Skip to content

Commit 46e1276

Browse files
davewichersdavewichers
committed
Upgrade a bunch of dependencies. Change xml autoformat to join comment lines. Minor tweaks to two run scripts for tools.
1 parent 72258cb commit 46e1276

File tree

5 files changed

+27
-41
lines changed

5 files changed

+27
-41
lines changed

‎DevStyleXml.prefs

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,5 @@ eclipse.preferences.version=1
22
indentationChar=space
33
indentationSize=4
44
lineWidth=999
5-
formatCommentJoinLines=false
5+
formatCommentJoinLines=true
6+

‎pom.xml

+22-37
Original file line numberDiff line numberDiff line change
@@ -638,22 +638,14 @@
638638
<!-- Have to include early in the pom like this so this version takes precendence over the old version used by the apacheds libs. -->
639639
<dependency>
640640
<groupId>org.slf4j</groupId>
641-
<artifactId>slf4j-log4j12</artifactId>
642-
<version>1.7.32</version>
641+
<artifactId>slf4j-reload4j</artifactId>
642+
<version>1.7.36</version>
643643
</dependency>
644644

645645
<dependency>
646646
<groupId>org.apache.directory.server</groupId>
647647
<artifactId>apacheds-core</artifactId>
648-
<!-- Upgrading to 2.0.0-M24 is an API breaking change. But it might be needed for Java
649-
10, because I get this error, that I don't get with Java 8:
650-
[java] at org.apache.directory.server.core.DefaultDirectoryService.initialize(DefaultDirectoryService.java:1426)
651-
[java] at org.apache.directory.server.core.DefaultDirectoryService.startup(DefaultDirectoryService.java:907)
652-
[java] at org.owasp.benchmark.helpers.LDAPServer.initDirectoryService(LDAPServer.java:148)
653-
[java] at org.owasp.benchmark.helpers.LDAPServer.<init>(LDAPServer.java:42)
654-
[java] at org.owasp.benchmark.helpers.LDAPServer.main(LDAPServer.java:320)
655-
[java] Caused by: java.lang.NumberFormatException: multiple points
656-
[java] at java.base/jdk.internal.math.FloatingDecimal.readJavaFormatString(FloatingDecimal.java:1914) -->
648+
<!-- Upgrading to 2.0.0-M24 is an API breaking change. But it might be needed for Java 10, because I get this error, that I don't get with Java 8: [java] at org.apache.directory.server.core.DefaultDirectoryService.initialize(DefaultDirectoryService.java:1426) [java] at org.apache.directory.server.core.DefaultDirectoryService.startup(DefaultDirectoryService.java:907) [java] at org.owasp.benchmark.helpers.LDAPServer.initDirectoryService(LDAPServer.java:148) [java] at org.owasp.benchmark.helpers.LDAPServer.<init>(LDAPServer.java:42) [java] at org.owasp.benchmark.helpers.LDAPServer.main(LDAPServer.java:320) [java] Caused by: java.lang.NumberFormatException: multiple points [java] at java.base/jdk.internal.math.FloatingDecimal.readJavaFormatString(FloatingDecimal.java:1914) -->
657649
<version>${version.apacheds}</version>
658650
<exclusions>
659651
<!-- Excluded because its old, and there is a bug in it causing an exception when using it. -->
@@ -757,13 +749,13 @@
757749
<dependency>
758750
<groupId>org.apache.httpcomponents</groupId>
759751
<artifactId>httpcore</artifactId>
760-
<version>4.4.14</version>
752+
<version>4.4.15</version>
761753
</dependency>
762754

763755
<dependency>
764756
<groupId>org.bouncycastle</groupId>
765757
<artifactId>bcprov-jdk15on</artifactId>
766-
<version>1.69</version>
758+
<version>1.70</version>
767759
</dependency>
768760

769761
<!-- Kevin's fix for jar version conflicts. For future Benchmark 1.3 -->
@@ -789,7 +781,7 @@
789781
<dependency>
790782
<groupId>org.jdom</groupId>
791783
<artifactId>jdom2</artifactId>
792-
<version>2.0.6</version>
784+
<version>2.0.6.1</version>
793785
</dependency>
794786

795787
<!-- mvn dependency:analyze says this is an unused declared dependency, but its wrong. Get a runtime error if it's not included -->
@@ -906,7 +898,7 @@
906898
<plugin>
907899
<groupId>org.apache.maven.plugins</groupId>
908900
<artifactId>maven-compiler-plugin</artifactId>
909-
<version>3.8.1</version>
901+
<version>3.9.0</version>
910902
<configuration>
911903
<fork>true</fork>
912904
<meminitial>1000m</meminitial>
@@ -917,18 +909,18 @@
917909
<plugin>
918910
<groupId>org.apache.maven.plugins</groupId>
919911
<artifactId>maven-deploy-plugin</artifactId>
920-
<version>3.0.0-M1</version>
912+
<version>3.0.0-M2</version>
921913
</plugin>
922914

923915
<plugin>
924916
<groupId>org.apache.maven.plugins</groupId>
925917
<artifactId>maven-enforcer-plugin</artifactId>
926-
<version>3.0.0-M3</version>
918+
<version>3.0.0</version>
927919
<dependencies>
928920
<dependency>
929921
<groupId>org.codehaus.mojo</groupId>
930922
<artifactId>extra-enforcer-rules</artifactId>
931-
<version>1.3</version>
923+
<version>1.5.1</version>
932924
</dependency>
933925
</dependencies>
934926
<executions>
@@ -984,7 +976,7 @@
984976
<plugin>
985977
<groupId>org.apache.maven.plugins</groupId>
986978
<artifactId>maven-pmd-plugin</artifactId>
987-
<version>3.14.0</version>
979+
<version>3.15.0</version>
988980
<configuration>
989981
<linkXref>true</linkXref>
990982
<targetJdk>1.7</targetJdk>
@@ -1006,7 +998,7 @@
1006998
<plugin>
1007999
<groupId>org.apache.maven.plugins</groupId>
10081000
<artifactId>maven-site-plugin</artifactId>
1009-
<version>3.9.1</version>
1001+
<version>3.10.0</version>
10101002
</plugin>
10111003

