Skip to content

Commit

Permalink
Merge branch 'release/5.0.0' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
jenkins committed Jan 28, 2022
2 parents a99c1da + 9bb063c commit 18a269c
Show file tree
Hide file tree
Showing 1,663 changed files with 69,616 additions and 30,123 deletions.
8 changes: 4 additions & 4 deletions .sdkmanrc
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Enable auto-env through the sdkman_auto_env config
# Add key=value pairs of SDKs to use below
java=12.0.2.j9-adpt
gradle=6.7.1
grails=4.0.6
groovy=2.5.14
java=17.0.1-tem
gradle=7.3.3
grails=5.1.2
groovy=3.0.9
519 changes: 274 additions & 245 deletions Jenkinsfile

Large diffs are not rendered by default.

27 changes: 1 addition & 26 deletions LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -173,29 +173,4 @@
incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability.

END OF TERMS AND CONDITIONS

APPENDIX: How to apply the Apache License to your work.

To apply the Apache License to your work, attach the following
boilerplate notice, with the fields enclosed by brackets "[]"
replaced with your own identifying information. (Don't include
the brackets!) The text should be enclosed in the appropriate
comment syntax for the file format. We also recommend that a
file or class name and description of purpose be included on the
same "printed page" as the copyright notice for easier
identification within third-party archives.

Copyright 2020 University of Oxford and Health and Social Care Information Centre, also known as NHS Digital

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
END OF TERMS AND CONDITIONS
2 changes: 1 addition & 1 deletion NOTICE
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright 2020 University of Oxford and Health and Social Care Information Centre, also known as NHS Digital
Copyright 2020-2022 University of Oxford and Health and Social Care Information Centre, also known as NHS Digital

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
8 changes: 3 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,12 @@ Core API for Mauro Data Mapper

## Requirements

* Grails 4.0.6 +
* Gradle 6.7.1
* Java OpenJDK 12
* Grails 5.1.1+
* Gradle 7.3.3
* Java 17

All of the above can be installed an easily maintained by using [SDKMAN!](https://sdkman.io).

*Grails 4.0.3 will not run in any version above Java 12, and Grails 4 will not work on any version below Java 11*

* PostgreSQL 12+

This is required to run any of the sub projects in development or production mode.
Expand Down
Loading

0 comments on commit 18a269c

Please sign in to comment.