You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@axis.apache.org by sh...@apache.org on 2011/01/03 13:14:08 UTC

svn commit: r1054589 - in /axis/axis2/java/rampart/branches/1_5_x: modules/distribution/bin.xml pom.xml

Author: shankar
Date: Mon Jan  3 12:14:08 2011
New Revision: 1054589

URL: http://svn.apache.org/viewvc?rev=1054589&view=rev
Log:
(1) changing opensaml version and removing unwanted repos
(2) Modifications to use nexus

Modified:
    axis/axis2/java/rampart/branches/1_5_x/modules/distribution/bin.xml
    axis/axis2/java/rampart/branches/1_5_x/pom.xml

Modified: axis/axis2/java/rampart/branches/1_5_x/modules/distribution/bin.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/distribution/bin.xml?rev=1054589&r1=1054588&r2=1054589&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/1_5_x/modules/distribution/bin.xml (original)
+++ axis/axis2/java/rampart/branches/1_5_x/modules/distribution/bin.xml Mon Jan  3 12:14:08 2011
@@ -22,7 +22,7 @@
                 <include>org.apache.rampart:rampart-core:jar</include>
                 <include>org.apache.rampart:rampart-policy:jar</include>
                 <include>org.apache.rampart:rampart-trust:jar</include>
-                <include>org.opensaml:opensaml:jar</include>
+                <include>org.opensaml:opensaml1:jar</include>
                 <include>org.opensaml:xmltooling:jar</include>
                 <include>joda-time:joda-time:jar</include>
                 <include>org.slf4j:slf4j-api:jar</include>

Modified: axis/axis2/java/rampart/branches/1_5_x/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/pom.xml?rev=1054589&r1=1054588&r2=1054589&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/1_5_x/pom.xml (original)
+++ axis/axis2/java/rampart/branches/1_5_x/pom.xml Mon Jan  3 12:14:08 2011
@@ -2,13 +2,13 @@
          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">
 
-    <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache</groupId>
         <artifactId>apache</artifactId>
-        <version>7</version>
+        <version>8</version>
     </parent>
     <groupId>org.apache.rampart</groupId>
+    <modelVersion>4.0.0</modelVersion>
     <artifactId>rampart-project</artifactId>
     <packaging>pom</packaging>
     <description> WS-Security, WS-Trust and WS-SecureConversation implementaion for Apache Axis2 </description>
@@ -94,20 +94,6 @@
 
     <repositories>
 	
-	<repository>
-            <id>wso2-maven2-repository</id>
-            <name>WSO2 Maven2 Repository</name>
-            <url>http://dist.wso2.org/maven2</url>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-            <releases>
-                <enabled>true</enabled>
-                <updatePolicy>never</updatePolicy>
-                <checksumPolicy>fail</checksumPolicy>
-            </releases>
-        </repository>
-
         <repository>
             <releases>
                 <enabled>true</enabled>
@@ -237,9 +223,9 @@
             <version>${xmlsec.version}</version>
         </dependency>
         <dependency>
-            <groupId>opensaml</groupId>
-            <artifactId>opensaml</artifactId>
-            <version>1.1.406</version>
+            <groupId>org.opensaml</groupId>
+            <artifactId>opensaml1</artifactId>
+            <version>1.1</version>
         </dependency>
         <dependency>
             <groupId>org.opensaml</groupId>
@@ -353,7 +339,7 @@
         </profile>
 
         <profile>
-            <id>distribution</id>
+            <id>apache-release</id>
             <activation>
                 <property>
                     <name>release</name>
@@ -386,7 +372,7 @@
         <axiom.version>1.2.10</axiom.version>
 
         <wss4j.version>1.5.10</wss4j.version>
-	<xmlsec.version>1.4.2</xmlsec.version>
+		<xmlsec.version>1.4.2</xmlsec.version>
         <opensaml.version>1.1</opensaml.version>
 
         <bcprov.jdk14.version>140</bcprov.jdk14.version>
@@ -402,23 +388,12 @@
     </properties>
 
     <distributionManagement>
-        <repository>
-            <id>apache-repo</id>
-            <name>Maven Central Repository</name>
-            <url>
-                scpexe://people.apache.org//www/people.apache.org/repo/m2-ibiblio-rsync-repository
-            </url>
-        </repository>
-        <snapshotRepository>
-            <id>apache-snapshots</id>
-            <name>Apache Development Repository</name>
-            <url>scpexe://people.apache.org//www/people.apache.org/repo/m2-snapshot-repository</url>
+		<snapshotRepository>
+            <id>apache.snapshots.https</id>
+            <name>${distMgmtSnapshotsName}</name>
+            <url>${distMgmtSnapshotsUrl}</url>
             <uniqueVersion>false</uniqueVersion>
         </snapshotRepository>
-        <site>
-            <id>website</id>
-            <url>scpexe://people.apache.org/www/ws.apache.org/rampart</url>
-        </site>
     </distributionManagement>
 
 </project>