Skip to content

Commit

Permalink
Merge branch 'release/19.0.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
cslzchen committed Aug 19, 2019
2 parents 2780806 + 860968c commit e753833
Show file tree
Hide file tree
Showing 5 changed files with 40 additions and 23 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ language: java
dist: trusty
sudo: false
jdk:
- oraclejdk8
- openjdk8
cache:
directories:
- '$HOME/.m2/repository'
Expand Down
11 changes: 11 additions & 0 deletions AUTHORS.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# Credits

## Contributors

- Michael Haselton [`@icereval`](https://github.com/icereval)
- Longze Chen [`@cslzchen`](https://github.com/cslzchen)
- Fitz Elliott [`@felliott`](https://github.com/felliott)
- Erin Braswell [`@erinspace`](https://github.com/erinspace)
- Andy Boughton [`@abought`](https://github.com/abought)
- Billy Hunt [`@billyhunt`](https://github.com/billyhunt)
- Darío Hereñú [`@kant`](https://github.com/kant)
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,14 @@

We follow the CalVer (https://calver.org/) versioning scheme: YY.MINOR.MICRO.

19.0.0 (2019-08-19)
===================

- Update the PR template
- Add the authors list
- Fixed type in readme
- Update TCI to switch from oraclejdk8 to openjdk8

18.1.7 (2019-08-15)
===================

Expand Down
40 changes: 19 additions & 21 deletions PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,36 +1,34 @@
<!-- Use the following format for the title of the Pull Request:
[Ticket] Title
<!-- Before submitting the PR, double check the target branch.
- For critical hotfixes, select "master" as the target branch.
Please (re)name your branch to "hotfix/<branch_name>".
- For the rest, select "develop" as the target branch. Please
(re)name your branch with a proper prefix listed below:
- "feature/" for features - major updates
- "patch/" for improvements - minor updates
- "fix/" for bug fixes
- For security issues, please check with the team lead before
submitting your Pull Request.
-->

<!-- Before submit your Pull Request, make sure you picked the right target branch:
- For hotfixes, select "master"
- For features, improvements and bug fixes, select "develop"
-->

<!-- For security related issue, talk with the team lead before submitting your PR -->

## Ticket

<!-- Link to JIRA ticket, if applicable e.g. https://openscience.atlassian.net/browse/SVCS-1234 -->
<!-- Link to the JIRA ticket(s), if applicable. For example:
[ENG-000](https://openscience.atlassian.net/browse/SVCS-000)
-->

## Purpose

<!-- Describe the purpose of your changes -->
<!-- Describe the purpose of your changes. -->

## Changes

<!-- Briefly describe or list your changes -->

## Side effects
<!-- Briefly describe or list your changes. -->

<!-- Any possible side effects? -->
## Dev / QA Notes

## QA Notes
<!-- This section is required if this change needs QA. -->

<!-- If applicable, briefly describe how QA should test this ticket/PR -->

## Deployment Notes
## Dev-Ops Notes

<!-- Any special configurations for deployment? -->

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -384,7 +384,7 @@ client_secret | ... | ...
If you have trouble building CAS via `mvn clean install`, you may need to install the "Java Cryptography Extension (JCE) Unlimited Strength
Jurisdiction Policy Files". Follow
[these instructions](http://bigdatazone.blogspot.com/2014/01/mac-osx-where-to-put-unlimited-jce-java.html) to unpack
the zip file, back up existing policy files files, and install the new, stronger cryptography policy files.
the zip file, back up existing policy files, and install the new, stronger cryptography policy files.


### TODO
Expand Down

0 comments on commit e753833

Please sign in to comment.