Reverting axiom dependant dependency version updates until carbon-dep…

…loyment is released
wso2-attic · Feb 29, 2016 · 46bdda5 · 46bdda5
1 parent 4c489e7
commit 46bdda5
Show file tree

Hide file tree

Showing 34 changed files with 102 additions and 86 deletions.
diff --git a/components/agents/org.wso2.carbon.identity.entitlement.proxy/pom.xml b/components/agents/org.wso2.carbon.identity.entitlement.proxy/pom.xml
@@ -68,7 +68,7 @@
             <artifactId>commons-logging</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.wso2.orbit.org.apache.neethi</groupId>
+            <groupId>org.apache.neethi.wso2</groupId>
             <artifactId>neethi</artifactId>
         </dependency>
         <dependency>
@@ -132,8 +132,8 @@
             <artifactId>org.wso2.balana</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.wso2.orbit.org.opensaml</groupId>
-            <artifactId>opensaml</artifactId>
+            <groupId>opensaml.wso2</groupId>
+            <artifactId>opensaml2</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.ws.security.wso2</groupId>

diff --git a/components/agents/org.wso2.carbon.identity.sso.agent/pom.xml b/components/agents/org.wso2.carbon.identity.sso.agent/pom.xml
@@ -45,8 +45,8 @@
             <optional>true</optional>
         </dependency>
         <dependency>
-            <groupId>org.wso2.orbit.org.opensaml</groupId>
-            <artifactId>opensaml</artifactId>
+            <groupId>opensaml.wso2</groupId>
+            <artifactId>opensaml2</artifactId>
             <exclusions>
                 <exclusion>
                     <groupId>commons-collections</groupId>

diff --git a/...ion-authenticators/org.wso2.carbon.identity.application.authenticator.passive.sts/pom.xml b/...ion-authenticators/org.wso2.carbon.identity.application.authenticator.passive.sts/pom.xml
@@ -60,8 +60,8 @@
             <artifactId>org.wso2.carbon.identity.application.authentication.framework</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.wso2.orbit.org.opensaml</groupId>
-            <artifactId>opensaml</artifactId>
+            <groupId>opensaml.wso2</groupId>
+            <artifactId>opensaml2</artifactId>
         </dependency>
         <dependency>
             <groupId>org.wso2.carbon.identity</groupId>

diff --git a/...ication-authenticators/org.wso2.carbon.identity.application.authenticator.samlsso/pom.xml b/...ication-authenticators/org.wso2.carbon.identity.application.authenticator.samlsso/pom.xml
@@ -59,8 +59,8 @@
             <artifactId>org.wso2.carbon.identity.application.authentication.framework</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.wso2.orbit.org.opensaml</groupId>
-            <artifactId>opensaml</artifactId>
+            <groupId>opensaml.wso2</groupId>
+            <artifactId>opensaml2</artifactId>
         </dependency>
         <dependency>
             <groupId>org.wso2.carbon.identity</groupId>

diff --git a/...s/saml2-sso-authenticator/org.wso2.carbon.identity.authenticator.saml2.sso.common/pom.xml b/...s/saml2-sso-authenticator/org.wso2.carbon.identity.authenticator.saml2.sso.common/pom.xml
@@ -56,8 +56,8 @@
             <artifactId>org.wso2.carbon.identity.base</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.wso2.orbit.org.opensaml</groupId>
-            <artifactId>opensaml</artifactId>
+            <groupId>opensaml.wso2</groupId>
+            <artifactId>opensaml2</artifactId>
         </dependency>
         <dependency>
             <groupId>org.wso2.carbon.identity</groupId>

diff --git a/...ators/saml2-sso-authenticator/org.wso2.carbon.identity.authenticator.saml2.sso.ui/pom.xml b/...ators/saml2-sso-authenticator/org.wso2.carbon.identity.authenticator.saml2.sso.ui/pom.xml
@@ -60,8 +60,8 @@
             <artifactId>org.wso2.carbon.utils</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.wso2.orbit.org.opensaml</groupId>
-            <artifactId>opensaml</artifactId>
+            <groupId>opensaml.wso2</groupId>
+            <artifactId>opensaml2</artifactId>
         </dependency>
         <dependency>
             <groupId>org.wso2.carbon.identity</groupId>

