Skip to content

Commit 818ab7b

Browse files
committed
jsoup: bump Maven to 3.9.11 and build with Java 17
Updating Maven in particular so that I can merge jhy/jsoup#2447 which requires a newer version.
1 parent 6f5791d commit 818ab7b

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

projects/jsoup/Dockerfile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,13 @@
1616

1717
FROM gcr.io/oss-fuzz-base/base-builder-jvm
1818

19-
RUN curl -L https://archive.apache.org/dist/maven/maven-3/3.6.3/binaries/apache-maven-3.6.3-bin.zip -o maven.zip && \
19+
ARG MAVEN_VERSION=3.9.11
20+
21+
RUN curl -L https://archive.apache.org/dist/maven/maven-3/$MAVEN_VERSION/binaries/apache-maven-$MAVEN_VERSION-bin.zip -o maven.zip && \
2022
unzip maven.zip -d $SRC/maven && \
2123
rm -rf maven.zip
2224

23-
ENV MVN $SRC/maven/apache-maven-3.6.3/bin/mvn
25+
ENV MVN $SRC/maven/apache-maven-$MAVEN_VERSION/bin/mvn
2426

2527
RUN git clone --depth 1 https://github.com/google/fuzzing && \
2628
cat fuzzing/dictionaries/html.dict \

projects/jsoup/build.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
# Move seed corpus and dictionary.
1919
mv $SRC/{*.zip,*.dict,*.options} $OUT
2020

21-
MAVEN_ARGS="-Dmaven.test.skip=true -Djavac.src.version=15 -Djavac.target.version=15"
22-
$MVN package org.apache.maven.plugins:maven-shade-plugin:3.2.4:shade $MAVEN_ARGS
23-
CURRENT_VERSION=$($MVN org.apache.maven.plugins:maven-help-plugin:3.2.0:evaluate \
21+
MAVEN_ARGS="-Dmaven.test.skip=true -Djavac.src.version=17 -Djavac.target.version=17"
22+
$MVN package org.apache.maven.plugins:maven-shade-plugin:3.6.1:shade $MAVEN_ARGS
23+
CURRENT_VERSION=$($MVN org.apache.maven.plugins:maven-help-plugin:3.5.1:evaluate \
2424
-Dexpression=project.version -q -DforceStdout)
2525
cp "target/jsoup-$CURRENT_VERSION.jar" $OUT/jsoup.jar
2626

0 commit comments

Comments
 (0)