You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ro...@apache.org on 2022/08/31 15:00:33 UTC

[qpid-jms] branch 1.x updated (20c27842 -> 86d8766c)

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

robbie pushed a change to branch 1.x
in repository https://gitbox.apache.org/repos/asf/qpid-jms.git


    from 20c27842 QPIDJMS-576: actually, you know, update to apache parent pom 27
     new c03201e0 QPIDJMS-576: match checksum-plugin config up with changes in parent pom
     new 86d8766c QPIDJMS-578: update to maven-bundle-plugin 5.1.8

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:
 apache-qpid-jms/pom.xml | 20 +++++++++-----------
 pom.xml                 |  2 +-
 qpid-jms-client/pom.xml | 24 +++++++++++++++++++++++-
 3 files changed, 33 insertions(+), 13 deletions(-)


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org


[qpid-jms] 02/02: QPIDJMS-578: update to maven-bundle-plugin 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 1.x
in repository https://gitbox.apache.org/repos/asf/qpid-jms.git

commit 86d8766cea3ad6e71e45c85148ce8091d2166e34
Author: Robbie Gemmell <ro...@apache.org>
AuthorDate: Wed Aug 31 15:42:06 2022 +0100

    QPIDJMS-578: update to maven-bundle-plugin 5.1.8
    
    (cherry picked from commit 15a44a12c1810e584857078edeaee210a6e0727b)
---
 pom.xml                 |  2 +-
 qpid-jms-client/pom.xml | 24 +++++++++++++++++++++++-
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 9562318a..e69e327e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -59,7 +59,7 @@
     <maven-javacc-plugin-version>2.6</maven-javacc-plugin-version>
     <maven-eclipse-plugin-version>2.10</maven-eclipse-plugin-version>
     <maven-idea-plugin-version>2.5</maven-idea-plugin-version>
-    <maven-bundle-plugin-version>5.1.2</maven-bundle-plugin-version>
+    <maven-bundle-plugin-version>5.1.8</maven-bundle-plugin-version>
     <findbugs-maven-plugin-version>3.0.2</findbugs-maven-plugin-version>
     <jacoco-plugin-version>0.8.6</jacoco-plugin-version>
 
diff --git a/qpid-jms-client/pom.xml b/qpid-jms-client/pom.xml
index b4baecd0..093be12c 100644
--- a/qpid-jms-client/pom.xml
+++ b/qpid-jms-client/pom.xml
@@ -24,7 +24,7 @@
   </parent>
 
   <artifactId>qpid-jms-client</artifactId>
-  <packaging>bundle</packaging>
+  <packaging>jar</packaging>
   <name>QpidJMS Client</name>
   <description>The core JMS Client implementation</description>
 
@@ -179,6 +179,28 @@
             <Dynamic-ImportPackage>*</Dynamic-ImportPackage>
           </instructions>
         </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>
       <plugin>
         <groupId>org.jacoco</groupId>


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org


[qpid-jms] 01/02: QPIDJMS-576: match checksum-plugin config up with changes in parent pom

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

robbie pushed a commit to branch 1.x
in repository https://gitbox.apache.org/repos/asf/qpid-jms.git

commit c03201e0b6ab72bc535094bf3f5146181329d16c
Author: Robbie Gemmell <ro...@apache.org>
AuthorDate: Wed Aug 31 14:31:28 2022 +0100

    QPIDJMS-576: match checksum-plugin config up with changes in parent pom
    
    (cherry picked from commit f6b0ba1d75305e8dbb312e608a7a089ed5ccc2b0)
---
 apache-qpid-jms/pom.xml | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/apache-qpid-jms/pom.xml b/apache-qpid-jms/pom.xml
index 03fc2ab3..fec256eb 100644
--- a/apache-qpid-jms/pom.xml
+++ b/apache-qpid-jms/pom.xml
@@ -94,19 +94,17 @@
               <execution>
                 <id>source-release-checksum</id>
                 <goals>
-                  <goal>files</goal>
+                  <goal>artifacts</goal>
                 </goals>
+                <phase>post-integration-test</phase>
                 <configuration>
-                  <fileSets>
-                    <fileSet>
-                      <directory>${project.build.directory}</directory>
-                      <includes>
-                        <include>apache-qpid-jms-${project.version}-src.tar.gz</include>
-                        <include>apache-qpid-jms-${project.version}-bin.tar.gz</include>
-                      </includes>
-                    </fileSet>
-                  </fileSets>
-                  <failIfNoFiles>true</failIfNoFiles>
+                  <algorithms>
+                    <algorithm>SHA-512</algorithm>
+                  </algorithms>
+                  <includeClassifiers>src,bin</includeClassifiers>
+                  <excludeMainArtifact>true</excludeMainArtifact>
+                  <csvSummary>false</csvSummary>
+                  <attachChecksums>true</attachChecksums>
                 </configuration>
               </execution>
             </executions>


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org