diff --git a/...ticators/saml2-sso-authenticator/org.wso2.carbon.identity.authenticator.saml2.sso/pom.xml b/...ticators/saml2-sso-authenticator/org.wso2.carbon.identity.authenticator.saml2.sso/pom.xml
@@ -56,8 +56,8 @@
             <artifactId>org.wso2.carbon.identity.base</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.wso2.orbit.org.opensaml</groupId>
-            <artifactId>opensaml</artifactId>
+            <groupId>opensaml.wso2</groupId>
+            <artifactId>opensaml2</artifactId>
         </dependency>
         <dependency>
             <groupId>org.wso2.carbon.identity</groupId>

diff --git a/...ticators/signedjwt-authenticator/org.wso2.carbon.identity.authenticator.signedjwt/pom.xml b/...ticators/signedjwt-authenticator/org.wso2.carbon.identity.authenticator.signedjwt/pom.xml
@@ -51,8 +51,8 @@
             <artifactId>org.wso2.carbon.utils</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.wso2.orbit.org.opensaml</groupId>
-            <artifactId>opensaml</artifactId>
+            <groupId>opensaml.wso2</groupId>
+            <artifactId>opensaml2</artifactId>
         </dependency>
         <dependency>
             <groupId>org.wso2.orbit.com.nimbusds</groupId>

diff --git a/components/entitlement/org.wso2.carbon.identity.entitlement/pom.xml b/components/entitlement/org.wso2.carbon.identity.entitlement/pom.xml
@@ -89,8 +89,8 @@
             <artifactId>libthrift</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.wso2.orbit.org.opensaml</groupId>
-            <artifactId>opensaml</artifactId>
+            <groupId>opensaml.wso2</groupId>
+            <artifactId>opensaml2</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.axis2.wso2</groupId>

diff --git a/components/identity-core/org.wso2.carbon.identity.base/pom.xml b/components/identity-core/org.wso2.carbon.identity.base/pom.xml
@@ -51,7 +51,7 @@
             <artifactId>wss4j</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.wso2.orbit.org.apache.neethi</groupId>
+            <groupId>org.apache.neethi.wso2</groupId>
             <artifactId>neethi</artifactId>
         </dependency>
         <dependency>

diff --git a/components/identity-core/org.wso2.carbon.identity.core/pom.xml b/components/identity-core/org.wso2.carbon.identity.core/pom.xml
@@ -42,10 +42,6 @@
             <groupId>org.apache.axis2.wso2</groupId>
             <artifactId>axis2</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.wso2.orbit.org.opensaml</groupId>
-            <artifactId>opensaml</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.wso2.carbon</groupId>
             <artifactId>org.wso2.carbon.registry.core</artifactId>

diff --git a/components/idp-mgt/org.wso2.carbon.idp.mgt/pom.xml b/components/idp-mgt/org.wso2.carbon.idp.mgt/pom.xml
@@ -30,6 +30,10 @@
     <name>WSO2 Carbon - Identity Provider Management Bundle</name>
 
     <dependencies>
+        <dependency>
+            <groupId>opensaml.wso2</groupId>
+            <artifactId>opensaml2</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.wso2.carbon</groupId>
             <artifactId>org.wso2.carbon.core</artifactId>

diff --git a/components/openid/org.wso2.carbon.identity.provider/pom.xml b/components/openid/org.wso2.carbon.identity.provider/pom.xml
@@ -83,7 +83,11 @@
             <artifactId>openid4java</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.wso2.orbit.org.opensaml</groupId>
+            <groupId>opensaml.wso2</groupId>
+            <artifactId>opensaml2</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>opensaml.wso2</groupId>
             <artifactId>opensaml</artifactId>
         </dependency>
         <dependency>

diff --git a/components/security-mgt/org.wso2.carbon.security.mgt/pom.xml b/components/security-mgt/org.wso2.carbon.security.mgt/pom.xml
@@ -34,7 +34,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.wso2.orbit.org.apache.neethi</groupId>
+            <groupId>org.apache.neethi.wso2</groupId>
             <artifactId>neethi</artifactId>
         </dependency>
         <dependency>

diff --git a/components/sso-saml/org.wso2.carbon.identity.sso.saml.common/pom.xml b/components/sso-saml/org.wso2.carbon.identity.sso.saml.common/pom.xml
@@ -49,8 +49,8 @@
             <artifactId>org.wso2.carbon.identity.authenticator.saml2.sso.common</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.wso2.orbit.org.opensaml</groupId>
