Skip to content

Commit

Permalink
Merge pull request #6272 from OpenNMS/jira/NMS-15663-spring-security-…
Browse files Browse the repository at this point in the history
…backport

NMS-15663: update to spring security with backported fixes
  • Loading branch information
Benjamin Reed authored Jun 27, 2023
2 parents 12b0e82 + 91d1839 commit 4604a7a
Show file tree
Hide file tree
Showing 94 changed files with 324 additions and 97 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1238,7 +1238,7 @@ jobs:
- attach_workspace:
at: ~/
- run-integration-tests:
rerun-failtest-count: 1
rerun-failtest-count: 0
integration-test-with-coverage:
executor: integration-test-executor
parallelism: 10
Expand Down
3 changes: 2 additions & 1 deletion container/features/src/license/THIRD-PARTY.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,12 @@ colt--colt--1.2.0=mit
com.eclipsesource.jaxrs--features--1.0.2.ONMS=epl_v1
findbugs--annotations--1.0.0=lgpl_v2_1
javax.transaction--jta--1.1=cddl_v1_1
org.codehaus.jettison--jettison--1.1=apache_v2
org.jinterop--j-interop--2.0.8=lgpl_v3
org.jinterop--j-interopdeps--2.0.8=lgpl_v3
org.opennms--jicmp-api--2.0.1=gpl_v2_cpe
org.opennms--jicmp6-api--2.0.1=gpl_v2_cpe
org.samba.jcifs--jcifs--1.3.19=lgpl_v2_1
org.simpleframework--org.simpleframework--3.1.3=lgpl_v2_1
org.springframework.security--spring-security-core--4.2.21.RELEASE_1.ONMS.1=apache_v2
org.springframework.security--spring-security-remoting--4.2.21.RELEASE_1.ONMS.1=apache_v2
org.vaadin.addons--dragdroplayouts--1.4.2=apache_v2
Original file line number Diff line number Diff line change
@@ -1 +1,8 @@
javax.transaction--jta--1.1=cddl_v1_1
org.springframework.security--spring-security-acl--4.2.21.RELEASE_1.ONMS.1=apache_v2
org.springframework.security--spring-security-config--4.2.21.RELEASE_1.ONMS.1=apache_v2
org.springframework.security--spring-security-core--4.2.21.RELEASE_1.ONMS.1=apache_v2
org.springframework.security--spring-security-ldap--4.2.21.RELEASE_1.ONMS.1=apache_v2
org.springframework.security--spring-security-remoting--4.2.21.RELEASE_1.ONMS.1=apache_v2
org.springframework.security--spring-security-taglibs--4.2.21.RELEASE_1.ONMS.1=apache_v2
org.springframework.security--spring-security-web--4.2.21.RELEASE_1.ONMS.1=apache_v2
2 changes: 2 additions & 0 deletions container/karaf/src/license/THIRD-PARTY.properties
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
javax.transaction--jta--1.1=cddl_v1_1
org.springframework.security--spring-security-core--4.2.21.RELEASE_1.ONMS.1=apache_v2
org.springframework.security--spring-security-remoting--4.2.21.RELEASE_1.ONMS.1=apache_v2
2 changes: 2 additions & 0 deletions container/shared/src/license/THIRD-PARTY.properties
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
javax.transaction--jta--1.1=cddl_v1_1
org.springframework.security--spring-security-core--4.2.21.RELEASE_1.ONMS.1=apache_v2
org.springframework.security--spring-security-remoting--4.2.21.RELEASE_1.ONMS.1=apache_v2
2 changes: 2 additions & 0 deletions core/health/rest/src/license/THIRD-PARTY.properties
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
javax.transaction--jta--1.1=cddl_v1_1
org.springframework.security--spring-security-core--4.2.21.RELEASE_1.ONMS.1=apache_v2
org.springframework.security--spring-security-remoting--4.2.21.RELEASE_1.ONMS.1=apache_v2
2 changes: 2 additions & 0 deletions core/ipc/twin/common/src/license/THIRD-PARTY.properties
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
javax.transaction--jta--1.1=cddl_v1_1
org.springframework.security--spring-security-core--4.2.21.RELEASE_1.ONMS.1=apache_v2
org.springframework.security--spring-security-remoting--4.2.21.RELEASE_1.ONMS.1=apache_v2
2 changes: 2 additions & 0 deletions core/ipc/twin/grpc/common/src/license/THIRD-PARTY.properties
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
javax.transaction--jta--1.1=cddl_v1_1
org.springframework.security--spring-security-core--4.2.21.RELEASE_1.ONMS.1=apache_v2
org.springframework.security--spring-security-remoting--4.2.21.RELEASE_1.ONMS.1=apache_v2
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
javax.transaction--jta--1.1=cddl_v1_1
org.springframework.security--spring-security-core--4.2.21.RELEASE_1.ONMS.1=apache_v2
org.springframework.security--spring-security-remoting--4.2.21.RELEASE_1.ONMS.1=apache_v2
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
javax.transaction--jta--1.1=cddl_v1_1
org.springframework.security--spring-security-core--4.2.21.RELEASE_1.ONMS.1=apache_v2
org.springframework.security--spring-security-remoting--4.2.21.RELEASE_1.ONMS.1=apache_v2
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
javax.transaction--jta--1.1=cddl_v1_1
org.springframework.security--spring-security-core--4.2.21.RELEASE_1.ONMS.1=apache_v2
org.springframework.security--spring-security-remoting--4.2.21.RELEASE_1.ONMS.1=apache_v2
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
javax.transaction--jta--1.1=cddl_v1_1
org.springframework.security--spring-security-core--4.2.21.RELEASE_1.ONMS.1=apache_v2
org.springframework.security--spring-security-remoting--4.2.21.RELEASE_1.ONMS.1=apache_v2
2 changes: 2 additions & 0 deletions core/ipc/twin/kafka/common/src/license/THIRD-PARTY.properties
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
javax.transaction--jta--1.1=cddl_v1_1
org.springframework.security--spring-security-core--4.2.21.RELEASE_1.ONMS.1=apache_v2
org.springframework.security--spring-security-remoting--4.2.21.RELEASE_1.ONMS.1=apache_v2
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
javax.transaction--jta--1.1=cddl_v1_1
org.springframework.security--spring-security-core--4.2.21.RELEASE_1.ONMS.1=apache_v2
org.springframework.security--spring-security-remoting--4.2.21.RELEASE_1.ONMS.1=apache_v2
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
javax.transaction--jta--1.1=cddl_v1_1
org.springframework.security--spring-security-core--4.2.21.RELEASE_1.ONMS.1=apache_v2
org.springframework.security--spring-security-remoting--4.2.21.RELEASE_1.ONMS.1=apache_v2
2 changes: 2 additions & 0 deletions core/ipc/twin/test/src/license/THIRD-PARTY.properties
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
javax.transaction--jta--1.1=cddl_v1_1
org.springframework.security--spring-security-core--4.2.21.RELEASE_1.ONMS.1=apache_v2
org.springframework.security--spring-security-remoting--4.2.21.RELEASE_1.ONMS.1=apache_v2
2 changes: 2 additions & 0 deletions core/upgrade/src/license/THIRD-PARTY.properties
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
javax.transaction--jta--1.1=cddl_v1_1
org.springframework.security--spring-security-core--4.2.21.RELEASE_1.ONMS.1=apache_v2
org.springframework.security--spring-security-remoting--4.2.21.RELEASE_1.ONMS.1=apache_v2
100 changes: 12 additions & 88 deletions dependencies/spring-security-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,56 +26,24 @@
<version>${springSecurityVersion}</version>
<exclusions>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-aop</artifactId>
</exclusion>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
</exclusion>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
</exclusion>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
</exclusion>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-dao</artifactId>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>*</artifactId>
</exclusion>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-expression</artifactId>
<groupId>commons-logging</groupId>
<artifactId>*</artifactId>
</exclusion>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-jdbc</artifactId>
<groupId>net.sf.ehcache</groupId>
<artifactId>*</artifactId>
</exclusion>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-mock</artifactId>
<groupId>org.aspectj</groupId>
<artifactId>*</artifactId>
</exclusion>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-remoting</artifactId>
</exclusion>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-support</artifactId>
</exclusion>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-tx</artifactId>
</exclusion>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
</exclusion>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
Expand All @@ -85,56 +53,12 @@
<version>${springSecurityVersion}</version>
<exclusions>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-aop</artifactId>
</exclusion>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
</exclusion>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
</exclusion>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
</exclusion>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-dao</artifactId>
</exclusion>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-expression</artifactId>
</exclusion>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-jdbc</artifactId>
</exclusion>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-mock</artifactId>
</exclusion>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-remoting</artifactId>
</exclusion>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-support</artifactId>
</exclusion>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-tx</artifactId>
</exclusion>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
javax.transaction--jta--1.1=cddl_v1_1
org.springframework.security--spring-security-core--4.2.21.RELEASE_1.ONMS.1=apache_v2
org.springframework.security--spring-security-remoting--4.2.21.RELEASE_1.ONMS.1=apache_v2
71 changes: 70 additions & 1 deletion dependencies/spring-security/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,38 @@
<artifactId>spring-security-ldap</artifactId>
<version>${springSecurityVersion}</version>
<exclusions>
<exclusion>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>*</artifactId>
</exclusion>
<exclusion>
<groupId>com.unboundid</groupId>
<artifactId>*</artifactId>
</exclusion>
<exclusion>
<groupId>commons-logging</groupId>
<artifactId>*</artifactId>
</exclusion>
<exclusion>
<groupId>ldapsdk</groupId>
<artifactId>*</artifactId>
</exclusion>
<exclusion>
<groupId>net.sf.ehcache</groupId>
<artifactId>*</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.directory.server</groupId>
<artifactId>*</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.directory.shared</groupId>
<artifactId>*</artifactId>
</exclusion>
<exclusion>
<groupId>org.aspectj</groupId>
<artifactId>*</artifactId>
</exclusion>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>*</artifactId>
Expand All @@ -33,7 +65,7 @@
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<artifactId>*</artifactId>
</exclusion>
<exclusion>
<groupId>org.springframework</groupId>
Expand All @@ -46,17 +78,41 @@
<artifactId>spring-security-config</artifactId>
<version>${springSecurityVersion}</version>
<exclusions>
<exclusion>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>*</artifactId>
</exclusion>
<exclusion>
<groupId>commons-logging</groupId>
<artifactId>*</artifactId>
</exclusion>
<exclusion>
<groupId>org.aspectj</groupId>
<artifactId>*</artifactId>
</exclusion>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>*</artifactId>
</exclusion>
<exclusion>
<groupId>org.springframework.security</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-acl</artifactId>
<version>${springSecurityVersion}</version>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
<artifactId>*</artifactId>
</exclusion>
<exclusion>
<groupId>net.sf.ehcache</groupId>
<artifactId>*</artifactId>
</exclusion>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>*</artifactId>
Expand All @@ -68,6 +124,14 @@
<artifactId>spring-security-taglibs</artifactId>
<version>${springSecurityVersion}</version>
<exclusions>
<exclusion>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>*</artifactId>
</exclusion>
<exclusion>
<groupId>commons-logging</groupId>
<artifactId>*</artifactId>
</exclusion>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>*</artifactId>
Expand Down Expand Up @@ -107,6 +171,11 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.opennms.dependencies</groupId>
<artifactId>jackson2-dependencies</artifactId>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.opennms.dependencies</groupId>
<artifactId>spring-dependencies</artifactId>
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1,8 @@
javax.transaction--jta--1.1=cddl_v1_1
org.springframework.security--spring-security-acl--4.2.21.RELEASE_1.ONMS.1=apache_v2
org.springframework.security--spring-security-config--4.2.21.RELEASE_1.ONMS.1=apache_v2
org.springframework.security--spring-security-core--4.2.21.RELEASE_1.ONMS.1=apache_v2
org.springframework.security--spring-security-ldap--4.2.21.RELEASE_1.ONMS.1=apache_v2
org.springframework.security--spring-security-remoting--4.2.21.RELEASE_1.ONMS.1=apache_v2
org.springframework.security--spring-security-taglibs--4.2.21.RELEASE_1.ONMS.1=apache_v2
org.springframework.security--spring-security-web--4.2.21.RELEASE_1.ONMS.1=apache_v2
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
javax.transaction--jta--1.1=cddl_v1_1
org.springframework.security--spring-security-core--4.2.21.RELEASE_1.ONMS.1=apache_v2
org.springframework.security--spring-security-remoting--4.2.21.RELEASE_1.ONMS.1=apache_v2
2 changes: 2 additions & 0 deletions features/datachoices/src/license/THIRD-PARTY.properties
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
javax.transaction--jta--1.1=cddl_v1_1
org.springframework.security--spring-security-core--4.2.21.RELEASE_1.ONMS.1=apache_v2
org.springframework.security--spring-security-remoting--4.2.21.RELEASE_1.ONMS.1=apache_v2
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
javax.transaction--jta--1.1=cddl_v1_1
org.springframework.security--spring-security-core--4.2.21.RELEASE_1.ONMS.1=apache_v2
org.springframework.security--spring-security-remoting--4.2.21.RELEASE_1.ONMS.1=apache_v2
2 changes: 2 additions & 0 deletions features/flows/rest/impl/src/license/THIRD-PARTY.properties
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
javax.transaction--jta--1.1=cddl_v1_1
org.springframework.security--spring-security-core--4.2.21.RELEASE_1.ONMS.1=apache_v2
org.springframework.security--spring-security-remoting--4.2.21.RELEASE_1.ONMS.1=apache_v2
2 changes: 2 additions & 0 deletions features/geocoder/rest/src/license/THIRD-PARTY.properties
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
javax.transaction--jta--1.1=cddl_v1_1
org.springframework.security--spring-security-core--4.2.21.RELEASE_1.ONMS.1=apache_v2
org.springframework.security--spring-security-remoting--4.2.21.RELEASE_1.ONMS.1=apache_v2
2 changes: 2 additions & 0 deletions features/geolocation/api/src/license/THIRD-PARTY.properties
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
javax.transaction--jta--1.1=cddl_v1_1
org.springframework.security--spring-security-core--4.2.21.RELEASE_1.ONMS.1=apache_v2
org.springframework.security--spring-security-remoting--4.2.21.RELEASE_1.ONMS.1=apache_v2
2 changes: 2 additions & 0 deletions features/geolocation/rest/src/license/THIRD-PARTY.properties
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
javax.transaction--jta--1.1=cddl_v1_1
org.springframework.security--spring-security-core--4.2.21.RELEASE_1.ONMS.1=apache_v2
org.springframework.security--spring-security-remoting--4.2.21.RELEASE_1.ONMS.1=apache_v2
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
javax.transaction--jta--1.1=cddl_v1_1
org.springframework.security--spring-security-core--4.2.21.RELEASE_1.ONMS.1=apache_v2
org.springframework.security--spring-security-remoting--4.2.21.RELEASE_1.ONMS.1=apache_v2
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
javax.transaction--jta--1.1=cddl_v1_1
org.springframework.security--spring-security-core--4.2.21.RELEASE_1.ONMS.1=apache_v2
org.springframework.security--spring-security-remoting--4.2.21.RELEASE_1.ONMS.1=apache_v2
2 changes: 2 additions & 0 deletions features/graph/rest/api/src/license/THIRD-PARTY.properties
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
javax.transaction--jta--1.1=cddl_v1_1
org.springframework.security--spring-security-core--4.2.21.RELEASE_1.ONMS.1=apache_v2
org.springframework.security--spring-security-remoting--4.2.21.RELEASE_1.ONMS.1=apache_v2
2 changes: 2 additions & 0 deletions features/graph/rest/impl/src/license/THIRD-PARTY.properties
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
javax.transaction--jta--1.1=cddl_v1_1
org.springframework.security--spring-security-core--4.2.21.RELEASE_1.ONMS.1=apache_v2
org.springframework.security--spring-security-remoting--4.2.21.RELEASE_1.ONMS.1=apache_v2
2 changes: 2 additions & 0 deletions features/graphml/rest/src/license/THIRD-PARTY.properties
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
javax.transaction--jta--1.1=cddl_v1_1
org.springframework.security--spring-security-core--4.2.21.RELEASE_1.ONMS.1=apache_v2
org.springframework.security--spring-security-remoting--4.2.21.RELEASE_1.ONMS.1=apache_v2
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,5 @@ findbugs--annotations--1.0.0=lgpl_v2_1
javax.transaction--jta--1.1=cddl_v1_1
org.samba.jcifs--jcifs--1.3.19=lgpl_v2_1
org.simpleframework--org.simpleframework--3.1.3=lgpl_v2_1
org.springframework.security--spring-security-core--4.2.21.RELEASE_1.ONMS.1=apache_v2
org.springframework.security--spring-security-remoting--4.2.21.RELEASE_1.ONMS.1=apache_v2
Loading

0 comments on commit 4604a7a

Please sign in to comment.