jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ju...@apache.org
Subject svn commit: r1196706 - in /jackrabbit/trunk: jackrabbit-core/ jackrabbit-jcr-rmi/ jackrabbit-parent/ jackrabbit-spi-commons/ jackrabbit-webapp/ test/performance/ test/performance/base/ test/performance/jackrabbit10/ test/performance/jackrabbit11/ test/...
Date Wed, 02 Nov 2011 17:17:32 GMT
Author: jukka
Date: Wed Nov  2 17:17:32 2011
New Revision: 1196706

URL: http://svn.apache.org/viewvc?rev=1196706&view=rev
Log:
JCR-3136: Add m2e lifecycle mappings for Eclipse Indigo

Also some POM cleanups and upgrade to Apache parent version 10. No functional impact.

Modified:
    jackrabbit/trunk/jackrabbit-core/pom.xml
    jackrabbit/trunk/jackrabbit-jcr-rmi/pom.xml
    jackrabbit/trunk/jackrabbit-parent/pom.xml
    jackrabbit/trunk/jackrabbit-spi-commons/pom.xml
    jackrabbit/trunk/jackrabbit-webapp/pom.xml
    jackrabbit/trunk/test/performance/base/pom.xml
    jackrabbit/trunk/test/performance/jackrabbit10/pom.xml
    jackrabbit/trunk/test/performance/jackrabbit11/pom.xml
    jackrabbit/trunk/test/performance/jackrabbit12/pom.xml
    jackrabbit/trunk/test/performance/jackrabbit13/pom.xml
    jackrabbit/trunk/test/performance/jackrabbit14/pom.xml
    jackrabbit/trunk/test/performance/jackrabbit15/pom.xml
    jackrabbit/trunk/test/performance/jackrabbit16/pom.xml
    jackrabbit/trunk/test/performance/jackrabbit20/pom.xml
    jackrabbit/trunk/test/performance/jackrabbit21/pom.xml
    jackrabbit/trunk/test/performance/jackrabbit22/pom.xml
    jackrabbit/trunk/test/performance/jackrabbit23/pom.xml
    jackrabbit/trunk/test/performance/jackrabbit24/pom.xml
    jackrabbit/trunk/test/performance/parent/pom.xml
    jackrabbit/trunk/test/performance/pom.xml

Modified: jackrabbit/trunk/jackrabbit-core/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/pom.xml?rev=1196706&r1=1196705&r2=1196706&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/pom.xml (original)
+++ jackrabbit/trunk/jackrabbit-core/pom.xml Wed Nov  2 17:17:32 2011
@@ -46,14 +46,14 @@
             <id>process-test-resources</id>
             <phase>process-test-resources</phase>
             <configuration>
-              <tasks>
+              <target>
                 <copy todir="${project.build.directory}/repository">
                   <fileset dir="${basedir}/src/test/repository" />
                 </copy>
                 <copy todir="${project.build.directory}/repository-2">
                   <fileset dir="${basedir}/src/test/repository" />
                 </copy>
-              </tasks>
+              </target>
             </configuration>
             <goals>
               <goal>run</goal>
@@ -177,6 +177,35 @@ org.apache.jackrabbit.core.data.GarbageC
         <filtering>true</filtering>
       </resource>
     </resources>
+    <pluginManagement>
+      <plugins>
+        <!-- JCR-3136: Add m2e lifecycle mappings for Eclipse Indigo -->
+        <plugin>
+          <groupId>org.eclipse.m2e</groupId>
+          <artifactId>lifecycle-mapping</artifactId>
+          <version>1.0.0</version>
+          <configuration>
+            <lifecycleMappingMetadata>
+              <pluginExecutions>
+                <pluginExecution>
+                  <pluginExecutionFilter>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-antrun-plugin</artifactId>
+                    <versionRange>[1.6,)</versionRange>
+                    <goals>
+                      <goal>run</goal>
+                    </goals>
+                  </pluginExecutionFilter>
+                  <action>
+                    <ignore/>
+                  </action>
+                </pluginExecution>
+              </pluginExecutions>
+            </lifecycleMappingMetadata>
+          </configuration>
+        </plugin>
+      </plugins>
+    </pluginManagement>
   </build>
 
   <dependencies>
