[apache-mime4j] 06/19: Fix build

[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 1b3c9c82132e80629fc00d50f52558ba57931c9f
Author: David Paleino <dapal at debian.org>
Date:   Fri Dec 28 17:28:03 2012 +0100

    Fix build
---
 debian/libapache-mime4j-java.poms |  6 +++
 debian/maven.ignoreRules          |  2 +-
 debian/patches/00-fix_build.patch | 81 +++++++++++++++++++++++++++++++++++++--
 debian/rules                      | 15 +++++---
 4 files changed, 95 insertions(+), 9 deletions(-)

diff --git a/debian/libapache-mime4j-java.poms b/debian/libapache-mime4j-java.poms
index 43e746b..d562924 100644
--- a/debian/libapache-mime4j-java.poms
+++ b/debian/libapache-mime4j-java.poms
@@ -1 +1,7 @@
 pom.xml --no-parent
+core/pom.xml
+dom/pom.xml
+storage/pom.xml
+benchmark/pom.xml
+examples/pom.xml
+assemble/pom.xml
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
index 07e37f4..5984666 100644
--- a/debian/maven.ignoreRules
+++ b/debian/maven.ignoreRules
@@ -1,4 +1,4 @@
-*	rat-maven-plugin
+*	apache-rat-plugin
 *	maven-remote-resources-plugin
 *	maven-source-plugin
 *	maven-bundle-plugin
diff --git a/debian/patches/00-fix_build.patch b/debian/patches/00-fix_build.patch
index d0a33d9..dd609ec 100644
--- a/debian/patches/00-fix_build.patch
+++ b/debian/patches/00-fix_build.patch
@@ -3,12 +3,32 @@ Subject: fix pom.xml to build
 Forwarded: no
 
 ---
- pom.xml |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ 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
-@@ -143,7 +143,7 @@
+@@ -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>
@@ -17,3 +37,58 @@ Forwarded: no
                          <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/rules b/debian/rules
index 4834b80..1ee7ea2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,19 +20,24 @@ override_dh_installchangelogs:
 override_dh_auto_build:
 	# can't use mvn-debian because of libapache-mime4j-doc -- see
 	# mvn-debian's source
-	mh_patchpom --no-parent -plibapache-mime4j-java pom.xml
+	mh_patchpoms -plibapache-mime4j-java
 	mvn -o -s /etc/maven2/settings-debian.xml \
 	  -Dmaven.test.skip=$(SKIPTEST) package
             
 override_dh_auto_install:
 	dh_auto_install
 	mh_installpoms -plibapache-mime4j-java -e$(UPVER)
-	mh_installjar -plibapache-mime4j-java -l pom.xml -i$(UPVER) -e$(UPVER) \
-	  target/apache-mime4j-debian.jar
-	-rm -vrf debian/libapache-mime4j-java/target/
+	for i in core dom storage benchmark; do \
+	  mh_installjar -plibapache-mime4j-java -l $$i/pom.xml -j$(UPVER) -e$(UPVER) \
+	    $$i/target/apache-mime4j-$$i-debian.jar ; \
+	done
+
+	# build docs after installing poms and jars to locations Maven can use
+	mvn -o -s /etc/maven2/settings-debian.xml \
+	  -Dmaven.test.skip=$(SKIPTEST) javadoc:javadoc
 
 override_dh_auto_clean:
 	dh_auto_clean
 	mh_unpatchpoms -plibapache-mime4j-java -v
-	-rm -rf target/
+	-rm -rf target/ */target/
 	-rm -rf debian/.mh/

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