Merge pull request #116 from hazendaz/master

Actions jdk support update / change per mybatis parent 33 on license headers

.github/workflows/ci.yaml

@@ -24,16 +24,18 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macOS-latest, windows-latest]
-        java: [8, 11, 15, 16-ea]
+        java: [8, 11, 16, 17-ea]
+        distribution: ['adopt']
       fail-fast: false
       max-parallel: 4
     name: Test JDK ${{ matrix.java }}, ${{ matrix.os }}
 
     steps:
       - uses: actions/checkout@v2
       - name: Set up JDK
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v2
         with:
           java-version: ${{ matrix.java }}
+          distribution: ${{ matrix.distribution }}
       - name: Test with Maven
         run: ./mvnw test -B -D"license.skip=true"

.github/workflows/coveralls.yaml

@@ -25,9 +25,10 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: Set up JDK
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v2
         with:
           java-version: 8
+          distribution: adopt
       - name: Report Coverage to Coveralls for Pull Requests
         if: github.event_name == 'pull_request'
         run: ./mvnw test jacoco:report coveralls:report -q -Dlicense.skip=true -DrepoToken=$GITHUB_TOKEN -DserviceName=github -DpullRequest=$PR_NUMBER

.github/workflows/sonar.yaml

@@ -31,9 +31,10 @@ jobs:
           # Disabling shallow clone is recommended for improving relevancy of reporting
           fetch-depth: 0
       - name: Set up JDK
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v2
         with:
           java-version: 11
+          distribution: adopt
       - name: Analyze with SonarCloud
         run: ./mvnw verify jacoco:report sonar:sonar -B -Dsonar.projectKey=mybatis_velocity-scripting -Dsonar.organization=mybatis -Dsonar.host.url=https://sonarcloud.io -Dsonar.login=$SONAR_TOKEN -Dlicense.skip=true
         env:

.github/workflows/sonatype.yaml

@@ -28,9 +28,10 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: Set up JDK
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v2
         with:
           java-version: 11
+          distribution: adopt
       - name: Deploy to Sonatype
         run: ./mvnw deploy -DskipTests -B --settings ./.mvn/settings.xml -Dlicense.skip=true
         env:

pom.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-       Copyright 2012-2020 the original author or authors.
+       Copyright 2012-2021 the original author or authors.
 
        Licensed under the Apache License, Version 2.0 (the "License");
        you may not use this file except in compliance with the License.

src/main/java/org/mybatis/scripting/velocity/Driver.java

@@ -1,4 +1,4 @@
-/**
+/*
  *    Copyright 2012-2019 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");

src/main/java/org/mybatis/scripting/velocity/FastLinkedList.java

@@ -1,4 +1,4 @@
-/**
+/*
  *    Copyright 2012-2018 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");

src/main/java/org/mybatis/scripting/velocity/InDirective.java

@@ -1,4 +1,4 @@
-/**
+/*
  *    Copyright 2012-2018 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");

src/main/java/org/mybatis/scripting/velocity/ParameterMappingCollector.java

@@ -1,4 +1,4 @@
-/**
+/*
  *    Copyright 2012-2020 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");

src/main/java/org/mybatis/scripting/velocity/ParameterMappingSourceParser.java

@@ -1,4 +1,4 @@
-/**
+/*
  *    Copyright 2012-2018 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");

src/main/java/org/mybatis/scripting/velocity/RepeatDirective.java

@@ -1,4 +1,4 @@
-/**
+/*
  *    Copyright 2012-2020 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");

src/main/java/org/mybatis/scripting/velocity/SQLScriptSource.java

@@ -1,4 +1,4 @@
-/**
+/*
  *    Copyright 2012-2020 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");

src/main/java/org/mybatis/scripting/velocity/SetDirective.java

@@ -1,4 +1,4 @@
-/**
+/*
  *    Copyright 2012-2020 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");

src/main/java/org/mybatis/scripting/velocity/TrimDirective.java

@@ -1,4 +1,4 @@
-/**
+/*
  *    Copyright 2012-2020 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");

src/main/java/org/mybatis/scripting/velocity/VelocityFacade.java

@@ -1,4 +1,4 @@
-/**
+/*
  *    Copyright 2012-2019 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");

src/main/java/org/mybatis/scripting/velocity/VelocityLanguageDriver.java

@@ -1,4 +1,4 @@
-/**
+/*
  *    Copyright 2012-2019 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");

src/main/java/org/mybatis/scripting/velocity/VelocityLanguageDriverConfig.java

@@ -1,4 +1,4 @@
-/**
+/*
  *    Copyright 2012-2019 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");

src/main/java/org/mybatis/scripting/velocity/WhereDirective.java

@@ -1,4 +1,4 @@
-/**
+/*
  *    Copyright 2012-2020 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");

src/test/java/org/mybatis/scripting/velocity/InDirectiveTest.java

@@ -1,4 +1,4 @@
-/**
+/*
  *    Copyright 2012-2019 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");

src/test/java/org/mybatis/scripting/velocity/TrimDirectiveTest.java

@@ -1,4 +1,4 @@
-/**
+/*
  *    Copyright 2012-2020 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");

src/test/java/org/mybatis/scripting/velocity/VelocityLanguageDriverConfigTest.java

@@ -1,4 +1,4 @@
-/**
+/*
  *    Copyright 2012-2019 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");

src/test/java/org/mybatis/scripting/velocity/WhereDirectiveTest.java

@@ -1,4 +1,4 @@
-/**
+/*
  *    Copyright 2012-2020 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");

src/test/java/org/mybatis/scripting/velocity/use/CustomUserDirective.java

@@ -1,4 +1,4 @@
-/**
+/*
  *    Copyright 2012-2018 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");

src/test/java/org/mybatis/scripting/velocity/use/EnumBinder.java

@@ -1,4 +1,4 @@
-/**
+/*
  *    Copyright 2012-2018 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");

src/test/java/org/mybatis/scripting/velocity/use/EnumWrapper.java

@@ -1,4 +1,4 @@
-/**
+/*
  *    Copyright 2012-2018 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");

src/test/java/org/mybatis/scripting/velocity/use/Name.java

@@ -1,4 +1,4 @@
-/**
+/*
  *    Copyright 2012-2018 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");

src/test/java/org/mybatis/scripting/velocity/use/Parameter.java

@@ -1,4 +1,4 @@
-/**
+/*
  *    Copyright 2012-2018 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");

src/test/java/org/mybatis/scripting/velocity/use/TrailingWildCardFormatter.java

@@ -1,4 +1,4 @@
-/**
+/*
  *    Copyright 2012-2016 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");

src/test/java/org/mybatis/scripting/velocity/use/VelocityLanguageTest.java

@@ -1,4 +1,4 @@
-/**
+/*
  *    Copyright 2012-2020 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");