-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'release/5.1.0' into main
- Loading branch information
Showing
15 changed files
with
320 additions
and
171 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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=17.0.1-tem | ||
java=17.0.3-tem | ||
gradle=7.3.3 | ||
grails=5.1.2 | ||
groovy=3.0.9 | ||
grails=5.1.7 | ||
groovy=3.0.10 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,91 @@ | ||
pipeline { | ||
agent any | ||
|
||
environment { | ||
JENKINS = 'true' | ||
} | ||
|
||
tools { | ||
jdk 'jdk-17' | ||
} | ||
|
||
options { | ||
timestamps() | ||
timeout(time: 30, unit: 'MINUTES') | ||
skipStagesAfterUnstable() | ||
buildDiscarder(logRotator(numToKeepStr: '30')) | ||
} | ||
|
||
stages { | ||
|
||
stage('Clean') { | ||
// Only clean when the last build failed | ||
when { | ||
expression { | ||
currentBuild.previousBuild?.currentResult == 'FAILURE' | ||
} | ||
} | ||
steps { | ||
sh "./gradlew clean" | ||
} | ||
} | ||
|
||
stage('Info') { | ||
steps { | ||
sh './gradlew -v' // Output gradle version for verification checks | ||
sh './grailsw -v' // Output grails version for verification checks | ||
} | ||
} | ||
|
||
stage('Test cleanup & Compile') { | ||
steps { | ||
sh './gradlew compile' | ||
} | ||
} | ||
|
||
stage('License Header Check') { | ||
steps { | ||
warnError('Missing License Headers') { | ||
sh './gradlew --build-cache license' | ||
} | ||
} | ||
} | ||
|
||
stage('Sonarqube') { | ||
when { | ||
branch 'main' | ||
} | ||
steps { | ||
withSonarQubeEnv('JenkinsQube') { | ||
sh "./gradlew sonarqube" | ||
} | ||
} | ||
} | ||
|
||
// stage('Deploy to Artifactory') { | ||
// when { | ||
// allOf { | ||
// anyOf { | ||
// branch 'main' | ||
// branch 'develop' | ||
// } | ||
// expression { | ||
// currentBuild.currentResult == 'SUCCESS' | ||
// } | ||
// } | ||
// | ||
// } | ||
// steps { | ||
// script { | ||
// sh "./gradlew --build-cache publish" | ||
// } | ||
// } | ||
// } | ||
} | ||
|
||
post { | ||
always { | ||
zulipNotification(topic: 'mdm-application-build') | ||
} | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,49 +1,32 @@ | ||
# Core Info | ||
version=5.0.0 | ||
version=5.1.0 | ||
group=uk.ac.ox.softeng.maurodatamapper | ||
# Gradle | ||
gradleVersion=7.3.3 | ||
org.gradle.jvmargs=-Dfile.encoding=UTF-8 | ||
org.gradle.jvmargs=-Dfile.encoding=UTF-8 -Xmx2g | ||
org.gradle.parallel=true | ||
org.gradle.caching=true | ||
# Code | ||
sourceCompatibility=17 | ||
targetCompatibility=17 | ||
# Deployment & Build | ||
artifactory_contextUrl=https://jenkins.cs.ox.ac.uk/artifactory | ||
oxbrcinformaticsGradlePluginsVersion=7.2 | ||
oxbrcinformaticsGradlePluginsVersion=7.8 | ||
licenseGradlePluginVersion=0.16.1 | ||
licenseGradlePluginSpringCoreOverrideVersion=5.3.14 | ||
## Grails | ||
grailsVersion=5.1.2 | ||
grailsGradlePluginVersion=5.1.1 | ||
groovyVersion=3.0.9 | ||
grailsHibernate5Version=7.2.1 | ||
# Grails | ||
grailsVersion=5.1.7 | ||
grailsGradlePluginVersion=5.1.4 | ||
groovyVersion=3.0.10 | ||
grailsHibernate5Version=7.2.2 | ||
grailsViewsVersion=2.2.0 | ||
## Hibernate & Database | ||
hibernateSearchVersion=3.0.0-SNAPSHOT | ||
hibernateSearchOrmVersion=6.0.8.OXBRC | ||
luceneVersion=8.7.0 | ||
## Core | ||
assetPipelineVersion=3.3.6 | ||
springBootVersion=2.6.1 | ||
spotbugsAnnotationVersion=4.4.2 | ||
commonsTextVersion=1.9 | ||
commonsCsvVersion=1.8 | ||
javaMailVersion=6.6.1 | ||
guavaVersion=31.0.1-jre | ||
commonsBeanutilsVersion=1.9.4 | ||
assetPipelineVersion=3.4.6 | ||
jaxbApiVersion=2.3.1 | ||
## Security | ||
commonsRngVersion=1.4 | ||
## BOM Overrides | ||
caffeine.version=2.9.3 | ||
groovy.version=3.0.9 | ||
#tomcat.version=10.0.8 # spring boot 2.6.1 will not work with tomcat 10 | ||
hibernate.version=5.6.3.Final | ||
#TODO update to logback.xml so we can migrate to 1.2.9 | ||
logback.version=1.2.7 | ||
snakeyaml.version=1.30 | ||
testingSupport.version=2.4.0 | ||
micronaut.version=3.2.7 | ||
#mssql-jdbc.version=8.4.0.jre11 | ||
springBootVersion=2.6.7 | ||
|
||
## v2.2.1 includes a logback.xml file which needs to be removed before we can update | ||
#views-json.version=2.2.0 | ||
#views-markup.version=2.2.0 | ||
#views-json-testing-support.version=2.2.0 | ||
#views-json-templates.version=2.2.0 | ||
## This really needs updating ASAP but the v5/v6 builds have issues | ||
#cache.version=4.0.3 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.