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:34 UTC
[sling-jcrinstall-bundle-archetype] branch master created (now
8d408e3)
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-jcrinstall-bundle-archetype.git.
at 8d408e3 SLING-7167 Adjust READMEs
This branch includes the following new commits:
new e238637 SLING-2978 - Create tooling top-level directory and move maven and ide under it
new 6af6a41 Update to parent pom 18
new c22bb31 Update to parent pom v19
new 16e2c4a SLING-3538 - Maven archetypes should use the same port as the default launchpad port
new 1633ada SLING-3539 - SimpleDSComponent from archetypes does nothing by default
new aedb0a6 SLING-3520 - Consolidate archetype plugin versions in a parent pom
new 0bfccc9 SLING-3532 - Move sling plugin configuration out of the autoInstallBundle profile
new 6ef73b1 [maven-release-plugin] prepare release sling-jcrinstall-bundle-archetype-1.0.2
new a590a7d [maven-release-plugin] prepare for next development iteration
new a7af04a SLING-4698 - Set parent.relativePath to empty for all modules
new e8cffa6 Maven archetypes: use parent version 3
new 4189573 archetypes: move to archetype parent 4-SNAPSHOT and fix rat checks
new b365a84 sling-bundle-for-jcrinstall-archetype: use sling-archetype-parent 4
new 962d10e [maven-release-plugin] prepare release sling-jcrinstall-bundle-archetype-1.0.4
new 094e300 [maven-release-plugin] prepare for next development iteration
new 93900cb sling-bundle-for-jcrinstall-archetype: use sling-archetype-parent 5-SNAPSHOT
new a2053cd Archetypes: roll back to released version of archetype parent
new 703960d SLING-7167 Adjust READMEs
new 1647092 SLING-7167 Adjust READMEs
new 8d408e3 SLING-7167 Adjust READMEs
The 20 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-jcrinstall-bundle-archetype] 20/20: 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-jcrinstall-bundle-archetype.git
commit 8d408e3a66f7150578fe0b28fe23f3c630bef539
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Tue Oct 3 10:12:41 2017 +0000
SLING-7167 Adjust READMEs
add uniform header linking to Sling project
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1810961 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 95f8caa..22472de 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,5 @@
-Sling JCRInstall Bundle Archetype
+# Apache Sling JCRInstall Bundle Archetype
+
+This module is part of the [Apache Sling](https://sling.apache.org) project.
Maven archetype for OSGi bundles installed via JCR Install.
diff --git a/pom.xml b/pom.xml
index a20bd9d..216f011 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,7 @@
<version>1.0.5-SNAPSHOT</version>
<packaging>maven-archetype</packaging>
- <name>Sling JCRInstall Bundle Archetype</name>
+ <name>Apache Sling JCRInstall Bundle Archetype</name>
<description>Maven archetype for a generic OSGi bundle installed via JCR Install.</description>
<scm>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-jcrinstall-bundle-archetype] 04/20: 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-jcrinstall-bundle-archetype.git
commit 16e2c4ab198d4d99936e260accbed5bd6f311795
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 | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/archetype-resources/pom.xml b/src/main/resources/archetype-resources/pom.xml
index 8189374..de3179b 100644
--- a/src/main/resources/archetype-resources/pom.xml
+++ b/src/main/resources/archetype-resources/pom.xml
@@ -120,10 +120,10 @@
<goal>install</goal>
</goals>
<configuration>
- <slingUrl>http://localhost:8888/libs/sling/install</slingUrl>
+ <slingUrl>http://localhost:8080/libs/sling/install</slingUrl>
<!--
Alternatively:
- <slingUrl>http://localhost:8888</slingUrl>
+ <slingUrl>http://localhost:8080</slingUrl>
<slingUrlSuffix>/libs/sling/install</slingUrlSuffix>
-->
<usePut>true</usePut>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-jcrinstall-bundle-archetype] 07/20: 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-jcrinstall-bundle-archetype.git
commit 0bfccc92a2ed5d2203ded2245f9d10c7e8ed316f
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 | 28 +++++++++++++++-----------
1 file changed, 16 insertions(+), 12 deletions(-)
diff --git a/src/main/resources/archetype-resources/pom.xml b/src/main/resources/archetype-resources/pom.xml
index 51f431c..08d2e95 100644
--- a/src/main/resources/archetype-resources/pom.xml
+++ b/src/main/resources/archetype-resources/pom.xml
@@ -55,6 +55,22 @@
<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/libs/sling/install</slingUrl>
+ <!--
+ Alternatively:
+ <slingUrl>http://localhost:8080</slingUrl>
+ <slingUrlSuffix>/libs/sling/install</slingUrlSuffix>
+ -->
+ <usePut>true</usePut>
+ <user>admin</user>
+ <password>admin</password>
+ </configuration>
+ </plugin>
</plugins>
</build>
<dependencies>
@@ -115,24 +131,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/libs/sling/install</slingUrl>
- <!--
- Alternatively:
- <slingUrl>http://localhost:8080</slingUrl>
- <slingUrlSuffix>/libs/sling/install</slingUrlSuffix>
- -->
- <usePut>true</usePut>
- <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-jcrinstall-bundle-archetype] 19/20: 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-jcrinstall-bundle-archetype.git
commit 16470928ebef655e02c52cbc233409ab302e997b
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Mon Oct 2 16:24:10 2017 +0000
SLING-7167 Adjust READMEs
switch from plain text to Markdown
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1810543 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-jcrinstall-bundle-archetype] 05/20: SLING-3539 -
SimpleDSComponent from archetypes does nothing by default
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-jcrinstall-bundle-archetype.git
commit 1633adabd4a03f841115653de72bc66dac530b53
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Fri May 2 10:55:09 2014 +0000
SLING-3539 - SimpleDSComponent from archetypes does nothing by default
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1591865 13f79535-47bb-0310-9956-ffa450edef68
---
.../archetype-resources/src/main/java/SimpleDSComponent.java | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/main/resources/archetype-resources/src/main/java/SimpleDSComponent.java b/src/main/resources/archetype-resources/src/main/java/SimpleDSComponent.java
index 22a4ce0..64fe8eb 100644
--- a/src/main/resources/archetype-resources/src/main/java/SimpleDSComponent.java
+++ b/src/main/resources/archetype-resources/src/main/java/SimpleDSComponent.java
@@ -20,6 +20,7 @@ package ${package};
import org.apache.felix.scr.annotations.Component;
+import org.apache.felix.scr.annotations.Property;
import org.apache.felix.scr.annotations.Service;
import org.osgi.framework.BundleContext;
@@ -28,10 +29,13 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
- * Just a simple DS Component
+ * A simple DS component which is executed every 10 seconds
+ *
+ * @see <a href="https://sling.apache.org/documentation/bundles/scheduler-service-commons-scheduler.html">Scheduler Service</a>
*/
@Component(metatype=true)
@Service
+@Property( name="scheduler.period", longValue = 10)
public class SimpleDSComponent implements Runnable {
private Logger logger = LoggerFactory.getLogger(this.getClass());
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-jcrinstall-bundle-archetype] 14/20: [maven-release-plugin]
prepare release sling-jcrinstall-bundle-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-jcrinstall-bundle-archetype.git
commit 962d10ec67450fc32724907efd631324524ab2e5
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Fri Oct 16 19:46:30 2015 +0000
[maven-release-plugin] prepare release sling-jcrinstall-bundle-archetype-1.0.4
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1709080 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/pom.xml b/pom.xml
index 6110949..f6377d0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,20 +23,20 @@
<groupId>org.apache.sling</groupId>
<artifactId>sling-archetype-parent</artifactId>
<version>4</version>
- <relativePath/>
+ <relativePath />
</parent>
<artifactId>sling-jcrinstall-bundle-archetype</artifactId>
- <version>1.0.3-SNAPSHOT</version>
+ <version>1.0.4</version>
<packaging>maven-archetype</packaging>
<name>Sling JCRInstall Bundle Archetype</name>
<description>Maven archetype for a generic OSGi bundle installed via JCR Install.</description>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/tooling/maven/archetypes/bundle-for-jcrinstall</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/tooling/maven/archetypes/bundle-for-jcrinstall</developerConnection>
- <url>http://svn.apache.org/viewvc/sling/trunk/tooling/maven/archetypes/bundle-for-jcrinstall</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/sling/tags/sling-jcrinstall-bundle-archetype-1.0.4</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/tags/sling-jcrinstall-bundle-archetype-1.0.4</developerConnection>
+ <url>http://svn.apache.org/viewvc/sling/tags/sling-jcrinstall-bundle-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-jcrinstall-bundle-archetype] 16/20:
sling-bundle-for-jcrinstall-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-jcrinstall-bundle-archetype.git
commit 93900cb53aea549e09a63101221f94cabcf8f3a0
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Fri Oct 16 19:47:25 2015 +0000
sling-bundle-for-jcrinstall-archetype: use sling-archetype-parent 5-SNAPSHOT
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1709084 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 380febc..63a03ac 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling-archetype-parent</artifactId>
- <version>4</version>
+ <version>5-SNAPSHOT</version>
<relativePath />
</parent>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-jcrinstall-bundle-archetype] 17/20: 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-jcrinstall-bundle-archetype.git
commit a2053cd46b114f5093647c9500aef2367e13a70a
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 63a03ac..a20bd9d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling-archetype-parent</artifactId>
- <version>5-SNAPSHOT</version>
+ <version>1</version>
<relativePath />
</parent>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-jcrinstall-bundle-archetype] 18/20: 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-jcrinstall-bundle-archetype.git
commit 703960d0b329e1211e29f4603186fa40870c07f6
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Mon Oct 2 15:03:24 2017 +0000
SLING-7167 Adjust READMEs
remove outdated information
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1810436 13f79535-47bb-0310-9956-ffa450edef68
---
README.txt | 24 ------------------------
1 file changed, 24 deletions(-)
diff --git a/README.txt b/README.txt
index 7da3241..95f8caa 100644
--- a/README.txt
+++ b/README.txt
@@ -1,27 +1,3 @@
Sling JCRInstall Bundle Archetype
Maven archetype for OSGi bundles installed via JCR Install.
-
-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/bundle
-
-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-jcrinstall-bundle-archetype] 06/20: 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-jcrinstall-bundle-archetype.git
commit aedb0a6594a0aa188bca2f689a2eb13b1220cc25
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 | 15 +++-------
src/main/resources/archetype-resources/pom.xml | 34 +++++++++++++---------
.../src/main/java/SimpleDSComponent.java | 4 +--
.../resources/projects/normal/archetype.properties | 4 +++
src/test/resources/projects/normal/goal.txt | 1 +
src/test/resources/projects/normal/verify.groovy | 9 ++++++
6 files changed, 40 insertions(+), 27 deletions(-)
diff --git a/pom.xml b/pom.xml
index 46caedb..4fa574e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,9 +21,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>
<artifactId>sling-jcrinstall-bundle-archetype</artifactId>
@@ -44,15 +44,8 @@
<extension>
<groupId>org.apache.maven.archetype</groupId>
<artifactId>archetype-packaging</artifactId>
- <version>2.0-alpha-4</version>
+ <version>${archetype.version}</version>
</extension>
</extensions>
- <plugins>
- <plugin>
- <artifactId>maven-archetype-plugin</artifactId>
- <version>2.0-alpha-4</version>
- <extensions>true</extensions>
- </plugin>
- </plugins>
</build>
</project>
diff --git a/src/main/resources/archetype-resources/pom.xml b/src/main/resources/archetype-resources/pom.xml
index de3179b..51f431c 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>
@@ -112,7 +115,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>
@@ -137,4 +140,7 @@
</build>
</profile>
</profiles>
+ <properties>
+ <project.build.sourceEncoding>${project.build.sourceEncoding}</project.build.sourceEncoding>
+ </properties>
</project>
diff --git a/src/main/resources/archetype-resources/src/main/java/SimpleDSComponent.java b/src/main/resources/archetype-resources/src/main/java/SimpleDSComponent.java
index 64fe8eb..a3e16bd 100644
--- a/src/main/resources/archetype-resources/src/main/java/SimpleDSComponent.java
+++ b/src/main/resources/archetype-resources/src/main/java/SimpleDSComponent.java
@@ -33,7 +33,7 @@ import org.slf4j.LoggerFactory;
*
* @see <a href="https://sling.apache.org/documentation/bundles/scheduler-service-commons-scheduler.html">Scheduler Service</a>
*/
-@Component(metatype=true)
+@Component
@Service
@Property( name="scheduler.period", longValue = 10)
public class SimpleDSComponent implements Runnable {
@@ -50,7 +50,7 @@ public class SimpleDSComponent implements Runnable {
this.bundleContext = ctx.getBundleContext();
}
- protected void deactivate() {
+ protected void deactivate(ComponentContext ctx) {
this.bundleContext = null;
}
diff --git a/src/test/resources/projects/normal/archetype.properties b/src/test/resources/projects/normal/archetype.properties
new file mode 100644
index 0000000..df6bac1
--- /dev/null
+++ b/src/test/resources/projects/normal/archetype.properties
@@ -0,0 +1,4 @@
+groupId=org.apache.sling
+artifactId=test-jcrinstall-bundle-archetype-project
+version=0.0.1-SNAPSHOT
+package=org.apache.sling.archetype.jcrinstall.bundle.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..4a1a71d
--- /dev/null
+++ b/src/test/resources/projects/normal/goal.txt
@@ -0,0 +1 @@
+verify
\ No newline at end of file
diff --git a/src/test/resources/projects/normal/verify.groovy b/src/test/resources/projects/normal/verify.groovy
new file mode 100644
index 0000000..8e4bc97
--- /dev/null
+++ b/src/test/resources/projects/normal/verify.groovy
@@ -0,0 +1,9 @@
+new File(basedir, '.').eachFileRecurse(groovy.io.FileType.FILES) { logFile ->
+ if ( logFile.name == "build.log" ) {
+ logFile.eachLine { line ->
+ if ( line.contains("WARNING") ) {
+ throw new RuntimeException("Warning found in line ${line}\nIn file ${logFile}");
+ }
+ }
+ }
+}
\ No newline at end of file
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-jcrinstall-bundle-archetype] 12/20: 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-jcrinstall-bundle-archetype.git
commit 4189573561ae917c98b3c6581bd9a27b4716b417
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 | 2 +-
.../resources/projects/normal/archetype.properties | 18 ++++++++++++++++++
src/test/resources/projects/normal/verify.groovy | 16 ++++++++++++++++
3 files changed, 35 insertions(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 357104a..4d95705 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling-archetype-parent</artifactId>
- <version>3</version>
+ <version>4-SNAPSHOT</version>
<relativePath/>
</parent>
diff --git a/src/test/resources/projects/normal/archetype.properties b/src/test/resources/projects/normal/archetype.properties
index df6bac1..5af45c4 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-jcrinstall-bundle-archetype-project
version=0.0.1-SNAPSHOT
diff --git a/src/test/resources/projects/normal/verify.groovy b/src/test/resources/projects/normal/verify.groovy
index 8e4bc97..dda5e44 100644
--- a/src/test/resources/projects/normal/verify.groovy
+++ b/src/test/resources/projects/normal/verify.groovy
@@ -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.
+ */
new File(basedir, '.').eachFileRecurse(groovy.io.FileType.FILES) { logFile ->
if ( logFile.name == "build.log" ) {
logFile.eachLine { line ->
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-jcrinstall-bundle-archetype] 15/20: [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-jcrinstall-bundle-archetype.git
commit 094e3007ed6889d70c680af3d8e2c28745dccb44
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Fri Oct 16 19:46:46 2015 +0000
[maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1709083 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index f6377d0..380febc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,16 +27,16 @@
</parent>
<artifactId>sling-jcrinstall-bundle-archetype</artifactId>
- <version>1.0.4</version>
+ <version>1.0.5-SNAPSHOT</version>
<packaging>maven-archetype</packaging>
<name>Sling JCRInstall Bundle Archetype</name>
<description>Maven archetype for a generic OSGi bundle installed via JCR Install.</description>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/sling/tags/sling-jcrinstall-bundle-archetype-1.0.4</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/tags/sling-jcrinstall-bundle-archetype-1.0.4</developerConnection>
- <url>http://svn.apache.org/viewvc/sling/tags/sling-jcrinstall-bundle-archetype-1.0.4</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/tooling/maven/archetypes/bundle-for-jcrinstall</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/tooling/maven/archetypes/bundle-for-jcrinstall</developerConnection>
+ <url>http://svn.apache.org/viewvc/sling/trunk/tooling/maven/archetypes/bundle-for-jcrinstall</url>
</scm>
<build>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-jcrinstall-bundle-archetype] 08/20: [maven-release-plugin]
prepare release sling-jcrinstall-bundle-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-jcrinstall-bundle-archetype.git
commit 6ef73b11956b6fbea94c3f6f2f6c844ac043bddc
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Thu May 15 08:55:59 2014 +0000
[maven-release-plugin] prepare release sling-jcrinstall-bundle-archetype-1.0.2
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1594826 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index 4fa574e..b84e3c7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,16 +27,16 @@
</parent>
<artifactId>sling-jcrinstall-bundle-archetype</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.0.2</version>
<packaging>maven-archetype</packaging>
<name>Sling JCRInstall Bundle Archetype</name>
<description>Maven archetype for a generic OSGi bundle installed via JCR Install.</description>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/tooling/maven/archetypes/bundle-for-jcrinstall</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/tooling/maven/archetypes/bundle-for-jcrinstall</developerConnection>
- <url>http://svn.apache.org/viewvc/sling/trunk/tooling/maven/archetypes/bundle-for-jcrinstall</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/sling/tags/sling-jcrinstall-bundle-archetype-1.0.2</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/tags/sling-jcrinstall-bundle-archetype-1.0.2</developerConnection>
+ <url>http://svn.apache.org/viewvc/sling/tags/sling-jcrinstall-bundle-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-jcrinstall-bundle-archetype] 13/20:
sling-bundle-for-jcrinstall-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-jcrinstall-bundle-archetype.git
commit b365a844012d8a9bcda5e62f745661eb678389f6
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Fri Oct 16 19:46:08 2015 +0000
sling-bundle-for-jcrinstall-archetype: use sling-archetype-parent 4
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1709079 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 4d95705..6110949 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling-archetype-parent</artifactId>
- <version>4-SNAPSHOT</version>
+ <version>4</version>
<relativePath/>
</parent>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-jcrinstall-bundle-archetype] 11/20: 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-jcrinstall-bundle-archetype.git
commit e8cffa6a1ac6466e7521a7a88846f121e745efef
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 d31b2b4..357104a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,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-jcrinstall-bundle-archetype] 01/20: 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-jcrinstall-bundle-archetype.git
commit e2386374cf51b7045bb2b1beafe132277f6e0f12
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
---
README.txt | 27 ++++
pom.xml | 58 +++++++++
.../META-INF/maven/archetype-metadata.xml | 29 +++++
src/main/resources/META-INF/maven/archetype.xml | 19 +++
src/main/resources/archetype-resources/pom.xml | 140 +++++++++++++++++++++
.../src/main/java/SimpleDSComponent.java | 54 ++++++++
6 files changed, 327 insertions(+)
diff --git a/README.txt b/README.txt
new file mode 100644
index 0000000..7da3241
--- /dev/null
+++ b/README.txt
@@ -0,0 +1,27 @@
+Sling JCRInstall Bundle Archetype
+
+Maven archetype for OSGi bundles installed via JCR Install.
+
+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/bundle
+
+See the Subversion documentation for other source control features.
+
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 0000000..6c7c1e1
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,58 @@
+<?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>
+
+ <artifactId>sling-jcrinstall-bundle-archetype</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
+ <packaging>maven-archetype</packaging>
+
+ <name>Sling JCRInstall Bundle Archetype</name>
+ <description>Maven archetype for a generic OSGi bundle installed via JCR Install.</description>
+
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/tooling/maven/archetypes/bundle-for-jcrinstall</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/tooling/maven/archetypes/bundle-for-jcrinstall</developerConnection>
+ <url>http://svn.apache.org/viewvc/sling/trunk/tooling/maven/archetypes/bundle-for-jcrinstall</url>
+ </scm>
+
+ <build>
+ <extensions>
+ <extension>
+ <groupId>org.apache.maven.archetype</groupId>
+ <artifactId>archetype-packaging</artifactId>
+ <version>2.0-alpha-4</version>
+ </extension>
+ </extensions>
+ <plugins>
+ <plugin>
+ <artifactId>maven-archetype-plugin</artifactId>
+ <version>2.0-alpha-4</version>
+ <extensions>true</extensions>
+ </plugin>
+ </plugins>
+ </build>
+</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..021b32a
--- /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-bundle">
+ <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/META-INF/maven/archetype.xml b/src/main/resources/META-INF/maven/archetype.xml
new file mode 100644
index 0000000..6d41494
--- /dev/null
+++ b/src/main/resources/META-INF/maven/archetype.xml
@@ -0,0 +1,19 @@
+<?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-bundle</id>
+ <sources>
+ <source>src/main/java/SimpleDSComponent.java</source>
+ </sources>
+</archetype>
diff --git a/src/main/resources/archetype-resources/pom.xml b/src/main/resources/archetype-resources/pom.xml
new file mode 100644
index 0000000..8189374
--- /dev/null
+++ b/src/main/resources/archetype-resources/pom.xml
@@ -0,0 +1,140 @@
+<?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>
+ <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/libs/sling/install</slingUrl>
+ <!--
+ Alternatively:
+ <slingUrl>http://localhost:8888</slingUrl>
+ <slingUrlSuffix>/libs/sling/install</slingUrlSuffix>
+ -->
+ <usePut>true</usePut>
+ <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/SimpleDSComponent.java b/src/main/resources/archetype-resources/src/main/java/SimpleDSComponent.java
new file mode 100644
index 0000000..22a4ce0
--- /dev/null
+++ b/src/main/resources/archetype-resources/src/main/java/SimpleDSComponent.java
@@ -0,0 +1,54 @@
+/*
+ * 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 org.apache.felix.scr.annotations.Component;
+import org.apache.felix.scr.annotations.Service;
+
+import org.osgi.framework.BundleContext;
+import org.osgi.service.component.ComponentContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Just a simple DS Component
+ */
+@Component(metatype=true)
+@Service
+public class SimpleDSComponent implements Runnable {
+
+ private Logger logger = LoggerFactory.getLogger(this.getClass());
+
+ private BundleContext bundleContext;
+
+ public void run() {
+ logger.info("Running...");
+ }
+
+ protected void activate(ComponentContext ctx) {
+ this.bundleContext = ctx.getBundleContext();
+ }
+
+ protected void deactivate() {
+ this.bundleContext = null;
+ }
+
+}
+
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-jcrinstall-bundle-archetype] 02/20: 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-jcrinstall-bundle-archetype.git
commit 6af6a41fd108967f621796adbc33109e9afd272e
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 6c7c1e1..fa300b8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,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-jcrinstall-bundle-archetype] 03/20: 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-jcrinstall-bundle-archetype.git
commit c22bb31e9065875d913984639249d6e85a84f71f
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 fa300b8..46caedb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,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-jcrinstall-bundle-archetype] 09/20: [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-jcrinstall-bundle-archetype.git
commit a590a7d6aefab5208800a23756d34625674c12e3
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Thu May 15 08:56:24 2014 +0000
[maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1594828 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index b84e3c7..e62ea6e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,16 +27,16 @@
</parent>
<artifactId>sling-jcrinstall-bundle-archetype</artifactId>
- <version>1.0.2</version>
+ <version>1.0.3-SNAPSHOT</version>
<packaging>maven-archetype</packaging>
<name>Sling JCRInstall Bundle Archetype</name>
<description>Maven archetype for a generic OSGi bundle installed via JCR Install.</description>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/sling/tags/sling-jcrinstall-bundle-archetype-1.0.2</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/tags/sling-jcrinstall-bundle-archetype-1.0.2</developerConnection>
- <url>http://svn.apache.org/viewvc/sling/tags/sling-jcrinstall-bundle-archetype-1.0.2</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/tooling/maven/archetypes/bundle-for-jcrinstall</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/tooling/maven/archetypes/bundle-for-jcrinstall</developerConnection>
+ <url>http://svn.apache.org/viewvc/sling/trunk/tooling/maven/archetypes/bundle-for-jcrinstall</url>
</scm>
<build>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-jcrinstall-bundle-archetype] 10/20: 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-jcrinstall-bundle-archetype.git
commit a7af04acdfd109b88e66303ea1d388d842573820
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 e62ea6e..d31b2b4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<groupId>org.apache.sling</groupId>
<artifactId>sling-archetype-parent</artifactId>
<version>1</version>
- <relativePath>../parent/pom.xml</relativePath>
+ <relativePath/>
</parent>
<artifactId>sling-jcrinstall-bundle-archetype</artifactId>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.