Skip to content

Multi-Release-Jar with initial support for JDK 9 and JDK 10 NIO API #120

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Apr 2, 2021
Merged

Multi-Release-Jar with initial support for JDK 9 and JDK 10 NIO API #120

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
e6165e5
Java 9: InputStream.transferTo(OutputStream) instead of JVM-based byt…
mkarg Aug 16, 2020
eebe1be
Java 10: Reader.transferTo(Writer) instead of JVM-based byte transfer
mkarg Aug 16, 2020
be51d3a
Multi-Release-Jar
mkarg Jan 1, 2021
bc5b0ab
Reducing duplicate code in MRJAR using VersionSpecifics class
mkarg Jan 2, 2021
e16dc59
Reducing number of classes; No singleton but static.
mkarg Jan 3, 2021
cecd035
Github CI: Build with JDK 15, test with matrix
mkarg Jan 3, 2021
6579a59
Revert "Github CI: Build with JDK 15, test with matrix"
mkarg Jan 10, 2021
d430deb
Can build on JDKs before SE 10, too
mkarg Jan 10, 2021
3fe65d8
Renamed per @rfsholte's request
mkarg Jan 24, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
87 changes: 87 additions & 0 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,21 @@ limitations under the License.
</plugins>
</pluginManagement>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<executions>
<execution>
<id>default-compile</id>
<goals>
<goal>compile</goal>
</goals>
<configuration>
<source>1.8</source>
<target>1.8</target>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-scm-publish-plugin</artifactId>
Expand Down Expand Up @@ -134,7 +149,79 @@ limitations under the License.
</systemProperties>
</configuration>
</plugin>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
<manifestEntries>
<Multi-Release>true</Multi-Release>
</manifestEntries>
</archive>
</configuration>
</plugin>
</plugins>
</build>

<profiles>
<profile>
<id>jdk9+</id>
<activation>
<jdk>[9,)</jdk>
</activation>
<build>
<pluginManagement>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<executions>
<execution>
<id>compile-java-9</id>
<goals>
<goal>compile</goal>
</goals>
<configuration>
<release>9</release>
<compileSourceRoots>
<compileSourceRoot>${project.basedir}/src/main/java9</compileSourceRoot>
</compileSourceRoots>
<multiReleaseOutput>true</multiReleaseOutput>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</pluginManagement>
</build>
</profile>
<profile>
<id>jdk10+</id>
<activation>
<jdk>[10,)</jdk>
</activation>
<build>
<pluginManagement>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<executions>
<execution>
<id>compile-java-10</id>
<goals>
<goal>compile</goal>
</goals>
<configuration>
<release>10</release>
<compileSourceRoots>
<compileSourceRoot>${project.basedir}/src/main/java10</compileSourceRoot>
</compileSourceRoots>
<multiReleaseOutput>true</multiReleaseOutput>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</pluginManagement>
</build>
</profile>
</profiles>
</project>
27 changes: 27 additions & 0 deletions src/main/java/org/codehaus/plexus/util/BaseIOUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
package org.codehaus.plexus.util;

import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.io.Reader;
import java.io.Writer;

/**
* Implementation specific to Java SE 8 version.
*/
abstract class BaseIOUtil
{
private static final int DEFAULT_BUFFER_SIZE = 1024 * 16;

static void copy( final InputStream input, final OutputStream output )
throws IOException
{
IOUtil.copy( input, output, DEFAULT_BUFFER_SIZE );
}

static void copy( final Reader input, final Writer output )
throws IOException
{
IOUtil.copy( input, output, DEFAULT_BUFFER_SIZE );
}
}
6 changes: 3 additions & 3 deletions src/main/java/org/codehaus/plexus/util/IOUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@
* method variants to specify buffer size and encoding, each row may correspond to up to 4 methods.
*/

public final class IOUtil
public final class IOUtil extends BaseIOUtil
{
private static final int DEFAULT_BUFFER_SIZE = 1024 * 16;

Expand All @@ -156,7 +156,7 @@ private IOUtil()
public static void copy( final InputStream input, final OutputStream output )
throws IOException
{
copy( input, output, DEFAULT_BUFFER_SIZE );
BaseIOUtil.copy( input, output );
}

/**
Expand Down Expand Up @@ -186,7 +186,7 @@ public static void copy( final InputStream input, final OutputStream output, fin
public static void copy( final Reader input, final Writer output )
throws IOException
{
copy( input, output, DEFAULT_BUFFER_SIZE );
BaseIOUtil.copy( input, output );
}

/**
Expand Down
25 changes: 25 additions & 0 deletions src/main/java10/org/codehaus/plexus/util/BaseIOUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
package org.codehaus.plexus.util;

import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.io.Reader;
import java.io.Writer;

/**
* Implementation specific to Java SE 10 version.
*/
abstract class BaseIOUtil
{
static void copy( final InputStream input, final OutputStream output )
throws IOException
{
input.transferTo( output );
}

static void copy( final Reader input, final Writer output )
throws IOException
{
input.transferTo( output );
}
}
27 changes: 27 additions & 0 deletions src/main/java9/org/codehaus/plexus/util/BaseIOUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
package org.codehaus.plexus.util;

import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.io.Reader;
import java.io.Writer;

/**
* Implementation specific to Java SE 9 version.
*/
abstract class BaseIOUtil
{
private static final int DEFAULT_BUFFER_SIZE = 1024 * 16;

static void copy( final InputStream input, final OutputStream output )
throws IOException
{
input.transferTo( output );
}

static void copy( final Reader input, final Writer output )
throws IOException
{
IOUtil.copy( input, output, DEFAULT_BUFFER_SIZE );
}
}