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/15 18:24:34 UTC
[sling-org-apache-sling-caconfig-impl] 02/02: SLING-11010 do not shade org.apache.sling.commons.osgi - we can depend on it directly
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-caconfig-impl.git
commit cf04416c5b3472e6d66ff35e0c709d054729cfab
Author: Stefan Seifert <st...@users.noreply.github.com>
AuthorDate: Wed Dec 15 19:19:39 2021 +0100
SLING-11010 do not shade org.apache.sling.commons.osgi - we can depend on it directly
---
pom.xml | 39 ---------------------------------------
1 file changed, 39 deletions(-)
diff --git a/pom.xml b/pom.xml
index 0baec40..57a229e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -62,8 +62,6 @@
org.apache.felix.webconsole;resolution:=optional,\
<!-- Support XSS API 1.x and 2.x - we use only classes from the API with same signature in both versions -->\
org.apache.sling.xss;version="[1.0.0,3)",\
- <!-- Remove those package imports because embedded and relocated via shade plugin (see below) -->\
- !org.apache.sling.commons.osgi,\
*
</bnd>
</configuration>
@@ -75,42 +73,6 @@
<artifactId>bnd-baseline-maven-plugin</artifactId>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-shade-plugin</artifactId>
- <version>3.0.0</version>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>shade</goal>
- </goals>
- <configuration>
- <createSourcesJar>true</createSourcesJar>
- <shadeSourcesContent>true</shadeSourcesContent>
- <artifactSet>
- <includes>
- <include>org.apache.sling:org.apache.sling.commons.osgi</include>
- </includes>
- </artifactSet>
- <relocations>
- <relocation>
- <pattern>org.apache.sling.commons.osgi</pattern>
- <shadedPattern>caconfigimpl.org.apache.sling.commons.osgi</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>
- </filters>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
<configuration>
@@ -128,7 +90,6 @@
<artifactId>org.osgi.annotation.versioning</artifactId>
<scope>provided</scope>
</dependency>
- <!-- Artifact is shaded and inlined -->
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.commons.osgi</artifactId>