Package: apache-mime4j / 0.7.2-3

00-fix_build.patch Patch series | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
From: David Paleino <dapal@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>