@@ -449,7 +478,7 @@ org.apache.jackrabbit.core.data.GarbageC
               <id>overlay-repository-descriptors</id>
               <phase>process-test-resources</phase>
               <configuration>
-                <tasks>
+                <target>
                   <copy todir="${project.build.directory}/repository" overwrite="true">
                     <fileset dir="${basedir}/src/test/repository-descriptor-overlay" />
                     <filterset>
@@ -482,7 +511,7 @@ org.apache.jackrabbit.core.data.GarbageC
                       <filter token="config.db.journalclass" value="${config.db.journalclass}"
/>
                     </filterset>
                   </copy>
-                </tasks>
+                </target>
               </configuration>
               <goals>
                 <goal>run</goal>

Modified: jackrabbit/trunk/jackrabbit-jcr-rmi/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-rmi/pom.xml?rev=1196706&r1=1196705&r2=1196706&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-rmi/pom.xml (original)
+++ jackrabbit/trunk/jackrabbit-jcr-rmi/pom.xml Wed Nov  2 17:17:32 2011
@@ -51,9 +51,9 @@
             <id>rmic</id>
             <phase>process-classes</phase>
             <configuration>
-              <tasks>
+              <target>
                 <rmic base="${project.build.outputDirectory}" verify="true" classpathref="maven.compile.classpath"
/>
-              </tasks>
+              </target>
             </configuration>
             <goals>
               <goal>run</goal>

Modified: jackrabbit/trunk/jackrabbit-parent/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-parent/pom.xml?rev=1196706&r1=1196705&r2=1196706&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-parent/pom.xml (original)
+++ jackrabbit/trunk/jackrabbit-parent/pom.xml Wed Nov  2 17:17:32 2011
@@ -27,7 +27,7 @@
   <parent>
     <groupId>org.apache</groupId>
     <artifactId>apache</artifactId>
-    <version>9</version>
+    <version>10</version>
     <relativePath />
   </parent>
 

Modified: jackrabbit/trunk/jackrabbit-spi-commons/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-spi-commons/pom.xml?rev=1196706&r1=1196705&r2=1196706&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-spi-commons/pom.xml (original)
+++ jackrabbit/trunk/jackrabbit-spi-commons/pom.xml Wed Nov  2 17:17:32 2011
@@ -59,7 +59,7 @@
             <id>delete-sources</id>
             <phase>process-sources</phase>
             <configuration>
-              <tasks>
+              <target>
                 <echo>Remove files that have been customized in Jackrabbit</echo>
                 <delete>
                   <fileset dir="${project.build.directory}/generated-sources/javacc/org/apache/jackrabbit/spi/commons/query">
@@ -70,7 +70,7 @@
                     <include name="xpath/SimpleNode.java" />
                   </fileset>
                 </delete>
-              </tasks>
+              </target>
             </configuration>
             <goals>
               <goal>run</goal>
@@ -133,6 +133,48 @@
         </configuration>
       </plugin>
     </plugins>
+    <pluginManagement>
+      <plugins>
+        <!-- JCR-3136: Add m2e lifecycle mappings for Eclipse Indigo -->
+        <plugin>
+          <groupId>org.eclipse.m2e</groupId>
+          <artifactId>lifecycle-mapping</artifactId>
+          <version>1.0.0</version>
+          <configuration>
+            <lifecycleMappingMetadata>
+              <pluginExecutions>
+                <pluginExecution>
+                  <pluginExecutionFilter>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-antrun-plugin</artifactId>
+                    <versionRange>[1.6,)</versionRange>
+                    <goals>
+                      <goal>run</goal>
+                    </goals>
+                  </pluginExecutionFilter>
+                  <action>
+                    <execute/>
+                  </action>
+                </pluginExecution>
+                <pluginExecution>
+                  <pluginExecutionFilter>
+                    <groupId>org.codehaus.mojo</groupId>
+                    <artifactId>javacc-maven-plugin</artifactId>
+                    <versionRange>[2.4.1,)</versionRange>
+                    <goals>
+                      <goal>jjtree-javacc</goal>
+                    </goals>
+                  </pluginExecutionFilter>
+                  <action>
+                    <execute/>
+                  </action>
+                </pluginExecution>
+              </pluginExecutions>
+            </lifecycleMappingMetadata>
+          </configuration>
+        </plugin>
+      </plugins>
+    </pluginManagement>
   </build>
 
   <dependencies>

