Skip to content

Commit 48dce3c

Browse files
davewichersdavewichers
committed
Upgrade a few plugin dependencies, and minor improvements to 2 scripts for running tools on Benchmark.
1 parent 3f11b4a commit 48dce3c

File tree

4 files changed

+48
-15
lines changed

4 files changed

+48
-15
lines changed

‎pom.xml

Lines changed: 20 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -782,14 +782,14 @@
782782
<dependency>
783783
<groupId>org.hsqldb</groupId>
784784
<artifactId>hsqldb</artifactId>
785-
<!-- <version>2.5.1</version> This is latest version, but requires Java 8. 2.3.6 is last version to support Java 7. -->
785+
<!-- <version>2.7.1</version> This is latest version, but requires Java 8. 2.3.6 is last version to support Java 7. -->
786786
<version>2.3.6</version>
787787
</dependency>
788788

789789
<dependency>
790790
<groupId>org.owasp.esapi</groupId>
791791
<artifactId>esapi</artifactId>
792-
<version>2.2.3.1</version>
792+
<version>2.3.0.0</version>
793793
</dependency>
794794

795795
<dependency>
@@ -853,12 +853,12 @@
853853
<plugin>
854854
<groupId>org.apache.maven.plugins</groupId>
855855
<artifactId>maven-antrun-plugin</artifactId>
856-
<version>3.0.0</version>
856+
<version>3.1.0</version>
857857
</plugin>
858858
<plugin>
859859
<groupId>org.apache.maven.plugins</groupId>
860860
<artifactId>maven-assembly-plugin</artifactId>
861-
<version>3.3.0</version>
861+
<version>3.4.2</version>
862862
</plugin>
863863
<plugin>
864864
<groupId>org.apache.maven.plugins</groupId>
@@ -908,7 +908,7 @@
908908
<plugin>
909909
<groupId>org.apache.maven.plugins</groupId>
910910
<artifactId>maven-deploy-plugin</artifactId>
911-
<version>3.0.0-M2</version>
911+
<version>3.0.0</version>
912912
</plugin>
913913

914914
<plugin>
@@ -969,13 +969,13 @@
969969
<plugin>
970970
<groupId>org.apache.maven.plugins</groupId>
971971
<artifactId>maven-install-plugin</artifactId>
972-
<version>3.0.0-M1</version>
972+
<version>3.0.1</version>
973973
</plugin>
974974

975975
<plugin>
976976
<groupId>org.apache.maven.plugins</groupId>
977977
<artifactId>maven-jxr-plugin</artifactId>
978-
<version>3.2.0</version>
978+
<version>3.3.0</version>
979979
</plugin>
980980

981981
<plugin>
@@ -991,19 +991,26 @@
991991
<plugin>
992992
<groupId>org.apache.maven.plugins</groupId>
993993
<artifactId>maven-project-info-reports-plugin</artifactId>
994-
<version>3.3.0</version>
994+
<version>3.4.1</version>
995995
</plugin>
996996

997997
<plugin>
998998
<groupId>org.apache.maven.plugins</groupId>
999999
<artifactId>maven-resources-plugin</artifactId>
1000-
<version>3.2.0</version>
1000+
<version>3.3.0</version>
10011001
</plugin>
10021002

10031003
<plugin>
1004+
<!-- Note: This uses the maven-fluido-skin version specified next. The skin is referenced in src/site/site.xml. -->
10041005
<groupId>org.apache.maven.plugins</groupId>
10051006
<artifactId>maven-site-plugin</artifactId>
1006-
<version>4.0.0-M1</version>
1007+
<version>4.0.0-M3</version>
1008+
</plugin>
1009+
1010+
<plugin>
1011+
<groupId>org.apache.maven.skins</groupId>
1012+
<artifactId>maven-fluido-skin</artifactId>
1013+
<version>1.11.1</version>
10071014
</plugin>
10081015

10091016
<plugin>
@@ -1075,7 +1082,7 @@
10751082
<plugin>
10761083
<groupId>com.diffplug.spotless</groupId>
10771084
<artifactId>spotless-maven-plugin</artifactId>
1078-
<version>2.22.8</version>
1085+
<version>2.24.1</version>
10791086
<configuration>
10801087
<!-- optional: limit format enforcement to just the files changed by this feature branch -->
10811088
<ratchetFrom>origin/master</ratchetFrom>
@@ -1219,8 +1226,8 @@
12191226
<version.apache-shared-ldap>0.9.19</version.apache-shared-ldap>
12201227
<version.exec.maven>1.6.0</version.exec.maven>
12211228
<version.hibernate>3.6.10.Final</version.hibernate>
1222-
<version.spotbugs.maven>4.7.0.0</version.spotbugs.maven>
1223-
<version.spotbugs>4.7.0</version.spotbugs>
1229+
<version.spotbugs.maven>4.7.1.1</version.spotbugs.maven>
1230+
<version.spotbugs>4.7.2</version.spotbugs>
12241231
<version.springframework>4.3.30.RELEASE</version.springframework>
12251232
<!-- tomcat 8.5 is last version to support Java 7. Tomcat 9+ requires Java 8. -->
12261233
<tomcat.major.version>8</tomcat.major.version>

‎scripts/mvnFortifyScan.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
sourceanalyzer -b benchmark -Xmx10G -scan -f benchmark.fpr
1+
sourceanalyzer -b benchmark -Xmx10G -scan -f results/Benchmark_1.2_Fortify.fpr
22

‎scripts/runHorusec.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ docker pull horuszup/horusec-cli
1111
benchmark_version=$(scripts/getBenchmarkVersion.sh)
1212
horusec_version=$(docker run --rm horuszup/horusec-cli horusec version 2>&1 | grep Version | awk '{print $NF}')
1313

14-
result_file="/src/results/Benchmark_$benchmark_version-horusec-$horusec_version.json"
14+
result_file="./results/Benchmark_$benchmark_version-horusec-$horusec_version.json"
1515
docker run --rm \
1616
-v /var/run/docker.sock:/var/run/docker.sock \
1717
-v "$(pwd)":/src horuszup/horusec-cli \

‎src/site/site.xml

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project name="${project.name}" xmlns="https://maven.apache.org/DECORATION/1.8.0"
3+
xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="https://maven.apache.org/DECORATION/1.8.0 https://maven.apache.org/xsd/decoration-1.8.0.xsd">
5+
<bannerLeft>
6+
<src>/images/owasp.png</src>
7+
<href>https://owasp.org/www-project-benchmark/</href>
8+
</bannerLeft>
9+
<skin>
10+
<groupId>org.apache.maven.skins</groupId>
11+
<artifactId>maven-fluido-skin</artifactId>
12+
</skin>
13+
<custom>
14+
<fluidoSkin>
15+
<topBarEnabled>false</topBarEnabled>
16+
<sideBarEnabled>true</sideBarEnabled>
17+
</fluidoSkin>
18+
</custom>
19+
<body>
20+
<links>
21+
<item name="OWASP Benchmark" href="https://owasp.org/www-project-benchmark/" />
22+
</links>
23+
<menu ref="reports" />
24+
</body>
25+
</project>
26+

0 commit comments

Comments
 (0)