You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2017/11/07 10:25:20 UTC
[sling-servlet-archetype] annotated tag
sling-servlet-archetype-1.0.2 created (now c17e081)
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a change to annotated tag sling-servlet-archetype-1.0.2
in repository https://gitbox.apache.org/repos/asf/sling-servlet-archetype.git.
at c17e081 (tag)
tagging 6decf181d132ab3b4d34c7c6a097572907f1bffe (commit)
by Robert Munteanu
on Thu May 15 09:00:17 2014 +0000
- Log -----------------------------------------------------------------
sling-servlet-archetype-1.0.2
-----------------------------------------------------------------------
This annotated tag includes the following new commits:
new 753eb72 SLING-1054 - adding servlet and resources archetypes
new cee9d77 svn:ignore
new 50335eb updating all modules to parent 10-SNAPSHOT in anticipation of emma additions to parent
new c383214 adding README files
new 0eaf461 going back to parent 9 before release
new 0cbca76 [maven-release-plugin] prepare release sling-servlet-archetype-1.0.0
new ab10456 [maven-release-plugin] prepare for next development iteration
new 5fcd2fa updating to latest parent post-release
new f6b7d31 generate pom needs source=1.5 to support annotations
new 7bf0243 use maven-compiler-plugin 2.3.2 in generated pom, to have java 1.5 as the default
new 8e5d9f6 Update to recent snapshots
new 8e56710 Use latest releases.
new c9b7a97 adding missing scm info and readmes
new 086167c SLING-2144 - updating bundle, scr, and osgi versions
new ad699d7 SLING-2145 - switching to use @SlingServlet
new 503760c SLING-2146 - adding a simple filter
new 1b3b239 SLING-2150 : Update plugins to use the latest available versions
new fb7869f SLING-2144 - downgrading bundle plugin as 2.3.5 doesn't work with Java 5
new 125b873 Update to recent snapshot
new bdbb95d Using latest released parent pom
new 0dab420 SLING-2187 - adding new module to contain our custom notice file; adding remote-resources plugin configuration to parent pom and removing all existing appended-resources NOTICE files
new c26120f temporarily using snapshots during release vote
new 6e02f53 using latest releases
new 7c17edf SLING-2338 - adding integration test for servlet archetype
new 36ac0c9 fixing build on windows
new b4d9bc4 SLING-2480 : Add config for maven-sling-plugin to m2e configuration
new 72dd518 SLING-2338 - adding antrum to fix crlfs when a checkout is done under cygwin on windows
new 50128fc Update to latest parent pom
new dfa20b1 Use released versions
new 6fe569b SLING-2608 - adding exclusion for iml files (thanks to Tommaso Teofili for the patch!)
new 71fec48 Use latest releases and update to new parent pom
new 59eb052 Update to latest parent pom and use latest releases in launchpad
new d675048 Correct reactor pom and update to parent pom 16
new 89611de SLING-2948 - Servlet archetype - set encoding for generated project
new 5d71b9b Update to latest parent pom
new 4e88876 SLING-2978 - Create tooling top-level directory and move maven and ide under it
new 08ef6c8 SLING-2804 : make sure directory exists before running command
new 2c0f6db Update to parent pom 18
new 7694dd5 Update to parent pom v19
new b1cb6db SLING-3538 - Maven archetypes should use the same port as the default launchpad port
new 2374617 SLING-3538 - Maven archetypes should use the same port as the default launchpad port
new deaf5fc SLING-3520 - Consolidate archetype plugin versions in a parent pom
new af800b7 SLING-3532 - Move sling plugin configuration out of the autoInstallBundle profile
new 6891762 [maven-release-plugin] prepare release sling-servlet-archetype-1.0.2
new 6decf18 [maven-release-plugin] copy for tag sling-servlet-archetype-1.0.2
The 45 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] 07/39: adding missing scm info and readmes
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag sling-servlet-archetype-1.0.2
in repository https://gitbox.apache.org/repos/asf/sling-servlet-archetype.git
commit c9b7a97f7127e7967e14707902894bb358cafe5a
Author: Justin Edelson <ju...@apache.org>
AuthorDate: Fri May 6 18:36:24 2011 +0000
adding missing scm info and readmes
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/maven/archetypes/servlet@1100317 13f79535-47bb-0310-9956-ffa450edef68
---
README.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.txt b/README.txt
index bb45b27..f582625 100644
--- a/README.txt
+++ b/README.txt
@@ -21,7 +21,7 @@ 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/maven/archetypes/initial-content
+ svn checkout http://svn.apache.org/repos/asf/sling/trunk/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] 24/39: SLING-2608 - adding exclusion for
iml files (thanks to Tommaso Teofili for the patch!)
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag sling-servlet-archetype-1.0.2
in repository https://gitbox.apache.org/repos/asf/sling-servlet-archetype.git
commit 6fe569bff5e3d57d9ae18e8415e4c274be0f98b0
Author: Justin Edelson <ju...@apache.org>
AuthorDate: Fri Sep 28 09:10:42 2012 +0000
SLING-2608 - adding exclusion for iml files (thanks to Tommaso Teofili for the patch!)
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/maven/archetypes/servlet@1391371 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 1 +
1 file changed, 1 insertion(+)
diff --git a/pom.xml b/pom.xml
index ec081dd..cf57b2f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -52,6 +52,7 @@
<exclude>**/.project</exclude>
<exclude>**/.classpath</exclude>
<exclude>**/target/**</exclude>
+ <exclude>**/*.iml</exclude>
</excludes>
</testResource>
</testResources>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-servlet-archetype] 14/39: Using latest released parent pom
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag sling-servlet-archetype-1.0.2
in repository https://gitbox.apache.org/repos/asf/sling-servlet-archetype.git
commit bdbb95da9d052b4921e2a9a3fa75307330344f0a
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Mon Aug 8 11:31:38 2011 +0000
Using latest released parent pom
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/maven/archetypes/servlet@1154924 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 2aa1139..aa4a4d7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>12-SNAPSHOT</version>
+ <version>11</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] 36/39: 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 annotated tag sling-servlet-archetype-1.0.2
in repository https://gitbox.apache.org/repos/asf/sling-servlet-archetype.git
commit deaf5fc7d55fdcc2e865d2715c7a064a1b2215f2
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/tooling/maven/archetypes/servlet@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] 03/39: generate pom needs source=1.5 to
support annotations
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag sling-servlet-archetype-1.0.2
in repository https://gitbox.apache.org/repos/asf/sling-servlet-archetype.git
commit f6b7d31207a67cd05f92a7bd1fcaab092b5f7138
Author: Bertrand Delacretaz <bd...@apache.org>
AuthorDate: Mon Nov 29 08:32:59 2010 +0000
generate pom needs source=1.5 to support annotations
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/maven/archetypes/servlet@1040034 13f79535-47bb-0310-9956-ffa450edef68
---
src/main/resources/archetype-resources/pom.xml | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/src/main/resources/archetype-resources/pom.xml b/src/main/resources/archetype-resources/pom.xml
index d1e95e8..583ff6b 100644
--- a/src/main/resources/archetype-resources/pom.xml
+++ b/src/main/resources/archetype-resources/pom.xml
@@ -46,6 +46,14 @@
<extensions>true</extensions>
<version>2.0.1</version>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
</plugins>
</build>
<dependencies>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-servlet-archetype] 28/39: SLING-2948 - Servlet archetype -
set encoding for generated project
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag sling-servlet-archetype-1.0.2
in repository https://gitbox.apache.org/repos/asf/sling-servlet-archetype.git
commit 89611de40910dbea86e4562c783d5af56eedf3c1
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Mon Jul 8 15:16:11 2013 +0000
SLING-2948 - Servlet archetype - set encoding for generated project
This prevents build warnings from being issued.
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/maven/archetypes/servlet@1500794 13f79535-47bb-0310-9956-ffa450edef68
---
src/main/resources/archetype-resources/pom.xml | 4 ++++
src/test/resources/projects/normal/reference/pom.xml | 4 ++++
2 files changed, 8 insertions(+)
diff --git a/src/main/resources/archetype-resources/pom.xml b/src/main/resources/archetype-resources/pom.xml
index 6e09b4f..c0e336a 100644
--- a/src/main/resources/archetype-resources/pom.xml
+++ b/src/main/resources/archetype-resources/pom.xml
@@ -104,6 +104,10 @@
<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>
diff --git a/src/test/resources/projects/normal/reference/pom.xml b/src/test/resources/projects/normal/reference/pom.xml
index f35f9e8..ffa8542 100644
--- a/src/test/resources/projects/normal/reference/pom.xml
+++ b/src/test/resources/projects/normal/reference/pom.xml
@@ -104,6 +104,10 @@
<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>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-servlet-archetype] 12/39: SLING-2144 - downgrading bundle
plugin as 2.3.5 doesn't work with Java 5
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag sling-servlet-archetype-1.0.2
in repository https://gitbox.apache.org/repos/asf/sling-servlet-archetype.git
commit fb7869fbc6e08a0ec943e97f5f857fac826b8a8c
Author: Justin Edelson <ju...@apache.org>
AuthorDate: Wed Jul 20 17:53:29 2011 +0000
SLING-2144 - downgrading bundle plugin as 2.3.5 doesn't work with Java 5
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/maven/archetypes/servlet@1148867 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 5e62c99..6e09b4f 100644
--- a/src/main/resources/archetype-resources/pom.xml
+++ b/src/main/resources/archetype-resources/pom.xml
@@ -44,7 +44,7 @@
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
- <version>2.3.5</version>
+ <version>2.0.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-servlet-archetype] 09/39: SLING-2145 - switching to use
@SlingServlet
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag sling-servlet-archetype-1.0.2
in repository https://gitbox.apache.org/repos/asf/sling-servlet-archetype.git
commit ad699d72e2b872edee112e958e42e1ec0f0cdc31
Author: Justin Edelson <ju...@apache.org>
AuthorDate: Fri Jul 15 20:24:07 2011 +0000
SLING-2145 - switching to use @SlingServlet
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/maven/archetypes/servlet@1147307 13f79535-47bb-0310-9956-ffa450edef68
---
.../src/main/java/ByPathServlet.java | 26 +++++++++++--------
.../src/main/java/ByResourceTypeServlet.java | 30 +++++++++++++---------
2 files changed, 34 insertions(+), 22 deletions(-)
diff --git a/src/main/resources/archetype-resources/src/main/java/ByPathServlet.java b/src/main/resources/archetype-resources/src/main/java/ByPathServlet.java
index a737ed9..8ab1c12 100644
--- a/src/main/resources/archetype-resources/src/main/java/ByPathServlet.java
+++ b/src/main/resources/archetype-resources/src/main/java/ByPathServlet.java
@@ -21,15 +21,11 @@ package ${package};
import java.io.IOException;
import java.io.Writer;
-import javax.servlet.Servlet;
import javax.servlet.ServletException;
-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.Reference;
-import org.apache.felix.scr.annotations.Service;
-
+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;
@@ -38,13 +34,23 @@ 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")
+ * })
*/
-@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);
diff --git a/src/main/resources/archetype-resources/src/main/java/ByResourceTypeServlet.java b/src/main/resources/archetype-resources/src/main/java/ByResourceTypeServlet.java
index 1ee9ff4..f87823f 100644
--- a/src/main/resources/archetype-resources/src/main/java/ByResourceTypeServlet.java
+++ b/src/main/resources/archetype-resources/src/main/java/ByResourceTypeServlet.java
@@ -21,15 +21,11 @@ package ${package};
import java.io.IOException;
import java.io.Writer;
-import javax.servlet.Servlet;
import javax.servlet.ServletException;
-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.Reference;
-import org.apache.felix.scr.annotations.Service;
-
+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;
@@ -39,15 +35,25 @@ 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")
+ * })
*/
-@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);
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-servlet-archetype] 37/39: 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 annotated tag sling-servlet-archetype-1.0.2
in repository https://gitbox.apache.org/repos/asf/sling-servlet-archetype.git
commit af800b73e1442a7d6ee8494a36a1982df58cbebe
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/tooling/maven/archetypes/servlet@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] 38/39: [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 annotated tag sling-servlet-archetype-1.0.2
in repository https://gitbox.apache.org/repos/asf/sling-servlet-archetype.git
commit 6891762070e87c2b4567cfaa837d52e98e9f6ce9
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/tooling/maven/archetypes/servlet@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] 02/39: updating to latest parent
post-release
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag sling-servlet-archetype-1.0.2
in repository https://gitbox.apache.org/repos/asf/sling-servlet-archetype.git
commit 5fcd2faeaf0107d060d4628a02d7cfbec82d0137
Author: Justin Edelson <ju...@apache.org>
AuthorDate: Tue Oct 19 17:23:10 2010 +0000
updating to latest parent post-release
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/maven/archetypes/servlet@1024329 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 324c2d0..5618f3d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>9</version>
+ <version>10-SNAPSHOT</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] 13/39: Update to recent snapshot
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag sling-servlet-archetype-1.0.2
in repository https://gitbox.apache.org/repos/asf/sling-servlet-archetype.git
commit 125b87331d80e82fe548572f06180fffbb9089e9
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Wed Aug 3 09:01:37 2011 +0000
Update to recent snapshot
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/maven/archetypes/servlet@1153397 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index d3d6945..2aa1139 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>11-SNAPSHOT</version>
+ <version>12-SNAPSHOT</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] 05/39: Update to recent snapshots
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag sling-servlet-archetype-1.0.2
in repository https://gitbox.apache.org/repos/asf/sling-servlet-archetype.git
commit 8e5d9f6321a1070f47d3b33204634efde7d109d5
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Wed Dec 8 16:37:27 2010 +0000
Update to recent snapshots
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/maven/archetypes/servlet@1043504 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 5618f3d..d3d6945 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>10-SNAPSHOT</version>
+ <version>11-SNAPSHOT</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] 21/39: SLING-2338 - adding antrum to fix
crlfs when a checkout is done under cygwin on windows
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag sling-servlet-archetype-1.0.2
in repository https://gitbox.apache.org/repos/asf/sling-servlet-archetype.git
commit 72dd51825a970444bdbc7abe3d4593b75c08bf50
Author: Justin Edelson <ju...@apache.org>
AuthorDate: Wed Jun 6 13:05:42 2012 +0000
SLING-2338 - adding antrum to fix crlfs when a checkout is done under cygwin on windows
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/maven/archetypes/servlet@1346871 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
diff --git a/pom.xml b/pom.xml
index 8d97cfc..30cfa18 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,6 +17,7 @@
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>
@@ -67,6 +68,23 @@
<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>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-servlet-archetype] 33/39: 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 annotated tag sling-servlet-archetype-1.0.2
in repository https://gitbox.apache.org/repos/asf/sling-servlet-archetype.git
commit 7694dd5cd425f809fc98aef9ec9c2fd5c093f47b
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/tooling/maven/archetypes/servlet@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] 26/39: Update to latest parent pom and
use latest releases in launchpad
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag sling-servlet-archetype-1.0.2
in repository https://gitbox.apache.org/repos/asf/sling-servlet-archetype.git
commit 59eb052d4122d93ef2db9253760e4adf6b4db22e
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Mon Feb 18 08:38:52 2013 +0000
Update to latest parent pom and use latest releases in launchpad
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/maven/archetypes/servlet@1447147 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 8b3ef41..af74b8b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>14</version>
+ <version>15</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] 10/39: SLING-2146 - adding a simple filter
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag sling-servlet-archetype-1.0.2
in repository https://gitbox.apache.org/repos/asf/sling-servlet-archetype.git
commit 503760ca44eb36d7cbcac6de8bd6ba249eda0558
Author: Justin Edelson <ju...@apache.org>
AuthorDate: Fri Jul 15 20:24:17 2011 +0000
SLING-2146 - adding a simple filter
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/maven/archetypes/servlet@1147308 13f79535-47bb-0310-9956-ffa450edef68
---
.../src/main/java/SimpleFilter.java | 71 ++++++++++++++++++++++
1 file changed, 71 insertions(+)
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() {
+ }
+
+}
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-servlet-archetype] 35/39: 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 annotated tag sling-servlet-archetype-1.0.2
in repository https://gitbox.apache.org/repos/asf/sling-servlet-archetype.git
commit 2374617640a4ad478e5b6696dbd12f3dd90fe6de
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/tooling/maven/archetypes/servlet@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] 06/39: Use latest releases.
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag sling-servlet-archetype-1.0.2
in repository https://gitbox.apache.org/repos/asf/sling-servlet-archetype.git
commit 8e56710f87e90c68be2cab7d4742efb51b3eb67d
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Mon Dec 13 08:55:35 2010 +0000
Use latest releases.
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/maven/archetypes/servlet@1045037 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index d3d6945..0771d02 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>11-SNAPSHOT</version>
+ <version>10</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] 17/39: using latest releases
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag sling-servlet-archetype-1.0.2
in repository https://gitbox.apache.org/repos/asf/sling-servlet-archetype.git
commit 6e02f53565f43d2e014688640394a1b705aeb2b9
Author: Justin Edelson <ju...@apache.org>
AuthorDate: Wed Sep 7 14:35:51 2011 +0000
using latest releases
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/maven/archetypes/servlet@1166199 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 5083545..b6a1369 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>13-SNAPSHOT</version>
+ <version>12</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] 11/39: SLING-2150 : Update plugins to use
the latest available versions
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag sling-servlet-archetype-1.0.2
in repository https://gitbox.apache.org/repos/asf/sling-servlet-archetype.git
commit 1b3b239a5b04e18c7c1fd8781a3864e73f53bc0c
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Wed Jul 20 12:21:40 2011 +0000
SLING-2150 : Update plugins to use the latest available versions
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/maven/archetypes/servlet@1148722 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
src/main/resources/archetype-resources/pom.xml | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/pom.xml b/pom.xml
index 0771d02..d3d6945 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>10</version>
+ <version>11-SNAPSHOT</version>
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
diff --git a/src/main/resources/archetype-resources/pom.xml b/src/main/resources/archetype-resources/pom.xml
index 5800038..5e62c99 100644
--- a/src/main/resources/archetype-resources/pom.xml
+++ b/src/main/resources/archetype-resources/pom.xml
@@ -30,7 +30,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-scr-plugin</artifactId>
- <version>1.7.0</version>
+ <version>1.7.2</version>
<executions>
<execution>
<id>generate-scr-descriptor</id>
@@ -94,7 +94,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.scr.annotations</artifactId>
- <version>1.5.0</version>
+ <version>1.6.0</version>
<scope>provided</scope>
</dependency>
<dependency>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-servlet-archetype] 27/39: Correct reactor pom and update to
parent pom 16
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag sling-servlet-archetype-1.0.2
in repository https://gitbox.apache.org/repos/asf/sling-servlet-archetype.git
commit d675048fd3398da8760d37c715087ac39b79c7fa
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Sun May 5 14:38:24 2013 +0000
Correct reactor pom and update to parent pom 16
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/maven/archetypes/servlet@1479333 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index af74b8b..fdc17a6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>15</version>
+ <version>16</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] 34/39: 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 annotated tag sling-servlet-archetype-1.0.2
in repository https://gitbox.apache.org/repos/asf/sling-servlet-archetype.git
commit b1cb6db66a717ccb9482fdd8efc0e56f08a9dc3a
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/tooling/maven/archetypes/servlet@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] 15/39: SLING-2187 - adding new module to
contain our custom notice file;
adding remote-resources plugin configuration to parent pom and removing all
existing appended-resources NOTICE files
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag sling-servlet-archetype-1.0.2
in repository https://gitbox.apache.org/repos/asf/sling-servlet-archetype.git
commit 0dab4202d88550ca0fcedd7fe173b512b2fe209b
Author: Justin Edelson <ju...@apache.org>
AuthorDate: Wed Aug 31 19:23:49 2011 +0000
SLING-2187 - adding new module to contain our custom notice file; adding remote-resources plugin configuration to parent pom and removing all existing appended-resources NOTICE files
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/maven/archetypes/servlet@1163752 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index aa4a4d7..2aa1139 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>11</version>
+ <version>12-SNAPSHOT</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] 32/39: 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 annotated tag sling-servlet-archetype-1.0.2
in repository https://gitbox.apache.org/repos/asf/sling-servlet-archetype.git
commit 2c0f6dbc79d9832b6e8a308b1d16416578c986ba
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/tooling/maven/archetypes/servlet@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] 01/39: [maven-release-plugin] prepare for
next development iteration
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag sling-servlet-archetype-1.0.2
in repository https://gitbox.apache.org/repos/asf/sling-servlet-archetype.git
commit ab104562978f47ed0d90dcaa5c459dde262a6b7a
Author: Justin Edelson <ju...@apache.org>
AuthorDate: Fri Oct 15 14:37:04 2010 +0000
[maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/maven/archetypes/servlet@1022951 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index 19013ff..324c2d0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,16 +28,16 @@
<groupId>org.apache.sling</groupId>
<artifactId>sling-servlet-archetype</artifactId>
- <version>1.0.0</version>
+ <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/tags/sling-servlet-archetype-1.0.0</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/tags/sling-servlet-archetype-1.0.0</developerConnection>
- <url>http://svn.apache.org/viewvc/sling/tags/sling-servlet-archetype-1.0.0</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/maven/archetypes/servlet</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/maven/archetypes/servlet</developerConnection>
+ <url>http://svn.apache.org/viewvc/sling/trunk/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] 08/39: SLING-2144 - updating bundle, scr,
and osgi versions
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag sling-servlet-archetype-1.0.2
in repository https://gitbox.apache.org/repos/asf/sling-servlet-archetype.git
commit 086167c95b48841be1840bd5b3bc2139dcb26bc0
Author: Justin Edelson <ju...@apache.org>
AuthorDate: Fri Jul 15 20:23:49 2011 +0000
SLING-2144 - updating bundle, scr, and osgi versions
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/maven/archetypes/servlet@1147306 13f79535-47bb-0310-9956-ffa450edef68
---
src/main/resources/archetype-resources/pom.xml | 20 ++++++++++++++++----
1 file changed, 16 insertions(+), 4 deletions(-)
diff --git a/src/main/resources/archetype-resources/pom.xml b/src/main/resources/archetype-resources/pom.xml
index b9db9f6..5800038 100644
--- a/src/main/resources/archetype-resources/pom.xml
+++ b/src/main/resources/archetype-resources/pom.xml
@@ -30,7 +30,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-scr-plugin</artifactId>
- <version>1.4.4</version>
+ <version>1.7.0</version>
<executions>
<execution>
<id>generate-scr-descriptor</id>
@@ -44,7 +44,7 @@
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
- <version>2.0.1</version>
+ <version>2.3.5</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -62,6 +62,18 @@
<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>
@@ -70,7 +82,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.api</artifactId>
- <version>2.0.8</version>
+ <version>2.2.0</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -82,7 +94,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.scr.annotations</artifactId>
- <version>1.0.0</version>
+ <version>1.5.0</version>
<scope>provided</scope>
</dependency>
<dependency>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-servlet-archetype] 30/39: 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 annotated tag sling-servlet-archetype-1.0.2
in repository https://gitbox.apache.org/repos/asf/sling-servlet-archetype.git
commit 4e88876edc83e7165f6274fc81959d8c00830f44
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/tooling/maven/archetypes/servlet@1506645 13f79535-47bb-0310-9956-ffa450edef68
---
README.txt | 2 +-
pom.xml | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/README.txt b/README.txt
index f582625..bf1587b 100644
--- a/README.txt
+++ b/README.txt
@@ -21,7 +21,7 @@ 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/maven/archetypes/servlet
+ 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
index 78b2add..82bb5dd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -37,9 +37,9 @@
<description>Maven archetype for Sling Servlets</description>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/maven/archetypes/servlet</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/maven/archetypes/servlet</developerConnection>
- <url>http://svn.apache.org/viewvc/sling/trunk/maven/archetypes/servlet</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] 31/39: 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 annotated tag sling-servlet-archetype-1.0.2
in repository https://gitbox.apache.org/repos/asf/sling-servlet-archetype.git
commit 08ef6c8b9be12fe2e8d80463a9bec2b521711b95
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/tooling/maven/archetypes/servlet@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] 20/39: SLING-2480 : Add config for
maven-sling-plugin to m2e configuration
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag sling-servlet-archetype-1.0.2
in repository https://gitbox.apache.org/repos/asf/sling-servlet-archetype.git
commit b4d9bc493bd870813bada7279e95cef9329eaa08
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Wed May 16 07:39:13 2012 +0000
SLING-2480 : Add config for maven-sling-plugin to m2e configuration
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/maven/archetypes/servlet@1339038 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index fe0cb80..8d97cfc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>12</version>
+ <version>13-SNAPSHOT</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] 16/39: temporarily using snapshots during
release vote
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag sling-servlet-archetype-1.0.2
in repository https://gitbox.apache.org/repos/asf/sling-servlet-archetype.git
commit c26120f3dba9e3bed915fdc8ce29ce485e1e4544
Author: Justin Edelson <ju...@apache.org>
AuthorDate: Wed Aug 31 20:10:55 2011 +0000
temporarily using snapshots during release vote
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/maven/archetypes/servlet@1163785 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 2aa1139..5083545 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>12-SNAPSHOT</version>
+ <version>13-SNAPSHOT</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] 22/39: Update to latest parent pom
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag sling-servlet-archetype-1.0.2
in repository https://gitbox.apache.org/repos/asf/sling-servlet-archetype.git
commit 50128fcb3843021a92d41155be07d64b61c67277
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Thu Jul 5 09:29:47 2012 +0000
Update to latest parent pom
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/maven/archetypes/servlet@1357521 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 30cfa18..fc8fa4c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>13-SNAPSHOT</version>
+ <version>14-SNAPSHOT</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/39: fixing build on windows
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag sling-servlet-archetype-1.0.2
in repository https://gitbox.apache.org/repos/asf/sling-servlet-archetype.git
commit 36ac0c9ca1952dcd9c7eb5f642a182600bf5b2f8
Author: Eric Norman <en...@apache.org>
AuthorDate: Wed Dec 28 21:34:43 2011 +0000
fixing build on windows
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/maven/archetypes/servlet@1225347 13f79535-47bb-0310-9956-ffa450edef68
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-servlet-archetype] 39/39: [maven-release-plugin] copy for
tag 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 annotated tag sling-servlet-archetype-1.0.2
in repository https://gitbox.apache.org/repos/asf/sling-servlet-archetype.git
commit 6decf181d132ab3b4d34c7c6a097572907f1bffe
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Thu May 15 09:00:17 2014 +0000
[maven-release-plugin] copy for tag sling-servlet-archetype-1.0.2
git-svn-id: https://svn.apache.org/repos/asf/sling/tags/sling-servlet-archetype-1.0.2@1594831 13f79535-47bb-0310-9956-ffa450edef68
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-servlet-archetype] 18/39: SLING-2338 - adding integration
test for servlet archetype
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag sling-servlet-archetype-1.0.2
in repository https://gitbox.apache.org/repos/asf/sling-servlet-archetype.git
commit 7c17edf92d2650003e82efe79ad0668746694854
Author: Justin Edelson <ju...@apache.org>
AuthorDate: Wed Dec 21 01:04:07 2011 +0000
SLING-2338 - adding integration test for servlet archetype
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/maven/archetypes/servlet@1221548 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 57 +++++----
src/main/resources/META-INF/maven/archetype.xml | 23 ----
.../src/test/java/ByPathServletTest.java | 16 +++
.../resources/projects/normal/archetype.properties | 4 +
src/test/resources/projects/normal/goal.txt | 1 +
.../resources/projects/normal/reference/pom.xml | 134 +++++++++++++++++++++
.../archetype/servlet/testing/ByPathServlet.java | 79 ++++++++++++
.../servlet/testing/ByResourceTypeServlet.java | 85 +++++++++++++
.../archetype/servlet/testing/SimpleFilter.java | 71 +++++++++++
.../servlet/testing/ByPathServletTest.java | 33 +++++
10 files changed, 458 insertions(+), 45 deletions(-)
diff --git a/pom.xml b/pom.xml
index b6a1369..fe0cb80 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,7 +17,8 @@
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">
+<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>
@@ -41,39 +42,51 @@
</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>
+ </excludes>
+ </testResource>
+ </testResources>
<extensions>
<extension>
<groupId>org.apache.maven.archetype</groupId>
<artifactId>archetype-packaging</artifactId>
- <version>2.0-alpha-4</version>
+ <version>2.2</version>
</extension>
</extensions>
<plugins>
<plugin>
<artifactId>maven-archetype-plugin</artifactId>
- <version>2.0-alpha-4</version>
+ <version>2.2</version>
<extensions>true</extensions>
</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>
+ <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.xml b/src/main/resources/META-INF/maven/archetype.xml
deleted file mode 100644
index ada4b67..0000000
--- a/src/main/resources/META-INF/maven/archetype.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?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>
- <id>sling-servlet</id>
- <sources>
- <source>src/main/java/ByPathServlet.java</source>
- <source>src/main/java/ByResourceTypeServlet.java</source>
- </sources>
- <testSources>
- <source>src/test/java/ByPathServletTest.java</source>
- </testSources>
-</archetype>
diff --git a/src/main/resources/archetype-resources/src/test/java/ByPathServletTest.java b/src/main/resources/archetype-resources/src/test/java/ByPathServletTest.java
index da2ff06..4614a24 100644
--- a/src/main/resources/archetype-resources/src/test/java/ByPathServletTest.java
+++ b/src/main/resources/archetype-resources/src/test/java/ByPathServletTest.java
@@ -1,3 +1,19 @@
+/*
+ * 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;
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..f35f9e8
--- /dev/null
+++ b/src/test/resources/projects/normal/reference/pom.xml
@@ -0,0 +1,134 @@
+<?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>
+ <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] 04/39: use maven-compiler-plugin 2.3.2 in
generated pom, to have java 1.5 as the default
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag sling-servlet-archetype-1.0.2
in repository https://gitbox.apache.org/repos/asf/sling-servlet-archetype.git
commit 7bf024313e2a1c2c2bde049c2abdf8b6522708ea
Author: Bertrand Delacretaz <bd...@apache.org>
AuthorDate: Wed Dec 1 09:36:24 2010 +0000
use maven-compiler-plugin 2.3.2 in generated pom, to have java 1.5 as the default
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/maven/archetypes/servlet@1040912 13f79535-47bb-0310-9956-ffa450edef68
---
src/main/resources/archetype-resources/pom.xml | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/src/main/resources/archetype-resources/pom.xml b/src/main/resources/archetype-resources/pom.xml
index 583ff6b..b9db9f6 100644
--- a/src/main/resources/archetype-resources/pom.xml
+++ b/src/main/resources/archetype-resources/pom.xml
@@ -49,10 +49,8 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
+ <!-- use version 2.3.2 to have java 1.5 as the default -->
+ <version>2.3.2</version>
</plugin>
</plugins>
</build>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-servlet-archetype] 29/39: Update to latest parent pom
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag sling-servlet-archetype-1.0.2
in repository https://gitbox.apache.org/repos/asf/sling-servlet-archetype.git
commit 5d71b9b6037eaada8f9a2df42c880ea3d4b02779
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Fri Jul 19 07:04:15 2013 +0000
Update to latest parent pom
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/maven/archetypes/servlet@1504788 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index fdc17a6..78b2add 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>16</version>
+ <version>17</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] 25/39: Use latest releases and update to
new parent pom
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag sling-servlet-archetype-1.0.2
in repository https://gitbox.apache.org/repos/asf/sling-servlet-archetype.git
commit 71fec48ae0d353ec3789e052e107f77b620b7836
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Sun Dec 23 06:53:35 2012 +0000
Use latest releases and update to new parent pom
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/maven/archetypes/servlet@1425425 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index cf57b2f..8b3ef41 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>13</version>
+ <version>14</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] 23/39: Use released versions
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag sling-servlet-archetype-1.0.2
in repository https://gitbox.apache.org/repos/asf/sling-servlet-archetype.git
commit dfa20b1902efc589b2527138340d1133bbd4928d
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Tue Jul 10 11:07:18 2012 +0000
Use released versions
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/maven/archetypes/servlet@1359601 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index fc8fa4c..ec081dd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>14-SNAPSHOT</version>
+ <version>13</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>.