Modified: jackrabbit/trunk/jackrabbit-webapp/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-webapp/pom.xml?rev=1196706&r1=1196705&r2=1196706&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-webapp/pom.xml (original)
+++ jackrabbit/trunk/jackrabbit-webapp/pom.xml Wed Nov  2 17:17:32 2011
@@ -154,9 +154,9 @@
           <execution>
             <phase>package</phase>
             <configuration>
-              <tasks>
+              <target>
                 <jar basedir="${project.build.outputDirectory}" destfile="${project.build.directory}/jackrabbit-webapp-${project.version}.jar"
/>
-              </tasks>
+              </target>
             </configuration>
             <goals>
               <goal>run</goal>

Modified: jackrabbit/trunk/test/performance/base/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/test/performance/base/pom.xml?rev=1196706&r1=1196705&r2=1196706&view=diff
==============================================================================
--- jackrabbit/trunk/test/performance/base/pom.xml (original)
+++ jackrabbit/trunk/test/performance/base/pom.xml Wed Nov  2 17:17:32 2011
@@ -26,12 +26,11 @@
   <parent>
     <groupId>org.apache.jackrabbit</groupId>
     <artifactId>jackrabbit-perf-parent</artifactId>
-    <version>SNAPSHOT</version>
+    <version>1-SNAPSHOT</version>
     <relativePath>../parent/pom.xml</relativePath>
   </parent>
 
   <artifactId>jackrabbit-perf-base</artifactId>
-  <version>SNAPSHOT</version>
   <name>Jackrabbit Performance Test Utilities</name>
 
   <dependencies>

Modified: jackrabbit/trunk/test/performance/jackrabbit10/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/test/performance/jackrabbit10/pom.xml?rev=1196706&r1=1196705&r2=1196706&view=diff
==============================================================================
--- jackrabbit/trunk/test/performance/jackrabbit10/pom.xml (original)
+++ jackrabbit/trunk/test/performance/jackrabbit10/pom.xml Wed Nov  2 17:17:32 2011
@@ -26,7 +26,7 @@
   <parent>
     <groupId>org.apache.jackrabbit</groupId>
     <artifactId>jackrabbit-perf-parent</artifactId>
-    <version>SNAPSHOT</version>
+    <version>1-SNAPSHOT</version>
     <relativePath>../parent/pom.xml</relativePath>
   </parent>
 

Modified: jackrabbit/trunk/test/performance/jackrabbit11/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/test/performance/jackrabbit11/pom.xml?rev=1196706&r1=1196705&r2=1196706&view=diff
==============================================================================
--- jackrabbit/trunk/test/performance/jackrabbit11/pom.xml (original)
+++ jackrabbit/trunk/test/performance/jackrabbit11/pom.xml Wed Nov  2 17:17:32 2011
@@ -26,7 +26,7 @@
   <parent>
     <groupId>org.apache.jackrabbit</groupId>
     <artifactId>jackrabbit-perf-parent</artifactId>
-    <version>SNAPSHOT</version>
+    <version>1-SNAPSHOT</version>
     <relativePath>../parent/pom.xml</relativePath>
   </parent>
 

Modified: jackrabbit/trunk/test/performance/jackrabbit12/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/test/performance/jackrabbit12/pom.xml?rev=1196706&r1=1196705&r2=1196706&view=diff
==============================================================================
--- jackrabbit/trunk/test/performance/jackrabbit12/pom.xml (original)
+++ jackrabbit/trunk/test/performance/jackrabbit12/pom.xml Wed Nov  2 17:17:32 2011
@@ -26,7 +26,7 @@
   <parent>
     <groupId>org.apache.jackrabbit</groupId>
     <artifactId>jackrabbit-perf-parent</artifactId>
-    <version>SNAPSHOT</version>
+    <version>1-SNAPSHOT</version>
     <relativePath>../parent/pom.xml</relativePath>
   </parent>
 

Modified: jackrabbit/trunk/test/performance/jackrabbit13/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/test/performance/jackrabbit13/pom.xml?rev=1196706&r1=1196705&r2=1196706&view=diff
==============================================================================
--- jackrabbit/trunk/test/performance/jackrabbit13/pom.xml (original)
+++ jackrabbit/trunk/test/performance/jackrabbit13/pom.xml Wed Nov  2 17:17:32 2011
@@ -26,7 +26,7 @@
   <parent>
     <groupId>org.apache.jackrabbit</groupId>
     <artifactId>jackrabbit-perf-parent</artifactId>
