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

Replace bitbucket urls with git.doit.wisc.edu equivalents

Also moved README-release to RELEASE.md so gitlabs will present README.md at the project page.
parent 6072885b
No related branches found
No related tags found
1 merge request!1Replace bitbucket urls with git.doit.wisc.edu equivalents
## Contributing
This project uses the [forking workflow](https://www.atlassian.com/git/tutorials/comparing-workflows/forking-workflow).
Please fork this project and submit pull requests to the [primary repository](https://git.doit.wisc.edu/adi-ia/rpc-netid-php).
It is expected that unit tests are created for new and updated functionality. Pull requests should be descriptive.
\ No newline at end of file
...@@ -11,16 +11,16 @@ The recommended way to obtain this client is with [Composer](http://www.getcompo ...@@ -11,16 +11,16 @@ The recommended way to obtain this client is with [Composer](http://www.getcompo
"repositories": [ "repositories": [
{ {
"type": "vcs", "type": "vcs",
"url": "git@bitbucket.uwmadison_doit/rpc-netid-php" "url": "git@git.doit.wisc.edu:adi-ia/rpc-netid-php.git"
} }
], ],
"require": { "require": {
"uwmadison_doit/rpc-netid-php": "1.*" "adi-ia/rpc-netid-php": "1.*"
} }
} }
``` ```
Your public SSH key will need to be linked to your Bitbucket account. You can alternatively use HTTP and specify your Bitbucket username and password. [The composer.json Schema - Repositories](https://getcomposer.org/doc/04-schema.md#repositories) Your public SSH key will need to be linked to your git.doit.wisc.edu account. Learn more in the composer documentation about [the composer.json Schema - Repositories](https://getcomposer.org/doc/04-schema.md#repositories)
### Git ### Git
...@@ -88,15 +88,6 @@ You will need to run `phpdoc` at the root of the project in order to generate th ...@@ -88,15 +88,6 @@ You will need to run `phpdoc` at the root of the project in order to generate th
[Installing phpdoc](http://phpdoc.org/docs/latest/getting-started/installing.html) [Installing phpdoc](http://phpdoc.org/docs/latest/getting-started/installing.html)
## Contributing
The rest of this README is for those wishing to contribute to the project.
This project uses the [forking workflow](https://www.atlassian.com/git/tutorials/comparing-workflows/forking-workflow).
Please fork this project and submit pull requests to the [blessed repository](https://bitbucket.org/uwmadison_doit/rpc-netid-php).
It is expected that unit tests are created for new and updated functionality. Pull requests should be descriptive.
## Development Requirements ## Development Requirements
1. [phing](http://www.phing.info/) 1. [phing](http://www.phing.info/)
...@@ -154,14 +145,3 @@ php phing.phar integration-test ...@@ -154,14 +145,3 @@ php phing.phar integration-test
A valid client certificate is required to authenticate with Middleware's web service. Test data must be supplied in `src/test/resources/integration-test-data.ini`. A valid client certificate is required to authenticate with Middleware's web service. Test data must be supplied in `src/test/resources/integration-test-data.ini`.
See the class summary in `src/test/integration-tests/RpcNetidClientSoapIT.php` and the comments in `src/test/resources/integration-test-data.SAMPLE.ini`. See the class summary in `src/test/integration-tests/RpcNetidClientSoapIT.php` and the comments in `src/test/resources/integration-test-data.SAMPLE.ini`.
## Release Management
To release a branch as a new version of the software:
```bash
php phing.phar release -Dversion=1.2.3 -Dbranch=myBranch
```
The `branch` property is optional and will default to `master` if not set.
See `README-release.md` for detailed information.
# Release Process # # Release Process #
1. User has cloned the [blessed repository](https://bitbucket.org/uwmadison_doit/rpc-netid-php/) and has write access to it. 1. User has cloned the [primary repository](https://git.doit.wisc.edu/adi-ia/rpc-netid-php/) and has write access to it.
2. User runs the following command: `php phing.phar release -Dversion=1.2.3 -Dbranch=myBranch` 2. User runs the following command: `php phing.phar release -Dversion=1.2.3 [-Dbranch=some-alternate-branch]` The branch argument is optional and defaults to `master`.
3. The designated branch is checked out. 3. The designated branch is checked out.
4. A tag is created with the name equal to the version number with no extra characters 4. A tag is created with the name equal to the version number with no extra characters
5. The repository is pushed to origin with all tags. 5. The repository is pushed to origin with all tags.
The end result is a new tag in the remote repository equal to the version number. Composer clients will now pick up on the new version number. The end result is a new tag in the remote repository equal to the version number. Composer clients will now pick up on the new version number.
For instance, if version 1.1.0 was released, a composer client with the following dependency would pick up on the new change:
```json
"require": {
"uwmadison_doit/rpc-netid-php": "1.*"
}
```
\ No newline at end of file
{ {
"name" : "uwmadison_doit/rpc-netid-php", "name" : "adi-ia/rpc-netid-php",
"description" : "PHP client for the NetID RPC web service provided by DoIT Middleware", "description" : "PHP client for the NetID RPC web service provided by DoIT Middleware",
"type" : "library", "type" : "library",
"homepage" : "https://bitbucket.org/uwmadison_doit/rpc-netid-php/", "homepage" : "https://git.doit.wisc.edu/adi-ia/rpc-netid-php",
"license" : "Apache-2.0", "license" : "Apache-2.0",
"authors" : [{ "authors" : [{
"name" : "UW-Madison DoIT ADI Internal Applications", "name" : "UW-Madison DoIT ADI Internal Applications",
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
], ],
"support" : { "support" : {
"email" : "adi-ia@lists.wisc.edu", "email" : "adi-ia@lists.wisc.edu",
"source" : "https://bitbucket.org/uwmadison_doit/rpc-netid-php/" "source" : "https://git.doit.wisc.edu/adi-ia/rpc-netid-php"
}, },
"require-dev" : { "require-dev" : {
}, },
......
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