You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2017/11/07 10:25:57 UTC

[sling-servlet-archetype] 37/39: SLING-3532 - Move sling plugin configuration out of the autoInstallBundle profile

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

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

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

    SLING-3532 - Move sling plugin configuration out of the
    autoInstallBundle profile
    
    git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/tooling/maven/archetypes/servlet@1594821 13f79535-47bb-0310-9956-ffa450edef68
---
 src/main/resources/archetype-resources/pom.xml       | 16 ++++++++++------
 src/test/resources/projects/normal/reference/pom.xml | 16 ++++++++++------
 2 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/src/main/resources/archetype-resources/pom.xml b/src/main/resources/archetype-resources/pom.xml
index e3e7ff7..331520f 100644
--- a/src/main/resources/archetype-resources/pom.xml
+++ b/src/main/resources/archetype-resources/pom.xml
@@ -55,6 +55,16 @@
                     <target>${archetype.java.version}</target>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.sling</groupId>
+                <artifactId>maven-sling-plugin</artifactId>
+                <version>${slingplugin.version}</version>
+                <configuration>
+                    <slingUrl>http://localhost:8080/system/console</slingUrl>
+                    <user>admin</user>
+                    <password>admin</password>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
     <dependencies>
@@ -119,18 +129,12 @@
                     <plugin>
                         <groupId>org.apache.sling</groupId>
                         <artifactId>maven-sling-plugin</artifactId>
-                        <version>${slingplugin.version}</version>
                         <executions>
                             <execution>
                                 <id>install-bundle</id>
                                 <goals>
                                     <goal>install</goal>
                                 </goals>
-                                <configuration>
-                                    <slingUrl>http://localhost:8080/system/console</slingUrl>
-                                    <user>admin</user>
-                                    <password>admin</password>
-                                </configuration>
                             </execution>
                         </executions>
                     </plugin>
diff --git a/src/test/resources/projects/normal/reference/pom.xml b/src/test/resources/projects/normal/reference/pom.xml
index 7834625..b7969bb 100644
--- a/src/test/resources/projects/normal/reference/pom.xml
+++ b/src/test/resources/projects/normal/reference/pom.xml
@@ -55,6 +55,16 @@
                     <target>6</target>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.sling</groupId>
+                <artifactId>maven-sling-plugin</artifactId>
+                <version>2.1.0</version>
+                <configuration>
+                    <slingUrl>http://localhost:8080/system/console</slingUrl>
+                    <user>admin</user>
+                    <password>admin</password>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
     <dependencies>
@@ -119,18 +129,12 @@
                     <plugin>
                         <groupId>org.apache.sling</groupId>
                         <artifactId>maven-sling-plugin</artifactId>
-                        <version>2.1.0</version>
                         <executions>
                             <execution>
                                 <id>install-bundle</id>
                                 <goals>
                                     <goal>install</goal>
                                 </goals>
-                                <configuration>
-                                    <slingUrl>http://localhost:8080/system/console</slingUrl>
-                                    <user>admin</user>
-                                    <password>admin</password>
-                                </configuration>
                             </execution>
                         </executions>
                     </plugin>

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