-    <version>SNAPSHOT</version>
+    <version>1-SNAPSHOT</version>
     <relativePath>../parent/pom.xml</relativePath>
   </parent>
 

Modified: jackrabbit/trunk/test/performance/jackrabbit14/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/test/performance/jackrabbit14/pom.xml?rev=1196706&r1=1196705&r2=1196706&view=diff
==============================================================================
--- jackrabbit/trunk/test/performance/jackrabbit14/pom.xml (original)
+++ jackrabbit/trunk/test/performance/jackrabbit14/pom.xml Wed Nov  2 17:17:32 2011
@@ -26,7 +26,7 @@
   <parent>
     <groupId>org.apache.jackrabbit</groupId>
     <artifactId>jackrabbit-perf-parent</artifactId>
-    <version>SNAPSHOT</version>
+    <version>1-SNAPSHOT</version>
     <relativePath>../parent/pom.xml</relativePath>
   </parent>
 

Modified: jackrabbit/trunk/test/performance/jackrabbit15/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/test/performance/jackrabbit15/pom.xml?rev=1196706&r1=1196705&r2=1196706&view=diff
==============================================================================
--- jackrabbit/trunk/test/performance/jackrabbit15/pom.xml (original)
+++ jackrabbit/trunk/test/performance/jackrabbit15/pom.xml Wed Nov  2 17:17:32 2011
@@ -26,7 +26,7 @@
   <parent>
     <groupId>org.apache.jackrabbit</groupId>
     <artifactId>jackrabbit-perf-parent</artifactId>
-    <version>SNAPSHOT</version>
+    <version>1-SNAPSHOT</version>
     <relativePath>../parent/pom.xml</relativePath>
   </parent>
 

Modified: jackrabbit/trunk/test/performance/jackrabbit16/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/test/performance/jackrabbit16/pom.xml?rev=1196706&r1=1196705&r2=1196706&view=diff
==============================================================================
--- jackrabbit/trunk/test/performance/jackrabbit16/pom.xml (original)
+++ jackrabbit/trunk/test/performance/jackrabbit16/pom.xml Wed Nov  2 17:17:32 2011
@@ -26,7 +26,7 @@
   <parent>
     <groupId>org.apache.jackrabbit</groupId>
     <artifactId>jackrabbit-perf-parent</artifactId>
-    <version>SNAPSHOT</version>
+    <version>1-SNAPSHOT</version>
     <relativePath>../parent/pom.xml</relativePath>
   </parent>
 

Modified: jackrabbit/trunk/test/performance/jackrabbit20/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/test/performance/jackrabbit20/pom.xml?rev=1196706&r1=1196705&r2=1196706&view=diff
==============================================================================
--- jackrabbit/trunk/test/performance/jackrabbit20/pom.xml (original)
+++ jackrabbit/trunk/test/performance/jackrabbit20/pom.xml Wed Nov  2 17:17:32 2011
@@ -26,7 +26,7 @@
   <parent>
     <groupId>org.apache.jackrabbit</groupId>
     <artifactId>jackrabbit-perf-parent</artifactId>
-    <version>SNAPSHOT</version>
+    <version>1-SNAPSHOT</version>
     <relativePath>../parent/pom.xml</relativePath>
   </parent>
 

Modified: jackrabbit/trunk/test/performance/jackrabbit21/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/test/performance/jackrabbit21/pom.xml?rev=1196706&r1=1196705&r2=1196706&view=diff
==============================================================================
--- jackrabbit/trunk/test/performance/jackrabbit21/pom.xml (original)
+++ jackrabbit/trunk/test/performance/jackrabbit21/pom.xml Wed Nov  2 17:17:32 2011
@@ -26,7 +26,7 @@
   <parent>
     <groupId>org.apache.jackrabbit</groupId>
     <artifactId>jackrabbit-perf-parent</artifactId>
-    <version>SNAPSHOT</version>
+    <version>1-SNAPSHOT</version>
     <relativePath>../parent/pom.xml</relativePath>
   </parent>
 

