This is an automated email from the ASF dual-hosted git repository.
cziegeler pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-whiteboard.git
The following commit(s) were added to refs/heads/master by this push:
new dc920dbe Use modules from current release vote, update all dependencies
dc920dbe is described below
commit dc920dbe2851433652cfb97c356bf6cae52bc07f
Author: Carsten Ziegeler <[email protected]>
AuthorDate: Wed Jun 25 10:15:59 2025 +0200
Use modules from current release vote, update all dependencies
---
sling-mini/pom.xml | 57 +++++++++++-----------
sling-mini/src/main/features/addons/sightly.json | 16 +++---
.../src/main/features/addons/webconsole.json | 8 +--
sling-mini/src/main/features/app.json | 2 +-
sling-mini/src/main/features/base.json | 10 ++--
.../src/main/features/deployments/offline.json | 2 +-
sling-mini/src/main/features/deployments/web.json | 4 +-
sling-mini/src/main/features/sling.json | 28 +++++------
8 files changed, 58 insertions(+), 69 deletions(-)
diff --git a/sling-mini/pom.xml b/sling-mini/pom.xml
index b20062cf..a89521e6 100644
--- a/sling-mini/pom.xml
+++ b/sling-mini/pom.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license
agreements. See the NOTICE file distributed with this work for additional
information
@@ -16,24 +16,25 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>52</version>
+ <version>62</version>
<relativePath />
</parent>
<artifactId>org.apache.sling.starter.minimal</artifactId>
<version>0.0.1-SNAPSHOT</version>
- <name>Apache Sling Minimal Starter</name>
- <description>A minimal starter for Apache Sling</description>
<packaging>slingosgifeature</packaging>
+ <name>Apache Sling Minimal Starter</name>
+ <description>A minimal starter for Apache Sling</description>
<properties>
- <sling.java.version>11</sling.java.version>
- <launcher.version>1.3.0</launcher.version>
+ <sling.java.version>17</sling.java.version>
+ <launcher.version>1.3.4</launcher.version>
<project.build.outputTimestamp>1</project.build.outputTimestamp>
<sourceDir>/tmp/docs</sourceDir>
<targetDir>/tmp/offliner</targetDir>
<feature>offlineapp</feature>
+ <minimalMavenBuildVersion>3.8.1</minimalMavenBuildVersion>
</properties>
<build>
@@ -41,8 +42,12 @@
<plugin>
<groupId>org.apache.sling</groupId>
<artifactId>slingfeature-maven-plugin</artifactId>
- <version>1.9.0</version>
+ <version>1.9.2</version>
<extensions>true</extensions>
+ <configuration>
+ <createReferenceFile>true</createReferenceFile>
+
<enableLegacyVariableReplacement>true</enableLegacyVariableReplacement>
+ </configuration>
<executions>
<execution>
<id>create-full</id>
@@ -58,12 +63,12 @@
<aggregate>
<classifier>offlineapp</classifier>
<filesInclude>*.json</filesInclude>
-<!--
+ <!--
<filesInclude>addons/sightly.json</filesInclude>
-->
<filesInclude>deployments/offline.json</filesInclude>
</aggregate>
- <aggregate>
+ <aggregate>
<classifier>fullwebapp</classifier>
<filesInclude>*.json</filesInclude>
<filesInclude>deployments/web.json</filesInclude>
@@ -92,7 +97,7 @@
<includeTasks>
<includeTask>bundle-packages</includeTask>
<includeTask>api-regions-exportsimports</includeTask>
-<!--
+ <!--
<includeTask>check-unused-bundles</includeTask>
-->
</includeTasks>
@@ -107,29 +112,25 @@
</goals>
</execution>
</executions>
- <configuration>
- <createReferenceFile>true</createReferenceFile>
-
<enableLegacyVariableReplacement>true</enableLegacyVariableReplacement>
- </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
- <version>3.5.0</version>
+ <version>3.8.1</version>
<executions>
<execution>
<id>unpack</id>
- <phase>package</phase>
<goals>
<goal>unpack</goal>
</goals>
+ <phase>package</phase>
<configuration>
<artifactItems>
<artifactItem>
- <groupId>org.apache.sling</groupId>
-
<artifactId>org.apache.sling.feature.launcher</artifactId>
- <version>${launcher.version}</version>
- <type>zip</type>
+ <groupId>org.apache.sling</groupId>
+
<artifactId>org.apache.sling.feature.launcher</artifactId>
+ <version>${launcher.version}</version>
+ <type>zip</type>
</artifactItem>
</artifactItems>
<outputDirectory>target</outputDirectory>
@@ -140,14 +141,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
- <version>1.5.0</version>
- <executions>
- <execution>
- <goals>
- <goal>exec</goal>
- </goals>
- </execution>
- </executions>
+ <version>3.5.1</version>
<configuration>
<executable>${basedir}/target/org.apache.sling.feature.launcher-${launcher.version}/bin/launcher</executable>
<arguments>
@@ -163,6 +157,13 @@
<argument>TARGET_DIR=${targetDir}</argument>
</arguments>
</configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>exec</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
<plugin>
<groupId>org.apache.rat</groupId>
diff --git a/sling-mini/src/main/features/addons/sightly.json
b/sling-mini/src/main/features/addons/sightly.json
index 84993e39..afa3fa66 100644
--- a/sling-mini/src/main/features/addons/sightly.json
+++ b/sling-mini/src/main/features/addons/sightly.json
@@ -5,31 +5,31 @@
"start-order":"20"
},
{
- "id":"com.fasterxml.jackson.core:jackson-annotations:2.16.1",
+ "id":"com.fasterxml.jackson.core:jackson-annotations:2.19.1",
"start-order":"20"
},
{
- "id":"com.fasterxml.jackson.core:jackson-core:2.16.1",
+ "id":"com.fasterxml.jackson.core:jackson-core:2.19.1",
"start-order":"20"
},
{
- "id":"com.fasterxml.jackson.core:jackson-databind:2.16.1",
+ "id":"com.fasterxml.jackson.core:jackson-databind:2.19.1",
"start-order":"20"
},
{
- "id":"com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.16.1",
+ "id":"com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.19.1",
"start-order":"20"
},
{
- "id": "org.apache.commons:commons-text:1.11.0",
+ "id": "org.apache.commons:commons-text:1.13.1",
"start-order": "20"
},
{
- "id": "org.slf4j:jcl-over-slf4j:1.7.36",
+ "id": "org.slf4j:jcl-over-slf4j:2.0.17",
"start-order": "1"
},
{
- "id": "org.slf4j:log4j-over-slf4j:1.7.36",
+ "id": "org.slf4j:log4j-over-slf4j:2.0.17",
"start-order": "1"
},
{
@@ -37,7 +37,7 @@
"start-order": "20"
},
{
- "id": "org.apache.sling:org.apache.sling.scripting.sightly:1.4.24-1.4.0",
+ "id": "org.apache.sling:org.apache.sling.scripting.sightly:1.4.28-1.4.0",
"start-order": "20"
},
{
diff --git a/sling-mini/src/main/features/addons/webconsole.json
b/sling-mini/src/main/features/addons/webconsole.json
index 541c6118..4e5a705c 100644
--- a/sling-mini/src/main/features/addons/webconsole.json
+++ b/sling-mini/src/main/features/addons/webconsole.json
@@ -9,7 +9,7 @@
"start-order":"10"
},
{
- "id":"org.apache.felix:org.apache.felix.webconsole:5.0.8",
+ "id":"org.apache.felix:org.apache.felix.webconsole:5.0.12",
"start-order":"10"
},
{
@@ -25,11 +25,7 @@
"start-order":"10"
},
{
- "id":"org.apache.sling:org.apache.sling.commons.log.webconsole:1.0.0",
- "start-order":"10"
- },
- {
- "id":"org.apache.felix:org.apache.felix.http.webconsoleplugin:1.2.0",
+ "id":"org.apache.felix:org.apache.felix.http.webconsoleplugin:1.2.2",
"start-order":"20"
},
{
diff --git a/sling-mini/src/main/features/app.json
b/sling-mini/src/main/features/app.json
index 8c8128a1..2b911208 100644
--- a/sling-mini/src/main/features/app.json
+++ b/sling-mini/src/main/features/app.json
@@ -1,7 +1,7 @@
{
"bundles":[
{
- "id":"org.jsoup:jsoup:1.16.1",
+ "id":"org.jsoup:jsoup:1.21.1",
"start-order":"20"
},
{
diff --git a/sling-mini/src/main/features/base.json
b/sling-mini/src/main/features/base.json
index a9916d13..b4a838b7 100644
--- a/sling-mini/src/main/features/base.json
+++ b/sling-mini/src/main/features/base.json
@@ -17,21 +17,17 @@
"start-order":"1"
},
{
- "id":"org.apache.sling:org.apache.sling.commons.log:5.5.0",
+ "id":"org.apache.sling:org.apache.sling.commons.log:jar:all:6.0.0",
"start-order":"1"
},
{
- "id":"org.apache.sling:org.apache.sling.commons.logservice:1.1.0",
+ "id":"org.apache.sling:org.apache.sling.commons.logservice:1.1.2",
"start-order":"1"
},
{
"id":"org.apache.felix:org.apache.felix.log:1.3.0",
"start-order":"1"
},
- {
- "id":"org.slf4j:slf4j-api:1.7.36",
- "start-order":"1"
- },
{
"id":"org.apache.felix:org.apache.felix.configadmin:1.9.26",
"start-order":"1"
@@ -45,7 +41,7 @@
"start-order":"1"
},
{
- "id":"org.apache.felix:org.apache.felix.http.servlet-api:3.0.0",
+ "id":"org.apache.felix:org.apache.felix.http.servlet-api:6.1.0",
"start-order":"1"
},
{
diff --git a/sling-mini/src/main/features/deployments/offline.json
b/sling-mini/src/main/features/deployments/offline.json
index 5eb3d2ca..efc8aeac 100644
--- a/sling-mini/src/main/features/deployments/offline.json
+++ b/sling-mini/src/main/features/deployments/offline.json
@@ -5,7 +5,7 @@
"start-order":"20"
},
{
- "id":"org.apache.felix:org.apache.felix.http.wrappers:1.1.8",
+ "id":"org.apache.felix:org.apache.felix.http.wrappers:6.1.0",
"start-order":"1"
}
],
diff --git a/sling-mini/src/main/features/deployments/web.json
b/sling-mini/src/main/features/deployments/web.json
index ef3a79e9..c18f7629 100644
--- a/sling-mini/src/main/features/deployments/web.json
+++ b/sling-mini/src/main/features/deployments/web.json
@@ -1,11 +1,11 @@
{
"bundles":[
{
- "id":"org.apache.felix:org.apache.felix.http.jetty12:1.0.19",
+ "id":"org.apache.felix:org.apache.felix.http.jetty12:1.0.34",
"start-order":"2"
},
{
- "id":"org.apache.sling:org.apache.sling.servlets.get:3.0.0-SNAPSHOT",
+ "id":"org.apache.sling:org.apache.sling.servlets.get:3.0.0",
"start-order":"20"
}
]
diff --git a/sling-mini/src/main/features/sling.json
b/sling-mini/src/main/features/sling.json
index a223ce62..47aff7ce 100644
--- a/sling-mini/src/main/features/sling.json
+++ b/sling-mini/src/main/features/sling.json
@@ -1,15 +1,11 @@
{
"bundles":[
{
- "id":"org.apache.commons:commons-fileupload2-core:2.0.0-M2",
+ "id":"commons-fileupload:commons-fileupload:1.6.0",
"start-order":"1"
},
{
- "id":"org.apache.commons:commons-fileupload2-jakarta-servlet5:2.0.0-M2",
- "start-order":"1"
- },
- {
- "id":"commons-io:commons-io:2.17.0",
+ "id":"commons-io:commons-io:2.19.0",
"start-order":"1"
},
{
@@ -17,19 +13,19 @@
"start-order":"1"
},
{
- "id":"commons-codec:commons-codec:1.16.0",
+ "id":"commons-codec:commons-codec:1.18.0",
"start-order":"20"
},
{
- "id":"org.apache.commons:commons-collections4:4.4",
+ "id":"org.apache.commons:commons-collections4:4.5.0",
"start-order":"20"
},
{
- "id":"org.apache.sling:org.apache.sling.api:3.0.0-SNAPSHOT",
+ "id":"org.apache.sling:org.apache.sling.api:3.0.0",
"start-order":"20"
},
{
- "id":"org.apache.sling:org.apache.sling.auth.core:2.0.0-SNAPSHOT",
+ "id":"org.apache.sling:org.apache.sling.auth.core:2.0.0",
"start-order":"20"
},
{
@@ -45,27 +41,27 @@
"start-order":"20"
},
{
- "id":"org.apache.sling:org.apache.sling.scripting.api:2.2.0",
+ "id":"org.apache.sling:org.apache.sling.scripting.api:2.2.2",
"start-order":"20"
},
{
- "id":"org.apache.sling:org.apache.sling.scripting.core:3.0.0-SNAPSHOT",
+ "id":"org.apache.sling:org.apache.sling.scripting.core:3.0.0",
"start-order":"20"
},
{
- "id":"org.apache.sling:org.apache.sling.scripting.spi:1.0.4",
+ "id":"org.apache.sling:org.apache.sling.scripting.spi:2.0.0",
"start-order":"20"
},
{
- "id":"org.apache.sling:org.apache.sling.engine:3.0.0-SNAPSHOT",
+ "id":"org.apache.sling:org.apache.sling.engine:3.0.0",
"start-order":"20"
},
{
- "id":"org.apache.sling:org.apache.sling.resourceresolver:2.0.0-SNAPSHOT",
+ "id":"org.apache.sling:org.apache.sling.resourceresolver:2.0.0",
"start-order":"20"
},
{
-
"id":"org.apache.sling:org.apache.sling.servlets.resolver:3.0.0-SNAPSHOT",
+ "id":"org.apache.sling:org.apache.sling.servlets.resolver:3.0.0",
"start-order":"20"
}
],
