Author: rombert
Date: Sun Dec 15 21:28:32 2013
New Revision: 1551060
URL: http://svn.apache.org/r1551060
Log:
SLING-3286 - Remove plugin version overrides from poms
Remove most plugin version overrides. Still left in:
- a couple of projects where upgrading to the maven-bundle-plugins
leads to errors (TODOs added)
- a couple of projects where the plugin version is newer than the
one from the parent project ( comments added )
Modified:
sling/trunk/bundles/api/pom.xml
sling/trunk/bundles/auth/core/pom.xml
sling/trunk/bundles/commons/log/pom.xml
sling/trunk/bundles/commons/mime/pom.xml
sling/trunk/bundles/commons/scheduler/pom.xml
sling/trunk/bundles/extensions/fsresource/pom.xml
sling/trunk/bundles/extensions/serviceusermapper/pom.xml
sling/trunk/bundles/extensions/settings/pom.xml
sling/trunk/bundles/extensions/threaddump/pom.xml
sling/trunk/bundles/jcr/contentloader/pom.xml
sling/trunk/bundles/jcr/davex/pom.xml
sling/trunk/bundles/jcr/jackrabbit-server/pom.xml
sling/trunk/bundles/jcr/jackrabbit-usermanager/pom.xml
sling/trunk/bundles/jcr/registration/pom.xml
sling/trunk/bundles/jcr/resource/pom.xml
sling/trunk/bundles/resourceaccesssecurity/pom.xml
sling/trunk/bundles/resourceresolver/pom.xml
sling/trunk/contrib/extensions/gwt/sample/pom.xml
sling/trunk/contrib/extensions/gwt/servlet/pom.xml
sling/trunk/contrib/extensions/i18n/pom.xml
sling/trunk/contrib/extensions/obr/pom.xml
sling/trunk/contrib/extensions/rewriter/pom.xml
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/pom.xml
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf/pom.xml
sling/trunk/contrib/launchpad/testing/pom.xml
sling/trunk/contrib/pom.xml
sling/trunk/contrib/scripting/python/pom.xml
sling/trunk/contrib/scripting/ruby/pom.xml
sling/trunk/contrib/scripting/scala/script/pom.xml
sling/trunk/launchpad/base/pom.xml
sling/trunk/launchpad/builder/pom.xml
sling/trunk/launchpad/test-bundles/pom.xml
sling/trunk/launchpad/test-services-war/pom.xml
sling/trunk/launchpad/test-services/pom.xml
sling/trunk/launchpad/testing-war/pom.xml
sling/trunk/launchpad/testing/pom.xml
sling/trunk/samples/framework-fragment/pom.xml
sling/trunk/testing/samples/integration-tests/pom.xml
Modified: sling/trunk/bundles/api/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/api/pom.xml?rev=1551060&r1=1551059&r2=1551060&view=diff
==============================================================================
--- sling/trunk/bundles/api/pom.xml (original)
+++ sling/trunk/bundles/api/pom.xml Sun Dec 15 21:28:32 2013
@@ -94,7 +94,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>2.4.0</version>
<extensions>true</extensions>
<configuration>
<instructions>
Modified: sling/trunk/bundles/auth/core/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/auth/core/pom.xml?rev=1551060&r1=1551059&r2=1551060&view=diff
==============================================================================
--- sling/trunk/bundles/auth/core/pom.xml (original)
+++ sling/trunk/bundles/auth/core/pom.xml Sun Dec 15 21:28:32 2013
@@ -60,7 +60,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>2.3.7</version>
<extensions>true</extensions>
<configuration>
<instructions>
Modified: sling/trunk/bundles/commons/log/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/commons/log/pom.xml?rev=1551060&r1=1551059&r2=1551060&view=diff
==============================================================================
--- sling/trunk/bundles/commons/log/pom.xml (original)
+++ sling/trunk/bundles/commons/log/pom.xml Sun Dec 15 21:28:32 2013
@@ -161,7 +161,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
- <version>1.8</version>
<executions>
<execution>
<id>reserve-network-port</id>
@@ -218,7 +217,6 @@
<!-- integration tests run with pax-exam -->
<plugin>
<artifactId>maven-failsafe-plugin</artifactId>
- <version>2.12</version>
<executions>
<execution>
<goals>
Modified: sling/trunk/bundles/commons/mime/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/commons/mime/pom.xml?rev=1551060&r1=1551059&r2=1551060&view=diff
==============================================================================
--- sling/trunk/bundles/commons/mime/pom.xml (original)
+++ sling/trunk/bundles/commons/mime/pom.xml Sun Dec 15 21:28:32 2013
@@ -51,7 +51,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>2.3.4</version>
<extensions>true</extensions>
<configuration>
<instructions>
Modified: sling/trunk/bundles/commons/scheduler/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/commons/scheduler/pom.xml?rev=1551060&r1=1551059&r2=1551060&view=diff
==============================================================================
--- sling/trunk/bundles/commons/scheduler/pom.xml (original)
+++ sling/trunk/bundles/commons/scheduler/pom.xml Sun Dec 15 21:28:32 2013
@@ -51,7 +51,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>2.3.7</version>
<extensions>true</extensions>
<configuration>
<instructions>
Modified: sling/trunk/bundles/extensions/fsresource/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/fsresource/pom.xml?rev=1551060&r1=1551059&r2=1551060&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/fsresource/pom.xml (original)
+++ sling/trunk/bundles/extensions/fsresource/pom.xml Sun Dec 15 21:28:32 2013
@@ -54,7 +54,6 @@
<plugin>
<groupId>org.apache.sling</groupId>
<artifactId>maven-sling-plugin</artifactId>
- <version>2.1.0</version>
<executions>
<execution>
<id>generate-adapter-metadata</id>
Modified: sling/trunk/bundles/extensions/serviceusermapper/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/serviceusermapper/pom.xml?rev=1551060&r1=1551059&r2=1551060&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/serviceusermapper/pom.xml (original)
+++ sling/trunk/bundles/extensions/serviceusermapper/pom.xml Sun Dec 15
21:28:32 2013
@@ -51,7 +51,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-scr-plugin</artifactId>
- <version>1.11.0</version>
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
Modified: sling/trunk/bundles/extensions/settings/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/settings/pom.xml?rev=1551060&r1=1551059&r2=1551060&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/settings/pom.xml (original)
+++ sling/trunk/bundles/extensions/settings/pom.xml Sun Dec 15 21:28:32 2013
@@ -58,7 +58,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>2.3.7</version>
<extensions>true</extensions>
<configuration>
<instructions>
Modified: sling/trunk/bundles/extensions/threaddump/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/threaddump/pom.xml?rev=1551060&r1=1551059&r2=1551060&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/threaddump/pom.xml (original)
+++ sling/trunk/bundles/extensions/threaddump/pom.xml Sun Dec 15 21:28:32 2013
@@ -54,7 +54,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>2.3.7</version>
<extensions>true</extensions>
<configuration>
<instructions>
Modified: sling/trunk/bundles/jcr/contentloader/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/contentloader/pom.xml?rev=1551060&r1=1551059&r2=1551060&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/contentloader/pom.xml (original)
+++ sling/trunk/bundles/jcr/contentloader/pom.xml Sun Dec 15 21:28:32 2013
@@ -50,7 +50,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>2.3.4</version>
<extensions>true</extensions>
<configuration>
<instructions>
Modified: sling/trunk/bundles/jcr/davex/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/davex/pom.xml?rev=1551060&r1=1551059&r2=1551060&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/davex/pom.xml (original)
+++ sling/trunk/bundles/jcr/davex/pom.xml Sun Dec 15 21:28:32 2013
@@ -41,7 +41,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>2.3.4</version>
<extensions>true</extensions>
<configuration>
<instructions>
Modified: sling/trunk/bundles/jcr/jackrabbit-server/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/jackrabbit-server/pom.xml?rev=1551060&r1=1551059&r2=1551060&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/jackrabbit-server/pom.xml (original)
+++ sling/trunk/bundles/jcr/jackrabbit-server/pom.xml Sun Dec 15 21:28:32 2013
@@ -84,7 +84,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>2.3.7</version>
<extensions>true</extensions>
<configuration>
<instructions>
Modified: sling/trunk/bundles/jcr/jackrabbit-usermanager/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/jackrabbit-usermanager/pom.xml?rev=1551060&r1=1551059&r2=1551060&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/jackrabbit-usermanager/pom.xml (original)
+++ sling/trunk/bundles/jcr/jackrabbit-usermanager/pom.xml Sun Dec 15 21:28:32
2013
@@ -57,7 +57,6 @@
<plugin>
<groupId>org.apache.sling</groupId>
<artifactId>maven-sling-plugin</artifactId>
- <version>2.1.0</version>
<executions>
<execution>
<id>generate-adapter-metadata</id>
Modified: sling/trunk/bundles/jcr/registration/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/registration/pom.xml?rev=1551060&r1=1551059&r2=1551060&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/registration/pom.xml (original)
+++ sling/trunk/bundles/jcr/registration/pom.xml Sun Dec 15 21:28:32 2013
@@ -51,7 +51,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>2.3.7</version>
<extensions>true</extensions>
<configuration>
<instructions>
Modified: sling/trunk/bundles/jcr/resource/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/resource/pom.xml?rev=1551060&r1=1551059&r2=1551060&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/resource/pom.xml (original)
+++ sling/trunk/bundles/jcr/resource/pom.xml Sun Dec 15 21:28:32 2013
@@ -61,7 +61,6 @@
<plugin>
<groupId>org.apache.sling</groupId>
<artifactId>maven-sling-plugin</artifactId>
- <version>2.1.0</version>
<executions>
<execution>
<id>generate-adapter-metadata</id>
@@ -75,7 +74,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>2.3.7</version>
<extensions>true</extensions>
<configuration>
<instructions>
Modified: sling/trunk/bundles/resourceaccesssecurity/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/resourceaccesssecurity/pom.xml?rev=1551060&r1=1551059&r2=1551060&view=diff
==============================================================================
--- sling/trunk/bundles/resourceaccesssecurity/pom.xml (original)
+++ sling/trunk/bundles/resourceaccesssecurity/pom.xml Sun Dec 15 21:28:32 2013
@@ -61,7 +61,6 @@
<plugin>
<groupId>org.apache.sling</groupId>
<artifactId>maven-sling-plugin</artifactId>
- <version>2.1.0</version>
<executions>
<execution>
<id>generate-adapter-metadata</id>
Modified: sling/trunk/bundles/resourceresolver/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/resourceresolver/pom.xml?rev=1551060&r1=1551059&r2=1551060&view=diff
==============================================================================
--- sling/trunk/bundles/resourceresolver/pom.xml (original)
+++ sling/trunk/bundles/resourceresolver/pom.xml Sun Dec 15 21:28:32 2013
@@ -61,7 +61,6 @@
<plugin>
<groupId>org.apache.sling</groupId>
<artifactId>maven-sling-plugin</artifactId>
- <version>2.1.0</version>
<executions>
<execution>
<id>generate-adapter-metadata</id>
Modified: sling/trunk/contrib/extensions/gwt/sample/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/gwt/sample/pom.xml?rev=1551060&r1=1551059&r2=1551060&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/gwt/sample/pom.xml (original)
+++ sling/trunk/contrib/extensions/gwt/sample/pom.xml Sun Dec 15 21:28:32 2013
@@ -73,7 +73,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>2.3.7</version>
<extensions>true</extensions>
<configuration>
<instructions>
Modified: sling/trunk/contrib/extensions/gwt/servlet/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/gwt/servlet/pom.xml?rev=1551060&r1=1551059&r2=1551060&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/gwt/servlet/pom.xml (original)
+++ sling/trunk/contrib/extensions/gwt/servlet/pom.xml Sun Dec 15 21:28:32 2013
@@ -55,6 +55,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
+ <!-- TODO - Upgrading to 2.4.0 leads to errors about
unresolved references -->
<version>2.3.7</version>
<extensions>true</extensions>
<configuration>
Modified: sling/trunk/contrib/extensions/i18n/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/i18n/pom.xml?rev=1551060&r1=1551059&r2=1551060&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/i18n/pom.xml (original)
+++ sling/trunk/contrib/extensions/i18n/pom.xml Sun Dec 15 21:28:32 2013
@@ -111,7 +111,6 @@
</plugin>
<plugin>
<artifactId>maven-clean-plugin</artifactId>
- <version>2.2</version>
<configuration>
<filesets>
<fileset>
Modified: sling/trunk/contrib/extensions/obr/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/obr/pom.xml?rev=1551060&r1=1551059&r2=1551060&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/obr/pom.xml (original)
+++ sling/trunk/contrib/extensions/obr/pom.xml Sun Dec 15 21:28:32 2013
@@ -58,6 +58,7 @@
<artifactId>maven-scr-plugin</artifactId>
</plugin>
<plugin>
+ <!-- TODO: upgrading to 2.4.0 leads to Split package, multiple
jars provide the same package:org/osgi/service/obr -->
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>2.3.7</version>
Modified: sling/trunk/contrib/extensions/rewriter/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/rewriter/pom.xml?rev=1551060&r1=1551059&r2=1551060&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/rewriter/pom.xml (original)
+++ sling/trunk/contrib/extensions/rewriter/pom.xml Sun Dec 15 21:28:32 2013
@@ -52,7 +52,6 @@
<plugin>
<groupId>org.apache.sling</groupId>
<artifactId>maven-sling-plugin</artifactId>
- <version>2.1.0</version>
<executions>
<execution>
<id>generate-adapter-metadata</id>
Modified:
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/pom.xml?rev=1551060&r1=1551059&r2=1551060&view=diff
==============================================================================
---
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/pom.xml
(original)
+++
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/pom.xml
Sun Dec 15 21:28:32 2013
@@ -119,7 +119,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>2.4.0</version>
<extensions>true</extensions>
<configuration>
<instructions>
@@ -134,6 +133,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
+ <!-- Version newer than the one declared in the parent pom -->
<version>3.1</version>
<configuration>
<source>1.6</source>
@@ -143,6 +143,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
+ <!-- Version newer than the one declared in the parent pom -->
<version>2.16</version>
<executions>
<execution>
Modified:
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf/pom.xml?rev=1551060&r1=1551059&r2=1551060&view=diff
==============================================================================
---
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf/pom.xml
(original)
+++
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf/pom.xml
Sun Dec 15 21:28:32 2013
@@ -71,7 +71,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>2.4.0</version>
<extensions>true</extensions>
<configuration>
<instructions>
@@ -90,6 +89,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
+ <!-- Version newer than the one declared in the parent pom -->
<version>3.1</version>
<configuration>
<source>1.6</source>
Modified: sling/trunk/contrib/launchpad/testing/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/testing/pom.xml?rev=1551060&r1=1551059&r2=1551060&view=diff
==============================================================================
--- sling/trunk/contrib/launchpad/testing/pom.xml (original)
+++ sling/trunk/contrib/launchpad/testing/pom.xml Sun Dec 15 21:28:32 2013
@@ -142,6 +142,7 @@
<plugin>
<groupId>org.apache.sling</groupId>
<artifactId>maven-launchpad-plugin</artifactId>
+ <!-- Version newer than the one declared in the parent pom -->
<version>2.2.1-SNAPSHOT</version>
<executions>
<execution>
Modified: sling/trunk/contrib/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/pom.xml?rev=1551060&r1=1551059&r2=1551060&view=diff
==============================================================================
--- sling/trunk/contrib/pom.xml (original)
+++ sling/trunk/contrib/pom.xml Sun Dec 15 21:28:32 2013
@@ -64,7 +64,6 @@
<plugins>
<plugin>
<artifactId>maven-clean-plugin</artifactId>
- <version>2.2</version>
<configuration>
<filesets>
<fileset>
Modified: sling/trunk/contrib/scripting/python/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/python/pom.xml?rev=1551060&r1=1551059&r2=1551060&view=diff
==============================================================================
--- sling/trunk/contrib/scripting/python/pom.xml (original)
+++ sling/trunk/contrib/scripting/python/pom.xml Sun Dec 15 21:28:32 2013
@@ -51,7 +51,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>2.3.7</version>
<extensions>true</extensions>
<configuration>
<instructions>
Modified: sling/trunk/contrib/scripting/ruby/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/ruby/pom.xml?rev=1551060&r1=1551059&r2=1551060&view=diff
==============================================================================
--- sling/trunk/contrib/scripting/ruby/pom.xml (original)
+++ sling/trunk/contrib/scripting/ruby/pom.xml Sun Dec 15 21:28:32 2013
@@ -51,7 +51,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>2.3.7</version>
<extensions>true</extensions>
<configuration>
<instructions>
Modified: sling/trunk/contrib/scripting/scala/script/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/scala/script/pom.xml?rev=1551060&r1=1551059&r2=1551060&view=diff
==============================================================================
--- sling/trunk/contrib/scripting/scala/script/pom.xml (original)
+++ sling/trunk/contrib/scripting/scala/script/pom.xml Sun Dec 15 21:28:32 2013
@@ -100,7 +100,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>2.3.7</version>
<extensions>true</extensions>
<configuration>
<instructions>
Modified: sling/trunk/launchpad/base/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/launchpad/base/pom.xml?rev=1551060&r1=1551059&r2=1551060&view=diff
==============================================================================
--- sling/trunk/launchpad/base/pom.xml (original)
+++ sling/trunk/launchpad/base/pom.xml Sun Dec 15 21:28:32 2013
@@ -52,7 +52,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
- <version>1.7</version>
<executions>
<execution>
<id>testbundles</id>
@@ -81,7 +80,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>2.3.7</version>
<extensions>true</extensions>
<configuration>
<instructions>
Modified: sling/trunk/launchpad/builder/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/launchpad/builder/pom.xml?rev=1551060&r1=1551059&r2=1551060&view=diff
==============================================================================
--- sling/trunk/launchpad/builder/pom.xml (original)
+++ sling/trunk/launchpad/builder/pom.xml Sun Dec 15 21:28:32 2013
@@ -90,7 +90,6 @@
</plugin>
<plugin>
<artifactId>maven-clean-plugin</artifactId>
- <version>2.2</version>
<configuration>
<filesets>
<fileset>
@@ -109,7 +108,6 @@
<plugin>
<groupId>org.apache.sling</groupId>
<artifactId>maven-launchpad-plugin</artifactId>
- <version>2.2.0</version>
<extensions>true</extensions>
<configuration>
<includeDefaultBundles>false</includeDefaultBundles>
Modified: sling/trunk/launchpad/test-bundles/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/launchpad/test-bundles/pom.xml?rev=1551060&r1=1551059&r2=1551060&view=diff
==============================================================================
--- sling/trunk/launchpad/test-bundles/pom.xml (original)
+++ sling/trunk/launchpad/test-bundles/pom.xml Sun Dec 15 21:28:32 2013
@@ -39,7 +39,6 @@
<plugin>
<groupId>org.apache.sling</groupId>
<artifactId>maven-launchpad-plugin</artifactId>
- <version>2.2.0</version>
<extensions>true</extensions>
</plugin>
</plugins>
Modified: sling/trunk/launchpad/test-services-war/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/launchpad/test-services-war/pom.xml?rev=1551060&r1=1551059&r2=1551060&view=diff
==============================================================================
--- sling/trunk/launchpad/test-services-war/pom.xml (original)
+++ sling/trunk/launchpad/test-services-war/pom.xml Sun Dec 15 21:28:32 2013
@@ -56,7 +56,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>2.0.1</version>
<executions>
<execution>
<id>war-manifest</id>
Modified: sling/trunk/launchpad/test-services/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/launchpad/test-services/pom.xml?rev=1551060&r1=1551059&r2=1551060&view=diff
==============================================================================
--- sling/trunk/launchpad/test-services/pom.xml (original)
+++ sling/trunk/launchpad/test-services/pom.xml Sun Dec 15 21:28:32 2013
@@ -87,7 +87,6 @@
<plugin>
<groupId>org.apache.sling</groupId>
<artifactId>maven-sling-plugin</artifactId>
- <version>2.1.0</version>
<executions>
<execution>
<id>generate-adapter-metadata</id>
Modified: sling/trunk/launchpad/testing-war/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/launchpad/testing-war/pom.xml?rev=1551060&r1=1551059&r2=1551060&view=diff
==============================================================================
--- sling/trunk/launchpad/testing-war/pom.xml (original)
+++ sling/trunk/launchpad/testing-war/pom.xml Sun Dec 15 21:28:32 2013
@@ -149,7 +149,6 @@
<plugin>
<groupId>org.apache.sling</groupId>
<artifactId>maven-launchpad-plugin</artifactId>
- <version>2.2.0</version>
<extensions>true</extensions>
<executions>
<execution>
Modified: sling/trunk/launchpad/testing/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/launchpad/testing/pom.xml?rev=1551060&r1=1551059&r2=1551060&view=diff
==============================================================================
--- sling/trunk/launchpad/testing/pom.xml (original)
+++ sling/trunk/launchpad/testing/pom.xml Sun Dec 15 21:28:32 2013
@@ -82,7 +82,6 @@
<plugins>
<plugin>
<artifactId>maven-clean-plugin</artifactId>
- <version>2.2</version>
<configuration>
<filesets>
<fileset>
@@ -90,7 +89,7 @@
<includes>
<include>derby.log</include>
<include>cachedir</include>
- <include>sling</include>
+ <include>sling/**</include>
<include>jackrabbit</include>
<include>coverage.ec</include>
</includes>
@@ -220,6 +219,7 @@
<plugins>
<plugin>
<artifactId>maven-failsafe-plugin</artifactId>
+ <!-- Version newer than the one declared in the parent
pom -->
<version>2.16</version>
<executions>
<execution>
Modified: sling/trunk/samples/framework-fragment/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/samples/framework-fragment/pom.xml?rev=1551060&r1=1551059&r2=1551060&view=diff
==============================================================================
--- sling/trunk/samples/framework-fragment/pom.xml (original)
+++ sling/trunk/samples/framework-fragment/pom.xml Sun Dec 15 21:28:32 2013
@@ -30,7 +30,6 @@
<plugin>
<groupId>org.codehaus.groovy.maven</groupId>
<artifactId>gmaven-plugin</artifactId>
- <version>1.0</version>
<executions>
<execution>
<phase>generate-resources</phase>
Modified: sling/trunk/testing/samples/integration-tests/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/testing/samples/integration-tests/pom.xml?rev=1551060&r1=1551059&r2=1551060&view=diff
==============================================================================
--- sling/trunk/testing/samples/integration-tests/pom.xml (original)
+++ sling/trunk/testing/samples/integration-tests/pom.xml Sun Dec 15 21:28:32
2013
@@ -99,14 +99,13 @@
<plugins>
<plugin>
<artifactId>maven-clean-plugin</artifactId>
- <version>2.2</version>
<configuration>
<filesets>
<fileset>
<directory>${basedir}</directory>
<includes>
<!-- sling folder is the workdir of the
executable jar that we test -->
- <include>sling</include>
+ <include>sling/**</include>
</includes>
</fileset>
</filesets>
@@ -171,7 +170,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.5</version>
<configuration>
<!-- We run all tests in the integration-tests phase -->
<excludes>
@@ -182,7 +180,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
- <version>2.7.2</version>
<executions>
<execution>
<id>integration-test</id>
