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:13:14 UTC

[sling-bundle-archetype] annotated tag sling-bundle-archetype-1.0.2 created (now ae83424)

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

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


      at ae83424  (tag)
 tagging 8edb0d673d0cd7d877f6cef3f538455af6741a90 (commit)
      by Robert Munteanu
      on Thu May 15 08:48:37 2014 +0000

- Log -----------------------------------------------------------------
sling-bundle-archetype-1.0.2
-----------------------------------------------------------------------

This annotated tag includes the following new commits:

     new f4f54cc  SLING-2161 - adding bundle archetype
     new 8252eff  removing unnecessary license and notice files
     new 653abf6  Update to recent snapshot
     new ca34edc  Using latest released parent pom
     new 24b31a5  fixing typo in bundle archetype
     new bf91304  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 498f661  temporarily using snapshots during release vote
     new c1be757  using latest releases
     new 255b344  bit of pom cleanup
     new 9e8a3d7  [maven-release-plugin] prepare release sling-bundle-archetype-1.0.0
     new f566d1a  [maven-release-plugin] prepare for next development iteration
     new a7c35c7  svn:ignore eclipse project files
     new cbfa3fb  SLING-2480 : Add config for maven-sling-plugin to m2e configuration
     new dee3977  Update to latest parent pom
     new 3fccd44  Use released versions
     new 3435429  Use latest releases and update to new parent pom
     new 86a9182  Update to latest parent pom and use latest releases in launchpad
     new af1539a  Correct reactor pom and update to parent pom 16
     new 9fa254f  Update to latest parent pom
     new 85d87a4  SLING-2978 - Create tooling top-level directory and move maven and ide under it
     new f2122c0  Update to parent pom 18
     new 9dde096  SLING-3051 : updated maven plugin and dependency versions of maven-scr-plugin and org.apache.felix.scr.annotations to work properly with m2eclipse (otherwise complains about lifecycle-mapping for scr goal not being mapped, and with these versions it works perfect). Plus adjusting the outputDirectory as suggested in SLING-3019
     new 900e8e4  Update to parent pom v19
     new 1ee38f5  SLING-3538 - Maven archetypes should use the same port as the default launchpad port
     new db99915  SLING-3539 - SimpleDSComponent from archetypes does nothing by default
     new 229ec51  SLING-3520 - Consolidate archetype plugin versions in a parent pom
     new df1cd89  SLING-3532 - Move sling plugin configuration out of the autoInstallBundle profile
     new 8732ed6  [maven-release-plugin] prepare release sling-bundle-archetype-1.0.2
     new 8edb0d6  [maven-release-plugin]  copy for tag sling-bundle-archetype-1.0.2

The 29 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-bundle-archetype] 09/19: 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-bundle-archetype-1.0.2
in repository https://gitbox.apache.org/repos/asf/sling-bundle-archetype.git

commit 9fa254ff78ac902cb0e1519d9c4a30cd642ef433
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@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 f99c214..36af298 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-bundle-archetype] 11/19: 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-bundle-archetype-1.0.2
in repository https://gitbox.apache.org/repos/asf/sling-bundle-archetype.git

commit f2122c07e33c85c425564545efd1fd8bbc2ad9b5
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@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 0b1f7ce..78efa67 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-bundle-archetype] 12/19: SLING-3051 : updated maven plugin and dependency versions of maven-scr-plugin and org.apache.felix.scr.annotations to work properly with m2eclipse (otherwise complains about lifecycle-mapping for scr goal not being mapped, and with these versions it works perfect). Plus adjusting the outputDirectory as suggested in SLING-3019

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-bundle-archetype-1.0.2
in repository https://gitbox.apache.org/repos/asf/sling-bundle-archetype.git

commit 9dde09695ae535c0a538c36d650e197f45b9513c
Author: Stefan Egli <st...@apache.org>
AuthorDate: Tue Sep 10 13:29:33 2013 +0000

    SLING-3051 : updated maven plugin and dependency versions of maven-scr-plugin and org.apache.felix.scr.annotations to work properly with m2eclipse (otherwise complains about lifecycle-mapping for scr goal not being mapped, and with these versions it works perfect). Plus adjusting the outputDirectory as suggested in SLING-3019
    
    git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/tooling/maven/archetypes/bundle@1521475 13f79535-47bb-0310-9956-ffa450edef68
---
 src/main/resources/archetype-resources/pom.xml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/archetype-resources/pom.xml b/src/main/resources/archetype-resources/pom.xml
