[apache-mime4j] 06/07: Enabled the OSGi metadata

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository apache-mime4j.

commit f508a3941908732acc6076898b36c471b423e3e9
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Nov 9 10:15:09 2015 +0100

    Enabled the OSGi metadata
---
 debian/changelog                  |  1 +
 debian/control                    |  1 +
 debian/maven.ignoreRules          |  1 -
 debian/patches/00-fix_build.patch | 94 ---------------------------------------
 debian/patches/series             |  1 -
 5 files changed, 2 insertions(+), 96 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a9de236..1d66998 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ apache-mime4j (0.7.2-4) UNRELEASED; urgency=medium
 
   * Build with maven-debian-helper (should improve the reproducibility)
   * Removed the dependency on maven-assembly-plugin (Closes: #804458)
+  * Enabled the OSGi metadata
   * No longer build and install the benchmark module
   * Install the javadoc under the /usr/share/doc/libapache-mime4j-java/api
     directory instead of /usr/share/libapache-mime4j-java-doc
diff --git a/debian/control b/debian/control
index 177b0ae..5e18cf7 100644
--- a/debian/control
+++ b/debian/control
@@ -8,6 +8,7 @@ Build-Depends-Indep: junit,
                      libcommons-io-java,
                      libjavacc-maven-plugin-java,
                      liblog4j1.2-java,
+                     libmaven-bundle-plugin-java,
                      libmaven-install-plugin-java,
                      libmaven-javadoc-plugin-java
 Standards-Version: 3.9.6
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
index 6f2d188..e7a0625 100644
--- a/debian/maven.ignoreRules
+++ b/debian/maven.ignoreRules
@@ -4,6 +4,5 @@ org.apache.james apache-mime4j-examples jar * * *
 org.apache.james apache-mime4j pom * * *
 org.apache.rat apache-rat-plugin * * * *
 org.apache.maven.plugins maven-assembly-plugin * * * *
-org.apache.felix maven-bundle-plugin * * * *
 org.apache.maven.plugins maven-remote-resources-plugin * * * *
 org.apache.maven.plugins maven-source-plugin * * * *
diff --git a/debian/patches/00-fix_build.patch b/debian/patches/00-fix_build.patch
deleted file mode 100644
index dd609ec..0000000
--- a/debian/patches/00-fix_build.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-From: David Paleino <dapal at debian.org>
-Subject: fix pom.xml to build
-Forwarded: no
-
----
- assemble/pom.xml |    3 ++-
- core/pom.xml     |    1 +
- dom/pom.xml      |    2 ++
- pom.xml          |   11 ++++++++++-
- storage/pom.xml  |    1 +
- 5 files changed, 16 insertions(+), 2 deletions(-)
-
---- apache-mime4j.orig/pom.xml
-+++ apache-mime4j/pom.xml
-@@ -110,6 +110,15 @@
-         </pluginManagement>
-         <plugins>
-             <plugin>
-+                <groupId>org.apache.maven.plugins</groupId>
-+                <artifactId>maven-compiler-plugin</artifactId>
-+                <inherited>true</inherited>
-+                <configuration>
-+                    <source>1.5</source>
-+                    <target>1.5</target>
-+                </configuration>
-+            </plugin>
-+            <plugin>
-                 <groupId>org.apache.rat</groupId>
-                 <artifactId>apache-rat-plugin</artifactId>
-                 <inherited>true</inherited>
-@@ -143,7 +152,7 @@
-                 <artifactId>maven-jar-plugin</artifactId>
-                 <configuration>
-                     <archive>
--                        <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
-+                        <!--<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>-->
-                         <manifestEntries>
-                             <Specification-Title>Apache Mime4j</Specification-Title>
-                             <Specification-Version>${project.version}</Specification-Version>
---- apache-mime4j.orig/dom/pom.xml
-+++ apache-mime4j/dom/pom.xml
-@@ -49,6 +49,7 @@
-         <dependency>
-             <groupId>junit</groupId>
-             <artifactId>junit</artifactId>
-+            <version>3.8.2</version>
-             <type>jar</type>
-             <!-- Removed as a workaround for an unidentified M2 bug -->
-             <scope>test</scope>
-@@ -67,6 +68,7 @@
-             <plugin>
-                 <groupId>org.codehaus.mojo</groupId>
-                 <artifactId>javacc-maven-plugin</artifactId>
-+                <version>2.6</version>
-                 <executions>
-                     <execution>
-                         <id>generate-jjtree</id>
---- apache-mime4j.orig/assemble/pom.xml
-+++ apache-mime4j/assemble/pom.xml
-@@ -59,6 +59,7 @@
-             <plugin>
-                 <groupId>org.apache.maven.plugins</groupId>
-                 <artifactId>maven-assembly-plugin</artifactId>
-+                <version>2.2-beta-5</version>
-                 <configuration>
-                     <descriptorSourceDirectory>${basedir}/src/assemble/</descriptorSourceDirectory>
-                     <tarLongFileMode>gnu</tarLongFileMode>
-@@ -102,4 +103,4 @@
-             </build>
-         </profile>
-     </profiles>
--</project>
-\ No newline at end of file
-+</project>
---- apache-mime4j.orig/core/pom.xml
-+++ apache-mime4j/core/pom.xml
-@@ -35,6 +35,7 @@
-         <dependency>
-             <groupId>junit</groupId>
-             <artifactId>junit</artifactId>
-+            <version>3.8.2</version>
-             <type>jar</type>
-             <!-- Removed as a workaround for an unidentified M2 bug -->
-             <scope>test</scope>
---- apache-mime4j.orig/storage/pom.xml
-+++ apache-mime4j/storage/pom.xml
-@@ -41,6 +41,7 @@
-         <dependency>
-             <groupId>junit</groupId>
-             <artifactId>junit</artifactId>
-+            <version>3.8.2</version>
-             <type>jar</type>
-             <!-- Removed as a workaround for an unidentified M2 bug -->
-             <scope>test</scope>
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index b75ec23..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-00-fix_build.patch

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