#3393 Fix for 12.x to support "NoTimeZone" to bypass MySQL JDBC use of Timezone Calendar

[maven-release-plugin] prepare for next development iteration
[maven-release-plugin] prepare release ebean-parent-12.16.2
2024-04-21 10:51:47 +00:00 · 2024-04-17 22:57:55 +12:00 · 2023-09-07 14:50:26 +12:00 · 2023-09-07 14:50:18 +12:00 · 2023-09-07 14:45:59 +12:00 · 2023-09-07 14:44:17 +12:00
21 changed files with 75 additions and 71 deletions
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>12.16.2-SNAPSHOT</version>
+    <version>12.16.3-SNAPSHOT</version>
  </parent>

  <name>ebean api</name>
@@ -117,7 +117,7 @@ public final class BeanSet<E> extends AbstractBeanCollection<E> implements Set<E
    try {
      if (set == null) {
        if (!disableLazyLoad && modifyListening) {
-          lazyLoadCollection(true);
+          lazyLoadCollection(false);
        } else {
          set = new LinkedHashSet<>();
        }
@@ -134,7 +134,7 @@ public final class BeanSet<E> extends AbstractBeanCollection<E> implements Set<E
        if (disableLazyLoad) {
          set = new LinkedHashSet<>();
        } else {
-          lazyLoadCollection(true);
+          lazyLoadCollection(false);
        }
      }
    } finally {
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>12.16.2-SNAPSHOT</version>
+    <version>12.16.3-SNAPSHOT</version>
  </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
@@ -26,7 +26,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>12.16.2-SNAPSHOT</version>
+      <version>12.16.3-SNAPSHOT</version>
      <scope>provided</scope>
    </dependency>

@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>12.16.2-SNAPSHOT</version>
+    <version>12.16.3-SNAPSHOT</version>
  </parent>

  <name>ebean bom</name>
@@ -71,88 +71,88 @@
      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean</artifactId>
-        <version>12.16.2-SNAPSHOT</version>
+        <version>12.16.3-SNAPSHOT</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-api</artifactId>
-        <version>12.16.2-SNAPSHOT</version>
+        <version>12.16.3-SNAPSHOT</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-core</artifactId>
-        <version>12.16.2-SNAPSHOT</version>
+        <version>12.16.3-SNAPSHOT</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-core-type</artifactId>
-        <version>12.16.2-SNAPSHOT</version>
+        <version>12.16.3-SNAPSHOT</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-ddl-generator</artifactId>
-        <version>12.16.2-SNAPSHOT</version>
+        <version>12.16.3-SNAPSHOT</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-externalmapping-api</artifactId>
-        <version>12.16.2-SNAPSHOT</version>
+        <version>12.16.3-SNAPSHOT</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-externalmapping-xml</artifactId>
-        <version>12.16.2-SNAPSHOT</version>
+        <version>12.16.3-SNAPSHOT</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-autotune</artifactId>
-        <version>12.16.2-SNAPSHOT</version>
+        <version>12.16.3-SNAPSHOT</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-querybean</artifactId>
-        <version>12.16.2-SNAPSHOT</version>
+        <version>12.16.3-SNAPSHOT</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>querybean-generator</artifactId>
-        <version>12.16.2-SNAPSHOT</version>
+        <version>12.16.3-SNAPSHOT</version>
        <scope>provided</scope>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>kotlin-querybean-generator</artifactId>
-        <version>12.16.2-SNAPSHOT</version>
+        <version>12.16.3-SNAPSHOT</version>
        <scope>provided</scope>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-test</artifactId>
-        <version>12.16.2-SNAPSHOT</version>
+        <version>12.16.3-SNAPSHOT</version>
        <scope>test</scope>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-postgis</artifactId>
-        <version>12.16.2-SNAPSHOT</version>
+        <version>12.16.3-SNAPSHOT</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-redis</artifactId>
-        <version>12.16.2-SNAPSHOT</version>
+        <version>12.16.3-SNAPSHOT</version>
      </dependency>

    </dependencies>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>12.16.2-SNAPSHOT</version>
+    <version>12.16.3-SNAPSHOT</version>
  </parent>

  <artifactId>ebean-core-type</artifactId>
@@ -16,7 +16,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>12.16.2-SNAPSHOT</version>
+      <version>12.16.3-SNAPSHOT</version>
    </dependency>

    <dependency>
@@ -3,7 +3,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>12.16.2-SNAPSHOT</version>
+    <version>12.16.3-SNAPSHOT</version>
  </parent>

  <artifactId>ebean-core</artifactId>
@@ -41,19 +41,19 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>12.16.2-SNAPSHOT</version>
+      <version>12.16.3-SNAPSHOT</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core-type</artifactId>
-      <version>12.16.2-SNAPSHOT</version>
+      <version>12.16.3-SNAPSHOT</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-externalmapping-api</artifactId>
-      <version>12.16.2-SNAPSHOT</version>
+      <version>12.16.3-SNAPSHOT</version>
    </dependency>

    <dependency>
@@ -97,8 +97,12 @@ public final class LoadManyRequest extends LoadRequest {
    // potentially changes the joins, selected properties, cache mode
    loadContext.configureQuery(query);
    if (onlyIds) {
-      // lazy loading invoked via clear() and removeAll()
-      query.select(many.targetIdProperty());
+      String mapKey = many.mapKey();
+      if (mapKey != null) {
+        query.select(mapKey);
+      } else {
+        query.select(many.targetIdProperty());
+      }
    }
    return query;
  }
@@ -445,6 +445,9 @@ public final class InternalConfiguration {
   */
  private DataTimeZone initDataTimeZone() {
    String tz = config.getDataTimeZone();
+    if ("NoTimeZone".equals(tz)) {
+      return new NoDataTimeZone();
+    }
    if (tz == null) {
      if (isMySql(getPlatform())) {
        return new MySqlDataTimeZone();
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>12.16.2-SNAPSHOT</version>
+    <version>12.16.3-SNAPSHOT</version>
  </parent>

  <name>ebean ddl generation</name>
@@ -28,14 +28,14 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core-type</artifactId>
-      <version>12.16.2-SNAPSHOT</version>
+      <version>12.16.3-SNAPSHOT</version>
      <scope>provided</scope>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>12.16.2-SNAPSHOT</version>
+      <version>12.16.3-SNAPSHOT</version>
      <scope>provided</scope>
    </dependency>

@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>12.16.2-SNAPSHOT</version>
+    <version>12.16.3-SNAPSHOT</version>
  </parent>

  <name>ebean external mapping api</name>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>12.16.2-SNAPSHOT</version>
+    <version>12.16.3-SNAPSHOT</version>
  </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
@@ -33,7 +33,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-externalmapping-api</artifactId>
-      <version>12.16.2-SNAPSHOT</version>
+      <version>12.16.3-SNAPSHOT</version>
    </dependency>

    <dependency>
@@ -59,14 +59,14 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>12.16.2-SNAPSHOT</version>
+      <version>12.16.3-SNAPSHOT</version>
      <scope>test</scope>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.16.2-SNAPSHOT</version>
+      <version>12.16.3-SNAPSHOT</version>
      <scope>test</scope>
    </dependency>

@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>12.16.2-SNAPSHOT</version>
+    <version>12.16.3-SNAPSHOT</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>

@@ -29,7 +27,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>12.16.2-SNAPSHOT</version>
+      <version>12.16.3-SNAPSHOT</version>
      <scope>provided</scope>
    </dependency>

@@ -51,7 +49,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-test</artifactId>
-      <version>12.16.2-SNAPSHOT</version>
+      <version>12.16.3-SNAPSHOT</version>
      <scope>test</scope>
    </dependency>

@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>12.16.2-SNAPSHOT</version>
+    <version>12.16.3-SNAPSHOT</version>
  </parent>

  <name>ebean postgis</name>
@@ -23,7 +23,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>12.16.2-SNAPSHOT</version>
+      <version>12.16.3-SNAPSHOT</version>
      <scope>provided</scope>
    </dependency>

@@ -67,7 +67,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-test</artifactId>
-      <version>12.16.2-SNAPSHOT</version>
+      <version>12.16.3-SNAPSHOT</version>
      <scope>test</scope>
    </dependency>

@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>12.16.2-SNAPSHOT</version>
+    <version>12.16.3-SNAPSHOT</version>
  </parent>

  <name>ebean querybean</name>
@@ -17,7 +17,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>12.16.2-SNAPSHOT</version>
+      <version>12.16.3-SNAPSHOT</version>
      <scope>provided</scope>
    </dependency>

@@ -56,21 +56,21 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.16.2-SNAPSHOT</version>
+      <version>12.16.3-SNAPSHOT</version>
      <scope>test</scope>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>querybean-generator</artifactId>
-      <version>12.16.2-SNAPSHOT</version>
+      <version>12.16.3-SNAPSHOT</version>
      <scope>test</scope>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-test</artifactId>
-      <version>12.16.2-SNAPSHOT</version>
+      <version>12.16.3-SNAPSHOT</version>
      <scope>test</scope>
    </dependency>

@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>12.16.2-SNAPSHOT</version>
+    <version>12.16.3-SNAPSHOT</version>
  </parent>

  <artifactId>ebean-redis</artifactId>
@@ -22,35 +22,35 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>12.16.2-SNAPSHOT</version>
+      <version>12.16.3-SNAPSHOT</version>
      <scope>provided</scope>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>12.16.2-SNAPSHOT</version>
+      <version>12.16.3-SNAPSHOT</version>
      <scope>provided</scope>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>12.16.2-SNAPSHOT</version>
+      <version>12.16.3-SNAPSHOT</version>
      <scope>test</scope>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>querybean-generator</artifactId>
-      <version>12.16.2-SNAPSHOT</version>
+      <version>12.16.3-SNAPSHOT</version>
      <scope>test</scope>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-test</artifactId>
-      <version>12.16.2-SNAPSHOT</version>
+      <version>12.16.3-SNAPSHOT</version>
      <scope>test</scope>
    </dependency>

@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>12.16.2-SNAPSHOT</version>
+    <version>12.16.3-SNAPSHOT</version>
  </parent>

  <name>ebean test</name>
@@ -29,14 +29,14 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>12.16.2-SNAPSHOT</version>
+      <version>12.16.3-SNAPSHOT</version>
      <scope>provided</scope>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.16.2-SNAPSHOT</version>
+      <version>12.16.3-SNAPSHOT</version>
    </dependency>

    <dependency>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>12.16.2-SNAPSHOT</version>
+    <version>12.16.3-SNAPSHOT</version>
  </parent>

  <name>ebean composite</name>
@@ -22,20 +22,20 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>12.16.2-SNAPSHOT</version>
+      <version>12.16.3-SNAPSHOT</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>12.16.2-SNAPSHOT</version>
+      <version>12.16.3-SNAPSHOT</version>
    </dependency>

    <!-- Technically optional but most expected to use query beans -->
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>12.16.2-SNAPSHOT</version>
+      <version>12.16.3-SNAPSHOT</version>
    </dependency>

  </dependencies>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>12.16.2-SNAPSHOT</version>
+    <version>12.16.3-SNAPSHOT</version>
  </parent>

  <name>kotlin querybean generator</name>
@@ -29,7 +29,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>12.16.2-SNAPSHOT</version>
+      <version>12.16.3-SNAPSHOT</version>
      <scope>test</scope>
    </dependency>

@@ -43,7 +43,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>12.16.2-SNAPSHOT</version>
+      <version>12.16.3-SNAPSHOT</version>
      <scope>test</scope>
    </dependency>

@@ -64,7 +64,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.16.2-SNAPSHOT</version>
+      <version>12.16.3-SNAPSHOT</version>
      <scope>test</scope>
    </dependency>

@@ -9,7 +9,7 @@

  <groupId>io.ebean</groupId>
  <artifactId>ebean-parent</artifactId>
-  <version>12.16.2-SNAPSHOT</version>
+  <version>12.16.3-SNAPSHOT</version>
  <packaging>pom</packaging>

  <name>ebean parent</name>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>12.16.2-SNAPSHOT</version>
+    <version>12.16.3-SNAPSHOT</version>
  </parent>

  <name>querybean generator</name>
@@ -5,7 +5,7 @@
    <groupId>org.avaje</groupId>
    <artifactId>java8-oss</artifactId>
    <version>3.3</version>
-    <relativePath/>
+    <relativePath />
  </parent>

  <groupId>io.ebean</groupId>
@@ -40,5 +40,4 @@
      </modules>
    </profile>
  </profiles>
-
 </project>
Author	SHA1	Message	Date
Rob Bygrave	6e163b9f5c	#3393 Fix for 12.x to support "NoTimeZone" to bypass MySQL JDBC use of Timezone Calendar	2024-04-17 22:57:55 +12:00
Rob Bygrave	63336bafe5	[maven-release-plugin] prepare for next development iteration	2023-09-07 14:50:26 +12:00
Rob Bygrave	97ca198b7c	[maven-release-plugin] prepare release ebean-parent-12.16.2	2023-09-07 14:50:18 +12:00
Rob BygraveandGitHub	88fd59e164	Merge pull request #3218 from ebean-orm/backport-12x/3173-BeanSet-init-loading [12x] Backport of fix for #3173 BeanSet init(), initClear() and BeanMap	2023-09-07 14:45:59 +12:00
Rob Bygrave	5b9ef2daec	[12x] Backport of fix for #3173 BeanSet init(), initClear() and BeanMap - BeanSet init() and initClear() load with onlyIds false because the expectation is that with BeanSet the equals/hashCode implementation can use a property - BeanMap lazy loading, include the mapKey if defined in the lazy loading query	2023-09-07 14:44:17 +12:00