Merge pull request #1607 from hazendaz/master

Drop tomcat 7, update to cargo for demo of waffle filter, updates throughout

.github/workflows/ci.yaml

@@ -8,7 +8,7 @@ jobs:
  strategy:
  matrix:
  os: [windows-2019, windows-latest]
- java: [11, 17, 18]
+ java: [11, 17, 18, 19-ea]
  fail-fast: false
  max-parallel: 4
  name: Test JDK ${{ matrix.java }}, ${{ matrix.os }}

.github/workflows/sonatype.yaml

@@ -14,7 +14,7 @@ jobs:
  - name: Set up JDK
  uses: actions/setup-java@v3
  with:
- java-version: 11
+ java-version: 17
  distribution: zulu
  - name: Deploy to Sonatype
  run: ./mvnw deploy -DskipTests -B -D"license.skip=true" --settings ./.mvn/settings.xml

.mvn/settings.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<settings xmlns="http:https://maven.apache.org/SETTINGS/1.1.0" xmlns:xsi="http:https://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http:https://maven.apache.org/SETTINGS/1.1.0 http:https://maven.apache.org/xsd/settings-1.1.0.xsd">
+<settings xmlns="http:https://maven.apache.org/SETTINGS/1.2.0" xmlns:xsi="http:https://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http:https://maven.apache.org/SETTINGS/1.2.0 https:https://maven.apache.org/xsd/settings-1.2.0.xsd">
  <servers>
  <server>
  <id>ossrh</id>

.mvn/wrapper/MavenWrapperDownloader.java

@@ -17,14 +17,24 @@
  * under the License.
  */
 
-import java.net.*;
-import java.io.*;
-import java.nio.channels.*;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.Authenticator;
+import java.net.PasswordAuthentication;
+import java.net.URL;
+import java.nio.file.Files;
+import java.nio.file.LinkOption;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.nio.file.StandardCopyOption;
+import java.nio.file.StandardOpenOption;
 import java.util.Properties;
 
