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:00 UTC

[sling-servlet-archetype] annotated tag sling-servlet-archetype-1.0.4 created (now 077dcdc)

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

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


      at 077dcdc  (tag)
 tagging 4cdc6ceb1193809c7df61edda0436c90a3d4811d (commit)
      by Robert Munteanu
      on Fri Oct 16 20:05:50 2015 +0000

- Log -----------------------------------------------------------------
sling-servlet-archetype-1.0.4
-----------------------------------------------------------------------

This annotated tag includes the following new commits:

     new 753eb72  SLING-1054 - adding servlet and resources archetypes
     new cee9d77  svn:ignore
     new 50335eb  updating all modules to parent 10-SNAPSHOT in anticipation of emma additions to parent
     new c383214  adding README files
     new 0eaf461  going back to parent 9 before release
     new 0cbca76  [maven-release-plugin] prepare release sling-servlet-archetype-1.0.0
     new ab10456  [maven-release-plugin] prepare for next development iteration
     new 5fcd2fa  updating to latest parent post-release
     new f6b7d31  generate pom needs source=1.5 to support annotations
     new 7bf0243   use maven-compiler-plugin 2.3.2 in generated pom, to have java 1.5 as the default
     new 8e5d9f6  Update to recent snapshots
     new 8e56710  Use latest releases.
     new c9b7a97  adding missing scm info and readmes
     new 086167c  SLING-2144 - updating bundle, scr, and osgi versions
     new ad699d7  SLING-2145 - switching to use @SlingServlet
     new 503760c  SLING-2146 - adding a simple filter
     new 1b3b239  SLING-2150 : Update plugins to use the latest available versions
     new fb7869f  SLING-2144 - downgrading bundle plugin as 2.3.5 doesn't work with Java 5
     new 125b873  Update to recent snapshot
     new bdbb95d  Using latest released parent pom
     new 0dab420  SLING-2187 - adding new module to contain our custom notice file; adding remote-resources plugin configuration to parent pom and removing all existing appended-resources NOTICE files
     new c26120f  temporarily using snapshots during release vote
     new 6e02f53  using latest releases
     new 7c17edf  SLING-2338 - adding integration test for servlet archetype
     new 36ac0c9  fixing build on windows
     new b4d9bc4  SLING-2480 : Add config for maven-sling-plugin to m2e configuration
     new 72dd518  SLING-2338 - adding antrum to fix crlfs when a checkout is done under cygwin on windows
     new 50128fc  Update to latest parent pom
     new dfa20b1  Use released versions
     new 6fe569b  SLING-2608 - adding exclusion for iml files (thanks to Tommaso Teofili for the patch!)
     new 71fec48  Use latest releases and update to new parent pom
     new 59eb052  Update to latest parent pom and use latest releases in launchpad
     new d675048  Correct reactor pom and update to parent pom 16
     new 89611de  SLING-2948 - Servlet archetype - set encoding for generated project
     new 5d71b9b  Update to latest parent pom
     new 4e88876  SLING-2978 - Create tooling top-level directory and move maven and ide under it
     new 08ef6c8  SLING-2804 : make sure directory exists before running command
     new 2c0f6db  Update to parent pom 18
     new 7694dd5  Update to parent pom v19
     new b1cb6db  SLING-3538 - Maven archetypes should use the same port as the default launchpad port
     new 2374617  SLING-3538 - Maven archetypes should use the same port as the default launchpad port
     new deaf5fc  SLING-3520 - Consolidate archetype plugin versions in a parent pom
     new af800b7  SLING-3532 - Move sling plugin configuration out of the autoInstallBundle profile
     new 6891762  [maven-release-plugin] prepare release sling-servlet-archetype-1.0.2
     new 7bf3478  [maven-release-plugin] prepare for next development iteration
     new 1d91747  SLING-4698 - Set parent.relativePath to empty for all modules
     new 694dba9  Maven archetypes: use parent version 3
     new b728e1b  archetypes: move to archetype parent 4-SNAPSHOT and fix rat checks
     new 2e2fa0f  sling-servlet-archetype: use sling-archetype-parent 4
     new f1a673e  [maven-release-plugin] prepare release sling-servlet-archetype-1.0.4
     new 4cdc6ce  [maven-release-plugin] copy for tag sling-servlet-archetype-1.0.4

The 51 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


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

[sling-servlet-archetype] 03/07: Maven archetypes: use parent version 3

Posted by ro...@apache.org.
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 694dba918677008d0443a0b29b44d3d67e4881fb
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Fri Oct 16 15:11:21 2015 +0000

    Maven archetypes: use parent version 3
    
    git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/tooling/maven/archetypes/servlet@1709035 13f79535-47bb-0310-9956-ffa450edef68
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 6c8863f..03f3a54 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.sling</groupId>
         <artifactId>sling-archetype-parent</artifactId>
-        <version>1</version>
+        <version>3</version>
         <relativePath/>
     </parent>
 

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

[sling-servlet-archetype] 06/07: [maven-release-plugin] prepare release sling-servlet-archetype-1.0.4