-            <artifactId>opensaml</artifactId>
+            <groupId>opensaml.wso2</groupId>
+            <artifactId>opensaml2</artifactId>
         </dependency>
         <dependency>
             <groupId>org.wso2.carbon</groupId>

diff --git a/components/sso-saml/org.wso2.carbon.identity.sso.saml.ui/pom.xml b/components/sso-saml/org.wso2.carbon.identity.sso.saml.ui/pom.xml
@@ -51,8 +51,8 @@
             <artifactId>org.wso2.carbon.identity.authenticator.saml2.sso.common</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.wso2.orbit.org.opensaml</groupId>
-            <artifactId>opensaml</artifactId>
+            <groupId>opensaml.wso2</groupId>
+            <artifactId>opensaml2</artifactId>
         </dependency>
         <dependency>
             <groupId>org.wso2.carbon</groupId>

diff --git a/components/sso-saml/org.wso2.carbon.identity.sso.saml/pom.xml b/components/sso-saml/org.wso2.carbon.identity.sso.saml/pom.xml
@@ -58,8 +58,8 @@
             <artifactId>org.wso2.carbon.security.mgt</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.wso2.orbit.org.opensaml</groupId>
-            <artifactId>opensaml</artifactId>
+            <groupId>opensaml.wso2</groupId>
+            <artifactId>opensaml2</artifactId>
         </dependency>
         <dependency>
             <groupId>org.wso2.carbon</groupId>

diff --git a/components/sts/org.wso2.carbon.identity.sts.passive/pom.xml b/components/sts/org.wso2.carbon.identity.sts.passive/pom.xml
@@ -66,7 +66,11 @@
             <artifactId>org.wso2.carbon.security.mgt</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.wso2.orbit.org.opensaml</groupId>
+            <groupId>opensaml.wso2</groupId>
+            <artifactId>opensaml2</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>opensaml.wso2</groupId>
             <artifactId>opensaml</artifactId>
         </dependency>
         <dependency>

diff --git a/components/tools/samlsso-validator/org.wso2.carbon.identity.tools.saml.validator.ui/pom.xml b/components/tools/samlsso-validator/org.wso2.carbon.identity.tools.saml.validator.ui/pom.xml
@@ -54,8 +54,8 @@
             <artifactId>org.wso2.carbon.identity.authenticator.saml2.sso.common</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.wso2.orbit.org.opensaml</groupId>
-            <artifactId>opensaml</artifactId>
+            <groupId>opensaml.wso2</groupId>
+            <artifactId>opensaml2</artifactId>
         </dependency>
         <dependency>
             <groupId>org.wso2.carbon</groupId>

diff --git a/components/tools/samlsso-validator/org.wso2.carbon.identity.tools.saml.validator/pom.xml b/components/tools/samlsso-validator/org.wso2.carbon.identity.tools.saml.validator/pom.xml
@@ -62,8 +62,8 @@
             <artifactId>org.wso2.carbon.security.mgt</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.wso2.orbit.org.opensaml</groupId>
-            <artifactId>opensaml</artifactId>
+            <groupId>opensaml.wso2</groupId>
+            <artifactId>opensaml2</artifactId>
         </dependency>
         <dependency>
             <groupId>org.wso2.carbon</groupId>

diff --git a/features/agents/org.wso2.carbon.identity.sso.agent.server.feature/pom.xml b/features/agents/org.wso2.carbon.identity.sso.agent.server.feature/pom.xml
@@ -38,8 +38,8 @@
             <artifactId>org.wso2.carbon.identity.sso.agent</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.wso2.orbit.org.opensaml</groupId>
-            <artifactId>opensaml</artifactId>
+            <groupId>opensaml.wso2</groupId>
+            <artifactId>opensaml2</artifactId>
         </dependency>
         <dependency>
             <groupId>org.wso2.orbit.org.openid4java</groupId>
@@ -81,7 +81,7 @@
                             </adviceFile>
                             <bundles>
                                 <bundleDef>org.wso2.carbon.identity:org.wso2.carbon.identity.sso.agent</bundleDef>