Modified: jackrabbit/trunk/test/performance/jackrabbit22/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/test/performance/jackrabbit22/pom.xml?rev=1196706&r1=1196705&r2=1196706&view=diff
==============================================================================
--- jackrabbit/trunk/test/performance/jackrabbit22/pom.xml (original)
+++ jackrabbit/trunk/test/performance/jackrabbit22/pom.xml Wed Nov  2 17:17:32 2011
@@ -26,7 +26,7 @@
   <parent>
     <groupId>org.apache.jackrabbit</groupId>
     <artifactId>jackrabbit-perf-parent</artifactId>
-    <version>SNAPSHOT</version>
+    <version>1-SNAPSHOT</version>
     <relativePath>../parent/pom.xml</relativePath>
   </parent>
 

Modified: jackrabbit/trunk/test/performance/jackrabbit23/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/test/performance/jackrabbit23/pom.xml?rev=1196706&r1=1196705&r2=1196706&view=diff
==============================================================================
--- jackrabbit/trunk/test/performance/jackrabbit23/pom.xml (original)
+++ jackrabbit/trunk/test/performance/jackrabbit23/pom.xml Wed Nov  2 17:17:32 2011
@@ -26,7 +26,7 @@
   <parent>
     <groupId>org.apache.jackrabbit</groupId>
     <artifactId>jackrabbit-perf-parent</artifactId>
-    <version>SNAPSHOT</version>
+    <version>1-SNAPSHOT</version>
     <relativePath>../parent/pom.xml</relativePath>
   </parent>
 
@@ -49,7 +49,7 @@
     <dependency>
       <groupId>org.apache.jackrabbit</groupId>
       <artifactId>jackrabbit-core</artifactId>
-      <version>2.3-SNAPSHOT</version>
+      <version>2.3.0</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

Modified: jackrabbit/trunk/test/performance/jackrabbit24/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/test/performance/jackrabbit24/pom.xml?rev=1196706&r1=1196705&r2=1196706&view=diff
==============================================================================
--- jackrabbit/trunk/test/performance/jackrabbit24/pom.xml (original)
+++ jackrabbit/trunk/test/performance/jackrabbit24/pom.xml Wed Nov  2 17:17:32 2011
@@ -26,7 +26,7 @@
   <parent>
     <groupId>org.apache.jackrabbit</groupId>
     <artifactId>jackrabbit-perf-parent</artifactId>
-    <version>SNAPSHOT</version>
+    <version>1-SNAPSHOT</version>
     <relativePath>../parent/pom.xml</relativePath>
   </parent>
 

Modified: jackrabbit/trunk/test/performance/parent/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/test/performance/parent/pom.xml?rev=1196706&r1=1196705&r2=1196706&view=diff
==============================================================================
--- jackrabbit/trunk/test/performance/parent/pom.xml (original)
+++ jackrabbit/trunk/test/performance/parent/pom.xml Wed Nov  2 17:17:32 2011
@@ -28,15 +28,16 @@
   <!-- =================================================================== -->
 
   <parent>
-    <groupId>org.apache.jackrabbit</groupId>
-    <artifactId>parent</artifactId>
-    <version>5</version>
-    <relativePath/>
+    <groupId>org.apache</groupId>
+    <artifactId>apache</artifactId>
+    <version>10</version>
+    <relativePath />
   </parent>
 
+  <groupId>org.apache.jackrabbit</groupId>
   <artifactId>jackrabbit-perf-parent</artifactId>
   <name>Jackrabbit Performance Test Parent</name>
-  <version>SNAPSHOT</version>
+  <version>1-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <properties>

Modified: jackrabbit/trunk/test/performance/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/test/performance/pom.xml?rev=1196706&r1=1196705&r2=1196706&view=diff
==============================================================================
--- jackrabbit/trunk/test/performance/pom.xml (original)
+++ jackrabbit/trunk/test/performance/pom.xml Wed Nov  2 17:17:32 2011
@@ -30,7 +30,7 @@
   <parent>
     <groupId>org.apache.jackrabbit</groupId>
     <artifactId>jackrabbit-perf-parent</artifactId>
-    <version>SNAPSHOT</version>
+    <version>1-SNAPSHOT</version>
     <relativePath>parent/pom.xml</relativePath>
   </parent>
 



Mime
View raw message