[qpid-java] 09/09: Adapt to the new release

Christopher Stuart Hoskin mans0954 at moszumanska.debian.org
Thu Dec 21 23:23:46 UTC 2017


This is an automated email from the git hooks/post-receive script.

mans0954 pushed a commit to branch master
in repository qpid-java.

commit 831414de10b0100c73a204cca09b675851a4e836
Author: Christopher Hoskin <christopher.hoskin at gmail.com>
Date:   Thu Dec 21 23:21:59 2017 +0000

    Adapt to the new release
---
 debian/changelog                                   |  4 +--
 ...{libqpid-java.poms => libqpid-broker-java.poms} | 24 +++++++------
 debian/maven.ignoreRules                           | 14 ++++++++
 debian/maven.rules                                 | 42 ++++++++++++++++++++++
 debian/patches/series                              |  2 +-
 5 files changed, 72 insertions(+), 14 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7a8c0c2..9244a0d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,5 @@
-qpid-broker-j (6.1.4-1) UNRELEASED; urgency=medium
+qpid-broker-j (7.0.0-1) UNRELEASED; urgency=medium
 
   * Initial release (Closes: #840131)
 
- -- Christopher Hoskin <mans0954 at debian.org>  Fri, 29 Sep 2017 23:52:42 +0100
+ -- Christopher Hoskin <mans0954 at debian.org>  Tue, 21 Nov 2017 23:30:50 +0000
diff --git a/debian/libqpid-java.poms b/debian/libqpid-broker-java.poms
similarity index 81%
rename from debian/libqpid-java.poms
rename to debian/libqpid-broker-java.poms
index 43245a9..1d80fe7 100644
--- a/debian/libqpid-java.poms
+++ b/debian/libqpid-broker-java.poms
@@ -25,10 +25,11 @@
 #   --site-xml=<location>: Optional, the location for site.xml if it needs to be installed.
 #     Empty by default. [mh_install]
 #
-pom.xml --no-parent --has-package-version
+pom.xml --has-package-version
 broker-codegen/pom.xml --has-package-version
 broker-core/pom.xml --has-package-version
 broker/pom.xml --has-package-version
+apache-qpid-broker-j/pom.xml --has-package-version
 broker-plugins/access-control/pom.xml --has-package-version
 broker-plugins/amqp-0-8-protocol/pom.xml --has-package-version
 broker-plugins/amqp-0-10-protocol/pom.xml --has-package-version
@@ -37,29 +38,30 @@ broker-plugins/amqp-msg-conv-0-8-to-0-10/pom.xml --has-package-version
 broker-plugins/amqp-msg-conv-0-8-to-1-0/pom.xml --has-package-version
 broker-plugins/amqp-msg-conv-0-10-to-1-0/pom.xml --has-package-version
 broker-plugins/derby-store/pom.xml --has-package-version
-broker-plugins/jdbc-provider-bone/pom.xml --ignore
+broker-plugins/jdbc-provider-bone/pom.xml --has-package-version
 broker-plugins/jdbc-store/pom.xml --has-package-version
+broker-plugins/logging-logback/pom.xml --has-package-version
 broker-plugins/management-amqp/pom.xml --has-package-version
 broker-plugins/management-http/pom.xml --has-package-version
 broker-plugins/memory-store/pom.xml --has-package-version
 broker-plugins/websocket/pom.xml --has-package-version
-common/pom.xml --has-package-version
-client/pom.xml --has-package-version
-client/example/pom.xml --has-package-version
-jca/pom.xml --has-package-version
-jca/rar/pom.xml --has-package-version
+broker-plugins/amqp-1-0-bdb-store/pom.xml --has-package-version
+broker-plugins/amqp-1-0-jdbc-store/pom.xml --has-package-version
 tools/pom.xml --has-package-version
 qpid-systests-parent/pom.xml --has-package-version
 qpid-test-utils/pom.xml --has-package-version
 systests/pom.xml --has-package-version
+systests/systests-utils/pom.xml --has-package-version
+systests/qpid-systests-jms_2.0/pom.xml --has-package-version
+systests/protocol-tests-amqp-1-0/pom.xml --has-package-version
+systests/end-to-end-conversion-tests/pom.xml --has-package-version
 perftests/pom.xml --has-package-version
 qpid-perftests-systests/pom.xml --has-package-version
 perftests/visualisation-jfc/pom.xml --has-package-version
-bdbstore/pom.xml --ignore
+bdbstore/pom.xml --has-package-version
 bdbstore/systests/pom.xml --has-package-version
-joramtests/pom.xml --ignore
+joramtests/pom.xml --has-package-version
+tck/pom.xml --has-package-version
 doc/pom.xml --has-package-version
 doc/java-broker/pom.xml --has-package-version
-doc/jms-client-0-8/pom.xml --has-package-version
-doc/jms-client-0-10/pom.xml --has-package-version
 doc/java-perftests/pom.xml --has-package-version
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
index a690bd2..ebf946e 100644
--- a/debian/maven.ignoreRules
+++ b/debian/maven.ignoreRules
@@ -1,8 +1,11 @@
 
 com.jolbox bonecp * * * *
 com.sleepycat je * * * *
+#junit junit * * * *
 org.apache.geronimo.framework geronimo-kernel * * * *
 org.apache.geronimo.specs geronimo-ejb_3.0_spec * * * *
+org.apache.geronimo.specs geronimo-jms_1.1_spec * * * *
+org.apache.geronimo.specs geronimo-jms_2.0_spec * * * *
 org.apache.geronimo.specs geronimo-servlet_3.0_spec * * * *
 org.apache.maven.plugins maven-assembly-plugin * * * *
 org.apache.maven.plugins maven-deploy-plugin * * * *
@@ -12,14 +15,25 @@ org.apache.maven.plugins maven-javadoc-plugin * * * *
 org.apache.maven.plugins maven-jxr-plugin * * * *
 org.apache.maven.plugins maven-project-info-reports-plugin * * * *
 org.apache.maven.plugins maven-rar-plugin * * * *
+org.apache.maven.plugins maven-release-plugin * * * *
+org.apache.maven.plugins maven-surefire-plugin * * * *
 org.apache.maven.plugins maven-surefire-report-plugin * * * *
 org.apache.qpid qpid-bdbstore-jmx * * * *
 org.apache.qpid qpid-bdbstore * * * *
+org.apache.qpid qpid-broker-core * * * *
+org.apache.qpid qpid-broker-plugins-amqp-1-0-protocol * * * *
 org.apache.qpid qpid-broker-plugins-jdbc-provider-bone * * * *
+org.apache.qpid qpid-client * * * *
 org.apache.rat apache-rat-plugin * * * *
 org.codehaus.mojo buildnumber-maven-plugin * * * *
 org.codehaus.mojo findbugs-maven-plugin * * * *
 org.codehaus.mojo license-maven-plugin * * * *
 org.dojotoolkit dojo * * * *
+org.eclipse.jetty jetty-server * * * *
+org.eclipse.jetty jetty-servlet * * * *
+org.fusesource.joram-jms-tests joram-jms-tests * * * *
 org.jacoco jacoco-maven-plugin * * * *
+org.mockito mockito-all * * * *
 org.python jython-standalone * * * *
+org.webjars.bower dgrid * * * *
+org.webjars.bower dstore * * * *
diff --git a/debian/maven.rules b/debian/maven.rules
index 2c1297a..59ccb3d 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -8,8 +8,50 @@ com.google.guava guava bundle s/.*/debian/ * *
 com.google.guava guava s/jar/bundle/ s/.*/debian/ * *
 junit junit jar s/4\..*/4.x/ * *
 net.sourceforge.csvjdbc csvjdbc jar s/.*/debian/ * *
+org.apache.qpid apache-qpid-broker-j pom s/.*/debian/ * *
+org.apache.qpid joramtests jar s/.*/debian/ * *
+org.apache.qpid protocol-tests-amqp-1-0 jar s/.*/debian/ * *
+org.apache.qpid qpid-bdbstore-systests jar s/.*/debian/ * *
+org.apache.qpid qpid-bdbstore jar s/.*/debian/ * *
+org.apache.qpid qpid-broker-codegen jar s/.*/debian/ * *
+org.apache.qpid qpid-broker-core jar s/.*/debian/ * *
+org.apache.qpid qpid-broker-parent pom s/.*/debian/ * *
+org.apache.qpid qpid-broker-plugins-access-control jar s/.*/debian/ * *
+org.apache.qpid qpid-broker-plugins-amqp-0-10-protocol jar s/.*/debian/ * *
+org.apache.qpid qpid-broker-plugins-amqp-0-8-protocol jar s/.*/debian/ * *
+org.apache.qpid qpid-broker-plugins-amqp-1-0-protocol-bdb-link-store jar s/.*/debian/ * *
+org.apache.qpid qpid-broker-plugins-amqp-1-0-protocol-jdbc-link-store jar s/.*/debian/ * *
+org.apache.qpid qpid-broker-plugins-amqp-1-0-protocol jar s/.*/debian/ * *
+org.apache.qpid qpid-broker-plugins-amqp-msg-conv-0-10-to-1-0 jar s/.*/debian/ * *
+org.apache.qpid qpid-broker-plugins-amqp-msg-conv-0-8-to-0-10 jar s/.*/debian/ * *
+org.apache.qpid qpid-broker-plugins-amqp-msg-conv-0-8-to-1-0 jar s/.*/debian/ * *
+org.apache.qpid qpid-broker-plugins-derby-store jar s/.*/debian/ * *
+org.apache.qpid qpid-broker-plugins-jdbc-provider-bone jar s/.*/debian/ * *
+org.apache.qpid qpid-broker-plugins-jdbc-store jar s/.*/debian/ * *
+org.apache.qpid qpid-broker-plugins-logging-logback jar s/.*/debian/ * *
+org.apache.qpid qpid-broker-plugins-management-amqp jar s/.*/debian/ * *
+org.apache.qpid qpid-broker-plugins-management-http jar s/.*/debian/ * *
+org.apache.qpid qpid-broker-plugins-memory-store jar s/.*/debian/ * *
+org.apache.qpid qpid-broker-plugins-websocket jar s/.*/debian/ * *
+org.apache.qpid qpid-broker jar s/.*/debian/ * *
+org.apache.qpid qpid-java-doc-broker jar s/.*/debian/ * *
+org.apache.qpid qpid-java-doc-perftests jar s/.*/debian/ * *
+org.apache.qpid qpid-java-doc pom s/.*/debian/ * *
+org.apache.qpid qpid-perftests-systests jar s/.*/debian/ * *
+org.apache.qpid qpid-perftests-visualisation-jfc jar s/.*/debian/ * *
+org.apache.qpid qpid-perftests jar s/.*/debian/ * *
+org.apache.qpid qpid-systests-end-to-end-conversion-tests jar s/.*/debian/ * *
+org.apache.qpid qpid-systests-jms_2.0 jar s/.*/debian/ * *
+org.apache.qpid qpid-systests-parent pom s/.*/debian/ * *
+org.apache.qpid qpid-systests-utils jar s/.*/debian/ * *
+org.apache.qpid qpid-systests jar s/.*/debian/ * *
+org.apache.qpid qpid-tck jar s/.*/debian/ * *
+org.apache.qpid qpid-test-utils jar s/.*/debian/ * *
+org.apache.qpid qpid-tools jar s/.*/debian/ * *
 org.codehaus.mojo exec-maven-plugin jar s/.*/1.1.1/ * *
 com.fasterxml.jackson.core jackson-core * s/.*/2.x/ * *
 com.fasterxml.jackson.core jackson-databind * s/.*/2.x/ * *
+s/jfree/org.jfree/ jfreechart * s/.*/debian/ * *
 junit junit * s/.*/4.x/ * *
+org.apache.maven maven* * s/.*/3.x/ * *
 org.eclipse.jetty jetty-* * s/.*/9.x/ * *
diff --git a/debian/patches/series b/debian/patches/series
index 34ba3c0..01e5ff4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,2 @@
-pom.patch
+#pom.patch
 bcel.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/qpid-java.git



More information about the pkg-java-commits mailing list