[mina2] 02/05: Enabled the OSGi metadata
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Fri Dec 11 16:34:34 UTC 2015
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository mina2.
commit aa6bd330f3312851a00925e19b9f6b3922413b33
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Fri Dec 11 11:58:10 2015 +0100
Enabled the OSGi metadata
---
debian/changelog | 1 +
debian/control | 1 +
debian/maven.ignoreRules | 1 -
debian/patches/04-maven-jar-packaging.patch | 240 ----------------------------
debian/patches/series | 1 -
5 files changed, 2 insertions(+), 242 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 7d2588d..b6af2f5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
mina2 (2.0.9-2) UNRELEASED; urgency=medium
+ * Enabled the OSGi metadata
* Build with the DH sequencer instead of CDBS
-- Emmanuel Bourg <ebourg at apache.org> Fri, 11 Dec 2015 09:14:13 +0100
diff --git a/debian/control b/debian/control
index 3e886fa..8ab848c 100644
--- a/debian/control
+++ b/debian/control
@@ -9,6 +9,7 @@ Build-Depends-Indep: libjzlib-java,
junit4,
libbuild-helper-maven-plugin-java,
libeasymock-java,
+ libmaven-bundle-plugin-java,
libmaven-install-plugin-java,
libmaven-javadoc-plugin-java,
libognl-java,
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
index 4e13ebc..02e8b46 100644
--- a/debian/maven.ignoreRules
+++ b/debian/maven.ignoreRules
@@ -4,5 +4,4 @@ org.easymock easymockclassextension jar * * *
org.apache.maven.plugins maven-jxr-plugin * * * *
org.apache.maven.plugins maven-release-plugin * * * *
org.apache.maven.plugins maven-source-plugin * * * *
-org.apache.felix maven-bundle-plugin * * * *
org.codehaus.mojo rat-maven-plugin * * * *
diff --git a/debian/patches/04-maven-jar-packaging.patch b/debian/patches/04-maven-jar-packaging.patch
deleted file mode 100644
index ba37854..0000000
--- a/debian/patches/04-maven-jar-packaging.patch
+++ /dev/null
@@ -1,240 +0,0 @@
-Description: Change the packaging from 'bundle' to 'jar'
-Author: Emmanuel Bourg <ebourg at apache.org>
-Forwarded: not-needed
---- a/src/mina-core/pom.xml
-+++ b/src/mina-core/pom.xml
-@@ -29,7 +29,7 @@
-
- <artifactId>mina-core</artifactId>
- <name>Apache MINA Core</name>
-- <packaging>bundle</packaging>
-+ <packaging>jar</packaging>
-
- <dependencies>
- <dependency>
---- a/src/mina-filter-compression/pom.xml
-+++ b/src/mina-filter-compression/pom.xml
-@@ -29,14 +29,13 @@
-
- <artifactId>mina-filter-compression</artifactId>
- <name>Apache MINA Compression Filter</name>
-- <packaging>bundle</packaging>
-+ <packaging>jar</packaging>
-
- <dependencies>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>mina-core</artifactId>
- <version>${project.version}</version>
-- <type>bundle</type>
- </dependency>
-
- <dependency>
---- a/src/mina-integration-xbean/pom.xml
-+++ b/src/mina-integration-xbean/pom.xml
-@@ -45,7 +45,6 @@
- <groupId>${project.groupId}</groupId>
- <artifactId>mina-integration-beans</artifactId>
- <version>${project.version}</version>
-- <type>bundle</type>
- </dependency>
-
- <dependency>
-@@ -59,7 +58,6 @@
- <groupId>${project.groupId}</groupId>
- <artifactId>mina-core</artifactId>
- <version>${project.version}</version>
-- <type>bundle</type>
- </dependency>
-
- <dependency>
---- a/src/mina-statemachine/pom.xml
-+++ b/src/mina-statemachine/pom.xml
-@@ -29,7 +29,7 @@
-
- <artifactId>mina-statemachine</artifactId>
- <name>Apache MINA State Machine</name>
-- <packaging>bundle</packaging>
-+ <packaging>jar</packaging>
-
- <dependencies>
- <dependency>
-@@ -37,7 +37,6 @@
- <version>${project.version}</version>
- <artifactId>mina-core</artifactId>
- <optional>true</optional>
-- <type>bundle</type>
- </dependency>
-
- <dependency>
---- a/src/mina-transport-apr/pom.xml
-+++ b/src/mina-transport-apr/pom.xml
-@@ -27,14 +27,13 @@
-
- <artifactId>mina-transport-apr</artifactId>
- <name>Apache MINA APR Transport</name>
-- <packaging>bundle</packaging>
-+ <packaging>jar</packaging>
-
- <dependencies>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>mina-core</artifactId>
- <version>${project.version}</version>
-- <type>bundle</type>
- </dependency>
-
- <dependency>
---- a/src/mina-transport-serial/pom.xml
-+++ b/src/mina-transport-serial/pom.xml
-@@ -29,7 +29,7 @@
-
- <artifactId>mina-transport-serial</artifactId>
- <name>Apache MINA Serial Communication support</name>
-- <packaging>bundle</packaging>
-+ <packaging>jar</packaging>
-
- <properties>
- <version.rxtx>2.1.7</version.rxtx>
-@@ -40,14 +40,12 @@
- <groupId>${project.groupId}</groupId>
- <artifactId>mina-core</artifactId>
- <version>${project.version}</version>
-- <type>bundle</type>
- </dependency>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>mina-integration-beans</artifactId>
- <version>${project.version}</version>
-- <type>bundle</type>
- </dependency>
-
- <dependency>
---- a/src/pom.xml
-+++ b/src/pom.xml
-@@ -181,49 +181,42 @@
- <groupId>${project.groupId}</groupId>
- <artifactId>mina-core</artifactId>
- <version>${project.version}</version>
-- <type>bundle</type>
- </dependency>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>mina-transport-apr</artifactId>
- <version>${project.version}</version>
-- <type>bundle</type>
- </dependency>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>mina-filter-compression</artifactId>
- <version>${project.version}</version>
-- <type>bundle</type>
- </dependency>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>mina-integration-beans</artifactId>
- <version>${project.version}</version>
-- <type>bundle</type>
- </dependency>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>mina-integration-ognl</artifactId>
- <version>${project.version}</version>
-- <type>bundle</type>
- </dependency>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>mina-integration-jmx</artifactId>
- <version>${project.version}</version>
-- <type>bundle</type>
- </dependency>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>mina-statemachine</artifactId>
- <version>${project.version}</version>
-- <type>bundle</type>
- </dependency>
-
- <!-- Transport -->
---- a/src/mina-integration-beans/pom.xml
-+++ b/src/mina-integration-beans/pom.xml
-@@ -29,14 +29,13 @@
-
- <artifactId>mina-integration-beans</artifactId>
- <name>Apache MINA JavaBeans Integration</name>
-- <packaging>bundle</packaging>
-+ <packaging>jar</packaging>
-
- <dependencies>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>mina-core</artifactId>
- <version>${project.version}</version>
-- <type>bundle</type>
- </dependency>
- </dependencies>
-
---- a/src/mina-integration-jmx/pom.xml
-+++ b/src/mina-integration-jmx/pom.xml
-@@ -29,28 +29,25 @@
-
- <artifactId>mina-integration-jmx</artifactId>
- <name>Apache MINA JMX Integration</name>
-- <packaging>bundle</packaging>
-+ <packaging>jar</packaging>
-
- <dependencies>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>mina-core</artifactId>
- <version>${project.version}</version>
-- <type>bundle</type>
- </dependency>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>mina-integration-beans</artifactId>
- <version>${project.version}</version>
-- <type>bundle</type>
- </dependency>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>mina-integration-ognl</artifactId>
- <version>${project.version}</version>
-- <type>bundle</type>
- </dependency>
-
- <dependency>
---- a/src/mina-integration-ognl/pom.xml
-+++ b/src/mina-integration-ognl/pom.xml
-@@ -29,21 +29,19 @@
-
- <artifactId>mina-integration-ognl</artifactId>
- <name>Apache MINA OGNL Integration</name>
-- <packaging>bundle</packaging>
-+ <packaging>jar</packaging>
-
- <dependencies>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>mina-core</artifactId>
- <version>${project.version}</version>
-- <type>bundle</type>
- </dependency>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>mina-integration-beans</artifactId>
- <version>${project.version}</version>
-- <type>bundle</type>
- </dependency>
-
- <dependency>
diff --git a/debian/patches/series b/debian/patches/series
index e18db63..8fd9f03 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
01-tomcat-jni-compatibility.patch
02-maven2-compatibility.patch
03-easymock-compatibility.patch
-04-maven-jar-packaging.patch
05-spring-dependency.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/mina2.git
More information about the pkg-java-commits
mailing list