New Upstream Release - mimepull
Ready changes
Summary
Merged new upstream version: 1.9.10 (was: 1.9.7).
Diff
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..a6f89c2
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/target/
\ No newline at end of file
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 0000000..7630913
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1,30 @@
+---
+
+---
+
+# Source Code Submissions
+We welcome your contributions and look forward to collaborating with you. We can only accept source code repository
+submissions from users who have signed and returned the Oracle
+Contributor Agreement. You will find details and the agreement to sign at this OTN web page:
+[Oracle Contributor Agreement](http://www.oracle.com/technetwork/community/oca-486395.html).
+
+# Other Contributions
+For all project Submissions other than source code repository contributions, the following also applies: Oracle does
+not claim ownership of Your Submissions. However, in order to fulfill
+the purposes of this project, You must give Oracle and all Users
+the right to post, access, discuss, use, publish, disseminate, and refine
+Your Submissions.
+
+In legalese: *You hereby grant to Oracle and all
+Users a royalty-free, perpetual, irrevocable, worldwide, non-exclusive,
+and fully sub-licensable right and license, under Your intellectual
+property rights, to reproduce, modify, adapt, publish, translate, create
+derivative works from, distribute, perform, display, and use Your
+Submissions (in whole or part) and to incorporate or implement them in
+other works in any form, media, or technology now known or later
+developed, all subject to the obligation to retain any copyright notices
+included in Your Submissions. All Users, Oracle, and their
+sublicensees are responsible for any modifications they make to the
+Submissions of others.*
+
+Copyright © 2017 Oracle and/or its affiliates. All rights reserved.
diff --git a/debian/changelog b/debian/changelog
index aeb876f..6cc8f0f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mimepull (1.9.10-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Debian Janitor <janitor@jelmer.uk> Mon, 21 Aug 2023 04:52:57 -0000
+
mimepull (1.9.7-2) unstable; urgency=medium
* Removed the unused dependency on libsvnkit-java
diff --git a/pom.xml b/pom.xml
index 2a866dc..8275f61 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- Copyright (c) 2012-2015 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2012-2018 Oracle and/or its affiliates. All rights reserved.
The contents of this file are subject to the terms of either the GNU
General Public License Version 2 only ("GPL") or the Common Development
@@ -44,13 +44,13 @@
<parent>
<groupId>net.java</groupId>
<artifactId>jvnet-parent</artifactId>
- <version>4</version>
+ <version>5</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jvnet.mimepull</groupId>
<artifactId>mimepull</artifactId>
- <version>1.9.7</version>
+ <version>1.9.10</version>
<packaging>jar</packaging>
<name>MIME streaming extension</name>
@@ -66,14 +66,9 @@
<developers>
<developer>
- <name>Jitendra Kotamraju</name>
- <email>jitendra.kotamraju@oracle.com</email>
- <organization>Oracle Corporation</organization>
- </developer>
- <developer>
- <name>Martin Grebac</name>
- <email>martin.grebac@oracle.com</email>
- <organization>Oracle Corporation</organization>
+ <id>bravehorsie</id>
+ <name>Roman Grigoriadi</name>
+ <email>Roman.Grigoriadi@oracle.com</email>
</developer>
</developers>
@@ -91,10 +86,11 @@
</licenses>
<scm>
- <connection>scm:svn:https://svn.java.net/svn/mimepull~svn/tags/mimepull-1.9.7</connection>
- <developerConnection>scm:svn:https://svn.java.net/svn/mimepull~svn/tags/mimepull-1.9.7</developerConnection>
- <url>http://java.net/projects/mimepull/sources/svn/show/tags/mimepull-1.9.7</url>
- </scm>
+ <connection>scm:git:ssh://git@github.com/javaee/metro-mimepull.git</connection>
+ <developerConnection>scm:git:ssh://git@github.com/javaee/metro-mimepull.git</developerConnection>
+ <url>https://github.com/javaee/metro-mimepull</url>
+ <tag>1.9.10</tag>
+ </scm>
<issueManagement>
<system>jira</system>
@@ -119,10 +115,76 @@
</properties>
<build>
+
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.7.0</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>3.1.0</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <version>3.0.0-M1</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.20</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>3.1.0</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <version>2.8.2</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-source-plugin</artifactId>
+ <version>3.0.1</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>3.0.0</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-release-plugin</artifactId>
+ <version>2.5.3</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>3.5.0</version>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>cobertura-maven-plugin</artifactId>
+ <version>2.7</version>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>buildnumber-maven-plugin</artifactId>
+ <version>1.4</version>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>findbugs-maven-plugin</artifactId>
+ <version>3.0.5</version>
+ </plugin>
+ <plugin>
+ <groupId>org.glassfish.copyright</groupId>
+ <artifactId>glassfish-copyright-maven-plugin</artifactId>
+ <version>1.49</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+
<plugins>
<plugin>
<artifactId>maven-enforcer-plugin</artifactId>
- <version>1.0.1</version>
<executions>
<execution>
<id>enforce-versions</id>
@@ -146,7 +208,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
- <version>2.5.1</version>
<configuration>
<formats>
<format>xml</format>
@@ -161,7 +222,6 @@
<plugin>
<groupId>org.glassfish.copyright</groupId>
<artifactId>glassfish-copyright-maven-plugin</artifactId>
- <version>1.29</version>
<configuration>
<templateFile>${project.basedir}/copyright.txt</templateFile>
<excludeFile>${project.basedir}/copyright-exclude</excludeFile>
@@ -177,10 +237,28 @@
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.5.1</version>
+ <executions>
+ <execution>
+ <id>default-compile</id>
+ <configuration>
+ <release>9</release>
+ </configuration>
+ </execution>
+ <execution>
+ <id>base-compile</id>
+ <goals>
+ <goal>compile</goal>
+ </goals>
+ <configuration>
+ <release>7</release>
+ <excludes>
+ <exclude>module-info.java</exclude>
+ </excludes>
+ </configuration>
+ </execution>
+ </executions>
<configuration>
- <source>1.7</source>
- <target>1.7</target>
+ <release>7</release>
</configuration>
</plugin>
<plugin>
@@ -195,7 +273,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>buildnumber-maven-plugin</artifactId>
- <version>1.1</version>
<configuration>
<getRevisionOnlyOnce>true</getRevisionOnlyOnce>
<timestampFormat>{0,date,yyyy-MM-dd'T'HH:mm:ssZ}</timestampFormat>
@@ -217,17 +294,16 @@
<dependency>
<groupId>org.tmatesoft.svnkit</groupId>
<artifactId>svnkit</artifactId>
- <version>1.7.4-v1</version>
+ <version>1.9.2</version>
</dependency>
</dependencies>
- </plugin>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.12.2</version>
<configuration>
<systemProperties>
- <property>
+ <property>
<name>java.util.logging.config.file</name>
<value>src/test/resources/logging.properties</value>
</property>
@@ -236,23 +312,21 @@
</plugin>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
- <version>2.4</version>
<configuration>
- <archive>
+ <archive>
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
<manifest>
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
- </manifest>
+ </manifest>
<manifestEntries>
<Implementation-Build-Id>${scmBranch}-${buildNumber}, ${timestamp}</Implementation-Build-Id>
</manifestEntries>
- </archive>
+ </archive>
</configuration>
- </plugin>
+ </plugin>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>2.0.0</version>
<executions>
<execution>
<id>bundle-manifest</id>
@@ -260,13 +334,17 @@
<goals>
<goal>manifest</goal>
</goals>
+ <configuration>
+ <instructions>
+ <Require-Capability>osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.7))"</Require-Capability>
+ </instructions>
+ </configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
- <version>3.0.1</version>
<configuration>
<skip>${findbugs.skip}</skip>
<threshold>${findbugs.threshold}</threshold>
@@ -275,7 +353,7 @@
${findbugs.exclude}
</excludeFilterFile>
<fork>true</fork>
- <jvmArgs>-Xms64m -Xmx256m</jvmArgs>
+ <jvmArgs>-Xms64m -Xmx256m</jvmArgs>
</configuration>
<dependencies>
<dependency>
@@ -286,48 +364,57 @@
</dependencies>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
- <version>2.7</version>
<configuration>
<retryFailedDeploymentCount>10</retryFailedDeploymentCount>
</configuration>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.9</version>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
- <version>2.2.1</version>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
- <version>2.1</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-gpg-plugin</artifactId>
- <version>1.1</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <version>1.0.1</version>
</plugin>
</plugins>
+
</build>
-
+
<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.1</version>
+ <version>4.11</version>
<scope>test</scope>
</dependency>
</dependencies>
+ <profiles>
+
+ <profile>
+ <id>jvnet-release</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-gpg-plugin</artifactId>
+ <version>1.6</version>
+ <executions>
+ <execution>
+ <id>sign-artifacts</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>sign</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ </profiles>
+
</project>
diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java
new file mode 100644
index 0000000..6092677
--- /dev/null
+++ b/src/main/java/module-info.java
@@ -0,0 +1,48 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common Development
+ * and Distribution License("CDDL") (collectively, the "License"). You
+ * may not use this file except in compliance with the License. You can
+ * obtain a copy of the License at
+ * http://glassfish.java.net/public/CDDL+GPL_1_1.html
+ * or packager/legal/LICENSE.txt. See the License for the specific
+ * language governing permissions and limitations under the License.
+ *
+ * When distributing the software, include this License Header Notice in each
+ * file and include the License file at packager/legal/LICENSE.txt.
+ *
+ * GPL Classpath Exception:
+ * Oracle designates this particular file as subject to the "Classpath"
+ * exception as provided by Oracle in the GPL Version 2 section of the License
+ * file that accompanied this code.
+ *
+ * Modifications:
+ * If applicable, add the following below the License Header, with the fields
+ * enclosed by brackets [] replaced by your own identifying information:
+ * "Portions Copyright [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ * If you wish your version of this file to be governed by only the CDDL or
+ * only the GPL Version 2, indicate your decision by adding "[Contributor]
+ * elects to include this software in this distribution under the [CDDL or GPL
+ * Version 2] license." If you don't indicate a single choice of license, a
+ * recipient has the option to distribute your version of this file under
+ * either the CDDL, the GPL Version 2 or to extend the choice of license to
+ * its licensees as provided above. However, if you add GPL Version 2 code
+ * and therefore, elected the GPL Version 2 license, then the option applies
+ * only if the new code is made subject to such option by the copyright
+ * holder.
+ */
+
+/**
+ * MIME streaming extension for Java.
+ */
+module org.jvnet.mimepull {
+ requires java.logging;
+
+ exports org.jvnet.mimepull;
+}