index 6e09b4f..b9016c0 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.2</version>
+                <version>1.13.0</version>
                 <executions>
                     <execution>
                         <id>generate-scr-descriptor</id>
@@ -39,6 +39,9 @@
                         </goals>
                     </execution>
                 </executions>
+                <configuration>
+                	<outputDirectory>${project.build.directory}/classes</outputDirectory>
+                </configuration>
             </plugin>
             <plugin>
                 <groupId>org.apache.felix</groupId>
@@ -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.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-bundle-archetype] 16/19: 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-bundle-archetype-1.0.2
in repository https://gitbox.apache.org/repos/asf/sling-bundle-archetype.git

commit 229ec511467df1c352732049f8394e91a1a05f74
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@1594818 13f79535-47bb-0310-9956-ffa450edef68
---
 pom.xml                                            | 15 +++------
 src/main/resources/archetype-resources/pom.xml     | 37 ++++++++++++----------
 .../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(+), 30 deletions(-)

diff --git a/pom.xml b/pom.xml
index f83efa6..3883425 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-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 d888c03..77a7ff4 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.13.0</version>
+                <version>${scrplugin.version}</version>
                 <executions>
                     <execution>
                         <id>generate-scr-descriptor</id>
@@ -39,21 +39,21 @@
                         </goals>
                     </execution>
                 </executions>
-                <configuration>
-                	<outputDirectory>${project.build.directory}/classes</outputDirectory>
-                </configuration>
             </plugin>
             <plugin>
                 <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>
@@ -85,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.9.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>
@@ -115,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>
@@ -134,4 +134,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..7a24f94
--- /dev/null
+++ b/src/test/resources/projects/normal/archetype.properties
@@ -0,0 +1,4 @@
+groupId=org.apache.sling
+artifactId=test-bundle-archetype-project
+version=0.0.1-SNAPSHOT
+package=org.apache.sling.archetype.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-bundle-archetype] 04/19: 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-bundle-archetype-1.0.2
in repository https://gitbox.apache.org/repos/asf/sling-bundle-archetype.git

commit dee39776a2d732ccbc2c8459c8d711425cd0e95c
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@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 e0693a7..bdeace1 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-bundle-archetype] 07/19: 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-bundle-archetype-1.0.2
in repository https://gitbox.apache.org/repos/asf/sling-bundle-archetype.git

commit 86a91825cdeb598d79498a3f435568cf6f4d2493
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@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 9a8c17f..f4b9153 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-bundle-archetype] 19/19: [maven-release-plugin] copy for tag sling-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-bundle-archetype-1.0.2
in repository https://gitbox.apache.org/repos/asf/sling-bundle-archetype.git

commit 8edb0d673d0cd7d877f6cef3f538455af6741a90
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Thu May 15 08:48:37 2014 +0000

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

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

[sling-bundle-archetype] 06/19: 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-bundle-archetype-1.0.2
in repository https://gitbox.apache.org/repos/asf/sling-bundle-archetype.git

commit 343542903caf9cec7f8860a42665a4fcf341b68e
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@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 cd1d793..9a8c17f 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-bundle-archetype] 03/19: 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-bundle-archetype-1.0.2
in repository https://gitbox.apache.org/repos/asf/sling-bundle-archetype.git

commit cbfa3fb47eecc4af43e3f5388b92e0eb715de12f
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@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 4c6f00c..e0693a7 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-bundle-archetype] 13/19: 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-bundle-archetype-1.0.2
in repository https://gitbox.apache.org/repos/asf/sling-bundle-archetype.git

commit 900e8e449675af5adfdf6ae612326ab0ece58a59
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@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 78efa67..f83efa6 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-bundle-archetype] 10/19: 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-bundle-archetype-1.0.2
in repository https://gitbox.apache.org/repos/asf/sling-bundle-archetype.git

commit 85d87a4ec50b328c542108e98cbb561b76259b3f
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@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 324c8a7..bf85624 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 36af298..0b1f7ce 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,9 +34,9 @@
     <description>Maven archetype for a generic OSGi bundle.</description>
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/maven/archetypes/bundle</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/maven/archetypes/bundle</developerConnection>
-        <url>http://svn.apache.org/viewvc/sling/trunk/maven/archetypes/bundle</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/tooling/maven/archetypes/bundle</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/tooling/maven/archetypes/bundle</developerConnection>
+        <url>http://svn.apache.org/viewvc/sling/trunk/tooling/maven/archetypes/bundle</url>
     </scm>
 
     <build>

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

