Author: veithen
Date: Thu Jul 5 19:29:00 2012
New Revision: 1357821
URL: http://svn.apache.org/viewvc?rev=1357821&view=rev
Log:
Merged r1355738 and r1357818 to the 1.6 branch to fix the issue with the
shibboleth repository.
Modified:
axis/axis2/java/rampart/branches/1_6/ (props changed)
axis/axis2/java/rampart/branches/1_6/pom.xml
Propchange: axis/axis2/java/rampart/branches/1_6/
------------------------------------------------------------------------------
Merged /axis/axis2/java/rampart/trunk:r1355738,1357818
Modified: axis/axis2/java/rampart/branches/1_6/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/pom.xml?rev=1357821&r1=1357820&r2=1357821&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/1_6/pom.xml (original)
+++ axis/axis2/java/rampart/branches/1_6/pom.xml Thu Jul 5 19:29:00 2012
@@ -118,26 +118,6 @@
<url>http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6</url>
</scm>
-
- <repositories>
- <repository>
- <releases>
- <enabled>true</enabled>
- <updatePolicy>always</updatePolicy>
- <checksumPolicy>warn</checksumPolicy>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- <updatePolicy>never</updatePolicy>
- <checksumPolicy>warn</checksumPolicy>
- </snapshots>
- <id>open-saml</id>
- <name>OpenSAML</name>
- <url>http://shibboleth.internet2.edu/downloads/maven2/</url>
- </repository>
-
- </repositories>
-
<build>
<pluginManagement>
<plugins>
@@ -160,7 +140,30 @@
</plugins>
</pluginManagement>
<plugins>
-
+ <plugin>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <version>1.1</version>
+ <executions>
+ <execution>
+ <phase>validate</phase>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <requireNoRepositories>
+ <message>The POM must not include
repository definitions since non Apache repositories threaten the build
stability.</message>
+ <banRepositories>true</banRepositories>
+
<banPluginRepositories>true</banPluginRepositories>
+ <!-- We still need to allow the Apache
snapshot repository -->
+
<allowSnapshotRepositories>true</allowSnapshotRepositories>
+ </requireNoRepositories>
+ </rules>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
@@ -217,19 +220,9 @@
<groupId>org.apache.ws.security</groupId>
<artifactId>wss4j</artifactId>
<version>${wss4j.version}</version>
- <exclusions>
- <!-- We exclude xalan:xalan as a transitive dependency, but
include
- org.apache.xalan:xalan as a direct dependency. This avoids
- conflicts with the dependencies of org.opensaml:opensaml
- (which uses org.apache.xalan:xalan). -->
- <exclusion>
- <artifactId>xalan</artifactId>
- <groupId>xalan</groupId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
- <groupId>org.apache.xalan</groupId>
+ <groupId>xalan</groupId>
<artifactId>xalan</artifactId>
<version>2.7.1</version>
</dependency>
