Skip to content
Snippets Groups Projects
Commit daa227f4 authored by Nicholas Blair's avatar Nicholas Blair
Browse files

Merge branch 'bitbucket-migration' into 'master'

Migrate git urls from bitbucket to git.doit.wisc.edu

This pull request updates git urls in the README and Maven pom for the git migration. I also made some minor text edits to the README as well.

See merge request !1
parents cd4134d0 7be78b9f
No related branches found
No related tags found
No related merge requests found
......@@ -15,12 +15,12 @@ Add the following to your Maven pom.xml:
<dependency>
<groupId>edu.wisc.uwss</groupId>
<artifactId>uw-spring-security-core</artifactId>
<version>0.3.0</version>
<version>0.4.7</version>
</dependency>
<dependency>
<groupId>edu.wisc.uwss</groupId>
<artifactId>uw-spring-security-config</artifactId>
<version>0.3.0</version>
<version>0.4.7</version>
</dependency>
The former, -core, should be a dependency in modules that integrate the user model within your service tier. The latter, -config, depends on -core and should be a dependency of your web application.
......@@ -42,19 +42,19 @@ user data model and authentication mechanisms,
This project follows a collaboration workflow similar to what is described in the "Integration Manager" section of http://git-scm.com/book/en/Distributed-Git-Distributed-Workflows.
It can also be described using the term "Fork and Pull."
The primary repository for this project is https://bitbucket.org/uwmadison_doit/uw-spring-security. Few developers will have 'push' access to this repository; the preferred permission will be 'fetch' only.
The primary repository for this project is https://git.doit.wisc.edu/adi-ia/uw-spring-security. Few developers will have 'push' access to this repository; the preferred permission will be 'fetch' only.
Each developer should:
1. Fork the primary repository into their personal bitbucket account.
1. Fork the primary repository into their personal namespace.
2. Clone the fork to their workstation.
3. Create branches for each unit of work.
4. When done, push the branch up to their personal fork.
5. Submit a pull request from the branch in their personal fork to the primary repository.
This process allows us to make use of bitbucket's excellent code review tools and gives us the flexibility to pick and choose
This process allows us to make use of gitlab's code review tools and gives us the flexibility to pick and choose
which features are ready for promotion at different times.
### Release Management
This module intends to adopt [Semantic Versioning](http://semver.org). Releases will be published with the Maven release plugin.
\ No newline at end of file
This project follows [Semantic Versioning](http://semver.org). Releases will be published with the Maven release plugin.
\ No newline at end of file
......@@ -8,9 +8,9 @@
<description>Parent project for module to integrate Spring Security with UW authentication mechanism.</description>
<scm>
<connection>scm:git:git@bitbucket.org:uwmadison_doit/uw-spring-security.git</connection>
<developerConnection>scm:git:git@bitbucket.org:uwmadison_doit/uw-spring-security.git</developerConnection>
<url>https://bitbucket.org/uwmadison_doit/uw-spring-security.git</url>
<connection>scm:git:git@git.doit.wisc.edu/adi-ia/uw-spring-security.git</connection>
<developerConnection>scm:git:ssh://git@git.doit.wisc.edu/adi-ia/uw-spring-security.git</developerConnection>
<url>https://git.doit.wisc.edu/adi-ia/uw-spring-security.git</url>
<tag>HEAD</tag>
</scm>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment