This is an automated email from the ASF dual-hosted git repository.
matthieu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
The following commit(s) were added to refs/heads/master by this push:
new 0ff5716 JAMES-2826 Since java 9 there's a release parameter that do
exactly what animal-sniffer does
0ff5716 is described below
commit 0ff5716977ba6446f2044036087569fc94da682c
Author: Matthieu Baechler <[email protected]>
AuthorDate: Mon Jul 8 18:09:33 2019 +0200
JAMES-2826 Since java 9 there's a release parameter that do exactly what
animal-sniffer does
The idea is to leverage a java > 8 compiler to gain greater compile
speed,
to replace the slow animal-sniffer plugin and to still generate
artifacts
for Java 8
---
dockerfiles/compilation/java-8/Dockerfile | 16 ++++++++--------
pom.xml | 28 ++--------------------------
server/container/spring/pom.xml | 15 ---------------
server/data/data-jpa/pom.xml | 10 ----------
server/queue/queue-file/pom.xml | 15 ---------------
5 files changed, 10 insertions(+), 74 deletions(-)
diff --git a/dockerfiles/compilation/java-8/Dockerfile
b/dockerfiles/compilation/java-8/Dockerfile
index c496289..7d27c22 100644
--- a/dockerfiles/compilation/java-8/Dockerfile
+++ b/dockerfiles/compilation/java-8/Dockerfile
@@ -2,19 +2,19 @@
#
# VERSION 1.0
-FROM openjdk:8u171-jdk
+FROM adoptopenjdk:11-jdk-hotspot
ENV GIT_VERSION 1:2.11.0-3
-# Install Maven
-WORKDIR /root
-RUN wget
https://archive.apache.org/dist/maven/maven-3/3.5.4/binaries/apache-maven-3.5.4-bin.tar.gz
-RUN tar -xvf apache-maven-3.5.4-bin.tar.gz
-RUN ln -s /root/apache-maven-3.5.4/bin/mvn /usr/bin/mvn
-
# Install git
RUN apt-get update
-RUN apt-get install -y git
+RUN apt-get install -y git wget unzip
+
+# Install Maven
+WORKDIR /root
+RUN wget
https://archive.apache.org/dist/maven/maven-3/3.6.1/binaries/apache-maven-3.6.1-bin.tar.gz
+RUN tar -xvf apache-maven-3.6.1-bin.tar.gz
+RUN ln -s /root/apache-maven-3.6.1/bin/mvn /usr/bin/mvn
# Copy the script
COPY compile.sh /root/compile.sh
diff --git a/pom.xml b/pom.xml
index 762f9fd..f491cad 100644
--- a/pom.xml
+++ b/pom.xml
@@ -576,7 +576,7 @@
otherwise the set values are used by default.
-->
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <target.jdk>1.8</target.jdk>
+ <target.jdk>8</target.jdk>
<james-skin.version>1.9-SNAPSHOT</james-skin.version>
<!--
This property contains the directory where to deploy when running
using "-Psite-reports" profile
@@ -2713,6 +2713,7 @@
<optimize>true</optimize>
<source>${target.jdk}</source>
<target>${target.jdk}</target>
+ <release>${target.jdk}</release>
</configuration>
</plugin>
<plugin>
@@ -3088,11 +3089,6 @@
</configuration>
</plugin>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>animal-sniffer-maven-plugin</artifactId>
- <version>1.16</version>
- </plugin>
- <plugin>
<groupId>pl.project13.maven</groupId>
<artifactId>git-commit-id-plugin</artifactId>
<version>3.0.0</version>
@@ -3183,26 +3179,6 @@
</dependencies>
</plugin>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>animal-sniffer-maven-plugin</artifactId>
- <configuration>
- <signature>
- <groupId>org.codehaus.mojo.signature</groupId>
- <artifactId>java18</artifactId>
- <version>1.0</version>
- </signature>
- </configuration>
- <executions>
- <execution>
- <id>check_java_8</id>
- <goals>
- <goal>check</goal>
- </goals>
- <phase>test</phase>
- </execution>
- </executions>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<configuration>
diff --git a/server/container/spring/pom.xml b/server/container/spring/pom.xml
index 86fe8ef..bbbaa70 100644
--- a/server/container/spring/pom.xml
+++ b/server/container/spring/pom.xml
@@ -200,19 +200,4 @@
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>animal-sniffer-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>check_java_8</id>
- <phase>none</phase>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
</project>
diff --git a/server/data/data-jpa/pom.xml b/server/data/data-jpa/pom.xml
index a545092..fc1927e 100644
--- a/server/data/data-jpa/pom.xml
+++ b/server/data/data-jpa/pom.xml
@@ -190,16 +190,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>animal-sniffer-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>check_java_8</id>
- <phase>none</phase>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
diff --git a/server/queue/queue-file/pom.xml b/server/queue/queue-file/pom.xml
index 989fc66..fb059eb 100644
--- a/server/queue/queue-file/pom.xml
+++ b/server/queue/queue-file/pom.xml
@@ -107,19 +107,4 @@
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>animal-sniffer-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>check_java_8</id>
- <phase>none</phase>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
