Rooba
/
oss-fuzz
mirror of https://github.com/google/oss-fuzz.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

spring-cloud-commons: Handle IllegalArgumentException & remove shade plugin from pom file (#8352) 

Handle IllegalArgumentException, remove shade plugin from pom file
This commit is contained in:
Patrice.S 2022-08-30 22:14:00 +02:00 committed by GitHub
parent 8d2c42e395
commit aa9ff740ea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
projects/spring-cloud-commons/EncryptionIntegrationFuzzer.java
View File

@ -23,7 +23,7 @@ public class EncryptionIntegrationFuzzer {
TextEncryptor encryptor; TextEncryptor encryptor;
try { try {
encryptor = new EncryptorFactory(salt).create(keyStr); encryptor = new EncryptorFactory(salt).create(keyStr);
} catch (KeyFormatException e) { } catch (KeyFormatException | IllegalArgumentException e) {
return; return;
} }

21
projects/spring-cloud-commons/build.sh
View File

@ -26,26 +26,6 @@ diff --git a/pom.xml b/pom.xml
index 831f5a1..855a43e 100644 index 831f5a1..855a43e 100644
--- a/pom.xml --- a/pom.xml
+++ b/pom.xml +++ b/pom.xml
@@ -32,6 +32,19 @@
</properties>
<build>
<plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <version>3.3.0</version>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>flatten-maven-plugin</artifactId>
@@ -61,10 +74,6 @@ @@ -61,10 +74,6 @@
<groupId>io.spring.javaformat</groupId> <groupId>io.spring.javaformat</groupId>
<artifactId>spring-javaformat-maven-plugin</artifactId> <artifactId>spring-javaformat-maven-plugin</artifactId>
@ -78,6 +58,7 @@ CURRENT_VERSION=$($MVN org.apache.maven.plugins:maven-help-plugin:3.2.0:evaluate
-Dexpression=project.version -q -DforceStdout) -Dexpression=project.version -q -DforceStdout)
$MVN clean package $MAVEN_ARGS $MVN clean package $MAVEN_ARGS
$MVN package org.apache.maven.plugins:maven-shade-plugin:3.2.4:shade $MAVEN_ARGS
cp "spring-cloud-commons/target/spring-cloud-commons-$CURRENT_VERSION.jar" "$OUT/spring-cloud-commons.jar" cp "spring-cloud-commons/target/spring-cloud-commons-$CURRENT_VERSION.jar" "$OUT/spring-cloud-commons.jar"
cp "spring-cloud-context/target/spring-cloud-context-$CURRENT_VERSION.jar" "$OUT/spring-cloud-context.jar" cp "spring-cloud-context/target/spring-cloud-context-$CURRENT_VERSION.jar" "$OUT/spring-cloud-context.jar"
cp "spring-cloud-starter-bootstrap/target/spring-cloud-starter-bootstrap-$CURRENT_VERSION.jar" "$OUT/spring-cloud-starter-bootstrap.jar" cp "spring-cloud-starter-bootstrap/target/spring-cloud-starter-bootstrap-$CURRENT_VERSION.jar" "$OUT/spring-cloud-starter-bootstrap.jar"