Author: cziegeler
Date: Tue Nov 24 16:07:54 2009
New Revision: 883747
URL: http://svn.apache.org/viewvc?rev=883747&view=rev
Log:
Update to latest parent pom.
Modified:
sling/trunk/bundles/scripting/api/pom.xml
sling/trunk/bundles/scripting/core/pom.xml
sling/trunk/bundles/scripting/javascript/pom.xml
sling/trunk/bundles/scripting/jsp-taglib/pom.xml
sling/trunk/bundles/scripting/jsp/pom.xml
Modified: sling/trunk/bundles/scripting/api/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/api/pom.xml?rev=883747&r1=883746&r2=883747&view=diff
==============================================================================
--- sling/trunk/bundles/scripting/api/pom.xml (original)
+++ sling/trunk/bundles/scripting/api/pom.xml Tue Nov 24 16:07:54 2009
@@ -23,8 +23,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>6</version>
- <relativePath>../../../parent/pom.xml</relativePath>
+ <version>7</version>
</parent>
<artifactId>org.apache.sling.scripting.api</artifactId>
@@ -82,11 +81,11 @@
</dependency>
<dependency>
- <groupId>org.apache.felix</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.felix</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
</dependency>
Modified: sling/trunk/bundles/scripting/core/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/core/pom.xml?rev=883747&r1=883746&r2=883747&view=diff
==============================================================================
--- sling/trunk/bundles/scripting/core/pom.xml (original)
+++ sling/trunk/bundles/scripting/core/pom.xml Tue Nov 24 16:07:54 2009
@@ -23,8 +23,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>6</version>
- <relativePath>../../../parent/pom.xml</relativePath>
+ <version>7</version>
</parent>
<artifactId>org.apache.sling.scripting.core</artifactId>
@@ -148,11 +147,11 @@
</dependency>
<dependency>
- <groupId>org.apache.felix</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.felix</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
</dependency>
<dependency>
Modified: sling/trunk/bundles/scripting/javascript/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/javascript/pom.xml?rev=883747&r1=883746&r2=883747&view=diff
==============================================================================
--- sling/trunk/bundles/scripting/javascript/pom.xml (original)
+++ sling/trunk/bundles/scripting/javascript/pom.xml Tue Nov 24 16:07:54 2009
@@ -23,8 +23,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>6</version>
- <relativePath>../../../parent/pom.xml</relativePath>
+ <version>7</version>
</parent>
<artifactId>org.apache.sling.scripting.javascript</artifactId>
@@ -121,11 +120,11 @@
<version>2.0.2-incubator</version>
</dependency>
<dependency>
- <groupId>org.apache.felix</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.felix</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
</dependency>
<dependency>
Modified: sling/trunk/bundles/scripting/jsp-taglib/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/jsp-taglib/pom.xml?rev=883747&r1=883746&r2=883747&view=diff
==============================================================================
--- sling/trunk/bundles/scripting/jsp-taglib/pom.xml (original)
+++ sling/trunk/bundles/scripting/jsp-taglib/pom.xml Tue Nov 24 16:07:54 2009
@@ -23,8 +23,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>6</version>
- <relativePath>../../../parent/pom.xml</relativePath>
+ <version>7</version>
</parent>
<artifactId>org.apache.sling.scripting.jsp.taglib</artifactId>
@@ -84,11 +83,11 @@
<version>2.0.2-incubator</version>
</dependency>
<dependency>
- <groupId>org.apache.felix</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.felix</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
</dependency>
<dependency>
Modified: sling/trunk/bundles/scripting/jsp/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/jsp/pom.xml?rev=883747&r1=883746&r2=883747&view=diff
==============================================================================
--- sling/trunk/bundles/scripting/jsp/pom.xml (original)
+++ sling/trunk/bundles/scripting/jsp/pom.xml Tue Nov 24 16:07:54 2009
@@ -23,8 +23,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>6</version>
- <relativePath>../../../parent/pom.xml</relativePath>
+ <version>7</version>
</parent>
<artifactId>org.apache.sling.scripting.jsp</artifactId>
@@ -149,11 +148,11 @@
</dependency>
<dependency>
- <groupId>org.apache.felix</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.felix</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
</dependency>
<dependency>
