Merge pull request #506 from jeffgbutler/update-parent

Update parent

Author: jeffgbutler

.github/dependabot.yml

@@ -25,7 +25,3 @@ updates:
   schedule:
     interval: daily
   open-pull-requests-limit: 10
-  ignore:
-  - dependency-name: org.hsqldb:hsqldb
-    versions:
-    - ">= 2.6.0"

.github/workflows/ci.yaml

@@ -24,7 +24,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        java: [8, 11, 17, 18, 19-ea]
+        java: [11, 17, 18, 19-ea]
         distribution: ['zulu']
       fail-fast: false
       max-parallel: 5

.github/workflows/coveralls.yaml

@@ -27,7 +27,7 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@v3
         with:
-          java-version: 8
+          java-version: 11
           distribution: zulu
       - name: Report Coverage to Coveralls for Pull Requests
         if: github.event_name == 'pull_request'

pom.xml

@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.mybatis</groupId>
     <artifactId>mybatis-parent</artifactId>
-    <version>34</version>
+    <version>35</version>
   </parent>
   <groupId>org.mybatis.dynamic-sql</groupId>
   <artifactId>mybatis-dynamic-sql</artifactId>
@@ -52,9 +52,8 @@
   </distributionManagement>
 
   <properties>
-    <java.version>1.8</java.version>
-    <maven.compiler.source>${java.version}</maven.compiler.source>
-    <maven.compiler.target>${java.version}</maven.compiler.target>
+    <java.test.version>11</java.test.version>
+    <java.test.release.version>11</java.test.release.version>
     <junit.jupiter.version>5.9.0</junit.jupiter.version>
     <junit.platform.version>1.9.0</junit.platform.version>
     <spring.batch.version>4.3.6</spring.batch.version>
@@ -79,6 +78,18 @@
 
   <build>
     <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-enforcer-plugin</artifactId>
+        <configuration>
+          <rules>
+            <enforceBytecodeVersion>
+              <maxJdkVersion>${java.version}</maxJdkVersion>
+              <ignoredScopes>test</ignoredScopes>
+            </enforceBytecodeVersion>
+          </rules>
+        </configuration>
+      </plugin>
       <plugin>
         <groupId>org.jetbrains.kotlin</groupId>
         <artifactId>kotlin-maven-plugin</artifactId>
@@ -171,9 +182,17 @@
       <plugin>
         <groupId>org.eluder.coveralls</groupId>
         <artifactId>coveralls-maven-plugin</artifactId>
+        <version>4.3.0</version>
         <configuration>
           <sourceDirectories>src/main/java,src/main/kotlin</sourceDirectories>
         </configuration>
+        <dependencies>
+          <dependency>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
+            <version>2.3.1</version>
+          </dependency>
+        </dependencies>
       </plugin>
       <plugin>
         <groupId>com.mycila</groupId>
@@ -275,7 +294,7 @@
     <dependency>
       <groupId>org.hsqldb</groupId>
       <artifactId>hsqldb</artifactId>
-      <version>2.5.2</version>
+      <version>2.7.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>

src/test/java/examples/joins/JoinMapperTest.java

@@ -680,36 +680,36 @@ void testFullJoin() {
             SelectStatementProvider selectStatement = select(orderLine.orderId, orderLine.quantity, orderLine.itemId.as("ol_itemid"), itemMaster.itemId.as("im_itemid"), itemMaster.description)
                     .from(itemMaster, "im")
                     .fullJoin(orderLine, "ol").on(itemMaster.itemId, equalTo(orderLine.itemId))
-                    .orderBy(sortColumn("im_itemid"))
+                    .orderBy(orderLine.orderId, sortColumn("im_itemid"))
                     .build()
                     .render(RenderingStrategies.MYBATIS3);
 
             String expectedStatement = "select ol.order_id, ol.quantity, ol.item_id as ol_itemid, im.item_id as im_itemid, im.description"
                     + " from ItemMaster im full join OrderLine ol on im.item_id = ol.item_id"
-                    + " order by im_itemid";
+                    + " order by order_id, im_itemid";
             assertThat(selectStatement.getSelectStatement()).isEqualTo(expectedStatement);
 
             List<Map<String, Object>> rows = mapper.selectManyMappedRows(selectStatement);
 
             assertThat(rows).hasSize(6);
             Map<String, Object> row = rows.get(0);
-            assertThat(row).containsEntry("ORDER_ID", 2);
-            assertThat(row).containsEntry("QUANTITY", 6);
-            assertThat(row).containsEntry("OL_ITEMID", 66);
-            assertThat(row).doesNotContainKey("DESCRIPTION");
-            assertThat(row).doesNotContainKey("IM_ITEMID");
+            assertThat(row).doesNotContainKey("ORDER_ID");
+            assertThat(row).doesNotContainKey("QUANTITY");
+            assertThat(row).containsEntry("DESCRIPTION", "Catcher Glove");
+            assertThat(row).containsEntry("IM_ITEMID", 55);
 
-            row = rows.get(3);
+            row = rows.get(2);
             assertThat(row).containsEntry("ORDER_ID", 1);
             assertThat(row).containsEntry("QUANTITY", 1);
             assertThat(row).containsEntry("DESCRIPTION", "First Base Glove");
             assertThat(row).containsEntry("IM_ITEMID", 33);
 
-            row = rows.get(5);
-            assertThat(row).doesNotContainKey("ORDER_ID");
-            assertThat(row).doesNotContainKey("QUANTITY");
-            assertThat(row).containsEntry("DESCRIPTION", "Catcher Glove");
-            assertThat(row).containsEntry("IM_ITEMID", 55);
+            row = rows.get(3);
+            assertThat(row).containsEntry("ORDER_ID", 2);
+            assertThat(row).containsEntry("QUANTITY", 6);
+            assertThat(row).containsEntry("OL_ITEMID", 66);
+            assertThat(row).doesNotContainKey("DESCRIPTION");
+            assertThat(row).doesNotContainKey("IM_ITEMID");
         }
     }