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 2026/04/20 13:29:04 UTC
(sling-whiteboard) branch master updated (8a264112 -> aa7a2a03)
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/sling-whiteboard.git
from 8a264112 skills: add basic support for updating up to parent pom 52
new 63172e04 skills: better support for upgrading to parent pom 30
new aa7a2a03 skills: improved instructions for converting to bnd.bnd
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
skills/update-sling-parent-pom/SKILL.md | 3 ++-
.../reference/.deps-scope.md.swp | Bin 12288 -> 0 bytes
.../update-sling-parent-pom/reference/bundle-parent.md | 16 ++++++++++++++++
skills/update-sling-parent-pom/reference/osgi-r6.md | 2 ++
.../reference/readd-scr-annotations.md | 11 +++++++++++
skills/update-sling-parent-pom/reference/servlet-3.md | 3 +++
6 files changed, 34 insertions(+), 1 deletion(-)
delete mode 100644 skills/update-sling-parent-pom/reference/.deps-scope.md.swp
create mode 100644 skills/update-sling-parent-pom/reference/readd-scr-annotations.md
(sling-whiteboard) 01/02: skills: better support for upgrading to parent pom 30
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-whiteboard.git
commit 63172e045c181da1130b6e5bd34420171c11355e
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Mon Apr 20 14:49:10 2026 +0200
skills: better support for upgrading to parent pom 30
Support adding back the SCR annotations dependency in case it was inherited from the parent pom.
---
skills/update-sling-parent-pom/SKILL.md | 3 ++-
.../reference/.deps-scope.md.swp | Bin 12288 -> 0 bytes
skills/update-sling-parent-pom/reference/osgi-r6.md | 2 ++
.../reference/readd-scr-annotations.md | 11 +++++++++++
skills/update-sling-parent-pom/reference/servlet-3.md | 3 +++
5 files changed, 18 insertions(+), 1 deletion(-)
diff --git a/skills/update-sling-parent-pom/SKILL.md b/skills/update-sling-parent-pom/SKILL.md
index ee880b85..62fe8580 100644
--- a/skills/update-sling-parent-pom/SKILL.md
+++ b/skills/update-sling-parent-pom/SKILL.md
@@ -47,7 +47,7 @@ The following versions are not supported and must be skipped:
| 27 | 8 | osgi-r6,servlet-3 |
| 28 | 8 | None |
| 29 | 8 | None |
-| 30 | 8 | None |
+| 30 | 8 | readd-scr-annotations |
| 31 | 8 | osgi-annotations |
| 32 | 8 | None |
| 33 | 8 | None |
@@ -81,6 +81,7 @@ See the following reference files for additional fixes needed to update to a spe
- bundle-parent: [bundle-parent.md](./reference/bundle-parent.md)
- timestamp: [timestamp.md](./reference/timestamp.md)
- mockito-java17: [mockito-java17.md](./reference/mockito-java17.md)
+- readd-scr-annotations: [readd-scr-annotations.md](./reference/readd-scr-annotations.md)
- osgi-deps: [osgi-deps.md](./reference/osgi-deps.md)
- deps-scope: [deps-scope.md](./reference/deps-scope.md)
diff --git a/skills/update-sling-parent-pom/reference/.deps-scope.md.swp b/skills/update-sling-parent-pom/reference/.deps-scope.md.swp
deleted file mode 100644
index 773e7847..00000000
Binary files a/skills/update-sling-parent-pom/reference/.deps-scope.md.swp and /dev/null differ
diff --git a/skills/update-sling-parent-pom/reference/osgi-r6.md b/skills/update-sling-parent-pom/reference/osgi-r6.md
index 3df6be1a..62512794 100644
--- a/skills/update-sling-parent-pom/reference/osgi-r6.md
+++ b/skills/update-sling-parent-pom/reference/osgi-r6.md
@@ -2,3 +2,5 @@ Replace the following Maven dependencies
- org.osgi:org.osgi.core → org.osgi:osgi.core
- org.osgi:org.osgi.compendium → org.osgi:osgi.cmpn
+
+Remove any versions that are specified so they can be managed in the parent pom.
diff --git a/skills/update-sling-parent-pom/reference/readd-scr-annotations.md b/skills/update-sling-parent-pom/reference/readd-scr-annotations.md
new file mode 100644
index 00000000..0f2f48db
--- /dev/null
+++ b/skills/update-sling-parent-pom/reference/readd-scr-annotations.md
@@ -0,0 +1,11 @@
+# Add back SCR annotations to the pom.xml
+
+In the build fails because the Felix SCR annotations are missing you can add them back to the pom.xml. They are not available by default in the parent pom but are part of the dependency management.
+
+```xml
+<dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.scr.annotations</artifactId>
+ <scope>provided</scope>
+</dependency>
+```
diff --git a/skills/update-sling-parent-pom/reference/servlet-3.md b/skills/update-sling-parent-pom/reference/servlet-3.md
index e40b0dc6..17617ead 100644
--- a/skills/update-sling-parent-pom/reference/servlet-3.md
+++ b/skills/update-sling-parent-pom/reference/servlet-3.md
@@ -1,3 +1,6 @@
Replace the following Maven dependencies:
- javax.servlet:servlet-api → javax.servlet:javax.servlet-api
+
+Remove any versions that are specified so they can be managed in the parent pom.
+
(sling-whiteboard) 02/02: skills: improved instructions for converting to bnd.bnd
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-whiteboard.git
commit aa7a2a03947a0068d30883fa77a69fa144a34890
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Mon Apr 20 15:23:50 2026 +0200
skills: improved instructions for converting to bnd.bnd
---
.../update-sling-parent-pom/reference/bundle-parent.md | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/skills/update-sling-parent-pom/reference/bundle-parent.md b/skills/update-sling-parent-pom/reference/bundle-parent.md
index 7ba84fb7..6fa05018 100644
--- a/skills/update-sling-parent-pom/reference/bundle-parent.md
+++ b/skills/update-sling-parent-pom/reference/bundle-parent.md
@@ -43,6 +43,22 @@ Provide-Capability:\
osgi.service;objectClass=org.apache.sling.models.factory.ModelFactory
```
+Not all instructions can be copied as they are. The folowing exceptions apply:
+
+1. `Embed-Dependency` instructions should be converted to `-includeresource` instructions. Example:
+
+```xml
+<Embed-Dependency>
+ org.apache.felix.utils;inline=org/apache/felix/utils/json/JSONWriter.class
+</Embed-Dependency>
+```
+
+This should be converted to the following in the bnd.bnd file:
+
+```
+includeresource: @org.apache.felix.utils-*.jar!/org/apache/felix/utils/json/JSONWriter.class
+```
+
If the build fails with a baselining error then add a pom property named `bnd.baseline.skip` with value `true`. This happens for projects that have not yet been released. Example below:
```