You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2023/08/07 11:20:37 UTC
[sling-org-apache-sling-installer-factory-feature] branch master updated: SLING-11995 : Update to Feature Model 2.0
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-org-apache-sling-installer-factory-feature.git
The following commit(s) were added to refs/heads/master by this push:
new 0358d45 SLING-11995 : Update to Feature Model 2.0
0358d45 is described below
commit 0358d45b0bf33d53a08e40c443b4563d02d79736
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Mon Aug 7 13:20:32 2023 +0200
SLING-11995 : Update to Feature Model 2.0
---
.gitignore | 1 +
.vscode/settings.json | 3 ---
pom.xml | 15 ++++++++-------
3 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/.gitignore b/.gitignore
index 5b783ed..16a7723 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+.vscode/
/target
.idea
.classpath
diff --git a/.vscode/settings.json b/.vscode/settings.json
deleted file mode 100644
index c5f3f6b..0000000
--- a/.vscode/settings.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- "java.configuration.updateBuildConfiguration": "interactive"
-}
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 255feeb..499b9e6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -85,9 +85,9 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-json_1.1_spec</artifactId>
- <version>1.2</version>
+ <groupId>jakarta.json</groupId>
+ <artifactId>jakarta.json-api</artifactId>
+ <version>2.0.2</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -109,13 +109,13 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.feature</artifactId>
- <version>1.2.26</version>
+ <version>2.0.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.feature.extension.apiregions</artifactId>
- <version>1.3.8</version>
+ <version>2.0.0</version>
<scope>provided</scope>
</dependency>
@@ -134,13 +134,14 @@
<dependency>
<groupId>org.apache.johnzon</groupId>
<artifactId>johnzon-core</artifactId>
- <version>1.2.8</version>
+ <classifier>jakarta</classifier>
+ <version>1.2.21</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.cm.json</artifactId>
- <version>1.0.6</version>
+ <version>2.0.0</version>
<scope>test</scope>
</dependency>
</dependencies>