Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion .github/workflows/validate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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:
Expand All @@ -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:
Expand All @@ -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
Expand All @@ -96,4 +104,6 @@ jobs:
java-version: ${{ env.JAVA_VERSION }}
cache: maven
- name: Test archetypes
run: etc/scripts/test-archetypes.sh
run: etc/scripts/test-archetypes.sh
env:
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_API_TOKEN }}
43 changes: 43 additions & 0 deletions .mvn/develocity.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<!--
*******************************************************************************
* Copyright (c) 2025 Contributors to the Eclipse Foundation
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License 2.0 which is available at
* https://www.eclipse.org/legal/epl-2.0/.
*
* SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* See git history
*******************************************************************************
-->
<develocity
xmlns="https://www.gradle.com/develocity-maven" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="https://www.gradle.com/develocity-maven https://www.gradle.com/schema/develocity-maven.xsd">
<server>
<url>https://develocity-staging.eclipse.org</url>
</server>
<projectId>ee4j.jersey</projectId>
<buildScan>
<obfuscation>
<ipAddresses>0.0.0.0</ipAddresses>
</obfuscation>
<publishing>
<onlyIf>
<![CDATA[authenticated]]>
</onlyIf>
</publishing>
<backgroundBuildScanUpload>#{isFalse(env['CI'])}</backgroundBuildScanUpload>
</buildScan>
<buildCache>
<local>
<enabled>false</enabled>
</local>
<remote>
<enabled>false</enabled>
<storeEnabled>#{isTrue(env['CI'])}</storeEnabled>
</remote>
</buildCache>
</develocity>
27 changes: 27 additions & 0 deletions .mvn/extensions.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
*******************************************************************************
* Copyright (c) 2025 Contributors to the Eclipse Foundation
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License 2.0 which is available at
* https://www.eclipse.org/legal/epl-2.0/.
*
* SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* See git history
*******************************************************************************
-->
<extensions>
<extension>
<groupId>com.gradle</groupId>
<artifactId>develocity-maven-extension</artifactId>
<version>1.23.1</version>
</extension>
<extension>
<groupId>com.gradle</groupId>
<artifactId>common-custom-user-data-maven-extension</artifactId>
<version>2.0.1</version>
</extension>
</extensions>
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
[![Build Status](https://travis-ci.org/eclipse-ee4j/jersey.svg?branch=master)](https://travis-ci.org/eclipse-ee4j/jersey)
&nbsp;[![EPL-2.0](./etc/epl.svg)](https://www.eclipse.org/legal/epl-2.0/)
&nbsp;[![GPL+CPE-2.0](./etc/gpl.svg)](https://www.gnu.org/software/classpath/license.html)
&nbsp;[![Revved up by Develocity](https://img.shields.io/badge/Revved%20up%20by-Develocity-06A0CE?logo=Gradle&labelColor=02303A)](https://develocity-staging.eclipse.org/)

### About Jersey

Expand Down
11 changes: 10 additions & 1 deletion etc/jenkins/Jenkinsfile_EE4J_build
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down Expand Up @@ -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"
}
}
}
}
Expand Down
31 changes: 22 additions & 9 deletions etc/jenkins/Jenkinsfile_ci_build
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
def secrets = [
[path: 'cbi/ee4j.jersey/develocity.eclipse.org', secretValues: [
[envVar: 'DEVELOCITY_ACCESS_KEY', vaultKey: 'api-token']
]
]
]

pipeline {
agent none

Expand All @@ -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') {
Expand All @@ -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') {
Expand All @@ -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
'''
}
}
}
}
Expand Down
11 changes: 10 additions & 1 deletion etc/jenkins/Jenkinsfile_master_build
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down Expand Up @@ -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"
}
}
}
}
Expand Down
13 changes: 11 additions & 2 deletions etc/jenkins/Jenkinsfile_release
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -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}"
}
}
}
}
Expand Down