diff options
Diffstat (limited to 'docker/maven')
| -rw-r--r-- | docker/maven/Dockerfile | 11 | ||||
| -rw-r--r-- | docker/maven/files/jdk-10/classpath/pom.xml (renamed from docker/maven/files/jdk-10/pom.xml) | 2 | ||||
| -rw-r--r-- | docker/maven/files/jdk-11/classpath/pom.xml (renamed from docker/maven/files/jdk-11/pom.xml) | 2 | ||||
| -rw-r--r-- | docker/maven/files/jdk-12/classpath/pom.xml (renamed from docker/maven/files/jdk-12/pom.xml) | 2 | ||||
| -rw-r--r-- | docker/maven/files/jdk-13/classpath/pom.xml (renamed from docker/maven/files/jdk-13/pom.xml) | 2 | ||||
| -rw-r--r-- | docker/maven/files/jdk-13/modules/pom.xml | 60 | ||||
| -rw-r--r-- | docker/maven/files/jdk-8/classpath/pom.xml (renamed from docker/maven/files/jdk-8/pom.xml) | 0 | ||||
| -rw-r--r-- | docker/maven/files/jdk-8/modules/readme.txt | 1 | ||||
| -rw-r--r-- | docker/maven/files/jdk-9/classpath/pom.xml (renamed from docker/maven/files/jdk-9/pom.xml) | 2 | ||||
| -rw-r--r-- | docker/maven/readme.md | 8 |
10 files changed, 77 insertions, 13 deletions
diff --git a/docker/maven/Dockerfile b/docker/maven/Dockerfile index e5269ba2..32ebbe48 100644 --- a/docker/maven/Dockerfile +++ b/docker/maven/Dockerfile @@ -1,9 +1,12 @@ FROM ubuntu:18.04 as downloader
-ARG jdk=12
+ARG jdk=13
ADD provision/jdk/java-${jdk}.sh provision/jdk/java-${jdk}.sh
RUN provision/jdk/java-${jdk}.sh
+ARG lombokjar=lombok.jar
+ADD https://projectlombok.org/downloads/${lombokjar} /lombok.jar
+
ARG maven=3.6.1
ADD provision/maven/maven-${maven}.sh provision/maven/maven-${maven}.sh
RUN provision/maven/maven-${maven}.sh
@@ -19,11 +22,11 @@ WORKDIR workspace ADD shared/ ./
-ARG jdk=12
+ARG jdk=13
ADD maven/files/jdk-${jdk} ./
-ARG lombokjar=lombok.jar
-ADD https://projectlombok.org/downloads/${lombokjar} lombok.jar
+COPY --from=downloader /lombok.jar /workspace/classpath/lombok.jar
+COPY --from=downloader /lombok.jar /workspace/modules/lombok.jar
ENV JDK_VERSION=${jdk}
ENV JAVA_HOME=/opt/jdk
diff --git a/docker/maven/files/jdk-10/pom.xml b/docker/maven/files/jdk-10/classpath/pom.xml index 9940955d..b5367ae1 100644 --- a/docker/maven/files/jdk-10/pom.xml +++ b/docker/maven/files/jdk-10/classpath/pom.xml @@ -46,7 +46,7 @@ <artifactId>lombok</artifactId> <version>1.2.3</version> <scope>system</scope> - <systemPath>/workspace/lombok.jar</systemPath> + <systemPath>/workspace/classpath/lombok.jar</systemPath> </dependency> </dependencies> diff --git a/docker/maven/files/jdk-11/pom.xml b/docker/maven/files/jdk-11/classpath/pom.xml index 58a66c4d..e1f04343 100644 --- a/docker/maven/files/jdk-11/pom.xml +++ b/docker/maven/files/jdk-11/classpath/pom.xml @@ -46,7 +46,7 @@ <artifactId>lombok</artifactId> <version>1.2.3</version> <scope>system</scope> - <systemPath>/workspace/lombok.jar</systemPath> + <systemPath>/workspace/classpath/lombok.jar</systemPath> </dependency> </dependencies> diff --git a/docker/maven/files/jdk-12/pom.xml b/docker/maven/files/jdk-12/classpath/pom.xml index cdbab371..78120150 100644 --- a/docker/maven/files/jdk-12/pom.xml +++ b/docker/maven/files/jdk-12/classpath/pom.xml @@ -46,7 +46,7 @@ <artifactId>lombok</artifactId> <version>1.2.3</version> <scope>system</scope> - <systemPath>/workspace/lombok.jar</systemPath> + <systemPath>/workspace/classpath/lombok.jar</systemPath> </dependency> </dependencies> diff --git a/docker/maven/files/jdk-13/pom.xml b/docker/maven/files/jdk-13/classpath/pom.xml index 46a7e3c8..2414342e 100644 --- a/docker/maven/files/jdk-13/pom.xml +++ b/docker/maven/files/jdk-13/classpath/pom.xml @@ -46,7 +46,7 @@ <artifactId>lombok</artifactId> <version>1.2.3</version> <scope>system</scope> - <systemPath>/workspace/lombok.jar</systemPath> + <systemPath>/workspace/classpath/lombok.jar</systemPath> </dependency> </dependencies> diff --git a/docker/maven/files/jdk-13/modules/pom.xml b/docker/maven/files/jdk-13/modules/pom.xml new file mode 100644 index 00000000..f607f590 --- /dev/null +++ b/docker/maven/files/jdk-13/modules/pom.xml @@ -0,0 +1,60 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <groupId>com.example</groupId> + <artifactId>lombok-jdk-${env.JDK_VERSION}</artifactId> + <version>1.0-SNAPSHOT</version> + + <properties> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <java.version>13</java.version> + </properties> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <version>3.8.0</version> + <configuration> + <source>${java.version}</source> + <target>${java.version}</target> + <showDeprecation>true</showDeprecation> + <showWarnings>true</showWarnings> + <fork>true</fork> + <compilerargs> + <arg>-Werror</arg> + <arg>-Xlint:all</arg> + <arg>-J--add-opens=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED</arg> + <arg>-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED</arg> + <arg>-J--add-opens=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED</arg> + <arg>-J--add-opens=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED</arg> + <arg>-J--add-opens=jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED</arg> + <arg>-J--add-opens=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED</arg> + <arg>-J--add-opens=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED</arg> + <arg>-J--add-opens=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED</arg> + <arg>-J--add-opens=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED</arg> + </compilerargs> + <annotationProcessorPaths> + <path> + <groupId>org.projectlombok</groupId> + <artifactId>lombok</artifactId> + <version>1.18.10</version> + </path> + </annotationProcessorPaths> + </configuration> + </plugin> + </plugins> + </build> + + <dependencies> + <dependency> + <groupId>org.projectlombok</groupId> + <artifactId>lombok</artifactId> + <version>1.2.3</version> + <scope>system</scope> + <systemPath>/workspace/modules/lombok.jar</systemPath> + </dependency> + </dependencies> + +</project>
\ No newline at end of file diff --git a/docker/maven/files/jdk-8/pom.xml b/docker/maven/files/jdk-8/classpath/pom.xml index 87c4a6a8..87c4a6a8 100644 --- a/docker/maven/files/jdk-8/pom.xml +++ b/docker/maven/files/jdk-8/classpath/pom.xml diff --git a/docker/maven/files/jdk-8/modules/readme.txt b/docker/maven/files/jdk-8/modules/readme.txt new file mode 100644 index 00000000..89aea537 --- /dev/null +++ b/docker/maven/files/jdk-8/modules/readme.txt @@ -0,0 +1 @@ +unsupported
\ No newline at end of file diff --git a/docker/maven/files/jdk-9/pom.xml b/docker/maven/files/jdk-9/classpath/pom.xml index dfbb9ad9..258c7fa5 100644 --- a/docker/maven/files/jdk-9/pom.xml +++ b/docker/maven/files/jdk-9/classpath/pom.xml @@ -46,7 +46,7 @@ <artifactId>lombok</artifactId> <version>1.2.3</version> <scope>system</scope> - <systemPath>/workspace/lombok.jar</systemPath> + <systemPath>/workspace/classpath/lombok.jar</systemPath> </dependency> </dependencies> diff --git a/docker/maven/readme.md b/docker/maven/readme.md index 2d0f0604..9ca76985 100644 --- a/docker/maven/readme.md +++ b/docker/maven/readme.md @@ -15,17 +15,17 @@ The maven version to be used. Supported values: (To be executed from the `<lombokhome>/docker` directory) ``` -docker build -t lombok-maven-jdk12 -f maven/Dockerfile . +docker build -t lombok-maven-jdk13 -f maven/Dockerfile . -docker build -t lombok-maven-jdk12 --build-arg lombokjar=lombok-1.16.20.jar -f maven/Dockerfile . +docker build -t lombok-maven-jdk13 --build-arg lombokjar=lombok-1.16.20.jar -f maven/Dockerfile . ``` ## Example run commands: ``` -docker run -it lombok-maven-jdk12 +docker run -it lombok-maven-jdk13 -docker run --rm -it -v /<lombokhome>/dist/lombok.jar:/workspace/lombok.jar lombok-maven-jdk12 +docker run --rm -it -v /<lombokhome>/dist/lombok.jar:/workspace/lombok.jar lombok-maven-jdk13 ``` ## Example container commands: |