branch release-4.4.1 created

Kanapriya · Apr 28, 2015 · 1375f19 · 1375f19
1 parent 8426c50
commit 1375f19
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 22 deletions.
diff --git a/...ation-authenticators/org.wso2.carbon.identity.application.authenticator.basicauth/pom.xml b/...ation-authenticators/org.wso2.carbon.identity.application.authenticator.basicauth/pom.xml
@@ -14,20 +14,6 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-~ Copyright (c) 2009-2011, WSO2 Inc. (http://www.wso2.org) All Rights
-Reserved. ~ ~ Licensed under the Apache License, Version 2.0 (the
-"License"); ~ you may not use this file except in compliance with the
-License. ~ You may obtain a copy of the License at ~ ~
-http://www.apache.org/licenses/LICENSE-2.0 ~ ~ Unless required by
-applicable law or agreed to in writing, software ~ distributed under
-the License is distributed on an "AS IS" BASIS, ~ WITHOUT WARRANTIES
-OR CONDITIONS OF ANY KIND, either express or implied. ~ See the
-License for the specific language governing permissions and ~
-limitations under the License.
--->
-
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <parent>

diff --git a/components/user-mgt/org.wso2.carbon.identity.user.account.connector/pom.xml b/components/user-mgt/org.wso2.carbon.identity.user.account.connector/pom.xml
@@ -113,6 +113,7 @@
                             org.wso2.carbon.context; version="${carbon.kernel.package.import.version.range}",
                             org.wso2.carbon.user.core.*; version="${carbon.kernel.package.import.version.range}",
                             org.wso2.carbon.utils.multitenancy; version="${carbon.kernel.package.import.version.range}",
+                            org.wso2.carbon.stratos.common.*; version="${carbon.kernel.package.import.version.range}",
 
                             org.wso2.carbon.user.api; version="${carbon.user.api.imp.pkg.version.range}",
                             org.wso2.carbon.registry.core.*; version="${carbon.kernel.registry.imp.pkg.version}",

diff --git a/pom.xml b/pom.xml
@@ -1016,7 +1016,7 @@
             <dependency>
                 <groupId>org.apache.amber</groupId>
                 <artifactId>amber-oauth2-client</artifactId>
-                <version>0.22-incubating</version>
+                <version>${amber-oauth2-client.version}</version>
             </dependency>
             <dependency>
                 <groupId>com.google.code.gson</groupId>
@@ -1137,7 +1137,7 @@
             <dependency>
                 <groupId>org.apache.amber</groupId>
                 <artifactId>openidconnect-authzserver</artifactId>
-                <version>0.22.1358727-wso2v7</version>
+                <version>${openidconnect-authzserver.amber.version}</version>
             </dependency>
             <!--dependency>
                 <groupId>org.wso2.carbon</groupId>
@@ -1924,7 +1924,7 @@
         <!--Carbon identity version-->
         <carbon.identity.version>4.4.1-SNAPSHOT</carbon.identity.version>
         <carbon.identity.package.export.version>${carbon.identity.version}</carbon.identity.package.export.version>
-        <carbon.identity.package.import.version.range>[4.3.0, 4.4.0)</carbon.identity.package.import.version.range>
+        <carbon.identity.package.import.version.range>[4.4.0, 4.5.0)</carbon.identity.package.import.version.range>
 
         <!--Carbon component version-->
         <carbon.user.api.imp.pkg.version.range>[1.0.1, 1.1.0)</carbon.user.api.imp.pkg.version.range>
@@ -1939,8 +1939,8 @@
         <axis2.osgi.version.range>[1.6.1.wso2v12, 1.7.0)</axis2.osgi.version.range>
         <orbit.version.wsdl4j>1.6.2.wso2v4</orbit.version.wsdl4j>
         <orbit.version.neethi>2.0.4.wso2v4</orbit.version.neethi>
-        <axis2-transports.version>1.1.0-wso2v12</axis2-transports.version>
-        <axis2-transports.version.range>[1.1.0-wso2v12,1.2.0)</axis2-transports.version.range>
+        <axis2-transports.version>1.1.0-wso2v13</axis2-transports.version>
+        <axis2-transports.version.range>[1.1.0-wso2v13,1.2.0)</axis2-transports.version.range>
 
         <!-- Axiom Version -->
         <axiom.version>1.2.11-wso2v6</axiom.version>
@@ -1969,8 +1969,6 @@
         <activation.version>1.1</activation.version>
         <javamail.version>1.4</javamail.version>
         <wss4j.version>1.5.11.wso2v10</wss4j.version>
-        <imp.pkg.version.wss4j>[1.5.11.wso2v10,2)</imp.pkg.version.wss4j>
-        <wss4j.version>1.5.11.wso2v10</wss4j.version>
         <wss4j.xml.security.imp.pkg.version.range>[1.4.2.patched,1.5.0)</wss4j.xml.security.imp.pkg.version.range>
         <wss4j.ws.security.imp.pkg.version.range>[1.5.11.wso2v9,1.6.0)</wss4j.ws.security.imp.pkg.version.range>
         <wsdl4j.wso2.version>1.6.2.wso2v4</wsdl4j.wso2.version>
@@ -1987,6 +1985,8 @@
         <junit.version>4.11</junit.version>
         <version.javax.servlet>3.0.0.v201112011016</version.javax.servlet>
         <amber.version>0.22.1358727.wso2v7</amber.version>
+        <amber-oauth2-client.version>0.22-incubating</amber-oauth2-client.version>
+        <openidconnect-authzserver.amber.version>0.22.1358727-wso2v7</openidconnect-authzserver.amber.version>
         <amber.package.import.version.range>[0.22.1358727.wso2v7, 0.23)</amber.package.import.version.range>
         <apacheds.core.version>1.5.7</apacheds.core.version>
         <apacheds.imp.pkg.version.range>[1.5.7,1.6.0)</apacheds.imp.pkg.version.range>
@@ -2014,7 +2014,7 @@
         <orbit.version.maven-scm>1.7.0.wso2v1</orbit.version.maven-scm>
 
         <!-- Rampart -->
-        <rampart.version>1.6.1-wso2v14T</rampart.version>
+        <rampart.version>1.6.1-wso2v14</rampart.version>
         <rampart.wso2.version>1.6.1.wso2v14</rampart.wso2.version>
         <rampart.wso2.osgi.version.range>[1.6.1,1.6.2)</rampart.wso2.osgi.version.range>
         <rampart.mar.version>1.6.1.wso2v14</rampart.mar.version>