This is an automated email from the ASF dual-hosted git repository.
robbie pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/qpid-jms.git
The following commit(s) were added to refs/heads/main by this push:
new 129ec92 QPIDJMS-540: require Java 11+ , i.e drop Java 8 [/9/10]
129ec92 is described below
commit 129ec92764d612b6ddbb586654834f3e4a91b1bc
Author: Robbie Gemmell <rob...@apache.org>
AuthorDate: Tue May 18 18:58:31 2021 +0100
QPIDJMS-540: require Java 11+ , i.e drop Java 8 [/9/10]
---
.github/workflows/build.yml | 2 +-
.travis.yml | 5 +----
appveyor.yml | 1 -
pom.xml | 38 +++++++++++++++++++++++++-------------
4 files changed, 27 insertions(+), 19 deletions(-)
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 71198f8..b8a46e0 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -8,7 +8,7 @@ jobs:
strategy:
fail-fast: false
matrix:
- java: [ 8, 11, 16 ]
+ java: [ 11, 16 ]
steps:
- uses: actions/checkout@v2
diff --git a/.travis.yml b/.travis.yml
index 4125798..fc78f71 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,13 +2,10 @@ language: java
matrix:
include:
- os: linux
- jdk: openjdk8
- dist: xenial
- - os: linux
jdk: openjdk11
dist: xenial
- os: osx
- osx_image: xcode9.3
+ osx_image: xcode9.4
cache:
directories:
- $HOME/.m2
diff --git a/appveyor.yml b/appveyor.yml
index 9634043..7944212 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -4,7 +4,6 @@ clone_depth: 30
environment:
matrix:
- - JAVA_HOME: C:\Program Files\Java\jdk1.8.0
- JAVA_HOME: C:\Program Files\Java\jdk11
install:
diff --git a/pom.xml b/pom.xml
index 3b3f841..39f824c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -60,13 +60,14 @@
<maven-eclipse-plugin-version>2.10</maven-eclipse-plugin-version>
<maven-idea-plugin-version>2.5</maven-idea-plugin-version>
<maven-bundle-plugin-version>5.1.1</maven-bundle-plugin-version>
+ <maven-enforcer-plugin-version>3.0.0-M3</maven-enforcer-plugin-version>
<findbugs-maven-plugin-version>3.0.2</findbugs-maven-plugin-version>
<jacoco-plugin-version>0.8.6</jacoco-plugin-version>
<surefire.version>2.22.2</surefire.version>
- <!-- See also maven.compiler.release in the java9on profile -->
- <maven.compiler.source>1.8</maven.compiler.source>
- <maven.compiler.target>1.8</maven.compiler.target>
+ <maven.compiler.source>11</maven.compiler.source>
+ <maven.compiler.target>11</maven.compiler.target>
+ <maven.compiler.release>11</maven.compiler.release>
<!-- Test properties -->
<maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile>
@@ -277,6 +278,27 @@
</configuration>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <version>${maven-enforcer-plugin-version}</version>
+ <executions>
+ <execution>
+ <id>enforce-java-version</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <requireJavaVersion>
+ <version>[11,)</version>
+ <message>You must use Java 11+ to build</message>
+ </requireJavaVersion>
+ </rules>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>${maven-bundle-plugin-version}</version>
@@ -385,15 +407,5 @@
</plugins>
</build>
</profile>
-
- <profile>
- <id>java9on</id>
- <activation>
- <jdk>[9,)</jdk>
- </activation>
- <properties>
- <maven.compiler.release>8</maven.compiler.release>
- </properties>
- </profile>
</profiles>
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
