mybatis · hazendaz · May 8, 2021 · May 8, 2021 · May 8, 2021 · May 8, 2021
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -21,3 +21,7 @@ updates:
   schedule:
     interval: daily
   open-pull-requests-limit: 10
+  ignore:
+  - dependency-name: org.hsqldb:hsqldb
+    versions:
+    - ">= 2.6.0"
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -1,5 +1,5 @@
 #
-#    Copyright 2011-2020 the original author or authors.
+#    Copyright 2011-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.
@@ -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"
diff --git a/.github/workflows/coveralls.yaml b/.github/workflows/coveralls.yaml
@@ -1,5 +1,5 @@
 #
-#    Copyright 2011-2020 the original author or authors.
+#    Copyright 2011-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.
@@ -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

diff --git a/.github/workflows/sonar.yaml b/.github/workflows/sonar.yaml
@@ -1,5 +1,5 @@
 #
-#    Copyright 2011-2020 the original author or authors.
+#    Copyright 2011-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.
@@ -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_scala -Dsonar.organization=mybatis -Dsonar.host.url=https://sonarcloud.io -Dsonar.login=$SONAR_TOKEN -Dlicense.skip=true
         env:

diff --git a/.github/workflows/sonatype.yaml b/.github/workflows/sonatype.yaml
@@ -1,5 +1,5 @@
 #
-#    Copyright 2011-2020 the original author or authors.
+#    Copyright 2011-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.
@@ -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:

diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties
@@ -1,2 +1,2 @@
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.1/apache-maven-3.8.1-bin.zip
 wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar
diff --git a/mybatis-scala-core/pom.xml b/mybatis-scala-core/pom.xml
@@ -60,7 +60,7 @@
     <dependency>
       <groupId>org.hsqldb</groupId>
       <artifactId>hsqldb</artifactId>
-      <version>2.5.1</version>
+      <version>2.5.2</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

