Author: dims
Date: Wed Feb 14 07:30:01 2007
New Revision: 507576
URL: http://svn.apache.org/viewvc?view=rev&rev=507576
Log:
Don't use the m1 repos & update dependencies
Modified:
webservices/rampart/trunk/java/modules/rampart-mar/pom.xml
webservices/rampart/trunk/java/pom.xml
Modified: webservices/rampart/trunk/java/modules/rampart-mar/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-mar/pom.xml?view=diff&rev=507576&r1=507575&r2=507576
==============================================================================
--- webservices/rampart/trunk/java/modules/rampart-mar/pom.xml (original)
+++ webservices/rampart/trunk/java/modules/rampart-mar/pom.xml Wed Feb 14
07:30:01 2007
@@ -1,58 +1,58 @@
-<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">
-
-
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.rampart</groupId>
- <artifactId>rampart</artifactId>
- <packaging>mar</packaging>
- <version>SNAPSHOT</version>
- <name>Rampart - Mar</name>
-
- <build>
- <sourceDirectory>src/main/java</sourceDirectory>
- <testSourceDirectory>src/main/java</testSourceDirectory>
- <resources>
- <resource>
- <directory>src/main/java</directory>
- </resource>
- </resources>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.4</source>
- <target>1.4</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.axis2.maven2</groupId>
- <artifactId>axis2-mar-maven-plugin</artifactId>
- <version>SNAPSHOT</version>
- <extensions>true</extensions>
- <configuration>
- <includeDependencies>false</includeDependencies>
- <moduleXmlFile>module.xml</moduleXmlFile>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
+<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">
+
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.rampart</groupId>
+ <artifactId>rampart</artifactId>
+ <packaging>mar</packaging>
+ <version>SNAPSHOT</version>
+ <name>Rampart - Mar</name>
+
+ <build>
+ <sourceDirectory>src/main/java</sourceDirectory>
+ <testSourceDirectory>src/main/java</testSourceDirectory>
+ <resources>
+ <resource>
+ <directory>src/main/java</directory>
+ </resource>
+ </resources>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.4</source>
+ <target>1.4</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.axis2.maven2</groupId>
+ <artifactId>axis2-mar-maven-plugin</artifactId>
+ <version>SNAPSHOT</version>
+ <extensions>true</extensions>
+ <configuration>
+ <includeDependencies>false</includeDependencies>
+ <moduleXmlFile>module.xml</moduleXmlFile>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
<dependencies>
<dependency>
<groupId>org.apache.rampart</groupId>
<artifactId>rampart-policy</artifactId>
<version>${pom.version}</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.apache.rampart</groupId>
<artifactId>rampart-trust</artifactId>
<version>${pom.version}</version>
- </dependency>
- </dependencies>
-
+ </dependency>
+ </dependencies>
+
<pluginRepositories>
<pluginRepository>
<id>apache-m2</id>
@@ -83,4 +83,4 @@
</releases>
</pluginRepository>
</pluginRepositories>
-</project>
+</project>
Modified: webservices/rampart/trunk/java/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/java/pom.xml?view=diff&rev=507576&r1=507575&r2=507576
==============================================================================
--- webservices/rampart/trunk/java/pom.xml (original)
+++ webservices/rampart/trunk/java/pom.xml Wed Feb 14 07:30:01 2007
@@ -75,44 +75,53 @@
<repositories>
- <repository>
- <id>maven-snapshots</id>
- <name>Maven Central Development Repository</name>
- <url>http://snapshots.maven.codehaus.org/maven2</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- </repository>
- <repository>
- <id>m1-ibiblio-rsync-repository</id>
-
<url>http://people.apache.org/repo/m1-ibiblio-rsync-repository</url>
- <layout>legacy</layout>
- </repository>
- <repository>
- <id>codehaus</id>
- <url>http://dist.codehaus.org</url>
- <layout>legacy</layout>
- </repository>
- <repository>
- <id>nonav</id>
- <url>https://maven-repository.dev.java.net/nonav/repository</url>
- <layout>legacy</layout>
- </repository>
- <repository>
- <id>apache-zones</id>
- <url>http://ws.zones.apache.org/repository</url>
- <layout>legacy</layout>
- </repository>
- <repository>
- <id>apache-zones-m2</id>
- <url>http://ws.zones.apache.org/repository2</url>
- </repository>
- <repository>
- <id>maven</id>
- <url>http://repo1.maven.org/maven</url>
- <layout>legacy</layout>
- </repository>
- </repositories>
+ <repository>
+ <releases>
+ <enabled>false</enabled>
+ <updatePolicy>always</updatePolicy>
+ <checksumPolicy>warn</checksumPolicy>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ <updatePolicy>never</updatePolicy>
+ <checksumPolicy>fail</checksumPolicy>
+ </snapshots>
+ <id>apache-snapshots</id>
+ <name>Apache Maven2 SNAPSHOTS</name>
+
<url>http://people.apache.org/repo/m2-snapshot-repository/</url>
+ <layout>default</layout>
+ </repository>
+ <repository>
+ <releases>
+ <enabled>true</enabled>
+ <updatePolicy>always</updatePolicy>
+ <checksumPolicy>warn</checksumPolicy>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ <updatePolicy>never</updatePolicy>
+ <checksumPolicy>warn</checksumPolicy>
+ </snapshots>
+ <id>apache-ws-snapshots2</id>
+ <name>Apache ws.zones - 2</name>
+ <url>http://ws.zones.apache.org/repository2/</url>
+ </repository>
+ <repository>
+ <releases>
+ <enabled>true</enabled>
+ <updatePolicy>always</updatePolicy>
+ <checksumPolicy>warn</checksumPolicy>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ <updatePolicy>never</updatePolicy>
+ <checksumPolicy>warn</checksumPolicy>
+ </snapshots>
+ <id>maven2</id>
+ <name>Maven2 repo</name>
+ <url>http://repo1.maven.org/maven2/</url>
+ </repository>
+ </repositories>
<pluginRepositories>
@@ -167,17 +176,6 @@
<dependencies>
- <!-- Axis2 Jars-->
- <dependency>
- <groupId>org.apache.axis2</groupId>
- <artifactId>axis2-addressing</artifactId>
- <version>${addressing.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.axis2</groupId>
- <artifactId>axis2-kernel</artifactId>
- <version>${axis2.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-xmlbeans</artifactId>
@@ -185,24 +183,9 @@
</dependency>
<dependency>
<groupId>org.apache.axis2</groupId>
- <artifactId>axis2-adb</artifactId>
- <version>${axis2.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.axis2</groupId>
<artifactId>axis2-adb-codegen</artifactId>
<version>${axis2.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.axis2</groupId>
- <artifactId>axis2-codegen</artifactId>
- <version>${axis2.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.axis2</groupId>
- <artifactId>axis2-java2wsdl</artifactId>
- <version>${axis2.version}</version>
- </dependency>
<!-- AIOM Dependencies -->
<dependency>
@@ -270,9 +253,9 @@
<version>${xml.apis.version}</version>
</dependency>
<dependency>
- <groupId>incubator-woden</groupId>
+ <groupId>org.apache.woden</groupId>
<artifactId>woden</artifactId>
- <version>${woden.version}</version>
+ <version>1.0-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>wsdl4j</groupId>
@@ -467,9 +450,9 @@
<jaxen.version>1.1-beta-10</jaxen.version>
- <stax.impl.groupid>woodstox</stax.impl.groupid>
- <stax.impl.artifactid>wstx</stax.impl.artifactid>
- <stax.impl.version>asl-3.1.0</stax.impl.version>
+ <stax.impl.groupid>org.codehaus.woodstox</stax.impl.groupid>
+ <stax.impl.artifactid>wstx-asl</stax.impl.artifactid>
+ <stax.impl.version>3.2.0</stax.impl.version>
<stax.api.version>1.0.1</stax.api.version>
<xml.apis.version>1.3.03</xml.apis.version>