This is an automated email from the ASF dual-hosted git repository.
sor pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-jlink-plugin.git
The following commit(s) were added to refs/heads/master by this push:
new 84d6073 [MJLINK-50] Upgrade to Java 8 / Maven 3.1.0
84d6073 is described below
commit 84d6073364b03797b3b7bacfa07bca4283919fb5
Author: Sandra Parsick <spars...@users.noreply.github.com>
AuthorDate: Sat Oct 31 10:54:47 2020 +0100
[MJLINK-50] Upgrade to Java 8 / Maven 3.1.0
---
pom.xml | 80 ++++++++++++++++++++++++++++++++++++++++++++++-------------------
1 file changed, 57 insertions(+), 23 deletions(-)
diff --git a/pom.xml b/pom.xml
index 26530a6..2714d01 100644
--- a/pom.xml
+++ b/pom.xml
@@ -65,9 +65,9 @@
</distributionManagement>
<properties>
- <mavenVersion>3.0</mavenVersion>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
+ <mavenVersion>3.1.0</mavenVersion>
+ <maven.compiler.source>8</maven.compiler.source>
+ <maven.compiler.target>8</maven.compiler.target>
<project.build.outputTimestamp>2020-04-07T21:04:00Z</project.build.outputTimestamp>
</properties>
@@ -118,42 +118,76 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
- <version>2.19.0</version>
+ <version>3.5.13</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
- <version>2.9.1</version>
+ <version>3.16.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.junit.vintage</groupId>
+ <artifactId>junit-vintage-engine</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.junit</groupId>
+ <artifactId>junit-bom</artifactId>
+ <version>5.7.0</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
<build>
<pluginManagement>
<plugins>
<plugin>
- <artifactId>maven-enforcer-plugin</artifactId>
- <version>3.0.0-M1</version>
- <executions>
- <execution>
- <id>enforce-bytecode-version</id>
- <configuration>
- <rules>
- <enforceBytecodeVersion>
- <maxJdkVersion>1.7</maxJdkVersion>
- <excludes>
- <exclude>org.ow2.asm:asm</exclude>
- </excludes>
- </enforceBytecodeVersion>
- <requireSameVersions />
- </rules>
- </configuration>
- </execution>
- </executions>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.8.1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-plugin-plugin</artifactId>
+ <version>3.6.0</version>
</plugin>
</plugins>
</pluginManagement>
+ <plugins>
+ <plugin>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <version>3.0.0-M3</version>
+ <executions>
+ <execution>
+ <id>enforce-bytecode-version</id>
+ <configuration>
+ <rules>
+ <enforceBytecodeVersion>
+ <maxJdkVersion>${maven.compiler.target}</maxJdkVersion>
+ <excludes>
+ <exclude>org.ow2.asm:asm</exclude>
+ </excludes>
+ </enforceBytecodeVersion>
+ <requireSameVersions />
+ </rules>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
<resources>
<resource>
<directory>src/main/filtered-resources</directory>
