This is an automated email from the ASF dual-hosted git repository.
andysch pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-project-archetype.git
The following commit(s) were added to refs/heads/master by this push:
new 25dafc6 Update the Archetype to Sling 12
25dafc6 is described below
commit 25dafc6db3e1ccc9afab44299e9d036e4f5bac20
Author: Andreas Schaefer <[email protected]>
AuthorDate: Fri May 8 16:43:46 2020 -0700
Update the Archetype to Sling 12
---
README.md | 5 ++--
pom.xml | 4 +--
.../archetype-resources/core.example/pom.xml | 4 +--
.../resources/archetype-resources/core/pom.xml | 4 +--
src/main/resources/archetype-resources/pom.xml | 32 ++++++++++++----------
5 files changed, 26 insertions(+), 23 deletions(-)
diff --git a/README.md b/README.md
index e722fe9..18cbe5a 100644
--- a/README.md
+++ b/README.md
@@ -6,10 +6,11 @@
|:--------|:------------|
|1.0.0 |Initial Release. Do not use anymore as it has issues with handling
embedded bundles|
|1.0.2 |Fixes for the embedded bundles issue and prevents the interactive
mode to fail to ask for certain parameters by having no defaults|
+|1.0.4 |Updated the Archetype to work with Sling 12|
#### Introduction
-This archetype will create a Sling project that can be deployed on the Sling
10. In contrast to
+This archetype will create a Sling project that can be deployed on the Sling
12. In contrast to
the Apache Sling Maven Archetypes this one is geared towards creating a full
project and not
just a single module.
@@ -64,7 +65,7 @@ You can create a project with this archetype using this
command:
mvn archetype:generate \
-DarchetypeGroupId=org.apache.sling \
-DarchetypeArtifactId=sling-project-archetype \
- -DarchetypeVersion=1.0.2
+ -DarchetypeVersion=1.0.4
```
Maven will then guide you through the configuration process to fill in all the
properties and then create the project.
diff --git a/pom.xml b/pom.xml
index ebfb025..37c97bc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -67,7 +67,7 @@
<plugins>
<plugin>
<artifactId>maven-archetype-plugin</artifactId>
- <version>3.0.1</version>
+ <version>3.1.2</version>
</plugin>
</plugins>
</pluginManagement>
@@ -77,7 +77,7 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>2.4</version>
+ <version>2.6</version>
</dependency>
</dependencies>
</project>
diff --git a/src/main/resources/archetype-resources/core.example/pom.xml
b/src/main/resources/archetype-resources/core.example/pom.xml
index a2c027c..ef9304d 100644
--- a/src/main/resources/archetype-resources/core.example/pom.xml
+++ b/src/main/resources/archetype-resources/core.example/pom.xml
@@ -141,8 +141,8 @@
</dependency>
<dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
</dependency>
<dependency>
diff --git a/src/main/resources/archetype-resources/core/pom.xml
b/src/main/resources/archetype-resources/core/pom.xml
index 255bb4c..9dfbbc1 100644
--- a/src/main/resources/archetype-resources/core/pom.xml
+++ b/src/main/resources/archetype-resources/core/pom.xml
@@ -135,8 +135,8 @@
</dependency>
<dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
</dependency>
<dependency>
diff --git a/src/main/resources/archetype-resources/pom.xml
b/src/main/resources/archetype-resources/pom.xml
index 0af65ff..67f453c 100644
--- a/src/main/resources/archetype-resources/pom.xml
+++ b/src/main/resources/archetype-resources/pom.xml
@@ -72,8 +72,9 @@
<sling.plugin.version>2.4.0</sling.plugin.version>
<dependency.plugin.version>3.1.1</dependency.plugin.version>
<build.helper.plugin.version>3.0.0</build.helper.plugin.version>
- <wcmio.plugin.version>1.6.18</wcmio.plugin.version>
-
<filevault-package.plugin.version>1.0.3</filevault-package.plugin.version>
+ <wcmio.plugin.version>1.7.6</wcmio.plugin.version>
+ <!-- TODO: Could not upgrade to 1.1.x as some tests prevent the
creation of All packages -->
+
<filevault-package.plugin.version>1.0.4</filevault-package.plugin.version>
<osgi.core.version>7.0.0</osgi.core.version>
<osgi.annotation.version>7.0.0</osgi.annotation.version>
@@ -83,12 +84,13 @@
<javax.servlet-api.version>3.1.0</javax.servlet-api.version>
<javax.inject.version>1</javax.inject.version>
<jcr.version>2.0</jcr.version>
- <sling.models.api.version>1.3.6</sling.models.api.version>
- <jetbrains.annotations.version>16.0.2</jetbrains.annotations.version>
- <sling.settings.version>1.3.10</sling.settings.version>
- <sling.commons.osgi.version>2.4.0</sling.commons.osgi.version>
- <jackrabbit-api.version>2.16.3</jackrabbit-api.version>
- <commons-lang.version>2.6</commons-lang.version>
+ <org.apache.sling.api.version>2.22.0</org.apache.sling.api.version>
+
<org.apache.sling.models.api.version>1.3.8</org.apache.sling.models.api.version>
+ <jetbrains.annotations.version>19.0.0</jetbrains.annotations.version>
+
<org.apache.sling.settings.version>1.3.10</org.apache.sling.settings.version>
+
<org.apache.sling.commons.osgi.version>2.4.0</org.apache.sling.commons.osgi.version>
+ <jackrabbit-api.version>2.19.3</jackrabbit-api.version>
+ <commons-lang3.version>3.9</commons-lang3.version>
<jmock-junit4.version>2.8.2</jmock-junit4.version>
</properties>
@@ -365,25 +367,25 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.api</artifactId>
- <version>${slingapi.version}</version>
+ <version>${org.apache.sling.api.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.settings</artifactId>
- <version>${sling.settings.version}</version>
+ <version>${org.apache.sling.settings.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.commons.osgi</artifactId>
- <version>${sling.commons.osgi.version}</version>
+ <version>${org.apache.sling.commons.osgi.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.models.api</artifactId>
- <version>${sling.models.api.version}</version>
+ <version>${org.apache.sling.models.api.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -395,9 +397,9 @@
<!-- Support -->
<dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>${commons-lang.version}</version>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ <version>${commons-lang3.version}</version>
<scope>provided</scope>
</dependency>
