You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by ju...@apache.org on 2006/12/04 00:19:57 UTC
svn commit: r481984 - in /jackrabbit/trunk: ./ jackrabbit-api/
jackrabbit-core/ jackrabbit-index-filters/ jackrabbit-jca/
jackrabbit-jcr-commons/ jackrabbit-jcr-rmi/ jackrabbit-jcr-server/
jackrabbit-jcr-tests/ jackrabbit-webapp/ jackrabbit-webdav/
Author: jukka
Date: Sun Dec 3 15:19:55 2006
New Revision: 481984
URL: http://svn.apache.org/viewvc?view=rev&rev=481984
Log:
JCR-332: Maven 2 fine-tuning
Modified:
jackrabbit/trunk/jackrabbit-api/pom.xml
jackrabbit/trunk/jackrabbit-core/pom.xml
jackrabbit/trunk/jackrabbit-index-filters/pom.xml
jackrabbit/trunk/jackrabbit-jca/pom.xml
jackrabbit/trunk/jackrabbit-jcr-commons/pom.xml
jackrabbit/trunk/jackrabbit-jcr-rmi/pom.xml
jackrabbit/trunk/jackrabbit-jcr-server/pom.xml
jackrabbit/trunk/jackrabbit-jcr-tests/pom.xml
jackrabbit/trunk/jackrabbit-webapp/pom.xml
jackrabbit/trunk/jackrabbit-webdav/pom.xml
jackrabbit/trunk/pom.xml
Modified: jackrabbit/trunk/jackrabbit-api/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-api/pom.xml?view=diff&rev=481984&r1=481983&r2=481984
==============================================================================
--- jackrabbit/trunk/jackrabbit-api/pom.xml (original)
+++ jackrabbit/trunk/jackrabbit-api/pom.xml Sun Dec 3 15:19:55 2006
@@ -59,15 +59,6 @@
</includes>
</resource>
</resources>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <target>1.4</target>
- <source>1.4</source>
- </configuration>
- </plugin>
- </plugins>
</build>
<dependencies>
Modified: jackrabbit/trunk/jackrabbit-core/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/pom.xml?view=diff&rev=481984&r1=481983&r2=481984
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/pom.xml (original)
+++ jackrabbit/trunk/jackrabbit-core/pom.xml Sun Dec 3 15:19:55 2006
@@ -222,13 +222,6 @@
</dependencies>
</plugin>
<plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <target>1.4</target>
- <source>1.4</source>
- </configuration>
- </plugin>
- <plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<skip>true</skip>
Modified: jackrabbit/trunk/jackrabbit-index-filters/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-index-filters/pom.xml?view=diff&rev=481984&r1=481983&r2=481984
==============================================================================
--- jackrabbit/trunk/jackrabbit-index-filters/pom.xml (original)
+++ jackrabbit/trunk/jackrabbit-index-filters/pom.xml Sun Dec 3 15:19:55 2006
@@ -59,15 +59,6 @@
</includes>
</resource>
</resources>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <target>1.4</target>
- <source>1.4</source>
- </configuration>
- </plugin>
- </plugins>
</build>
<dependencies>
Modified: jackrabbit/trunk/jackrabbit-jca/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jca/pom.xml?view=diff&rev=481984&r1=481983&r2=481984
==============================================================================
--- jackrabbit/trunk/jackrabbit-jca/pom.xml (original)
+++ jackrabbit/trunk/jackrabbit-jca/pom.xml Sun Dec 3 15:19:55 2006
@@ -66,13 +66,6 @@
</resources>
<plugins>
<plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <target>1.4</target>
- <source>1.4</source>
- </configuration>
- </plugin>
- <plugin>
<artifactId>maven-rar-plugin</artifactId>
<configuration>
<includeJar>true</includeJar>
Modified: jackrabbit/trunk/jackrabbit-jcr-commons/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-commons/pom.xml?view=diff&rev=481984&r1=481983&r2=481984
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-commons/pom.xml (original)
+++ jackrabbit/trunk/jackrabbit-jcr-commons/pom.xml Sun Dec 3 15:19:55 2006
@@ -59,15 +59,6 @@
</includes>
</resource>
</resources>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <target>1.4</target>
- <source>1.4</source>
- </configuration>
- </plugin>
- </plugins>
</build>
<dependencies>
Modified: jackrabbit/trunk/jackrabbit-jcr-rmi/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-rmi/pom.xml?view=diff&rev=481984&r1=481983&r2=481984
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-rmi/pom.xml (original)
+++ jackrabbit/trunk/jackrabbit-jcr-rmi/pom.xml Sun Dec 3 15:19:55 2006
@@ -62,13 +62,6 @@
</resources>
<plugins>
<plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <target>1.4</target>
- <source>1.4</source>
- </configuration>
- </plugin>
- <plugin>
<inherited>true</inherited>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
Modified: jackrabbit/trunk/jackrabbit-jcr-server/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-server/pom.xml?view=diff&rev=481984&r1=481983&r2=481984
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-server/pom.xml (original)
+++ jackrabbit/trunk/jackrabbit-jcr-server/pom.xml Sun Dec 3 15:19:55 2006
@@ -59,15 +59,6 @@
</includes>
</resource>
</resources>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <target>1.4</target>
- <source>1.4</source>
- </configuration>
- </plugin>
- </plugins>
</build>
<dependencies>
Modified: jackrabbit/trunk/jackrabbit-jcr-tests/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-tests/pom.xml?view=diff&rev=481984&r1=481983&r2=481984
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-tests/pom.xml (original)
+++ jackrabbit/trunk/jackrabbit-jcr-tests/pom.xml Sun Dec 3 15:19:55 2006
@@ -66,15 +66,6 @@
</includes>
</resource>
</resources>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <target>1.4</target>
- <source>1.4</source>
- </configuration>
- </plugin>
- </plugins>
</build>
<dependencies>
Modified: jackrabbit/trunk/jackrabbit-webapp/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-webapp/pom.xml?view=diff&rev=481984&r1=481983&r2=481984
==============================================================================
--- jackrabbit/trunk/jackrabbit-webapp/pom.xml (original)
+++ jackrabbit/trunk/jackrabbit-webapp/pom.xml Sun Dec 3 15:19:55 2006
@@ -60,15 +60,6 @@
</includes>
</resource>
</resources>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <target>1.4</target>
- <source>1.4</source>
- </configuration>
- </plugin>
- </plugins>
</build>
<dependencies>
Modified: jackrabbit/trunk/jackrabbit-webdav/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-webdav/pom.xml?view=diff&rev=481984&r1=481983&r2=481984
==============================================================================
--- jackrabbit/trunk/jackrabbit-webdav/pom.xml (original)
+++ jackrabbit/trunk/jackrabbit-webdav/pom.xml Sun Dec 3 15:19:55 2006
@@ -59,15 +59,6 @@
</includes>
</resource>
</resources>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <target>1.4</target>
- <source>1.4</source>
- </configuration>
- </plugin>
- </plugins>
</build>
<dependencies>
Modified: jackrabbit/trunk/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/pom.xml?view=diff&rev=481984&r1=481983&r2=481984
==============================================================================
--- jackrabbit/trunk/pom.xml (original)
+++ jackrabbit/trunk/pom.xml Sun Dec 3 15:19:55 2006
@@ -59,6 +59,34 @@
<module>jackrabbit-jca</module>
</modules>
+ <build>
+ <plugins>
+ <!-- User Java 1.4 everywhere -->
+ <plugin>
+ <inherited>true</inherited>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <target>1.4</target>
+ <source>1.4</source>
+ </configuration>
+ </plugin>
+ <!-- Interoperate with Maven 1 -->
+ <plugin>
+ <inherited>true</inherited>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-one-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>install-maven-one-repository</goal>
+ </goals>
+ <phase>install</phase>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
<!-- ====================================================================== -->
<!-- M A I L I N G L I S T S -->
<!-- ====================================================================== -->