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/10/18 23:29:52 UTC
[sling-servlet-archetype] branch master created (now 13eeddc)
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/sling-servlet-archetype.git.
at 13eeddc SLING-7167 Adjust READMEs
This branch includes the following new commits:
new 73b9798 SLING-2978 - Create tooling top-level directory and move maven and ide under it
new 5912f8d SLING-2804 : make sure directory exists before running command
new 87e1776 Update to parent pom 18
new 638b738 Update to parent pom v19
new 5c14bfd SLING-3538 - Maven archetypes should use the same port as the default launchpad port
new c3e0251 SLING-3538 - Maven archetypes should use the same port as the default launchpad port
new 9de7e4f SLING-3520 - Consolidate archetype plugin versions in a parent pom
new 79627e1 SLING-3532 - Move sling plugin configuration out of the autoInstallBundle profile
new 73e8ae7 [maven-release-plugin] prepare release sling-servlet-archetype-1.0.2
new b8f7c5c [maven-release-plugin] prepare for next development iteration
new 6518c30 SLING-4698 - Set parent.relativePath to empty for all modules
new 71accc6 Maven archetypes: use parent version 3
new eea554d archetypes: move to archetype parent 4-SNAPSHOT and fix rat checks
new e399e80 sling-servlet-archetype: use sling-archetype-parent 4
new e78de08 [maven-release-plugin] prepare release sling-servlet-archetype-1.0.4
new 175f9c2 [maven-release-plugin] prepare for next development iteration
new 91ecf9b sling-servlet-archetype: use sling-archetype-parent 5-SNAPSHOT
new 5c2db76 Archetypes: roll back to released version of archetype parent
new db7c8d3 servlet-archetype: fix reference project after parent rollback
new 0b1f872 SLING-7167 Adjust READMEs
new db3fa88 SLING-7167 Adjust READMEs
new 13eeddc SLING-7167 Adjust READMEs
The 22 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] 08/22: SLING-3532 - Move sling plugin
configuration out of the autoInstallBundle profile
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-servlet-archetype.git
commit 79627e1c2ae8bf09a29696322e2fcbeb1e7cbb96
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Thu May 15 08:40:09 2014 +0000
SLING-3532 - Move sling plugin configuration out of the
autoInstallBundle profile
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1594821 13f79535-47bb-0310-9956-ffa450edef68
---
src/main/resources/archetype-resources/pom.xml | 16 ++++++++++------
src/test/resources/projects/normal/reference/pom.xml | 16 ++++++++++------
2 files changed, 20 insertions(+), 12 deletions(-)
diff --git a/src/main/resources/archetype-resources/pom.xml b/src/main/resources/archetype-resources/pom.xml
index e3e7ff7..331520f 100644
--- a/src/main/resources/archetype-resources/pom.xml
+++ b/src/main/resources/archetype-resources/pom.xml
@@ -55,6 +55,16 @@
<target>${archetype.java.version}</target>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>maven-sling-plugin</artifactId>
+ <version>${slingplugin.version}</version>
+ <configuration>
+ <slingUrl>http://localhost:8080/system/console</slingUrl>
+ <user>admin</user>
+ <password>admin</password>
+ </configuration>
+ </plugin>
</plugins>
</build>
<dependencies>
@@ -119,18 +129,12 @@
<plugin>
<groupId>org.apache.sling</groupId>
<artifactId>maven-sling-plugin</artifactId>
- <version>${slingplugin.version}</version>
<executions>
<execution>
<id>install-bundle</id>
<goals>
<goal>install</goal>
</goals>
- <configuration>
- <slingUrl>http://localhost:8080/system/console</slingUrl>
- <user>admin</user>
- <password>admin</password>
- </configuration>
</execution>
</executions>
</plugin>
diff --git a/src/test/resources/projects/normal/reference/pom.xml b/src/test/resources/projects/normal/reference/pom.xml
index 7834625..b7969bb 100644
--- a/src/test/resources/projects/normal/reference/pom.xml
+++ b/src/test/resources/projects/normal/reference/pom.xml
@@ -55,6 +55,16 @@
<target>6</target>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>maven-sling-plugin</artifactId>
+ <version>2.1.0</version>
+ <configuration>
+ <slingUrl>http://localhost:8080/system/console</slingUrl>
+ <user>admin</user>
+ <password>admin</password>
+ </configuration>
+ </plugin>
</plugins>
</build>
<dependencies>
@@ -119,18 +129,12 @@
<plugin>
<groupId>org.apache.sling</groupId>
<artifactId>maven-sling-plugin</artifactId>
- <version>2.1.0</version>
<executions>
<execution>
<id>install-bundle</id>
<goals>
<goal>install</goal>
</goals>
- <configuration>
- <slingUrl>http://localhost:8080/system/console</slingUrl>
- <user>admin</user>
- <password>admin</password>
- </configuration>
</execution>
</executions>
</plugin>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-servlet-archetype] 03/22: Update to parent pom 18
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-servlet-archetype.git
commit 87e1776121edc82917bfc93372f04547dd05c0a5
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Fri Sep 6 12:15:57 2013 +0000
Update to parent pom 18
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1520554 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index c8c5e54..55af31b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>17</version>
+ <version>18</version>
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-servlet-archetype] 04/22: Update to parent pom v19
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-servlet-archetype.git
commit 638b73814462a2067fbaf1f55ea90ef12f77f161
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Mon Mar 31 14:39:20 2014 +0000
Update to parent pom v19
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1583337 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 55af31b..6d396fe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>18</version>
+ <version>19</version>
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-servlet-archetype] 19/22: servlet-archetype: fix reference
project after parent rollback
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-servlet-archetype.git
commit db7c8d3db8dbb06138789a1a2af2ae112e8f457f
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Fri Oct 16 22:46:19 2015 +0000
servlet-archetype: fix reference project after parent rollback
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1709123 13f79535-47bb-0310-9956-ffa450edef68
---
src/test/resources/projects/normal/reference/pom.xml | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/test/resources/projects/normal/reference/pom.xml b/src/test/resources/projects/normal/reference/pom.xml
index 5e9e75a..b7969bb 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.21.0</version>
+ <version>1.16.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>3.0.0</version>
+ <version>2.4.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.3</version>
+ <version>3.1</version>
<configuration>
- <source>7</source>
- <target>7</target>
+ <source>6</source>
+ <target>6</target>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.sling</groupId>
<artifactId>maven-sling-plugin</artifactId>
- <version>2.1.2</version>
+ <version>2.1.0</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.9.0</version>
+ <version>2.2.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.7.6</version>
+ <version>1.5.10</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.scr.annotations</artifactId>
- <version>1.9.12</version>
+ <version>1.9.8</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.12</version>
+ <version>3.8.1</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] 06/22: SLING-3538 - Maven archetypes
should use the same port as the default launchpad port
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-servlet-archetype.git
commit c3e0251a1a42b8cfec36c5c2b015eed888967ad9
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Fri May 2 13:52:54 2014 +0000
SLING-3538 - Maven archetypes should use the same port as the default
launchpad port
Updated reference project for the servlet archetype.
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1591908 13f79535-47bb-0310-9956-ffa450edef68
---
src/test/resources/projects/normal/reference/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/test/resources/projects/normal/reference/pom.xml b/src/test/resources/projects/normal/reference/pom.xml
index ffa8542..ce932f2 100644
--- a/src/test/resources/projects/normal/reference/pom.xml
+++ b/src/test/resources/projects/normal/reference/pom.xml
@@ -124,7 +124,7 @@
<goal>install</goal>
</goals>
<configuration>
- <slingUrl>http://localhost:8888/system/console</slingUrl>
+ <slingUrl>http://localhost:8080/system/console</slingUrl>
<user>admin</user>
<password>admin</password>
</configuration>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-servlet-archetype] 09/22: [maven-release-plugin] prepare
release sling-servlet-archetype-1.0.2
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-servlet-archetype.git
commit 73e8ae7accd93fc4766559837eeb9a6f2bd2090a
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Thu May 15 09:00:01 2014 +0000
[maven-release-plugin] prepare release sling-servlet-archetype-1.0.2
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1594830 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/pom.xml b/pom.xml
index 03fae0c..6a182db 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,8 +18,7 @@
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.sling</groupId>
@@ -30,16 +29,16 @@
<groupId>org.apache.sling</groupId>
<artifactId>sling-servlet-archetype</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.0.2</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.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>
</scm>
<build>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-servlet-archetype] 05/22: SLING-3538 - Maven archetypes
should use the same port as the default launchpad port
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-servlet-archetype.git
commit 5c14bfd6d4cb5b5212469d52c283ad3ff4c70bab
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Fri May 2 10:41:31 2014 +0000
SLING-3538 - Maven archetypes should use the same port as the default
launchpad port
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1591859 13f79535-47bb-0310-9956-ffa450edef68
---
src/main/resources/archetype-resources/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/resources/archetype-resources/pom.xml b/src/main/resources/archetype-resources/pom.xml
index c0e336a..332ff16 100644
--- a/src/main/resources/archetype-resources/pom.xml
+++ b/src/main/resources/archetype-resources/pom.xml
@@ -124,7 +124,7 @@
<goal>install</goal>
</goals>
<configuration>
- <slingUrl>http://localhost:8888/system/console</slingUrl>
+ <slingUrl>http://localhost:8080/system/console</slingUrl>
<user>admin</user>
<password>admin</password>
</configuration>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-servlet-archetype] 16/22: [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 branch master
in repository https://gitbox.apache.org/repos/asf/sling-servlet-archetype.git
commit 175f9c276ddb49ee21b49c647bac9b29372a6586
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Fri Oct 16 20:05:52 2015 +0000
[maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1709100 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index 90f349c..925b6bc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,16 +28,16 @@
</parent>
<artifactId>sling-servlet-archetype</artifactId>
- <version>1.0.4</version>
+ <version>1.0.5-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.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>
+ <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] 22/22: SLING-7167 Adjust READMEs
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-servlet-archetype.git
commit 13eeddcc22b140f3c554b1f5809ed75b36444a78
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Tue Oct 3 10:13:13 2017 +0000
SLING-7167 Adjust READMEs
add uniform header linking to Sling project
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1810965 13f79535-47bb-0310-9956-ffa450edef68
---
README.md | 4 +++-
pom.xml | 2 +-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/README.md b/README.md
index fe4421a..985df96 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,5 @@
-Sling Servlet Archetype
+# Apache Sling Servlet Archetype
+
+This module is part of the [Apache Sling](https://sling.apache.org) project.
Maven archetype for Sling Servlets.
diff --git a/pom.xml b/pom.xml
index 99d2072..45ba8c3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,7 +31,7 @@
<version>1.0.5-SNAPSHOT</version>
<packaging>maven-archetype</packaging>
- <name>Sling Servlet Archetype</name>
+ <name>Apache Sling Servlet Archetype</name>
<description>Maven archetype for Sling Servlets</description>
<scm>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-servlet-archetype] 18/22: Archetypes: roll back to released
version of archetype parent
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-servlet-archetype.git
commit 5c2db76837916a07cedbd224e05c36b187a24ef0
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Fri Oct 16 22:07:11 2015 +0000
Archetypes: roll back to released version of archetype parent
Our current policy of setting the parent's relativePath to empty
prevents picking up the parent from the reactor build, so we must
use a released version.
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1709119 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 1262bd1..99d2072 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
<groupId>org.apache.sling</groupId>
<artifactId>sling-archetype-parent</artifactId>
<relativePath />
- <version>5-SNAPSHOT</version>
+ <version>1</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>.
[sling-servlet-archetype] 10/22: [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 branch master
in repository https://gitbox.apache.org/repos/asf/sling-servlet-archetype.git
commit b8f7c5c68483d4822566eb745acad6d34addaf61
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@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] 20/22: SLING-7167 Adjust READMEs
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-servlet-archetype.git
commit 0b1f872697f6872b72a5152bec599f2005e022fc
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Mon Oct 2 15:04:00 2017 +0000
SLING-7167 Adjust READMEs
remove outdated information
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1810440 13f79535-47bb-0310-9956-ffa450edef68
---
README.txt | 24 ------------------------
1 file changed, 24 deletions(-)
diff --git a/README.txt b/README.txt
index bf1587b..fe4421a 100644
--- a/README.txt
+++ b/README.txt
@@ -1,27 +1,3 @@
Sling Servlet Archetype
Maven archetype for Sling Servlets.
-
-Getting Started
-===============
-
-This component uses a Maven 2 (http://maven.apache.org/) build
-environment. It requires a Java 5 JDK (or higher) and Maven (http://maven.apache.org/)
-2.0.7 or later. We recommend to use the latest Maven version.
-
-If you have Maven 2 installed, you can install the jar into your local Maven repository
-using the following command:
-
- mvn install
-
-See the Maven 2 documentation for other build features.
-
-The latest source code for this component is available in the
-Subversion (http://subversion.tigris.org/) source repository of
-the Apache Software Foundation. If you have Subversion installed,
-you can checkout the latest source using the following command:
-
- svn checkout http://svn.apache.org/repos/asf/sling/trunk/tooling/maven/archetypes/servlet
-
-See the Subversion documentation for other source control features.
-
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-servlet-archetype] 02/22: SLING-2804 : make sure directory
exists before running command
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-servlet-archetype.git
commit 5912f8d72a2440e8ae19932cfe1f5553297f91ba
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Mon Aug 5 13:58:07 2013 +0000
SLING-2804 : make sure directory exists before running command
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1510479 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 1 +
1 file changed, 1 insertion(+)
diff --git a/pom.xml b/pom.xml
index 82bb5dd..c8c5e54 100644
--- a/pom.xml
+++ b/pom.xml
@@ -77,6 +77,7 @@
<phase>process-test-resources</phase>
<configuration>
<target>
+ <mkdir dir="${project.build.testOutputDirectory}" /> <!-- SLING-2804 -->
<fixcrlf srcdir="${project.build.testOutputDirectory}" />
</target>
</configuration>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-servlet-archetype] 13/22: 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 branch master
in repository https://gitbox.apache.org/repos/asf/sling-servlet-archetype.git
commit eea554da32ef27d6ec565522b78e881f77fb09f3
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@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] 15/22: [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 branch master
in repository https://gitbox.apache.org/repos/asf/sling-servlet-archetype.git
commit e78de0838df62ec89c4dcbd2c67a6ea928e5cfa8
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@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] 12/22: 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 branch master
in repository https://gitbox.apache.org/repos/asf/sling-servlet-archetype.git
commit 71accc63125a00f5a113c2d034d80fd02084a2f5
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@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] 14/22: 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 branch master
in repository https://gitbox.apache.org/repos/asf/sling-servlet-archetype.git
commit e399e80a78b45225b61d6c68830b9284fc0c8590
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@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>.
[sling-servlet-archetype] 11/22: 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 branch master
in repository https://gitbox.apache.org/repos/asf/sling-servlet-archetype.git
commit 6518c304e3af7ed0d85dd14d755b90bc3147d8a7
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@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] 01/22: SLING-2978 - Create tooling
top-level directory and move maven and ide under it
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-servlet-archetype.git
commit 73b9798465558d3f1a83e057089af1d93929bfff
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Wed Jul 24 18:13:22 2013 +0000
SLING-2978 - Create tooling top-level directory and move maven and ide
under it
* moved the maven directory under tooling maven
* adjusted module paths in pom.xml
* updated the scm information in the pom.xml files
* updated the scm information in the README.txt files
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1506645 13f79535-47bb-0310-9956-ffa450edef68
---
LICENSE | 202 +++++++++++++++++++++
NOTICE | 8 +
README.txt | 27 +++
pom.xml | 111 +++++++++++
.../META-INF/maven/archetype-metadata.xml | 29 +++
src/main/resources/archetype-resources/pom.xml | 138 ++++++++++++++
.../src/main/java/ByPathServlet.java | 79 ++++++++
.../src/main/java/ByResourceTypeServlet.java | 85 +++++++++
.../src/main/java/SimpleFilter.java | 71 ++++++++
.../src/test/java/ByPathServletTest.java | 33 ++++
.../resources/projects/normal/archetype.properties | 4 +
src/test/resources/projects/normal/goal.txt | 1 +
.../resources/projects/normal/reference/pom.xml | 138 ++++++++++++++
.../archetype/servlet/testing/ByPathServlet.java | 79 ++++++++
.../servlet/testing/ByResourceTypeServlet.java | 85 +++++++++
.../archetype/servlet/testing/SimpleFilter.java | 71 ++++++++
.../servlet/testing/ByPathServletTest.java | 33 ++++
17 files changed, 1194 insertions(+)
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..d645695
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,202 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed 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.
diff --git a/NOTICE b/NOTICE
new file mode 100644
index 0000000..9254fc2
--- /dev/null
+++ b/NOTICE
@@ -0,0 +1,8 @@
+Apache Sling Servlet Maven Archetype
+Copyright 2008-2010 The Apache Software Foundation
+
+Apache Sling is based on source code originally developed
+by Day Software (http://www.day.com/).
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
diff --git a/README.txt b/README.txt
new file mode 100644
index 0000000..bf1587b
--- /dev/null
+++ b/README.txt
@@ -0,0 +1,27 @@
+Sling Servlet Archetype
+
+Maven archetype for Sling Servlets.
+
+Getting Started
+===============
+
+This component uses a Maven 2 (http://maven.apache.org/) build
+environment. It requires a Java 5 JDK (or higher) and Maven (http://maven.apache.org/)
+2.0.7 or later. We recommend to use the latest Maven version.
+
+If you have Maven 2 installed, you can install the jar into your local Maven repository
+using the following command:
+
+ mvn install
+
+See the Maven 2 documentation for other build features.
+
+The latest source code for this component is available in the
+Subversion (http://subversion.tigris.org/) source repository of
+the Apache Software Foundation. If you have Subversion installed,
+you can checkout the latest source using the following command:
+
+ svn checkout http://svn.apache.org/repos/asf/sling/trunk/tooling/maven/archetypes/servlet
+
+See the Subversion documentation for other source control features.
+
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 0000000..82bb5dd
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ 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.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>sling</artifactId>
+ <version>17</version>
+ <relativePath>../../../parent/pom.xml</relativePath>
+ </parent>
+
+ <groupId>org.apache.sling</groupId>
+ <artifactId>sling-servlet-archetype</artifactId>
+ <version>1.0.1-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/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>
+ <testResources>
+ <testResource>
+ <directory>src/test/resources</directory>
+ <excludes>
+ <exclude>**/.settings</exclude>
+ <exclude>**/.settings/**</exclude>
+ <exclude>**/.project</exclude>
+ <exclude>**/.classpath</exclude>
+ <exclude>**/target/**</exclude>
+ <exclude>**/*.iml</exclude>
+ </excludes>
+ </testResource>
+ </testResources>
+ <extensions>
+ <extension>
+ <groupId>org.apache.maven.archetype</groupId>
+ <artifactId>archetype-packaging</artifactId>
+ <version>2.2</version>
+ </extension>
+ </extensions>
+ <plugins>
+ <plugin>
+ <artifactId>maven-archetype-plugin</artifactId>
+ <version>2.2</version>
+ <extensions>true</extensions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>fix-crlfs</id>
+ <phase>process-test-resources</phase>
+ <configuration>
+ <target>
+ <fixcrlf srcdir="${project.build.testOutputDirectory}" />
+ </target>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-plugin-plugin</artifactId>
+ <version>2.5.1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <!-- No javadocs -->
+ <excludePackageNames>
+ org.apache.sling
+ </excludePackageNames>
+ </configuration>
+ </plugin>
+ </plugins>
+ </reporting>
+</project>
diff --git a/src/main/resources/META-INF/maven/archetype-metadata.xml b/src/main/resources/META-INF/maven/archetype-metadata.xml
new file mode 100644
index 0000000..4a514cc
--- /dev/null
+++ b/src/main/resources/META-INF/maven/archetype-metadata.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+<archetype-descriptor name="sling-servlet">
+ <fileSets>
+ <fileSet filtered="true" packaged="true" encoding="UTF-8">
+ <directory>src/main/java</directory>
+ <includes>
+ <include>**/*.java</include>
+ </includes>
+ </fileSet>
+ <fileSet filtered="true" packaged="true" encoding="UTF-8">
+ <directory>src/test/java</directory>
+ <includes>
+ <include>**/*.java</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+</archetype-descriptor>
diff --git a/src/main/resources/archetype-resources/pom.xml b/src/main/resources/archetype-resources/pom.xml
new file mode 100644
index 0000000..c0e336a
--- /dev/null
+++ b/src/main/resources/archetype-resources/pom.xml
@@ -0,0 +1,138 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ 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.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>${groupId}</groupId>
+ <artifactId>${artifactId}</artifactId>
+ <packaging>bundle</packaging>
+ <version>${version}</version>
+ <name>${artifactId}</name>
+ <description>${groupId} - ${artifactId}</description>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-scr-plugin</artifactId>
+ <version>1.7.2</version>
+ <executions>
+ <execution>
+ <id>generate-scr-descriptor</id>
+ <goals>
+ <goal>scr</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <version>2.0.1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <!-- use version 2.3.2 to have java 1.5 as the default -->
+ <version>2.3.2</version>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.5</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ <version>4.2.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <version>4.2.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.jcr</groupId>
+ <artifactId>jcr</artifactId>
+ <version>2.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.api</artifactId>
+ <version>2.2.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>1.5.10</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.scr.annotations</artifactId>
+ <version>1.6.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+ </properties>
+ <profiles>
+ <profile>
+ <id>autoInstallBundle</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>maven-sling-plugin</artifactId>
+ <version>2.0.4-incubator</version>
+ <executions>
+ <execution>
+ <id>install-bundle</id>
+ <goals>
+ <goal>install</goal>
+ </goals>
+ <configuration>
+ <slingUrl>http://localhost:8888/system/console</slingUrl>
+ <user>admin</user>
+ <password>admin</password>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+</project>
diff --git a/src/main/resources/archetype-resources/src/main/java/ByPathServlet.java b/src/main/resources/archetype-resources/src/main/java/ByPathServlet.java
new file mode 100644
index 0000000..8ab1c12
--- /dev/null
+++ b/src/main/resources/archetype-resources/src/main/java/ByPathServlet.java
@@ -0,0 +1,79 @@
+/*
+ * 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.
+ */
+package ${package};
+
+import java.io.IOException;
+import java.io.Writer;
+
+import javax.servlet.ServletException;
+
+import org.apache.felix.scr.annotations.Properties;
+import org.apache.felix.scr.annotations.Property;
+import org.apache.felix.scr.annotations.sling.SlingServlet;
+import org.apache.sling.api.SlingHttpServletRequest;
+import org.apache.sling.api.SlingHttpServletResponse;
+import org.apache.sling.api.servlets.SlingSafeMethodsServlet;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Hello World Servlet registered by path
+ *
+ * Annotations below are short version of:
+ *
+ * @Component
+ * @Service(Servlet.class)
+ * @Properties({
+ * @Property(name="service.description", value="Hello World Path Servlet"),
+ * @Property(name="service.vendor", value="The Apache Software Foundation"),
+ * @Property(name="sling.servlet.paths", value="/hello-world-servlet")
+ * })
+ */
+@SlingServlet(paths="/hello-world-servlet")
+@Properties({
+ @Property(name="service.description", value="Hello World Path Servlet"),
+ @Property(name="service.vendor", value="The Apache Software Foundation")
+})
+@SuppressWarnings("serial")
+public class ByPathServlet extends SlingSafeMethodsServlet {
+
+ private final Logger log = LoggerFactory.getLogger(ByPathServlet.class);
+
+ @Override
+ protected void doGet(SlingHttpServletRequest request,
+ SlingHttpServletResponse response) throws ServletException,
+ IOException {
+
+ Writer w = response.getWriter();
+ w.write("<!DOCTYPE html PUBLIC \"-//IETF//DTD HTML 2.0//EN\">");
+ w.write("<html>");
+ w.write("<head>");
+ w.write("<title>Hello World Servlet</title>");
+ w.write("</head>");
+ w.write("<body>");
+ w.write("<h1>Hello World!</h1>");
+ w.write("</body>");
+ w.write("</html>");
+
+ log.info("Hello World Servlet");
+
+ }
+
+}
+
diff --git a/src/main/resources/archetype-resources/src/main/java/ByResourceTypeServlet.java b/src/main/resources/archetype-resources/src/main/java/ByResourceTypeServlet.java
new file mode 100644
index 0000000..f87823f
--- /dev/null
+++ b/src/main/resources/archetype-resources/src/main/java/ByResourceTypeServlet.java
@@ -0,0 +1,85 @@
+/*
+ * 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.
+ */
+package ${package};
+
+import java.io.IOException;
+import java.io.Writer;
+
+import javax.servlet.ServletException;
+
+import org.apache.felix.scr.annotations.Properties;
+import org.apache.felix.scr.annotations.Property;
+import org.apache.felix.scr.annotations.sling.SlingServlet;
+import org.apache.sling.api.SlingHttpServletRequest;
+import org.apache.sling.api.SlingHttpServletResponse;
+import org.apache.sling.api.resource.Resource;
+import org.apache.sling.api.servlets.SlingSafeMethodsServlet;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Hello World Servlet registered by resource type
+ *
+ * Annotations below are short version of:
+ *
+ * @Component
+ * @Service(Servlet.class)
+ * @Properties({
+ * @Property(name="service.description", value="Hello World Type Servlet"),
+ * @Property(name="service.vendor", value="The Apache Software Foundation"),
+ * @Property(name="sling.servlet.resourceTypes", value="sling/servlet/default"),
+ * @Property(name="sling.servlet.selectors", value="hello"),
+ * @Property(name="sling.servlet.extensions", value="html")
+ * })
+ */
+@SlingServlet(resourceTypes="sling/servlet/default", selectors="hello", extensions="html")
+@Properties({
+ @Property(name="service.description", value="Hello World Type Servlet"),
+ @Property(name="service.vendor", value="The Apache Software Foundation")
+})
+@SuppressWarnings("serial")
+public class ByResourceTypeServlet extends SlingSafeMethodsServlet {
+
+ private final Logger log = LoggerFactory.getLogger(ByResourceTypeServlet.class);
+
+ @Override
+ protected void doGet(SlingHttpServletRequest request,
+ SlingHttpServletResponse response) throws ServletException,
+ IOException {
+ Resource resource = request.getResource();
+
+ Writer w = response.getWriter();
+ w.write("<!DOCTYPE html PUBLIC \"-//IETF//DTD HTML 2.0//EN\">");
+ w.write("<html>");
+ w.write("<head>");
+ w.write("<title>Hello World Servlet</title>");
+ w.write("</head>");
+ w.write("<body>");
+ w.write("<h1>Hello ");
+ w.write(resource.getPath());
+ w.write("</h1>");
+ w.write("</body>");
+ w.write("</html>");
+
+ log.info("Hello World Servlet");
+
+ }
+
+}
+
diff --git a/src/main/resources/archetype-resources/src/main/java/SimpleFilter.java b/src/main/resources/archetype-resources/src/main/java/SimpleFilter.java
new file mode 100644
index 0000000..3cd2430
--- /dev/null
+++ b/src/main/resources/archetype-resources/src/main/java/SimpleFilter.java
@@ -0,0 +1,71 @@
+/*
+ * 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.
+ */
+package ${package};
+
+import java.io.IOException;
+
+import javax.servlet.Filter;
+import javax.servlet.FilterChain;
+import javax.servlet.FilterConfig;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+
+import org.apache.felix.scr.annotations.Component;
+import org.apache.felix.scr.annotations.Properties;
+import org.apache.felix.scr.annotations.Property;
+import org.apache.felix.scr.annotations.Service;
+import org.apache.felix.scr.annotations.sling.SlingFilter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * A Simple Filter
+ *
+ * Annotations below are short version of:
+ *
+ * @Component
+ * @Service(Filter.class)
+ * @Properties({
+ * @Property(name="service.description", value="A Simple Filter"),
+ * @Property(name="service.vendor", value="The Apache Software Foundation"),
+ * @Property(name="sling.filter.scope", value="REQUEST"),
+ * @Property(name="service.ranking", intValue=1)
+ * })
+ */
+@SlingFilter(order=1, description="A Simple Filter")
+@Property(name="service.vendor", value="The Apache Software Foundation")
+public class SimpleFilter implements Filter {
+
+ private final Logger log = LoggerFactory.getLogger(SimpleFilter.class);
+
+ public void init(FilterConfig filterConfig) throws ServletException {
+ }
+
+ public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException,
+ ServletException {
+ log.info("filter invoked - start");
+ chain.doFilter(request, response);
+ log.info("filter invoked - end");
+ }
+
+ public void destroy() {
+ }
+
+}
diff --git a/src/main/resources/archetype-resources/src/test/java/ByPathServletTest.java b/src/main/resources/archetype-resources/src/test/java/ByPathServletTest.java
new file mode 100644
index 0000000..4614a24
--- /dev/null
+++ b/src/main/resources/archetype-resources/src/test/java/ByPathServletTest.java
@@ -0,0 +1,33 @@
+/*
+ * 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.
+ */
+package ${package};
+
+import junit.framework.TestCase;
+
+/**
+ * Unit test for By Path Servlet.
+ */
+public class ByPathServletTest extends TestCase {
+
+ /**
+ * Rigourous Test :-)
+ */
+ public void testByPathServlet() {
+ assertTrue(true);
+ }
+
+}
diff --git a/src/test/resources/projects/normal/archetype.properties b/src/test/resources/projects/normal/archetype.properties
new file mode 100644
index 0000000..d6fe58d
--- /dev/null
+++ b/src/test/resources/projects/normal/archetype.properties
@@ -0,0 +1,4 @@
+groupId=org.apache.sling
+artifactId=test-servlet-archetype-project
+version=0.0.1-SNAPSHOT
+package=org.apache.sling.archetype.servlet.testing
\ No newline at end of file
diff --git a/src/test/resources/projects/normal/goal.txt b/src/test/resources/projects/normal/goal.txt
new file mode 100644
index 0000000..597acc7
--- /dev/null
+++ b/src/test/resources/projects/normal/goal.txt
@@ -0,0 +1 @@
+package
\ No newline at end of file
diff --git a/src/test/resources/projects/normal/reference/pom.xml b/src/test/resources/projects/normal/reference/pom.xml
new file mode 100644
index 0000000..ffa8542
--- /dev/null
+++ b/src/test/resources/projects/normal/reference/pom.xml
@@ -0,0 +1,138 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ 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.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>test-servlet-archetype-project</artifactId>
+ <packaging>bundle</packaging>
+ <version>0.0.1-SNAPSHOT</version>
+ <name>test-servlet-archetype-project</name>
+ <description>org.apache.sling - test-servlet-archetype-project</description>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-scr-plugin</artifactId>
+ <version>1.7.2</version>
+ <executions>
+ <execution>
+ <id>generate-scr-descriptor</id>
+ <goals>
+ <goal>scr</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <version>2.0.1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <!-- use version 2.3.2 to have java 1.5 as the default -->
+ <version>2.3.2</version>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.5</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ <version>4.2.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <version>4.2.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.jcr</groupId>
+ <artifactId>jcr</artifactId>
+ <version>2.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.api</artifactId>
+ <version>2.2.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>1.5.10</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.scr.annotations</artifactId>
+ <version>1.6.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+ </properties>
+ <profiles>
+ <profile>
+ <id>autoInstallBundle</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>maven-sling-plugin</artifactId>
+ <version>2.0.4-incubator</version>
+ <executions>
+ <execution>
+ <id>install-bundle</id>
+ <goals>
+ <goal>install</goal>
+ </goals>
+ <configuration>
+ <slingUrl>http://localhost:8888/system/console</slingUrl>
+ <user>admin</user>
+ <password>admin</password>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+</project>
diff --git a/src/test/resources/projects/normal/reference/src/main/java/org/apache/sling/archetype/servlet/testing/ByPathServlet.java b/src/test/resources/projects/normal/reference/src/main/java/org/apache/sling/archetype/servlet/testing/ByPathServlet.java
new file mode 100644
index 0000000..56d11d4
--- /dev/null
+++ b/src/test/resources/projects/normal/reference/src/main/java/org/apache/sling/archetype/servlet/testing/ByPathServlet.java
@@ -0,0 +1,79 @@
+/*
+ * 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.
+ */
+package org.apache.sling.archetype.servlet.testing;
+
+import java.io.IOException;
+import java.io.Writer;
+
+import javax.servlet.ServletException;
+
+import org.apache.felix.scr.annotations.Properties;
+import org.apache.felix.scr.annotations.Property;
+import org.apache.felix.scr.annotations.sling.SlingServlet;
+import org.apache.sling.api.SlingHttpServletRequest;
+import org.apache.sling.api.SlingHttpServletResponse;
+import org.apache.sling.api.servlets.SlingSafeMethodsServlet;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Hello World Servlet registered by path
+ *
+ * Annotations below are short version of:
+ *
+ * @Component
+ * @Service(Servlet.class)
+ * @Properties({
+ * @Property(name="service.description", value="Hello World Path Servlet"),
+ * @Property(name="service.vendor", value="The Apache Software Foundation"),
+ * @Property(name="sling.servlet.paths", value="/hello-world-servlet")
+ * })
+ */
+@SlingServlet(paths="/hello-world-servlet")
+@Properties({
+ @Property(name="service.description", value="Hello World Path Servlet"),
+ @Property(name="service.vendor", value="The Apache Software Foundation")
+})
+@SuppressWarnings("serial")
+public class ByPathServlet extends SlingSafeMethodsServlet {
+
+ private final Logger log = LoggerFactory.getLogger(ByPathServlet.class);
+
+ @Override
+ protected void doGet(SlingHttpServletRequest request,
+ SlingHttpServletResponse response) throws ServletException,
+ IOException {
+
+ Writer w = response.getWriter();
+ w.write("<!DOCTYPE html PUBLIC \"-//IETF//DTD HTML 2.0//EN\">");
+ w.write("<html>");
+ w.write("<head>");
+ w.write("<title>Hello World Servlet</title>");
+ w.write("</head>");
+ w.write("<body>");
+ w.write("<h1>Hello World!</h1>");
+ w.write("</body>");
+ w.write("</html>");
+
+ log.info("Hello World Servlet");
+
+ }
+
+}
+
diff --git a/src/test/resources/projects/normal/reference/src/main/java/org/apache/sling/archetype/servlet/testing/ByResourceTypeServlet.java b/src/test/resources/projects/normal/reference/src/main/java/org/apache/sling/archetype/servlet/testing/ByResourceTypeServlet.java
new file mode 100644
index 0000000..6ae820e
--- /dev/null
+++ b/src/test/resources/projects/normal/reference/src/main/java/org/apache/sling/archetype/servlet/testing/ByResourceTypeServlet.java
@@ -0,0 +1,85 @@
+/*
+ * 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.
+ */
+package org.apache.sling.archetype.servlet.testing;
+
+import java.io.IOException;
+import java.io.Writer;
+
+import javax.servlet.ServletException;
+
+import org.apache.felix.scr.annotations.Properties;
+import org.apache.felix.scr.annotations.Property;
+import org.apache.felix.scr.annotations.sling.SlingServlet;
+import org.apache.sling.api.SlingHttpServletRequest;
+import org.apache.sling.api.SlingHttpServletResponse;
+import org.apache.sling.api.resource.Resource;
+import org.apache.sling.api.servlets.SlingSafeMethodsServlet;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Hello World Servlet registered by resource type
+ *
+ * Annotations below are short version of:
+ *
+ * @Component
+ * @Service(Servlet.class)
+ * @Properties({
+ * @Property(name="service.description", value="Hello World Type Servlet"),
+ * @Property(name="service.vendor", value="The Apache Software Foundation"),
+ * @Property(name="sling.servlet.resourceTypes", value="sling/servlet/default"),
+ * @Property(name="sling.servlet.selectors", value="hello"),
+ * @Property(name="sling.servlet.extensions", value="html")
+ * })
+ */
+@SlingServlet(resourceTypes="sling/servlet/default", selectors="hello", extensions="html")
+@Properties({
+ @Property(name="service.description", value="Hello World Type Servlet"),
+ @Property(name="service.vendor", value="The Apache Software Foundation")
+})
+@SuppressWarnings("serial")
+public class ByResourceTypeServlet extends SlingSafeMethodsServlet {
+
+ private final Logger log = LoggerFactory.getLogger(ByResourceTypeServlet.class);
+
+ @Override
+ protected void doGet(SlingHttpServletRequest request,
+ SlingHttpServletResponse response) throws ServletException,
+ IOException {
+ Resource resource = request.getResource();
+
+ Writer w = response.getWriter();
+ w.write("<!DOCTYPE html PUBLIC \"-//IETF//DTD HTML 2.0//EN\">");
+ w.write("<html>");
+ w.write("<head>");
+ w.write("<title>Hello World Servlet</title>");
+ w.write("</head>");
+ w.write("<body>");
+ w.write("<h1>Hello ");
+ w.write(resource.getPath());
+ w.write("</h1>");
+ w.write("</body>");
+ w.write("</html>");
+
+ log.info("Hello World Servlet");
+
+ }
+
+}
+
diff --git a/src/test/resources/projects/normal/reference/src/main/java/org/apache/sling/archetype/servlet/testing/SimpleFilter.java b/src/test/resources/projects/normal/reference/src/main/java/org/apache/sling/archetype/servlet/testing/SimpleFilter.java
new file mode 100644
index 0000000..635f500
--- /dev/null
+++ b/src/test/resources/projects/normal/reference/src/main/java/org/apache/sling/archetype/servlet/testing/SimpleFilter.java
@@ -0,0 +1,71 @@
+/*
+ * 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.
+ */
+package org.apache.sling.archetype.servlet.testing;
+
+import java.io.IOException;
+
+import javax.servlet.Filter;
+import javax.servlet.FilterChain;
+import javax.servlet.FilterConfig;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+
+import org.apache.felix.scr.annotations.Component;
+import org.apache.felix.scr.annotations.Properties;
+import org.apache.felix.scr.annotations.Property;
+import org.apache.felix.scr.annotations.Service;
+import org.apache.felix.scr.annotations.sling.SlingFilter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * A Simple Filter
+ *
+ * Annotations below are short version of:
+ *
+ * @Component
+ * @Service(Filter.class)
+ * @Properties({
+ * @Property(name="service.description", value="A Simple Filter"),
+ * @Property(name="service.vendor", value="The Apache Software Foundation"),
+ * @Property(name="sling.filter.scope", value="REQUEST"),
+ * @Property(name="service.ranking", intValue=1)
+ * })
+ */
+@SlingFilter(order=1, description="A Simple Filter")
+@Property(name="service.vendor", value="The Apache Software Foundation")
+public class SimpleFilter implements Filter {
+
+ private final Logger log = LoggerFactory.getLogger(SimpleFilter.class);
+
+ public void init(FilterConfig filterConfig) throws ServletException {
+ }
+
+ public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException,
+ ServletException {
+ log.info("filter invoked - start");
+ chain.doFilter(request, response);
+ log.info("filter invoked - end");
+ }
+
+ public void destroy() {
+ }
+
+}
diff --git a/src/test/resources/projects/normal/reference/src/test/java/org/apache/sling/archetype/servlet/testing/ByPathServletTest.java b/src/test/resources/projects/normal/reference/src/test/java/org/apache/sling/archetype/servlet/testing/ByPathServletTest.java
new file mode 100644
index 0000000..5448d57
--- /dev/null
+++ b/src/test/resources/projects/normal/reference/src/test/java/org/apache/sling/archetype/servlet/testing/ByPathServletTest.java
@@ -0,0 +1,33 @@
+/*
+ * 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.
+ */
+package org.apache.sling.archetype.servlet.testing;
+
+import junit.framework.TestCase;
+
+/**
+ * Unit test for By Path Servlet.
+ */
+public class ByPathServletTest extends TestCase {
+
+ /**
+ * Rigourous Test :-)
+ */
+ public void testByPathServlet() {
+ assertTrue(true);
+ }
+
+}
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-servlet-archetype] 21/22: SLING-7167 Adjust READMEs
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-servlet-archetype.git
commit db3fa886c5cf2f8675f68fd82a3056734454c31f
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Mon Oct 2 16:24:47 2017 +0000
SLING-7167 Adjust READMEs
switch from plain text to Markdown
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1810547 13f79535-47bb-0310-9956-ffa450edef68
---
README.txt => README.md | 0
1 file changed, 0 insertions(+), 0 deletions(-)
diff --git a/README.txt b/README.md
similarity index 100%
rename from README.txt
rename to README.md
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-servlet-archetype] 07/22: SLING-3520 - Consolidate archetype
plugin versions in a parent pom
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-servlet-archetype.git
commit 9de7e4fcef5cb84dbd56844dac3b6629049979f8
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Thu May 15 08:36:08 2014 +0000
SLING-3520 - Consolidate archetype plugin versions in a parent pom
Update all archetypes to use the archetype parent. Projects missing
verification now run a simple verify script which validates that the
build was successful and no warnings were generated.
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1594818 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 13 +++------
src/main/resources/archetype-resources/pom.xml | 31 ++++++++++++----------
.../resources/projects/normal/reference/pom.xml | 15 ++++++-----
3 files changed, 30 insertions(+), 29 deletions(-)
diff --git a/pom.xml b/pom.xml
index 6d396fe..03fae0c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,9 +23,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.sling</groupId>
- <artifactId>sling</artifactId>
- <version>19</version>
- <relativePath>../../../parent/pom.xml</relativePath>
+ <artifactId>sling-archetype-parent</artifactId>
+ <version>1</version>
+ <relativePath>../parent/pom.xml</relativePath>
</parent>
<groupId>org.apache.sling</groupId>
@@ -60,16 +60,11 @@
<extension>
<groupId>org.apache.maven.archetype</groupId>
<artifactId>archetype-packaging</artifactId>
- <version>2.2</version>
+ <version>${archetype.version}</version>
</extension>
</extensions>
<plugins>
<plugin>
- <artifactId>maven-archetype-plugin</artifactId>
- <version>2.2</version>
- <extensions>true</extensions>
- </plugin>
- <plugin>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
diff --git a/src/main/resources/archetype-resources/pom.xml b/src/main/resources/archetype-resources/pom.xml
index 332ff16..e3e7ff7 100644
--- a/src/main/resources/archetype-resources/pom.xml
+++ b/src/main/resources/archetype-resources/pom.xml
@@ -19,18 +19,18 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <groupId>${groupId}</groupId>
- <artifactId>${artifactId}</artifactId>
+ <groupId>\${groupId}</groupId>
+ <artifactId>\${artifactId}</artifactId>
<packaging>bundle</packaging>
- <version>${version}</version>
- <name>${artifactId}</name>
- <description>${groupId} - ${artifactId}</description>
+ <version>\${version}</version>
+ <name>\${artifactId}</name>
+ <description>\${groupId} - \${artifactId}</description>
<build>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-scr-plugin</artifactId>
- <version>1.7.2</version>
+ <version>${scrplugin.version}</version>
<executions>
<execution>
<id>generate-scr-descriptor</id>
@@ -44,13 +44,16 @@
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
- <version>2.0.1</version>
+ <version>${bundleplugin.version}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <!-- use version 2.3.2 to have java 1.5 as the default -->
- <version>2.3.2</version>
+ <version>${compilerplugin.version}</version>
+ <configuration>
+ <source>${archetype.java.version}</source>
+ <target>${archetype.java.version}</target>
+ </configuration>
</plugin>
</plugins>
</build>
@@ -82,25 +85,25 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.api</artifactId>
- <version>2.2.0</version>
+ <version>${slingapi.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.5.10</version>
+ <version>${slf4japi.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.scr.annotations</artifactId>
- <version>1.6.0</version>
+ <version>${scrannotations.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.1</version>
+ <version>${junit.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -116,7 +119,7 @@
<plugin>
<groupId>org.apache.sling</groupId>
<artifactId>maven-sling-plugin</artifactId>
- <version>2.0.4-incubator</version>
+ <version>${slingplugin.version}</version>
<executions>
<execution>
<id>install-bundle</id>
diff --git a/src/test/resources/projects/normal/reference/pom.xml b/src/test/resources/projects/normal/reference/pom.xml
index ce932f2..7834625 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.7.2</version>
+ <version>1.16.0</version>
<executions>
<execution>
<id>generate-scr-descriptor</id>
@@ -44,13 +44,16 @@
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
- <version>2.0.1</version>
+ <version>2.4.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <!-- use version 2.3.2 to have java 1.5 as the default -->
- <version>2.3.2</version>
+ <version>3.1</version>
+ <configuration>
+ <source>6</source>
+ <target>6</target>
+ </configuration>
</plugin>
</plugins>
</build>
@@ -94,7 +97,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.scr.annotations</artifactId>
- <version>1.6.0</version>
+ <version>1.9.8</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -116,7 +119,7 @@
<plugin>
<groupId>org.apache.sling</groupId>
<artifactId>maven-sling-plugin</artifactId>
- <version>2.0.4-incubator</version>
+ <version>2.1.0</version>
<executions>
<execution>
<id>install-bundle</id>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-servlet-archetype] 17/22: sling-servlet-archetype: use
sling-archetype-parent 5-SNAPSHOT
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-servlet-archetype.git
commit 91ecf9b9ea1b681f0e58f124e58ebef696fb930e
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Fri Oct 16 20:06:58 2015 +0000
sling-servlet-archetype: use sling-archetype-parent 5-SNAPSHOT
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1709101 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 925b6bc..1262bd1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
<groupId>org.apache.sling</groupId>
<artifactId>sling-archetype-parent</artifactId>
<relativePath />
- <version>4</version>
+ <version>5-SNAPSHOT</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>.