You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ma...@apache.org on 2018/05/19 17:49:32 UTC
[archiva] branch master updated (9add27a -> c87933a)
This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/archiva.git.
from 9add27a Cleanup of build file
new 27f5fd5 Preparing for JDK>=9 compatibility
new c87933a Adding JDK>=9 builds to Jenkinsfile
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
Jenkinsfile | 67 ++++++++++++++++------
.../archiva-base/archiva-checksum/pom.xml | 13 +++++
.../archiva-core-consumers/pom.xml | 13 +++++
.../archiva-base/archiva-converter/pom.xml | 13 +++++
.../archiva-base/archiva-policies/pom.xml | 13 +++++
archiva-modules/archiva-base/archiva-proxy/pom.xml | 13 +++++
.../archiva-base/archiva-transaction/pom.xml | 13 +++++
.../archiva-rest/archiva-rest-services/pom.xml | 19 ++++++
.../archiva-web/archiva-web-common/pom.xml | 18 ++++++
archiva-modules/archiva-web/archiva-webdav/pom.xml | 13 +++++
archiva-modules/plugins/maven2-repository/pom.xml | 12 ++++
archiva-modules/plugins/problem-reports/pom.xml | 13 +++++
pom.xml | 19 ++++++
13 files changed, 221 insertions(+), 18 deletions(-)
--
To stop receiving notification emails like this one, please contact
martin_s@apache.org.
[archiva] 01/02: Preparing for JDK>=9 compatibility
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/archiva.git
commit 27f5fd524c931c655c10df11f3c75ed885b9ed62
Author: Martin Stockhammer <ma...@apache.org>
AuthorDate: Sat May 19 19:07:44 2018 +0200
Preparing for JDK>=9 compatibility
---
archiva-modules/archiva-base/archiva-checksum/pom.xml | 13 +++++++++++++
.../archiva-consumers/archiva-core-consumers/pom.xml | 13 +++++++++++++
.../archiva-base/archiva-converter/pom.xml | 13 +++++++++++++
archiva-modules/archiva-base/archiva-policies/pom.xml | 13 +++++++++++++
archiva-modules/archiva-base/archiva-proxy/pom.xml | 13 +++++++++++++
.../archiva-base/archiva-transaction/pom.xml | 13 +++++++++++++
.../archiva-rest/archiva-rest-services/pom.xml | 19 +++++++++++++++++++
.../archiva-web/archiva-web-common/pom.xml | 18 ++++++++++++++++++
archiva-modules/archiva-web/archiva-webdav/pom.xml | 13 +++++++++++++
archiva-modules/plugins/maven2-repository/pom.xml | 12 ++++++++++++
archiva-modules/plugins/problem-reports/pom.xml | 13 +++++++++++++
pom.xml | 19 +++++++++++++++++++
12 files changed, 172 insertions(+)
diff --git a/archiva-modules/archiva-base/archiva-checksum/pom.xml b/archiva-modules/archiva-base/archiva-checksum/pom.xml
index a027079..8f5ab0b 100644
--- a/archiva-modules/archiva-base/archiva-checksum/pom.xml
+++ b/archiva-modules/archiva-base/archiva-checksum/pom.xml
@@ -51,6 +51,19 @@
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</dependency>
+
+ <!-- Needed for JDK >= 9 -->
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml
index 277bd2a..2cfb88f 100644
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml
@@ -164,6 +164,19 @@
<artifactId>archiva-maven2-indexer</artifactId>
<scope>test</scope>
</dependency>
+
+ <!-- Needed for JDK >= 9 -->
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
<pluginManagement>
diff --git a/archiva-modules/archiva-base/archiva-converter/pom.xml b/archiva-modules/archiva-base/archiva-converter/pom.xml
index 91d1cc6..ffeee4d 100644
--- a/archiva-modules/archiva-base/archiva-converter/pom.xml
+++ b/archiva-modules/archiva-base/archiva-converter/pom.xml
@@ -100,6 +100,19 @@
<artifactId>xercesImpl</artifactId>
<scope>test</scope>
</dependency>
+
+ <!-- Needed for JDK >= 9 -->
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
<plugins>
diff --git a/archiva-modules/archiva-base/archiva-policies/pom.xml b/archiva-modules/archiva-base/archiva-policies/pom.xml
index 947daa4..7da80fc 100644
--- a/archiva-modules/archiva-base/archiva-policies/pom.xml
+++ b/archiva-modules/archiva-base/archiva-policies/pom.xml
@@ -92,6 +92,19 @@
<artifactId>spring-test</artifactId>
<scope>test</scope>
</dependency>
+
+ <!-- Needed for JDK >= 9 -->
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
diff --git a/archiva-modules/archiva-base/archiva-proxy/pom.xml b/archiva-modules/archiva-base/archiva-proxy/pom.xml
index dca7a31..b4b33a1 100644
--- a/archiva-modules/archiva-base/archiva-proxy/pom.xml
+++ b/archiva-modules/archiva-base/archiva-proxy/pom.xml
@@ -220,6 +220,19 @@
<artifactId>archiva-maven2-indexer</artifactId>
<scope>test</scope>
</dependency>
+
+ <!-- Needed for JDK >= 9 -->
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
<plugins>
diff --git a/archiva-modules/archiva-base/archiva-transaction/pom.xml b/archiva-modules/archiva-base/archiva-transaction/pom.xml
index 1214329..daf444f 100644
--- a/archiva-modules/archiva-base/archiva-transaction/pom.xml
+++ b/archiva-modules/archiva-base/archiva-transaction/pom.xml
@@ -66,6 +66,19 @@
<artifactId>log4j-jcl</artifactId>
<scope>compile</scope>
</dependency>
+
+ <!-- Needed for JDK >= 9 -->
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
<plugins>
diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml
index 3605930..c022209 100644
--- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml
+++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml
@@ -408,6 +408,25 @@
<scope>provided</scope>
</dependency>
+ <!-- Needed for JDK >= 9 -->
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
<build>
diff --git a/archiva-modules/archiva-web/archiva-web-common/pom.xml b/archiva-modules/archiva-web/archiva-web-common/pom.xml
index 0f4d583..7c4dbfe 100644
--- a/archiva-modules/archiva-web/archiva-web-common/pom.xml
+++ b/archiva-modules/archiva-web/archiva-web-common/pom.xml
@@ -385,6 +385,24 @@
<scope>test</scope>
</dependency>
+ <!-- Needed for JDK >= 9 -->
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
diff --git a/archiva-modules/archiva-web/archiva-webdav/pom.xml b/archiva-modules/archiva-web/archiva-webdav/pom.xml
index 717074c..44d5057 100644
--- a/archiva-modules/archiva-web/archiva-webdav/pom.xml
+++ b/archiva-modules/archiva-web/archiva-webdav/pom.xml
@@ -258,6 +258,19 @@
<scope>test</scope>
</dependency>
+ <!-- Needed for JDK >= 9 -->
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
<build>
<plugins>
diff --git a/archiva-modules/plugins/maven2-repository/pom.xml b/archiva-modules/plugins/maven2-repository/pom.xml
index 2acfa79..d79a114 100644
--- a/archiva-modules/plugins/maven2-repository/pom.xml
+++ b/archiva-modules/plugins/maven2-repository/pom.xml
@@ -193,6 +193,18 @@
<scope>test</scope>
</dependency>
+ <!-- Needed for JDK >= 9 -->
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
<plugins>
diff --git a/archiva-modules/plugins/problem-reports/pom.xml b/archiva-modules/plugins/problem-reports/pom.xml
index 3ffb4b3..69c7f3c 100644
--- a/archiva-modules/plugins/problem-reports/pom.xml
+++ b/archiva-modules/plugins/problem-reports/pom.xml
@@ -74,6 +74,19 @@
<artifactId>xercesImpl</artifactId>
<scope>test</scope>
</dependency>
+
+ <!-- Needed for JDK >= 9 -->
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
<plugins>
diff --git a/pom.xml b/pom.xml
index 396c72c..17d4efe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1528,6 +1528,25 @@
<version>1.7.2</version>
</dependency>
+ <!-- Dependencies for JDK >=9 update -->
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <version>1.3.2</version>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>2.3.0</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
+ <version>2.3.0</version>
+ </dependency>
+
</dependencies>
</dependencyManagement>
--
To stop receiving notification emails like this one, please contact
martin_s@apache.org.
[archiva] 02/02: Adding JDK>=9 builds to Jenkinsfile
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/archiva.git
commit c87933a4a65667dd47e2643b37070a1e0f6d767a
Author: Martin Stockhammer <ma...@apache.org>
AuthorDate: Sat May 19 19:49:28 2018 +0200
Adding JDK>=9 builds to Jenkinsfile
---
Jenkinsfile | 67 ++++++++++++++++++++++++++++++++++++++++++++-----------------
1 file changed, 49 insertions(+), 18 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index dafce91..88887bc 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -29,6 +29,8 @@
*/
LABEL = 'ubuntu'
buildJdk = 'JDK 1.8 (latest)'
+buildJdk9 = 'JDK 1.9 (latest)'
+buildJdk10 = 'JDK 10 (latest)'
buildMvn = 'Maven 3.5.2'
deploySettings = 'DefaultMavenSettingsProvider.1331204114925'
INTEGRATION_PIPELINE = "Archiva-IntegrationTests-Gitbox"
@@ -40,21 +42,6 @@ pipeline {
stages {
-
- stage('Checkout') {
- steps {
- script {
- echo "Info: Job-Name=${JOB_NAME}, Branch=${BRANCH_NAME}, Workspace=${PWD}"
- }
- checkout scm
- }
- post {
- failure {
- notifyBuild("Checkout failure (${currentBuild.currentResult})")
- }
- }
- }
-
stage('BuildAndDeploy') {
steps {
timeout(120) {
@@ -105,13 +92,57 @@ pipeline {
}
}
+ stage('JDKs') {
+ parallel {
+ stage('JDK9') {
+ steps {
+ ws("${env.JOB_NAME}-JDK9") {
+ checkout scm
+ timeout(120) {
+ withMaven(maven: buildMvn, jdk: buildJdk9,
+ mavenSettingsConfig: deploySettings,
+ mavenLocalRepo: ".repository",
+ options: [concordionPublisher(disabled: true), dependenciesFingerprintPublisher(disabled: true),
+ findbugsPublisher(disabled: true), artifactsPublisher(disabled: true),
+ invokerPublisher(disabled: true), jgivenPublisher(disabled: true),
+ junitPublisher(disabled: true, ignoreAttachments: false),
+ openTasksPublisher(disabled: true), pipelineGraphPublisher(disabled: true)]
+ )
+ {
+ sh "mvn clean install -B -U -e -fae -T2"
+ }
+ }
+ }
+ }
+ }
+ stage('JDK10') {
+ steps {
+ ws("${env.JOB_NAME}-JDK10") {
+ checkout scm
+ timeout(120) {
+ withMaven(maven: buildMvn, jdk: buildJdk10,
+ mavenSettingsConfig: deploySettings,
+ mavenLocalRepo: ".repository",
+ options: [concordionPublisher(disabled: true), dependenciesFingerprintPublisher(disabled: true),
+ findbugsPublisher(disabled: true), artifactsPublisher(disabled: true),
+ invokerPublisher(disabled: true), jgivenPublisher(disabled: true),
+ junitPublisher(disabled: true, ignoreAttachments: false),
+ openTasksPublisher(disabled: true), pipelineGraphPublisher(disabled: true)]
+ )
+ {
+ sh "mvn clean install -B -U -e -fae -T2"
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+
post {
unstable {
notifyBuild("Unstable Build")
}
- always {
- cleanWs deleteDirs: true, notFailBuild: true, patterns: [[pattern: '.repository', type: 'EXCLUDE']]
- }
success {
script {
def previousResult = currentBuild.previousBuild?.result
--
To stop receiving notification emails like this one, please contact
martin_s@apache.org.