You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ro...@apache.org on 2022/10/19 16:32:54 UTC

[activemq-artemis] branch main updated (75ce36cdbe -> cd6a895c38)

This is an automated email from the ASF dual-hosted git repository.

robbie pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git


    from 75ce36cdbe This closes #4259
     new 7bd67d2eb5 ARTEMIS-4061: update maven-bundle-plugin to 5.1.8
     new cd6a895c38 ARTEMIS-4061: have simplest protocol modules use the jar plugin for packaging, picks up the project.build.outputTimestamp

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 artemis-protocols/artemis-amqp-protocol/pom.xml  | 35 ++++++++++++++++++++++-
 artemis-protocols/artemis-mqtt-protocol/pom.xml  | 36 +++++++++++++++++++++++-
 artemis-protocols/artemis-stomp-protocol/pom.xml | 36 +++++++++++++++++++++++-
 pom.xml                                          |  2 +-
 4 files changed, 105 insertions(+), 4 deletions(-)


[activemq-artemis] 02/02: ARTEMIS-4061: have simplest protocol modules use the jar plugin for packaging, picks up the project.build.outputTimestamp

Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

robbie pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git

commit cd6a895c3810bfebabfae4de8440a4f7acaa3af7
Author: Robbie Gemmell <ro...@apache.org>
AuthorDate: Wed Oct 19 17:07:30 2022 +0100

    ARTEMIS-4061: have simplest protocol modules use the jar plugin for packaging, picks up the project.build.outputTimestamp
---
 artemis-protocols/artemis-amqp-protocol/pom.xml  | 35 ++++++++++++++++++++++-
 artemis-protocols/artemis-mqtt-protocol/pom.xml  | 36 +++++++++++++++++++++++-
 artemis-protocols/artemis-stomp-protocol/pom.xml | 36 +++++++++++++++++++++++-
 3 files changed, 104 insertions(+), 3 deletions(-)

diff --git a/artemis-protocols/artemis-amqp-protocol/pom.xml b/artemis-protocols/artemis-amqp-protocol/pom.xml
index 31bfa913ad..1eb75da0cd 100644
--- a/artemis-protocols/artemis-amqp-protocol/pom.xml
+++ b/artemis-protocols/artemis-amqp-protocol/pom.xml
@@ -24,7 +24,7 @@
    </parent>
 
    <artifactId>artemis-amqp-protocol</artifactId>
-   <packaging>bundle</packaging>
+   <packaging>jar</packaging>
    <name>ActiveMQ Artemis AMQP Protocol</name>
 
    <properties>
@@ -131,4 +131,37 @@
       </dependency>
    </dependencies>
 
+   <build>
+      <plugins>
+         <plugin>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>maven-bundle-plugin</artifactId>
+            <configuration>
+               <exportScr>true</exportScr>
+            </configuration>
+            <executions>
+               <execution>
+                  <id>bundle-manifest</id>
+                  <phase>process-classes</phase>
+                  <goals>
+                     <goal>manifest</goal>
+                  </goals>
+               </execution>
+            </executions>
+         </plugin>
+         <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-jar-plugin</artifactId>
+            <configuration>
+               <archive>
+                  <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+                  <manifest>
+                     <addDefaultSpecificationEntries>false</addDefaultSpecificationEntries>
+                     <addDefaultImplementationEntries>false</addDefaultImplementationEntries>
+                  </manifest>
+               </archive>
+            </configuration>
+         </plugin>
+      </plugins>
+   </build>
 </project>
diff --git a/artemis-protocols/artemis-mqtt-protocol/pom.xml b/artemis-protocols/artemis-mqtt-protocol/pom.xml
index 4197967846..341069a70d 100644
--- a/artemis-protocols/artemis-mqtt-protocol/pom.xml
+++ b/artemis-protocols/artemis-mqtt-protocol/pom.xml
@@ -24,7 +24,7 @@
    </parent>
 
    <artifactId>artemis-mqtt-protocol</artifactId>
