Skip to content

Commit 4e7a73c

Browse files
authored
Merge pull request #11 from fgibelin/sync-upstream-master-20261001
Sync master with upstream OWASP-Benchmark/BenchmarkJava
2 parents f7ea522 + f44e4ae commit 4e7a73c

2 files changed

Lines changed: 12 additions & 12 deletions

File tree

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434

3535
# Initializes the CodeQL tools for scanning.
3636
- name: Initialize CodeQL
37-
uses: github/codeql-action/init@v4.37.9
37+
uses: github/codeql-action/init@v4.38.2
3838
with:
3939
languages: ${{ matrix.language }}
4040
queries: security-extended, security-experimental, security-and-quality
@@ -43,7 +43,7 @@ jobs:
4343
run: mvn -DskipTests=true install
4444

4545
- name: Perform CodeQL Analysis
46-
uses: github/codeql-action/analyze@v4.37.9
46+
uses: github/codeql-action/analyze@v4.38.2
4747

4848
- name: Upload Output
4949
uses: actions/upload-artifact@v7

‎pom.xml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -663,7 +663,7 @@
663663
<dependency>
664664
<groupId>org.slf4j</groupId>
665665
<artifactId>slf4j-reload4j</artifactId>
666-
<version>2.0.19</version>
666+
<version>2.0.20</version>
667667
</dependency>
668668

669669
<!-- NOTE: Do NOT upgrade this library until the Apache team fixes issue: https://issues.apache.org/jira/browse/DIRAPI-433 -->
@@ -784,7 +784,7 @@
784784
<dependency>
785785
<groupId>org.apache.httpcomponents.core5</groupId>
786786
<artifactId>httpcore5</artifactId>
787-
<version>5.4.3</version>
787+
<version>5.4.4</version>
788788
</dependency>
789789

790790
<dependency>
@@ -867,7 +867,7 @@
867867
<dependency>
868868
<groupId>com.fasterxml.jackson.core</groupId>
869869
<artifactId>jackson-databind</artifactId>
870-
<version>2.22.2</version>
870+
<version>2.22.3</version>
871871
</dependency>
872872
</dependencies>
873873

@@ -949,7 +949,7 @@
949949
<plugin>
950950
<groupId>org.apache.maven.plugins</groupId>
951951
<artifactId>maven-deploy-plugin</artifactId>
952-
<version>3.1.4</version>
952+
<version>3.2.0</version>
953953
</plugin>
954954

955955
<plugin>
@@ -960,7 +960,7 @@
960960
<dependency>
961961
<groupId>org.codehaus.mojo</groupId>
962962
<artifactId>extra-enforcer-rules</artifactId>
963-
<version>1.12.0</version>
963+
<version>1.12.1</version>
964964
</dependency>
965965
</dependencies>
966966
<executions>
@@ -1006,7 +1006,7 @@
10061006
<plugin>
10071007
<groupId>org.apache.maven.plugins</groupId>
10081008
<artifactId>maven-install-plugin</artifactId>
1009-
<version>3.1.4</version>
1009+
<version>3.2.0</version>
10101010
</plugin>
10111011

10121012
<plugin>
@@ -1066,13 +1066,13 @@
10661066
<plugin>
10671067
<groupId>org.codehaus.cargo</groupId>
10681068
<artifactId>cargo-maven3-plugin</artifactId>
1069-
<version>1.10.28</version>
1069+
<version>1.10.29</version>
10701070
</plugin>
10711071

10721072
<plugin>
10731073
<groupId>org.codehaus.mojo</groupId>
10741074
<artifactId>versions-maven-plugin</artifactId>
1075-
<version>2.21.0</version>
1075+
<version>2.22.0</version>
10761076
</plugin>
10771077

10781078
<!-- SpotBugs Static Analysis - the successor to FindBugs -->
@@ -1256,7 +1256,7 @@
12561256
</tomcat.jvmargs.debug>
12571257
<log.directory>${project.build.directory}/log</log.directory>
12581258

1259-
<version.apache.api-ldap>2.1.8</version.apache.api-ldap>
1259+
<version.apache.api-ldap>2.1.9</version.apache.api-ldap>
12601260
<version.apacheds>2.0.0.AM27</version.apacheds>
12611261
<version.fluido>2.1.0</version.fluido>
12621262
<!-- hibernate is up to rev 6+. But 4.0.0. causes this error: symbol: org.hibernate.classic.Session not found -->
@@ -1267,7 +1267,7 @@
12671267
<version.springframework>5.3.39</version.springframework>
12681268
<!-- Tomcat 10 moves from Java EE to Jakarta EE, moving packages javax.* to jakarta.* - code changes likely required to address this change. -->
12691269
<tomcat.major.version>9</tomcat.major.version>
1270-
<version.tomcat>9.0.120</version.tomcat>
1270+
<version.tomcat>9.0.122</version.tomcat>
12711271
<tomcat.url>https://downloads.apache.org/tomcat/tomcat-${tomcat.major.version}/v${version.tomcat}/bin/apache-tomcat-${version.tomcat}.zip</tomcat.url>
12721272
</properties>
12731273

0 commit comments

Comments
 (0)