Merge pull request #11 from EnricoScantamburlo/made_it_work_with_recent_jdk
Fixes errors when compiling with recent JDKS
diff --git a/pom.xml b/pom.xml
index 6ef2230..9007571 100644
--- a/pom.xml
+++ b/pom.xml
@@ -41,7 +41,7 @@
<url>https://issues.apache.org/jira/browse/NETBEANSINFRA</url>
</issueManagement>
<prerequisites>
- <maven>3.0.5</maven>
+ <maven>3.6.3</maven>
</prerequisites>
<licenses>
<license>
@@ -62,7 +62,7 @@
<!-- TODO need to override parent version value... I suppose this will eventually end up in mojo parent pom, check regularly -->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
- <version>3.5</version>
+ <version>3.6.0</version>
<configuration>
<skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
</configuration>
@@ -118,8 +118,8 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>1.7</source>
- <target>1.7</target>
+ <source>1.8</source>
+ <target>1.8</target>
</configuration>
</plugin>
<plugin>
diff --git a/src/main/java/org/apache/netbeans/nbm/CreateNetBeansFileStructure.java b/src/main/java/org/apache/netbeans/nbm/CreateNetBeansFileStructure.java
index 9d33cc6..9a3d230 100644
--- a/src/main/java/org/apache/netbeans/nbm/CreateNetBeansFileStructure.java
+++ b/src/main/java/org/apache/netbeans/nbm/CreateNetBeansFileStructure.java
@@ -21,8 +21,6 @@
import java.io.BufferedOutputStream;
import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
import java.io.IOException;
import java.io.PrintWriter;
import java.lang.reflect.Field;
@@ -40,13 +38,11 @@
import java.util.jar.Attributes;
import java.util.jar.JarFile;
import java.util.jar.JarInputStream;
-import java.util.jar.JarOutputStream;
import java.util.jar.Manifest;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.repository.layout.DefaultRepositoryLayout;
-//import org.apache.maven.artifact.factory.ArtifactFactory;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.model.Resource;
import org.apache.maven.plugin.MojoExecutionException;
@@ -301,8 +297,7 @@
a.putValue( "Class-Path", classPath );
a.remove( new Attributes.Name( "Maven-Class-Path" ) );
- try ( FileSystem fs = FileSystems.newFileSystem( moduleFile.toPath(), null ) )
- {
+ try (FileSystem fs = FileSystems.newFileSystem(moduleFile.toPath(), (ClassLoader) null)) {
try ( BufferedOutputStream mfWriter = new BufferedOutputStream( Files.newOutputStream( fs.getPath( JarFile.MANIFEST_NAME ) ) ) )
{
m.write( mfWriter );
@@ -354,15 +349,9 @@
{
String name = target.getName();
getLog().info( "Using *.external replacement for " + name );
- PrintWriter external = new PrintWriter( new File( targetDir, name + ".external" ), "UTF-8" );
- try
- {
+ try (PrintWriter external = new PrintWriter(new File(targetDir, name + ".external"), "UTF-8")) {
writeExternal( external, artifact );
}
- finally
- {
- external.close();
- }
}
}
catch ( IOException ex )
@@ -488,7 +477,7 @@
"NBM resources defined in module descriptor are deprecated. Please configure NBM resources in plugin configuration." );
Copy cp = (Copy) antProject.createTask( "copy" );
cp.setTodir( clusterDir );
- HashMap<File, Collection<FileSet>> customPaths = new HashMap<File, Collection<FileSet>>();
+ HashMap<File, Collection<FileSet>> customPaths = new HashMap<>();
boolean hasStandard = false;
for ( NbmResource res : ress )
{
@@ -512,7 +501,7 @@
Collection<FileSet> col = customPaths.get( path );
if ( col == null )
{
- col = new ArrayList<FileSet>();
+ col = new ArrayList<>();
customPaths.put( path, col );
}
col.add( set );
@@ -576,25 +565,7 @@
fld.setAccessible( true );
fld.set( null, null );
- }
- catch ( IllegalArgumentException ex )
- {
- Logger.getLogger( CreateNetBeansFileStructure.class.getName() ).log( Level.SEVERE, null, ex );
- }
- catch ( IllegalAccessException ex )
- {
- Logger.getLogger( CreateNetBeansFileStructure.class.getName() ).log( Level.SEVERE, null, ex );
- }
- catch ( NoSuchFieldException ex )
- {
- Logger.getLogger( CreateNetBeansFileStructure.class.getName() ).log( Level.SEVERE, null, ex );
- }
- catch ( SecurityException ex )
- {
- Logger.getLogger( CreateNetBeansFileStructure.class.getName() ).log( Level.SEVERE, null, ex );
- }
- catch ( ClassNotFoundException ex )
- {
+ } catch (IllegalArgumentException | IllegalAccessException | NoSuchFieldException | SecurityException | ClassNotFoundException ex) {
Logger.getLogger( CreateNetBeansFileStructure.class.getName() ).log( Level.SEVERE, null, ex );
}
}
