incubator-sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fmesc...@apache.org
Subject svn commit: r734714 - in /incubator/sling/trunk: extensions/jcrinstall/testing/pom.xml jcr/ocm/pom.xml launchpad/app/pom.xml launchpad/testing/pom.xml launchpad/webapp/pom.xml parent/pom.xml samples/simple-demo/pom.xml
Date Thu, 15 Jan 2009 14:08:58 GMT
Author: fmeschbe
Date: Thu Jan 15 06:08:57 2009
New Revision: 734714

URL: http://svn.apache.org/viewvc?rev=734714&view=rev
Log:
SLING-830 More plugin version consolidation

Modified:
    incubator/sling/trunk/extensions/jcrinstall/testing/pom.xml
    incubator/sling/trunk/jcr/ocm/pom.xml
    incubator/sling/trunk/launchpad/app/pom.xml
    incubator/sling/trunk/launchpad/testing/pom.xml
    incubator/sling/trunk/launchpad/webapp/pom.xml
    incubator/sling/trunk/parent/pom.xml
    incubator/sling/trunk/samples/simple-demo/pom.xml

Modified: incubator/sling/trunk/extensions/jcrinstall/testing/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/extensions/jcrinstall/testing/pom.xml?rev=734714&r1=734713&r2=734714&view=diff
==============================================================================
--- incubator/sling/trunk/extensions/jcrinstall/testing/pom.xml (original)
+++ incubator/sling/trunk/extensions/jcrinstall/testing/pom.xml Thu Jan 15 06:08:57 2009
@@ -96,7 +96,6 @@
             <plugin>
                 <groupId>org.mortbay.jetty</groupId>
                 <artifactId>maven-jetty-plugin</artifactId>
-                <version>6.1.5</version>
                 <configuration>
                     <contextPath>/</contextPath>
                     <scanIntervalSeconds>
@@ -441,7 +440,6 @@
                     <plugin>
                         <groupId>org.codehaus.cargo</groupId>
                         <artifactId>cargo-maven2-plugin</artifactId>
-                        <version>0.3.1</version>
                         <executions>
                             <execution>
                                 <id>start-container</id>

Modified: incubator/sling/trunk/jcr/ocm/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/jcr/ocm/pom.xml?rev=734714&r1=734713&r2=734714&view=diff
==============================================================================
--- incubator/sling/trunk/jcr/ocm/pom.xml (original)
+++ incubator/sling/trunk/jcr/ocm/pom.xml Thu Jan 15 06:08:57 2009
@@ -53,7 +53,6 @@
             <plugin>
                 <groupId>org.apache.sling</groupId>
                 <artifactId>maven-jcrocm-plugin</artifactId>
-                <version>2.0.2-incubator</version>
                 <executions>
                     <execution>
                         <id>generate-JCR-OCM-descriptor</id>

Modified: incubator/sling/trunk/launchpad/app/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/app/pom.xml?rev=734714&r1=734713&r2=734714&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/app/pom.xml (original)
+++ incubator/sling/trunk/launchpad/app/pom.xml Thu Jan 15 06:08:57 2009
@@ -482,7 +482,6 @@
                 <plugins>
                     <plugin>
                         <artifactId>maven-assembly-plugin</artifactId>
-                        <version>2.2-beta-1</version>
                         <executions>
                             <execution>
                                 <id>assemble-distribution</id>

Modified: incubator/sling/trunk/launchpad/testing/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/testing/pom.xml?rev=734714&r1=734713&r2=734714&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/testing/pom.xml (original)
+++ incubator/sling/trunk/launchpad/testing/pom.xml Thu Jan 15 06:08:57 2009
@@ -88,7 +88,6 @@
             <plugin>
                 <groupId>org.mortbay.jetty</groupId>
                 <artifactId>maven-jetty-plugin</artifactId>
-                <version>6.1.5</version>
                 <configuration>
                     <contextPath>/</contextPath>
                     <scanIntervalSeconds>
@@ -380,7 +379,6 @@
                     <plugin>
                         <groupId>org.codehaus.cargo</groupId>
                         <artifactId>cargo-maven2-plugin</artifactId>
-                        <version>0.3.1</version>
                         <executions>
                             <execution>
                                 <id>start-container</id>

Modified: incubator/sling/trunk/launchpad/webapp/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/webapp/pom.xml?rev=734714&r1=734713&r2=734714&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/webapp/pom.xml (original)
+++ incubator/sling/trunk/launchpad/webapp/pom.xml Thu Jan 15 06:08:57 2009
@@ -76,7 +76,6 @@
             <plugin>
                 <groupId>org.mortbay.jetty</groupId>
                 <artifactId>maven-jetty-plugin</artifactId>
-                <version>6.1.5</version>
                 <configuration>
                     <contextPath>/</contextPath>
                     <scanIntervalSeconds>

Modified: incubator/sling/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/parent/pom.xml?rev=734714&r1=734713&r2=734714&view=diff
==============================================================================
--- incubator/sling/trunk/parent/pom.xml (original)
+++ incubator/sling/trunk/parent/pom.xml Thu Jan 15 06:08:57 2009
@@ -143,6 +143,21 @@
         <pluginManagement>
             <plugins>
                 <plugin>
+                    <groupId>org.apache.sling</groupId>
+                    <artifactId>maven-sling-plugin</artifactId>
+                    <version>2.0.2-incubator</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.sling</groupId>
+                    <artifactId>maven-jspc-plugin</artifactId>
+                    <version>2.0.2-incubator</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.sling</groupId>
+                    <artifactId>maven-jcrocm-plugin</artifactId>
+                    <version>2.0.2-incubator</version>
+                </plugin>
+                <plugin>
                     <groupId>org.apache.felix</groupId>
                     <artifactId>maven-scr-plugin</artifactId>
                     <version>1.0.8</version>
@@ -193,6 +208,16 @@
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-surefire-plugin</artifactId>
+                    <version>2.4.3</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-war-plugin</artifactId>
+                    <version>2.1-alpha-2</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-plugin-plugin</artifactId>
                     <version>2.4.2</version>
                 </plugin>
@@ -211,6 +236,16 @@
                     <artifactId>maven-dependency-plugin</artifactId>
                     <version>2.0</version>
                 </plugin>
+                <plugin>
+                    <groupId>org.mortbay.jetty</groupId>
+                    <artifactId>maven-jetty-plugin</artifactId>
+                    <version>6.1.5</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.codehaus.cargo</groupId>
+                    <artifactId>cargo-maven2-plugin</artifactId>
+                    <version>0.3.1</version>
+                </plugin>
             </plugins>
         </pluginManagement>
     </build>

Modified: incubator/sling/trunk/samples/simple-demo/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/samples/simple-demo/pom.xml?rev=734714&r1=734713&r2=734714&view=diff
==============================================================================
--- incubator/sling/trunk/samples/simple-demo/pom.xml (original)
+++ incubator/sling/trunk/samples/simple-demo/pom.xml Thu Jan 15 06:08:57 2009
@@ -52,7 +52,6 @@
             <plugin>
                 <groupId>org.apache.sling</groupId>
                 <artifactId>maven-jcrocm-plugin</artifactId>
-                <version>2.0.2-incubator</version>
                 <executions>
                     <execution>
                         <id>generate-JCR-OCM-descriptor</id>
@@ -67,7 +66,6 @@
             <plugin>
                 <groupId>org.apache.sling</groupId>
                 <artifactId>maven-jspc-plugin</artifactId>
-                <version>2.0.2-incubator</version>
                 <executions>
                     <execution>
                         <id>compile-jsp</id>



Mime
View raw message