You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2015/04/21 00:32:31 UTC

svn commit: r1674996 - in /sling/trunk/tooling/maven/archetypes: launchpad-standalone/src/main/resources/archetype-resources/pom.xml launchpad-webapp/src/main/resources/archetype-resources/pom.xml

Author: rombert
Date: Mon Apr 20 22:32:30 2015
New Revision: 1674996

URL: http://svn.apache.org/r1674996
Log:
SLING-4633 - Launchpad archetypes do not run on Java 7 or newer

Modified:
    sling/trunk/tooling/maven/archetypes/launchpad-standalone/src/main/resources/archetype-resources/pom.xml
    sling/trunk/tooling/maven/archetypes/launchpad-webapp/src/main/resources/archetype-resources/pom.xml

Modified: sling/trunk/tooling/maven/archetypes/launchpad-standalone/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/maven/archetypes/launchpad-standalone/src/main/resources/archetype-resources/pom.xml?rev=1674996&r1=1674995&r2=1674996&view=diff
==============================================================================
--- sling/trunk/tooling/maven/archetypes/launchpad-standalone/src/main/resources/archetype-resources/pom.xml (original)
+++ sling/trunk/tooling/maven/archetypes/launchpad-standalone/src/main/resources/archetype-resources/pom.xml Mon Apr 20 22:32:30 2015
@@ -36,12 +36,12 @@
                 </executions>
                 <configuration>
                     <defaultBundleList>
-                        <version>6</version>
+                        <version>7</version>
                     </defaultBundleList>
                     <jarWebSupport>
                         <groupId>org.apache.felix</groupId>
                         <artifactId>org.apache.felix.http.jetty</artifactId>
-                        <version>2.2.0</version>
+                        <version>2.2.2</version>
                     </jarWebSupport>
                 </configuration>
             </plugin>
@@ -64,7 +64,7 @@
         <dependency>
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.launchpad.base</artifactId>
-            <version>2.4.0</version>
+            <version>4.6.1-2.5.8</version>
             <classifier>app</classifier>
             <scope>runtime</scope>
         </dependency>

Modified: sling/trunk/tooling/maven/archetypes/launchpad-webapp/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/maven/archetypes/launchpad-webapp/src/main/resources/archetype-resources/pom.xml?rev=1674996&r1=1674995&r2=1674996&view=diff
==============================================================================
--- sling/trunk/tooling/maven/archetypes/launchpad-webapp/src/main/resources/archetype-resources/pom.xml (original)
+++ sling/trunk/tooling/maven/archetypes/launchpad-webapp/src/main/resources/archetype-resources/pom.xml Mon Apr 20 22:32:30 2015
@@ -36,7 +36,7 @@
                 </executions>
                 <configuration>
                     <defaultBundleList>
-                        <version>6</version>
+                        <version>7</version>
                     </defaultBundleList>
                 </configuration>
             </plugin>
@@ -76,7 +76,7 @@
         <dependency>
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.launchpad.base</artifactId>
-            <version>2.4.0</version>
+            <version>4.6.1-2.5.8</version>
             <type>war</type>
             <classifier>webapp</classifier>
             <scope>runtime</scope>