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-agent-skills.git
commit f020ff5a04ac85b3e8a5e47c4e496f3b7b11bb07 Author: Robert Munteanu <[email protected]> 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. --- update-sling-parent-pom/SKILL.md | 3 ++- update-sling-parent-pom/reference/.deps-scope.md.swp | Bin 12288 -> 0 bytes update-sling-parent-pom/reference/osgi-r6.md | 2 ++ .../reference/readd-scr-annotations.md | 11 +++++++++++ update-sling-parent-pom/reference/servlet-3.md | 3 +++ 5 files changed, 18 insertions(+), 1 deletion(-) diff --git a/update-sling-parent-pom/SKILL.md b/update-sling-parent-pom/SKILL.md index ee880b8..62fe858 100644 --- a/update-sling-parent-pom/SKILL.md +++ b/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/update-sling-parent-pom/reference/.deps-scope.md.swp b/update-sling-parent-pom/reference/.deps-scope.md.swp deleted file mode 100644 index 773e784..0000000 Binary files a/update-sling-parent-pom/reference/.deps-scope.md.swp and /dev/null differ diff --git a/update-sling-parent-pom/reference/osgi-r6.md b/update-sling-parent-pom/reference/osgi-r6.md index 3df6be1..6251279 100644 --- a/update-sling-parent-pom/reference/osgi-r6.md +++ b/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/update-sling-parent-pom/reference/readd-scr-annotations.md b/update-sling-parent-pom/reference/readd-scr-annotations.md new file mode 100644 index 0000000..0f2f48d --- /dev/null +++ b/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/update-sling-parent-pom/reference/servlet-3.md b/update-sling-parent-pom/reference/servlet-3.md index e40b0dc..17617ea 100644 --- a/update-sling-parent-pom/reference/servlet-3.md +++ b/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. +
