You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2020/06/15 16:39:14 UTC
[activemq-artemis] branch master updated: ARTEMIS-2109: require JDK
8 for release, enforce use of JDK8 or 11+ otherwise,
rename profiles for consistency and clarity,
remove superflous/incorrect managed plugin versions
This is an automated email from the ASF dual-hosted git repository.
clebertsuconic pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
The following commit(s) were added to refs/heads/master by this push:
new 6e2b5dc ARTEMIS-2109: require JDK 8 for release, enforce use of JDK8 or 11+ otherwise, rename profiles for consistency and clarity, remove superflous/incorrect managed plugin versions
new 797b492 This closes #3183
6e2b5dc is described below
commit 6e2b5dc8f2a8c62efd9bf8b14e0a8b3efa128de1
Author: Robbie Gemmell <ro...@apache.org>
AuthorDate: Mon Jun 15 11:27:17 2020 +0100
ARTEMIS-2109: require JDK 8 for release, enforce use of JDK8 or 11+ otherwise, rename profiles for consistency and clarity, remove superflous/incorrect managed plugin versions
Update CI to only use the release profile for building examples on JDK8, use noRun profile otherwise. Does the exact same in terms of setting properties for the examples build, just doesnt engage the parent release profile which enforces JDK8.
---
.travis.yml | 20 +++++++++++++++-----
pom.xml | 15 +++++++--------
2 files changed, 22 insertions(+), 13 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 46b5e3d..369fef6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,9 +1,19 @@
language: java
install: true
-jdk:
- - openjdk8
- - openjdk11
- - openjdk14
+matrix:
+ include:
+ - os: linux
+ jdk: openjdk8
+ env:
+ - EXAMPLES_PROFILE="release"
+ - os: linux
+ jdk: openjdk11
+ env:
+ - EXAMPLES_PROFILE="noRun"
+ - os: linux
+ jdk: openjdk14
+ env:
+ - EXAMPLES_PROFILE="noRun"
# clean out Artemis artifacts from the cache
before_install:
@@ -16,7 +26,7 @@ script:
- set -e
- mvn -Dorg.apache.activemq.artemis.core.io.aio.AIOSequentialFileFactory.DISABLED=AnythingNotNull -Pfast-tests -Pextra-tests -Ptests-CI -B install -q
- cd examples
-- mvn install -Prelease install -B -q
+- mvn install -P${EXAMPLES_PROFILE} -B -q
cache:
directories:
diff --git a/pom.xml b/pom.xml
index 38af255..dcf5a99 100644
--- a/pom.xml
+++ b/pom.xml
@@ -901,7 +901,7 @@
</build>
</profile>
<profile>
- <id>jdk18</id>
+ <id>jdk8</id>
<activation>
<jdk>1.8</jdk>
</activation>
@@ -911,9 +911,9 @@
</properties>
</profile>
<profile>
- <id>java9on</id>
+ <id>jdk11on</id>
<activation>
- <jdk>[9,)</jdk>
+ <jdk>[11,)</jdk>
</activation>
<properties>
<maven.compiler.source>8</maven.compiler.source>
@@ -1013,7 +1013,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
- <version>1.4</version>
<executions>
<execution>
<id>enforce-java</id>
@@ -1022,9 +1021,9 @@
</goals>
<configuration>
<rules>
- <!-- we need java8 when building the release -->
<requireJavaVersion>
- <version>1.8.0</version>
+ <version>[1.8, 9)</version>
+ <message>JDK 8 is required when building the release</message>
</requireJavaVersion>
</rules>
</configuration>
@@ -1562,7 +1561,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
- <version>1.4</version>
<executions>
<execution>
<id>enforce-java</id>
@@ -1572,7 +1570,8 @@
<configuration>
<rules>
<requireJavaVersion>
- <version>1.8.0</version>
+ <version>[1.8, 9),[11,)</version>
+ <message>You must use either JDK 8 or JDK 11+ when building</message>
</requireJavaVersion>
</rules>
</configuration>