-public class MavenWrapperDownloader
+public final class MavenWrapperDownloader
 {
- private static final String WRAPPER_VERSION = "3.1.0";
+ private static final String WRAPPER_VERSION = "3.1.1";
+
+ private static final boolean VERBOSE = Boolean.parseBoolean( System.getenv( "MVNW_VERBOSE" ) );
 
  /**
  * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided.
@@ -49,78 +59,53 @@ public class MavenWrapperDownloader
  */
  private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl";
 
- public static void main( String args[] )
+ public static void main( String[] args )
  {
- System.out.println( "- Downloader started" );
- File baseDirectory = new File( args[0] );
- System.out.println( "- Using base directory: " + baseDirectory.getAbsolutePath() );
-
- // If the maven-wrapper.properties exists, read it and check if it contains a custom
- // wrapperUrl parameter.
- File mavenWrapperPropertyFile = new File( baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH );
- String url = DEFAULT_DOWNLOAD_URL;
- if ( mavenWrapperPropertyFile.exists() )
+ if ( args.length == 0 )
  {
- FileInputStream mavenWrapperPropertyFileInputStream = null;
- try
- {
- mavenWrapperPropertyFileInputStream = new FileInputStream( mavenWrapperPropertyFile );
- Properties mavenWrapperProperties = new Properties();
- mavenWrapperProperties.load( mavenWrapperPropertyFileInputStream );
- url = mavenWrapperProperties.getProperty( PROPERTY_NAME_WRAPPER_URL, url );
- }
- catch ( IOException e )
- {
- System.out.println( "- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'" );
- }
- finally
- {
- try
- {
- if ( mavenWrapperPropertyFileInputStream != null )
- {
- mavenWrapperPropertyFileInputStream.close();
- }
- }
- catch ( IOException e )
- {
- // Ignore ...
- }
- }
+ System.err.println( " - ERROR projectBasedir parameter missing" );
+ System.exit( 1 );
  }
- System.out.println( "- Downloading from: " + url );
 
- File outputFile = new File( baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH );
- if ( !outputFile.getParentFile().exists() )
+ log( " - Downloader started" );
+ final String dir = args[0].replace( "..", "" ); // Sanitize path
+ final Path projectBasedir = Paths.get( dir ).toAbsolutePath().normalize();
+ if ( !Files.isDirectory( projectBasedir, LinkOption._LINKS ) )
  {
- if ( !outputFile.getParentFile().mkdirs() )
- {
- System.out.println( "- ERROR creating output directory '" + outputFile.getParentFile().getAbsolutePath()
- + "'" );
- }
+ System.err.println( " - ERROR projectBasedir not exists: " + projectBasedir );
+ System.exit( 1 );
  }
- System.out.println( "- Downloading to: " + outputFile.getAbsolutePath() );
+
+ log( " - Using base directory: " + projectBasedir );
+
+ // If the maven-wrapper.properties exists, read it and check if it contains a custom
+ // wrapperUrl parameter.
+ Path mavenWrapperPropertyFile = projectBasedir.resolve( MAVEN_WRAPPER_PROPERTIES_PATH );
+ String url = readWrapperUrl( mavenWrapperPropertyFile );
+
  try
  {
+ Path outputFile = projectBasedir.resolve( MAVEN_WRAPPER_JAR_PATH );
+ createDirectories( outputFile.getParent() );
  downloadFileFromURL( url, outputFile );
- System.out.println( "Done" );
+ log( "Done" );
  System.exit( 0 );
  }
- catch ( Throwable e )
+ catch ( IOException e )
  {
- System.out.println( "- Error downloading" );
+ System.err.println( "- Error downloading" );
  e.printStackTrace();
  System.exit( 1 );
  }
  }
 
- private static void downloadFileFromURL( String urlString, File destination )
- throws Exception
+ private static void downloadFileFromURL( String urlString, Path destination ) throws IOException
  {
+ log( " - Downloading to: " + destination );
  if ( System.getenv( "MVNW_USERNAME" ) != null && System.getenv( "MVNW_PASSWORD" ) != null )
  {
- String username = System.getenv( "MVNW_USERNAME" );
- char[] password = System.getenv( "MVNW_PASSWORD" ).toCharArray();
+ final String username = System.getenv( "MVNW_USERNAME" );
+ final char[] password = System.getenv( "MVNW_PASSWORD" ).toCharArray();
  Authenticator.setDefault( new Authenticator()
  {
  @Override
@@ -131,12 +116,47 @@ protected PasswordAuthentication getPasswordAuthentication()
  } );
  }
  URL website = new URL( urlString );
- ReadableByteChannel rbc;
- rbc = Channels.newChannel( website.openStream() );
- FileOutputStream fos = new FileOutputStream( destination );
- fos.getChannel().transferFrom( rbc, 0, Long.MAX_VALUE );
- fos.close();
- rbc.close();
+ try ( InputStream inStream = website.openStream() ) {
+ Files.copy( inStream, destination, StandardCopyOption.REPLACE_EXISTING );
+ }
+ log( " - Downloader complete" );
+ }
+
+ private static void createDirectories(Path outputPath) throws IOException
+ {
+ if ( !Files.isDirectory( outputPath, LinkOption._LINKS ) ) {
+ Path createDirectories = Files.createDirectories( outputPath );
+ log( " - Directories created: " + createDirectories );
+ }
+ }
+
+ private static String readWrapperUrl( Path mavenWrapperPropertyFile )
+ {
+ String url = DEFAULT_DOWNLOAD_URL;
+ if ( Files.exists( mavenWrapperPropertyFile, LinkOption._LINKS ) )
+ {
+ log( " - Reading property file: " + mavenWrapperPropertyFile );
+ try ( InputStream in = Files.newInputStream( mavenWrapperPropertyFile, StandardOpenOption.READ ) )
+ {
+ Properties mavenWrapperProperties = new Properties();
+ mavenWrapperProperties.load( in );
+ url = mavenWrapperProperties.getProperty( PROPERTY_NAME_WRAPPER_URL, DEFAULT_DOWNLOAD_URL );
+ }
+ catch ( IOException e )
+ {
+ System.err.println( " - ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'" );
+ }
+ }
+ log( " - Downloading from: " + url );
+ return url;
+ }
+
+ private static void log( String msg )
+ {
+ if ( VERBOSE )
+ {
+ System.out.println( msg );
+ }
  }
 
 }

.mvn/wrapper/maven-wrapper.properties

@@ -5,14 +5,14 @@
 # to you under the Apache License, Version 2.0 (the
 # "License"); you may not use this file except in compliance
 # with the License. You may obtain a copy of the License at
-# 
-# http:https://www.apache.org/licenses/LICENSE-2.0
-# 
+#
+# https:https://www.apache.org/licenses/LICENSE-2.0
+#
 # Unless required by applicable law or agreed to in writing,
 # software distributed under the License is distributed on an
 # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 # KIND, either express or implied. See the License for the
 # specific language governing permissions and limitations
 # under the License.
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.5/apache-maven-3.8.5-bin.zip
-wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.6/apache-maven-3.8.6-bin.zip
+wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar

CHANGELOG.md

@@ -1,6 +1,18 @@
-3.2.0 (todo)
-============
+3.2.0 (6/26/2022)
+=================
 * Drop Tomcat 7 support as end of life
+* General Build Updates
+* Build jdk 11 or better with target to jdk 8 with enforcer to ensure binary compatibility
+* Require maven 3.8.6 to build
+* Library Updates
+* Plugin Updates
+* Remove jdepend from build as no longer supported
+* Remove animal sniffer as replaced by usage of jdk 11 and enforcer
+* Dropped remainder of java 8 build profile
+* Replace tidy plugin with sort pom plugin for better support
+* Skip license plugin on releases
+* JNA base at 5.12.0
+* Replace tomcat7 plugin with cargo maven3 plugin and simplify README for waffle-filter demo for same.
 
 3.1.1 (12/19/2021)
 ==================