[docker] next set of fixes

This commit is contained in:
Roel Spilker committed 2023-09-15 04:15:23 +02:00
1 parent 5b872c8172
commit 4d527303e5
10 files changed
+16 -11

No files matched your search

+1 -1
View File
@@ -10,7 +10,7 @@
</target>
<target name="compile" depends="init" description="compile the source">
<javac classpath="../lombok.jar" modulepath="lombok.jar" srcdir="${src}" destdir="${build}" fork="true">
<javac classpath="../lombok.jar" modulepath="../lombok.jar" srcdir="${src}" destdir="${build}" fork="true">
<compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED"/>
<compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>
<compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED"/>
+1 -1
View File
@@ -10,7 +10,7 @@
</target>
<target name="compile" depends="init" description="compile the source">
<javac classpath="lombok.jar" modulepath="lombok.jar" srcdir="${src}" destdir="${build}" fork="true">
<javac classpath="../lombok.jar" modulepath="../lombok.jar" srcdir="${src}" destdir="${build}" fork="true">
<compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED"/>
<compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>
<compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED"/>
+1 -1
View File
@@ -10,7 +10,7 @@
</target>
<target name="compile" depends="init" description="compile the source">
<javac classpath="lombok.jar" srcdir="${src}" destdir="${build}" fork="true">
<javac classpath="../lombok.jar" srcdir="${src}" destdir="${build}" fork="true">
<compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED"/>
<compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>
<compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED"/>
+1 -1
View File
@@ -10,7 +10,7 @@
</target>
<target name="compile" depends="init" description="compile the source">
<javac classpath="lombok.jar" modulepath="lombok.jar" srcdir="${src}" destdir="${build}" fork="true">
<javac classpath="../lombok.jar" modulepath="../lombok.jar" srcdir="${src}" destdir="${build}" fork="true">
<compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED"/>
<compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>
<compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED"/>
+1 -1
View File
@@ -10,7 +10,7 @@
</target>
<target name="compile" depends="init" description="compile the source">
<javac classpath="lombok.jar" srcdir="${src}" destdir="${build}" fork="true">
<javac classpath="../lombok.jar" srcdir="${src}" destdir="${build}" fork="true">
<compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED"/>
<compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>
<compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED"/>
+1 -1
View File
@@ -7,7 +7,7 @@ RUN provision/jdk/java-${jdk}.sh
ARG lombokjar=lombok.jar
ADD https://projectlombok.org/downloads/${lombokjar} /lombok.jar
ARG gradle=7.6.1
ARG gradle=8.3
ADD provision/gradle/gradle-${gradle}.sh provision/gradle/gradle-${gradle}.sh
RUN provision/gradle/gradle-${gradle}.sh
+4 -3
View File
@@ -2,11 +2,12 @@
[_(general configuration and options)_](../readme.md)
### `ARG gradle=7.6.1`
### `ARG gradle=8.3`
The gradle version to be used. Supported values:
- `7.6.1` (default)
- `8.3` (default)
- `7.6.1`
- `6.8.3`
## Example build commands:
@@ -16,7 +17,7 @@ The gradle version to be used. Supported values:
```
docker build -t lombok-gradle-jdk17 -f gradle/Dockerfile .
docker build -t lombok-gradle-jdk17 --build-arg lombokjar=lombok-1.18.20.jar -f gradle/Dockerfile .
docker build -t lombok-gradle-jdk17 --build-arg lombokjar=lombok-1.18.28.jar -f gradle/Dockerfile .
```
## Example run commands:
+1 -1
View File
@@ -15,7 +15,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.9.0</version>
<version>3.11.0</version>
<configuration>
<source>${java.version}</source>
<target>${java.version}</target>
+1 -1
View File
@@ -15,7 +15,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.9.0</version>
<version>3.11.0</version>
<configuration>
<source>${java.version}</source>
<target>${java.version}</target>
+4
View File
@@ -0,0 +1,4 @@
apt-get update && apt-get install -y wget unzip
wget https://services.gradle.org/distributions/gradle-8.3-bin.zip -O gradle.zip
mkdir /opt/gradle && unzip -d /opt/gradle gradle.zip
mv /opt/gradle/gradle-8.3 /opt/gradle/gradle