Modified: james/mime4j/trunk/pom.xml URL: http://svn.apache.org/viewvc/james/mime4j/trunk/pom.xml?rev=1457421&r1=1457420&r2=1457421&view=diff ============================================================================== --- james/mime4j/trunk/pom.xml (original) +++ james/mime4j/trunk/pom.xml Sun Mar 17 10:36:33 2013 @@ -17,21 +17,22 @@ specific language governing permissions and limitations under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> <artifactId>james-project</artifactId> <groupId>org.apache.james</groupId> <version>1.8.1</version> - <relativePath /> + <relativePath/> </parent> <artifactId>apache-mime4j-project</artifactId> <version>0.8-SNAPSHOT</version> <packaging>pom</packaging> - <name>Apache JAMES Mime4j Project</name> + <name>Apache James :: Mime4j :: Project</name> <description>Java stream based MIME message parser</description> <url>http://james.apache.org/mime4j</url> <inceptionYear>2004</inceptionYear> @@ -63,52 +64,73 @@ </distributionManagement> <properties> - <target.jdk>1.5</target.jdk> + <target.jdk>1.6</target.jdk> + <commons-logging.version>1.1.1</commons-logging.version> + <log4j.version>1.2.14</log4j.version> + <junit.version>4.10</junit.version> + <commons-io.version>1.4</commons-io.version> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> </properties> <dependencyManagement> <dependencies> <dependency> + <groupId>org.apache.james</groupId> + <artifactId>apache-mime4j-core</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.james</groupId> + <artifactId>apache-mime4j-dom</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.james</groupId> + <artifactId>apache-mime4j-mbox-iterator</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.james</groupId> + <artifactId>apache-mime4j-examples</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.james</groupId> + <artifactId>apache-mime4j-storage</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.james</groupId> + <artifactId>apache-mime4j-benchmark</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> - <version>1.1.1</version> + <version>${commons-logging.version}</version> </dependency> <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> - <version>1.2.14</version> + <version>${log4j.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.10</version> - <type>jar</type> - <!-- Removed as a workaround for an unidentified M2 bug --> + <version>${junit.version}</version> <scope>test</scope> - <optional>true</optional> </dependency> <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> - <version>1.4</version> + <version>${commons-io.version}</version> <scope>test</scope> - <optional>true</optional> </dependency> </dependencies> </dependencyManagement> <build> - <pluginManagement> - <plugins> - <!-- See https://issues.apache.org/**jira/browse/FELIX-3037<https://issues.apache.org/jira/browse/FELIX-3037>--> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <version>2.3.6</version> - </plugin> - </plugins> - </pluginManagement> <plugins> <plugin> <groupId>org.apache.rat</groupId> @@ -126,7 +148,9 @@ <exclude>LICENSE.*</exclude> <exclude>**/README.*</exclude> <exclude>**/main/resources/long-multipart.msg</exclude> - <exclude>**/main/resources/META-INF/services/org.apache.james.mime4j.dom.MessageServiceFactory</exclude> + <exclude> + **/main/resources/META-INF/services/org.apache.james.mime4j.dom.MessageServiceFactory + </exclude> <exclude>**/test/resources/testmsgs/*</exclude> <exclude>**/test/resources/mimetools-testmsgs/*</exclude> <exclude>**/test/resources/test-1/*</exclude> @@ -143,77 +167,9 @@ </executions> </plugin> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <configuration> - <archive> - <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile> - <manifestEntries> - <Specification-Title>Apache Mime4j</Specification-Title> - <Specification-Version>${project.version}</Specification-Version> - <Specification-Vendor>The Apache Software Foundation</Specification-Vendor> - <Implementation-Title>Apache Mime4j</Implementation-Title> - <Implementation-Version>${project.version}</Implementation-Version> - <Implementation-Vendor>The Apache Software Foundation</Implementation-Vendor> - <Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id> - <url>${project.url}</url> - </manifestEntries> - </archive> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <inherited>true</inherited> - <configuration> - <excludePackageNames>org.apache.james.mime4j.field.address.parser:org.apache.james.mime4j.field.contentdisposition.parser:org.apache.james.mime4j.field.contenttype.parser:org.apache.james.mime4j.field.datetime.parser:org.apache.james.mime4j.field.language.parser:org.apache.james.mime4j.field.mimeversion.parser:org.apache.james.mime4j.field.structured.parser</excludePackageNames> - </configuration> - </plugin> - <!-- Add NOTICE and LICENSE to generated JAR --> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-remote-resources-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>process</goal> - </goals> - <configuration> - <resourceBundles> - <resourceBundle>org.apache:apache-jar-resource-bundle:1.4</resourceBundle> - </resourceBundles> - <properties> - <addLicense>true</addLicense> - </properties> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-source-plugin</artifactId> - <executions> - <execution> - <id>attach-sources</id> - <goals> - <goal>jar</goal> - </goals> - </execution> - </executions> - </plugin> - - <plugin> <groupId>org.apache.felix</groupId> <artifactId>maven-bundle-plugin</artifactId> - <executions> - <execution> - <id>bundle-manifest</id> - <phase>process-classes</phase> - <goals> - <goal>manifest</goal> - </goals> - </execution> - </executions> + <version>2.3.7</version> <extensions>true</extensions> </plugin> </plugins>
Modified: james/mime4j/trunk/storage/pom.xml URL: http://svn.apache.org/viewvc/james/mime4j/trunk/storage/pom.xml?rev=1457421&r1=1457420&r2=1457421&view=diff ============================================================================== --- james/mime4j/trunk/storage/pom.xml (original) +++ james/mime4j/trunk/storage/pom.xml Sun Mar 17 10:36:33 2013 @@ -17,7 +17,8 @@ specific language governing permissions and limitations under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> @@ -28,23 +29,19 @@ </parent> <artifactId>apache-mime4j-storage</artifactId> + <packaging>bundle</packaging> - <name>Apache JAMES Mime4j (Storage)</name> + <name>Apache James :: Mime4j :: Storage</name> <description>Java MIME Document Object Model Storage</description> <dependencies> <dependency> <groupId>org.apache.james</groupId> <artifactId>apache-mime4j-dom</artifactId> - <version>${project.version}</version> </dependency> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <type>jar</type> - <!-- Removed as a workaround for an unidentified M2 bug --> - <scope>test</scope> - <optional>true</optional> </dependency> </dependencies> Modified: james/mime4j/trunk/storage/src/main/java/org/apache/james/mime4j/storage/MemoryStorageProvider.java URL: http://svn.apache.org/viewvc/james/mime4j/trunk/storage/src/main/java/org/apache/james/mime4j/storage/MemoryStorageProvider.java?rev=1457421&r1=1457420&r2=1457421&view=diff ============================================================================== --- james/mime4j/trunk/storage/src/main/java/org/apache/james/mime4j/storage/MemoryStorageProvider.java (original) +++ james/mime4j/trunk/storage/src/main/java/org/apache/james/mime4j/storage/MemoryStorageProvider.java Sun Mar 17 10:36:33 2013 @@ -49,7 +49,7 @@ public class MemoryStorageProvider exten private static final class MemoryStorageOutputStream extends StorageOutputStream { - ByteArrayBuffer bab = new ByteArrayBuffer(1024); + final ByteArrayBuffer bab = new ByteArrayBuffer(1024); @Override protected void write0(byte[] buffer, int offset, int length) Modified: james/mime4j/trunk/storage/src/main/java/org/apache/james/mime4j/storage/StorageTextBody.java URL: http://svn.apache.org/viewvc/james/mime4j/trunk/storage/src/main/java/org/apache/james/mime4j/storage/StorageTextBody.java?rev=1457421&r1=1457420&r2=1457421&view=diff ============================================================================== --- james/mime4j/trunk/storage/src/main/java/org/apache/james/mime4j/storage/StorageTextBody.java (original) +++ james/mime4j/trunk/storage/src/main/java/org/apache/james/mime4j/storage/StorageTextBody.java Sun Mar 17 10:36:33 2013 @@ -33,7 +33,7 @@ import org.apache.james.mime4j.dom.TextB class StorageTextBody extends TextBody { private MultiReferenceStorage storage; - private Charset charset; + private final Charset charset; public StorageTextBody(MultiReferenceStorage storage, Charset charset) { this.storage = storage; Modified: james/mime4j/trunk/storage/src/main/java/org/apache/james/mime4j/storage/TempFileStorageProvider.java URL: http://svn.apache.org/viewvc/james/mime4j/trunk/storage/src/main/java/org/apache/james/mime4j/storage/TempFileStorageProvider.java?rev=1457421&r1=1457420&r2=1457421&view=diff ============================================================================== --- james/mime4j/trunk/storage/src/main/java/org/apache/james/mime4j/storage/TempFileStorageProvider.java (original) +++ james/mime4j/trunk/storage/src/main/java/org/apache/james/mime4j/storage/TempFileStorageProvider.java Sun Mar 17 10:36:33 2013 @@ -109,7 +109,7 @@ public class TempFileStorageProvider ext private static final class TempFileStorageOutputStream extends StorageOutputStream { - private File file; + private final File file; private OutputStream out; public TempFileStorageOutputStream(File file) throws IOException {
