This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-resolver.git
The following commit(s) were added to refs/heads/master by this push:
new 195f1af [MRESOLVER-147] Upgrade to Java 8
195f1af is described below
commit 195f1afb6dd2748df301fd653e370cdcff6efe71
Author: Tamas Cservenak <[email protected]>
AuthorDate: Tue Nov 17 17:54:41 2020 +0100
[MRESOLVER-147] Upgrade to Java 8
* Build Java 8 modules unconditionally
* Add Animal Sniffer to remain safely buildable on newer Java versions
* Bump version since this is an import change
This closes #79
---
.travis.yml | 2 -
maven-resolver-api/pom.xml | 2 +-
maven-resolver-connector-basic/pom.xml | 2 +-
.../maven-resolver-demo-maven-plugin/pom.xml | 2 +-
.../maven-resolver-demo-snippets/pom.xml | 2 +-
maven-resolver-demos/pom.xml | 2 +-
maven-resolver-impl/pom.xml | 2 +-
maven-resolver-spi/pom.xml | 2 +-
maven-resolver-synccontext-global/pom.xml | 2 +-
maven-resolver-synccontext-redisson/pom.xml | 2 +-
maven-resolver-test-util/pom.xml | 2 +-
maven-resolver-transport-classpath/pom.xml | 2 +-
maven-resolver-transport-file/pom.xml | 2 +-
maven-resolver-transport-http/pom.xml | 2 +-
maven-resolver-transport-wagon/pom.xml | 2 +-
maven-resolver-util/pom.xml | 2 +-
pom.xml | 43 +++++++++-------------
17 files changed, 33 insertions(+), 42 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index c9f2a14..24ea442 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,8 +4,6 @@ dist: trusty
matrix:
include:
- os: linux
- jdk: openjdk7
- - os: linux
jdk: openjdk8
- os: linux
jdk: openjdk11
diff --git a/maven-resolver-api/pom.xml b/maven-resolver-api/pom.xml
index 90a6a7f..e93f649 100644
--- a/maven-resolver-api/pom.xml
+++ b/maven-resolver-api/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver</artifactId>
- <version>1.6.2-SNAPSHOT</version>
+ <version>1.7.0-SNAPSHOT</version>
</parent>
<artifactId>maven-resolver-api</artifactId>
diff --git a/maven-resolver-connector-basic/pom.xml
b/maven-resolver-connector-basic/pom.xml
index e10a8e9..a8d6271 100644
--- a/maven-resolver-connector-basic/pom.xml
+++ b/maven-resolver-connector-basic/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver</artifactId>
- <version>1.6.2-SNAPSHOT</version>
+ <version>1.7.0-SNAPSHOT</version>
</parent>
<artifactId>maven-resolver-connector-basic</artifactId>
diff --git a/maven-resolver-demos/maven-resolver-demo-maven-plugin/pom.xml
b/maven-resolver-demos/maven-resolver-demo-maven-plugin/pom.xml
index cf4224f..d3b5cca 100644
--- a/maven-resolver-demos/maven-resolver-demo-maven-plugin/pom.xml
+++ b/maven-resolver-demos/maven-resolver-demo-maven-plugin/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver-demos</artifactId>
- <version>1.6.2-SNAPSHOT</version>
+ <version>1.7.0-SNAPSHOT</version>
</parent>
<artifactId>resolver-demo-maven-plugin</artifactId>
diff --git a/maven-resolver-demos/maven-resolver-demo-snippets/pom.xml
b/maven-resolver-demos/maven-resolver-demo-snippets/pom.xml
index e3dfca8..d42b2be 100644
--- a/maven-resolver-demos/maven-resolver-demo-snippets/pom.xml
+++ b/maven-resolver-demos/maven-resolver-demo-snippets/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver-demos</artifactId>
- <version>1.6.2-SNAPSHOT</version>
+ <version>1.7.0-SNAPSHOT</version>
</parent>
<artifactId>maven-resolver-demo-snippets</artifactId>
diff --git a/maven-resolver-demos/pom.xml b/maven-resolver-demos/pom.xml
index 5df2fdc..8ff181e 100644
--- a/maven-resolver-demos/pom.xml
+++ b/maven-resolver-demos/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver</artifactId>
- <version>1.6.2-SNAPSHOT</version>
+ <version>1.7.0-SNAPSHOT</version>
</parent>
<artifactId>maven-resolver-demos</artifactId>
diff --git a/maven-resolver-impl/pom.xml b/maven-resolver-impl/pom.xml
index 207faf0..70f9f11 100644
--- a/maven-resolver-impl/pom.xml
+++ b/maven-resolver-impl/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver</artifactId>
- <version>1.6.2-SNAPSHOT</version>
+ <version>1.7.0-SNAPSHOT</version>
</parent>
<artifactId>maven-resolver-impl</artifactId>
diff --git a/maven-resolver-spi/pom.xml b/maven-resolver-spi/pom.xml
index 2b0d15c..0c4d20b 100644
--- a/maven-resolver-spi/pom.xml
+++ b/maven-resolver-spi/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver</artifactId>
- <version>1.6.2-SNAPSHOT</version>
+ <version>1.7.0-SNAPSHOT</version>
</parent>
<artifactId>maven-resolver-spi</artifactId>
diff --git a/maven-resolver-synccontext-global/pom.xml
b/maven-resolver-synccontext-global/pom.xml
index adaef66..995ae84 100644
--- a/maven-resolver-synccontext-global/pom.xml
+++ b/maven-resolver-synccontext-global/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver</artifactId>
- <version>1.6.2-SNAPSHOT</version>
+ <version>1.7.0-SNAPSHOT</version>
</parent>
<artifactId>maven-resolver-synccontext-global</artifactId>
diff --git a/maven-resolver-synccontext-redisson/pom.xml
b/maven-resolver-synccontext-redisson/pom.xml
index 2d21773..72b8b8c 100644
--- a/maven-resolver-synccontext-redisson/pom.xml
+++ b/maven-resolver-synccontext-redisson/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver</artifactId>
- <version>1.6.2-SNAPSHOT</version>
+ <version>1.7.0-SNAPSHOT</version>
</parent>
<artifactId>maven-resolver-synccontext-redisson</artifactId>
diff --git a/maven-resolver-test-util/pom.xml b/maven-resolver-test-util/pom.xml
index 92716ee..6dd62b6 100644
--- a/maven-resolver-test-util/pom.xml
+++ b/maven-resolver-test-util/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver</artifactId>
- <version>1.6.2-SNAPSHOT</version>
+ <version>1.7.0-SNAPSHOT</version>
</parent>
<artifactId>maven-resolver-test-util</artifactId>
diff --git a/maven-resolver-transport-classpath/pom.xml
b/maven-resolver-transport-classpath/pom.xml
index 4f4d4df..21db9d6 100644
--- a/maven-resolver-transport-classpath/pom.xml
+++ b/maven-resolver-transport-classpath/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver</artifactId>
- <version>1.6.2-SNAPSHOT</version>
+ <version>1.7.0-SNAPSHOT</version>
</parent>
<artifactId>maven-resolver-transport-classpath</artifactId>
diff --git a/maven-resolver-transport-file/pom.xml
b/maven-resolver-transport-file/pom.xml
index 4ab0308..3db97c8 100644
--- a/maven-resolver-transport-file/pom.xml
+++ b/maven-resolver-transport-file/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver</artifactId>
- <version>1.6.2-SNAPSHOT</version>
+ <version>1.7.0-SNAPSHOT</version>
</parent>
<artifactId>maven-resolver-transport-file</artifactId>
diff --git a/maven-resolver-transport-http/pom.xml
b/maven-resolver-transport-http/pom.xml
index 7c44b4c..43a9a24 100644
--- a/maven-resolver-transport-http/pom.xml
+++ b/maven-resolver-transport-http/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver</artifactId>
- <version>1.6.2-SNAPSHOT</version>
+ <version>1.7.0-SNAPSHOT</version>
</parent>
<artifactId>maven-resolver-transport-http</artifactId>
diff --git a/maven-resolver-transport-wagon/pom.xml
b/maven-resolver-transport-wagon/pom.xml
index 430adc2..a628ecc 100644
--- a/maven-resolver-transport-wagon/pom.xml
+++ b/maven-resolver-transport-wagon/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver</artifactId>
- <version>1.6.2-SNAPSHOT</version>
+ <version>1.7.0-SNAPSHOT</version>
</parent>
<artifactId>maven-resolver-transport-wagon</artifactId>
diff --git a/maven-resolver-util/pom.xml b/maven-resolver-util/pom.xml
index 989405f..2ca0ee2 100644
--- a/maven-resolver-util/pom.xml
+++ b/maven-resolver-util/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver</artifactId>
- <version>1.6.2-SNAPSHOT</version>
+ <version>1.7.0-SNAPSHOT</version>
</parent>
<artifactId>maven-resolver-util</artifactId>
diff --git a/pom.xml b/pom.xml
index 0edb232..4723f90 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,7 @@
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver</artifactId>
- <version>1.6.2-SNAPSHOT</version>
+ <version>1.7.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Maven Artifact Resolver</name>
@@ -68,7 +68,7 @@
</distributionManagement>
<properties>
- <javaVersion>7</javaVersion>
+ <javaVersion>8</javaVersion>
<surefire.redirectTestOutputToFile>true</surefire.redirectTestOutputToFile>
<maven.site.path>resolver-archives/resolver-LATEST</maven.site.path>
<checkstyle.violation.ignore>None</checkstyle.violation.ignore>
@@ -89,6 +89,8 @@
<module>maven-resolver-transport-file</module>
<module>maven-resolver-transport-http</module>
<module>maven-resolver-transport-wagon</module>
+ <module>maven-resolver-synccontext-global</module>
+ <module>maven-resolver-synccontext-redisson</module>
<module>maven-resolver-demos</module>
</modules>
@@ -390,22 +392,23 @@
</pluginManagement>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>animal-sniffer-maven-plugin</artifactId>
+ <version>1.19</version>
+ <configuration>
+ <signature>
+ <groupId>org.codehaus.mojo.signature</groupId>
+ <artifactId>java18</artifactId>
+ <version>1.0</version>
+ </signature>
+ </configuration>
<executions>
<execution>
- <id>enforce-minimum-java-version</id>
+ <id>check-java-compat</id>
+ <phase>process-classes</phase>
<goals>
- <goal>enforce</goal>
+ <goal>check</goal>
</goals>
- <configuration>
- <rules>
- <requireJavaVersion>
- <version>1.8.0</version>
- <message>bnd-maven-plugin requires at least Java 8 to
run</message>
- </requireJavaVersion>
- </rules>
- </configuration>
</execution>
</executions>
</plugin>
@@ -522,7 +525,7 @@
<rules>
<requireJavaVersion>
<version>(,9)</version>
- <message>Release with Java 7 or 8 due to changed
signatures of java.nio.ByteBuffer (MRESOLVER-67)</message>
+ <message>Release with Java 8 due to changed signatures
of java.nio.ByteBuffer (MRESOLVER-67)</message>
</requireJavaVersion>
</rules>
</configuration>
@@ -532,15 +535,5 @@
</plugins>
</build>
</profile>
- <profile>
- <id>java8-modules</id>
- <activation>
- <jdk>[1.8,)</jdk>
- </activation>
- <modules>
- <module>maven-resolver-synccontext-global</module>
- <module>maven-resolver-synccontext-redisson</module>
- </modules>
- </profile>
</profiles>
</project>
