Commit 46e1276
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
5 files changed
Lines changed: 27 additions & 41 deletions
File tree
- scripts
- src/main/webapp/img
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -2,4 +2,5 @@ eclipse.preferences.version=1 | |||
| 2 | 2 | indentationChar=space | |
| 3 | 3 | indentationSize=4 | |
| 4 | 4 | lineWidth=999 | |
| 5 | - formatCommentJoinLines=false | ||
| 5 | + formatCommentJoinLines=true | ||
| 6 | + | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -638,22 +638,14 @@ | |||
| 638 | 638 | <!-- Have to include early in the pom like this so this version takes precendence over the old version used by the apacheds libs. --> | |
| 639 | 639 | <dependency> | |
| 640 | 640 | <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> | ||
| 643 | 643 | </dependency> | |
| 644 | 644 | ||
| 645 | 645 | <dependency> | |
| 646 | 646 | <groupId>org.apache.directory.server</groupId> | |
| 647 | 647 | <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) --> | ||
| 657 | 649 | <version>${version.apacheds}</version> | |
| 658 | 650 | <exclusions> | |
| 659 | 651 | <!-- Excluded because its old, and there is a bug in it causing an exception when using it. --> | |
@@ -757,13 +749,13 @@ | |||
| 757 | 749 | <dependency> | |
| 758 | 750 | <groupId>org.apache.httpcomponents</groupId> | |
| 759 | 751 | <artifactId>httpcore</artifactId> | |
| 760 | - <version>4.4.14</version> | ||
| 752 | + <version>4.4.15</version> | ||
| 761 | 753 | </dependency> | |
| 762 | 754 | ||
| 763 | 755 | <dependency> | |
| 764 | 756 | <groupId>org.bouncycastle</groupId> | |
| 765 | 757 | <artifactId>bcprov-jdk15on</artifactId> | |
| 766 | - <version>1.69</version> | ||
| 758 | + <version>1.70</version> | ||
| 767 | 759 | </dependency> | |
| 768 | 760 | ||
| 769 | 761 | <!-- Kevin's fix for jar version conflicts. For future Benchmark 1.3 --> | |
@@ -789,7 +781,7 @@ | |||
| 789 | 781 | <dependency> | |
| 790 | 782 | <groupId>org.jdom</groupId> | |
| 791 | 783 | <artifactId>jdom2</artifactId> | |
| 792 | - <version>2.0.6</version> | ||
| 784 | + <version>2.0.6.1</version> | ||
| 793 | 785 | </dependency> | |
| 794 | 786 | ||
| 795 | 787 | <!-- 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 @@ | |||
| 906 | 898 | <plugin> | |
| 907 | 899 | <groupId>org.apache.maven.plugins</groupId> | |
| 908 | 900 | <artifactId>maven-compiler-plugin</artifactId> | |
| 909 | - <version>3.8.1</version> | ||
| 901 | + <version>3.9.0</version> | ||
| 910 | 902 | <configuration> | |
| 911 | 903 | <fork>true</fork> | |
| 912 | 904 | <meminitial>1000m</meminitial> | |
@@ -917,18 +909,18 @@ | |||
| 917 | 909 | <plugin> | |
| 918 | 910 | <groupId>org.apache.maven.plugins</groupId> | |
| 919 | 911 | <artifactId>maven-deploy-plugin</artifactId> | |
| 920 | - <version>3.0.0-M1</version> | ||
| 912 | + <version>3.0.0-M2</version> | ||
| 921 | 913 | </plugin> | |
| 922 | 914 | ||
| 923 | 915 | <plugin> | |
| 924 | 916 | <groupId>org.apache.maven.plugins</groupId> | |
| 925 | 917 | <artifactId>maven-enforcer-plugin</artifactId> | |
| 926 | - <version>3.0.0-M3</version> | ||
| 918 | + <version>3.0.0</version> | ||
| 927 | 919 | <dependencies> | |
| 928 | 920 | <dependency> | |
| 929 | 921 | <groupId>org.codehaus.mojo</groupId> | |
| 930 | 922 | <artifactId>extra-enforcer-rules</artifactId> | |
| 931 | - <version>1.3</version> | ||
| 923 | + <version>1.5.1</version> | ||
| 932 | 924 | </dependency> | |
| 933 | 925 | </dependencies> | |
| 934 | 926 | <executions> | |
@@ -984,7 +976,7 @@ | |||
| 984 | 976 | <plugin> | |
| 985 | 977 | <groupId>org.apache.maven.plugins</groupId> | |
| 986 | 978 | <artifactId>maven-pmd-plugin</artifactId> | |
| 987 | - <version>3.14.0</version> | ||
| 979 | + <version>3.15.0</version> | ||
| 988 | 980 | <configuration> | |
| 989 | 981 | <linkXref>true</linkXref> | |
| 990 | 982 | <targetJdk>1.7</targetJdk> | |
@@ -1006,7 +998,7 @@ | |||
| 1006 | 998 | <plugin> | |
| 1007 | 999 | <groupId>org.apache.maven.plugins</groupId> | |
| 1008 | 1000 | <artifactId>maven-site-plugin</artifactId> | |
| 1009 | - <version>3.9.1</version> | ||
| 1001 | + <version>3.10.0</version> | ||
| 1010 | 1002 | </plugin> | |
| 1011 | 1003 | ||
| 1012 | 1004 | <plugin> | |
@@ -1027,7 +1019,7 @@ | |||
| 1027 | 1019 | <plugin> | |
| 1028 | 1020 | <groupId>org.codehaus.cargo</groupId> | |
| 1029 | 1021 | <artifactId>cargo-maven3-plugin</artifactId> | |
| 1030 | - <version>1.9.7</version> | ||
| 1022 | + <version>1.9.8</version> | ||
| 1031 | 1023 | </plugin> | |
| 1032 | 1024 | ||
| 1033 | 1025 | <!-- SpotBugs Static Analysis - the successor to FindBugs --> | |
@@ -1065,10 +1057,9 @@ | |||
| 1065 | 1057 | <plugin> | |
| 1066 | 1058 | <groupId>com.diffplug.spotless</groupId> | |
| 1067 | 1059 | <artifactId>spotless-maven-plugin</artifactId> | |
| 1068 | - <version>2.13.0</version> | ||
| 1060 | + <version>2.17.6</version> | ||
| 1069 | 1061 | <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 --> | ||
| 1072 | 1063 | <ratchetFrom>origin/master</ratchetFrom> | |
| 1073 | 1064 | <formats> | |
| 1074 | 1065 | <!-- you can define as many formats as you want, each is independent --> | |
@@ -1112,14 +1103,9 @@ | |||
| 1112 | 1103 | ||
| 1113 | 1104 | <format> | |
| 1114 | 1105 | <includes> | |
| 1115 | - <include>**/*.xml</include> | ||
| 1106 | + <include>src/config/**/*.xml</include> | ||
| 1107 | + <include>pom.xml</include> | ||
| 1116 | 1108 | </includes> | |
| 1117 | - <excludes> | ||
| 1118 | - <exclude>data/**/*.*</exclude> | ||
| 1119 | - <exclude>results/**/*.*</exclude> | ||
| 1120 | - <exclude>scorecard/**/*.*</exclude> | ||
| 1121 | - <exclude>target/**/*.*</exclude> | ||
| 1122 | - </excludes> | ||
| 1123 | 1109 | <eclipseWtp> | |
| 1124 | 1110 | <type>XML</type> | |
| 1125 | 1111 | <files> | |
@@ -1162,12 +1148,12 @@ | |||
| 1162 | 1148 | <plugin> | |
| 1163 | 1149 | <groupId>org.apache.maven.plugins</groupId> | |
| 1164 | 1150 | <artifactId>maven-jxr-plugin</artifactId> | |
| 1165 | - <version>2.3</version> | ||
| 1151 | + <version>3.1.1</version> | ||
| 1166 | 1152 | </plugin> | |
| 1167 | 1153 | <plugin> | |
| 1168 | 1154 | <groupId>org.codehaus.mojo</groupId> | |
| 1169 | 1155 | <artifactId>versions-maven-plugin</artifactId> | |
| 1170 | - <version>2.5</version> | ||
| 1156 | + <version>2.8.1</version> | ||
| 1171 | 1157 | <reportSets> | |
| 1172 | 1158 | <reportSet> | |
| 1173 | 1159 | <reports> | |
@@ -1200,8 +1186,7 @@ | |||
| 1200 | 1186 | <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> | |
| 1201 | 1187 | <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> | |
| 1202 | 1188 | <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 --> | ||
| 1205 | 1190 | <runenv>local</runenv> | |
| 1206 | 1191 | <tomcat.jvmargs> | |
| 1207 | 1192 | -Xms1G | |
@@ -1219,8 +1204,8 @@ | |||
| 1219 | 1204 | <version.apache-shared-ldap>0.9.19</version.apache-shared-ldap> | |
| 1220 | 1205 | <version.exec.maven>1.6.0</version.exec.maven> | |
| 1221 | 1206 | <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> | ||
| 1224 | 1209 | <version.springframework>4.3.30.RELEASE</version.springframework> | |
| 1225 | 1210 | <!-- tomcat 8.5 is last version to support Java 7. Tomcat 9+ requires Java 8. --> | |
| 1226 | 1211 | <tomcat.major.version>8</tomcat.major.version> | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -8,6 +8,6 @@ requireCommand docker | |||
| 8 | 8 | ||
| 9 | 9 | benchmark_version=$(scripts/getBenchmarkVersion.sh) | |
| 10 | 10 | 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" | ||
| 12 | 12 | ||
| 13 | 13 | docker run --rm -v "${PWD}:/src" returntocorp/semgrep --config p/security-audit -q --json -o "$result_file" . > /dev/null | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -7,8 +7,8 @@ source scripts/requireCommand.sh | |||
| 7 | 7 | requireCommand docker | |
| 8 | 8 | ||
| 9 | 9 | 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" | ||
| 12 | 12 | ||
| 13 | 13 | mkdir -p .shiftleftscan-reports | |
| 14 | 14 | ||
LoadingViewer requires iframe.
0 commit comments