You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by or...@apache.org on 2021/06/15 10:57:13 UTC

[qpid-broker-j] branch 8.0.x updated (32df27b -> c95ece3)

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

orudyy pushed a change to branch 8.0.x
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git.


    from 32df27b  QPID-8523:[Broker-J] Set initial-delivery-count in a response attach only when role is a sender
     new 6b7ff4c  NO-JIRA: move repo definition for bdb dep into bdbstore module where needed, speed up build
     new 5f1b8d9  NO-JIRA: alternative approach to only using the repo for bdb dep where really needed, to speed up build
     new c95ece3  QPID-8539:[Broker-J] Upgrade jackson dependecies

The 3 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-broker-j/pom.xml |  1 +
 bdbstore/pom.xml             |  4 ++++
 pom.xml                      | 10 ++++++----
 3 files changed, 11 insertions(+), 4 deletions(-)

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


[qpid-broker-j] 02/03: NO-JIRA: alternative approach to only using the repo for bdb dep where really needed, to speed up build

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

orudyy pushed a commit to branch 8.0.x
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git

commit 5f1b8d94d64f851f23b3b49a3fef41cabeca968f
Author: Robbie Gemmell <ro...@apache.org>
AuthorDate: Mon Jun 14 12:15:51 2021 +0100

    NO-JIRA: alternative approach to only using the repo for bdb dep where really needed, to speed up build
    
    Although core build worked fine with prev version, it seemed to cause issue with CI 'checks' job failing.
---
 apache-qpid-broker-j/pom.xml |  1 +
 bdbstore/pom.xml             | 19 ++++---------------
 pom.xml                      | 17 +++++++++++++++++
 3 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/apache-qpid-broker-j/pom.xml b/apache-qpid-broker-j/pom.xml
index a2347fc..7a56d47 100644
--- a/apache-qpid-broker-j/pom.xml
+++ b/apache-qpid-broker-j/pom.xml
@@ -28,6 +28,7 @@
 
   <properties>
     <dependency-change-verification>true</dependency-change-verification>
+    <bdb-repo-enabled>true</bdb-repo-enabled>
   </properties>
 
   <dependencies>
diff --git a/bdbstore/pom.xml b/bdbstore/pom.xml
index e761c1d..6e71a0d 100644
--- a/bdbstore/pom.xml
+++ b/bdbstore/pom.xml
@@ -28,6 +28,10 @@
   <name>Apache Qpid Broker-J BDB Message Store Plug-in</name>
   <description>BDB message store implementation using Oracle Berkeley DB Java Edition</description>
 
+  <properties>
+    <bdb-repo-enabled>true</bdb-repo-enabled>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.qpid</groupId>
@@ -78,21 +82,6 @@
     </dependency>
   </dependencies>
 
-  <repositories>
-    <!-- For the BDB JE dependency -->
-    <repository>
-      <id>oracle.releases</id>
-      <url>https://download.oracle.com/maven</url>
-      <layout>default</layout>
-      <releases>
-        <enabled>true</enabled>
-      </releases>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-    </repository>
-  </repositories>
-
   <build>
     <resources>
       <resource>
diff --git a/pom.xml b/pom.xml
index e9e8435..b9b5a01 100644
--- a/pom.xml
+++ b/pom.xml
@@ -157,6 +157,8 @@
     <bcprov-version>1.68</bcprov-version>
     <bcpkix-version>1.68</bcpkix-version>
     <prometheus-client-version>0.9.0</prometheus-client-version>
+
+    <bdb-repo-enabled>false</bdb-repo-enabled>
   </properties>
 
   <modules>
@@ -1104,6 +1106,21 @@
     </plugins>
   </build>
 
+  <repositories>
+    <!-- For the BDB JE dependency -->
+    <repository>
+      <id>oracle.releases</id>
+      <url>https://download.oracle.com/maven</url>
+      <layout>default</layout>
+      <releases>
+        <enabled>${bdb-repo-enabled}</enabled>
+      </releases>
+      <snapshots>
+        <enabled>false</enabled>
+      </snapshots>
+    </repository>
+  </repositories>
+
   <reporting>
     <plugins>
       <plugin>

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


[qpid-broker-j] 03/03: QPID-8539:[Broker-J] Upgrade jackson dependecies

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

orudyy pushed a commit to branch 8.0.x
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git

commit c95ece3309876f76c933027010b40b9dc4d906be
Author: Dedeepya T <de...@yahoo.co.in>
AuthorDate: Tue Jun 15 15:14:30 2021 +0530

    QPID-8539:[Broker-J] Upgrade jackson dependecies
    
    This closes #94
---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index b9b5a01..552678e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -105,8 +105,8 @@
     <derby-version>10.14.2.0</derby-version>
     <logback-version>1.2.3</logback-version>
     <guava-version>30.0-jre</guava-version>
-    <fasterxml-jackson-version>2.12.1</fasterxml-jackson-version>
-    <fasterxml-jackson-databind-version>2.12.1</fasterxml-jackson-databind-version>
+    <fasterxml-jackson-version>2.12.3</fasterxml-jackson-version>
+    <fasterxml-jackson-databind-version>2.12.3</fasterxml-jackson-databind-version>
     <slf4j-version>1.7.30</slf4j-version>
     <jetty-version>9.4.35.v20201120</jetty-version>
 

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


[qpid-broker-j] 01/03: NO-JIRA: move repo definition for bdb dep into bdbstore module where needed, speed up build

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

orudyy pushed a commit to branch 8.0.x
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git

commit 6b7ff4c3b5116098a7b7fa3b594b198ca40d0ed3
Author: Robbie Gemmell <ro...@apache.org>
AuthorDate: Wed Jun 9 14:35:54 2021 +0100

    NO-JIRA: move repo definition for bdb dep into bdbstore module where needed, speed up build
    
    The repo is slow, and due to being in the root pom it is tried first for many
    files that will never be found in the repo. Only the bdbstore module needs it,
    for 2 files, but it is tried for >400 files that will never be found there.
    
    Reduces build time on clean install from ~7.5min to ~2min
---
 bdbstore/pom.xml | 15 +++++++++++++++
 pom.xml          | 15 ---------------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/bdbstore/pom.xml b/bdbstore/pom.xml
index d0921ba..e761c1d 100644
--- a/bdbstore/pom.xml
+++ b/bdbstore/pom.xml
@@ -78,6 +78,21 @@
     </dependency>
   </dependencies>
 
+  <repositories>
+    <!-- For the BDB JE dependency -->
+    <repository>
+      <id>oracle.releases</id>
+      <url>https://download.oracle.com/maven</url>
+      <layout>default</layout>
+      <releases>
+        <enabled>true</enabled>
+      </releases>
+      <snapshots>
+        <enabled>false</enabled>
+      </snapshots>
+    </repository>
+  </repositories>
+
   <build>
     <resources>
       <resource>
diff --git a/pom.xml b/pom.xml
index 3f94166..e9e8435 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1104,21 +1104,6 @@
     </plugins>
   </build>
 
-  <repositories>
-    <!-- For the BDB JE dependency of the optional bdbstore plugin modules-->
-    <repository>
-      <id>oracle.releases</id>
-      <url>https://download.oracle.com/maven</url>
-      <layout>default</layout>
-      <releases>
-        <enabled>true</enabled>
-      </releases>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-    </repository>
-  </repositories>
-
   <reporting>
     <plugins>
       <plugin>

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