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 2021/12/02 08:20:09 UTC
[sling-org-apache-sling-models-impl] branch master updated: SLING-10948 Update to Parent 46 and latest versions of OSGi annotation dependencies (#26)
This is an automated email from the ASF dual-hosted git repository.
sseifert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-models-impl.git
The following commit(s) were added to refs/heads/master by this push:
new 7d44153 SLING-10948 Update to Parent 46 and latest versions of OSGi annotation dependencies (#26)
7d44153 is described below
commit 7d4415325336612b16e6fd08e07f7941c5e55c90
Author: Stefan Seifert <st...@users.noreply.github.com>
AuthorDate: Thu Dec 2 09:20:02 2021 +0100
SLING-10948 Update to Parent 46 and latest versions of OSGi annotation dependencies (#26)
---
bnd.bnd | 1 -
pom.xml | 26 +++-----------------------
2 files changed, 3 insertions(+), 24 deletions(-)
diff --git a/bnd.bnd b/bnd.bnd
index 0b1929d..e3fce50 100644
--- a/bnd.bnd
+++ b/bnd.bnd
@@ -1,6 +1,5 @@
# Remove those package imports because embedded and relocated via shade plugin (see below)
Import-Package:\
- !org.apache.sling.commons.osgi,\
!org.apache.sling.scripting.core.impl.helper,\
*
Provide-Capability:\
diff --git a/pom.xml b/pom.xml
index 722293c..b8bbe9a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling-bundle-parent</artifactId>
- <version>40</version>
+ <version>46</version>
<relativePath />
</parent>
<artifactId>org.apache.sling.models.impl</artifactId>
@@ -38,13 +38,13 @@
</scm>
<properties>
<sling.java.version>8</sling.java.version>
+ <project.build.outputTimestamp>2021-12-01T00:00:00Z</project.build.outputTimestamp>
</properties>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
- <version>3.2.1</version>
<executions>
<execution>
<phase>package</phase>
@@ -56,28 +56,17 @@
<shadeSourcesContent>true</shadeSourcesContent>
<artifactSet>
<includes>
- <include>org.apache.sling:org.apache.sling.commons.osgi</include>
<include>org.apache.sling:org.apache.sling.scripting.core</include>
</includes>
</artifactSet>
<relocations>
<relocation>
- <pattern>org.apache.sling.commons.osgi</pattern>
- <shadedPattern>slingmodelsimpl.org.apache.sling.commons.osgi</shadedPattern>
- </relocation>
- <relocation>
<pattern>org.apache.sling.scripting.core.impl.helper</pattern>
<shadedPattern>slingmodelsimpl.org.apache.sling.scripting.core.impl.helper</shadedPattern>
</relocation>
</relocations>
<filters>
<filter>
- <artifact>org.apache.sling:org.apache.sling.commons.osgi</artifact>
- <includes>
- <include>org/apache/sling/commons/osgi/**</include>
- </includes>
- </filter>
- <filter>
<artifact>org.apache.sling:org.apache.sling.scripting.core</artifact>
<includes>
<include>org/apache/sling/scripting/core/impl/helper/ProtectedBindings*</include>
@@ -118,20 +107,17 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.service.component.annotations</artifactId>
- <version>1.3.0</version> <!-- downgrade to DS 1.3 (OSGi R6), as this leads to a run time dependency -->
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.service.metatype.annotations</artifactId>
- <version>1.3.0</version> <!-- downgrade to metatype 1.3 (OSGi R6) -->
<scope>provided</scope>
</dependency>
<!-- regular compile-time dependencies -->
<dependency>
<groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.4</version><!-- still Servlet 2.4 -->
+ <artifactId>javax.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
@@ -163,7 +149,6 @@
<version>1</version>
<scope>provided</scope>
</dependency>
- <!-- Artifact is shaded and inlined, only some classes included (see above) -->
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.commons.osgi</artifactId>
@@ -219,11 +204,6 @@
</dependency>
<!-- transitive depedendencies of org.apache.sling.servlet-helpers -->
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-collections4</artifactId>
<version>4.1</version>