Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

javassist: Fix build #13097

Merged
merged 5 commits into from
Feb 24, 2025
Merged

javassist: Fix build #13097

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
17794ed
javassist: Fix build
arthurscchan Feb 24, 2025
ed5ae39
Fix build
arthurscchan Feb 24, 2025
42fa5b7
Merge branch 'master' into fix-javassist
arthurscchan Feb 24, 2025
574c4af
Fix formatting
arthurscchan Feb 24, 2025
ddfc5d4
Merge branch 'master' into fix-javassist
arthurscchan Feb 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions projects/javassist/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
5 changes: 2 additions & 3 deletions projects/javassist/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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/
Expand Down
27 changes: 20 additions & 7 deletions projects/javassist/pom.xml.diff
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>