Merge pull request #13418 from tharindu1st/remove-wss4j

update carbon.registry.version and carbon.mediation.version
wso2 · Mar 15, 2024 · fedf90c · fedf90c
2 parents cc44b6e + 611af9f
commit fedf90c
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 99 deletions.
diff --git a/modules/distribution/product/src/main/assembly/bin.xml b/modules/distribution/product/src/main/assembly/bin.xml
@@ -77,9 +77,6 @@
  <exclude>**/repository/components/plugins/nimbus-jose-jwt_2.26.1.wso2v2.jar</exclude>
  <exclude>**/repository/components/plugins/net.minidev.json-smart_1.2.0.jar</exclude>
  <!--<exclude>**/repository/components/plugins/wss4j_1.5.11.wso2v10.jar</exclude>-->
- <exclude>**/repository/components/plugins/rampart-trust_1.6.1.wso2v14.jar</exclude>
- <exclude>**/repository/components/plugins/rampart-policy_1.6.1.wso2v14.jar</exclude>
- <exclude>**/repository/components/plugins/rampart-core_1.6.1.wso2v14.jar</exclude>
  <exclude>**/repository/components/plugins/commons-io_2.0.0.wso2v2.jar</exclude>
  <exclude>**/repository/components/plugins/com.google.gson_2.1.0.jar</exclude>
  <exclude>**/repository/components/plugins/com.google.gson_2.2.4.jar</exclude>
@@ -983,24 +980,6 @@
  <include>org.apache.qpid.wso2:qpid-client:jar</include>
  </includes>
  </dependencySet>
- <dependencySet>
- <outputDirectory>wso2am-${pom.version}/samples/axis2Client/client_repo/modules</outputDirectory>
- <includes>
- <include>org.apache.axis2:addressing:mar</include>
- <include>org.apache.rampart:rampart:mar</include>
- <include>org.apache.sandesha2:sandesha2:mar</include>
- </includes>
- <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
- </dependencySet>
- <dependencySet>
- <outputDirectory>wso2am-${pom.version}/samples/axis2Server/repository/modules</outputDirectory>
- <includes>
- <include>org.apache.axis2:addressing:mar</include>
- <include>org.apache.rampart:rampart:mar</include>
- <include>org.apache.sandesha2:sandesha2:mar</include>
- </includes>
- <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
- </dependencySet>
  <!--dependencySet>
  <outputDirectory>wso2am-${pom.version}/repository/axis2/client/lib</outputDirectory>
  <excludes>
@@ -1016,9 +995,6 @@
  </dependencySet-->
  <dependencySet>
  <outputDirectory>wso2am-${pom.version}/repository/deployment/client/modules</outputDirectory>
- <includes>
- <include>org.apache.rampart:rampart:mar</include>
- </includes>
  </dependencySet>
  <dependencySet>
  <outputDirectory>wso2am-${pom.version}/repository/components/lib</outputDirectory>

diff --git a/modules/features/product/org.wso2.am.security.feature/pom.xml b/modules/features/product/org.wso2.am.security.feature/pom.xml
@@ -35,22 +35,6 @@
  <groupId>org.wso2.orbit.org.opensaml</groupId>
  <artifactId>opensaml</artifactId>
  </dependency>
- <dependency>
- <groupId>org.apache.ws.security.wso2</groupId>
- <artifactId>wss4j</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.rampart.wso2</groupId>
- <artifactId>rampart-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.rampart.wso2</groupId>
- <artifactId>rampart-trust</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.rampart.wso2</groupId>
- <artifactId>rampart-policy</artifactId>
- </dependency>
  <dependency>
  <groupId>org.apache.santuario</groupId>
  <artifactId>xmlsec</artifactId>
@@ -81,18 +65,6 @@
  <bundleDef>
  org.wso2.orbit.org.opensaml:opensaml
  </bundleDef>
- <bundleDef>
- org.apache.ws.security.wso2:wss4j
- </bundleDef>
- <bundleDef>
- org.apache.rampart.wso2:rampart-core
- </bundleDef>
- <bundleDef>
- org.apache.rampart.wso2:rampart-trust
- </bundleDef>
- <bundleDef>
- org.apache.rampart.wso2:rampart-policy
- </bundleDef>
  <bundleDef>
  org.apache.santuario:xmlsec
  </bundleDef>

