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 2019/09/09 10:11:39 UTC
[qpid-broker-j] branch master updated (a33aca4 -> b14b35d)
This is an automated email from the ASF dual-hosted git repository.
orudyy pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git.
from a33aca4 QPID-8360: [Broker-J]Add broker and virtual host loggers storing log records in database
new 55d664a QPID-8360: [Broker-J] Update licenseMerge for 'Eclipse Public License' to accept license specified as 'MPL 2.0 or EPL 1.0'
new 7ffbe98 QPID-8360: [Broker-J] Update depenecies reference file
new b14b35d QPID-8360: [Broker-J] Clean-up code
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:
.../assembly/dependency-verification/DEPENDENCIES_REFERENCE | 2 ++
.../qpid/server/logging/logback/jdbc/JDBCBrokerLogger.java | 9 ++++-----
.../qpid/server/logging/logback/jdbc/JDBCBrokerLoggerImpl.java | 1 -
.../qpid/server/logging/logback/jdbc/JDBCLoggerHelper.java | 2 +-
.../logging/logback/jdbc/JDBCSettingsDBNameResolver.java | 2 +-
.../logback/jdbc/JDBCSettingsDrivenConnectionSource.java | 5 +++--
.../server/logging/logback/jdbc/JDBCVirtualHostLogger.java | 10 ++++------
.../server/logging/logback/jdbc/JDBCVirtualHostLoggerImpl.java | 1 -
.../server/logging/logback/jdbc/InMemoryDatabaseTestBase.java | 3 +--
.../server/logging/logback/jdbc/JDBCBrokerLoggerImplTest.java | 1 -
.../qpid/server/logging/logback/jdbc/JDBCLoggerHelperTest.java | 2 +-
.../logback/jdbc/JDBCSettingsDrivenConnectionSourceTest.java | 2 +-
.../logging/logback/jdbc/JDBCVirtualHostLoggerImplTest.java | 1 -
pom.xml | 2 +-
14 files changed, 19 insertions(+), 24 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: QPID-8360: [Broker-J] Update depenecies
reference file
Posted by or...@apache.org.
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 7ffbe9859e46a6ae8bbe39d1684f0f21e1954628
Author: Alex Rudyy <or...@apache.org>
AuthorDate: Mon Sep 9 11:09:00 2019 +0100
QPID-8360: [Broker-J] Update depenecies reference file
---
.../src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE | 2 ++
1 file changed, 2 insertions(+)
diff --git a/apache-qpid-broker-j/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE b/apache-qpid-broker-j/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE
index db8aafd..5a88210 100644
--- a/apache-qpid-broker-j/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE
+++ b/apache-qpid-broker-j/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE
@@ -97,6 +97,8 @@ From: 'The Apache Software Foundation' (https://www.apache.org/)
License: Apache License, Version 2.0 (https://www.apache.org/licenses/LICENSE-2.0.txt)
- Apache Qpid Broker-J Derby Message Store Plug-in (http://qpid.apache.org/components/broker-plugins/qpid-broker-plugins-derby-store) org.apache.qpid:qpid-broker-plugins-derby-store:jar
License: Apache License, Version 2.0 (https://www.apache.org/licenses/LICENSE-2.0.txt)
+ - Apache Qpid Broker-J LogBack JDBC Logging Plug-in (http://qpid.apache.org/components/broker-plugins/qpid-broker-plugins-jdbc-logging-logback) org.apache.qpid:qpid-broker-plugins-jdbc-logging-logback:jar
+ License: Apache License, Version 2.0 (https://www.apache.org/licenses/LICENSE-2.0.txt)
- Apache Qpid Broker-J JDBC Message Store Connection Pooling Plug-in (http://qpid.apache.org/components/broker-plugins/qpid-broker-plugins-jdbc-provider-bone) org.apache.qpid:qpid-broker-plugins-jdbc-provider-bone:jar
License: Apache License, Version 2.0 (https://www.apache.org/licenses/LICENSE-2.0.txt)
- Apache Qpid Broker-J JDBC Message Store Plug-in (http://qpid.apache.org/components/broker-plugins/qpid-broker-plugins-jdbc-store) org.apache.qpid:qpid-broker-plugins-jdbc-store:jar
---------------------------------------------------------------------
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-8360: [Broker-J] Clean-up code
Posted by or...@apache.org.
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 b14b35dcf409cf252dc75cf76a28ba712649b538
Author: Alex Rudyy <or...@apache.org>
AuthorDate: Mon Sep 9 11:09:33 2019 +0100
QPID-8360: [Broker-J] Clean-up code
---
.../qpid/server/logging/logback/jdbc/JDBCBrokerLogger.java | 9 ++++-----
.../qpid/server/logging/logback/jdbc/JDBCBrokerLoggerImpl.java | 1 -
.../qpid/server/logging/logback/jdbc/JDBCLoggerHelper.java | 2 +-
.../logging/logback/jdbc/JDBCSettingsDBNameResolver.java | 2 +-
.../logback/jdbc/JDBCSettingsDrivenConnectionSource.java | 5 +++--
.../server/logging/logback/jdbc/JDBCVirtualHostLogger.java | 10 ++++------
.../server/logging/logback/jdbc/JDBCVirtualHostLoggerImpl.java | 1 -
.../server/logging/logback/jdbc/InMemoryDatabaseTestBase.java | 3 +--
.../server/logging/logback/jdbc/JDBCBrokerLoggerImplTest.java | 1 -
.../qpid/server/logging/logback/jdbc/JDBCLoggerHelperTest.java | 2 +-
.../logback/jdbc/JDBCSettingsDrivenConnectionSourceTest.java | 2 +-
.../logging/logback/jdbc/JDBCVirtualHostLoggerImplTest.java | 1 -
12 files changed, 16 insertions(+), 23 deletions(-)
diff --git a/broker-plugins/jdbc-logging-logback/src/main/java/org/apache/qpid/server/logging/logback/jdbc/JDBCBrokerLogger.java b/broker-plugins/jdbc-logging-logback/src/main/java/org/apache/qpid/server/logging/logback/jdbc/JDBCBrokerLogger.java
index 244b103..b80913b 100644
--- a/broker-plugins/jdbc-logging-logback/src/main/java/org/apache/qpid/server/logging/logback/jdbc/JDBCBrokerLogger.java
+++ b/broker-plugins/jdbc-logging-logback/src/main/java/org/apache/qpid/server/logging/logback/jdbc/JDBCBrokerLogger.java
@@ -33,12 +33,12 @@ public interface JDBCBrokerLogger<X extends JDBCBrokerLogger<X>> extends BrokerL
String DEFAULT_BROKER_FAIL_ON_JDBC_LOGGER_ERROR = "false";
@Override
- @ManagedAttribute(mandatory=true)
+ @ManagedAttribute(mandatory = true)
String getConnectionUrl();
@Override
- @ManagedAttribute(defaultValue= DefaultConnectionProviderFactory.TYPE,
- validValues = {"org.apache.qpid.server.store.jdbc.DefaultConnectionProviderFactory#getAllAvailableConnectionProviderTypes()"} )
+ @ManagedAttribute(defaultValue = DefaultConnectionProviderFactory.TYPE,
+ validValues = {"org.apache.qpid.server.store.jdbc.DefaultConnectionProviderFactory#getAllAvailableConnectionProviderTypes()"})
String getConnectionPoolType();
@Override
@@ -46,11 +46,10 @@ public interface JDBCBrokerLogger<X extends JDBCBrokerLogger<X>> extends BrokerL
String getUsername();
@Override
- @ManagedAttribute(secure=true)
+ @ManagedAttribute(secure = true)
String getPassword();
@Override
@ManagedAttribute
String getTableNamePrefix();
-
}
diff --git a/broker-plugins/jdbc-logging-logback/src/main/java/org/apache/qpid/server/logging/logback/jdbc/JDBCBrokerLoggerImpl.java b/broker-plugins/jdbc-logging-logback/src/main/java/org/apache/qpid/server/logging/logback/jdbc/JDBCBrokerLoggerImpl.java
index c371184..3bf49b6 100644
--- a/broker-plugins/jdbc-logging-logback/src/main/java/org/apache/qpid/server/logging/logback/jdbc/JDBCBrokerLoggerImpl.java
+++ b/broker-plugins/jdbc-logging-logback/src/main/java/org/apache/qpid/server/logging/logback/jdbc/JDBCBrokerLoggerImpl.java
@@ -168,5 +168,4 @@ public class JDBCBrokerLoggerImpl extends AbstractBrokerLogger<JDBCBrokerLoggerI
{
_jdbcLoggerHelper.restartConnectionSourceIfExists(getAppender());
}
-
}
diff --git a/broker-plugins/jdbc-logging-logback/src/main/java/org/apache/qpid/server/logging/logback/jdbc/JDBCLoggerHelper.java b/broker-plugins/jdbc-logging-logback/src/main/java/org/apache/qpid/server/logging/logback/jdbc/JDBCLoggerHelper.java
index d6edd2b..1260210 100644
--- a/broker-plugins/jdbc-logging-logback/src/main/java/org/apache/qpid/server/logging/logback/jdbc/JDBCLoggerHelper.java
+++ b/broker-plugins/jdbc-logging-logback/src/main/java/org/apache/qpid/server/logging/logback/jdbc/JDBCLoggerHelper.java
@@ -33,9 +33,9 @@ import org.apache.qpid.server.store.jdbc.JDBCSettings;
class JDBCLoggerHelper
{
- private static final Logger LOGGER = LoggerFactory.getLogger(JDBCLoggerHelper.class);
final static ch.qos.logback.classic.Logger ROOT_LOGGER =
((ch.qos.logback.classic.Logger) LoggerFactory.getLogger(Logger.ROOT_LOGGER_NAME));
+ private static final Logger LOGGER = LoggerFactory.getLogger(JDBCLoggerHelper.class);
Appender<ILoggingEvent> createAppenderInstance(final Context context,
final ConfiguredObject<?> logger,
diff --git a/broker-plugins/jdbc-logging-logback/src/main/java/org/apache/qpid/server/logging/logback/jdbc/JDBCSettingsDBNameResolver.java b/broker-plugins/jdbc-logging-logback/src/main/java/org/apache/qpid/server/logging/logback/jdbc/JDBCSettingsDBNameResolver.java
index cc28635..2d071ba 100644
--- a/broker-plugins/jdbc-logging-logback/src/main/java/org/apache/qpid/server/logging/logback/jdbc/JDBCSettingsDBNameResolver.java
+++ b/broker-plugins/jdbc-logging-logback/src/main/java/org/apache/qpid/server/logging/logback/jdbc/JDBCSettingsDBNameResolver.java
@@ -35,7 +35,7 @@ class JDBCSettingsDBNameResolver implements DBNameResolver
@Override
public <N extends Enum<?>> String getTableName(final N tableName)
{
- String settingsTableNamePrefix = _settings.getTableNamePrefix() ;
+ final String settingsTableNamePrefix = _settings.getTableNamePrefix();
final String prefix = settingsTableNamePrefix == null ? "" : settingsTableNamePrefix;
final String name = prefix + tableName.toString();
return name.toLowerCase();
diff --git a/broker-plugins/jdbc-logging-logback/src/main/java/org/apache/qpid/server/logging/logback/jdbc/JDBCSettingsDrivenConnectionSource.java b/broker-plugins/jdbc-logging-logback/src/main/java/org/apache/qpid/server/logging/logback/jdbc/JDBCSettingsDrivenConnectionSource.java
index d2f76f6..5197421 100644
--- a/broker-plugins/jdbc-logging-logback/src/main/java/org/apache/qpid/server/logging/logback/jdbc/JDBCSettingsDrivenConnectionSource.java
+++ b/broker-plugins/jdbc-logging-logback/src/main/java/org/apache/qpid/server/logging/logback/jdbc/JDBCSettingsDrivenConnectionSource.java
@@ -65,7 +65,8 @@ public class JDBCSettingsDrivenConnectionSource extends ConnectionSourceBase
{
_connectionProvider.getAndUpdate(provider -> provider == null ? create() : provider);
discoverConnectionProperties();
- if (!supportsGetGeneratedKeys() && getSQLDialectCode() == SQLDialectCode.UNKNOWN_DIALECT) {
+ if (!supportsGetGeneratedKeys() && getSQLDialectCode() == SQLDialectCode.UNKNOWN_DIALECT)
+ {
addWarn("Connection does not support GetGeneratedKey method and could not discover the dialect.");
}
super.start();
@@ -76,7 +77,7 @@ public class JDBCSettingsDrivenConnectionSource extends ConnectionSourceBase
{
super.stop();
- final ConnectionProvider connectionProvider = _connectionProvider.getAndSet(null);
+ final ConnectionProvider connectionProvider = _connectionProvider.getAndSet(null);
if (connectionProvider != null)
{
try
diff --git a/broker-plugins/jdbc-logging-logback/src/main/java/org/apache/qpid/server/logging/logback/jdbc/JDBCVirtualHostLogger.java b/broker-plugins/jdbc-logging-logback/src/main/java/org/apache/qpid/server/logging/logback/jdbc/JDBCVirtualHostLogger.java
index 76c125b..bbac661 100644
--- a/broker-plugins/jdbc-logging-logback/src/main/java/org/apache/qpid/server/logging/logback/jdbc/JDBCVirtualHostLogger.java
+++ b/broker-plugins/jdbc-logging-logback/src/main/java/org/apache/qpid/server/logging/logback/jdbc/JDBCVirtualHostLogger.java
@@ -20,7 +20,6 @@
package org.apache.qpid.server.logging.logback.jdbc;
import org.apache.qpid.server.model.ManagedAttribute;
-import org.apache.qpid.server.model.ManagedContextDefault;
import org.apache.qpid.server.model.VirtualHostLogger;
import org.apache.qpid.server.store.jdbc.DefaultConnectionProviderFactory;
import org.apache.qpid.server.store.jdbc.JDBCSettings;
@@ -28,12 +27,12 @@ import org.apache.qpid.server.store.jdbc.JDBCSettings;
public interface JDBCVirtualHostLogger<X extends JDBCVirtualHostLogger<X>> extends VirtualHostLogger<X>, JDBCSettings
{
@Override
- @ManagedAttribute(mandatory=true)
+ @ManagedAttribute(mandatory = true)
String getConnectionUrl();
@Override
- @ManagedAttribute(defaultValue= DefaultConnectionProviderFactory.TYPE,
- validValues = {"org.apache.qpid.server.store.jdbc.DefaultConnectionProviderFactory#getAllAvailableConnectionProviderTypes()"} )
+ @ManagedAttribute(defaultValue = DefaultConnectionProviderFactory.TYPE,
+ validValues = {"org.apache.qpid.server.store.jdbc.DefaultConnectionProviderFactory#getAllAvailableConnectionProviderTypes()"})
String getConnectionPoolType();
@Override
@@ -41,11 +40,10 @@ public interface JDBCVirtualHostLogger<X extends JDBCVirtualHostLogger<X>> exten
String getUsername();
@Override
- @ManagedAttribute(secure=true)
+ @ManagedAttribute(secure = true)
String getPassword();
@Override
@ManagedAttribute
String getTableNamePrefix();
-
}
diff --git a/broker-plugins/jdbc-logging-logback/src/main/java/org/apache/qpid/server/logging/logback/jdbc/JDBCVirtualHostLoggerImpl.java b/broker-plugins/jdbc-logging-logback/src/main/java/org/apache/qpid/server/logging/logback/jdbc/JDBCVirtualHostLoggerImpl.java
index 2a028f6..8eb0a27 100644
--- a/broker-plugins/jdbc-logging-logback/src/main/java/org/apache/qpid/server/logging/logback/jdbc/JDBCVirtualHostLoggerImpl.java
+++ b/broker-plugins/jdbc-logging-logback/src/main/java/org/apache/qpid/server/logging/logback/jdbc/JDBCVirtualHostLoggerImpl.java
@@ -22,7 +22,6 @@ package org.apache.qpid.server.logging.logback.jdbc;
import java.util.Map;
import java.util.Set;
-import ch.qos.logback.classic.db.DBAppender;
import ch.qos.logback.classic.spi.ILoggingEvent;
import ch.qos.logback.core.Appender;
import ch.qos.logback.core.Context;
diff --git a/broker-plugins/jdbc-logging-logback/src/test/java/org/apache/qpid/server/logging/logback/jdbc/InMemoryDatabaseTestBase.java b/broker-plugins/jdbc-logging-logback/src/test/java/org/apache/qpid/server/logging/logback/jdbc/InMemoryDatabaseTestBase.java
index 8af8e83..6f02786 100644
--- a/broker-plugins/jdbc-logging-logback/src/test/java/org/apache/qpid/server/logging/logback/jdbc/InMemoryDatabaseTestBase.java
+++ b/broker-plugins/jdbc-logging-logback/src/test/java/org/apache/qpid/server/logging/logback/jdbc/InMemoryDatabaseTestBase.java
@@ -34,7 +34,7 @@ public class InMemoryDatabaseTestBase extends UnitTestBase
private Connection _setupConnection;
@Before
- public void startUpDatabase() throws SQLException
+ public void startUpDatabase() throws SQLException
{
_setupConnection = DriverManager.getConnection(getTestDatabaseUrl());
}
@@ -61,5 +61,4 @@ public class InMemoryDatabaseTestBase extends UnitTestBase
{
return _setupConnection;
}
-
}
diff --git a/broker-plugins/jdbc-logging-logback/src/test/java/org/apache/qpid/server/logging/logback/jdbc/JDBCBrokerLoggerImplTest.java b/broker-plugins/jdbc-logging-logback/src/test/java/org/apache/qpid/server/logging/logback/jdbc/JDBCBrokerLoggerImplTest.java
index 48740ec..9cb8bc9 100644
--- a/broker-plugins/jdbc-logging-logback/src/test/java/org/apache/qpid/server/logging/logback/jdbc/JDBCBrokerLoggerImplTest.java
+++ b/broker-plugins/jdbc-logging-logback/src/test/java/org/apache/qpid/server/logging/logback/jdbc/JDBCBrokerLoggerImplTest.java
@@ -146,5 +146,4 @@ public class JDBCBrokerLoggerImplTest extends InMemoryDatabaseTestBase
assertEquals(TABLE_PREFIX, _logger.getTableNamePrefix());
}
-
}
diff --git a/broker-plugins/jdbc-logging-logback/src/test/java/org/apache/qpid/server/logging/logback/jdbc/JDBCLoggerHelperTest.java b/broker-plugins/jdbc-logging-logback/src/test/java/org/apache/qpid/server/logging/logback/jdbc/JDBCLoggerHelperTest.java
index 0e03e47..bb5a335 100644
--- a/broker-plugins/jdbc-logging-logback/src/test/java/org/apache/qpid/server/logging/logback/jdbc/JDBCLoggerHelperTest.java
+++ b/broker-plugins/jdbc-logging-logback/src/test/java/org/apache/qpid/server/logging/logback/jdbc/JDBCLoggerHelperTest.java
@@ -66,7 +66,7 @@ public class JDBCLoggerHelperTest extends InMemoryDatabaseTestBase
assertTrue(appender instanceof DBAppender);
assertTrue(appender.isStarted());
assertEquals(context, appender.getContext());
- assertTrue(((DBAppender)appender).getConnectionSource() instanceof JDBCSettingsDrivenConnectionSource);
+ assertTrue(((DBAppender) appender).getConnectionSource() instanceof JDBCSettingsDrivenConnectionSource);
}
@Test
diff --git a/broker-plugins/jdbc-logging-logback/src/test/java/org/apache/qpid/server/logging/logback/jdbc/JDBCSettingsDrivenConnectionSourceTest.java b/broker-plugins/jdbc-logging-logback/src/test/java/org/apache/qpid/server/logging/logback/jdbc/JDBCSettingsDrivenConnectionSourceTest.java
index 0120452..93f212c 100644
--- a/broker-plugins/jdbc-logging-logback/src/test/java/org/apache/qpid/server/logging/logback/jdbc/JDBCSettingsDrivenConnectionSourceTest.java
+++ b/broker-plugins/jdbc-logging-logback/src/test/java/org/apache/qpid/server/logging/logback/jdbc/JDBCSettingsDrivenConnectionSourceTest.java
@@ -43,7 +43,7 @@ public class JDBCSettingsDrivenConnectionSourceTest extends InMemoryDatabaseTest
public void setUp()
{
final JDBCSettings jdbcSettings = mock(JDBCSettings.class);
- when(jdbcSettings.getConnectionUrl()).thenReturn( getTestDatabaseUrl());
+ when(jdbcSettings.getConnectionUrl()).thenReturn(getTestDatabaseUrl());
final ConfiguredObject<?> object = mock(ConfiguredObject.class);
_connectionSource = new JDBCSettingsDrivenConnectionSource(object, jdbcSettings);
diff --git a/broker-plugins/jdbc-logging-logback/src/test/java/org/apache/qpid/server/logging/logback/jdbc/JDBCVirtualHostLoggerImplTest.java b/broker-plugins/jdbc-logging-logback/src/test/java/org/apache/qpid/server/logging/logback/jdbc/JDBCVirtualHostLoggerImplTest.java
index ce3b00c..99a8df1 100644
--- a/broker-plugins/jdbc-logging-logback/src/test/java/org/apache/qpid/server/logging/logback/jdbc/JDBCVirtualHostLoggerImplTest.java
+++ b/broker-plugins/jdbc-logging-logback/src/test/java/org/apache/qpid/server/logging/logback/jdbc/JDBCVirtualHostLoggerImplTest.java
@@ -134,5 +134,4 @@ public class JDBCVirtualHostLoggerImplTest extends InMemoryDatabaseTestBase
assertEquals(TABLE_PREFIX, _logger.getTableNamePrefix());
}
-
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[qpid-broker-j] 01/03: QPID-8360: [Broker-J] Update licenseMerge
for 'Eclipse Public License' to accept license specified as 'MPL 2.0 or EPL
1.0'
Posted by or...@apache.org.
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 55d664a768580911ce2d6efc546de7726f3b6c3e
Author: Alex Rudyy <or...@apache.org>
AuthorDate: Mon Sep 9 11:08:20 2019 +0100
QPID-8360: [Broker-J] Update licenseMerge for 'Eclipse Public License' to accept license specified as 'MPL 2.0 or EPL 1.0'
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 1a851ab..6b8fcda 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1432,7 +1432,7 @@
<licenseMerge>Apache Software License, Version 2.0|The Apache Software License, Version 2.0|Apache Software License - Version 2.0|Apache v2|Apache 2|Apache License, Version 2.0|Apache 2.0|Apache Public License 2.0</licenseMerge>
<licenseMerge>The MIT License|MIT License|MIT license</licenseMerge>
<licenseMerge>BSD License|New BSD|New BSD License|BSD 3-Clause|BSD Licence 3</licenseMerge>
- <licenseMerge>Eclipse Public License - Version 1.0|Eclipse Public License - v 1.0|Eclipse Public License, Version 1.0|Eclipse Public License 1.0</licenseMerge>
+ <licenseMerge>Eclipse Public License - Version 1.0|Eclipse Public License - v 1.0|Eclipse Public License, Version 1.0|Eclipse Public License 1.0|MPL 2.0 or EPL 1.0</licenseMerge>
<licenseMerge>Academic Free License v2.1|AFL-2.1</licenseMerge>
<licenseMerge>COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0|CDDL + GPLv2 with classpath exception</licenseMerge>
</licenseMerges>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org