Skip to content

Commit e748d5b

Browse files
authored
jvm: Fix project build (#13085)
This PR fixes more JVM projects built following FI update. Signed-off-by: Arthur Chan <[email protected]>
1 parent a8f27ec commit e748d5b

File tree

3 files changed

+3
-25
lines changed

3 files changed

+3
-25
lines changed

projects/undertow/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ BUILD_CLASSPATH=$(echo $ALL_JARS | xargs printf -- "$OUT/%s:"):$JAZZER_API_PATH
3434
# All .jar and .class files lie in the same directory as the fuzzer at runtime.
3535
RUNTIME_CLASSPATH=$(echo $ALL_JARS | xargs printf -- "\$this_dir/%s:"):\$this_dir
3636

37-
for fuzzer in $(find $SRC -name '*Fuzzer.java')
37+
for fuzzer in $(find $SRC -maxdepth 1 -name '*Fuzzer.java')
3838
do
3939
fuzzer_basename=$(basename -s .java $fuzzer)
4040
javac -cp $BUILD_CLASSPATH $fuzzer

projects/woodstox/build.sh

Lines changed: 1 addition & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -18,28 +18,6 @@
1818
# Move seed corpus and dictionary.
1919
mv $SRC/{*.zip,*.dict} $OUT
2020

21-
22-
cat > patch.diff <<- EOM
23-
diff --git a/pom.xml b/pom.xml
24-
index 3e29db9..c79e086 100644
25-
--- a/pom.xml
26-
+++ b/pom.xml
27-
@@ -206,8 +206,8 @@ SAX2 and Stax2 APIs
28-
<plugin>
29-
<artifactId>maven-compiler-plugin</artifactId>
30-
<configuration>
31-
- <source>1.6</source>
32-
- <target>1.6</target>
33-
+ <source>15</source>
34-
+ <target>15</target>
35-
<!--
36-
<excludes>
37-
<exclude>test/**</exclude>
38-
EOM
39-
40-
git apply patch.diff
41-
42-
4321
MAVEN_ARGS="-Djavac.src.version=15 -Djavac.target.version=15 -DskipTests"
4422
$MVN package org.apache.maven.plugins:maven-shade-plugin:3.2.4:shade $MAVEN_ARGS
4523
CURRENT_VERSION=$($MVN org.apache.maven.plugins:maven-help-plugin:3.2.0:evaluate \
@@ -55,7 +33,7 @@ BUILD_CLASSPATH=$(echo $ALL_JARS | xargs printf -- "$OUT/%s:"):$JAZZER_API_PATH
5533
# All .jar and .class files lie in the same directory as the fuzzer at runtime.
5634
RUNTIME_CLASSPATH=$(echo $ALL_JARS | xargs printf -- "\$this_dir/%s:"):\$this_dir
5735

58-
for fuzzer in $(find $SRC -name '*Fuzzer.java'); do
36+
for fuzzer in $(find $SRC -maxdepth 1 -name '*Fuzzer.java'); do
5937
fuzzer_basename=$(basename -s .java $fuzzer)
6038
javac -cp $BUILD_CLASSPATH $fuzzer
6139
cp $SRC/$fuzzer_basename.class $OUT/

projects/xerces/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ BUILD_CLASSPATH=$(echo $ALL_JARS | xargs printf -- "$OUT/%s:"):$JAZZER_API_PATH
4242
# All .jar and .class files lie in the same directory as the fuzzer at runtime.
4343
RUNTIME_CLASSPATH=$(echo $ALL_JARS | xargs printf -- "\$this_dir/%s:"):\$this_dir
4444

45-
for fuzzer in $(find $SRC -name '*Fuzzer.java'); do
45+
for fuzzer in $(find $SRC -maxdepth 1 -name '*Fuzzer.java'); do
4646
fuzzer_basename=$(basename -s .java $fuzzer)
4747
javac -cp $BUILD_CLASSPATH $fuzzer
4848
cp $SRC/$fuzzer_basename.class $OUT/

0 commit comments

Comments
 (0)