diff --git a/mybatis-scala-core/src/main/scala/org/mybatis/scala/cache/package.scala b/mybatis-scala-core/src/main/scala/org/mybatis/scala/cache/package.scala
@@ -1,4 +1,4 @@
-/**
+/*
  *    Copyright 2011-2015 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/mybatis-scala-core/src/main/scala/org/mybatis/scala/config/Configuration.scala b/mybatis-scala-core/src/main/scala/org/mybatis/scala/config/Configuration.scala
@@ -1,4 +1,4 @@
-/**
+/*
  *    Copyright 2011-2015 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/mybatis-scala-core/src/main/scala/org/mybatis/scala/config/ConfigurationException.scala b/mybatis-scala-core/src/main/scala/org/mybatis/scala/config/ConfigurationException.scala
@@ -1,4 +1,4 @@
-/**
+/*
  *    Copyright 2011-2015 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/mybatis-scala-core/src/main/scala/org/mybatis/scala/config/ConfigurationSpace.scala b/mybatis-scala-core/src/main/scala/org/mybatis/scala/config/ConfigurationSpace.scala
@@ -1,4 +1,4 @@
-/**
+/*
  *    Copyright 2011-2015 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/mybatis-scala-core/src/main/scala/org/mybatis/scala/config/DefaultScriptingDriver.scala b/mybatis-scala-core/src/main/scala/org/mybatis/scala/config/DefaultScriptingDriver.scala
@@ -1,4 +1,4 @@
-/**
+/*
  *    Copyright 2011-2015 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/mybatis-scala-core/src/main/scala/org/mybatis/scala/config/DynamicSQLBuilder.scala b/mybatis-scala-core/src/main/scala/org/mybatis/scala/config/DynamicSQLBuilder.scala
@@ -1,4 +1,4 @@
-/**
+/*
  *    Copyright 2011-2015 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/mybatis-scala-core/src/main/scala/org/mybatis/scala/config/Environment.scala b/mybatis-scala-core/src/main/scala/org/mybatis/scala/config/Environment.scala
@@ -1,4 +1,4 @@
-/**
+/*
  *    Copyright 2011-2015 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/mybatis-scala-core/src/main/scala/org/mybatis/scala/config/ObjectFactory.scala b/mybatis-scala-core/src/main/scala/org/mybatis/scala/config/ObjectFactory.scala
@@ -1,4 +1,4 @@
-/**
+/*
  *    Copyright 2011-2015 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/mybatis-scala-core/src/main/scala/org/mybatis/scala/config/ObjectWrapperFactory.scala b/mybatis-scala-core/src/main/scala/org/mybatis/scala/config/ObjectWrapperFactory.scala
@@ -1,4 +1,4 @@
-/**
+/*
  *    Copyright 2011-2015 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/mybatis-scala-core/src/main/scala/org/mybatis/scala/config/package.scala b/mybatis-scala-core/src/main/scala/org/mybatis/scala/config/package.scala
@@ -1,4 +1,4 @@
-/**
+/*
  *    Copyright 2011-2015 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/mybatis-scala-core/src/main/scala/org/mybatis/scala/mapping/Binding.scala b/mybatis-scala-core/src/main/scala/org/mybatis/scala/mapping/Binding.scala
@@ -1,4 +1,4 @@
-/**
+/*
  *    Copyright 2011-2015 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/mybatis-scala-core/src/main/scala/org/mybatis/scala/mapping/Case.scala b/mybatis-scala-core/src/main/scala/org/mybatis/scala/mapping/Case.scala
@@ -1,4 +1,4 @@
-/**
+/*
  *    Copyright 2011-2015 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/mybatis-scala-core/src/main/scala/org/mybatis/scala/mapping/Delete.scala b/mybatis-scala-core/src/main/scala/org/mybatis/scala/mapping/Delete.scala
@@ -1,4 +1,4 @@
-/**
+/*
  *    Copyright 2011-2015 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/mybatis-scala-core/src/main/scala/org/mybatis/scala/mapping/FQI.scala b/mybatis-scala-core/src/main/scala/org/mybatis/scala/mapping/FQI.scala
@@ -1,4 +1,4 @@
-/**
+/*
  *    Copyright 2011-2015 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/mybatis-scala-core/src/main/scala/org/mybatis/scala/mapping/Insert.scala b/mybatis-scala-core/src/main/scala/org/mybatis/scala/mapping/Insert.scala
@@ -1,4 +1,4 @@
-/**
+/*
  *    Copyright 2011-2015 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/mybatis-scala-core/src/main/scala/org/mybatis/scala/mapping/JdbcType.scala b/mybatis-scala-core/src/main/scala/org/mybatis/scala/mapping/JdbcType.scala
@@ -1,4 +1,4 @@
-/**
+/*
  *    Copyright 2011-2015 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/mybatis-scala-core/src/main/scala/org/mybatis/scala/mapping/KeyGenerator.scala b/mybatis-scala-core/src/main/scala/org/mybatis/scala/mapping/KeyGenerator.scala
@@ -1,4 +1,4 @@
-/**
+/*
  *    Copyright 2011-2015 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/mybatis-scala-core/src/main/scala/org/mybatis/scala/mapping/OptionTypeHandler.scala b/mybatis-scala-core/src/main/scala/org/mybatis/scala/mapping/OptionTypeHandler.scala
@@ -1,4 +1,4 @@
-/**
+/*
  *    Copyright 2011-2015 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/mybatis-scala-core/src/main/scala/org/mybatis/scala/mapping/Perform.scala b/mybatis-scala-core/src/main/scala/org/mybatis/scala/mapping/Perform.scala
@@ -1,4 +1,4 @@
-/**
+/*
  *    Copyright 2011-2015 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/mybatis-scala-core/src/main/scala/org/mybatis/scala/mapping/ResultFlag.scala b/mybatis-scala-core/src/main/scala/org/mybatis/scala/mapping/ResultFlag.scala
@@ -1,4 +1,4 @@
-/**
+/*
  *    Copyright 2011-2015 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/mybatis-scala-core/src/main/scala/org/mybatis/scala/mapping/ResultMap.scala b/mybatis-scala-core/src/main/scala/org/mybatis/scala/mapping/ResultMap.scala
@@ -1,4 +1,4 @@
-/**
+/*
  *    Copyright 2011-2015 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/mybatis-scala-core/src/main/scala/org/mybatis/scala/mapping/ResultMapping.scala b/mybatis-scala-core/src/main/scala/org/mybatis/scala/mapping/ResultMapping.scala
@@ -1,4 +1,4 @@
-/**
+/*
  *    Copyright 2011-2015 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/mybatis-scala-core/src/main/scala/org/mybatis/scala/mapping/ResultSetType.scala b/mybatis-scala-core/src/main/scala/org/mybatis/scala/mapping/ResultSetType.scala
@@ -1,4 +1,4 @@
-/**
+/*
  *    Copyright 2011-2015 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/mybatis-scala-core/src/main/scala/org/mybatis/scala/mapping/SQLFunction.scala b/mybatis-scala-core/src/main/scala/org/mybatis/scala/mapping/SQLFunction.scala
@@ -1,4 +1,4 @@
-/**
+/*
  *    Copyright 2011-2015 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/mybatis-scala-core/src/main/scala/org/mybatis/scala/mapping/Select.scala b/mybatis-scala-core/src/main/scala/org/mybatis/scala/mapping/Select.scala
@@ -1,4 +1,4 @@
-/**
+/*
  *    Copyright 2011-2015 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/mybatis-scala-core/src/main/scala/org/mybatis/scala/mapping/Statement.scala b/mybatis-scala-core/src/main/scala/org/mybatis/scala/mapping/Statement.scala
@@ -1,4 +1,4 @@
-/**
+/*
  *    Copyright 2011-2015 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/mybatis-scala-core/src/main/scala/org/mybatis/scala/mapping/StatementType.scala b/mybatis-scala-core/src/main/scala/org/mybatis/scala/mapping/StatementType.scala
@@ -1,4 +1,4 @@
-/**
+/*
  *    Copyright 2011-2015 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/mybatis-scala-core/src/main/scala/org/mybatis/scala/mapping/T.scala b/mybatis-scala-core/src/main/scala/org/mybatis/scala/mapping/T.scala
@@ -1,4 +1,4 @@
-/**
+/*
  *    Copyright 2011-2015 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/mybatis-scala-core/src/main/scala/org/mybatis/scala/mapping/Update.scala b/mybatis-scala-core/src/main/scala/org/mybatis/scala/mapping/Update.scala
@@ -1,4 +1,4 @@
-/**
+/*
  *    Copyright 2011-2015 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/mybatis-scala-core/src/main/scala/org/mybatis/scala/mapping/package.scala b/mybatis-scala-core/src/main/scala/org/mybatis/scala/mapping/package.scala
@@ -1,4 +1,4 @@
-/**
+/*
  *    Copyright 2011-2015 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/mybatis-scala-core/src/main/scala/org/mybatis/scala/session/ExecutorType.scala b/mybatis-scala-core/src/main/scala/org/mybatis/scala/session/ExecutorType.scala
@@ -1,4 +1,4 @@
-/**
+/*
  *    Copyright 2011-2015 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/mybatis-scala-core/src/main/scala/org/mybatis/scala/session/ResultHandlerDelegator.scala b/mybatis-scala-core/src/main/scala/org/mybatis/scala/session/ResultHandlerDelegator.scala
@@ -1,4 +1,4 @@
-/**
+/*
  *    Copyright 2011-2015 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/mybatis-scala-core/src/main/scala/org/mybatis/scala/session/RowBounds.scala b/mybatis-scala-core/src/main/scala/org/mybatis/scala/session/RowBounds.scala
@@ -1,4 +1,4 @@
-/**
+/*
  *    Copyright 2011-2015 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/mybatis-scala-core/src/main/scala/org/mybatis/scala/session/Session.scala b/mybatis-scala-core/src/main/scala/org/mybatis/scala/session/Session.scala
@@ -1,4 +1,4 @@
-/**
+/*
  *    Copyright 2011-2015 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/mybatis-scala-core/src/main/scala/org/mybatis/scala/session/SessionManager.scala b/mybatis-scala-core/src/main/scala/org/mybatis/scala/session/SessionManager.scala
@@ -1,4 +1,4 @@
-/**
+/*
  *    Copyright 2011-2015 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/mybatis-scala-core/src/main/scala/org/mybatis/scala/session/TransactionIsolationLevel.scala b/mybatis-scala-core/src/main/scala/org/mybatis/scala/session/TransactionIsolationLevel.scala
@@ -1,4 +1,4 @@
-/**
+/*
  *    Copyright 2011-2015 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/mybatis-scala-core/src/main/scala/org/mybatis/scala/session/package.scala b/mybatis-scala-core/src/main/scala/org/mybatis/scala/session/package.scala
@@ -1,4 +1,4 @@
-/**
+/*
  *    Copyright 2011-2015 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/mybatis-scala-core/src/test/scala/org/mybatis/scala/Database.scala b/mybatis-scala-core/src/test/scala/org/mybatis/scala/Database.scala
@@ -1,4 +1,4 @@
-/**
+/*
  *    Copyright 2011-2015 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/mybatis-scala-core/src/test/scala/org/mybatis/scala/DatabaseSchema.scala b/mybatis-scala-core/src/test/scala/org/mybatis/scala/DatabaseSchema.scala
@@ -1,4 +1,4 @@
-/**
+/*
  *    Copyright 2011-2015 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/mybatis-scala-core/src/test/scala/org/mybatis/scala/DatabaseSupport.scala b/mybatis-scala-core/src/test/scala/org/mybatis/scala/DatabaseSupport.scala
@@ -1,4 +1,4 @@
-/**
+/*
  *    Copyright 2011-2015 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/mybatis-scala-core/src/test/scala/org/mybatis/scala/domain/Blog.scala b/mybatis-scala-core/src/test/scala/org/mybatis/scala/domain/Blog.scala
@@ -1,4 +1,4 @@
-/**
+/*
  *    Copyright 2011-2015 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/mybatis-scala-core/src/test/scala/org/mybatis/scala/domain/User.scala b/mybatis-scala-core/src/test/scala/org/mybatis/scala/domain/User.scala
@@ -1,4 +1,4 @@
-/**
+/*
  *    Copyright 2011-2015 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/mybatis-scala-core/src/test/scala/org/mybatis/scala/infrastructure/BlogRepository.scala b/mybatis-scala-core/src/test/scala/org/mybatis/scala/infrastructure/BlogRepository.scala
@@ -1,4 +1,4 @@
-/**
+/*
  *    Copyright 2011-2015 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/mybatis-scala-core/src/test/scala/org/mybatis/scala/infrastructure/UserRepository.scala b/mybatis-scala-core/src/test/scala/org/mybatis/scala/infrastructure/UserRepository.scala
@@ -1,4 +1,4 @@
-/**
+/*
  *    Copyright 2011-2015 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/mybatis-scala-core/src/test/scala/org/mybatis/scala/mapping/InsertSpec.scala b/mybatis-scala-core/src/test/scala/org/mybatis/scala/mapping/InsertSpec.scala
@@ -1,4 +1,4 @@
-/**
+/*
  *    Copyright 2011-2015 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/mybatis-scala-core/src/test/scala/org/mybatis/scala/mapping/SelectSpec.scala b/mybatis-scala-core/src/test/scala/org/mybatis/scala/mapping/SelectSpec.scala
@@ -1,4 +1,4 @@
-/**
+/*
  *    Copyright 2011-2015 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/mybatis-scala-core/src/test/scala/org/mybatis/scala/mapping/StatementSpec.scala b/mybatis-scala-core/src/test/scala/org/mybatis/scala/mapping/StatementSpec.scala
@@ -1,4 +1,4 @@
-/**
+/*
  *    Copyright 2011-2015 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/mybatis-scala-samples/pom.xml b/mybatis-scala-samples/pom.xml
@@ -49,7 +49,7 @@
     <dependency>
       <groupId>org.hsqldb</groupId>
       <artifactId>hsqldb</artifactId>
-      <version>2.5.1</version>
+      <version>2.5.2</version>
     </dependency>
   </dependencies>