Skip to content

Commit 84e8b7c

Browse files
shawn-hurleydymurray
authored andcommitted
fixing maven download (#212)
(cherry picked from commit 564267c)
1 parent 47236f7 commit 84e8b7c

2 files changed

Lines changed: 8 additions & 8 deletions

File tree

Dockerfile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@ RUN mkdir /output && cp ./build/libs/fernflower.jar /output
1616

1717
FROM registry.access.redhat.com/ubi9/ubi AS addon-build
1818
RUN dnf install -y java-21-openjdk-devel wget zip --nodocs --setopt=install_weak_deps=0 && dnf clean all && rm -rf /var/cache/dnf
19-
RUN curl -fsSL -o /tmp/apache-maven.tar.gz https://dlcdn.apache.org/maven/maven-3/3.9.13/binaries/apache-maven-3.9.13-bin.tar.gz && \
19+
RUN curl -fsSL -o /tmp/apache-maven.tar.gz https://dlcdn.apache.org/maven/maven-3/3.9.14/binaries/apache-maven-3.9.14-bin.tar.gz && \
2020
tar -xzf /tmp/apache-maven.tar.gz -C /usr/local/ && \
2121
rm /tmp/apache-maven.tar.gz
2222
WORKDIR /app
2323
COPY ./ /app/
2424
ENV JAVA_HOME /usr/lib/jvm/java-21-openjdk
25-
RUN /usr/local/apache-maven-3.9.13/bin/mvn clean install -DskipTests=true
25+
RUN /usr/local/apache-maven-3.9.14/bin/mvn clean install -DskipTests=true
2626
# Download maven index data
2727
WORKDIR /maven-index-data
2828
RUN set -e; \
@@ -44,7 +44,7 @@ RUN microdnf install -y python39 java-1.8.0-openjdk-devel java-21-openjdk-devel
4444
ENV JAVA_HOME /usr/lib/jvm/java-21-openjdk
4545
# Specify Java 1.8 home for usage with gradle wrappers
4646
ENV JAVA8_HOME /usr/lib/jvm/java-1.8.0-openjdk
47-
ENV M2_HOME /usr/local/apache-maven-3.9.13
47+
ENV M2_HOME /usr/local/apache-maven-3.9.14
4848

4949
# Copy "download sources" gradle task. This is needed to download project sources.
5050
RUN mkdir /root/.gradle
@@ -54,8 +54,8 @@ COPY ./gradle/build-v9.gradle /usr/local/etc/task-v9.gradle
5454
COPY hack/maven.default.index /usr/local/etc/maven.default.index
5555

5656
COPY --from=jdtls-download /jdtls /jdtls/
57-
COPY --from=addon-build /usr/local/apache-maven-3.9.13/ /usr/local/apache-maven-3.9.13/
58-
RUN ln -s /usr/local/apache-maven-3.9.13/bin/mvn /usr/bin/mvn
57+
COPY --from=addon-build /usr/local/apache-maven-3.9.14/ /usr/local/apache-maven-3.9.14/
58+
RUN ln -s /usr/local/apache-maven-3.9.14/bin/mvn /usr/bin/mvn
5959
COPY --from=addon-build /root/.m2/repository/io/konveyor/tackle/java-analyzer-bundle.core/1.0.0-SNAPSHOT/java-analyzer-bundle.core-1.0.0-SNAPSHOT.jar /jdtls/plugins/
6060
COPY --from=addon-build /root/.m2/repository/io/konveyor/tackle/java-analyzer-bundle.core/1.0.0-SNAPSHOT/java-analyzer-bundle.core-1.0.0-SNAPSHOT.jar /jdtls/java-analyzer-bundle/java-analyzer-bundle.core/target/java-analyzer-bundle.core-1.0.0-SNAPSHOT.jar
6161
COPY --from=fernflower /output/fernflower.jar /bin/fernflower.jar

Dockerfile.test

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@ RUN microdnf install -y python39 java-1.8.0-openjdk-devel java-21-openjdk-devel
3030
ENV JAVA_HOME /usr/lib/jvm/java-21-openjdk
3131
# Specify Java 1.8 home for usage with gradle wrappers
3232
ENV JAVA8_HOME /usr/lib/jvm/java-1.8.0-openjdk
33-
RUN curl -fsSL -o /tmp/apache-maven.tar.gz https://dlcdn.apache.org/maven/maven-3/3.9.13/binaries/apache-maven-3.9.13-bin.tar.gz && \
33+
RUN curl -fsSL -o /tmp/apache-maven.tar.gz https://dlcdn.apache.org/maven/maven-3/3.9.14/binaries/apache-maven-3.9.14-bin.tar.gz && \
3434
tar -xzf /tmp/apache-maven.tar.gz -C /usr/local/ && \
35-
ln -s /usr/local/apache-maven-3.9.13/bin/mvn /usr/bin/mvn && \
35+
ln -s /usr/local/apache-maven-3.9.14/bin/mvn /usr/bin/mvn && \
3636
rm /tmp/apache-maven.tar.gz
37-
ENV M2_HOME /usr/local/apache-maven-3.9.13
37+
ENV M2_HOME /usr/local/apache-maven-3.9.14
3838

3939
# Copy "download sources" gradle task. This is needed to download project sources.
4040
RUN mkdir /root/.gradle

0 commit comments

Comments
 (0)