-   <packaging>bundle</packaging>
+   <packaging>jar</packaging>
    <name>ActiveMQ Artemis MQTT Protocol</name>
 
    <properties>
@@ -96,4 +96,38 @@
          <type>jar</type>
       </dependency>
    </dependencies>
+
+   <build>
+      <plugins>
+         <plugin>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>maven-bundle-plugin</artifactId>
+            <configuration>
+               <exportScr>true</exportScr>
+            </configuration>
+            <executions>
+               <execution>
+                  <id>bundle-manifest</id>
+                  <phase>process-classes</phase>
+                  <goals>
+                     <goal>manifest</goal>
+                  </goals>
+               </execution>
+            </executions>
+         </plugin>
+         <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-jar-plugin</artifactId>
+            <configuration>
+               <archive>
+                  <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+                  <manifest>
+                     <addDefaultSpecificationEntries>false</addDefaultSpecificationEntries>
+                     <addDefaultImplementationEntries>false</addDefaultImplementationEntries>
+                  </manifest>
+               </archive>
+            </configuration>
+         </plugin>
+      </plugins>
+   </build>
 </project>
diff --git a/artemis-protocols/artemis-stomp-protocol/pom.xml b/artemis-protocols/artemis-stomp-protocol/pom.xml
index c276d61fb6..0432189dc5 100644
--- a/artemis-protocols/artemis-stomp-protocol/pom.xml
+++ b/artemis-protocols/artemis-stomp-protocol/pom.xml
@@ -23,7 +23,7 @@
    <modelVersion>4.0.0</modelVersion>
 
    <artifactId>artemis-stomp-protocol</artifactId>
-   <packaging>bundle</packaging>
+   <packaging>jar</packaging>
    <name>ActiveMQ Artemis STOMP Protocol</name>
 
 
@@ -89,4 +89,38 @@
          <scope>test</scope>
       </dependency>
    </dependencies>
+
+   <build>
+      <plugins>
+         <plugin>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>maven-bundle-plugin</artifactId>
+            <configuration>
+               <exportScr>true</exportScr>
+            </configuration>
+            <executions>
+               <execution>
+                  <id>bundle-manifest</id>
+                  <phase>process-classes</phase>
+                  <goals>
+                     <goal>manifest</goal>
+                  </goals>
+               </execution>
+            </executions>
+         </plugin>
+         <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-jar-plugin</artifactId>
+            <configuration>
+               <archive>
+                  <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+                  <manifest>
+                     <addDefaultSpecificationEntries>false</addDefaultSpecificationEntries>
+                     <addDefaultImplementationEntries>false</addDefaultImplementationEntries>
+                  </manifest>
+               </archive>
+            </configuration>
+         </plugin>
+      </plugins>
+   </build>
 </project>


[activemq-artemis] 01/02: ARTEMIS-4061: update maven-bundle-plugin to 5.1.8

Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

robbie pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git

commit 7bd67d2eb5f1ee60df7f052be62cab9a8852860d
Author: Robbie Gemmell <ro...@apache.org>
AuthorDate: Wed Oct 19 17:06:50 2022 +0100

    ARTEMIS-4061: update maven-bundle-plugin to 5.1.8
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 386ba80761..006c509629 100644
--- a/pom.xml
+++ b/pom.xml
@@ -106,7 +106,7 @@
       <tomcat.servlet-api.version>8.5.78</tomcat.servlet-api.version>
       <jgroups.version>5.2.0.Final</jgroups.version>
       <errorprone.version>2.10.0</errorprone.version>
-      <maven.bundle.plugin.version>5.1.6</maven.bundle.plugin.version>
+      <maven.bundle.plugin.version>5.1.8</maven.bundle.plugin.version>
       <maven.checkstyle.plugin.version>3.1.2</maven.checkstyle.plugin.version>
       <sevntu.checks.version>1.39.0</sevntu.checks.version>
       <checkstyle.version>9.2.1</checkstyle.version>