You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2008/02/19 15:49:17 UTC
svn commit: r629110 - in /incubator/sling/trunk: jcr/ocm/pom.xml
jcr/resource/pom.xml parent/pom.xml sling/adapter/pom.xml
sling/core/pom.xml sling/sample/pom.xml sling/servlet-resolver/pom.xml
sling/servlets-standard/pom.xml
Author: cziegeler
Date: Tue Feb 19 06:49:14 2008
New Revision: 629110
URL: http://svn.apache.org/viewvc?rev=629110&view=rev
Log:
Remove plugin definition for sling plugins from parent pom to remove the circular dependency. Add missing version info for jspc plugin.
Modified:
incubator/sling/trunk/jcr/ocm/pom.xml
incubator/sling/trunk/jcr/resource/pom.xml
incubator/sling/trunk/parent/pom.xml
incubator/sling/trunk/sling/adapter/pom.xml
incubator/sling/trunk/sling/core/pom.xml
incubator/sling/trunk/sling/sample/pom.xml
incubator/sling/trunk/sling/servlet-resolver/pom.xml
incubator/sling/trunk/sling/servlets-standard/pom.xml
Modified: incubator/sling/trunk/jcr/ocm/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/jcr/ocm/pom.xml?rev=629110&r1=629109&r2=629110&view=diff
==============================================================================
--- incubator/sling/trunk/jcr/ocm/pom.xml (original)
+++ incubator/sling/trunk/jcr/ocm/pom.xml Tue Feb 19 06:49:14 2008
@@ -60,6 +60,15 @@
<plugin>
<groupId>org.apache.sling</groupId>
<artifactId>maven-jcrocm-plugin</artifactId>
+ <version>2.0.0-incubator-SNAPSHOT</version>
+ <executions>
+ <execution>
+ <id>generate-JCR-OCM-descriptor</id>
+ <goals>
+ <goal>ocm</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
Modified: incubator/sling/trunk/jcr/resource/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/jcr/resource/pom.xml?rev=629110&r1=629109&r2=629110&view=diff
==============================================================================
--- incubator/sling/trunk/jcr/resource/pom.xml (original)
+++ incubator/sling/trunk/jcr/resource/pom.xml Tue Feb 19 06:49:14 2008
@@ -59,6 +59,15 @@
<plugin>
<groupId>org.apache.sling</groupId>
<artifactId>maven-jcrocm-plugin</artifactId>
+ <version>2.0.0-incubator-SNAPSHOT</version>
+ <executions>
+ <execution>
+ <id>generate-JCR-OCM-descriptor</id>
+ <goals>
+ <goal>ocm</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
Modified: incubator/sling/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/parent/pom.xml?rev=629110&r1=629109&r2=629110&view=diff
==============================================================================
--- incubator/sling/trunk/parent/pom.xml (original)
+++ incubator/sling/trunk/parent/pom.xml Tue Feb 19 06:49:14 2008
@@ -150,19 +150,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.sling</groupId>
- <artifactId>maven-jcrocm-plugin</artifactId>
- <version>2.0.0-incubator-SNAPSHOT</version>
- <executions>
- <execution>
- <id>generate-JCR-OCM-descriptor</id>
- <goals>
- <goal>ocm</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
<!-- Compile for Java 5 and higher -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Modified: incubator/sling/trunk/sling/adapter/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/sling/adapter/pom.xml?rev=629110&r1=629109&r2=629110&view=diff
==============================================================================
--- incubator/sling/trunk/sling/adapter/pom.xml (original)
+++ incubator/sling/trunk/sling/adapter/pom.xml Tue Feb 19 06:49:14 2008
@@ -56,6 +56,15 @@
<plugin>
<groupId>org.apache.sling</groupId>
<artifactId>maven-jcrocm-plugin</artifactId>
+ <version>2.0.0-incubator-SNAPSHOT</version>
+ <executions>
+ <execution>
+ <id>generate-JCR-OCM-descriptor</id>
+ <goals>
+ <goal>ocm</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
Modified: incubator/sling/trunk/sling/core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/sling/core/pom.xml?rev=629110&r1=629109&r2=629110&view=diff
==============================================================================
--- incubator/sling/trunk/sling/core/pom.xml (original)
+++ incubator/sling/trunk/sling/core/pom.xml Tue Feb 19 06:49:14 2008
@@ -55,6 +55,15 @@
<plugin>
<groupId>org.apache.sling</groupId>
<artifactId>maven-jcrocm-plugin</artifactId>
+ <version>2.0.0-incubator-SNAPSHOT</version>
+ <executions>
+ <execution>
+ <id>generate-JCR-OCM-descriptor</id>
+ <goals>
+ <goal>ocm</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
Modified: incubator/sling/trunk/sling/sample/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/sling/sample/pom.xml?rev=629110&r1=629109&r2=629110&view=diff
==============================================================================
--- incubator/sling/trunk/sling/sample/pom.xml (original)
+++ incubator/sling/trunk/sling/sample/pom.xml Tue Feb 19 06:49:14 2008
@@ -44,12 +44,22 @@
<plugin>
<groupId>org.apache.sling</groupId>
<artifactId>maven-jcrocm-plugin</artifactId>
+ <version>2.0.0-incubator-SNAPSHOT</version>
+ <executions>
+ <execution>
+ <id>generate-JCR-OCM-descriptor</id>
+ <goals>
+ <goal>ocm</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
<!-- Compile JSP scripts into the bundle -->
<plugin>
<groupId>org.apache.sling</groupId>
<artifactId>maven-jspc-plugin</artifactId>
+ <version>2.0.0-incubator-SNAPSHOT</version>
<executions>
<execution>
<id>compile-jsp</id>
Modified: incubator/sling/trunk/sling/servlet-resolver/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/sling/servlet-resolver/pom.xml?rev=629110&r1=629109&r2=629110&view=diff
==============================================================================
--- incubator/sling/trunk/sling/servlet-resolver/pom.xml (original)
+++ incubator/sling/trunk/sling/servlet-resolver/pom.xml Tue Feb 19 06:49:14 2008
@@ -54,6 +54,15 @@
<plugin>
<groupId>org.apache.sling</groupId>
<artifactId>maven-jcrocm-plugin</artifactId>
+ <version>2.0.0-incubator-SNAPSHOT</version>
+ <executions>
+ <execution>
+ <id>generate-JCR-OCM-descriptor</id>
+ <goals>
+ <goal>ocm</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
Modified: incubator/sling/trunk/sling/servlets-standard/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/sling/servlets-standard/pom.xml?rev=629110&r1=629109&r2=629110&view=diff
==============================================================================
--- incubator/sling/trunk/sling/servlets-standard/pom.xml (original)
+++ incubator/sling/trunk/sling/servlets-standard/pom.xml Tue Feb 19 06:49:14 2008
@@ -60,6 +60,15 @@
<plugin>
<groupId>org.apache.sling</groupId>
<artifactId>maven-jcrocm-plugin</artifactId>
+ <version>2.0.0-incubator-SNAPSHOT</version>
+ <executions>
+ <execution>
+ <id>generate-JCR-OCM-descriptor</id>
+ <goals>
+ <goal>ocm</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>