-                                <bundleDef>org.wso2.orbit.org.opensaml:opensaml</bundleDef>
+                                <bundleDef>opensaml.wso2:opensaml2</bundleDef>
                                 <bundleDef>org.wso2.orbit.org.openid4java:openid4java</bundleDef>
                                 <bundleDef>org.wso2.orbit.org.apache.oltu.oauth2:oltu</bundleDef>
                                 <bundleDef>org.wso2.orbit.org.apache.httpcomponents:httpclient</bundleDef>

diff --git a/...sts/org.wso2.carbon.identity.application.authenticator.passive.sts.server.feature/pom.xml b/...sts/org.wso2.carbon.identity.application.authenticator.passive.sts.server.feature/pom.xml
@@ -43,8 +43,8 @@
             <artifactId>org.wso2.carbon.identity.application.authentication.framework</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.wso2.orbit.org.opensaml</groupId>
-            <artifactId>opensaml</artifactId>
+            <groupId>opensaml.wso2</groupId>
+            <artifactId>opensaml2</artifactId>
         </dependency>
     </dependencies>
 
@@ -65,7 +65,7 @@
                             <id>org.wso2.carbon.identity.application.authenticator.passive.sts.server</id>
                             <propertiesFile>../../../etc/feature.properties</propertiesFile>
                             <bundles>
-                                <bundleDef>org.wso2.orbit.org.opensaml:opensaml</bundleDef>
+                                <bundleDef>opensaml.wso2:opensaml2</bundleDef>
                                 <bundleDef>
                                     org.wso2.carbon.identity:org.wso2.carbon.identity.application.authenticator.passive.sts
                                 </bundleDef>

diff --git a/...samlsso/org.wso2.carbon.identity.application.authenticator.samlsso.server.feature/pom.xml b/...samlsso/org.wso2.carbon.identity.application.authenticator.samlsso.server.feature/pom.xml
@@ -43,8 +43,8 @@
             <artifactId>org.wso2.carbon.identity.application.authentication.framework</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.wso2.orbit.org.opensaml</groupId>
-            <artifactId>opensaml</artifactId>
+            <groupId>opensaml.wso2</groupId>
+            <artifactId>opensaml2</artifactId>
         </dependency>
     </dependencies>
 
@@ -68,7 +68,7 @@
                                 <bundleDef>
                                     org.wso2.carbon.identity:org.wso2.carbon.identity.application.authenticator.samlsso
                                 </bundleDef>
-                                <bundleDef>org.wso2.orbit.org.opensaml:opensaml</bundleDef>
+                                <bundleDef>opensaml.wso2:opensaml2</bundleDef>
                             </bundles>
                             <importFeatures>
                                 <importFeatureDef>org.wso2.carbon.core:${carbon.kernel.version}</importFeatureDef>

diff --git a/...sso-authenticator/org.wso2.carbon.identity.authenticator.saml2.sso.server.feature/pom.xml b/...sso-authenticator/org.wso2.carbon.identity.authenticator.saml2.sso.server.feature/pom.xml
@@ -43,8 +43,8 @@
             <artifactId>org.wso2.carbon.identity.authenticator.saml2.sso.common</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.wso2.orbit.org.opensaml</groupId>
-            <artifactId>opensaml</artifactId>
+            <groupId>opensaml.wso2</groupId>
+            <artifactId>opensaml2</artifactId>
         </dependency>
     </dependencies>
 
@@ -76,7 +76,7 @@
                                 <bundleDef>
                                     org.wso2.carbon.identity:org.wso2.carbon.identity.authenticator.saml2.sso.common
                                 </bundleDef>
-                                <bundleDef>org.wso2.orbit.org.opensaml:opensaml</bundleDef>
+                                <bundleDef>opensaml.wso2:opensaml2</bundleDef>
                             </bundles>
                             <importFeatures>
                                 <importFeatureDef>org.wso2.carbon.core:${carbon.kernel.version}</importFeatureDef>

diff --git a/...ml2-sso-authenticator/org.wso2.carbon.identity.authenticator.saml2.sso.ui.feature/pom.xml b/...ml2-sso-authenticator/org.wso2.carbon.identity.authenticator.saml2.sso.ui.feature/pom.xml
@@ -51,8 +51,8 @@
             <artifactId>org.wso2.carbon.identity.sso.saml.stub</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.wso2.orbit.org.opensaml</groupId>
-            <artifactId>opensaml</artifactId>
+            <groupId>opensaml.wso2</groupId>
+            <artifactId>opensaml2</artifactId>
         </dependency>
     </dependencies>
 
