javassist: Fix build (#13097)

This PR fixes the build for project javassist following the upstream respository. --------- Signed-off-by: Arthur Chan <[email protected]>
google · Feb 24, 2025 · 7b50b80 · 7b50b80
1 parent d647580
commit 7b50b80
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 12 deletions.
diff --git a/projects/javassist/Dockerfile b/projects/javassist/Dockerfile
@@ -16,11 +16,11 @@
 
 FROM gcr.io/oss-fuzz-base/base-builder-jvm
 
-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 && \
+RUN curl -L https://archive.apache.org/dist/maven/maven-3/3.9.9/binaries/apache-maven-3.9.9-bin.zip -o maven.zip && \
     unzip maven.zip -d $SRC/maven && \
     rm -rf maven.zip
 
-ENV MVN $SRC/maven/apache-maven-3.6.3/bin/mvn
+ENV MVN $SRC/maven/apache-maven-3.9.9/bin/mvn
 
 RUN git clone --depth 1 https://github.com/jboss-javassist/javassist.git
 

diff --git a/projects/javassist/build.sh b/projects/javassist/build.sh
@@ -23,8 +23,7 @@ mv ./src/test ./src/java
 mkdir ./src/test
 mv ./src/java ./src/test/java
 
-MAVEN_ARGS="-Djavac.src.version=15 -Djavac.target.version=15 -DskipTests"
-$MVN package org.apache.maven.plugins:maven-shade-plugin:3.2.4:shade $MAVEN_ARGS
+$MVN clean package org.apache.maven.plugins:maven-shade-plugin:3.2.4:shade -DskipTests
 CURRENT_VERSION=$($MVN org.apache.maven.plugins:maven-help-plugin:3.2.0:evaluate \
  -Dexpression=project.version -q -DforceStdout)
 cp "target/javassist-$CURRENT_VERSION.jar" $OUT/javassist.jar
@@ -38,7 +37,7 @@ BUILD_CLASSPATH=$(echo $ALL_JARS | xargs printf -- "$OUT/%s:"):$JAZZER_API_PATH
 # All .jar and .class files lie in the same directory as the fuzzer at runtime.
 RUNTIME_CLASSPATH=$(echo $ALL_JARS | xargs printf -- "\$this_dir/%s:"):\$this_dir
 
-for fuzzer in $(find $SRC -name '*Fuzzer.java'); do
+for fuzzer in $(find $SRC -maxdepth 1 -name '*Fuzzer.java'); do
   fuzzer_basename=$(basename -s .java $fuzzer)
   javac -cp $BUILD_CLASSPATH $fuzzer
   cp $SRC/$fuzzer_basename.class $OUT/

diff --git a/projects/javassist/pom.xml.diff b/projects/javassist/pom.xml.diff
@@ -1,15 +1,28 @@
 diff --git a/pom.xml b/pom.xml
-index a604e16..52c8a7b 100644
+index d13fee2..4157d4f 100644
 --- a/pom.xml
 +++ b/pom.xml
-@@ -138,8 +138,8 @@
-     </snapshotRepository>
-   </distributionManagement>
+@@ -155,11 +155,11 @@
+   </dependencies>
+
    <build>
 -    <sourceDirectory>src/main/</sourceDirectory>
 -    <testSourceDirectory>src/test/</testSourceDirectory>
-+    <sourceDirectory>src/main/java/</sourceDirectory>
-+    <testSourceDirectory>src/test/java/</testSourceDirectory>
++    <sourceDirectory>src/main/java</sourceDirectory>
++    <testSourceDirectory>src/test/java</testSourceDirectory>
      <testResources>
        <testResource>
-         <directory>src/test/resources</directory>
+-        <directory>src/test/resources</directory>
++        <directory>src/test/java/resources</directory>
+       </testResource>
+     </testResources>
+     <plugins>
+@@ -200,7 +200,7 @@
+               <mainClass>javassist.CtClass</mainClass>
+               <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+             </manifest>
+-            <manifestFile>src/main/META-INF/MANIFEST.MF</manifestFile>
++            <manifestFile>src/main/java/META-INF/MANIFEST.MF</manifestFile>
+           </archive>
+         </configuration>
+       </plugin>