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 09:14:20 UTC
[sling-jcrinstall-bundle-archetype] annotated tag
sling-jcrinstall-bundle-archetype-1.0.2 created (now 935cfa4)
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a change to annotated tag sling-jcrinstall-bundle-archetype-1.0.2
in repository https://gitbox.apache.org/repos/asf/sling-jcrinstall-bundle-archetype.git.
at 935cfa4 (tag)
tagging 04cff59f497f905dfa8ebd3222a0ec491832cf22 (commit)
by Robert Munteanu
on Thu May 15 08:56:20 2014 +0000
- Log -----------------------------------------------------------------
sling-jcrinstall-bundle-archetype-1.0.2
-----------------------------------------------------------------------
This annotated tag includes the following new commits:
new 5dd261f SLING-2146 - adding second bundle archetype - this one installs via JCR Install
new cef8134 Update to recent snapshot
new ce09600 Using latest released parent pom
new 6d4c320 fixing typo in bundle archetype
new e06a246 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 eb44667 temporarily using snapshots during release vote
new f2fbe5e using latest releases
new 9900174 bit of pom cleanup
new 9e9937a [maven-release-plugin] prepare release sling-jcrinstall-bundle-archetype-1.0.0
new 1db3043 [maven-release-plugin] prepare for next development iteration
new 995c18c svn:ignore eclipse project files
new 5de932a SLING-2480 : Add config for maven-sling-plugin to m2e configuration
new 94419a3 Update to latest parent pom
new 463c4f4 Use released versions
new 0912a0d Use latest releases and update to new parent pom
new 68effd5 Update to latest parent pom and use latest releases in launchpad
new 83ff761 Correct reactor pom and update to parent pom 16
new 9d4feff Update to latest parent pom
new 16c2ffd SLING-2978 - Create tooling top-level directory and move maven and ide under it
new 3a37599 Update to parent pom 18
new e3fcec2 Update to parent pom v19
new b47cb9f SLING-3538 - Maven archetypes should use the same port as the default launchpad port
new e1b8e25 SLING-3539 - SimpleDSComponent from archetypes does nothing by default
new a98ea18 SLING-3520 - Consolidate archetype plugin versions in a parent pom
new eeac875 SLING-3532 - Move sling plugin configuration out of the autoInstallBundle profile
new bcaa638 [maven-release-plugin] prepare release sling-jcrinstall-bundle-archetype-1.0.2
new 04cff59 [maven-release-plugin] copy for tag sling-jcrinstall-bundle-archetype-1.0.2
The 27 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] 09/18: 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-jcrinstall-bundle-archetype-1.0.2
in repository https://gitbox.apache.org/repos/asf/sling-jcrinstall-bundle-archetype.git
commit 9d4feff6c22ddbc8b0550d01517c0e0138cf4514
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/bundle-for-jcrinstall@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 1b9708d..8fe1a75 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,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-jcrinstall-bundle-archetype] 11/18: 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-jcrinstall-bundle-archetype-1.0.2
in repository https://gitbox.apache.org/repos/asf/sling-jcrinstall-bundle-archetype.git
commit 3a37599e868efbc9b527257d04d9c71a983ba4de
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/bundle-for-jcrinstall@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] 10/18: 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-jcrinstall-bundle-archetype-1.0.2
in repository https://gitbox.apache.org/repos/asf/sling-jcrinstall-bundle-archetype.git
commit 16c2ffd993e346eefedffa384ff16b994c0be356
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/bundle-for-jcrinstall@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 c71632f..7da3241 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/bundle
+ 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
index 8fe1a75..6c7c1e1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,9 +34,9 @@
<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/maven/archetypes/bundle-for-jcrinstall</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/maven/archetypes/bundle-for-jcrinstall</developerConnection>
- <url>http://svn.apache.org/viewvc/sling/trunk/maven/archetypes/bundle-for-jcrinstall</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] 05/18: 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-jcrinstall-bundle-archetype-1.0.2
in repository https://gitbox.apache.org/repos/asf/sling-jcrinstall-bundle-archetype.git
commit 463c4f46a43bbd15a2f94323d21437491af4bc41
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/bundle-for-jcrinstall@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 ff1e6b1..2f6d1b6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,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>.
[sling-jcrinstall-bundle-archetype] 12/18: 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-jcrinstall-bundle-archetype-1.0.2
in repository https://gitbox.apache.org/repos/asf/sling-jcrinstall-bundle-archetype.git
commit e3fcec2c4d93903558a11c99737ca3e76f32d956
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/bundle-for-jcrinstall@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] 07/18: 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-jcrinstall-bundle-archetype-1.0.2
in repository https://gitbox.apache.org/repos/asf/sling-jcrinstall-bundle-archetype.git
commit 68effd5391c4f8fba2a2e6a747b2799be6a938d2
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/bundle-for-jcrinstall@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 307cfe3..d050209 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,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-jcrinstall-bundle-archetype] 04/18: 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-jcrinstall-bundle-archetype-1.0.2
in repository https://gitbox.apache.org/repos/asf/sling-jcrinstall-bundle-archetype.git
commit 94419a38b4099409c168d4f9ed37e079466794b0
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/bundle-for-jcrinstall@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 c44d1e1..ff1e6b1 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>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-jcrinstall-bundle-archetype] 17/18: [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 annotated tag sling-jcrinstall-bundle-archetype-1.0.2
in repository https://gitbox.apache.org/repos/asf/sling-jcrinstall-bundle-archetype.git
commit bcaa63830bcdd14c04ed47d0b96f12bc7fdbcdef
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/tooling/maven/archetypes/bundle-for-jcrinstall@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] 14/18: 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 annotated tag sling-jcrinstall-bundle-archetype-1.0.2
in repository https://gitbox.apache.org/repos/asf/sling-jcrinstall-bundle-archetype.git
commit e1b8e250ce9624767994ce1efc88150731e61cf8
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/tooling/maven/archetypes/bundle-for-jcrinstall@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] 13/18: 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-jcrinstall-bundle-archetype-1.0.2
in repository https://gitbox.apache.org/repos/asf/sling-jcrinstall-bundle-archetype.git
commit b47cb9fa0276ff4778aee37c9198afad0190dcfe
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/bundle-for-jcrinstall@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] 06/18: 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-jcrinstall-bundle-archetype-1.0.2
in repository https://gitbox.apache.org/repos/asf/sling-jcrinstall-bundle-archetype.git
commit 0912a0d3e1f829dc7f3d0cdd4b8e9fdf37107c5c
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/bundle-for-jcrinstall@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 2f6d1b6..307cfe3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,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-jcrinstall-bundle-archetype] 15/18: 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-jcrinstall-bundle-archetype-1.0.2
in repository https://gitbox.apache.org/repos/asf/sling-jcrinstall-bundle-archetype.git
commit a98ea18d1faf835dc5b6b8e83abc96a18f928c9a
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/bundle-for-jcrinstall@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] 02/18: svn:ignore eclipse
project 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-jcrinstall-bundle-archetype-1.0.2
in repository https://gitbox.apache.org/repos/asf/sling-jcrinstall-bundle-archetype.git
commit 995c18c6ba675f776e175db88f22176264903a77
Author: Eric Norman <en...@apache.org>
AuthorDate: Fri Nov 11 06:21:39 2011 +0000
svn:ignore eclipse project files
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/maven/archetypes/bundle-for-jcrinstall@1200746 13f79535-47bb-0310-9956-ffa450edef68
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-jcrinstall-bundle-archetype] 03/18: 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-jcrinstall-bundle-archetype-1.0.2
in repository https://gitbox.apache.org/repos/asf/sling-jcrinstall-bundle-archetype.git
commit 5de932a3bdeb09c223ef6875f77615f361a6ecf4
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/bundle-for-jcrinstall@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 35cdb5d..c44d1e1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,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-jcrinstall-bundle-archetype] 16/18: 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-jcrinstall-bundle-archetype-1.0.2
in repository https://gitbox.apache.org/repos/asf/sling-jcrinstall-bundle-archetype.git
commit eeac8754fc0de009e3806dfa9d1060e8bb47536b
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/bundle-for-jcrinstall@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] 08/18: 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-jcrinstall-bundle-archetype-1.0.2
in repository https://gitbox.apache.org/repos/asf/sling-jcrinstall-bundle-archetype.git
commit 83ff7616564847cc9374efa2aa4a1343cc0b3ac3
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/bundle-for-jcrinstall@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 d050209..1b9708d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,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-jcrinstall-bundle-archetype] 01/18: [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-jcrinstall-bundle-archetype-1.0.2
in repository https://gitbox.apache.org/repos/asf/sling-jcrinstall-bundle-archetype.git
commit 1db3043c2ee45e45f85423fab5fab1bc2410189f
Author: Justin Edelson <ju...@apache.org>
AuthorDate: Thu Sep 15 14:26:05 2011 +0000
[maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/maven/archetypes/bundle-for-jcrinstall@1171110 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index 89b71b3..35cdb5d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,16 +27,16 @@
</parent>
<artifactId>sling-jcrinstall-bundle-archetype</artifactId>
- <version>1.0.0</version>
+ <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/tags/sling-jcrinstall-bundle-archetype-1.0.0</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/tags/sling-jcrinstall-bundle-archetype-1.0.0</developerConnection>
- <url>http://svn.apache.org/viewvc/sling/tags/sling-jcrinstall-bundle-archetype-1.0.0</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/maven/archetypes/bundle-for-jcrinstall</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/maven/archetypes/bundle-for-jcrinstall</developerConnection>
+ <url>http://svn.apache.org/viewvc/sling/trunk/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] 18/18: [maven-release-plugin]
copy for tag 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 annotated tag sling-jcrinstall-bundle-archetype-1.0.2
in repository https://gitbox.apache.org/repos/asf/sling-jcrinstall-bundle-archetype.git
commit 04cff59f497f905dfa8ebd3222a0ec491832cf22
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Thu May 15 08:56:20 2014 +0000
[maven-release-plugin] copy for tag sling-jcrinstall-bundle-archetype-1.0.2
git-svn-id: https://svn.apache.org/repos/asf/sling/tags/sling-jcrinstall-bundle-archetype-1.0.2@1594827 13f79535-47bb-0310-9956-ffa450edef68
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.