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 2017/11/07 10:26:04 UTC

[sling-servlet-archetype] 04/07: archetypes: move to archetype parent 4-SNAPSHOT and fix rat checks

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to annotated tag sling-servlet-archetype-1.0.4
in repository https://gitbox.apache.org/repos/asf/sling-servlet-archetype.git

commit b728e1bacf0340e20653e27c8164c7eb9a05e0a1
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Fri Oct 16 19:38:55 2015 +0000

    archetypes: move to archetype parent 4-SNAPSHOT and fix rat checks
    
    git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/tooling/maven/archetypes/servlet@1709070 13f79535-47bb-0310-9956-ffa450edef68
---
 pom.xml                                              |  3 +--
 .../resources/projects/normal/archetype.properties   | 18 ++++++++++++++++++
 src/test/resources/projects/normal/reference/pom.xml | 20 ++++++++++----------
 3 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/pom.xml b/pom.xml
index 03f3a54..8fe0da2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,11 +23,10 @@
     <parent>
         <groupId>org.apache.sling</groupId>
         <artifactId>sling-archetype-parent</artifactId>
-        <version>3</version>
         <relativePath/>
+        <version>4-SNAPSHOT</version>
     </parent>
 
-    <groupId>org.apache.sling</groupId>
     <artifactId>sling-servlet-archetype</artifactId>
     <version>1.0.3-SNAPSHOT</version>
     <packaging>maven-archetype</packaging>
diff --git a/src/test/resources/projects/normal/archetype.properties b/src/test/resources/projects/normal/archetype.properties
index d6fe58d..ac9353d 100644
--- a/src/test/resources/projects/normal/archetype.properties
+++ b/src/test/resources/projects/normal/archetype.properties
@@ -1,3 +1,21 @@
+#####################################################################
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+# 
+# http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#####################################################################
 groupId=org.apache.sling
 artifactId=test-servlet-archetype-project
 version=0.0.1-SNAPSHOT
diff --git a/src/test/resources/projects/normal/reference/pom.xml b/src/test/resources/projects/normal/reference/pom.xml
index b7969bb..5e9e75a 100644
--- a/src/test/resources/projects/normal/reference/pom.xml
+++ b/src/test/resources/projects/normal/reference/pom.xml
@@ -30,7 +30,7 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-scr-plugin</artifactId>
-                <version>1.16.0</version>
+                <version>1.21.0</version>
                 <executions>
                     <execution>
                         <id>generate-scr-descriptor</id>
@@ -44,21 +44,21 @@
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
                 <extensions>true</extensions>
-                <version>2.4.0</version>
+                <version>3.0.0</version>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.1</version>
+                <version>3.3</version>
                 <configuration>
-                    <source>6</source>
-                    <target>6</target>
+                    <source>7</source>
+                    <target>7</target>
                 </configuration>
             </plugin>
             <plugin>
                 <groupId>org.apache.sling</groupId>
                 <artifactId>maven-sling-plugin</artifactId>
-                <version>2.1.0</version>
+                <version>2.1.2</version>
                 <configuration>
                     <slingUrl>http://localhost:8080/system/console</slingUrl>
                     <user>admin</user>
@@ -95,25 +95,25 @@
         <dependency>
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.api</artifactId>
-            <version>2.2.0</version>
+            <version>2.9.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
-            <version>1.5.10</version>
+            <version>1.7.6</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.scr.annotations</artifactId>
-            <version>1.9.8</version>
+            <version>1.9.12</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>3.8.1</version>
+            <version>4.12</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.