kwin commented on a change in pull request #10:
URL:
https://github.com/apache/sling-org-apache-sling-event/pull/10#discussion_r608816926
##########
File path: pom.xml
##########
@@ -57,39 +57,98 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
+ <groupId>biz.aQute.bnd</groupId>
Review comment:
the plugin is already configured correctly in sling-bundle-parent.
Please use the bnd.bnd file for customization.
##########
File path: pom.xml
##########
@@ -57,39 +57,98 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
+ <groupId>biz.aQute.bnd</groupId>
+ <artifactId>bnd-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>bnd-process</id>
+ <goals>
+ <goal>bnd-process</goal>
+ </goals>
+ <configuration>
+ <bnd>
+-noextraheader:true
+-snapshot: SNAPSHOT
+Sling-Namespaces: slingevent=http://sling.apache.org/jcr/event/1.0
+Sling-Nodetypes: SLING-INF/nodetypes/event.cnd
+Import-Package: \
+ javax.servlet.http;resolution:=optional,\
+ org.apache.felix.inventory;resolution:=optional,\
+ javax.servlet;resolution:=optional,\
+ <!-- For build compatibility with Java 11 -->\
+ javax.annotation;version="[0.0,2)",\
+ *
+Export-Package: \
+ org.apache.sling.event.jobs,\
+ org.apache.sling.event.jobs.consumer,\
+ org.apache.sling.event.jobs.jmx
+
+-conditionalpackage: \
+ org.apache.jackrabbit.util,\
+ org.apache.sling.commons.osgi,\
+ org.apache.sling.event.api
+-includeresource: \
+ target/dependency/org.apache.sling.event.api.jar,\
+ @target/dependency/quartz.jar!/org/quartz/CronExpression.class,\
+ @target/dependency/quartz.jar!/org/quartz/ValueSet.class,\
+
@target/dependency/org.apache.sling.commons.osgi.jar!/org/apache/sling/commons/osgi/PropertiesUtil.class,\
+
@target/dependency/jackrabbit-jcr-commons.jar!/org/apache/jackrabbit/util/ISO9075.class,\
+
@target/dependency/jackrabbit-jcr-commons.jar!/org/apache/jackrabbit/util/ISO8601.class,\
+
@target/dependency/jackrabbit-jcr-commons.jar!/org/apache/jackrabbit/util/XMLChar.class
+Bundle-Classpath: ., org.apache.sling.event.api.jar
+ </bnd>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>biz.aQute.bnd</groupId>
+ <artifactId>bnd-baseline-maven-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
Review comment:
Instead of relying on maven-dependency-plugin I would rather rely on bnd
for adding the third party dependencies (e.g. via
https://stackoverflow.com/questions/58718160/how-to-embed-a-maven-dependency-with-bnd-maven-plugin)
##########
File path: pom.xml
##########
@@ -45,7 +45,7 @@
<properties>
<site.jira.version.id>12315369</site.jira.version.id>
Review comment:
please add a timestamp property for reproducible builds:
https://maven.apache.org/guides/mini/guide-reproducible-builds.html#how-do-i-configure-my-maven-build
##########
File path: pom.xml
##########
@@ -57,39 +57,98 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
+ <groupId>biz.aQute.bnd</groupId>
+ <artifactId>bnd-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>bnd-process</id>
+ <goals>
+ <goal>bnd-process</goal>
+ </goals>
+ <configuration>
+ <bnd>
+-noextraheader:true
+-snapshot: SNAPSHOT
+Sling-Namespaces: slingevent=http://sling.apache.org/jcr/event/1.0
+Sling-Nodetypes: SLING-INF/nodetypes/event.cnd
+Import-Package: \
+ javax.servlet.http;resolution:=optional,\
+ org.apache.felix.inventory;resolution:=optional,\
+ javax.servlet;resolution:=optional,\
+ <!-- For build compatibility with Java 11 -->\
+ javax.annotation;version="[0.0,2)",\
+ *
+Export-Package: \
+ org.apache.sling.event.jobs,\
+ org.apache.sling.event.jobs.consumer,\
+ org.apache.sling.event.jobs.jmx
+
+-conditionalpackage: \
+ org.apache.jackrabbit.util,\
+ org.apache.sling.commons.osgi,\
+ org.apache.sling.event.api
+-includeresource: \
+ target/dependency/org.apache.sling.event.api.jar,\
+ @target/dependency/quartz.jar!/org/quartz/CronExpression.class,\
+ @target/dependency/quartz.jar!/org/quartz/ValueSet.class,\
+
@target/dependency/org.apache.sling.commons.osgi.jar!/org/apache/sling/commons/osgi/PropertiesUtil.class,\
+
@target/dependency/jackrabbit-jcr-commons.jar!/org/apache/jackrabbit/util/ISO9075.class,\
+
@target/dependency/jackrabbit-jcr-commons.jar!/org/apache/jackrabbit/util/ISO8601.class,\
+
@target/dependency/jackrabbit-jcr-commons.jar!/org/apache/jackrabbit/util/XMLChar.class
+Bundle-Classpath: ., org.apache.sling.event.api.jar
+ </bnd>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>biz.aQute.bnd</groupId>
+ <artifactId>bnd-baseline-maven-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-dependencies</id>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <phase>process-sources</phase>
+ </execution>
+ </executions>
<configuration>
- <instructions>
- <Import-Package>
-
javax.servlet;javax.servlet.http;resolution:=optional,
- org.apache.felix.inventory;resolution:=optional,
- *
- </Import-Package>
- <Export-Package>
- org.apache.sling.event.jobs,
- org.apache.sling.event.jobs.consumer,
- org.apache.sling.event.jobs.jmx
- </Export-Package>
- <DynamicImport-Package>
- javax.servlet,
- javax.servlet.http,
- org.apache.felix.inventory
- </DynamicImport-Package>
- <Sling-Nodetypes>
- SLING-INF/nodetypes/event.cnd
- </Sling-Nodetypes>
- <Sling-Namespaces>
- slingevent=http://sling.apache.org/jcr/event/1.0
- </Sling-Namespaces>
- <Embed-Dependency>
-
jackrabbit-jcr-commons;inline="org/apache/jackrabbit/util/ISO9075.*|org/apache/jackrabbit/util/ISO8601.*|org/apache/jackrabbit/util/XMLChar.*",
-
org.apache.sling.commons.osgi;inline="org/apache/sling/commons/osgi/PropertiesUtil.*",
-
quartz;inline="org/quartz/CronExpression.*|org/quartz/ValueSet.*",
- org.apache.sling.event.api
- </Embed-Dependency>
- </instructions>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.event.api</artifactId>
+
<destFileName>org.apache.sling.event.api.jar</destFileName>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.quartz-scheduler</groupId>
+ <artifactId>quartz</artifactId>
+ <destFileName>quartz.jar</destFileName>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.sling</groupId>
+
<artifactId>org.apache.sling.commons.osgi</artifactId>
+
<destFileName>org.apache.sling.commons.osgi.jar</destFileName>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.jackrabbit</groupId>
+ <artifactId>jackrabbit-jcr-commons</artifactId>
+
<destFileName>jackrabbit-jcr-commons.jar</destFileName>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
Review comment:
this plugin is configured in parent, remove here.
##########
File path: pom.xml
##########
@@ -22,13 +22,13 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.sling</groupId>
- <artifactId>sling</artifactId>
- <version>33</version>
+ <artifactId>sling-bundle-parent</artifactId>
+ <version>40</version>
Review comment:
Please use the newest version 41
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