10121004
<plugin>
@@ -1027,7 +1019,7 @@
10271019
<plugin>
10281020
<groupId>org.codehaus.cargo</groupId>
10291021
<artifactId>cargo-maven3-plugin</artifactId>
1030-
<version>1.9.7</version>
1022+
<version>1.9.8</version>
10311023
</plugin>
10321024

10331025
<!-- SpotBugs Static Analysis - the successor to FindBugs -->
@@ -1065,10 +1057,9 @@
10651057
<plugin>
10661058
<groupId>com.diffplug.spotless</groupId>
10671059
<artifactId>spotless-maven-plugin</artifactId>
1068-
<version>2.13.0</version>
1060+
<version>2.17.6</version>
10691061
<configuration>
1070-
<!-- optional: limit format enforcement to just the files changed by this
1071-
feature branch -->
1062+
<!-- optional: limit format enforcement to just the files changed by this feature branch -->
10721063
<ratchetFrom>origin/master</ratchetFrom>
10731064
<formats>
10741065
<!-- you can define as many formats as you want, each is independent -->
@@ -1112,14 +1103,9 @@
11121103

11131104
<format>
11141105
<includes>
1115-
<include>**/*.xml</include>
1106+
<include>src/config/**/*.xml</include>
1107+
<include>pom.xml</include>
11161108
</includes>
1117-
<excludes>
1118-
<exclude>data/**/*.*</exclude>
1119-
<exclude>results/**/*.*</exclude>
1120-
<exclude>scorecard/**/*.*</exclude>
1121-
<exclude>target/**/*.*</exclude>
1122-
</excludes>
11231109
<eclipseWtp>
11241110
<type>XML</type>
11251111
<files>
@@ -1162,12 +1148,12 @@
11621148
<plugin>
11631149
<groupId>org.apache.maven.plugins</groupId>
11641150
<artifactId>maven-jxr-plugin</artifactId>
1165-
<version>2.3</version>
1151+
<version>3.1.1</version>
11661152
</plugin>
11671153
<plugin>
11681154
<groupId>org.codehaus.mojo</groupId>
11691155
<artifactId>versions-maven-plugin</artifactId>
1170-
<version>2.5</version>
1156+
<version>2.8.1</version>
11711157
<reportSets>
11721158
<reportSet>
11731159
<reports>
@@ -1200,8 +1186,7 @@
12001186
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
12011187
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
12021188
<maven.war.webxml>${basedir}/src/config/web.xml</maven.war.webxml>
1203-
<!-- runenv defaults to local here. But scripts can set this to 'remote' to launch remotely
1204-
accessible Benchmark. e.g., mvn clean package cargo:run -Pdeploy1.2 -Drunenv=remote -->
1189+
<!-- runenv defaults to local here. But scripts can set this to 'remote' to launch remotely accessible Benchmark. e.g., mvn clean package cargo:run -Pdeploy1.2 -Drunenv=remote -->
12051190
<runenv>local</runenv>
12061191
<tomcat.jvmargs>
12071192
-Xms1G
@@ -1219,8 +1204,8 @@
12191204
<version.apache-shared-ldap>0.9.19</version.apache-shared-ldap>
12201205
<version.exec.maven>1.6.0</version.exec.maven>
12211206
<version.hibernate>3.6.10.Final</version.hibernate>
1222-
<version.spotbugs.maven>4.3.0</version.spotbugs.maven>
1223-
<version.spotbugs>4.4.1</version.spotbugs>
1207+
<version.spotbugs.maven>4.5.3.0</version.spotbugs.maven>
1208+
<version.spotbugs>4.6.0</version.spotbugs>
12241209
<version.springframework>4.3.30.RELEASE</version.springframework>
12251210
<!-- tomcat 8.5 is last version to support Java 7. Tomcat 9+ requires Java 8. -->
12261211
<tomcat.major.version>8</tomcat.major.version>

‎scripts/runSemgrep.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ requireCommand docker
88

99
benchmark_version=$(scripts/getBenchmarkVersion.sh)
1010
semgrep_version=$(docker run --rm returntocorp/semgrep --version)
11-
result_file="/src/results/Benchmark_$benchmark_version-semgrep-v$semgrep_version.json"
11+
result_file="/src/results/Benchmark_$benchmark_version-Semgrep-v$semgrep_version.json"
1212

1313
docker run --rm -v "${PWD}:/src" returntocorp/semgrep --config p/security-audit -q --json -o "$result_file" . > /dev/null

‎scripts/runShiftLeftScan.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ source scripts/requireCommand.sh
77
requireCommand docker
88

99
benchmark_version=$(scripts/getBenchmarkVersion.sh)
10-
shiflteft_version="2.0.3" # it's not (yet) possible to get the release version so we just assume it
11-
result_file="results/Benchmark_$benchmark_version-shiftleftscan-v$shiflteft_version.json"
10+
shiflteft_version="2.0.4" # it's not (yet) possible to get the release version so we just assume it
11+
result_file="results/Benchmark_$benchmark_version-ShiftLeftScan-v$shiflteft_version.json"
1212

1313
mkdir -p .shiftleftscan-reports
1414

‎src/main/webapp/img/500px-Banner_stand.png

-94.1 KB
Loading

0 commit comments

Comments
 (0)