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:15 UTC
[qpid-broker-j] 02/03: NO-JIRA: alternative approach to only using
the repo for bdb dep where really needed, to speed up build
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