[sling-bundle-archetype] 17/19: 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-bundle-archetype-1.0.2
in repository https://gitbox.apache.org/repos/asf/sling-bundle-archetype.git

commit df1cd89cf9749a3e3573c97ece173f450942f53d
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@1594821 13f79535-47bb-0310-9956-ffa450edef68
---
 src/main/resources/archetype-resources/pom.xml | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/main/resources/archetype-resources/pom.xml b/src/main/resources/archetype-resources/pom.xml
index 77a7ff4..51a83ed 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>
@@ -115,18 +125,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>

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

[sling-bundle-archetype] 15/19: 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-bundle-archetype-1.0.2
in repository https://gitbox.apache.org/repos/asf/sling-bundle-archetype.git

commit db9991545e2797d7c4fb23429c17460aa52aa67b
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@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-bundle-archetype] 18/19: [maven-release-plugin] prepare release sling-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-bundle-archetype-1.0.2
in repository https://gitbox.apache.org/repos/asf/sling-bundle-archetype.git

commit 8732ed622462a948b330d3f149bf94c3c5f177b1
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Thu May 15 08:48:09 2014 +0000

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

diff --git a/pom.xml b/pom.xml
index 3883425..0d89298 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,16 +27,16 @@
     </parent>
 
     <artifactId>sling-bundle-archetype</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.0.2</version>
     <packaging>maven-archetype</packaging>
 
     <name>Sling Bundle Archetype</name>
     <description>Maven archetype for a generic OSGi bundle.</description>
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/tooling/maven/archetypes/bundle</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/tooling/maven/archetypes/bundle</developerConnection>
-        <url>http://svn.apache.org/viewvc/sling/trunk/tooling/maven/archetypes/bundle</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/sling/tags/sling-bundle-archetype-1.0.2</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/tags/sling-bundle-archetype-1.0.2</developerConnection>
+        <url>http://svn.apache.org/viewvc/sling/tags/sling-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-bundle-archetype] 01/19: [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-bundle-archetype-1.0.2
in repository https://gitbox.apache.org/repos/asf/sling-bundle-archetype.git

commit f566d1a7faed276908f325c93521896c06a14103
Author: Justin Edelson <ju...@apache.org>
AuthorDate: Thu Sep 15 14:24:22 2011 +0000

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

diff --git a/pom.xml b/pom.xml
index 2ba862b..4c6f00c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,16 +27,16 @@
     </parent>
 
     <artifactId>sling-bundle-archetype</artifactId>
-    <version>1.0.0</version>
+    <version>1.0.1-SNAPSHOT</version>
     <packaging>maven-archetype</packaging>
 
     <name>Sling Bundle Archetype</name>
     <description>Maven archetype for a generic OSGi bundle.</description>
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/sling/tags/sling-bundle-archetype-1.0.0</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/tags/sling-bundle-archetype-1.0.0</developerConnection>
-        <url>http://svn.apache.org/viewvc/sling/tags/sling-bundle-archetype-1.0.0</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/maven/archetypes/bundle</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/maven/archetypes/bundle</developerConnection>
+        <url>http://svn.apache.org/viewvc/sling/trunk/maven/archetypes/bundle</url>
     </scm>
 
     <build>

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

[sling-bundle-archetype] 05/19: 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-bundle-archetype-1.0.2
in repository https://gitbox.apache.org/repos/asf/sling-bundle-archetype.git

commit 3fccd4490f0cac73bb0aee075993f05b88c37d8d
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@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 bdeace1..cd1d793 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-bundle-archetype] 14/19: 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-bundle-archetype-1.0.2
in repository https://gitbox.apache.org/repos/asf/sling-bundle-archetype.git

commit 1ee38f5a00ed690e279329a2cef5a03867d5b656
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@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 b9016c0..d888c03 100644
--- a/src/main/resources/archetype-resources/pom.xml
+++ b/src/main/resources/archetype-resources/pom.xml
@@ -123,7 +123,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-bundle-archetype] 08/19: 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-bundle-archetype-1.0.2
in repository https://gitbox.apache.org/repos/asf/sling-bundle-archetype.git

commit af1539a0643dab2e16c7ac7239fc5e1a154ad172
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@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 f4b9153..f99c214 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-bundle-archetype] 02/19: 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-bundle-archetype-1.0.2
in repository https://gitbox.apache.org/repos/asf/sling-bundle-archetype.git

commit a7c35c783ff4b6a55a4c7ed6b8b3df4c8a4b97a0
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@1200746 13f79535-47bb-0310-9956-ffa450edef68

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