Posted by ro...@apache.org.
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 f1a673eb3859587a5f8677d726efe408e6ed8a59
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Fri Oct 16 20:05:36 2015 +0000

    [maven-release-plugin] prepare release sling-servlet-archetype-1.0.4
    
    git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/tooling/maven/archetypes/servlet@1709098 13f79535-47bb-0310-9956-ffa450edef68
---
 pom.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index 3bff382..90f349c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,21 +23,21 @@
     <parent>
         <groupId>org.apache.sling</groupId>
         <artifactId>sling-archetype-parent</artifactId>
-        <relativePath/>
+        <relativePath />
         <version>4</version>
     </parent>
 
     <artifactId>sling-servlet-archetype</artifactId>
-    <version>1.0.3-SNAPSHOT</version>
+    <version>1.0.4</version>
     <packaging>maven-archetype</packaging>
 
     <name>Sling Servlet Archetype</name>
     <description>Maven archetype for Sling Servlets</description>
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/tooling/maven/archetypes/servlet</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/tooling/maven/archetypes/servlet</developerConnection>
-        <url>http://svn.apache.org/viewvc/sling/trunk/tooling/maven/archetypes/servlet</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/sling/tags/sling-servlet-archetype-1.0.4</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/tags/sling-servlet-archetype-1.0.4</developerConnection>
+        <url>http://svn.apache.org/viewvc/sling/tags/sling-servlet-archetype-1.0.4</url>
     </scm>
 
     <build>

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

[sling-servlet-archetype] 01/07: [maven-release-plugin] prepare for next development iteration

Posted by ro...@apache.org.
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 7bf347889033edddecb9ccefedeb6c26417b567e
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Thu May 15 09:00:21 2014 +0000

    [maven-release-plugin] prepare for next development iteration
    
    git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/tooling/maven/archetypes/servlet@1594832 13f79535-47bb-0310-9956-ffa450edef68
---
 pom.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 6a182db..13d099d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,16 +29,16 @@
 
     <groupId>org.apache.sling</groupId>
     <artifactId>sling-servlet-archetype</artifactId>
-    <version>1.0.2</version>
+    <version>1.0.3-SNAPSHOT</version>
     <packaging>maven-archetype</packaging>
 
     <name>Sling Servlet Archetype</name>
     <description>Maven archetype for Sling Servlets</description>
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/sling/tags/sling-servlet-archetype-1.0.2</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/tags/sling-servlet-archetype-1.0.2</developerConnection>
-        <url>http://svn.apache.org/viewvc/sling/tags/sling-servlet-archetype-1.0.2</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/tooling/maven/archetypes/servlet</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/tooling/maven/archetypes/servlet</developerConnection>
+        <url>http://svn.apache.org/viewvc/sling/trunk/tooling/maven/archetypes/servlet</url>
     </scm>
 
     <build>

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

[sling-servlet-archetype] 02/07: SLING-4698 - Set parent.relativePath to empty for all modules

Posted by ro...@apache.org.
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 1d917476feeaba2e5984b3d7ae7bcd262eba43ba
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Thu May 7 10:14:40 2015 +0000

    SLING-4698 - Set parent.relativePath to empty for all modules
    
    git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/tooling/maven/archetypes/servlet@1678154 13f79535-47bb-0310-9956-ffa450edef68
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 13d099d..6c8863f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
         <groupId>org.apache.sling</groupId>
         <artifactId>sling-archetype-parent</artifactId>
         <version>1</version>
-        <relativePath>../parent/pom.xml</relativePath>
+        <relativePath/>
     </parent>
 
     <groupId>org.apache.sling</groupId>

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

[sling-servlet-archetype] 07/07: [maven-release-plugin] copy for tag sling-servlet-archetype-1.0.4

Posted by ro...@apache.org.
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 4cdc6ceb1193809c7df61edda0436c90a3d4811d
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Fri Oct 16 20:05:50 2015 +0000

    [maven-release-plugin] copy for tag sling-servlet-archetype-1.0.4
    
    git-svn-id: https://svn.apache.org/repos/asf/sling/tags/sling-servlet-archetype-1.0.4@1709099 13f79535-47bb-0310-9956-ffa450edef68

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

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

Posted by ro...@apache.org.
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>.

[sling-servlet-archetype] 05/07: sling-servlet-archetype: use sling-archetype-parent 4

Posted by ro...@apache.org.
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 2e2fa0f569a11ede5be431e46787f16492574b45
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Fri Oct 16 20:05:13 2015 +0000

    sling-servlet-archetype: use sling-archetype-parent 4
    
    git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/tooling/maven/archetypes/servlet@1709097 13f79535-47bb-0310-9956-ffa450edef68
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 8fe0da2..3bff382 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
         <groupId>org.apache.sling</groupId>
         <artifactId>sling-archetype-parent</artifactId>
         <relativePath/>
-        <version>4-SNAPSHOT</version>
+        <version>4</version>
     </parent>
 
     <artifactId>sling-servlet-archetype</artifactId>

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