You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by da...@apache.org on 2020/07/28 15:05:54 UTC
[sling-org-apache-sling-javax-activation] 30/34: SLING-9601 Provide
a Sling javax.activation bundle without dependencies built in (#2)
This is an automated email from the ASF dual-hosted git repository.
davidb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-javax-activation.git
commit 67c868b1d772c7bc9166c9461593ef07c0722dc5
Author: David Bosschaert <da...@gmail.com>
AuthorDate: Sat Jul 25 14:21:57 2020 +0100
SLING-9601 Provide a Sling javax.activation bundle without dependencies built in (#2)
An additional bundle with the classifier -nodeps is now generated which
does not contain the javax.activation classes/activation.jar file.
Also updated parent pom to latest version.
---
pom.xml | 39 +++++++++++++++++++++++++++++++--------
1 file changed, 31 insertions(+), 8 deletions(-)
diff --git a/pom.xml b/pom.xml
index d7ba8f5..c12050a 100755
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>26</version>
+ <version>34</version>
<relativePath/>
</parent>
@@ -51,13 +51,35 @@
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
- <configuration>
- <instructions>
- <Bundle-Activator>org.apache.sling.javax.activation.internal.Activator</Bundle-Activator>
- <Export-Package>javax.activation;version=${javax.activation.version}</Export-Package>
- <Embed-Dependency>*;scope=compile</Embed-Dependency>
- </instructions>
- </configuration>
+ <executions>
+ <execution>
+ <id>bundle</id>
+ <goals><goal>bundle</goal></goals>
+ <configuration>
+ <instructions>
+ <Bundle-Activator>org.apache.sling.javax.activation.internal.Activator</Bundle-Activator>
+ <Export-Package>javax.activation;version=${javax.activation.version}</Export-Package>
+ <Embed-Dependency>*;scope=compile</Embed-Dependency>
+ </instructions>
+ </configuration>
+ </execution>
+ <execution>
+ <id>nodepsbundle</id>
+ <goals><goal>bundle</goal></goals>
+ <configuration>
+ <classifier>nodeps</classifier>
+ <instructions>
+ <Bundle-Name>
+ ${project.name} (No embedded dependencies)
+ </Bundle-Name>
+ <Bundle-SymbolicName>
+ ${project.artifactId}.nodeps
+ </Bundle-SymbolicName>
+ <Bundle-Activator>org.apache.sling.javax.activation.internal.Activator</Bundle-Activator>
+ </instructions>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
</plugins>
</build>
@@ -78,6 +100,7 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
+ <version>4.2.0</version>
<scope>provided</scope>
</dependency>
<dependency>