diff --git a/modules/integration/tests-common/integration-test-utils/pom.xml b/modules/integration/tests-common/integration-test-utils/pom.xml
@@ -60,28 +60,6 @@ under the License.
  <groupId>org.wso2.carbon.automation</groupId>
  <artifactId>org.wso2.carbon.automation.engine</artifactId>
  </dependency>
- <dependency>
- <groupId>org.apache.rampart</groupId>
- <artifactId>rampart-core</artifactId>
- <exclusions>
- <exclusion>
- <groupId>net.sf.saxon</groupId>
- <artifactId>Saxon-HE</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-jdk12</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.ws.security.wso2</groupId>
- <artifactId>wss4j</artifactId>
- </dependency>
  <dependency>
  <groupId>com.google.code.gson</groupId>
  <artifactId>gson</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -786,11 +786,6 @@
  <artifactId>org.wso2.carbon.um.ws.api.stub</artifactId>
  <version>${carbon.identity-user-ws.version}</version>
  </dependency>
- <dependency>
- <groupId>org.apache.rampart</groupId>
- <artifactId>rampart-core</artifactId>
- <version>${rampart.wso2.version}</version>
- </dependency>
  <dependency>
  <groupId>org.slf4j</groupId>
  <artifactId>slf4j-api</artifactId>
@@ -1257,21 +1252,7 @@
  <artifactId>disruptor</artifactId>
  <version>${disruptor.orbit.version}</version>
  </dependency>
- <dependency>
- <groupId>org.apache.rampart.wso2</groupId>
- <artifactId>rampart-core</artifactId>
- <version>${rampart.wso2.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.rampart.wso2</groupId>
- <artifactId>rampart-trust</artifactId>
- <version>${rampart.wso2.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.rampart.wso2</groupId>
- <artifactId>rampart-policy</artifactId>
- <version>${rampart.wso2.version}</version>
- </dependency>
+
  <dependency>
  <groupId>org.apache.santuario</groupId>
  <artifactId>xmlsec</artifactId>
@@ -1301,12 +1282,12 @@
  <carbon.apimgt.ui.version>9.1.7</carbon.apimgt.ui.version>
 
  <!-- APIM Component Version -->
- <carbon.apimgt.version>9.29.51</carbon.apimgt.version>
+ <carbon.apimgt.version>9.29.55</carbon.apimgt.version>
 
  <carbon.apimgt.imp.pkg.version>[9.0.0, 10.0.0)</carbon.apimgt.imp.pkg.version>
 
  <!-- Carbon Registry -->
- <carbon.registry.version>4.8.27</carbon.registry.version>
+ <carbon.registry.version>4.8.29</carbon.registry.version>
  <carbon.registry.package.import.version.range>[4.7.0, 5.0.0)</carbon.registry.package.import.version.range>
 
 
@@ -1323,7 +1304,7 @@
  <carbon.kernel.imp.pkg.version>[4.5.0, 5.0.0)</carbon.kernel.imp.pkg.version>
 
  <!-- carbon mediation -->
- <carbon.mediation.version>4.7.198</carbon.mediation.version>
+ <carbon.mediation.version>4.7.199</carbon.mediation.version>
 
  <!-- carbon identity -->
  <carbon.identity.version>5.25.696</carbon.identity.version>
@@ -1416,7 +1397,6 @@
  <org.apache.tomcat>7.0.96</org.apache.tomcat>
  <org.codehaus.jackson.version>1.9.13</org.codehaus.jackson.version>
  <carbon.rest.api.version>4.2.2</carbon.rest.api.version>
- <rampart.wso2.version>1.6.1-wso2v43</rampart.wso2.version>
  <slf4j.api.version>1.7.28</slf4j.api.version>
  <org.slf4j.version>1.7.30</org.slf4j.version>
  <google.code.gson.version>2.9.1</google.code.gson.version>
@@ -1498,7 +1478,6 @@
  <apim.analytics.publisher.version>1.2.18</apim.analytics.publisher.version>
  <disruptor.orbit.version>3.4.2.wso2v1</disruptor.orbit.version>
  <opensaml2.version>2.6.6.wso2v4</opensaml2.version>
- <rampart.wso2.version>1.7.0-wso2v3</rampart.wso2.version>
  <wss4j.version>1.6.0-wso2v7</wss4j.version>
 
  <!-- Service Catalog Client Dependencies -->