You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by dk...@apache.org on 2015/03/19 15:11:39 UTC
svn commit: r1667759 - in /webservices/wss4j/trunk: bindings/pom.xml
integration/pom.xml parent/pom.xml policy/pom.xml pom.xml
ws-security-common/pom.xml ws-security-dom/pom.xml
ws-security-policy-stax/pom.xml ws-security-stax/pom.xml
Author: dkulp
Date: Thu Mar 19 14:11:39 2015
New Revision: 1667759
URL: http://svn.apache.org/r1667759
Log:
Fix a bunch of warnings when loaded into m2e
Modified:
webservices/wss4j/trunk/bindings/pom.xml
webservices/wss4j/trunk/integration/pom.xml
webservices/wss4j/trunk/parent/pom.xml
webservices/wss4j/trunk/policy/pom.xml
webservices/wss4j/trunk/pom.xml
webservices/wss4j/trunk/ws-security-common/pom.xml
webservices/wss4j/trunk/ws-security-dom/pom.xml
webservices/wss4j/trunk/ws-security-policy-stax/pom.xml
webservices/wss4j/trunk/ws-security-stax/pom.xml
Modified: webservices/wss4j/trunk/bindings/pom.xml
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/bindings/pom.xml?rev=1667759&r1=1667758&r2=1667759&view=diff
==============================================================================
--- webservices/wss4j/trunk/bindings/pom.xml (original)
+++ webservices/wss4j/trunk/bindings/pom.xml Thu Mar 19 14:11:39 2015
@@ -26,9 +26,7 @@
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.wss4j</groupId>
<artifactId>wss4j-bindings</artifactId>
- <version>2.1.0-SNAPSHOT</version>
<name>Apache WSS4J WS-Security Bindings</name>
<properties>
@@ -39,7 +37,6 @@
<dependency>
<groupId>org.apache.santuario</groupId>
<artifactId>xmlsec</artifactId>
- <version>${xmlsec.version}</version>
</dependency>
</dependencies>
Modified: webservices/wss4j/trunk/integration/pom.xml
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/integration/pom.xml?rev=1667759&r1=1667758&r2=1667759&view=diff
==============================================================================
--- webservices/wss4j/trunk/integration/pom.xml (original)
+++ webservices/wss4j/trunk/integration/pom.xml Thu Mar 19 14:11:39 2015
@@ -25,9 +25,7 @@
<relativePath>../parent/pom.xml</relativePath>
<version>2.1.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.wss4j</groupId>
<artifactId>integration</artifactId>
- <version>2.1.0-SNAPSHOT</version>
<name>Apache WSS4J WS-Security Integration</name>
<build>
@@ -35,7 +33,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>2.4</version>
<executions>
<execution>
<goals>
Modified: webservices/wss4j/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/parent/pom.xml?rev=1667759&r1=1667758&r2=1667759&view=diff
==============================================================================
--- webservices/wss4j/trunk/parent/pom.xml (original)
+++ webservices/wss4j/trunk/parent/pom.xml Thu Mar 19 14:11:39 2015
@@ -25,9 +25,7 @@
<artifactId>wss4j</artifactId>
<version>2.1.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.wss4j</groupId>
<artifactId>wss4j-parent</artifactId>
- <version>2.1.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Apache WSS4J parent</name>
<description>Apache WSS4J parent pom</description>
@@ -218,6 +216,44 @@
</archive>
</configuration>
</plugin>
+ <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
+ <plugin>
+ <groupId>org.eclipse.m2e</groupId>
+ <artifactId>lifecycle-mapping</artifactId>
+ <version>1.0.0</version>
+ <configuration>
+ <lifecycleMappingMetadata>
+ <pluginExecutions>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <versionRange>[2.4.0,)</versionRange>
+ <goals>
+ <goal>cleanVersions</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore></ignore>
+ </action>
+ </pluginExecution>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <versionRange>[1.0.0,)</versionRange>
+ <goals>
+ <goal>process</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore></ignore>
+ </action>
+ </pluginExecution>
+ </pluginExecutions>
+ </lifecycleMappingMetadata>
+ </configuration>
+ </plugin>
</plugins>
</pluginManagement>
<plugins>
Modified: webservices/wss4j/trunk/policy/pom.xml
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/pom.xml?rev=1667759&r1=1667758&r2=1667759&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/pom.xml (original)
+++ webservices/wss4j/trunk/policy/pom.xml Thu Mar 19 14:11:39 2015
@@ -26,9 +26,7 @@
<relativePath>../parent/pom.xml</relativePath>
<version>2.1.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.wss4j</groupId>
<artifactId>wss4j-policy</artifactId>
- <version>2.1.0-SNAPSHOT</version>
<name>Apache WSS4J WS-SecurityPolicy model</name>
<dependencies>
Modified: webservices/wss4j/trunk/pom.xml
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/pom.xml?rev=1667759&r1=1667758&r2=1667759&view=diff
==============================================================================
--- webservices/wss4j/trunk/pom.xml (original)
+++ webservices/wss4j/trunk/pom.xml Thu Mar 19 14:11:39 2015
@@ -156,7 +156,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
- <version>2.3</version>
<executions>
<execution>
<goals>
@@ -171,7 +170,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
- <version>2.5</version>
<configuration>
<useReleaseProfile>false</useReleaseProfile>
<preparationGoals>clean install</preparationGoals>
@@ -183,6 +181,16 @@
</plugins>
<pluginManagement>
<plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-release-plugin</artifactId>
+ <version>2.5</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <version>2.3</version>
+ </plugin>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
Modified: webservices/wss4j/trunk/ws-security-common/pom.xml
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/pom.xml?rev=1667759&r1=1667758&r2=1667759&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-common/pom.xml (original)
+++ webservices/wss4j/trunk/ws-security-common/pom.xml Thu Mar 19 14:11:39 2015
@@ -25,10 +25,8 @@
<relativePath>../parent/pom.xml</relativePath>
<version>2.1.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.wss4j</groupId>
<artifactId>wss4j-ws-security-common</artifactId>
<name>Apache WSS4J WS-Security Common</name>
- <version>2.1.0-SNAPSHOT</version>
<properties>
<wss4j.osgi.import>
@@ -79,7 +77,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>2.4</version>
<executions>
<execution>
<goals>
Modified: webservices/wss4j/trunk/ws-security-dom/pom.xml
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/pom.xml?rev=1667759&r1=1667758&r2=1667759&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/pom.xml (original)
+++ webservices/wss4j/trunk/ws-security-dom/pom.xml Thu Mar 19 14:11:39 2015
@@ -25,10 +25,8 @@
<relativePath>../parent/pom.xml</relativePath>
<version>2.1.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.wss4j</groupId>
<artifactId>wss4j-ws-security-dom</artifactId>
<name>Apache WSS4J DOM WS-Security</name>
- <version>2.1.0-SNAPSHOT</version>
<properties>
<wss4j.osgi.dynamic.import>
@@ -72,7 +70,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>2.4</version>
<executions>
<execution>
<goals>
Modified: webservices/wss4j/trunk/ws-security-policy-stax/pom.xml
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-policy-stax/pom.xml?rev=1667759&r1=1667758&r2=1667759&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-policy-stax/pom.xml (original)
+++ webservices/wss4j/trunk/ws-security-policy-stax/pom.xml Thu Mar 19 14:11:39 2015
@@ -26,9 +26,7 @@
<relativePath>../parent/pom.xml</relativePath>
<version>2.1.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.wss4j</groupId>
<artifactId>wss4j-ws-security-policy-stax</artifactId>
- <version>2.1.0-SNAPSHOT</version>
<name>Apache WSS4J Streaming WS-SecurityPolicy</name>
<dependencies>
Modified: webservices/wss4j/trunk/ws-security-stax/pom.xml
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/pom.xml?rev=1667759&r1=1667758&r2=1667759&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/pom.xml (original)
+++ webservices/wss4j/trunk/ws-security-stax/pom.xml Thu Mar 19 14:11:39 2015
@@ -26,9 +26,7 @@
<relativePath>../parent/pom.xml</relativePath>
<version>2.1.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.wss4j</groupId>
<artifactId>wss4j-ws-security-stax</artifactId>
- <version>2.1.0-SNAPSHOT</version>
<name>Apache WSS4J Streaming WS-Security</name>
<dependencies>
@@ -107,7 +105,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>2.4</version>
<executions>
<execution>
<goals>