@@ -89,7 +89,7 @@
                                     org.wso2.carbon.identity:org.wso2.carbon.identity.authenticator.saml2.sso.common
                                 </bundleDef>
                                 <bundleDef>org.wso2.carbon.identity:org.wso2.carbon.identity.sso.saml.stub</bundleDef>
-                                <bundleDef>org.wso2.orbit.org.opensaml:opensaml</bundleDef>
+                                <bundleDef>opensaml.wso2:opensaml2</bundleDef>
                             </bundles>
                             <importFeatures>
                                 <importFeatureDef>org.wso2.carbon.core:${carbon.kernel.version}</importFeatureDef>

diff --git a/features/oauth/org.wso2.carbon.identity.oauth.server.feature/pom.xml b/features/oauth/org.wso2.carbon.identity.oauth.server.feature/pom.xml
@@ -76,8 +76,8 @@
             <artifactId>waffle-jna</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.wso2.orbit.org.opensaml</groupId>
-            <artifactId>opensaml</artifactId>
+            <groupId>opensaml.wso2</groupId>
+            <artifactId>opensaml2</artifactId>
         </dependency>
     </dependencies>
 
@@ -164,7 +164,7 @@
                                 <bundleDef>org.wso2.orbit.com.nimbusds:nimbus-jose-jwt</bundleDef>
                                 <bundleDef>net.minidev:json-smart</bundleDef>
                                 <bundleDef>org.wso2.orbit.com.github.dblock.waffle:waffle-jna</bundleDef>
-                                <bundleDef>org.wso2.orbit.org.opensaml:opensaml</bundleDef>
+                                <bundleDef>opensaml.wso2:opensaml2</bundleDef>
                             </bundles>
                             <importFeatures>
                                 <importFeatureDef>org.wso2.carbon.core:${carbon.kernel.version}</importFeatureDef>

diff --git a/features/openid/org.wso2.carbon.identity.provider.server.feature/pom.xml b/features/openid/org.wso2.carbon.identity.provider.server.feature/pom.xml
@@ -55,8 +55,8 @@
             <artifactId>guice</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.wso2.orbit.org.opensaml</groupId>
-            <artifactId>opensaml</artifactId>
+            <groupId>opensaml.wso2</groupId>
+            <artifactId>opensaml2</artifactId>
         </dependency>
         <dependency>
             <groupId>net.sf.ehcache.wso2</groupId>
@@ -123,7 +123,7 @@
                                 <bundleDef>org.wso2.carbon.identity:org.wso2.carbon.identity.provider</bundleDef>
                                 <bundleDef>org.wso2.orbit.org.openid4java:openid4java</bundleDef>
                                 <bundleDef>org.igniterealtime.smack.wso2:smack</bundleDef>
-                                <bundleDef>org.wso2.orbit.org.opensaml:opensaml</bundleDef>
+                                <bundleDef>opensaml.wso2:opensaml2</bundleDef>
                                 <bundleDef>net.sf.ehcache.wso2:ehcache</bundleDef>
                                 <bundleDef>net.minidev:json-smart</bundleDef>
                             </bundles>

diff --git a/features/sso-saml/org.wso2.carbon.identity.sso.saml.server.feature/pom.xml b/features/sso-saml/org.wso2.carbon.identity.sso.saml.server.feature/pom.xml
@@ -40,8 +40,8 @@
             <artifactId>org.wso2.carbon.identity.sso.saml</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.wso2.orbit.org.opensaml</groupId>
-            <artifactId>opensaml</artifactId>
+            <groupId>opensaml.wso2</groupId>
+            <artifactId>opensaml2</artifactId>
         </dependency>
         <dependency>
             <groupId>org.wso2.carbon.identity</groupId>
@@ -103,7 +103,7 @@
                             </adviceFile>
                             <bundles>
                                 <bundleDef>org.wso2.carbon.identity:org.wso2.carbon.identity.sso.saml</bundleDef>
-                                <bundleDef>org.wso2.orbit.org.opensaml:opensaml</bundleDef>
+                                <bundleDef>opensaml.wso2:opensaml2</bundleDef>
                             </bundles>
                             <importFeatures>
                                 <importFeatureDef>org.wso2.carbon.core:${carbon.kernel.version}</importFeatureDef>