diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml
index 5748a521973..b2afbb9ca2e 100644
--- a/.github/workflows/validate.yml
+++ b/.github/workflows/validate.yml
@@ -38,6 +38,8 @@ jobs:
cache: maven
- name: Copyright
run: etc/scripts/copyright.sh
+ env:
+ DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_API_TOKEN }}
- name: Upload copyright info
uses: actions/upload-artifact@v4
with:
@@ -57,6 +59,8 @@ jobs:
cache: maven
- name: Checkstyle
run: etc/scripts/checkstyle.sh
+ env:
+ DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_API_TOKEN }}
- name: Upload checkstyle info
uses: actions/upload-artifact@v4
with:
@@ -76,6 +80,8 @@ jobs:
cache: maven
- name: Build JDK17+ required modules
run: mvn -B -U -V clean install -DskipTests -pl :jersey-helidon-connector -am
+ env:
+ DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_API_TOKEN }}
- name: Set up JDK ${{ env.JAVA_VERSION }}
uses: actions/setup-java@v4.1.0
with:
@@ -84,6 +90,8 @@ jobs:
cache: maven
- name: Build ApiDocs
run: etc/scripts/apidocs.sh
+ env:
+ DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_API_TOKEN }}
archetypes:
timeout-minutes: 45
runs-on: ubuntu-latest
@@ -96,4 +104,6 @@ jobs:
java-version: ${{ env.JAVA_VERSION }}
cache: maven
- name: Test archetypes
- run: etc/scripts/test-archetypes.sh
\ No newline at end of file
+ run: etc/scripts/test-archetypes.sh
+ env:
+ DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_API_TOKEN }}
\ No newline at end of file
diff --git a/.mvn/develocity.xml b/.mvn/develocity.xml
new file mode 100644
index 00000000000..baeee504b46
--- /dev/null
+++ b/.mvn/develocity.xml
@@ -0,0 +1,43 @@
+
+
+
+
+ https://develocity-staging.eclipse.org
+
+ ee4j.jersey
+
+
+ 0.0.0.0
+
+
+
+
+
+
+ #{isFalse(env['CI'])}
+
+
+
+ false
+
+
+ false
+ #{isTrue(env['CI'])}
+
+
+
diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml
new file mode 100644
index 00000000000..3fb11e9473a
--- /dev/null
+++ b/.mvn/extensions.xml
@@ -0,0 +1,27 @@
+
+
+
+
+ com.gradle
+ develocity-maven-extension
+ 1.23.1
+
+
+ com.gradle
+ common-custom-user-data-maven-extension
+ 2.0.1
+
+
\ No newline at end of file
diff --git a/README.md b/README.md
index 62ab9a0f5c2..0f98c6f177c 100644
--- a/README.md
+++ b/README.md
@@ -15,6 +15,7 @@
[](https://travis-ci.org/eclipse-ee4j/jersey)
[](https://www.eclipse.org/legal/epl-2.0/)
[](https://www.gnu.org/software/classpath/license.html)
+ [](https://develocity-staging.eclipse.org/)
### About Jersey
diff --git a/etc/jenkins/Jenkinsfile_EE4J_build b/etc/jenkins/Jenkinsfile_EE4J_build
index 609d150c2d5..4b8b896e741 100644
--- a/etc/jenkins/Jenkinsfile_EE4J_build
+++ b/etc/jenkins/Jenkinsfile_EE4J_build
@@ -1,5 +1,12 @@
#!/usr/bin/env groovy
+def secrets = [
+ [path: 'cbi/ee4j.jersey/develocity.eclipse.org', secretValues: [
+ [envVar: 'DEVELOCITY_ACCESS_KEY', vaultKey: 'api-token']
+ ]
+ ]
+]
+
pipeline {
agent any
triggers {
@@ -42,7 +49,9 @@ pipeline {
done
'''
configFileProvider([configFile(fileId: CONFIG_FILE_ID, variable: 'MAVEN_SETTINGS_XML')]) {
- sh "$MVN -s $MAVEN_SETTINGS_XML clean install"
+ withVault([vaultSecrets: secrets]) {
+ sh "$MVN -s $MAVEN_SETTINGS_XML clean install"
+ }
}
}
}
diff --git a/etc/jenkins/Jenkinsfile_ci_build b/etc/jenkins/Jenkinsfile_ci_build
index 18d2e0f7893..db5ff66161a 100644
--- a/etc/jenkins/Jenkinsfile_ci_build
+++ b/etc/jenkins/Jenkinsfile_ci_build
@@ -1,3 +1,10 @@
+def secrets = [
+ [path: 'cbi/ee4j.jersey/develocity.eclipse.org', secretValues: [
+ [envVar: 'DEVELOCITY_ACCESS_KEY', vaultKey: 'api-token']
+ ]
+ ]
+]
+
pipeline {
agent none
@@ -19,9 +26,11 @@ pipeline {
maven 'apache-maven-latest'
}
steps {
- sh '''
- bash ${WORKSPACE}/etc/jenkins/jenkins_build.sh
- '''
+ withVault([vaultSecrets: secrets]) {
+ sh '''
+ bash ${WORKSPACE}/etc/jenkins/jenkins_build.sh
+ '''
+ }
}
}
stage('JDK 11') {
@@ -33,9 +42,11 @@ pipeline {
maven 'apache-maven-latest'
}
steps {
- sh '''
- bash ${WORKSPACE}/etc/jenkins/jenkins_build.sh
- '''
+ withVault([vaultSecrets: secrets]) {
+ sh '''
+ bash ${WORKSPACE}/etc/jenkins/jenkins_build.sh
+ '''
+ }
}
}
stage('JDK 21') {
@@ -47,9 +58,11 @@ pipeline {
maven 'apache-maven-latest'
}
steps {
- sh '''
- bash ${WORKSPACE}/etc/jenkins/jenkins_build.sh
- '''
+ withVault([vaultSecrets: secrets]) {
+ sh '''
+ bash ${WORKSPACE}/etc/jenkins/jenkins_build.sh
+ '''
+ }
}
}
}
diff --git a/etc/jenkins/Jenkinsfile_master_build b/etc/jenkins/Jenkinsfile_master_build
index 9b62947b645..e01385453e0 100644
--- a/etc/jenkins/Jenkinsfile_master_build
+++ b/etc/jenkins/Jenkinsfile_master_build
@@ -1,5 +1,12 @@
#!/usr/bin/env groovy
+def secrets = [
+ [path: 'cbi/ee4j.jersey/develocity.eclipse.org', secretValues: [
+ [envVar: 'DEVELOCITY_ACCESS_KEY', vaultKey: 'api-token']
+ ]
+ ]
+]
+
pipeline {
agent any
triggers {
@@ -42,7 +49,9 @@ pipeline {
done
'''
configFileProvider([configFile(fileId: CONFIG_FILE_ID, variable: 'MAVEN_SETTINGS_XML')]) {
- sh "$MVN -s $MAVEN_SETTINGS_XML clean install"
+ withVault([vaultSecrets: secrets]) {
+ sh "$MVN -s $MAVEN_SETTINGS_XML clean install"
+ }
}
}
}
diff --git a/etc/jenkins/Jenkinsfile_release b/etc/jenkins/Jenkinsfile_release
index 6fce5ed3dea..9230b5c24be 100644
--- a/etc/jenkins/Jenkinsfile_release
+++ b/etc/jenkins/Jenkinsfile_release
@@ -21,6 +21,13 @@ node {
def RELEASE_FOLDER='.'
def RELEASE_BRANCH=BRANCH
+ def secrets = [
+ [path: 'cbi/ee4j.jersey/develocity.eclipse.org', secretValues: [
+ [envVar: 'DEVELOCITY_ACCESS_KEY', vaultKey: 'api-token']
+ ]
+ ]
+ ]
+
env.JAVA_HOME="/opt/tools/java/oracle/jdk-8/1.8.0_181"
env.PATH="${env.JAVA_HOME}/bin:${env.PATH}"
sh '/opt/tools/java/oracle/jdk-8/1.8.0_181/bin/java -version'
@@ -144,8 +151,10 @@ node {
configFileProvider([configFile(fileId: SECURITY_FILE_ID, targetLocation: '/home/jenkins/.m2/')]) {
configFileProvider([configFile(fileId: CONFIG_FILE_ID, variable: 'MAVEN_SETTINGS_XML')]) {
- sh "${MVN_HOME}/bin/mvn -q -B -s ${MAVEN_SETTINGS_XML} -DskipTests -Ddoclint=none -Dadditionalparam='-Xdoclint:none' " +
- " -U -C clean package source:jar javadoc:jar ${TARGET}"
+ withVault([vaultSecrets: secrets]) {
+ sh "${MVN_HOME}/bin/mvn -q -B -s ${MAVEN_SETTINGS_XML} -DskipTests -Ddoclint=none -Dadditionalparam='-Xdoclint:none' " +
+ " -U -C clean package source:jar javadoc:jar ${TARGET}"
+ }
}
}
}