diff --git a/docker/gradle/Dockerfile b/docker/gradle/Dockerfile index efc7eef2..381b0f09 100644 --- a/docker/gradle/Dockerfile +++ b/docker/gradle/Dockerfile @@ -23,8 +23,7 @@ WORKDIR workspace ADD shared/ ./ ADD gradle/files/ ./ -COPY --from=downloader /lombok.jar /workspace/classpath/lombok.jar -COPY --from=downloader /lombok.jar /workspace/modules/lombok.jar +COPY --from=downloader /lombok.jar /workspace/lombok.jar ARG jdk=17 ENV JDK_VERSION=${jdk} diff --git a/docker/gradle/files/classpath/build.gradle b/docker/gradle/files/classpath/build.gradle index bbf276c7..eca05e78 100644 --- a/docker/gradle/files/classpath/build.gradle +++ b/docker/gradle/files/classpath/build.gradle @@ -1,6 +1,6 @@ apply plugin: 'java' dependencies { - compileOnly files('lombok.jar') - annotationProcessor files('lombok.jar') + compileOnly files('../lombok.jar') + annotationProcessor files('../lombok.jar') } \ No newline at end of file diff --git a/docker/maven/Dockerfile b/docker/maven/Dockerfile index d11dd0c7..16d6caf9 100644 --- a/docker/maven/Dockerfile +++ b/docker/maven/Dockerfile @@ -25,8 +25,7 @@ ADD shared/ ./ ARG jdk=17 ADD maven/files/jdk-${jdk} ./ -COPY --from=downloader /lombok.jar /workspace/classpath/lombok.jar -COPY --from=downloader /lombok.jar /workspace/modules/lombok.jar +COPY --from=downloader /lombok.jar /workspace/lombok.jar ENV JDK_VERSION=${jdk} ENV JAVA_HOME=/opt/jdk diff --git a/docker/maven/files/jdk-11/classpath/pom.xml b/docker/maven/files/jdk-11/classpath/pom.xml index e1f04343..58a66c4d 100644 --- a/docker/maven/files/jdk-11/classpath/pom.xml +++ b/docker/maven/files/jdk-11/classpath/pom.xml @@ -46,7 +46,7 @@ lombok 1.2.3 system - /workspace/classpath/lombok.jar + /workspace/lombok.jar diff --git a/docker/maven/files/jdk-17/classpath/pom.xml b/docker/maven/files/jdk-17/classpath/pom.xml index 8e9c0c46..649ddc8e 100644 --- a/docker/maven/files/jdk-17/classpath/pom.xml +++ b/docker/maven/files/jdk-17/classpath/pom.xml @@ -46,7 +46,7 @@ lombok 1.2.3 system - /workspace/classpath/lombok.jar + /workspace/lombok.jar diff --git a/docker/maven/files/jdk-21/classpath/pom.xml b/docker/maven/files/jdk-21/classpath/pom.xml index 6f07b836..6aeae995 100644 --- a/docker/maven/files/jdk-21/classpath/pom.xml +++ b/docker/maven/files/jdk-21/classpath/pom.xml @@ -46,7 +46,7 @@ lombok 1.2.3 system - /workspace/classpath/lombok.jar + /workspace/lombok.jar