You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ss...@apache.org on 2024/12/17 12:55:38 UTC
(sling-project-archetype) 01/01: SLING-12579 Update Plugins and dependencies
This is an automated email from the ASF dual-hosted git repository.
sseifert pushed a commit to branch feature/SLING-12579-update-plugins-deps
in repository https://gitbox.apache.org/repos/asf/sling-project-archetype.git
commit 77ae38db474db39563b9e9aa191c55257c527a8c
Author: Stefan Seifert <st...@users.noreply.github.com>
AuthorDate: Tue Dec 17 13:55:28 2024 +0100
SLING-12579 Update Plugins and dependencies
---
pom.xml | 6 +-
.../archetype-resources/core.example/pom.xml | 2 +-
.../src/main/java/servlet/ZipServlet.java | 3 -
.../resources/archetype-resources/core/pom.xml | 4 +-
src/main/resources/archetype-resources/pom.xml | 65 ++++++++++------------
5 files changed, 34 insertions(+), 46 deletions(-)
diff --git a/pom.xml b/pom.xml
index 35d895a..9967ba9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -59,18 +59,18 @@
<archetype.java.version>11</archetype.java.version>
<!-- dependency versions to use in generated archetypes -->
- <junit.version>4.12</junit.version>
+ <junit.version>4.13.2</junit.version>
<slf4japi.version>1.7.25</slf4japi.version>
<!-- version of the maven archetype plugin -->
- <archetype.version>3.1.2</archetype.version>
+ <archetype.version>3.3.1</archetype.version>
</properties>
<dependencies>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>2.14.0</version>
+ <version>2.18.0</version>
<scope>compile</scope>
</dependency>
</dependencies>
diff --git a/src/main/resources/archetype-resources/core.example/pom.xml b/src/main/resources/archetype-resources/core.example/pom.xml
index d91ed2a..78ad7b9 100644
--- a/src/main/resources/archetype-resources/core.example/pom.xml
+++ b/src/main/resources/archetype-resources/core.example/pom.xml
@@ -83,7 +83,7 @@
</plugin>
<plugin>
<groupId>org.apache.sling</groupId>
- <artifactId>maven-sling-plugin</artifactId>
+ <artifactId>sling-maven-plugin</artifactId>
<configuration>
<slingUrl>http://\${sling.host}:\${sling.port}/system/console</slingUrl>
<user>\${sling.user}</user>
diff --git a/src/main/resources/archetype-resources/core.example/src/main/java/servlet/ZipServlet.java b/src/main/resources/archetype-resources/core.example/src/main/java/servlet/ZipServlet.java
index 1beaf33..c2f049b 100644
--- a/src/main/resources/archetype-resources/core.example/src/main/java/servlet/ZipServlet.java
+++ b/src/main/resources/archetype-resources/core.example/src/main/java/servlet/ZipServlet.java
@@ -20,7 +20,6 @@
package ${package}.servlet;
import java.io.IOException;
-import java.io.Writer;
import java.nio.charset.StandardCharsets;
import java.util.zip.ZipOutputStream;
import java.util.zip.ZipEntry;
@@ -35,8 +34,6 @@ import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.SlingHttpServletRequest;
import org.apache.sling.api.SlingHttpServletResponse;
import org.apache.sling.api.servlets.SlingSafeMethodsServlet;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* Download servlet
diff --git a/src/main/resources/archetype-resources/core/pom.xml b/src/main/resources/archetype-resources/core/pom.xml
index 34a0e07..8b79daf 100644
--- a/src/main/resources/archetype-resources/core/pom.xml
+++ b/src/main/resources/archetype-resources/core/pom.xml
@@ -77,7 +77,7 @@
</plugin>
<plugin>
<groupId>org.apache.sling</groupId>
- <artifactId>maven-sling-plugin</artifactId>
+ <artifactId>sling-maven-plugin</artifactId>
<configuration>
<slingUrl>http://\${sling.host}:\${sling.port}/system/console</slingUrl>
<user>\${sling.user}</user>
@@ -148,6 +148,6 @@
<!--
Attention: the autoInstallBundle was removed as deploying bundles directly and through a package is causing
issues with updates and can prevent the latest code of a bundle being deployed.
- If you know what you are doing then you can use maven-sling-plugin directly from the Maven CLI.
+ If you know what you are doing then you can use sling-maven-plugin directly from the Maven CLI.
-->
</project>
diff --git a/src/main/resources/archetype-resources/pom.xml b/src/main/resources/archetype-resources/pom.xml
index 611faf9..8c2af7b 100644
--- a/src/main/resources/archetype-resources/pom.xml
+++ b/src/main/resources/archetype-resources/pom.xml
@@ -57,25 +57,25 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <release.plugin.version>2.5.3</release.plugin.version>
- <source.plugin.version>3.0.1</source.plugin.version>
- <resource.plugin.version>3.1.0</resource.plugin.version>
- <jar.plugin.version>3.1.1</jar.plugin.version>
- <enforcer.plugin.version>3.0.0-M2</enforcer.plugin.version>
- <compiler.plugin.version>3.8.0</compiler.plugin.version>
+ <release.plugin.version>3.1.1</release.plugin.version>
+ <source.plugin.version>3.3.1</source.plugin.version>
+ <resource.plugin.version>3.3.1</resource.plugin.version>
+ <jar.plugin.version>3.4.2</jar.plugin.version>
+ <enforcer.plugin.version>3.5.0</enforcer.plugin.version>
+ <compiler.plugin.version>3.13.0</compiler.plugin.version>
<bundle.plugin.version>5.1.9</bundle.plugin.version>
- <clean.plugin.version>3.1.0</clean.plugin.version>
- <installer.plugin.version>3.0.0-M1</installer.plugin.version>
- <surfire.plugin.version>3.0.0-M3</surfire.plugin.version>
- <failsafe.plugin.version>3.0.0-M3</failsafe.plugin.version>
- <deploy.plugin.version>3.0.0-M1</deploy.plugin.version>
- <sling.plugin.version>2.4.0</sling.plugin.version>
- <dependency.plugin.version>3.8.0</dependency.plugin.version>
- <build.helper.plugin.version>3.0.0</build.helper.plugin.version>
- <wcmio.plugin.version>1.7.6</wcmio.plugin.version>
+ <clean.plugin.version>3.4.0</clean.plugin.version>
+ <installer.plugin.version>3.1.3</installer.plugin.version>
+ <surfire.plugin.version>3.5.2</surfire.plugin.version>
+ <failsafe.plugin.version>3.5.2</failsafe.plugin.version>
+ <deploy.plugin.version>3.1.3</deploy.plugin.version>
+ <sling.plugin.version>3.0.2</sling.plugin.version>
+ <dependency.plugin.version>3.8.1</dependency.plugin.version>
+ <build.helper.plugin.version>3.6.0</build.helper.plugin.version>
+ <wcmio.plugin.version>2.1.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>
- <slingfeature.plugin.version>1.8.4</slingfeature.plugin.version>
+ <slingfeature.plugin.version>1.9.0</slingfeature.plugin.version>
<osgi.core.version>7.0.0</osgi.core.version>
<osgi.annotation.version>7.0.0</osgi.annotation.version>
@@ -83,18 +83,17 @@
<org.osgi.service.metatype.annotations.version>1.4.0</org.osgi.service.metatype.annotations.version>
<org.osgi.compendium.version>5.0.0</org.osgi.compendium.version>
<javax.servlet-api.version>3.1.0</javax.servlet-api.version>
- <javax.inject.version>1</javax.inject.version>
<jcr.version>2.0</jcr.version>
<org.apache.felix.framework.version>7.0.1</org.apache.felix.framework.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>
+ <org.apache.sling.api.version>2.24.0</org.apache.sling.api.version>
+ <org.apache.sling.models.api.version>1.4.0</org.apache.sling.models.api.version>
<org.apache.sling.feature.launcher.version>1.3.0</org.apache.sling.feature.launcher.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>
+ <jetbrains.annotations.version>26.0.1</jetbrains.annotations.version>
+ <org.apache.sling.settings.version>1.4.2</org.apache.sling.settings.version>
+ <org.apache.sling.commons.osgi.version>2.4.2</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>
+ <commons-lang3.version>3.17.0</commons-lang3.version>
+ <jmock-junit4.version>2.13.1</jmock-junit4.version>
<sling.starter.version>@SLING_STARTER_LATEST_VERSION@</sling.starter.version>
</properties>
@@ -143,12 +142,12 @@
<configuration>
<rules>
<requireMavenVersion>
- <message>Project must be built with Maven 3.1.0 or higher</message>
- <version>[3.1.0,)</version>
+ <message>Project must be built with Maven 3.8.1 or higher</message>
+ <version>3.8.1</version>
</requireMavenVersion>
<requireJavaVersion>
- <message>Project must be compiled with Java 7 or higher</message>
- <version>1.7.0</version>
+ <message>Project must be compiled with Java 11 or higher</message>
+ <version>11</version>
</requireJavaVersion>
</rules>
</configuration>
@@ -234,7 +233,7 @@
<!-- Apache Sling Plugin -->
<plugin>
<groupId>org.apache.sling</groupId>
- <artifactId>maven-sling-plugin</artifactId>
+ <artifactId>sling-maven-plugin</artifactId>
<version>${sling.plugin.version}</version>
</plugin>
<!-- Content Package Plugin -->
@@ -349,14 +348,6 @@
<scope>provided</scope>
</dependency>
- <!-- dependency injection annotations -->
- <dependency>
- <groupId>javax.inject</groupId>
- <artifactId>javax.inject</artifactId>
- <version>$[javax.inject.version</version>
- <scope>provided</scope>
- </dependency>
-
<!-- JCR API -->
<dependency>
<groupId>javax.jcr</groupId>