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 2020/08/22 23:50:41 UTC
[qpid-broker-j] 04/05: QPID-8368: [Broker-J] Add graylog module to
the project module list and include it as a dependecy of qpid-broker
This is an automated email from the ASF dual-hosted git repository.
orudyy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git
commit 7efcddd11e7a14a5f916d3951eaf25ae4f1d7757
Author: Alex Rudyy <or...@apache.org>
AuthorDate: Sat Aug 22 23:41:14 2020 +0100
QPID-8368: [Broker-J] Add graylog module to the project module list and include it as a dependecy of qpid-broker
---
broker-plugins/graylog-logging-logback/pom.xml | 7 ++-----
broker/pom.xml | 25 ++++++----------------
pom.xml | 29 ++++++++------------------
3 files changed, 17 insertions(+), 44 deletions(-)
diff --git a/broker-plugins/graylog-logging-logback/pom.xml b/broker-plugins/graylog-logging-logback/pom.xml
index 7371dfa..dcc452d 100644
--- a/broker-plugins/graylog-logging-logback/pom.xml
+++ b/broker-plugins/graylog-logging-logback/pom.xml
@@ -31,10 +31,6 @@
<name>Apache Qpid Broker-J LogBack GrayLog Logging Plug-in</name>
<description>LogBack GrayLog Logging broker plug-in</description>
- <properties>
- <logback-gelf-version>3.0.0</logback-gelf-version>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.apache.qpid</groupId>
@@ -56,7 +52,8 @@
<dependency>
<groupId>de.siegmar</groupId>
<artifactId>logback-gelf</artifactId>
- <version>${logback-gelf-version}</version>
+ <scope>provided</scope>
+ <optional>true</optional>
</dependency>
<dependency>
diff --git a/broker/pom.xml b/broker/pom.xml
index 4f2ae15..0d06449 100644
--- a/broker/pom.xml
+++ b/broker/pom.xml
@@ -28,25 +28,6 @@
<name>Apache Qpid Broker-J</name>
<description>Broker configuration and executable</description>
- <profiles>
- <profile>
- <id>graylog</id>
- <activation>
- <property>
- <name>graylog</name>
- </property>
- </activation>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.qpid</groupId>
- <artifactId>qpid-broker-plugins-graylog-logging-logback</artifactId>
- <scope>runtime</scope>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
-
<dependencies>
<dependency>
<groupId>org.apache.qpid</groupId>
@@ -176,6 +157,12 @@
<scope>runtime</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.qpid</groupId>
+ <artifactId>qpid-broker-plugins-graylog-logging-logback</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+
<!-- test dependencies -->
<dependency>
<groupId>org.apache.qpid</groupId>
diff --git a/pom.xml b/pom.xml
index 2362bb0..522a7a2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -156,6 +156,7 @@
<kerby-version>2.0.0</kerby-version>
<bcprov-version>1.64</bcprov-version>
<bcpkix-version>1.64</bcpkix-version>
+ <logback-gelf-version>3.0.0</logback-gelf-version>
</properties>
<modules>
@@ -174,6 +175,7 @@
<module>broker-plugins/jdbc-provider-bone</module>
<module>broker-plugins/jdbc-store</module>
<module>broker-plugins/jdbc-logging-logback</module>
+ <module>broker-plugins/graylog-logging-logback</module>
<module>broker-plugins/logging-logback</module>
<module>broker-plugins/management-amqp</module>
<module>broker-plugins/management-http</module>
@@ -825,6 +827,13 @@
<artifactId>bcpkix-jdk15on</artifactId>
<version>${bcpkix-version}</version>
</dependency>
+
+ <dependency>
+ <groupId>de.siegmar</groupId>
+ <artifactId>logback-gelf</artifactId>
+ <version>${logback-gelf-version}</version>
+ </dependency>
+
</dependencies>
</dependencyManagement>
@@ -1631,26 +1640,6 @@
</build>
</profile>
- <profile>
- <id>graylog</id>
- <activation>
- <property>
- <name>graylog</name>
- </property>
- </activation>
-
- <modules>
- <module>broker-plugins/graylog-logging-logback</module>
- </modules>
- <properties>
- <graylog/>
- <profile>java-mms.1-0</profile>
- <profile.broker.version>1.0</profile.broker.version>
- <profile.virtualhostnode.type>Memory</profile.virtualhostnode.type>
- <profile.virtualhostnode.context.blueprint>{"type":"ProvidedStore","globalAddressDomains":"${dollar.sign}{qpid.globalAddressDomains}"}</profile.virtualhostnode.context.blueprint>
- <profile.qpid.tests.mms.messagestore.persistence>true</profile.qpid.tests.mms.messagestore.persistence>
- </properties>
- </profile>
</profiles>
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org