From f2b57860b9eba8fcfee20ded06eadbd7fee67f01 Mon Sep 17 00:00:00 2001 From: Koen Aers Date: Tue, 30 Jan 2024 12:37:09 +0100 Subject: [PATCH 01/58] HBX-2712: Update Hibernate ORM Dependency to Version 6.4.3-SNAPSHOT Signed-off-by: Koen Aers --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4192667751..77f581d400 100644 --- a/pom.xml +++ b/pom.xml @@ -92,7 +92,7 @@ 1.19.1 2.2.224 6.0.6.Final - 6.4.2.Final + 6.4.3-SNAPSHOT 2.6.1 8.0.1 3.5.3.Final From 5a8d86ee4a8a1d29c775152aed49da75eeda26f6 Mon Sep 17 00:00:00 2001 From: Daren Isaacs Date: Sun, 31 Dec 2023 16:41:29 +1000 Subject: [PATCH 02/58] HBX-2053 Class naming in hibernate.reveng.xml -Adjust table/classname matching logic in OverrideRepository. -New test for entity generation with custom entity package and classname. -Test for h2 lowercase identifier generation. -Adjust the db test utility to allow for an alternate hibernate.properties. --- .../reveng/strategy/OverrideRepository.java | 82 +++++++++-- .../tool/entitynaming/EntityNamingTest.java | 129 ++++++++++++++++++ .../RevengStrategyEntityNaming.java | 64 +++++++++ .../hibernate/tool/entitynaming/create.sql | 4 + .../org/hibernate/tool/entitynaming/drop.sql | 3 + .../tool/entitynaming/hibernate.properties | 7 + .../hibernate/tool/entitynaming/reveng.xml | 8 ++ .../hibernate/tools/test/util/JdbcUtil.java | 63 +++++++-- .../tools/test/util/ResourceUtil.java | 9 ++ .../tools/test/util/JdbcUtilTest.java | 10 +- .../tools/test/util/ResourceUtilTest.java | 5 + .../hprops/AlternateHibernatePropsTest.java | 43 ++++++ .../tools/test/util/hprops/create.sql | 1 + .../hibernate/tools/test/util/hprops/drop.sql | 1 + .../test/util/hprops/hibernate.properties | 6 + 15 files changed, 411 insertions(+), 24 deletions(-) create mode 100644 test/h2/src/test/java/org/hibernate/tool/entitynaming/EntityNamingTest.java create mode 100644 test/h2/src/test/java/org/hibernate/tool/entitynaming/RevengStrategyEntityNaming.java create mode 100644 test/h2/src/test/resources/org/hibernate/tool/entitynaming/create.sql create mode 100644 test/h2/src/test/resources/org/hibernate/tool/entitynaming/drop.sql create mode 100644 test/h2/src/test/resources/org/hibernate/tool/entitynaming/hibernate.properties create mode 100644 test/h2/src/test/resources/org/hibernate/tool/entitynaming/reveng.xml create mode 100644 test/utils/src/test/java/org/hibernate/tools/test/util/hprops/AlternateHibernatePropsTest.java create mode 100644 test/utils/src/test/resources/org/hibernate/tools/test/util/hprops/create.sql create mode 100644 test/utils/src/test/resources/org/hibernate/tools/test/util/hprops/drop.sql create mode 100644 test/utils/src/test/resources/org/hibernate/tools/test/util/hprops/hibernate.properties diff --git a/orm/src/main/java/org/hibernate/tool/internal/reveng/strategy/OverrideRepository.java b/orm/src/main/java/org/hibernate/tool/internal/reveng/strategy/OverrideRepository.java index ecd9777a4f..4f36a7dbb7 100644 --- a/orm/src/main/java/org/hibernate/tool/internal/reveng/strategy/OverrideRepository.java +++ b/orm/src/main/java/org/hibernate/tool/internal/reveng/strategy/OverrideRepository.java @@ -60,7 +60,7 @@ public class OverrideRepository { final private Set excludedColumns; - final private Map tableToClassName; + final private TableToClassName tableToClassName; final private List schemaSelections; @@ -99,7 +99,7 @@ public OverrideRepository() { identifierPropertiesForTable = new HashMap(); primaryKeyColumnsForTable = new HashMap>(); propertyNameForPrimaryKey = new HashMap(); - tableToClassName = new HashMap(); + tableToClassName = new TableToClassName(); excludedColumns = new HashSet(); schemaSelections = new ArrayList(); compositeIdNameForTable = new HashMap(); @@ -600,12 +600,23 @@ public void addTable(Table table, String wantedClassName) { existing.add( fk ); } - tables.add(table); - if(StringHelper.isNotEmpty(wantedClassName)) { - tableToClassName.put(TableIdentifier.create(table), wantedClassName); + TableIdentifier tableIdentifier = TableIdentifier.create(table); + String className = wantedClassName; + /* If wantedClassName specifies a package, it is given by + config so do no more. */ + if(!wantedClassName.contains(".")) { + /* Now look for the package name specified by + config. */ + String packageName = getPackageName(tableIdentifier); + if (packageName != null && !packageName.isBlank()) { + className = packageName + "." + wantedClassName; + } + } + tableToClassName.put(tableIdentifier, className); } - } + tables.add(table); + } static class TableColumnKey { private TableIdentifier query; @@ -739,7 +750,60 @@ public void addMetaAttributeInfo( } - - - + /*It is not possible to match a table on TableMapper alone because RootClassBinder.bind() + calls nullifyDefaultCatalogAndSchema(table) before doing this TableToClassName lookup. + So only use the table name for initial matching, and catalog or schema names when they + are not null. + */ + + private class TableToClassName { + Map map = new HashMap(); + + private String get(TableIdentifier tableIdentifier) { + TableMapper mapper = map.get(tableIdentifier.getName()); + if (mapper != null) { + if (mapper.catalog == null || tableIdentifier.getCatalog() == null || + mapper.catalog.equals(tableIdentifier.getCatalog())){ + if (mapper.schema == null || tableIdentifier.getSchema() == null || + mapper.schema.equals(tableIdentifier.getSchema())){ + if (mapper.packageName.length() == 0) { + return mapper.className; + } else { + return mapper.packageName + "." + mapper.className; + } + } + } + } + return null; + } + + private void put(TableIdentifier tableIdentifier, String wantedClassName) { + TableMapper tableMapper = new TableMapper( + tableIdentifier.getCatalog(), + tableIdentifier.getSchema(), + tableIdentifier.getName(), + wantedClassName); + map.put(tableIdentifier.getName(), tableMapper); + } + } + + private class TableMapper { + String catalog; + String schema; + String className; + String packageName; + + private TableMapper(String catalog, String schema, String name, String wantedClassName) { + this.catalog = catalog; + this.schema = schema; + if (wantedClassName.contains(".")) { + int nameStartPos = wantedClassName.lastIndexOf("."); + this.className = wantedClassName.substring(nameStartPos+1); + this.packageName = wantedClassName.substring(0, nameStartPos); + } else { + this.className = wantedClassName; + this.packageName = ""; + } + } + } } diff --git a/test/h2/src/test/java/org/hibernate/tool/entitynaming/EntityNamingTest.java b/test/h2/src/test/java/org/hibernate/tool/entitynaming/EntityNamingTest.java new file mode 100644 index 0000000000..9c4a27363d --- /dev/null +++ b/test/h2/src/test/java/org/hibernate/tool/entitynaming/EntityNamingTest.java @@ -0,0 +1,129 @@ +/* + * Hibernate Tools, Tooling for your Hibernate Projects + * + * Copyright 2004-2021 Red Hat, Inc. + * + * Licensed under the GNU Lesser General Public License (LGPL), + * version 2.1 or later (the "License"). + * You may not use this file except in compliance with the License. + * You may read the licence in the 'lgpl.txt' file in the root folder of + * project or obtain a copy at + * + * http://www.gnu.org/licenses/lgpl-2.1.html + * + * 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. + */ +package org.hibernate.tool.entitynaming; + +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.io.File; +import java.io.IOException; +import java.nio.file.Files; +import java.util.Properties; + +import org.hibernate.tool.api.export.Exporter; +import org.hibernate.tool.api.export.ExporterConstants; +import org.hibernate.tool.api.export.ExporterFactory; +import org.hibernate.tool.api.export.ExporterType; +import org.hibernate.tool.api.metadata.MetadataDescriptor; +import org.hibernate.tool.api.metadata.MetadataDescriptorFactory; +import org.hibernate.tool.api.reveng.RevengSettings; +import org.hibernate.tool.api.reveng.RevengStrategy; +import org.hibernate.tool.api.reveng.RevengStrategyFactory; +import org.hibernate.tools.test.util.JdbcUtil; +import org.hibernate.tools.test.util.ResourceUtil; +import org.jboss.logging.Logger; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestInstance; +import org.junit.jupiter.api.TestInstance.Lifecycle; +import org.junit.jupiter.api.io.TempDir; + +/** + * Test lowercase database identifiers and specified entity package and class name. + * + * Settings: 1. Adjust hibernate.properties to clear hibernate.default_schema and + * hibernate.default_catalog. Setting these values fail the classname/tablename matching logic + * because of a call to nullifyDefaultCatalogAndSchema(table) in RootClassBinder.bind() before the + * TableToClassName logic. + * + * 2. Create a custom RevengStrategy (eg RevengStrategyEntityNaming.java) with the required + * SchemaSelection settings. + * + * @author Daren + */ +@TestInstance(Lifecycle.PER_CLASS) +public class EntityNamingTest { + + private static final Logger log = Logger.getLogger(EntityNamingTest.class); + + @TempDir + public File outputDir = new File("output"); + + static final String packageName = "com.entity"; + + Properties hibernateProperties = new Properties(); + + @BeforeAll + public void setUp() { + JdbcUtil.createDatabase(this); + try { + hibernateProperties.load(JdbcUtil.getAlternateHibernateProperties(this)); + if (log.isInfoEnabled()) { + log.info(hibernateProperties.toString()); + } + } catch (IOException ex) { + throw new RuntimeException("Alternate hibernate.properties does not exist!", ex); + } + } + + @AfterAll + public void tearDown() { + JdbcUtil.dropDatabase(this); + } + + @Test + public void testGenerateJava() throws IOException { + File[] revengFiles = new File[]{ + ResourceUtil.resolveResourceFile(this.getClass(), "reveng.xml")}; + + RevengStrategy reveng = RevengStrategyFactory.createReverseEngineeringStrategy( + null, revengFiles); + + reveng = new RevengStrategyEntityNaming(reveng); + + //Necessary to set the root strategy. + RevengSettings revengSettings + = new RevengSettings(reveng).setDefaultPackageName(packageName) + .setDetectManyToMany(true) + .setDetectOneToOne(true) + .setDetectOptimisticLock(true); + + reveng.setSettings(revengSettings); + MetadataDescriptor metadataDescriptor = MetadataDescriptorFactory + .createReverseEngineeringDescriptor(reveng, hibernateProperties); + + Exporter exporter = ExporterFactory.createExporter(ExporterType.JAVA); + exporter.getProperties().put(ExporterConstants.METADATA_DESCRIPTOR, metadataDescriptor); + exporter.getProperties().put(ExporterConstants.DESTINATION_FOLDER, outputDir); + exporter.getProperties().setProperty("ejb3", "true"); + exporter.start(); + String packageDir = outputDir + File.separator + + packageName.replace(".", File.separator); + File dummy = new File(packageDir, "Dummy.java"); + assertTrue(dummy.exists()); + File order = new File(packageDir, "Order.java"); + assertTrue(order.exists()); + File orderItem = new File(packageDir, "OrderItem.java"); + assertTrue(orderItem.exists()); + String str = new String(Files.readAllBytes(orderItem.toPath())); + assertTrue(str.contains("private Integer oiId;")); + assertTrue(str.contains("private Order order;")); + } +} diff --git a/test/h2/src/test/java/org/hibernate/tool/entitynaming/RevengStrategyEntityNaming.java b/test/h2/src/test/java/org/hibernate/tool/entitynaming/RevengStrategyEntityNaming.java new file mode 100644 index 0000000000..34e6cbbe9a --- /dev/null +++ b/test/h2/src/test/java/org/hibernate/tool/entitynaming/RevengStrategyEntityNaming.java @@ -0,0 +1,64 @@ +/* + * Copyright (C) 2023 Hibernate. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301 USA + */ +package org.hibernate.tool.entitynaming; + +import java.util.ArrayList; +import java.util.List; + +import org.hibernate.mapping.Column; +import org.hibernate.tool.api.reveng.RevengStrategy; +import org.hibernate.tool.api.reveng.TableIdentifier; +import org.hibernate.tool.internal.reveng.strategy.DelegatingStrategy; +import org.hibernate.tool.internal.util.NameConverter; + +/** + * + * @author Daren + */ +public class RevengStrategyEntityNaming extends DelegatingStrategy { + + private List schemas; + + public RevengStrategyEntityNaming(RevengStrategy delegate) { + super(delegate); + this.schemas = new ArrayList<>(); + schemas.add(new SchemaSelection(){ + @Override + public String getMatchCatalog() { + /* no h2 pattern matching on catalog*/ + return "test1"; + } + + @Override + public String getMatchSchema() { + return "PUBLIC"; + } + + @Override + public String getMatchTable() { + return ".*"; + } + }); + } + + public List getSchemaSelections() { + return schemas; + } + + } diff --git a/test/h2/src/test/resources/org/hibernate/tool/entitynaming/create.sql b/test/h2/src/test/resources/org/hibernate/tool/entitynaming/create.sql new file mode 100644 index 0000000000..392e700d39 --- /dev/null +++ b/test/h2/src/test/resources/org/hibernate/tool/entitynaming/create.sql @@ -0,0 +1,4 @@ +CREATE TABLE "orders" ( "ordId" INT generated by default as identity (start with 1) NOT NULL, "ordDesc" VARCHAR(10), "ordVersion" TINYINT DEFAULT 0 NOT NULL, PRIMARY KEY ("ordId")) +CREATE TABLE "orderItems" ( "oiId" INT generated by default as identity (start with 1) NOT NULL, "oiOrdId" INT NOT NULL, "oiDesc" VARCHAR(10), "oiVersion" TINYINT DEFAULT 0 NOT NULL, PRIMARY KEY ("oiId")) +ALTER TABLE "orderItems" ADD CONSTRAINT "orderorderitemfk" FOREIGN KEY ("oiOrdId") REFERENCES "orders" ("ordId") ON DELETE CASCADE ON UPDATE CASCADE +CREATE TABLE "dummy" ( "duId" INT generated by default as identity (start with 1) NOT NULL, "duVersion" TINYINT DEFAULT 0 NOT NULL, PRIMARY KEY ("duId")) \ No newline at end of file diff --git a/test/h2/src/test/resources/org/hibernate/tool/entitynaming/drop.sql b/test/h2/src/test/resources/org/hibernate/tool/entitynaming/drop.sql new file mode 100644 index 0000000000..78ad958cce --- /dev/null +++ b/test/h2/src/test/resources/org/hibernate/tool/entitynaming/drop.sql @@ -0,0 +1,3 @@ +DROP TABLE "orderItems" +DROP TABLE "orders" +DROP TABLE "dummy" \ No newline at end of file diff --git a/test/h2/src/test/resources/org/hibernate/tool/entitynaming/hibernate.properties b/test/h2/src/test/resources/org/hibernate/tool/entitynaming/hibernate.properties new file mode 100644 index 0000000000..e69951820a --- /dev/null +++ b/test/h2/src/test/resources/org/hibernate/tool/entitynaming/hibernate.properties @@ -0,0 +1,7 @@ +hibernate.dialect org.hibernate.dialect.H2Dialect +hibernate.connection.driver_class org.h2.Driver +hibernate.connection.username sa +hibernate.connection.password +hibernate.connection.url jdbc:h2:mem:test1;DATABASE_TO_UPPER=FALSE +hibernate.default_schema +hibernate.default_catalog diff --git a/test/h2/src/test/resources/org/hibernate/tool/entitynaming/reveng.xml b/test/h2/src/test/resources/org/hibernate/tool/entitynaming/reveng.xml new file mode 100644 index 0000000000..4d81f3d268 --- /dev/null +++ b/test/h2/src/test/resources/org/hibernate/tool/entitynaming/reveng.xml @@ -0,0 +1,8 @@ + + + + + +
+
+ diff --git a/test/utils/src/main/java/org/hibernate/tools/test/util/JdbcUtil.java b/test/utils/src/main/java/org/hibernate/tools/test/util/JdbcUtil.java index 622ddaa1d6..39fa6cd130 100644 --- a/test/utils/src/main/java/org/hibernate/tools/test/util/JdbcUtil.java +++ b/test/utils/src/main/java/org/hibernate/tools/test/util/JdbcUtil.java @@ -35,13 +35,25 @@ public class JdbcUtil { static HashMap CONNECTION_TABLE = new HashMap<>(); - - public static Properties getConnectionProperties() { + + /** + * Obtain the database connection properties. + * @param test object residing in the package of an optional alternate hibernate.properties. + * Set null for the default hibernate.properties. + * @return + */ + public static Properties getConnectionProperties(Object test) { Properties properties = new Properties(); - InputStream inputStream = Thread + InputStream inputStream = null; + if (test != null) { + inputStream = getAlternateHibernateProperties(test); + } + if (inputStream == null) { + inputStream = Thread .currentThread() .getContextClassLoader() .getResourceAsStream("hibernate.properties"); + } try { properties.load(inputStream); } catch (IOException e) { @@ -59,10 +71,21 @@ public static Properties getConnectionProperties() { properties.getProperty("hibernate.connection.password")); return connectionProperties; } - + + public static InputStream getAlternateHibernateProperties(Object test) { + InputStream inputStream = ResourceUtil.resolveResourceLocation( + test.getClass(), "hibernate.properties"); + return inputStream; + } + + /** + * Create a database connection associated with a test object. + * @param test object as key to stored connection. Test object package may also contain + * an optional hibernate.properties. + */ public static void establishJdbcConnection(Object test) { try { - CONNECTION_TABLE.put(test, createJdbcConnection()); + CONNECTION_TABLE.put(test, createJdbcConnection(test)); } catch (SQLException e) { throw new RuntimeException(e); } @@ -102,10 +125,10 @@ public static String toIdentifier(Object test, String string) { } } - public static boolean isDatabaseOnline() { + public static boolean isDatabaseOnline(Object test) { boolean result = false; try { - Connection connection = createJdbcConnection(); + Connection connection = createJdbcConnection(test); result = connection.isValid(1); connection.commit(); connection.close(); @@ -115,15 +138,30 @@ public static boolean isDatabaseOnline() { return result; } + /** + * Establish a connection and execute create.sql. + * + * @param Object residing in the package of create.sql and optional alternate hibernate.properties. + */ public static void createDatabase(Object test) { establishJdbcConnection(test); executeSql(test, getSqls(test, "create.sql")); } + /** + * Using an established connection, execute data.sql. + * + * @param Object residing in the package of data.sql resource. + */ public static void populateDatabase(Object test) { executeSql(test, getSqls(test, "data.sql")); } - + + /** + * Using an established connection, execute drop.sql. + * + * @param Object residing in the package of drop.sql resource. + */ public static void dropDatabase(Object test) { executeSql(test, getSqls(test, "drop.sql")); releaseJdbcConnection(test); @@ -149,9 +187,14 @@ private static String[] getSqls(Object test, String scriptName) { return result; } - private static Connection createJdbcConnection() + /** + * Obtain a connection to a database. + * @param test object as key to stored connection. Test object package may also contain + * an optional hibernate.properties. + */ + private static Connection createJdbcConnection(Object test) throws SQLException { - Properties connectionProperties = getConnectionProperties(); + Properties connectionProperties = getConnectionProperties(test); String connectionUrl = (String)connectionProperties.remove("url"); return DriverManager .getDriver(connectionUrl) diff --git a/test/utils/src/main/java/org/hibernate/tools/test/util/ResourceUtil.java b/test/utils/src/main/java/org/hibernate/tools/test/util/ResourceUtil.java index 6e5ff068e8..5d3ffefbe3 100644 --- a/test/utils/src/main/java/org/hibernate/tools/test/util/ResourceUtil.java +++ b/test/utils/src/main/java/org/hibernate/tools/test/util/ResourceUtil.java @@ -22,6 +22,7 @@ import java.io.File; import java.io.IOException; import java.io.InputStream; +import java.net.URL; import java.nio.file.Files; public class ResourceUtil { @@ -51,6 +52,14 @@ public static InputStream resolveResourceLocation(Class testClass, String res } return result; } + + public static File resolveResourceFile(Class testClass, String resourceName) { + String path = testClass.getPackage().getName().replace('.', File.separatorChar); + URL resourceUrl = testClass.getClassLoader().getResource(path + File.separatorChar + + resourceName); + File resourceFile = new File(resourceUrl.getFile()); + return resourceFile; + } private static String getRelativeResourcesRoot(Class testClass) { return '/' + testClass.getPackage().getName().replace('.', '/') + '/'; diff --git a/test/utils/src/test/java/org/hibernate/tools/test/util/JdbcUtilTest.java b/test/utils/src/test/java/org/hibernate/tools/test/util/JdbcUtilTest.java index 4acf7162ee..26d794577c 100644 --- a/test/utils/src/test/java/org/hibernate/tools/test/util/JdbcUtilTest.java +++ b/test/utils/src/test/java/org/hibernate/tools/test/util/JdbcUtilTest.java @@ -60,10 +60,10 @@ public void tearDown() throws Exception { clearConnectionTable(); restoreClassLoader(); } - + @Test - public void testGetConnectionProperties() throws Exception { - Properties properties = JdbcUtil.getConnectionProperties(); + public void testGetConnectionPropertiesForTest() throws Exception { + Properties properties = JdbcUtil.getConnectionProperties(null); assertEquals("jdbc:h2:mem:test", properties.get("url")); assertEquals("sa", properties.get("user")); assertEquals("", properties.get("password")); @@ -128,10 +128,10 @@ public void testToIdentifier() throws Exception { @Test public void testIsDatabaseOnline() throws Exception { - assertTrue(JdbcUtil.isDatabaseOnline()); + assertTrue(JdbcUtil.isDatabaseOnline(null)); new File(outputFolder, "hibernate.properties").delete(); createHibernateProperties("foo", "bar", "jdbc:sqlserver://org.foo.bar:1433"); - assertFalse(JdbcUtil.isDatabaseOnline()); + assertFalse(JdbcUtil.isDatabaseOnline(null)); } private void clearConnectionTable() throws Exception { diff --git a/test/utils/src/test/java/org/hibernate/tools/test/util/ResourceUtilTest.java b/test/utils/src/test/java/org/hibernate/tools/test/util/ResourceUtilTest.java index 5a72c059f3..12248671f8 100644 --- a/test/utils/src/test/java/org/hibernate/tools/test/util/ResourceUtilTest.java +++ b/test/utils/src/test/java/org/hibernate/tools/test/util/ResourceUtilTest.java @@ -58,4 +58,9 @@ public void testCreateResources() { .contains("HelloWorld")); } + @Test + public void testFindResourceFile() { + File resourceFile = ResourceUtil.resolveResourceFile(this.getClass(), "FileUtilTest.resource"); + assertTrue(resourceFile.exists()); + } } diff --git a/test/utils/src/test/java/org/hibernate/tools/test/util/hprops/AlternateHibernatePropsTest.java b/test/utils/src/test/java/org/hibernate/tools/test/util/hprops/AlternateHibernatePropsTest.java new file mode 100644 index 0000000000..ad2050fa33 --- /dev/null +++ b/test/utils/src/test/java/org/hibernate/tools/test/util/hprops/AlternateHibernatePropsTest.java @@ -0,0 +1,43 @@ +/* + * Hibernate Tools, Tooling for your Hibernate Projects + * + * Copyright 2017-2020 Red Hat, Inc. + * + * Licensed under the GNU Lesser General Public License (LGPL), + * version 2.1 or later (the "License"). + * You may not use this file except in compliance with the License. + * You may read the licence in the 'lgpl.txt' file in the root folder of + * project or obtain a copy at + * + * http://www.gnu.org/licenses/lgpl-2.1.html + * + * 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. + */ +package org.hibernate.tools.test.util.hprops; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +import org.hibernate.tools.test.util.JdbcUtil; +import org.junit.jupiter.api.Test; + +import java.util.Properties; + +public class AlternateHibernatePropsTest { + private static final String connectString = "jdbc:h2:mem:test1;"; + + @Test + public void testExecuteDDL() throws Exception { + + Properties properties = JdbcUtil.getConnectionProperties(this); + assertEquals(connectString, properties.get("url")); + assertEquals("sa", properties.get("user")); + assertEquals("123", properties.get("password")); + + JdbcUtil.createDatabase(this); + JdbcUtil.dropDatabase(this); + } +} \ No newline at end of file diff --git a/test/utils/src/test/resources/org/hibernate/tools/test/util/hprops/create.sql b/test/utils/src/test/resources/org/hibernate/tools/test/util/hprops/create.sql new file mode 100644 index 0000000000..3ae830f859 --- /dev/null +++ b/test/utils/src/test/resources/org/hibernate/tools/test/util/hprops/create.sql @@ -0,0 +1 @@ +CREATE TABLE DUMMY (ID INT, NAME VARCHAR(10)) diff --git a/test/utils/src/test/resources/org/hibernate/tools/test/util/hprops/drop.sql b/test/utils/src/test/resources/org/hibernate/tools/test/util/hprops/drop.sql new file mode 100644 index 0000000000..fd18ea0a11 --- /dev/null +++ b/test/utils/src/test/resources/org/hibernate/tools/test/util/hprops/drop.sql @@ -0,0 +1 @@ +DROP TABLE DUMMY \ No newline at end of file diff --git a/test/utils/src/test/resources/org/hibernate/tools/test/util/hprops/hibernate.properties b/test/utils/src/test/resources/org/hibernate/tools/test/util/hprops/hibernate.properties new file mode 100644 index 0000000000..c9c293a49b --- /dev/null +++ b/test/utils/src/test/resources/org/hibernate/tools/test/util/hprops/hibernate.properties @@ -0,0 +1,6 @@ +hibernate.connection.username sa +hibernate.connection.password 123 +hibernate.connection.url jdbc:h2:mem:test1; +hibernate.dialect org.hibernate.dialect.H2Dialect +hibernate.connection.driver_class org.h2.Driver +hibernate.default_schema PUBLIC From 446e82a0c1fcbe11bc3fa8a253966f3d84e10688 Mon Sep 17 00:00:00 2001 From: Daren Isaacs Date: Wed, 20 Dec 2023 12:04:53 +1000 Subject: [PATCH 03/58] HBX-2661 Fix date test of TypeFactoryWrapperTest. Adjust the test to use the same timezone (UTC+0) as the date formatter of JdbcTimestampJavaType. Note JdbcDateJavaType uses the system default timezone for string format, but I don't believe JdbcTimestampJavaType is at fault. Signed-off-by: Koen Aers --- .../tool/orm/jbt/wrp/TypeFactoryWrapperTest.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/jbt/src/test/java/org/hibernate/tool/orm/jbt/wrp/TypeFactoryWrapperTest.java b/jbt/src/test/java/org/hibernate/tool/orm/jbt/wrp/TypeFactoryWrapperTest.java index fb2a6d3bc1..774962526a 100644 --- a/jbt/src/test/java/org/hibernate/tool/orm/jbt/wrp/TypeFactoryWrapperTest.java +++ b/jbt/src/test/java/org/hibernate/tool/orm/jbt/wrp/TypeFactoryWrapperTest.java @@ -4,6 +4,8 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import java.text.SimpleDateFormat; +import java.time.ZoneId; +import java.time.ZoneOffset; import java.util.Currency; import java.util.Date; import java.util.Locale; @@ -221,8 +223,10 @@ public void testGetTypeFormats() { assertEquals("a string", typeFormats.get(TypeFactoryWrapper.INSTANCE.getStringType())); assertEquals("a text", typeFormats.get(TypeFactoryWrapper.INSTANCE.getTextType())); assertEquals(':', typeFormats.get(TypeFactoryWrapper.INSTANCE.getTimeType()).charAt(2)); - assertEquals( - new SimpleDateFormat("yyyy-MM-dd").format(new Date()), + //JdbcTimestampJavaType uses timezone UTC+0 for the string format vs the system default tz for JdbcDateJavaType. + SimpleDateFormat utcDateFormat = new SimpleDateFormat("yyyy-MM-dd"); + utcDateFormat.setTimeZone(TimeZone.getTimeZone(ZoneId.from( ZoneOffset.UTC ))); + assertEquals(utcDateFormat.format(new Date()).substring(0, 10), typeFormats.get(TypeFactoryWrapper.INSTANCE.getTimestampType()).substring(0, 10)); assertEquals( TimeZone.getDefault().getID(), From e5929f1ea8ccc543dca2c71a65d70aa01447b96a Mon Sep 17 00:00:00 2001 From: Adrien Ferrand Date: Mon, 8 Jan 2024 09:41:38 +0100 Subject: [PATCH 04/58] HBX-2716 - Remove floating point types from types advertised to support precision & scale Signed-off-by: Koen Aers --- .../reveng/reader/BasicColumnProcessor.java | 4 +-- .../util/JdbcToHibernateTypeHelper.java | 34 ++++++++++++------- 2 files changed, 23 insertions(+), 15 deletions(-) diff --git a/orm/src/main/java/org/hibernate/tool/internal/reveng/reader/BasicColumnProcessor.java b/orm/src/main/java/org/hibernate/tool/internal/reveng/reader/BasicColumnProcessor.java index 6536ce30ae..2947d871e7 100644 --- a/orm/src/main/java/org/hibernate/tool/internal/reveng/reader/BasicColumnProcessor.java +++ b/orm/src/main/java/org/hibernate/tool/internal/reveng/reader/BasicColumnProcessor.java @@ -85,12 +85,12 @@ public static void processBasicColumns( if(JdbcToHibernateTypeHelper.typeHasLength(sqlType) ) { column.setLength(size); } - if(JdbcToHibernateTypeHelper.typeHasScaleAndPrecision(sqlType) ) { + if(JdbcToHibernateTypeHelper.typeHasPrecision(sqlType) ) { column.setPrecision(size); } } if(intBounds(decimalDigits) ) { - if(JdbcToHibernateTypeHelper.typeHasScaleAndPrecision(sqlType) ) { + if(JdbcToHibernateTypeHelper.typeHasScale(sqlType) ) { column.setScale(decimalDigits); } } diff --git a/orm/src/main/java/org/hibernate/tool/internal/util/JdbcToHibernateTypeHelper.java b/orm/src/main/java/org/hibernate/tool/internal/util/JdbcToHibernateTypeHelper.java index 8fc41f0941..c6cb354907 100644 --- a/orm/src/main/java/org/hibernate/tool/internal/util/JdbcToHibernateTypeHelper.java +++ b/orm/src/main/java/org/hibernate/tool/internal/util/JdbcToHibernateTypeHelper.java @@ -183,17 +183,25 @@ public static String getJDBCTypeName(int value) { * @throws SQLException */ - // scale and precision have numeric column - public static boolean typeHasScaleAndPrecision(int sqlType) { - return (sqlType == Types.DECIMAL || sqlType == Types.NUMERIC - || sqlType == Types.REAL || sqlType == Types.FLOAT || sqlType == Types.DOUBLE); - } - - // length is for string column - public static boolean typeHasLength(int sqlType) { - return (sqlType == Types.CHAR || sqlType == Types.DATE - || sqlType == Types.LONGVARCHAR || sqlType == Types.TIME || sqlType == Types.TIMESTAMP - || sqlType == Types.VARCHAR ); - } -} + // scale is for non floating point numeric columns + public static boolean typeHasScale(int sqlType) { + return (sqlType == Types.DECIMAL || sqlType == Types.NUMERIC); + } + + // precision is for numeric columns + public static boolean typeHasPrecision(int sqlType) { + return (sqlType == Types.DECIMAL || sqlType == Types.NUMERIC + || sqlType == Types.REAL || sqlType == Types.FLOAT || sqlType == Types.DOUBLE); + } + public static boolean typeHasScaleAndPrecision(int sqlType) { + return typeHasScale(sqlType) && typeHasPrecision(sqlType); + } + + // length is for string columns + public static boolean typeHasLength(int sqlType) { + return (sqlType == Types.CHAR || sqlType == Types.DATE + || sqlType == Types.LONGVARCHAR || sqlType == Types.TIME || sqlType == Types.TIMESTAMP + || sqlType == Types.VARCHAR ); + } +} From 9a32f9165ce0fd4a381a3ed4627638b69c4e6875 Mon Sep 17 00:00:00 2001 From: Koen Aers Date: Wed, 7 Feb 2024 12:09:38 +0100 Subject: [PATCH 05/58] HBX-2717: Update Hibernate ORM Dependency to Version 6.4.3.Final Signed-off-by: Koen Aers --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 77f581d400..08ac45d202 100644 --- a/pom.xml +++ b/pom.xml @@ -92,7 +92,7 @@ 1.19.1 2.2.224 6.0.6.Final - 6.4.3-SNAPSHOT + 6.4.3.Final 2.6.1 8.0.1 3.5.3.Final From da6a6db17f5f8120c0450b9fa617e130f7c0b9a8 Mon Sep 17 00:00:00 2001 From: Koen Aers Date: Wed, 7 Feb 2024 13:49:18 +0100 Subject: [PATCH 06/58] HBX-2718: Update version identifier to 6.4.3.Final Signed-off-by: Koen Aers --- ant/pom.xml | 2 +- jbt/pom.xml | 2 +- maven/pom.xml | 2 +- orm/pom.xml | 2 +- orm/src/main/java/org/hibernate/tool/api/version/Version.java | 2 +- pom.xml | 2 +- test/common/pom.xml | 2 +- test/h2/pom.xml | 2 +- test/hsql/pom.xml | 2 +- test/maven/pom.xml | 2 +- test/mssql/pom.xml | 2 +- test/mysql/pom.xml | 2 +- test/nodb/pom.xml | 2 +- test/oracle/pom.xml | 2 +- test/pom.xml | 2 +- test/utils/pom.xml | 2 +- utils/pom.xml | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/ant/pom.xml b/ant/pom.xml index 8f472b20ba..eebf7be563 100644 --- a/ant/pom.xml +++ b/ant/pom.xml @@ -21,7 +21,7 @@ org.hibernate.tool hibernate-tools-parent - 6.4.3-SNAPSHOT + 6.4.3.Final hibernate-tools-ant diff --git a/jbt/pom.xml b/jbt/pom.xml index 16d9f9f108..1862ec7661 100644 --- a/jbt/pom.xml +++ b/jbt/pom.xml @@ -25,7 +25,7 @@ org.hibernate.tool hibernate-tools-parent - 6.4.3-SNAPSHOT + 6.4.3.Final hibernate-tools-orm-jbt diff --git a/maven/pom.xml b/maven/pom.xml index 2b18aa570f..fe5c0af22a 100644 --- a/maven/pom.xml +++ b/maven/pom.xml @@ -21,7 +21,7 @@ org.hibernate.tool hibernate-tools-parent - 6.4.3-SNAPSHOT + 6.4.3.Final hibernate-tools-maven diff --git a/orm/pom.xml b/orm/pom.xml index 8f726ba3e6..930aaa1412 100644 --- a/orm/pom.xml +++ b/orm/pom.xml @@ -25,7 +25,7 @@ org.hibernate.tool hibernate-tools-parent - 6.4.3-SNAPSHOT + 6.4.3.Final hibernate-tools-orm diff --git a/orm/src/main/java/org/hibernate/tool/api/version/Version.java b/orm/src/main/java/org/hibernate/tool/api/version/Version.java index 9bf5318bfe..f596869f34 100644 --- a/orm/src/main/java/org/hibernate/tool/api/version/Version.java +++ b/orm/src/main/java/org/hibernate/tool/api/version/Version.java @@ -2,6 +2,6 @@ public interface Version { - final static String CURRENT_VERSION = "6.4.3-SNAPSHOT"; + final static String CURRENT_VERSION = "6.4.3.Final"; } diff --git a/pom.xml b/pom.xml index 08ac45d202..309c877670 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ org.hibernate.tool hibernate-tools-parent - 6.4.3-SNAPSHOT + 6.4.3.Final pom diff --git a/test/common/pom.xml b/test/common/pom.xml index 717ee1c0c8..51f560ba36 100644 --- a/test/common/pom.xml +++ b/test/common/pom.xml @@ -28,7 +28,7 @@ org.hibernate.tool hibernate-tools-tests-parent - 6.4.3-SNAPSHOT + 6.4.3.Final hibernate-tools-tests-common diff --git a/test/h2/pom.xml b/test/h2/pom.xml index c88c9e735f..f540cf270a 100644 --- a/test/h2/pom.xml +++ b/test/h2/pom.xml @@ -28,7 +28,7 @@ org.hibernate.tool hibernate-tools-tests-parent - 6.4.3-SNAPSHOT + 6.4.3.Final hibernate-tools-tests-h2 diff --git a/test/hsql/pom.xml b/test/hsql/pom.xml index 4cf475f18c..b51b498e2e 100644 --- a/test/hsql/pom.xml +++ b/test/hsql/pom.xml @@ -27,7 +27,7 @@ org.hibernate.tool hibernate-tools-tests-parent - 6.4.3-SNAPSHOT + 6.4.3.Final hibernate-tools-tests-hsql diff --git a/test/maven/pom.xml b/test/maven/pom.xml index 80eb6ed106..105314d9dc 100644 --- a/test/maven/pom.xml +++ b/test/maven/pom.xml @@ -28,7 +28,7 @@ org.hibernate.tool hibernate-tools-tests-parent - 6.4.3-SNAPSHOT + 6.4.3.Final hibernate-tools-tests-maven diff --git a/test/mssql/pom.xml b/test/mssql/pom.xml index 0e1b225c1f..b65f939810 100644 --- a/test/mssql/pom.xml +++ b/test/mssql/pom.xml @@ -28,7 +28,7 @@ org.hibernate.tool hibernate-tools-tests-parent - 6.4.3-SNAPSHOT + 6.4.3.Final hibernate-tools-tests-mssql diff --git a/test/mysql/pom.xml b/test/mysql/pom.xml index fde93a76f9..b684b9ec2b 100644 --- a/test/mysql/pom.xml +++ b/test/mysql/pom.xml @@ -28,7 +28,7 @@ org.hibernate.tool hibernate-tools-tests-parent - 6.4.3-SNAPSHOT + 6.4.3.Final hibernate-tools-tests-mysql diff --git a/test/nodb/pom.xml b/test/nodb/pom.xml index 6f3e1a060b..86965745a2 100644 --- a/test/nodb/pom.xml +++ b/test/nodb/pom.xml @@ -27,7 +27,7 @@ org.hibernate.tool hibernate-tools-tests-parent - 6.4.3-SNAPSHOT + 6.4.3.Final hibernate-tools-tests-nodb diff --git a/test/oracle/pom.xml b/test/oracle/pom.xml index 0fac086360..468110d512 100644 --- a/test/oracle/pom.xml +++ b/test/oracle/pom.xml @@ -28,7 +28,7 @@ org.hibernate.tool hibernate-tools-tests-parent - 6.4.3-SNAPSHOT + 6.4.3.Final hibernate-tools-tests-oracle diff --git a/test/pom.xml b/test/pom.xml index 36a71d769d..ec46dabd23 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -28,7 +28,7 @@ org.hibernate.tool hibernate-tools-parent - 6.4.3-SNAPSHOT + 6.4.3.Final hibernate-tools-tests-parent diff --git a/test/utils/pom.xml b/test/utils/pom.xml index e591274ff6..08ccc0c5c2 100644 --- a/test/utils/pom.xml +++ b/test/utils/pom.xml @@ -27,7 +27,7 @@ org.hibernate.tool hibernate-tools-tests-parent - 6.4.3-SNAPSHOT + 6.4.3.Final hibernate-tools-tests-utils diff --git a/utils/pom.xml b/utils/pom.xml index 3866b20968..241d3f49e7 100644 --- a/utils/pom.xml +++ b/utils/pom.xml @@ -21,7 +21,7 @@ org.hibernate.tool hibernate-tools-parent - 6.4.3-SNAPSHOT + 6.4.3.Final hibernate-tools-utils From b9148bf60e99d6f730c15d1426becf639283beec Mon Sep 17 00:00:00 2001 From: Koen Aers Date: Wed, 7 Feb 2024 16:50:55 +0100 Subject: [PATCH 07/58] HBX-2721: Update version identifier to 6.4.4-SNAPSHOT Signed-off-by: Koen Aers --- ant/pom.xml | 2 +- jbt/pom.xml | 2 +- maven/pom.xml | 2 +- orm/pom.xml | 2 +- orm/src/main/java/org/hibernate/tool/api/version/Version.java | 2 +- pom.xml | 2 +- test/common/pom.xml | 2 +- test/h2/pom.xml | 2 +- test/hsql/pom.xml | 2 +- test/maven/pom.xml | 2 +- test/mssql/pom.xml | 2 +- test/mysql/pom.xml | 2 +- test/nodb/pom.xml | 2 +- test/oracle/pom.xml | 2 +- test/pom.xml | 2 +- test/utils/pom.xml | 2 +- utils/pom.xml | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/ant/pom.xml b/ant/pom.xml index eebf7be563..6114efd898 100644 --- a/ant/pom.xml +++ b/ant/pom.xml @@ -21,7 +21,7 @@ org.hibernate.tool hibernate-tools-parent - 6.4.3.Final + 6.4.4-SNAPSHOT hibernate-tools-ant diff --git a/jbt/pom.xml b/jbt/pom.xml index 1862ec7661..1dc51cd1ba 100644 --- a/jbt/pom.xml +++ b/jbt/pom.xml @@ -25,7 +25,7 @@ org.hibernate.tool hibernate-tools-parent - 6.4.3.Final + 6.4.4-SNAPSHOT hibernate-tools-orm-jbt diff --git a/maven/pom.xml b/maven/pom.xml index fe5c0af22a..8d128a1a82 100644 --- a/maven/pom.xml +++ b/maven/pom.xml @@ -21,7 +21,7 @@ org.hibernate.tool hibernate-tools-parent - 6.4.3.Final + 6.4.4-SNAPSHOT hibernate-tools-maven diff --git a/orm/pom.xml b/orm/pom.xml index 930aaa1412..abf585d6b4 100644 --- a/orm/pom.xml +++ b/orm/pom.xml @@ -25,7 +25,7 @@ org.hibernate.tool hibernate-tools-parent - 6.4.3.Final + 6.4.4-SNAPSHOT hibernate-tools-orm diff --git a/orm/src/main/java/org/hibernate/tool/api/version/Version.java b/orm/src/main/java/org/hibernate/tool/api/version/Version.java index f596869f34..6fb6545988 100644 --- a/orm/src/main/java/org/hibernate/tool/api/version/Version.java +++ b/orm/src/main/java/org/hibernate/tool/api/version/Version.java @@ -2,6 +2,6 @@ public interface Version { - final static String CURRENT_VERSION = "6.4.3.Final"; + final static String CURRENT_VERSION = "6.4.4-SNAPSHOT"; } diff --git a/pom.xml b/pom.xml index 309c877670..f2ace65017 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ org.hibernate.tool hibernate-tools-parent - 6.4.3.Final + 6.4.4-SNAPSHOT pom diff --git a/test/common/pom.xml b/test/common/pom.xml index 51f560ba36..6cbc803079 100644 --- a/test/common/pom.xml +++ b/test/common/pom.xml @@ -28,7 +28,7 @@ org.hibernate.tool hibernate-tools-tests-parent - 6.4.3.Final + 6.4.4-SNAPSHOT hibernate-tools-tests-common diff --git a/test/h2/pom.xml b/test/h2/pom.xml index f540cf270a..92925004e3 100644 --- a/test/h2/pom.xml +++ b/test/h2/pom.xml @@ -28,7 +28,7 @@ org.hibernate.tool hibernate-tools-tests-parent - 6.4.3.Final + 6.4.4-SNAPSHOT hibernate-tools-tests-h2 diff --git a/test/hsql/pom.xml b/test/hsql/pom.xml index b51b498e2e..fc6997827e 100644 --- a/test/hsql/pom.xml +++ b/test/hsql/pom.xml @@ -27,7 +27,7 @@ org.hibernate.tool hibernate-tools-tests-parent - 6.4.3.Final + 6.4.4-SNAPSHOT hibernate-tools-tests-hsql diff --git a/test/maven/pom.xml b/test/maven/pom.xml index 105314d9dc..d2fa5f8417 100644 --- a/test/maven/pom.xml +++ b/test/maven/pom.xml @@ -28,7 +28,7 @@ org.hibernate.tool hibernate-tools-tests-parent - 6.4.3.Final + 6.4.4-SNAPSHOT hibernate-tools-tests-maven diff --git a/test/mssql/pom.xml b/test/mssql/pom.xml index b65f939810..1f3b5ff37f 100644 --- a/test/mssql/pom.xml +++ b/test/mssql/pom.xml @@ -28,7 +28,7 @@ org.hibernate.tool hibernate-tools-tests-parent - 6.4.3.Final + 6.4.4-SNAPSHOT hibernate-tools-tests-mssql diff --git a/test/mysql/pom.xml b/test/mysql/pom.xml index b684b9ec2b..b396f89052 100644 --- a/test/mysql/pom.xml +++ b/test/mysql/pom.xml @@ -28,7 +28,7 @@ org.hibernate.tool hibernate-tools-tests-parent - 6.4.3.Final + 6.4.4-SNAPSHOT hibernate-tools-tests-mysql diff --git a/test/nodb/pom.xml b/test/nodb/pom.xml index 86965745a2..0d17642eb4 100644 --- a/test/nodb/pom.xml +++ b/test/nodb/pom.xml @@ -27,7 +27,7 @@ org.hibernate.tool hibernate-tools-tests-parent - 6.4.3.Final + 6.4.4-SNAPSHOT hibernate-tools-tests-nodb diff --git a/test/oracle/pom.xml b/test/oracle/pom.xml index 468110d512..1ce8cbb705 100644 --- a/test/oracle/pom.xml +++ b/test/oracle/pom.xml @@ -28,7 +28,7 @@ org.hibernate.tool hibernate-tools-tests-parent - 6.4.3.Final + 6.4.4-SNAPSHOT hibernate-tools-tests-oracle diff --git a/test/pom.xml b/test/pom.xml index ec46dabd23..fef9e3d411 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -28,7 +28,7 @@ org.hibernate.tool hibernate-tools-parent - 6.4.3.Final + 6.4.4-SNAPSHOT hibernate-tools-tests-parent diff --git a/test/utils/pom.xml b/test/utils/pom.xml index 08ccc0c5c2..599f33c9cc 100644 --- a/test/utils/pom.xml +++ b/test/utils/pom.xml @@ -27,7 +27,7 @@ org.hibernate.tool hibernate-tools-tests-parent - 6.4.3.Final + 6.4.4-SNAPSHOT hibernate-tools-tests-utils diff --git a/utils/pom.xml b/utils/pom.xml index 241d3f49e7..ed8053993e 100644 --- a/utils/pom.xml +++ b/utils/pom.xml @@ -21,7 +21,7 @@ org.hibernate.tool hibernate-tools-parent - 6.4.3.Final + 6.4.4-SNAPSHOT hibernate-tools-utils From d2f3df712809baaba456056f5241d0639f13c0ef Mon Sep 17 00:00:00 2001 From: Koen Aers Date: Thu, 8 Feb 2024 08:20:42 +0100 Subject: [PATCH 08/58] HBX-2722: Update Hibernate ORM Dependency to Version 6.4.4-SNAPSHOT Signed-off-by: Koen Aers --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f2ace65017..3ea8e840dc 100644 --- a/pom.xml +++ b/pom.xml @@ -92,7 +92,7 @@ 1.19.1 2.2.224 6.0.6.Final - 6.4.3.Final + 6.4.4-SNAPSHOT 2.6.1 8.0.1 3.5.3.Final From ad34fa4586d13ecbe5b370827cbbfa58274cb190 Mon Sep 17 00:00:00 2001 From: Koen Aers Date: Fri, 16 Feb 2024 14:42:42 +0200 Subject: [PATCH 09/58] HBX-2723: Update Hibernate ORM Dependency to Version 6.4.4.Final Signed-off-by: Koen Aers --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3ea8e840dc..fe75b1dc58 100644 --- a/pom.xml +++ b/pom.xml @@ -92,7 +92,7 @@ 1.19.1 2.2.224 6.0.6.Final - 6.4.4-SNAPSHOT + 6.4.4.Final 2.6.1 8.0.1 3.5.3.Final From f4dd6b70dcdaf2d3f0781f4909062c725fb864e3 Mon Sep 17 00:00:00 2001 From: Koen Aers Date: Fri, 16 Feb 2024 14:59:13 +0200 Subject: [PATCH 10/58] HBX-2724: Update version identifier to 6.4.4.Final Signed-off-by: Koen Aers --- ant/pom.xml | 2 +- jbt/pom.xml | 2 +- maven/pom.xml | 2 +- orm/pom.xml | 2 +- orm/src/main/java/org/hibernate/tool/api/version/Version.java | 2 +- pom.xml | 2 +- test/common/pom.xml | 2 +- test/h2/pom.xml | 2 +- test/hsql/pom.xml | 2 +- test/maven/pom.xml | 2 +- test/mssql/pom.xml | 2 +- test/mysql/pom.xml | 2 +- test/nodb/pom.xml | 2 +- test/oracle/pom.xml | 2 +- test/pom.xml | 2 +- test/utils/pom.xml | 2 +- utils/pom.xml | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/ant/pom.xml b/ant/pom.xml index 6114efd898..3e0089e728 100644 --- a/ant/pom.xml +++ b/ant/pom.xml @@ -21,7 +21,7 @@ org.hibernate.tool hibernate-tools-parent - 6.4.4-SNAPSHOT + 6.4.4.Final hibernate-tools-ant diff --git a/jbt/pom.xml b/jbt/pom.xml index 1dc51cd1ba..d0b5953a88 100644 --- a/jbt/pom.xml +++ b/jbt/pom.xml @@ -25,7 +25,7 @@ org.hibernate.tool hibernate-tools-parent - 6.4.4-SNAPSHOT + 6.4.4.Final hibernate-tools-orm-jbt diff --git a/maven/pom.xml b/maven/pom.xml index 8d128a1a82..09a97f7c4e 100644 --- a/maven/pom.xml +++ b/maven/pom.xml @@ -21,7 +21,7 @@ org.hibernate.tool hibernate-tools-parent - 6.4.4-SNAPSHOT + 6.4.4.Final hibernate-tools-maven diff --git a/orm/pom.xml b/orm/pom.xml index abf585d6b4..9012eb9b47 100644 --- a/orm/pom.xml +++ b/orm/pom.xml @@ -25,7 +25,7 @@ org.hibernate.tool hibernate-tools-parent - 6.4.4-SNAPSHOT + 6.4.4.Final hibernate-tools-orm diff --git a/orm/src/main/java/org/hibernate/tool/api/version/Version.java b/orm/src/main/java/org/hibernate/tool/api/version/Version.java index 6fb6545988..b33b832cba 100644 --- a/orm/src/main/java/org/hibernate/tool/api/version/Version.java +++ b/orm/src/main/java/org/hibernate/tool/api/version/Version.java @@ -2,6 +2,6 @@ public interface Version { - final static String CURRENT_VERSION = "6.4.4-SNAPSHOT"; + final static String CURRENT_VERSION = "6.4.4.Final"; } diff --git a/pom.xml b/pom.xml index fe75b1dc58..f02ead74a2 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ org.hibernate.tool hibernate-tools-parent - 6.4.4-SNAPSHOT + 6.4.4.Final pom diff --git a/test/common/pom.xml b/test/common/pom.xml index 6cbc803079..2baefacec2 100644 --- a/test/common/pom.xml +++ b/test/common/pom.xml @@ -28,7 +28,7 @@ org.hibernate.tool hibernate-tools-tests-parent - 6.4.4-SNAPSHOT + 6.4.4.Final hibernate-tools-tests-common diff --git a/test/h2/pom.xml b/test/h2/pom.xml index 92925004e3..e96b73ff61 100644 --- a/test/h2/pom.xml +++ b/test/h2/pom.xml @@ -28,7 +28,7 @@ org.hibernate.tool hibernate-tools-tests-parent - 6.4.4-SNAPSHOT + 6.4.4.Final hibernate-tools-tests-h2 diff --git a/test/hsql/pom.xml b/test/hsql/pom.xml index fc6997827e..2a7c8297f5 100644 --- a/test/hsql/pom.xml +++ b/test/hsql/pom.xml @@ -27,7 +27,7 @@ org.hibernate.tool hibernate-tools-tests-parent - 6.4.4-SNAPSHOT + 6.4.4.Final hibernate-tools-tests-hsql diff --git a/test/maven/pom.xml b/test/maven/pom.xml index d2fa5f8417..8116807975 100644 --- a/test/maven/pom.xml +++ b/test/maven/pom.xml @@ -28,7 +28,7 @@ org.hibernate.tool hibernate-tools-tests-parent - 6.4.4-SNAPSHOT + 6.4.4.Final hibernate-tools-tests-maven diff --git a/test/mssql/pom.xml b/test/mssql/pom.xml index 1f3b5ff37f..8183e6939d 100644 --- a/test/mssql/pom.xml +++ b/test/mssql/pom.xml @@ -28,7 +28,7 @@ org.hibernate.tool hibernate-tools-tests-parent - 6.4.4-SNAPSHOT + 6.4.4.Final hibernate-tools-tests-mssql diff --git a/test/mysql/pom.xml b/test/mysql/pom.xml index b396f89052..3226a9963c 100644 --- a/test/mysql/pom.xml +++ b/test/mysql/pom.xml @@ -28,7 +28,7 @@ org.hibernate.tool hibernate-tools-tests-parent - 6.4.4-SNAPSHOT + 6.4.4.Final hibernate-tools-tests-mysql diff --git a/test/nodb/pom.xml b/test/nodb/pom.xml index 0d17642eb4..f418959146 100644 --- a/test/nodb/pom.xml +++ b/test/nodb/pom.xml @@ -27,7 +27,7 @@ org.hibernate.tool hibernate-tools-tests-parent - 6.4.4-SNAPSHOT + 6.4.4.Final hibernate-tools-tests-nodb diff --git a/test/oracle/pom.xml b/test/oracle/pom.xml index 1ce8cbb705..9d2e99db01 100644 --- a/test/oracle/pom.xml +++ b/test/oracle/pom.xml @@ -28,7 +28,7 @@ org.hibernate.tool hibernate-tools-tests-parent - 6.4.4-SNAPSHOT + 6.4.4.Final hibernate-tools-tests-oracle diff --git a/test/pom.xml b/test/pom.xml index fef9e3d411..0daaa8babf 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -28,7 +28,7 @@ org.hibernate.tool hibernate-tools-parent - 6.4.4-SNAPSHOT + 6.4.4.Final hibernate-tools-tests-parent diff --git a/test/utils/pom.xml b/test/utils/pom.xml index 599f33c9cc..f6f20b37cb 100644 --- a/test/utils/pom.xml +++ b/test/utils/pom.xml @@ -27,7 +27,7 @@ org.hibernate.tool hibernate-tools-tests-parent - 6.4.4-SNAPSHOT + 6.4.4.Final hibernate-tools-tests-utils diff --git a/utils/pom.xml b/utils/pom.xml index ed8053993e..578c3d76ec 100644 --- a/utils/pom.xml +++ b/utils/pom.xml @@ -21,7 +21,7 @@ org.hibernate.tool hibernate-tools-parent - 6.4.4-SNAPSHOT + 6.4.4.Final hibernate-tools-utils From 28ae91976150b7fadf24dd50ac2726859428dfbb Mon Sep 17 00:00:00 2001 From: Koen Aers Date: Mon, 19 Feb 2024 14:52:45 +0100 Subject: [PATCH 11/58] HBX-2725: Update version identifier to 6.4.5-SNAPSHOT Signed-off-by: Koen Aers --- ant/pom.xml | 2 +- jbt/pom.xml | 2 +- maven/pom.xml | 2 +- orm/pom.xml | 2 +- orm/src/main/java/org/hibernate/tool/api/version/Version.java | 2 +- pom.xml | 2 +- test/common/pom.xml | 2 +- test/h2/pom.xml | 2 +- test/hsql/pom.xml | 2 +- test/maven/pom.xml | 2 +- test/mssql/pom.xml | 2 +- test/mysql/pom.xml | 2 +- test/nodb/pom.xml | 2 +- test/oracle/pom.xml | 2 +- test/pom.xml | 2 +- test/utils/pom.xml | 2 +- utils/pom.xml | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/ant/pom.xml b/ant/pom.xml index 3e0089e728..8023d9d67a 100644 --- a/ant/pom.xml +++ b/ant/pom.xml @@ -21,7 +21,7 @@ org.hibernate.tool hibernate-tools-parent - 6.4.4.Final + 6.4.5-SNAPSHOT hibernate-tools-ant diff --git a/jbt/pom.xml b/jbt/pom.xml index d0b5953a88..a90be7c8e2 100644 --- a/jbt/pom.xml +++ b/jbt/pom.xml @@ -25,7 +25,7 @@ org.hibernate.tool hibernate-tools-parent - 6.4.4.Final + 6.4.5-SNAPSHOT hibernate-tools-orm-jbt diff --git a/maven/pom.xml b/maven/pom.xml index 09a97f7c4e..379195c8f3 100644 --- a/maven/pom.xml +++ b/maven/pom.xml @@ -21,7 +21,7 @@ org.hibernate.tool hibernate-tools-parent - 6.4.4.Final + 6.4.5-SNAPSHOT hibernate-tools-maven diff --git a/orm/pom.xml b/orm/pom.xml index 9012eb9b47..bc61877cc8 100644 --- a/orm/pom.xml +++ b/orm/pom.xml @@ -25,7 +25,7 @@ org.hibernate.tool hibernate-tools-parent - 6.4.4.Final + 6.4.5-SNAPSHOT hibernate-tools-orm diff --git a/orm/src/main/java/org/hibernate/tool/api/version/Version.java b/orm/src/main/java/org/hibernate/tool/api/version/Version.java index b33b832cba..bf51d6cfc2 100644 --- a/orm/src/main/java/org/hibernate/tool/api/version/Version.java +++ b/orm/src/main/java/org/hibernate/tool/api/version/Version.java @@ -2,6 +2,6 @@ public interface Version { - final static String CURRENT_VERSION = "6.4.4.Final"; + final static String CURRENT_VERSION = "6.4.5-SNAPSHOT"; } diff --git a/pom.xml b/pom.xml index f02ead74a2..66693d700f 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ org.hibernate.tool hibernate-tools-parent - 6.4.4.Final + 6.4.5-SNAPSHOT pom diff --git a/test/common/pom.xml b/test/common/pom.xml index 2baefacec2..66abceea8c 100644 --- a/test/common/pom.xml +++ b/test/common/pom.xml @@ -28,7 +28,7 @@ org.hibernate.tool hibernate-tools-tests-parent - 6.4.4.Final + 6.4.5-SNAPSHOT hibernate-tools-tests-common diff --git a/test/h2/pom.xml b/test/h2/pom.xml index e96b73ff61..5d25a93f00 100644 --- a/test/h2/pom.xml +++ b/test/h2/pom.xml @@ -28,7 +28,7 @@ org.hibernate.tool hibernate-tools-tests-parent - 6.4.4.Final + 6.4.5-SNAPSHOT hibernate-tools-tests-h2 diff --git a/test/hsql/pom.xml b/test/hsql/pom.xml index 2a7c8297f5..445dc2c184 100644 --- a/test/hsql/pom.xml +++ b/test/hsql/pom.xml @@ -27,7 +27,7 @@ org.hibernate.tool hibernate-tools-tests-parent - 6.4.4.Final + 6.4.5-SNAPSHOT hibernate-tools-tests-hsql diff --git a/test/maven/pom.xml b/test/maven/pom.xml index 8116807975..ac3b3aba7f 100644 --- a/test/maven/pom.xml +++ b/test/maven/pom.xml @@ -28,7 +28,7 @@ org.hibernate.tool hibernate-tools-tests-parent - 6.4.4.Final + 6.4.5-SNAPSHOT hibernate-tools-tests-maven diff --git a/test/mssql/pom.xml b/test/mssql/pom.xml index 8183e6939d..59e4f03be9 100644 --- a/test/mssql/pom.xml +++ b/test/mssql/pom.xml @@ -28,7 +28,7 @@ org.hibernate.tool hibernate-tools-tests-parent - 6.4.4.Final + 6.4.5-SNAPSHOT hibernate-tools-tests-mssql diff --git a/test/mysql/pom.xml b/test/mysql/pom.xml index 3226a9963c..32f23ac34f 100644 --- a/test/mysql/pom.xml +++ b/test/mysql/pom.xml @@ -28,7 +28,7 @@ org.hibernate.tool hibernate-tools-tests-parent - 6.4.4.Final + 6.4.5-SNAPSHOT hibernate-tools-tests-mysql diff --git a/test/nodb/pom.xml b/test/nodb/pom.xml index f418959146..e3bec68313 100644 --- a/test/nodb/pom.xml +++ b/test/nodb/pom.xml @@ -27,7 +27,7 @@ org.hibernate.tool hibernate-tools-tests-parent - 6.4.4.Final + 6.4.5-SNAPSHOT hibernate-tools-tests-nodb diff --git a/test/oracle/pom.xml b/test/oracle/pom.xml index 9d2e99db01..ea136c0c0a 100644 --- a/test/oracle/pom.xml +++ b/test/oracle/pom.xml @@ -28,7 +28,7 @@ org.hibernate.tool hibernate-tools-tests-parent - 6.4.4.Final + 6.4.5-SNAPSHOT hibernate-tools-tests-oracle diff --git a/test/pom.xml b/test/pom.xml index 0daaa8babf..1d2c57edc7 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -28,7 +28,7 @@ org.hibernate.tool hibernate-tools-parent - 6.4.4.Final + 6.4.5-SNAPSHOT hibernate-tools-tests-parent diff --git a/test/utils/pom.xml b/test/utils/pom.xml index f6f20b37cb..647c3e62c6 100644 --- a/test/utils/pom.xml +++ b/test/utils/pom.xml @@ -27,7 +27,7 @@ org.hibernate.tool hibernate-tools-tests-parent - 6.4.4.Final + 6.4.5-SNAPSHOT hibernate-tools-tests-utils diff --git a/utils/pom.xml b/utils/pom.xml index 578c3d76ec..f87453408a 100644 --- a/utils/pom.xml +++ b/utils/pom.xml @@ -21,7 +21,7 @@ org.hibernate.tool hibernate-tools-parent - 6.4.4.Final + 6.4.5-SNAPSHOT hibernate-tools-utils From 01872338cf44426775fc0d7ef19a5963b052abb0 Mon Sep 17 00:00:00 2001 From: Koen Aers Date: Mon, 19 Feb 2024 15:03:36 +0100 Subject: [PATCH 12/58] HBX-2726: Update Hibernate ORM Dependency to Version 6.4.5-SNAPSHOT Signed-off-by: Koen Aers --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 66693d700f..61eef4f629 100644 --- a/pom.xml +++ b/pom.xml @@ -92,7 +92,7 @@ 1.19.1 2.2.224 6.0.6.Final - 6.4.4.Final + 6.4.5-SNAPSHOT 2.6.1 8.0.1 3.5.3.Final From 92310f540f16be4e188dcb2b04fc27d54dc95277 Mon Sep 17 00:00:00 2001 From: Jan Schatteman Date: Tue, 30 Apr 2024 16:03:27 +0200 Subject: [PATCH 13/58] HBX-2793: Update Hibernate ORM Dependency to Version 6.4.5.Final Signed-off-by: Jan Schatteman --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 61eef4f629..d34bdbca73 100644 --- a/pom.xml +++ b/pom.xml @@ -92,7 +92,7 @@ 1.19.1 2.2.224 6.0.6.Final - 6.4.5-SNAPSHOT + 6.4.5.Final 2.6.1 8.0.1 3.5.3.Final From f792a2a64214ab61a8c0b9d7f47a616966edc818 Mon Sep 17 00:00:00 2001 From: Jan Schatteman Date: Tue, 30 Apr 2024 16:57:46 +0200 Subject: [PATCH 14/58] HBX-2794: Update version identifier to 6.4.5.Final Signed-off-by: Jan Schatteman --- ant/pom.xml | 2 +- jbt/pom.xml | 2 +- maven/pom.xml | 2 +- orm/pom.xml | 2 +- orm/src/main/java/org/hibernate/tool/api/version/Version.java | 2 +- pom.xml | 2 +- test/common/pom.xml | 2 +- test/h2/pom.xml | 2 +- test/hsql/pom.xml | 2 +- test/maven/pom.xml | 2 +- test/mssql/pom.xml | 2 +- test/mysql/pom.xml | 2 +- test/nodb/pom.xml | 2 +- test/oracle/pom.xml | 2 +- test/pom.xml | 2 +- test/utils/pom.xml | 2 +- utils/pom.xml | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/ant/pom.xml b/ant/pom.xml index 8023d9d67a..bc02f95f41 100644 --- a/ant/pom.xml +++ b/ant/pom.xml @@ -21,7 +21,7 @@ org.hibernate.tool hibernate-tools-parent - 6.4.5-SNAPSHOT + 6.4.5.Final hibernate-tools-ant diff --git a/jbt/pom.xml b/jbt/pom.xml index a90be7c8e2..e6acc0eeae 100644 --- a/jbt/pom.xml +++ b/jbt/pom.xml @@ -25,7 +25,7 @@ org.hibernate.tool hibernate-tools-parent - 6.4.5-SNAPSHOT + 6.4.5.Final hibernate-tools-orm-jbt diff --git a/maven/pom.xml b/maven/pom.xml index 379195c8f3..bd4c9ab3e1 100644 --- a/maven/pom.xml +++ b/maven/pom.xml @@ -21,7 +21,7 @@ org.hibernate.tool hibernate-tools-parent - 6.4.5-SNAPSHOT + 6.4.5.Final hibernate-tools-maven diff --git a/orm/pom.xml b/orm/pom.xml index bc61877cc8..049e525720 100644 --- a/orm/pom.xml +++ b/orm/pom.xml @@ -25,7 +25,7 @@ org.hibernate.tool hibernate-tools-parent - 6.4.5-SNAPSHOT + 6.4.5.Final hibernate-tools-orm diff --git a/orm/src/main/java/org/hibernate/tool/api/version/Version.java b/orm/src/main/java/org/hibernate/tool/api/version/Version.java index bf51d6cfc2..9d003a397f 100644 --- a/orm/src/main/java/org/hibernate/tool/api/version/Version.java +++ b/orm/src/main/java/org/hibernate/tool/api/version/Version.java @@ -2,6 +2,6 @@ public interface Version { - final static String CURRENT_VERSION = "6.4.5-SNAPSHOT"; + final static String CURRENT_VERSION = "6.4.5.Final"; } diff --git a/pom.xml b/pom.xml index d34bdbca73..1bb4396347 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ org.hibernate.tool hibernate-tools-parent - 6.4.5-SNAPSHOT + 6.4.5.Final pom diff --git a/test/common/pom.xml b/test/common/pom.xml index 66abceea8c..c9344ce683 100644 --- a/test/common/pom.xml +++ b/test/common/pom.xml @@ -28,7 +28,7 @@ org.hibernate.tool hibernate-tools-tests-parent - 6.4.5-SNAPSHOT + 6.4.5.Final hibernate-tools-tests-common diff --git a/test/h2/pom.xml b/test/h2/pom.xml index 5d25a93f00..c9a2c85a61 100644 --- a/test/h2/pom.xml +++ b/test/h2/pom.xml @@ -28,7 +28,7 @@ org.hibernate.tool hibernate-tools-tests-parent - 6.4.5-SNAPSHOT + 6.4.5.Final hibernate-tools-tests-h2 diff --git a/test/hsql/pom.xml b/test/hsql/pom.xml index 445dc2c184..4ce5037d52 100644 --- a/test/hsql/pom.xml +++ b/test/hsql/pom.xml @@ -27,7 +27,7 @@ org.hibernate.tool hibernate-tools-tests-parent - 6.4.5-SNAPSHOT + 6.4.5.Final hibernate-tools-tests-hsql diff --git a/test/maven/pom.xml b/test/maven/pom.xml index ac3b3aba7f..757470f4ae 100644 --- a/test/maven/pom.xml +++ b/test/maven/pom.xml @@ -28,7 +28,7 @@ org.hibernate.tool hibernate-tools-tests-parent - 6.4.5-SNAPSHOT + 6.4.5.Final hibernate-tools-tests-maven diff --git a/test/mssql/pom.xml b/test/mssql/pom.xml index 59e4f03be9..69ed1b6e18 100644 --- a/test/mssql/pom.xml +++ b/test/mssql/pom.xml @@ -28,7 +28,7 @@ org.hibernate.tool hibernate-tools-tests-parent - 6.4.5-SNAPSHOT + 6.4.5.Final hibernate-tools-tests-mssql diff --git a/test/mysql/pom.xml b/test/mysql/pom.xml index 32f23ac34f..1fadd1751b 100644 --- a/test/mysql/pom.xml +++ b/test/mysql/pom.xml @@ -28,7 +28,7 @@ org.hibernate.tool hibernate-tools-tests-parent - 6.4.5-SNAPSHOT + 6.4.5.Final hibernate-tools-tests-mysql diff --git a/test/nodb/pom.xml b/test/nodb/pom.xml index e3bec68313..e35433f361 100644 --- a/test/nodb/pom.xml +++ b/test/nodb/pom.xml @@ -27,7 +27,7 @@ org.hibernate.tool hibernate-tools-tests-parent - 6.4.5-SNAPSHOT + 6.4.5.Final hibernate-tools-tests-nodb diff --git a/test/oracle/pom.xml b/test/oracle/pom.xml index ea136c0c0a..e58ee07889 100644 --- a/test/oracle/pom.xml +++ b/test/oracle/pom.xml @@ -28,7 +28,7 @@ org.hibernate.tool hibernate-tools-tests-parent - 6.4.5-SNAPSHOT + 6.4.5.Final hibernate-tools-tests-oracle diff --git a/test/pom.xml b/test/pom.xml index 1d2c57edc7..20f8d291ec 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -28,7 +28,7 @@ org.hibernate.tool hibernate-tools-parent - 6.4.5-SNAPSHOT + 6.4.5.Final hibernate-tools-tests-parent diff --git a/test/utils/pom.xml b/test/utils/pom.xml index 647c3e62c6..f9ce23ffc0 100644 --- a/test/utils/pom.xml +++ b/test/utils/pom.xml @@ -27,7 +27,7 @@ org.hibernate.tool hibernate-tools-tests-parent - 6.4.5-SNAPSHOT + 6.4.5.Final hibernate-tools-tests-utils diff --git a/utils/pom.xml b/utils/pom.xml index f87453408a..02161b7068 100644 --- a/utils/pom.xml +++ b/utils/pom.xml @@ -21,7 +21,7 @@ org.hibernate.tool hibernate-tools-parent - 6.4.5-SNAPSHOT + 6.4.5.Final hibernate-tools-utils From 5af05a10aedc97530cf81e2a3c45edf80c6f39ce Mon Sep 17 00:00:00 2001 From: Jan Schatteman Date: Thu, 2 May 2024 18:08:27 +0200 Subject: [PATCH 15/58] HBX-2802: Update version identifier to 6.4.6-SNAPSHOT Signed-off-by: Jan Schatteman --- ant/pom.xml | 2 +- jbt/pom.xml | 2 +- maven/pom.xml | 2 +- orm/pom.xml | 2 +- orm/src/main/java/org/hibernate/tool/api/version/Version.java | 2 +- pom.xml | 2 +- test/common/pom.xml | 2 +- test/h2/pom.xml | 2 +- test/hsql/pom.xml | 2 +- test/maven/pom.xml | 2 +- test/mssql/pom.xml | 2 +- test/mysql/pom.xml | 2 +- test/nodb/pom.xml | 2 +- test/oracle/pom.xml | 2 +- test/pom.xml | 2 +- test/utils/pom.xml | 2 +- utils/pom.xml | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/ant/pom.xml b/ant/pom.xml index bc02f95f41..e2eac94a9a 100644 --- a/ant/pom.xml +++ b/ant/pom.xml @@ -21,7 +21,7 @@ org.hibernate.tool hibernate-tools-parent - 6.4.5.Final + 6.4.6-SNAPSHOT hibernate-tools-ant diff --git a/jbt/pom.xml b/jbt/pom.xml index e6acc0eeae..797506f2d0 100644 --- a/jbt/pom.xml +++ b/jbt/pom.xml @@ -25,7 +25,7 @@ org.hibernate.tool hibernate-tools-parent - 6.4.5.Final + 6.4.6-SNAPSHOT hibernate-tools-orm-jbt diff --git a/maven/pom.xml b/maven/pom.xml index bd4c9ab3e1..3c6d46ef01 100644 --- a/maven/pom.xml +++ b/maven/pom.xml @@ -21,7 +21,7 @@ org.hibernate.tool hibernate-tools-parent - 6.4.5.Final + 6.4.6-SNAPSHOT hibernate-tools-maven diff --git a/orm/pom.xml b/orm/pom.xml index 049e525720..c9a8b8cb08 100644 --- a/orm/pom.xml +++ b/orm/pom.xml @@ -25,7 +25,7 @@ org.hibernate.tool hibernate-tools-parent - 6.4.5.Final + 6.4.6-SNAPSHOT hibernate-tools-orm diff --git a/orm/src/main/java/org/hibernate/tool/api/version/Version.java b/orm/src/main/java/org/hibernate/tool/api/version/Version.java index 9d003a397f..b1a2b97e56 100644 --- a/orm/src/main/java/org/hibernate/tool/api/version/Version.java +++ b/orm/src/main/java/org/hibernate/tool/api/version/Version.java @@ -2,6 +2,6 @@ public interface Version { - final static String CURRENT_VERSION = "6.4.5.Final"; + final static String CURRENT_VERSION = "6.4.6-SNAPSHOT"; } diff --git a/pom.xml b/pom.xml index 1bb4396347..d40b45ca2f 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ org.hibernate.tool hibernate-tools-parent - 6.4.5.Final + 6.4.6-SNAPSHOT pom diff --git a/test/common/pom.xml b/test/common/pom.xml index c9344ce683..976e9fe004 100644 --- a/test/common/pom.xml +++ b/test/common/pom.xml @@ -28,7 +28,7 @@ org.hibernate.tool hibernate-tools-tests-parent - 6.4.5.Final + 6.4.6-SNAPSHOT hibernate-tools-tests-common diff --git a/test/h2/pom.xml b/test/h2/pom.xml index c9a2c85a61..e5e69bd512 100644 --- a/test/h2/pom.xml +++ b/test/h2/pom.xml @@ -28,7 +28,7 @@ org.hibernate.tool hibernate-tools-tests-parent - 6.4.5.Final + 6.4.6-SNAPSHOT hibernate-tools-tests-h2 diff --git a/test/hsql/pom.xml b/test/hsql/pom.xml index 4ce5037d52..012d371bb4 100644 --- a/test/hsql/pom.xml +++ b/test/hsql/pom.xml @@ -27,7 +27,7 @@ org.hibernate.tool hibernate-tools-tests-parent - 6.4.5.Final + 6.4.6-SNAPSHOT hibernate-tools-tests-hsql diff --git a/test/maven/pom.xml b/test/maven/pom.xml index 757470f4ae..aa3a65886e 100644 --- a/test/maven/pom.xml +++ b/test/maven/pom.xml @@ -28,7 +28,7 @@ org.hibernate.tool hibernate-tools-tests-parent - 6.4.5.Final + 6.4.6-SNAPSHOT hibernate-tools-tests-maven diff --git a/test/mssql/pom.xml b/test/mssql/pom.xml index 69ed1b6e18..e0ff924e08 100644 --- a/test/mssql/pom.xml +++ b/test/mssql/pom.xml @@ -28,7 +28,7 @@ org.hibernate.tool hibernate-tools-tests-parent - 6.4.5.Final + 6.4.6-SNAPSHOT hibernate-tools-tests-mssql diff --git a/test/mysql/pom.xml b/test/mysql/pom.xml index 1fadd1751b..c40cf343d4 100644 --- a/test/mysql/pom.xml +++ b/test/mysql/pom.xml @@ -28,7 +28,7 @@ org.hibernate.tool hibernate-tools-tests-parent - 6.4.5.Final + 6.4.6-SNAPSHOT hibernate-tools-tests-mysql diff --git a/test/nodb/pom.xml b/test/nodb/pom.xml index e35433f361..605faf84a3 100644 --- a/test/nodb/pom.xml +++ b/test/nodb/pom.xml @@ -27,7 +27,7 @@ org.hibernate.tool hibernate-tools-tests-parent - 6.4.5.Final + 6.4.6-SNAPSHOT hibernate-tools-tests-nodb diff --git a/test/oracle/pom.xml b/test/oracle/pom.xml index e58ee07889..96476c344c 100644 --- a/test/oracle/pom.xml +++ b/test/oracle/pom.xml @@ -28,7 +28,7 @@ org.hibernate.tool hibernate-tools-tests-parent - 6.4.5.Final + 6.4.6-SNAPSHOT hibernate-tools-tests-oracle diff --git a/test/pom.xml b/test/pom.xml index 20f8d291ec..6d924186b2 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -28,7 +28,7 @@ org.hibernate.tool hibernate-tools-parent - 6.4.5.Final + 6.4.6-SNAPSHOT hibernate-tools-tests-parent diff --git a/test/utils/pom.xml b/test/utils/pom.xml index f9ce23ffc0..435ef2cda3 100644 --- a/test/utils/pom.xml +++ b/test/utils/pom.xml @@ -27,7 +27,7 @@ org.hibernate.tool hibernate-tools-tests-parent - 6.4.5.Final + 6.4.6-SNAPSHOT hibernate-tools-tests-utils diff --git a/utils/pom.xml b/utils/pom.xml index 02161b7068..d5c2c8efc2 100644 --- a/utils/pom.xml +++ b/utils/pom.xml @@ -21,7 +21,7 @@ org.hibernate.tool hibernate-tools-parent - 6.4.5.Final + 6.4.6-SNAPSHOT hibernate-tools-utils From 3e761689c59dedc1c209d9a0b6d53badabdbe6c2 Mon Sep 17 00:00:00 2001 From: Jan Schatteman Date: Thu, 2 May 2024 18:17:58 +0200 Subject: [PATCH 16/58] HBX-2806: Update Hibernate ORM Dependency to Version 6.4.6.Final Signed-off-by: Jan Schatteman --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d40b45ca2f..dd6f88e37f 100644 --- a/pom.xml +++ b/pom.xml @@ -92,7 +92,7 @@ 1.19.1 2.2.224 6.0.6.Final - 6.4.5.Final + 6.4.6.Final 2.6.1 8.0.1 3.5.3.Final From 382fa5f6e0c9f8854947db5f7806c7ddfaffc71f Mon Sep 17 00:00:00 2001 From: Jan Schatteman Date: Thu, 2 May 2024 18:48:43 +0200 Subject: [PATCH 17/58] HBX-2810: Update version identifier to 6.4.6.Final Signed-off-by: Jan Schatteman --- ant/pom.xml | 2 +- jbt/pom.xml | 2 +- maven/pom.xml | 2 +- orm/pom.xml | 2 +- orm/src/main/java/org/hibernate/tool/api/version/Version.java | 2 +- pom.xml | 2 +- test/common/pom.xml | 2 +- test/h2/pom.xml | 2 +- test/hsql/pom.xml | 2 +- test/maven/pom.xml | 2 +- test/mssql/pom.xml | 2 +- test/mysql/pom.xml | 2 +- test/nodb/pom.xml | 2 +- test/oracle/pom.xml | 2 +- test/pom.xml | 2 +- test/utils/pom.xml | 2 +- utils/pom.xml | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/ant/pom.xml b/ant/pom.xml index e2eac94a9a..9cc310b0c3 100644 --- a/ant/pom.xml +++ b/ant/pom.xml @@ -21,7 +21,7 @@ org.hibernate.tool hibernate-tools-parent - 6.4.6-SNAPSHOT + 6.4.6.Final hibernate-tools-ant diff --git a/jbt/pom.xml b/jbt/pom.xml index 797506f2d0..ef3f310722 100644 --- a/jbt/pom.xml +++ b/jbt/pom.xml @@ -25,7 +25,7 @@ org.hibernate.tool hibernate-tools-parent - 6.4.6-SNAPSHOT + 6.4.6.Final hibernate-tools-orm-jbt diff --git a/maven/pom.xml b/maven/pom.xml index 3c6d46ef01..b3e28b2894 100644 --- a/maven/pom.xml +++ b/maven/pom.xml @@ -21,7 +21,7 @@ org.hibernate.tool hibernate-tools-parent - 6.4.6-SNAPSHOT + 6.4.6.Final hibernate-tools-maven diff --git a/orm/pom.xml b/orm/pom.xml index c9a8b8cb08..1778dabe36 100644 --- a/orm/pom.xml +++ b/orm/pom.xml @@ -25,7 +25,7 @@ org.hibernate.tool hibernate-tools-parent - 6.4.6-SNAPSHOT + 6.4.6.Final hibernate-tools-orm diff --git a/orm/src/main/java/org/hibernate/tool/api/version/Version.java b/orm/src/main/java/org/hibernate/tool/api/version/Version.java index b1a2b97e56..bcc0fead7b 100644 --- a/orm/src/main/java/org/hibernate/tool/api/version/Version.java +++ b/orm/src/main/java/org/hibernate/tool/api/version/Version.java @@ -2,6 +2,6 @@ public interface Version { - final static String CURRENT_VERSION = "6.4.6-SNAPSHOT"; + final static String CURRENT_VERSION = "6.4.6.Final"; } diff --git a/pom.xml b/pom.xml index dd6f88e37f..94188624cc 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ org.hibernate.tool hibernate-tools-parent - 6.4.6-SNAPSHOT + 6.4.6.Final pom diff --git a/test/common/pom.xml b/test/common/pom.xml index 976e9fe004..c9299cea4a 100644 --- a/test/common/pom.xml +++ b/test/common/pom.xml @@ -28,7 +28,7 @@ org.hibernate.tool hibernate-tools-tests-parent - 6.4.6-SNAPSHOT + 6.4.6.Final hibernate-tools-tests-common diff --git a/test/h2/pom.xml b/test/h2/pom.xml index e5e69bd512..5abea3ac3a 100644 --- a/test/h2/pom.xml +++ b/test/h2/pom.xml @@ -28,7 +28,7 @@ org.hibernate.tool hibernate-tools-tests-parent - 6.4.6-SNAPSHOT + 6.4.6.Final hibernate-tools-tests-h2 diff --git a/test/hsql/pom.xml b/test/hsql/pom.xml index 012d371bb4..7ad30a1fbf 100644 --- a/test/hsql/pom.xml +++ b/test/hsql/pom.xml @@ -27,7 +27,7 @@ org.hibernate.tool hibernate-tools-tests-parent - 6.4.6-SNAPSHOT + 6.4.6.Final hibernate-tools-tests-hsql diff --git a/test/maven/pom.xml b/test/maven/pom.xml index aa3a65886e..6af57428d8 100644 --- a/test/maven/pom.xml +++ b/test/maven/pom.xml @@ -28,7 +28,7 @@ org.hibernate.tool hibernate-tools-tests-parent - 6.4.6-SNAPSHOT + 6.4.6.Final hibernate-tools-tests-maven diff --git a/test/mssql/pom.xml b/test/mssql/pom.xml index e0ff924e08..5482c625d4 100644 --- a/test/mssql/pom.xml +++ b/test/mssql/pom.xml @@ -28,7 +28,7 @@ org.hibernate.tool hibernate-tools-tests-parent - 6.4.6-SNAPSHOT + 6.4.6.Final hibernate-tools-tests-mssql diff --git a/test/mysql/pom.xml b/test/mysql/pom.xml index c40cf343d4..ca5d608e82 100644 --- a/test/mysql/pom.xml +++ b/test/mysql/pom.xml @@ -28,7 +28,7 @@ org.hibernate.tool hibernate-tools-tests-parent - 6.4.6-SNAPSHOT + 6.4.6.Final hibernate-tools-tests-mysql diff --git a/test/nodb/pom.xml b/test/nodb/pom.xml index 605faf84a3..260be6b2d7 100644 --- a/test/nodb/pom.xml +++ b/test/nodb/pom.xml @@ -27,7 +27,7 @@ org.hibernate.tool hibernate-tools-tests-parent - 6.4.6-SNAPSHOT + 6.4.6.Final hibernate-tools-tests-nodb diff --git a/test/oracle/pom.xml b/test/oracle/pom.xml index 96476c344c..de62464411 100644 --- a/test/oracle/pom.xml +++ b/test/oracle/pom.xml @@ -28,7 +28,7 @@ org.hibernate.tool hibernate-tools-tests-parent - 6.4.6-SNAPSHOT + 6.4.6.Final hibernate-tools-tests-oracle diff --git a/test/pom.xml b/test/pom.xml index 6d924186b2..ed051f62af 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -28,7 +28,7 @@ org.hibernate.tool hibernate-tools-parent - 6.4.6-SNAPSHOT + 6.4.6.Final hibernate-tools-tests-parent diff --git a/test/utils/pom.xml b/test/utils/pom.xml index 435ef2cda3..02abbb7101 100644 --- a/test/utils/pom.xml +++ b/test/utils/pom.xml @@ -27,7 +27,7 @@ org.hibernate.tool hibernate-tools-tests-parent - 6.4.6-SNAPSHOT + 6.4.6.Final hibernate-tools-tests-utils diff --git a/utils/pom.xml b/utils/pom.xml index d5c2c8efc2..65d440a000 100644 --- a/utils/pom.xml +++ b/utils/pom.xml @@ -21,7 +21,7 @@ org.hibernate.tool hibernate-tools-parent - 6.4.6-SNAPSHOT + 6.4.6.Final hibernate-tools-utils From d595c50e52e43cb10fc2abebf5bbd16780f82614 Mon Sep 17 00:00:00 2001 From: Jan Schatteman Date: Thu, 2 May 2024 19:10:44 +0200 Subject: [PATCH 18/58] HBX-2803: Update version identifier to 6.4.7-SNAPSHOT Signed-off-by: Jan Schatteman --- ant/pom.xml | 2 +- jbt/pom.xml | 2 +- maven/pom.xml | 2 +- orm/pom.xml | 2 +- orm/src/main/java/org/hibernate/tool/api/version/Version.java | 2 +- pom.xml | 2 +- test/common/pom.xml | 2 +- test/h2/pom.xml | 2 +- test/hsql/pom.xml | 2 +- test/maven/pom.xml | 2 +- test/mssql/pom.xml | 2 +- test/mysql/pom.xml | 2 +- test/nodb/pom.xml | 2 +- test/oracle/pom.xml | 2 +- test/pom.xml | 2 +- test/utils/pom.xml | 2 +- utils/pom.xml | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/ant/pom.xml b/ant/pom.xml index 9cc310b0c3..eed77ace63 100644 --- a/ant/pom.xml +++ b/ant/pom.xml @@ -21,7 +21,7 @@ org.hibernate.tool hibernate-tools-parent - 6.4.6.Final + 6.4.7-SNAPSHOT hibernate-tools-ant diff --git a/jbt/pom.xml b/jbt/pom.xml index ef3f310722..0de9e3722b 100644 --- a/jbt/pom.xml +++ b/jbt/pom.xml @@ -25,7 +25,7 @@ org.hibernate.tool hibernate-tools-parent - 6.4.6.Final + 6.4.7-SNAPSHOT hibernate-tools-orm-jbt diff --git a/maven/pom.xml b/maven/pom.xml index b3e28b2894..d627ec1fda 100644 --- a/maven/pom.xml +++ b/maven/pom.xml @@ -21,7 +21,7 @@ org.hibernate.tool hibernate-tools-parent - 6.4.6.Final + 6.4.7-SNAPSHOT hibernate-tools-maven diff --git a/orm/pom.xml b/orm/pom.xml index 1778dabe36..2e6fe56246 100644 --- a/orm/pom.xml +++ b/orm/pom.xml @@ -25,7 +25,7 @@ org.hibernate.tool hibernate-tools-parent - 6.4.6.Final + 6.4.7-SNAPSHOT hibernate-tools-orm diff --git a/orm/src/main/java/org/hibernate/tool/api/version/Version.java b/orm/src/main/java/org/hibernate/tool/api/version/Version.java index bcc0fead7b..b73936a83b 100644 --- a/orm/src/main/java/org/hibernate/tool/api/version/Version.java +++ b/orm/src/main/java/org/hibernate/tool/api/version/Version.java @@ -2,6 +2,6 @@ public interface Version { - final static String CURRENT_VERSION = "6.4.6.Final"; + final static String CURRENT_VERSION = "6.4.7-SNAPSHOT"; } diff --git a/pom.xml b/pom.xml index 94188624cc..26734e722e 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ org.hibernate.tool hibernate-tools-parent - 6.4.6.Final + 6.4.7-SNAPSHOT pom diff --git a/test/common/pom.xml b/test/common/pom.xml index c9299cea4a..4fc5a1c3a8 100644 --- a/test/common/pom.xml +++ b/test/common/pom.xml @@ -28,7 +28,7 @@ org.hibernate.tool hibernate-tools-tests-parent - 6.4.6.Final + 6.4.7-SNAPSHOT hibernate-tools-tests-common diff --git a/test/h2/pom.xml b/test/h2/pom.xml index 5abea3ac3a..ba0e85e1d9 100644 --- a/test/h2/pom.xml +++ b/test/h2/pom.xml @@ -28,7 +28,7 @@ org.hibernate.tool hibernate-tools-tests-parent - 6.4.6.Final + 6.4.7-SNAPSHOT hibernate-tools-tests-h2 diff --git a/test/hsql/pom.xml b/test/hsql/pom.xml index 7ad30a1fbf..7005cb62ba 100644 --- a/test/hsql/pom.xml +++ b/test/hsql/pom.xml @@ -27,7 +27,7 @@ org.hibernate.tool hibernate-tools-tests-parent - 6.4.6.Final + 6.4.7-SNAPSHOT hibernate-tools-tests-hsql diff --git a/test/maven/pom.xml b/test/maven/pom.xml index 6af57428d8..5b941d7d41 100644 --- a/test/maven/pom.xml +++ b/test/maven/pom.xml @@ -28,7 +28,7 @@ org.hibernate.tool hibernate-tools-tests-parent - 6.4.6.Final + 6.4.7-SNAPSHOT hibernate-tools-tests-maven diff --git a/test/mssql/pom.xml b/test/mssql/pom.xml index 5482c625d4..5930390120 100644 --- a/test/mssql/pom.xml +++ b/test/mssql/pom.xml @@ -28,7 +28,7 @@ org.hibernate.tool hibernate-tools-tests-parent - 6.4.6.Final + 6.4.7-SNAPSHOT hibernate-tools-tests-mssql diff --git a/test/mysql/pom.xml b/test/mysql/pom.xml index ca5d608e82..0e5bc332b8 100644 --- a/test/mysql/pom.xml +++ b/test/mysql/pom.xml @@ -28,7 +28,7 @@ org.hibernate.tool hibernate-tools-tests-parent - 6.4.6.Final + 6.4.7-SNAPSHOT hibernate-tools-tests-mysql diff --git a/test/nodb/pom.xml b/test/nodb/pom.xml index 260be6b2d7..07864db705 100644 --- a/test/nodb/pom.xml +++ b/test/nodb/pom.xml @@ -27,7 +27,7 @@ org.hibernate.tool hibernate-tools-tests-parent - 6.4.6.Final + 6.4.7-SNAPSHOT hibernate-tools-tests-nodb diff --git a/test/oracle/pom.xml b/test/oracle/pom.xml index de62464411..009a5b05a3 100644 --- a/test/oracle/pom.xml +++ b/test/oracle/pom.xml @@ -28,7 +28,7 @@ org.hibernate.tool hibernate-tools-tests-parent - 6.4.6.Final + 6.4.7-SNAPSHOT hibernate-tools-tests-oracle diff --git a/test/pom.xml b/test/pom.xml index ed051f62af..2db2421b1e 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -28,7 +28,7 @@ org.hibernate.tool hibernate-tools-parent - 6.4.6.Final + 6.4.7-SNAPSHOT hibernate-tools-tests-parent diff --git a/test/utils/pom.xml b/test/utils/pom.xml index 02abbb7101..c4946869b4 100644 --- a/test/utils/pom.xml +++ b/test/utils/pom.xml @@ -27,7 +27,7 @@ org.hibernate.tool hibernate-tools-tests-parent - 6.4.6.Final + 6.4.7-SNAPSHOT hibernate-tools-tests-utils diff --git a/utils/pom.xml b/utils/pom.xml index 65d440a000..e001703fbe 100644 --- a/utils/pom.xml +++ b/utils/pom.xml @@ -21,7 +21,7 @@ org.hibernate.tool hibernate-tools-parent - 6.4.6.Final + 6.4.7-SNAPSHOT hibernate-tools-utils From faaaa1059d2c6b414a4057e700f4e59e24942de3 Mon Sep 17 00:00:00 2001 From: Jan Schatteman Date: Fri, 3 May 2024 17:45:33 +0200 Subject: [PATCH 19/58] HBX-2811: Update Hibernate ORM Dependency to Version 6.4.7.Final Signed-off-by: Jan Schatteman --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 26734e722e..0759302b6c 100644 --- a/pom.xml +++ b/pom.xml @@ -92,7 +92,7 @@ 1.19.1 2.2.224 6.0.6.Final - 6.4.6.Final + 6.4.7.Final 2.6.1 8.0.1 3.5.3.Final From 6b50837c0a64690f8380c43c6d03e89eff1d5b30 Mon Sep 17 00:00:00 2001 From: Jan Schatteman Date: Fri, 3 May 2024 17:59:53 +0200 Subject: [PATCH 20/58] HBX-2813: Update version identifier to 6.4.7.Final Signed-off-by: Jan Schatteman --- ant/pom.xml | 2 +- jbt/pom.xml | 2 +- maven/pom.xml | 2 +- orm/pom.xml | 2 +- orm/src/main/java/org/hibernate/tool/api/version/Version.java | 2 +- pom.xml | 2 +- test/common/pom.xml | 2 +- test/h2/pom.xml | 2 +- test/hsql/pom.xml | 2 +- test/maven/pom.xml | 2 +- test/mssql/pom.xml | 2 +- test/mysql/pom.xml | 2 +- test/nodb/pom.xml | 2 +- test/oracle/pom.xml | 2 +- test/pom.xml | 2 +- test/utils/pom.xml | 2 +- utils/pom.xml | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/ant/pom.xml b/ant/pom.xml index eed77ace63..5dcebe7e0f 100644 --- a/ant/pom.xml +++ b/ant/pom.xml @@ -21,7 +21,7 @@ org.hibernate.tool hibernate-tools-parent - 6.4.7-SNAPSHOT + 6.4.7.Final hibernate-tools-ant diff --git a/jbt/pom.xml b/jbt/pom.xml index 0de9e3722b..08059e9448 100644 --- a/jbt/pom.xml +++ b/jbt/pom.xml @@ -25,7 +25,7 @@ org.hibernate.tool hibernate-tools-parent - 6.4.7-SNAPSHOT + 6.4.7.Final hibernate-tools-orm-jbt diff --git a/maven/pom.xml b/maven/pom.xml index d627ec1fda..a16c1fca7e 100644 --- a/maven/pom.xml +++ b/maven/pom.xml @@ -21,7 +21,7 @@ org.hibernate.tool hibernate-tools-parent - 6.4.7-SNAPSHOT + 6.4.7.Final hibernate-tools-maven diff --git a/orm/pom.xml b/orm/pom.xml index 2e6fe56246..d93105c3c4 100644 --- a/orm/pom.xml +++ b/orm/pom.xml @@ -25,7 +25,7 @@ org.hibernate.tool hibernate-tools-parent - 6.4.7-SNAPSHOT + 6.4.7.Final hibernate-tools-orm diff --git a/orm/src/main/java/org/hibernate/tool/api/version/Version.java b/orm/src/main/java/org/hibernate/tool/api/version/Version.java index b73936a83b..f25c703f7e 100644 --- a/orm/src/main/java/org/hibernate/tool/api/version/Version.java +++ b/orm/src/main/java/org/hibernate/tool/api/version/Version.java @@ -2,6 +2,6 @@ public interface Version { - final static String CURRENT_VERSION = "6.4.7-SNAPSHOT"; + final static String CURRENT_VERSION = "6.4.7.Final"; } diff --git a/pom.xml b/pom.xml index 0759302b6c..2525e97620 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ org.hibernate.tool hibernate-tools-parent - 6.4.7-SNAPSHOT + 6.4.7.Final pom diff --git a/test/common/pom.xml b/test/common/pom.xml index 4fc5a1c3a8..59a97646b7 100644 --- a/test/common/pom.xml +++ b/test/common/pom.xml @@ -28,7 +28,7 @@ org.hibernate.tool hibernate-tools-tests-parent - 6.4.7-SNAPSHOT + 6.4.7.Final hibernate-tools-tests-common diff --git a/test/h2/pom.xml b/test/h2/pom.xml index ba0e85e1d9..1dc92050df 100644 --- a/test/h2/pom.xml +++ b/test/h2/pom.xml @@ -28,7 +28,7 @@ org.hibernate.tool hibernate-tools-tests-parent - 6.4.7-SNAPSHOT + 6.4.7.Final hibernate-tools-tests-h2 diff --git a/test/hsql/pom.xml b/test/hsql/pom.xml index 7005cb62ba..d15b1ea1a0 100644 --- a/test/hsql/pom.xml +++ b/test/hsql/pom.xml @@ -27,7 +27,7 @@ org.hibernate.tool hibernate-tools-tests-parent - 6.4.7-SNAPSHOT + 6.4.7.Final hibernate-tools-tests-hsql diff --git a/test/maven/pom.xml b/test/maven/pom.xml index 5b941d7d41..976c4ada60 100644 --- a/test/maven/pom.xml +++ b/test/maven/pom.xml @@ -28,7 +28,7 @@ org.hibernate.tool hibernate-tools-tests-parent - 6.4.7-SNAPSHOT + 6.4.7.Final hibernate-tools-tests-maven diff --git a/test/mssql/pom.xml b/test/mssql/pom.xml index 5930390120..40f20c678e 100644 --- a/test/mssql/pom.xml +++ b/test/mssql/pom.xml @@ -28,7 +28,7 @@ org.hibernate.tool hibernate-tools-tests-parent - 6.4.7-SNAPSHOT + 6.4.7.Final hibernate-tools-tests-mssql diff --git a/test/mysql/pom.xml b/test/mysql/pom.xml index 0e5bc332b8..8981d32138 100644 --- a/test/mysql/pom.xml +++ b/test/mysql/pom.xml @@ -28,7 +28,7 @@ org.hibernate.tool hibernate-tools-tests-parent - 6.4.7-SNAPSHOT + 6.4.7.Final hibernate-tools-tests-mysql diff --git a/test/nodb/pom.xml b/test/nodb/pom.xml index 07864db705..53466fe29d 100644 --- a/test/nodb/pom.xml +++ b/test/nodb/pom.xml @@ -27,7 +27,7 @@ org.hibernate.tool hibernate-tools-tests-parent - 6.4.7-SNAPSHOT + 6.4.7.Final hibernate-tools-tests-nodb diff --git a/test/oracle/pom.xml b/test/oracle/pom.xml index 009a5b05a3..55a9ec279b 100644 --- a/test/oracle/pom.xml +++ b/test/oracle/pom.xml @@ -28,7 +28,7 @@ org.hibernate.tool hibernate-tools-tests-parent - 6.4.7-SNAPSHOT + 6.4.7.Final hibernate-tools-tests-oracle diff --git a/test/pom.xml b/test/pom.xml index 2db2421b1e..5377eeff79 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -28,7 +28,7 @@ org.hibernate.tool hibernate-tools-parent - 6.4.7-SNAPSHOT + 6.4.7.Final hibernate-tools-tests-parent diff --git a/test/utils/pom.xml b/test/utils/pom.xml index c4946869b4..74409c9188 100644 --- a/test/utils/pom.xml +++ b/test/utils/pom.xml @@ -27,7 +27,7 @@ org.hibernate.tool hibernate-tools-tests-parent - 6.4.7-SNAPSHOT + 6.4.7.Final hibernate-tools-tests-utils diff --git a/utils/pom.xml b/utils/pom.xml index e001703fbe..22eabb66c0 100644 --- a/utils/pom.xml +++ b/utils/pom.xml @@ -21,7 +21,7 @@ org.hibernate.tool hibernate-tools-parent - 6.4.7-SNAPSHOT + 6.4.7.Final hibernate-tools-utils From cf7552f729c69d47d746261c30cd1f12dda24db1 Mon Sep 17 00:00:00 2001 From: Jan Schatteman Date: Fri, 3 May 2024 18:59:45 +0200 Subject: [PATCH 21/58] HBX-2804: Update version identifier to 6.4.8-SNAPSHOT Signed-off-by: Jan Schatteman --- ant/pom.xml | 2 +- jbt/pom.xml | 2 +- maven/pom.xml | 2 +- orm/pom.xml | 2 +- orm/src/main/java/org/hibernate/tool/api/version/Version.java | 2 +- pom.xml | 2 +- test/common/pom.xml | 2 +- test/h2/pom.xml | 2 +- test/hsql/pom.xml | 2 +- test/maven/pom.xml | 2 +- test/mssql/pom.xml | 2 +- test/mysql/pom.xml | 2 +- test/nodb/pom.xml | 2 +- test/oracle/pom.xml | 2 +- test/pom.xml | 2 +- test/utils/pom.xml | 2 +- utils/pom.xml | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/ant/pom.xml b/ant/pom.xml index 5dcebe7e0f..40c3548bfc 100644 --- a/ant/pom.xml +++ b/ant/pom.xml @@ -21,7 +21,7 @@ org.hibernate.tool hibernate-tools-parent - 6.4.7.Final + 6.4.8-SNAPSHOT hibernate-tools-ant diff --git a/jbt/pom.xml b/jbt/pom.xml index 08059e9448..a3399f4c76 100644 --- a/jbt/pom.xml +++ b/jbt/pom.xml @@ -25,7 +25,7 @@ org.hibernate.tool hibernate-tools-parent - 6.4.7.Final + 6.4.8-SNAPSHOT hibernate-tools-orm-jbt diff --git a/maven/pom.xml b/maven/pom.xml index a16c1fca7e..fdec62f2f2 100644 --- a/maven/pom.xml +++ b/maven/pom.xml @@ -21,7 +21,7 @@ org.hibernate.tool hibernate-tools-parent - 6.4.7.Final + 6.4.8-SNAPSHOT hibernate-tools-maven diff --git a/orm/pom.xml b/orm/pom.xml index d93105c3c4..67e233ca80 100644 --- a/orm/pom.xml +++ b/orm/pom.xml @@ -25,7 +25,7 @@ org.hibernate.tool hibernate-tools-parent - 6.4.7.Final + 6.4.8-SNAPSHOT hibernate-tools-orm diff --git a/orm/src/main/java/org/hibernate/tool/api/version/Version.java b/orm/src/main/java/org/hibernate/tool/api/version/Version.java index f25c703f7e..59bf9cdbf3 100644 --- a/orm/src/main/java/org/hibernate/tool/api/version/Version.java +++ b/orm/src/main/java/org/hibernate/tool/api/version/Version.java @@ -2,6 +2,6 @@ public interface Version { - final static String CURRENT_VERSION = "6.4.7.Final"; + final static String CURRENT_VERSION = "6.4.8-SNAPSHOT"; } diff --git a/pom.xml b/pom.xml index 2525e97620..ad64429618 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ org.hibernate.tool hibernate-tools-parent - 6.4.7.Final + 6.4.8-SNAPSHOT pom diff --git a/test/common/pom.xml b/test/common/pom.xml index 59a97646b7..f459efee73 100644 --- a/test/common/pom.xml +++ b/test/common/pom.xml @@ -28,7 +28,7 @@ org.hibernate.tool hibernate-tools-tests-parent - 6.4.7.Final + 6.4.8-SNAPSHOT hibernate-tools-tests-common diff --git a/test/h2/pom.xml b/test/h2/pom.xml index 1dc92050df..32d6cce432 100644 --- a/test/h2/pom.xml +++ b/test/h2/pom.xml @@ -28,7 +28,7 @@ org.hibernate.tool hibernate-tools-tests-parent - 6.4.7.Final + 6.4.8-SNAPSHOT hibernate-tools-tests-h2 diff --git a/test/hsql/pom.xml b/test/hsql/pom.xml index d15b1ea1a0..e1954f19d8 100644 --- a/test/hsql/pom.xml +++ b/test/hsql/pom.xml @@ -27,7 +27,7 @@ org.hibernate.tool hibernate-tools-tests-parent - 6.4.7.Final + 6.4.8-SNAPSHOT hibernate-tools-tests-hsql diff --git a/test/maven/pom.xml b/test/maven/pom.xml index 976c4ada60..68ff842583 100644 --- a/test/maven/pom.xml +++ b/test/maven/pom.xml @@ -28,7 +28,7 @@ org.hibernate.tool hibernate-tools-tests-parent - 6.4.7.Final + 6.4.8-SNAPSHOT hibernate-tools-tests-maven diff --git a/test/mssql/pom.xml b/test/mssql/pom.xml index 40f20c678e..bc89762af7 100644 --- a/test/mssql/pom.xml +++ b/test/mssql/pom.xml @@ -28,7 +28,7 @@ org.hibernate.tool hibernate-tools-tests-parent - 6.4.7.Final + 6.4.8-SNAPSHOT hibernate-tools-tests-mssql diff --git a/test/mysql/pom.xml b/test/mysql/pom.xml index 8981d32138..29d716be66 100644 --- a/test/mysql/pom.xml +++ b/test/mysql/pom.xml @@ -28,7 +28,7 @@ org.hibernate.tool hibernate-tools-tests-parent - 6.4.7.Final + 6.4.8-SNAPSHOT hibernate-tools-tests-mysql diff --git a/test/nodb/pom.xml b/test/nodb/pom.xml index 53466fe29d..2da13bb125 100644 --- a/test/nodb/pom.xml +++ b/test/nodb/pom.xml @@ -27,7 +27,7 @@ org.hibernate.tool hibernate-tools-tests-parent - 6.4.7.Final + 6.4.8-SNAPSHOT hibernate-tools-tests-nodb diff --git a/test/oracle/pom.xml b/test/oracle/pom.xml index 55a9ec279b..a9a5655acf 100644 --- a/test/oracle/pom.xml +++ b/test/oracle/pom.xml @@ -28,7 +28,7 @@ org.hibernate.tool hibernate-tools-tests-parent - 6.4.7.Final + 6.4.8-SNAPSHOT hibernate-tools-tests-oracle diff --git a/test/pom.xml b/test/pom.xml index 5377eeff79..56d0c710f4 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -28,7 +28,7 @@ org.hibernate.tool hibernate-tools-parent - 6.4.7.Final + 6.4.8-SNAPSHOT hibernate-tools-tests-parent diff --git a/test/utils/pom.xml b/test/utils/pom.xml index 74409c9188..db39ee89d4 100644 --- a/test/utils/pom.xml +++ b/test/utils/pom.xml @@ -27,7 +27,7 @@ org.hibernate.tool hibernate-tools-tests-parent - 6.4.7.Final + 6.4.8-SNAPSHOT hibernate-tools-tests-utils diff --git a/utils/pom.xml b/utils/pom.xml index 22eabb66c0..824ff0ed3c 100644 --- a/utils/pom.xml +++ b/utils/pom.xml @@ -21,7 +21,7 @@ org.hibernate.tool hibernate-tools-parent - 6.4.7.Final + 6.4.8-SNAPSHOT hibernate-tools-utils From f1bfb7085a36959e86edb4fd8944c24ef99870d3 Mon Sep 17 00:00:00 2001 From: Jan Schatteman Date: Tue, 7 May 2024 17:18:02 +0200 Subject: [PATCH 22/58] HBX-2815: Update Hibernate ORM Dependency to Version 6.4.8.Final Signed-off-by: Jan Schatteman --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ad64429618..771be2a0da 100644 --- a/pom.xml +++ b/pom.xml @@ -92,7 +92,7 @@ 1.19.1 2.2.224 6.0.6.Final - 6.4.7.Final + 6.4.8.Final 2.6.1 8.0.1 3.5.3.Final From c83a3d13c2ab0968c92f8149e0e37822cfe5fd9d Mon Sep 17 00:00:00 2001 From: Jan Schatteman Date: Tue, 7 May 2024 18:04:54 +0200 Subject: [PATCH 23/58] HBX-2816: Update version identifier to 6.4.8.Final Signed-off-by: Jan Schatteman --- ant/pom.xml | 2 +- jbt/pom.xml | 2 +- maven/pom.xml | 2 +- orm/pom.xml | 2 +- orm/src/main/java/org/hibernate/tool/api/version/Version.java | 2 +- pom.xml | 2 +- test/common/pom.xml | 2 +- test/h2/pom.xml | 2 +- test/hsql/pom.xml | 2 +- test/maven/pom.xml | 2 +- test/mssql/pom.xml | 2 +- test/mysql/pom.xml | 2 +- test/nodb/pom.xml | 2 +- test/oracle/pom.xml | 2 +- test/pom.xml | 2 +- test/utils/pom.xml | 2 +- utils/pom.xml | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/ant/pom.xml b/ant/pom.xml index 40c3548bfc..06466400ec 100644 --- a/ant/pom.xml +++ b/ant/pom.xml @@ -21,7 +21,7 @@ org.hibernate.tool hibernate-tools-parent - 6.4.8-SNAPSHOT + 6.4.8.Final hibernate-tools-ant diff --git a/jbt/pom.xml b/jbt/pom.xml index a3399f4c76..f040816c84 100644 --- a/jbt/pom.xml +++ b/jbt/pom.xml @@ -25,7 +25,7 @@ org.hibernate.tool hibernate-tools-parent - 6.4.8-SNAPSHOT + 6.4.8.Final hibernate-tools-orm-jbt diff --git a/maven/pom.xml b/maven/pom.xml index fdec62f2f2..c9661cea95 100644 --- a/maven/pom.xml +++ b/maven/pom.xml @@ -21,7 +21,7 @@ org.hibernate.tool hibernate-tools-parent - 6.4.8-SNAPSHOT + 6.4.8.Final hibernate-tools-maven diff --git a/orm/pom.xml b/orm/pom.xml index 67e233ca80..dec1eac149 100644 --- a/orm/pom.xml +++ b/orm/pom.xml @@ -25,7 +25,7 @@ org.hibernate.tool hibernate-tools-parent - 6.4.8-SNAPSHOT + 6.4.8.Final hibernate-tools-orm diff --git a/orm/src/main/java/org/hibernate/tool/api/version/Version.java b/orm/src/main/java/org/hibernate/tool/api/version/Version.java index 59bf9cdbf3..15103830c1 100644 --- a/orm/src/main/java/org/hibernate/tool/api/version/Version.java +++ b/orm/src/main/java/org/hibernate/tool/api/version/Version.java @@ -2,6 +2,6 @@ public interface Version { - final static String CURRENT_VERSION = "6.4.8-SNAPSHOT"; + final static String CURRENT_VERSION = "6.4.8.Final"; } diff --git a/pom.xml b/pom.xml index 771be2a0da..08d45a09af 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ org.hibernate.tool hibernate-tools-parent - 6.4.8-SNAPSHOT + 6.4.8.Final pom diff --git a/test/common/pom.xml b/test/common/pom.xml index f459efee73..c267402462 100644 --- a/test/common/pom.xml +++ b/test/common/pom.xml @@ -28,7 +28,7 @@ org.hibernate.tool hibernate-tools-tests-parent - 6.4.8-SNAPSHOT + 6.4.8.Final hibernate-tools-tests-common diff --git a/test/h2/pom.xml b/test/h2/pom.xml index 32d6cce432..3605f31dff 100644 --- a/test/h2/pom.xml +++ b/test/h2/pom.xml @@ -28,7 +28,7 @@ org.hibernate.tool hibernate-tools-tests-parent - 6.4.8-SNAPSHOT + 6.4.8.Final hibernate-tools-tests-h2 diff --git a/test/hsql/pom.xml b/test/hsql/pom.xml index e1954f19d8..caad5735f4 100644 --- a/test/hsql/pom.xml +++ b/test/hsql/pom.xml @@ -27,7 +27,7 @@ org.hibernate.tool hibernate-tools-tests-parent - 6.4.8-SNAPSHOT + 6.4.8.Final hibernate-tools-tests-hsql diff --git a/test/maven/pom.xml b/test/maven/pom.xml index 68ff842583..9cb8dab9c6 100644 --- a/test/maven/pom.xml +++ b/test/maven/pom.xml @@ -28,7 +28,7 @@ org.hibernate.tool hibernate-tools-tests-parent - 6.4.8-SNAPSHOT + 6.4.8.Final hibernate-tools-tests-maven diff --git a/test/mssql/pom.xml b/test/mssql/pom.xml index bc89762af7..ac613bf60f 100644 --- a/test/mssql/pom.xml +++ b/test/mssql/pom.xml @@ -28,7 +28,7 @@ org.hibernate.tool hibernate-tools-tests-parent - 6.4.8-SNAPSHOT + 6.4.8.Final hibernate-tools-tests-mssql diff --git a/test/mysql/pom.xml b/test/mysql/pom.xml index 29d716be66..116e117150 100644 --- a/test/mysql/pom.xml +++ b/test/mysql/pom.xml @@ -28,7 +28,7 @@ org.hibernate.tool hibernate-tools-tests-parent - 6.4.8-SNAPSHOT + 6.4.8.Final hibernate-tools-tests-mysql diff --git a/test/nodb/pom.xml b/test/nodb/pom.xml index 2da13bb125..0fec4866d3 100644 --- a/test/nodb/pom.xml +++ b/test/nodb/pom.xml @@ -27,7 +27,7 @@ org.hibernate.tool hibernate-tools-tests-parent - 6.4.8-SNAPSHOT + 6.4.8.Final hibernate-tools-tests-nodb diff --git a/test/oracle/pom.xml b/test/oracle/pom.xml index a9a5655acf..5c2c7523b1 100644 --- a/test/oracle/pom.xml +++ b/test/oracle/pom.xml @@ -28,7 +28,7 @@ org.hibernate.tool hibernate-tools-tests-parent - 6.4.8-SNAPSHOT + 6.4.8.Final hibernate-tools-tests-oracle diff --git a/test/pom.xml b/test/pom.xml index 56d0c710f4..29a8b2f18d 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -28,7 +28,7 @@ org.hibernate.tool hibernate-tools-parent - 6.4.8-SNAPSHOT + 6.4.8.Final hibernate-tools-tests-parent diff --git a/test/utils/pom.xml b/test/utils/pom.xml index db39ee89d4..19c863eb2e 100644 --- a/test/utils/pom.xml +++ b/test/utils/pom.xml @@ -27,7 +27,7 @@ org.hibernate.tool hibernate-tools-tests-parent - 6.4.8-SNAPSHOT + 6.4.8.Final hibernate-tools-tests-utils diff --git a/utils/pom.xml b/utils/pom.xml index 824ff0ed3c..e3aed45f0f 100644 --- a/utils/pom.xml +++ b/utils/pom.xml @@ -21,7 +21,7 @@ org.hibernate.tool hibernate-tools-parent - 6.4.8-SNAPSHOT + 6.4.8.Final hibernate-tools-utils From 332592202ada502fb2af5af6f934b879814448a9 Mon Sep 17 00:00:00 2001 From: Jan Schatteman Date: Tue, 7 May 2024 19:55:58 +0200 Subject: [PATCH 24/58] HBX-2805: Update version identifier to 6.4.9-SNAPSHOT Signed-off-by: Jan Schatteman --- ant/pom.xml | 2 +- jbt/pom.xml | 2 +- maven/pom.xml | 2 +- orm/pom.xml | 2 +- orm/src/main/java/org/hibernate/tool/api/version/Version.java | 2 +- pom.xml | 2 +- test/common/pom.xml | 2 +- test/h2/pom.xml | 2 +- test/hsql/pom.xml | 2 +- test/maven/pom.xml | 2 +- test/mssql/pom.xml | 2 +- test/mysql/pom.xml | 2 +- test/nodb/pom.xml | 2 +- test/oracle/pom.xml | 2 +- test/pom.xml | 2 +- test/utils/pom.xml | 2 +- utils/pom.xml | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/ant/pom.xml b/ant/pom.xml index 06466400ec..1e9dcb55b5 100644 --- a/ant/pom.xml +++ b/ant/pom.xml @@ -21,7 +21,7 @@ org.hibernate.tool hibernate-tools-parent - 6.4.8.Final + 6.4.9-SNAPSHOT hibernate-tools-ant diff --git a/jbt/pom.xml b/jbt/pom.xml index f040816c84..257744c047 100644 --- a/jbt/pom.xml +++ b/jbt/pom.xml @@ -25,7 +25,7 @@ org.hibernate.tool hibernate-tools-parent - 6.4.8.Final + 6.4.9-SNAPSHOT hibernate-tools-orm-jbt diff --git a/maven/pom.xml b/maven/pom.xml index c9661cea95..83c3d8cf0e 100644 --- a/maven/pom.xml +++ b/maven/pom.xml @@ -21,7 +21,7 @@ org.hibernate.tool hibernate-tools-parent - 6.4.8.Final + 6.4.9-SNAPSHOT hibernate-tools-maven diff --git a/orm/pom.xml b/orm/pom.xml index dec1eac149..3fc5827a33 100644 --- a/orm/pom.xml +++ b/orm/pom.xml @@ -25,7 +25,7 @@ org.hibernate.tool hibernate-tools-parent - 6.4.8.Final + 6.4.9-SNAPSHOT hibernate-tools-orm diff --git a/orm/src/main/java/org/hibernate/tool/api/version/Version.java b/orm/src/main/java/org/hibernate/tool/api/version/Version.java index 15103830c1..1ba4cd0e7e 100644 --- a/orm/src/main/java/org/hibernate/tool/api/version/Version.java +++ b/orm/src/main/java/org/hibernate/tool/api/version/Version.java @@ -2,6 +2,6 @@ public interface Version { - final static String CURRENT_VERSION = "6.4.8.Final"; + final static String CURRENT_VERSION = "6.4.9-SNAPSHOT"; } diff --git a/pom.xml b/pom.xml index 08d45a09af..a1117fbeef 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ org.hibernate.tool hibernate-tools-parent - 6.4.8.Final + 6.4.9-SNAPSHOT pom diff --git a/test/common/pom.xml b/test/common/pom.xml index c267402462..829f961876 100644 --- a/test/common/pom.xml +++ b/test/common/pom.xml @@ -28,7 +28,7 @@ org.hibernate.tool hibernate-tools-tests-parent - 6.4.8.Final + 6.4.9-SNAPSHOT hibernate-tools-tests-common diff --git a/test/h2/pom.xml b/test/h2/pom.xml index 3605f31dff..20b990959e 100644 --- a/test/h2/pom.xml +++ b/test/h2/pom.xml @@ -28,7 +28,7 @@ org.hibernate.tool hibernate-tools-tests-parent - 6.4.8.Final + 6.4.9-SNAPSHOT hibernate-tools-tests-h2 diff --git a/test/hsql/pom.xml b/test/hsql/pom.xml index caad5735f4..4dbe4da834 100644 --- a/test/hsql/pom.xml +++ b/test/hsql/pom.xml @@ -27,7 +27,7 @@ org.hibernate.tool hibernate-tools-tests-parent - 6.4.8.Final + 6.4.9-SNAPSHOT hibernate-tools-tests-hsql diff --git a/test/maven/pom.xml b/test/maven/pom.xml index 9cb8dab9c6..b9a20a378a 100644 --- a/test/maven/pom.xml +++ b/test/maven/pom.xml @@ -28,7 +28,7 @@ org.hibernate.tool hibernate-tools-tests-parent - 6.4.8.Final + 6.4.9-SNAPSHOT hibernate-tools-tests-maven diff --git a/test/mssql/pom.xml b/test/mssql/pom.xml index ac613bf60f..e1e7d306f6 100644 --- a/test/mssql/pom.xml +++ b/test/mssql/pom.xml @@ -28,7 +28,7 @@ org.hibernate.tool hibernate-tools-tests-parent - 6.4.8.Final + 6.4.9-SNAPSHOT hibernate-tools-tests-mssql diff --git a/test/mysql/pom.xml b/test/mysql/pom.xml index 116e117150..bcc6d69d25 100644 --- a/test/mysql/pom.xml +++ b/test/mysql/pom.xml @@ -28,7 +28,7 @@ org.hibernate.tool hibernate-tools-tests-parent - 6.4.8.Final + 6.4.9-SNAPSHOT hibernate-tools-tests-mysql diff --git a/test/nodb/pom.xml b/test/nodb/pom.xml index 0fec4866d3..4fc53869e9 100644 --- a/test/nodb/pom.xml +++ b/test/nodb/pom.xml @@ -27,7 +27,7 @@ org.hibernate.tool hibernate-tools-tests-parent - 6.4.8.Final + 6.4.9-SNAPSHOT hibernate-tools-tests-nodb diff --git a/test/oracle/pom.xml b/test/oracle/pom.xml index 5c2c7523b1..1a8805da54 100644 --- a/test/oracle/pom.xml +++ b/test/oracle/pom.xml @@ -28,7 +28,7 @@ org.hibernate.tool hibernate-tools-tests-parent - 6.4.8.Final + 6.4.9-SNAPSHOT hibernate-tools-tests-oracle diff --git a/test/pom.xml b/test/pom.xml index 29a8b2f18d..d8a797a5b9 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -28,7 +28,7 @@ org.hibernate.tool hibernate-tools-parent - 6.4.8.Final + 6.4.9-SNAPSHOT hibernate-tools-tests-parent diff --git a/test/utils/pom.xml b/test/utils/pom.xml index 19c863eb2e..9a74a65689 100644 --- a/test/utils/pom.xml +++ b/test/utils/pom.xml @@ -27,7 +27,7 @@ org.hibernate.tool hibernate-tools-tests-parent - 6.4.8.Final + 6.4.9-SNAPSHOT hibernate-tools-tests-utils diff --git a/utils/pom.xml b/utils/pom.xml index e3aed45f0f..00c2b7ad22 100644 --- a/utils/pom.xml +++ b/utils/pom.xml @@ -21,7 +21,7 @@ org.hibernate.tool hibernate-tools-parent - 6.4.8.Final + 6.4.9-SNAPSHOT hibernate-tools-utils From 5c9a02826ea9b2f316b108fd7258a8eb7c1bee71 Mon Sep 17 00:00:00 2001 From: Jan Schatteman Date: Wed, 12 Jun 2024 20:03:29 +0200 Subject: [PATCH 25/58] HBX-2836: Update Hibernate ORM Dependency to Version 6.4.9.Final Signed-off-by: Jan Schatteman --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a1117fbeef..e41f64659e 100644 --- a/pom.xml +++ b/pom.xml @@ -92,7 +92,7 @@ 1.19.1 2.2.224 6.0.6.Final - 6.4.8.Final + 6.4.9.Final 2.6.1 8.0.1 3.5.3.Final From 2f2fa565c9f9742814492c8f1cf28a71408bc09c Mon Sep 17 00:00:00 2001 From: Jan Schatteman Date: Wed, 12 Jun 2024 21:08:07 +0200 Subject: [PATCH 26/58] HBX-2837: Update version identifier to 6.4.9.Final Signed-off-by: Jan Schatteman --- ant/pom.xml | 2 +- jbt/pom.xml | 2 +- maven/pom.xml | 2 +- orm/pom.xml | 2 +- orm/src/main/java/org/hibernate/tool/api/version/Version.java | 2 +- pom.xml | 2 +- test/common/pom.xml | 2 +- test/h2/pom.xml | 2 +- test/hsql/pom.xml | 2 +- test/maven/pom.xml | 2 +- test/mssql/pom.xml | 2 +- test/mysql/pom.xml | 2 +- test/nodb/pom.xml | 2 +- test/oracle/pom.xml | 2 +- test/pom.xml | 2 +- test/utils/pom.xml | 2 +- utils/pom.xml | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/ant/pom.xml b/ant/pom.xml index 1e9dcb55b5..544695561a 100644 --- a/ant/pom.xml +++ b/ant/pom.xml @@ -21,7 +21,7 @@ org.hibernate.tool hibernate-tools-parent - 6.4.9-SNAPSHOT + 6.4.9.Final hibernate-tools-ant diff --git a/jbt/pom.xml b/jbt/pom.xml index 257744c047..5d348ebc77 100644 --- a/jbt/pom.xml +++ b/jbt/pom.xml @@ -25,7 +25,7 @@ org.hibernate.tool hibernate-tools-parent - 6.4.9-SNAPSHOT + 6.4.9.Final hibernate-tools-orm-jbt diff --git a/maven/pom.xml b/maven/pom.xml index 83c3d8cf0e..f2ac2e3f9c 100644 --- a/maven/pom.xml +++ b/maven/pom.xml @@ -21,7 +21,7 @@ org.hibernate.tool hibernate-tools-parent - 6.4.9-SNAPSHOT + 6.4.9.Final hibernate-tools-maven diff --git a/orm/pom.xml b/orm/pom.xml index 3fc5827a33..c3fb4e48e5 100644 --- a/orm/pom.xml +++ b/orm/pom.xml @@ -25,7 +25,7 @@ org.hibernate.tool hibernate-tools-parent - 6.4.9-SNAPSHOT + 6.4.9.Final hibernate-tools-orm diff --git a/orm/src/main/java/org/hibernate/tool/api/version/Version.java b/orm/src/main/java/org/hibernate/tool/api/version/Version.java index 1ba4cd0e7e..bfabb62f68 100644 --- a/orm/src/main/java/org/hibernate/tool/api/version/Version.java +++ b/orm/src/main/java/org/hibernate/tool/api/version/Version.java @@ -2,6 +2,6 @@ public interface Version { - final static String CURRENT_VERSION = "6.4.9-SNAPSHOT"; + final static String CURRENT_VERSION = "6.4.9.Final"; } diff --git a/pom.xml b/pom.xml index e41f64659e..b4f388446e 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ org.hibernate.tool hibernate-tools-parent - 6.4.9-SNAPSHOT + 6.4.9.Final pom diff --git a/test/common/pom.xml b/test/common/pom.xml index 829f961876..9d8560fbac 100644 --- a/test/common/pom.xml +++ b/test/common/pom.xml @@ -28,7 +28,7 @@ org.hibernate.tool hibernate-tools-tests-parent - 6.4.9-SNAPSHOT + 6.4.9.Final hibernate-tools-tests-common diff --git a/test/h2/pom.xml b/test/h2/pom.xml index 20b990959e..1d724e994c 100644 --- a/test/h2/pom.xml +++ b/test/h2/pom.xml @@ -28,7 +28,7 @@ org.hibernate.tool hibernate-tools-tests-parent - 6.4.9-SNAPSHOT + 6.4.9.Final hibernate-tools-tests-h2 diff --git a/test/hsql/pom.xml b/test/hsql/pom.xml index 4dbe4da834..aa54fbe108 100644 --- a/test/hsql/pom.xml +++ b/test/hsql/pom.xml @@ -27,7 +27,7 @@ org.hibernate.tool hibernate-tools-tests-parent - 6.4.9-SNAPSHOT + 6.4.9.Final hibernate-tools-tests-hsql diff --git a/test/maven/pom.xml b/test/maven/pom.xml index b9a20a378a..77f0f6a85c 100644 --- a/test/maven/pom.xml +++ b/test/maven/pom.xml @@ -28,7 +28,7 @@ org.hibernate.tool hibernate-tools-tests-parent - 6.4.9-SNAPSHOT + 6.4.9.Final hibernate-tools-tests-maven diff --git a/test/mssql/pom.xml b/test/mssql/pom.xml index e1e7d306f6..f9fdc960b4 100644 --- a/test/mssql/pom.xml +++ b/test/mssql/pom.xml @@ -28,7 +28,7 @@ org.hibernate.tool hibernate-tools-tests-parent - 6.4.9-SNAPSHOT + 6.4.9.Final hibernate-tools-tests-mssql diff --git a/test/mysql/pom.xml b/test/mysql/pom.xml index bcc6d69d25..6e8f4126dc 100644 --- a/test/mysql/pom.xml +++ b/test/mysql/pom.xml @@ -28,7 +28,7 @@ org.hibernate.tool hibernate-tools-tests-parent - 6.4.9-SNAPSHOT + 6.4.9.Final hibernate-tools-tests-mysql diff --git a/test/nodb/pom.xml b/test/nodb/pom.xml index 4fc53869e9..c8dcd5c990 100644 --- a/test/nodb/pom.xml +++ b/test/nodb/pom.xml @@ -27,7 +27,7 @@ org.hibernate.tool hibernate-tools-tests-parent - 6.4.9-SNAPSHOT + 6.4.9.Final hibernate-tools-tests-nodb diff --git a/test/oracle/pom.xml b/test/oracle/pom.xml index 1a8805da54..aabde5b8ae 100644 --- a/test/oracle/pom.xml +++ b/test/oracle/pom.xml @@ -28,7 +28,7 @@ org.hibernate.tool hibernate-tools-tests-parent - 6.4.9-SNAPSHOT + 6.4.9.Final hibernate-tools-tests-oracle diff --git a/test/pom.xml b/test/pom.xml index d8a797a5b9..567731f1b8 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -28,7 +28,7 @@ org.hibernate.tool hibernate-tools-parent - 6.4.9-SNAPSHOT + 6.4.9.Final hibernate-tools-tests-parent diff --git a/test/utils/pom.xml b/test/utils/pom.xml index 9a74a65689..2fb85ab0d0 100644 --- a/test/utils/pom.xml +++ b/test/utils/pom.xml @@ -27,7 +27,7 @@ org.hibernate.tool hibernate-tools-tests-parent - 6.4.9-SNAPSHOT + 6.4.9.Final hibernate-tools-tests-utils diff --git a/utils/pom.xml b/utils/pom.xml index 00c2b7ad22..30bdd95e54 100644 --- a/utils/pom.xml +++ b/utils/pom.xml @@ -21,7 +21,7 @@ org.hibernate.tool hibernate-tools-parent - 6.4.9-SNAPSHOT + 6.4.9.Final hibernate-tools-utils From 7ff26c377cdf304574ee0a38e6ba4fa55010a0d9 Mon Sep 17 00:00:00 2001 From: Jan Schatteman Date: Wed, 12 Jun 2024 23:20:58 +0200 Subject: [PATCH 27/58] HBX-2839: Update version identifier to 6.4.10-SNAPSHOT Signed-off-by: Jan Schatteman --- ant/pom.xml | 2 +- jbt/pom.xml | 2 +- maven/pom.xml | 2 +- orm/pom.xml | 2 +- orm/src/main/java/org/hibernate/tool/api/version/Version.java | 2 +- pom.xml | 2 +- test/common/pom.xml | 2 +- test/h2/pom.xml | 2 +- test/hsql/pom.xml | 2 +- test/maven/pom.xml | 2 +- test/mssql/pom.xml | 2 +- test/mysql/pom.xml | 2 +- test/nodb/pom.xml | 2 +- test/oracle/pom.xml | 2 +- test/pom.xml | 2 +- test/utils/pom.xml | 2 +- utils/pom.xml | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/ant/pom.xml b/ant/pom.xml index 544695561a..8e53c1d35e 100644 --- a/ant/pom.xml +++ b/ant/pom.xml @@ -21,7 +21,7 @@ org.hibernate.tool hibernate-tools-parent - 6.4.9.Final + 6.4.10-SNAPSHOT hibernate-tools-ant diff --git a/jbt/pom.xml b/jbt/pom.xml index 5d348ebc77..3babafd95f 100644 --- a/jbt/pom.xml +++ b/jbt/pom.xml @@ -25,7 +25,7 @@ org.hibernate.tool hibernate-tools-parent - 6.4.9.Final + 6.4.10-SNAPSHOT hibernate-tools-orm-jbt diff --git a/maven/pom.xml b/maven/pom.xml index f2ac2e3f9c..ccc695b938 100644 --- a/maven/pom.xml +++ b/maven/pom.xml @@ -21,7 +21,7 @@ org.hibernate.tool hibernate-tools-parent - 6.4.9.Final + 6.4.10-SNAPSHOT hibernate-tools-maven diff --git a/orm/pom.xml b/orm/pom.xml index c3fb4e48e5..6b38aa7633 100644 --- a/orm/pom.xml +++ b/orm/pom.xml @@ -25,7 +25,7 @@ org.hibernate.tool hibernate-tools-parent - 6.4.9.Final + 6.4.10-SNAPSHOT hibernate-tools-orm diff --git a/orm/src/main/java/org/hibernate/tool/api/version/Version.java b/orm/src/main/java/org/hibernate/tool/api/version/Version.java index bfabb62f68..b0d4824d7c 100644 --- a/orm/src/main/java/org/hibernate/tool/api/version/Version.java +++ b/orm/src/main/java/org/hibernate/tool/api/version/Version.java @@ -2,6 +2,6 @@ public interface Version { - final static String CURRENT_VERSION = "6.4.9.Final"; + final static String CURRENT_VERSION = "6.4.10-SNAPSHOT"; } diff --git a/pom.xml b/pom.xml index b4f388446e..67f9758a8f 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ org.hibernate.tool hibernate-tools-parent - 6.4.9.Final + 6.4.10-SNAPSHOT pom diff --git a/test/common/pom.xml b/test/common/pom.xml index 9d8560fbac..5cdaf777d0 100644 --- a/test/common/pom.xml +++ b/test/common/pom.xml @@ -28,7 +28,7 @@ org.hibernate.tool hibernate-tools-tests-parent - 6.4.9.Final + 6.4.10-SNAPSHOT hibernate-tools-tests-common diff --git a/test/h2/pom.xml b/test/h2/pom.xml index 1d724e994c..91d1517c10 100644 --- a/test/h2/pom.xml +++ b/test/h2/pom.xml @@ -28,7 +28,7 @@ org.hibernate.tool hibernate-tools-tests-parent - 6.4.9.Final + 6.4.10-SNAPSHOT hibernate-tools-tests-h2 diff --git a/test/hsql/pom.xml b/test/hsql/pom.xml index aa54fbe108..330d51c68b 100644 --- a/test/hsql/pom.xml +++ b/test/hsql/pom.xml @@ -27,7 +27,7 @@ org.hibernate.tool hibernate-tools-tests-parent - 6.4.9.Final + 6.4.10-SNAPSHOT hibernate-tools-tests-hsql diff --git a/test/maven/pom.xml b/test/maven/pom.xml index 77f0f6a85c..2f49162b02 100644 --- a/test/maven/pom.xml +++ b/test/maven/pom.xml @@ -28,7 +28,7 @@ org.hibernate.tool hibernate-tools-tests-parent - 6.4.9.Final + 6.4.10-SNAPSHOT hibernate-tools-tests-maven diff --git a/test/mssql/pom.xml b/test/mssql/pom.xml index f9fdc960b4..8e56a019c0 100644 --- a/test/mssql/pom.xml +++ b/test/mssql/pom.xml @@ -28,7 +28,7 @@ org.hibernate.tool hibernate-tools-tests-parent - 6.4.9.Final + 6.4.10-SNAPSHOT hibernate-tools-tests-mssql diff --git a/test/mysql/pom.xml b/test/mysql/pom.xml index 6e8f4126dc..a74053bba1 100644 --- a/test/mysql/pom.xml +++ b/test/mysql/pom.xml @@ -28,7 +28,7 @@ org.hibernate.tool hibernate-tools-tests-parent - 6.4.9.Final + 6.4.10-SNAPSHOT hibernate-tools-tests-mysql diff --git a/test/nodb/pom.xml b/test/nodb/pom.xml index c8dcd5c990..35e7aa30be 100644 --- a/test/nodb/pom.xml +++ b/test/nodb/pom.xml @@ -27,7 +27,7 @@ org.hibernate.tool hibernate-tools-tests-parent - 6.4.9.Final + 6.4.10-SNAPSHOT hibernate-tools-tests-nodb diff --git a/test/oracle/pom.xml b/test/oracle/pom.xml index aabde5b8ae..829093f5bd 100644 --- a/test/oracle/pom.xml +++ b/test/oracle/pom.xml @@ -28,7 +28,7 @@ org.hibernate.tool hibernate-tools-tests-parent - 6.4.9.Final + 6.4.10-SNAPSHOT hibernate-tools-tests-oracle diff --git a/test/pom.xml b/test/pom.xml index 567731f1b8..a8a221a5dc 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -28,7 +28,7 @@ org.hibernate.tool hibernate-tools-parent - 6.4.9.Final + 6.4.10-SNAPSHOT hibernate-tools-tests-parent diff --git a/test/utils/pom.xml b/test/utils/pom.xml index 2fb85ab0d0..8a7df7e67b 100644 --- a/test/utils/pom.xml +++ b/test/utils/pom.xml @@ -27,7 +27,7 @@ org.hibernate.tool hibernate-tools-tests-parent - 6.4.9.Final + 6.4.10-SNAPSHOT hibernate-tools-tests-utils diff --git a/utils/pom.xml b/utils/pom.xml index 30bdd95e54..4177aa49cf 100644 --- a/utils/pom.xml +++ b/utils/pom.xml @@ -21,7 +21,7 @@ org.hibernate.tool hibernate-tools-parent - 6.4.9.Final + 6.4.10-SNAPSHOT hibernate-tools-utils From e65a99e179e5e83e0e2cc95c42d61305f44be254 Mon Sep 17 00:00:00 2001 From: Koen Aers Date: Fri, 19 Jul 2024 08:23:36 +0300 Subject: [PATCH 28/58] HBX-2869: Create a GenerateHBM Mojo in the Maven plugin - Add the Mojo Signed-off-by: Koen Aers --- .../hibernate/tool/maven/GenerateHbmMojo.java | 66 +++++++++++++++++++ 1 file changed, 66 insertions(+) create mode 100644 maven/src/main/java/org/hibernate/tool/maven/GenerateHbmMojo.java diff --git a/maven/src/main/java/org/hibernate/tool/maven/GenerateHbmMojo.java b/maven/src/main/java/org/hibernate/tool/maven/GenerateHbmMojo.java new file mode 100644 index 0000000000..13dc50aa5e --- /dev/null +++ b/maven/src/main/java/org/hibernate/tool/maven/GenerateHbmMojo.java @@ -0,0 +1,66 @@ +/* + * Hibernate Tools, Tooling for your Hibernate Projects + * + * Copyright 2016-2020 Red Hat, Inc. + * + * Licensed under the GNU Lesser General Public License (LGPL), + * version 2.1 or later (the "License"). + * You may not use this file except in compliance with the License. + * You may read the licence in the 'lgpl.txt' file in the root folder of + * project or obtain a copy at + * + * http://www.gnu.org/licenses/lgpl-2.1.html + * + * 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. + */ +package org.hibernate.tool.maven; + +import org.apache.maven.plugins.annotations.Mojo; +import org.apache.maven.plugins.annotations.Parameter; +import org.hibernate.tool.api.export.Exporter; +import org.hibernate.tool.api.export.ExporterConstants; +import org.hibernate.tool.api.export.ExporterFactory; +import org.hibernate.tool.api.export.ExporterType; +import org.hibernate.tool.api.metadata.MetadataDescriptor; + +import java.io.File; + +import static org.apache.maven.plugins.annotations.LifecyclePhase.GENERATE_SOURCES; + +/** + * Mojo to generate hbm.xml files from an existing database. + *

+ * See: https://docs.jboss.org/tools/latest/en/hibernatetools/html_single/#d0e4821 + */ +@Mojo(name = "generateHbm", defaultPhase = GENERATE_SOURCES) +public class GenerateHbmMojo extends AbstractGenerationMojo { + + /** The directory into which the DAOs will be generated. */ + @Parameter(defaultValue = "${project.basedir}/src/main/resources") + private File outputDirectory; + + @Parameter + private String templatePath; + + protected void executeExporter(MetadataDescriptor metadataDescriptor) { + try { + Exporter hbmExporter = ExporterFactory.createExporter(ExporterType.HBM); + hbmExporter.getProperties().put(ExporterConstants.METADATA_DESCRIPTOR, metadataDescriptor); + hbmExporter.getProperties().put(ExporterConstants.DESTINATION_FOLDER, outputDirectory); + if (templatePath != null) { + getLog().info("Setting template path to: " + templatePath); + hbmExporter.getProperties().put(ExporterConstants.TEMPLATE_PATH, new String[] {templatePath}); + } + getLog().info("Starting HBM export to directory: " + outputDirectory + "..."); + hbmExporter.start(); + } catch (Exception e) { + e.printStackTrace(); + } + } + + +} From 06a60f3215e6a3332077560e90ad8f09973e9748 Mon Sep 17 00:00:00 2001 From: Koen Aers Date: Fri, 19 Jul 2024 12:55:18 +0300 Subject: [PATCH 29/58] HBX-2869: Create a GenerateHBM Mojo in the Maven plugin - Test the Mojo Signed-off-by: Koen Aers --- .../src/it/generateHbm/invoker.properties | 2 + test/maven/src/it/generateHbm/pom.xml | 53 ++++++++++++++++++ .../src/main/resources/hibernate.properties | 7 +++ .../src/main/resources/hibernate.reveng.xml | 11 ++++ .../main/resources/templates/pojo/Pojo.ftl | 29 ++++++++++ .../resources/templates/pojo/PojoFields.ftl | 7 +++ test/maven/src/it/generateHbm/test.mv.db | Bin 0 -> 28672 bytes test/maven/src/it/generateHbm/verify.groovy | 6 ++ 8 files changed, 115 insertions(+) create mode 100644 test/maven/src/it/generateHbm/invoker.properties create mode 100644 test/maven/src/it/generateHbm/pom.xml create mode 100644 test/maven/src/it/generateHbm/src/main/resources/hibernate.properties create mode 100644 test/maven/src/it/generateHbm/src/main/resources/hibernate.reveng.xml create mode 100644 test/maven/src/it/generateHbm/src/main/resources/templates/pojo/Pojo.ftl create mode 100644 test/maven/src/it/generateHbm/src/main/resources/templates/pojo/PojoFields.ftl create mode 100644 test/maven/src/it/generateHbm/test.mv.db create mode 100644 test/maven/src/it/generateHbm/verify.groovy diff --git a/test/maven/src/it/generateHbm/invoker.properties b/test/maven/src/it/generateHbm/invoker.properties new file mode 100644 index 0000000000..13598db400 --- /dev/null +++ b/test/maven/src/it/generateHbm/invoker.properties @@ -0,0 +1,2 @@ +invoker.java.version = 1.8+ +invoker.goals = generate-resources \ No newline at end of file diff --git a/test/maven/src/it/generateHbm/pom.xml b/test/maven/src/it/generateHbm/pom.xml new file mode 100644 index 0000000000..31b70c7f7e --- /dev/null +++ b/test/maven/src/it/generateHbm/pom.xml @@ -0,0 +1,53 @@ + + + 4.0.0 + + org.hibernate.tool.test + hbm2ddl + 0.0.1-SNAPSHOT + + + UTF-8 + UTF-8 + + 1.8 + 1.4.195 + + + + + + org.hibernate.tool + hibernate-tools-maven + @project.version@ + + + HBM generation + generate-resources + + generateHbm + + + ${project.build.directory}/generated-sources + ${project.basedir}/src/main/resources/templates/ + + + + + ${project.basedir}/src/main/resources/hibernate.reveng.xml + + + + + com.h2database + h2 + ${h2.version} + + + + + + + \ No newline at end of file diff --git a/test/maven/src/it/generateHbm/src/main/resources/hibernate.properties b/test/maven/src/it/generateHbm/src/main/resources/hibernate.properties new file mode 100644 index 0000000000..71496b3adc --- /dev/null +++ b/test/maven/src/it/generateHbm/src/main/resources/hibernate.properties @@ -0,0 +1,7 @@ +hibernate.dialect=org.hibernate.dialect.H2Dialect +hibernate.connection.driver_class=org.h2.Driver +hibernate.connection.url=jdbc:h2:./test;DB_CLOSE_ON_EXIT=FALSE +hibernate.connection.username=sa +hibernate.connection.password= +hibernate.connection.pool_size=1 +hibernate.show_sql=true \ No newline at end of file diff --git a/test/maven/src/it/generateHbm/src/main/resources/hibernate.reveng.xml b/test/maven/src/it/generateHbm/src/main/resources/hibernate.reveng.xml new file mode 100644 index 0000000000..7ac52fd2cf --- /dev/null +++ b/test/maven/src/it/generateHbm/src/main/resources/hibernate.reveng.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/test/maven/src/it/generateHbm/src/main/resources/templates/pojo/Pojo.ftl b/test/maven/src/it/generateHbm/src/main/resources/templates/pojo/Pojo.ftl new file mode 100644 index 0000000000..84ff76a5b2 --- /dev/null +++ b/test/maven/src/it/generateHbm/src/main/resources/templates/pojo/Pojo.ftl @@ -0,0 +1,29 @@ +${pojo.getPackageDeclaration()} +// Generated ${date} by Hibernate Tools ${version} + +<#assign classbody> +<#include "PojoTypeDeclaration.ftl"/> { + +<#if !pojo.isInterface()> +<#include "PojoFields.ftl"/> + +<#include "PojoConstructors.ftl"/> + +<#include "PojoPropertyAccessors.ftl"/> + +<#include "PojoToString.ftl"/> + +<#include "PojoEqualsHashcode.ftl"/> + +<#else> +<#include "PojoInterfacePropertyAccessors.ftl"/> + + +<#include "PojoExtraClassCode.ftl"/> + +} + + +${pojo.generateImports()} +${classbody} + diff --git a/test/maven/src/it/generateHbm/src/main/resources/templates/pojo/PojoFields.ftl b/test/maven/src/it/generateHbm/src/main/resources/templates/pojo/PojoFields.ftl new file mode 100644 index 0000000000..18cf396cc6 --- /dev/null +++ b/test/maven/src/it/generateHbm/src/main/resources/templates/pojo/PojoFields.ftl @@ -0,0 +1,7 @@ +<#-- // Fields --> +<#list pojo.getAllPropertiesIterator() as field><#if pojo.getMetaAttribAsBool(field, "gen-property", true)><#if pojo.hasMetaAttribute(field, "field-description")> /** + ${pojo.getFieldJavaDoc(field, 0)} + */ + ${pojo.getFieldModifiers(field)} ${pojo.getJavaTypeName(field, jdk5)} ${c2j.keyWordCheck(field.name)}<#if pojo.hasFieldInitializor(field, jdk5)> = ${pojo.getFieldInitialization(field, jdk5)}; + + diff --git a/test/maven/src/it/generateHbm/test.mv.db b/test/maven/src/it/generateHbm/test.mv.db new file mode 100644 index 0000000000000000000000000000000000000000..72d79270f88b69518fe17598ef53debfe7371c91 GIT binary patch literal 28672 zcmeI4TWcFf6vuZJtBI93AWCQ-S{NtPPC+O$yV{#*OJr$-L?zisa!8)c>@6{IBxB1V z^r3{d^r_Hq(9hAAmVAOd=B*IOW4}Y`XlG}4t&1bas&UB?W-qg=oio4H#sB}Aqk35> zIC}&4iCA}czw^rkV_a|_AN8M<00AHX1b_e#00KY&2mk>f00e*l5V!yY>O%L6HR%5f za91D%AOHk_01yBIKmZ5;0U!VbfB+Bx0*fUOC;7!BfIYv@vieWyewni6^D=R8q3=H* zmes;OedHf9pWt9HV3~izWRnCiRt&5bhPzMMq=A4C*KwWHlmK*=$7uGzs`OTpWl8$v zg(Tf+v-Mp`dj0D1^(+gps7sPOkbjXbOIN~S6g5|Dc;N{oTq@yG4VR^GsXdE^?M8DS zv;rUY-tIHM#RjdYxG>t@ibkB^(EJF89^udgj*td+a2kiEQY*pXif+BATYaosVy3%I z--VL63r5tfD!MIAxeJ=+7)iI@jXq_!XRz=0dk3_CNZlcuuyJ@TY(46GgXZ87-x*S8 z&oAPu;gP+8)1v$FcE=AE`^tl>0RbQY1b_e#00KY&2mk>f00cfP0u%as+I;#zQ3F@? zoU^Fu>CeqY{RfdERU<_@Mevr!1+N<_&trmDF;pw1|AXnB&e_WJzx}sP`Y39DnFWo|`D_=!?wmPh}^ALS&Ka7LoO*^b< z$3&a$xSa>vsIg0|qc2t-F^CNAlmW5v*HCq{-R*TMqcKIJOQyt%Cmt2- z(Lo*p`y5!yyuF;2@|jhV&)ihM6SXP*8)p8r=2%`L^5XC0p+lF3tf{{OE~+kMJz*PV_e zjn=PUEyvm}^IN7WEuWuHm?|29U2mk>f z00e*l5C8&c0$g>b^taIetSSCIJy*x38Bl9dBcHWJ9U z`G0M!N=O%p=~P(^wo2GdI&~JR|9|{24HsU06y^W<4(R{%7cFc90U!VbfB+Bx0zlw` z5SYk13;nOTiT)3;>bt~q&m^a(K3VAh@qBZl|7Yg^jX5gMr}jB-BhUZ8;o9yl&;RrK z|6}?8?^F5zDcVkmJojXg7iYZBLFFYGZ*sg+--`49=OX)N#zA8m=b!^;M&SqzJZ?@2 zG5R0f@D2iz{!jFG VtpB}~{wErC70;hnInRGy?qAGfE9C$H literal 0 HcmV?d00001 diff --git a/test/maven/src/it/generateHbm/verify.groovy b/test/maven/src/it/generateHbm/verify.groovy new file mode 100644 index 0000000000..586fe51dc5 --- /dev/null +++ b/test/maven/src/it/generateHbm/verify.groovy @@ -0,0 +1,6 @@ +import java.io.*; + +File file = new File(basedir, "target/generated-sources/Person.hbm.xml"); +if (!file.isFile()) { + throw new FileNotFoundException("Could not find generated HBM file: " + file); +} From 0bdbbede025bc27a030a0c2f52588dc946e5ed65 Mon Sep 17 00:00:00 2001 From: Jan Schatteman Date: Tue, 6 Aug 2024 21:30:03 +0200 Subject: [PATCH 30/58] HBX-2895: Update Hibernate ORM Dependency to Version 6.4.10.Final Signed-off-by: Jan Schatteman --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 67f9758a8f..3275b650f1 100644 --- a/pom.xml +++ b/pom.xml @@ -92,7 +92,7 @@ 1.19.1 2.2.224 6.0.6.Final - 6.4.9.Final + 6.4.10.Final 2.6.1 8.0.1 3.5.3.Final From 166f67f8c0037ef47b03e34762cabd5e245d9e8b Mon Sep 17 00:00:00 2001 From: Jan Schatteman Date: Tue, 6 Aug 2024 21:41:38 +0200 Subject: [PATCH 31/58] HBX-2896: Update version identifier to 6.4.10.Final Signed-off-by: Jan Schatteman --- ant/pom.xml | 2 +- jbt/pom.xml | 2 +- maven/pom.xml | 2 +- orm/pom.xml | 2 +- orm/src/main/java/org/hibernate/tool/api/version/Version.java | 2 +- pom.xml | 2 +- test/common/pom.xml | 2 +- test/h2/pom.xml | 2 +- test/hsql/pom.xml | 2 +- test/maven/pom.xml | 2 +- test/mssql/pom.xml | 2 +- test/mysql/pom.xml | 2 +- test/nodb/pom.xml | 2 +- test/oracle/pom.xml | 2 +- test/pom.xml | 2 +- test/utils/pom.xml | 2 +- utils/pom.xml | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/ant/pom.xml b/ant/pom.xml index 8e53c1d35e..e0e1d980e8 100644 --- a/ant/pom.xml +++ b/ant/pom.xml @@ -21,7 +21,7 @@ org.hibernate.tool hibernate-tools-parent - 6.4.10-SNAPSHOT + 6.4.10.Final hibernate-tools-ant diff --git a/jbt/pom.xml b/jbt/pom.xml index 3babafd95f..f535a66d47 100644 --- a/jbt/pom.xml +++ b/jbt/pom.xml @@ -25,7 +25,7 @@ org.hibernate.tool hibernate-tools-parent - 6.4.10-SNAPSHOT + 6.4.10.Final hibernate-tools-orm-jbt diff --git a/maven/pom.xml b/maven/pom.xml index ccc695b938..fa9e14bb9e 100644 --- a/maven/pom.xml +++ b/maven/pom.xml @@ -21,7 +21,7 @@ org.hibernate.tool hibernate-tools-parent - 6.4.10-SNAPSHOT + 6.4.10.Final hibernate-tools-maven diff --git a/orm/pom.xml b/orm/pom.xml index 6b38aa7633..ca95653745 100644 --- a/orm/pom.xml +++ b/orm/pom.xml @@ -25,7 +25,7 @@ org.hibernate.tool hibernate-tools-parent - 6.4.10-SNAPSHOT + 6.4.10.Final hibernate-tools-orm diff --git a/orm/src/main/java/org/hibernate/tool/api/version/Version.java b/orm/src/main/java/org/hibernate/tool/api/version/Version.java index b0d4824d7c..b166f09b63 100644 --- a/orm/src/main/java/org/hibernate/tool/api/version/Version.java +++ b/orm/src/main/java/org/hibernate/tool/api/version/Version.java @@ -2,6 +2,6 @@ public interface Version { - final static String CURRENT_VERSION = "6.4.10-SNAPSHOT"; + final static String CURRENT_VERSION = "6.4.10.Final"; } diff --git a/pom.xml b/pom.xml index 3275b650f1..399b165069 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ org.hibernate.tool hibernate-tools-parent - 6.4.10-SNAPSHOT + 6.4.10.Final pom diff --git a/test/common/pom.xml b/test/common/pom.xml index 5cdaf777d0..4a0e977500 100644 --- a/test/common/pom.xml +++ b/test/common/pom.xml @@ -28,7 +28,7 @@ org.hibernate.tool hibernate-tools-tests-parent - 6.4.10-SNAPSHOT + 6.4.10.Final hibernate-tools-tests-common diff --git a/test/h2/pom.xml b/test/h2/pom.xml index 91d1517c10..dddf4fc3db 100644 --- a/test/h2/pom.xml +++ b/test/h2/pom.xml @@ -28,7 +28,7 @@ org.hibernate.tool hibernate-tools-tests-parent - 6.4.10-SNAPSHOT + 6.4.10.Final hibernate-tools-tests-h2 diff --git a/test/hsql/pom.xml b/test/hsql/pom.xml index 330d51c68b..f02ddb345a 100644 --- a/test/hsql/pom.xml +++ b/test/hsql/pom.xml @@ -27,7 +27,7 @@ org.hibernate.tool hibernate-tools-tests-parent - 6.4.10-SNAPSHOT + 6.4.10.Final hibernate-tools-tests-hsql diff --git a/test/maven/pom.xml b/test/maven/pom.xml index 2f49162b02..9bdb273f21 100644 --- a/test/maven/pom.xml +++ b/test/maven/pom.xml @@ -28,7 +28,7 @@ org.hibernate.tool hibernate-tools-tests-parent - 6.4.10-SNAPSHOT + 6.4.10.Final hibernate-tools-tests-maven diff --git a/test/mssql/pom.xml b/test/mssql/pom.xml index 8e56a019c0..be6ee3472b 100644 --- a/test/mssql/pom.xml +++ b/test/mssql/pom.xml @@ -28,7 +28,7 @@ org.hibernate.tool hibernate-tools-tests-parent - 6.4.10-SNAPSHOT + 6.4.10.Final hibernate-tools-tests-mssql diff --git a/test/mysql/pom.xml b/test/mysql/pom.xml index a74053bba1..d88f9b7b79 100644 --- a/test/mysql/pom.xml +++ b/test/mysql/pom.xml @@ -28,7 +28,7 @@ org.hibernate.tool hibernate-tools-tests-parent - 6.4.10-SNAPSHOT + 6.4.10.Final hibernate-tools-tests-mysql diff --git a/test/nodb/pom.xml b/test/nodb/pom.xml index 35e7aa30be..6db663f359 100644 --- a/test/nodb/pom.xml +++ b/test/nodb/pom.xml @@ -27,7 +27,7 @@ org.hibernate.tool hibernate-tools-tests-parent - 6.4.10-SNAPSHOT + 6.4.10.Final hibernate-tools-tests-nodb diff --git a/test/oracle/pom.xml b/test/oracle/pom.xml index 829093f5bd..8d9c72d305 100644 --- a/test/oracle/pom.xml +++ b/test/oracle/pom.xml @@ -28,7 +28,7 @@ org.hibernate.tool hibernate-tools-tests-parent - 6.4.10-SNAPSHOT + 6.4.10.Final hibernate-tools-tests-oracle diff --git a/test/pom.xml b/test/pom.xml index a8a221a5dc..a35695aa7f 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -28,7 +28,7 @@ org.hibernate.tool hibernate-tools-parent - 6.4.10-SNAPSHOT + 6.4.10.Final hibernate-tools-tests-parent diff --git a/test/utils/pom.xml b/test/utils/pom.xml index 8a7df7e67b..6471b55621 100644 --- a/test/utils/pom.xml +++ b/test/utils/pom.xml @@ -27,7 +27,7 @@ org.hibernate.tool hibernate-tools-tests-parent - 6.4.10-SNAPSHOT + 6.4.10.Final hibernate-tools-tests-utils diff --git a/utils/pom.xml b/utils/pom.xml index 4177aa49cf..e1cf1d63bf 100644 --- a/utils/pom.xml +++ b/utils/pom.xml @@ -21,7 +21,7 @@ org.hibernate.tool hibernate-tools-parent - 6.4.10-SNAPSHOT + 6.4.10.Final hibernate-tools-utils From 3241327edd67dd811bb86148fdf12c16b4dca4bc Mon Sep 17 00:00:00 2001 From: Jan Schatteman Date: Tue, 6 Aug 2024 22:46:49 +0200 Subject: [PATCH 32/58] HBX-2897: Update version identifier to 6.4.11-SNAPSHOT Signed-off-by: Jan Schatteman --- ant/pom.xml | 2 +- jbt/pom.xml | 2 +- maven/pom.xml | 2 +- orm/pom.xml | 2 +- orm/src/main/java/org/hibernate/tool/api/version/Version.java | 2 +- pom.xml | 2 +- test/common/pom.xml | 2 +- test/h2/pom.xml | 2 +- test/hsql/pom.xml | 2 +- test/maven/pom.xml | 2 +- test/mssql/pom.xml | 2 +- test/mysql/pom.xml | 2 +- test/nodb/pom.xml | 2 +- test/oracle/pom.xml | 2 +- test/pom.xml | 2 +- test/utils/pom.xml | 2 +- utils/pom.xml | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/ant/pom.xml b/ant/pom.xml index e0e1d980e8..3c43d31822 100644 --- a/ant/pom.xml +++ b/ant/pom.xml @@ -21,7 +21,7 @@ org.hibernate.tool hibernate-tools-parent - 6.4.10.Final + 6.4.11-SNAPSHOT hibernate-tools-ant diff --git a/jbt/pom.xml b/jbt/pom.xml index f535a66d47..d2fa37d3be 100644 --- a/jbt/pom.xml +++ b/jbt/pom.xml @@ -25,7 +25,7 @@ org.hibernate.tool hibernate-tools-parent - 6.4.10.Final + 6.4.11-SNAPSHOT hibernate-tools-orm-jbt diff --git a/maven/pom.xml b/maven/pom.xml index fa9e14bb9e..86cada3c20 100644 --- a/maven/pom.xml +++ b/maven/pom.xml @@ -21,7 +21,7 @@ org.hibernate.tool hibernate-tools-parent - 6.4.10.Final + 6.4.11-SNAPSHOT hibernate-tools-maven diff --git a/orm/pom.xml b/orm/pom.xml index ca95653745..a43fd010a5 100644 --- a/orm/pom.xml +++ b/orm/pom.xml @@ -25,7 +25,7 @@ org.hibernate.tool hibernate-tools-parent - 6.4.10.Final + 6.4.11-SNAPSHOT hibernate-tools-orm diff --git a/orm/src/main/java/org/hibernate/tool/api/version/Version.java b/orm/src/main/java/org/hibernate/tool/api/version/Version.java index b166f09b63..ddbaef081a 100644 --- a/orm/src/main/java/org/hibernate/tool/api/version/Version.java +++ b/orm/src/main/java/org/hibernate/tool/api/version/Version.java @@ -2,6 +2,6 @@ public interface Version { - final static String CURRENT_VERSION = "6.4.10.Final"; + final static String CURRENT_VERSION = "6.4.11-SNAPSHOT"; } diff --git a/pom.xml b/pom.xml index 399b165069..108fca8fe0 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ org.hibernate.tool hibernate-tools-parent - 6.4.10.Final + 6.4.11-SNAPSHOT pom diff --git a/test/common/pom.xml b/test/common/pom.xml index 4a0e977500..4601a5d8bf 100644 --- a/test/common/pom.xml +++ b/test/common/pom.xml @@ -28,7 +28,7 @@ org.hibernate.tool hibernate-tools-tests-parent - 6.4.10.Final + 6.4.11-SNAPSHOT hibernate-tools-tests-common diff --git a/test/h2/pom.xml b/test/h2/pom.xml index dddf4fc3db..5e4fed1576 100644 --- a/test/h2/pom.xml +++ b/test/h2/pom.xml @@ -28,7 +28,7 @@ org.hibernate.tool hibernate-tools-tests-parent - 6.4.10.Final + 6.4.11-SNAPSHOT hibernate-tools-tests-h2 diff --git a/test/hsql/pom.xml b/test/hsql/pom.xml index f02ddb345a..5bbcc94426 100644 --- a/test/hsql/pom.xml +++ b/test/hsql/pom.xml @@ -27,7 +27,7 @@ org.hibernate.tool hibernate-tools-tests-parent - 6.4.10.Final + 6.4.11-SNAPSHOT hibernate-tools-tests-hsql diff --git a/test/maven/pom.xml b/test/maven/pom.xml index 9bdb273f21..4be4a6d400 100644 --- a/test/maven/pom.xml +++ b/test/maven/pom.xml @@ -28,7 +28,7 @@ org.hibernate.tool hibernate-tools-tests-parent - 6.4.10.Final + 6.4.11-SNAPSHOT hibernate-tools-tests-maven diff --git a/test/mssql/pom.xml b/test/mssql/pom.xml index be6ee3472b..d6bb03988c 100644 --- a/test/mssql/pom.xml +++ b/test/mssql/pom.xml @@ -28,7 +28,7 @@ org.hibernate.tool hibernate-tools-tests-parent - 6.4.10.Final + 6.4.11-SNAPSHOT hibernate-tools-tests-mssql diff --git a/test/mysql/pom.xml b/test/mysql/pom.xml index d88f9b7b79..df2d2fed3c 100644 --- a/test/mysql/pom.xml +++ b/test/mysql/pom.xml @@ -28,7 +28,7 @@ org.hibernate.tool hibernate-tools-tests-parent - 6.4.10.Final + 6.4.11-SNAPSHOT hibernate-tools-tests-mysql diff --git a/test/nodb/pom.xml b/test/nodb/pom.xml index 6db663f359..a3aadd3b3f 100644 --- a/test/nodb/pom.xml +++ b/test/nodb/pom.xml @@ -27,7 +27,7 @@ org.hibernate.tool hibernate-tools-tests-parent - 6.4.10.Final + 6.4.11-SNAPSHOT hibernate-tools-tests-nodb diff --git a/test/oracle/pom.xml b/test/oracle/pom.xml index 8d9c72d305..d97829e1e3 100644 --- a/test/oracle/pom.xml +++ b/test/oracle/pom.xml @@ -28,7 +28,7 @@ org.hibernate.tool hibernate-tools-tests-parent - 6.4.10.Final + 6.4.11-SNAPSHOT hibernate-tools-tests-oracle diff --git a/test/pom.xml b/test/pom.xml index a35695aa7f..9d2c4da8c2 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -28,7 +28,7 @@ org.hibernate.tool hibernate-tools-parent - 6.4.10.Final + 6.4.11-SNAPSHOT hibernate-tools-tests-parent diff --git a/test/utils/pom.xml b/test/utils/pom.xml index 6471b55621..8933d2f62b 100644 --- a/test/utils/pom.xml +++ b/test/utils/pom.xml @@ -27,7 +27,7 @@ org.hibernate.tool hibernate-tools-tests-parent - 6.4.10.Final + 6.4.11-SNAPSHOT hibernate-tools-tests-utils diff --git a/utils/pom.xml b/utils/pom.xml index e1cf1d63bf..72d0c7d215 100644 --- a/utils/pom.xml +++ b/utils/pom.xml @@ -21,7 +21,7 @@ org.hibernate.tool hibernate-tools-parent - 6.4.10.Final + 6.4.11-SNAPSHOT hibernate-tools-utils From c273c2f41a92204d3577c772baacfe5086d1da5b Mon Sep 17 00:00:00 2001 From: Koen Aers Date: Thu, 29 Aug 2024 14:22:41 +0300 Subject: [PATCH 33/58] HBX-2910: Make sure that the Exporter classes needed by plugin 'org.hibernate.eclipse.console' are visible and available Signed-off-by: Koen Aers --- .../org/hibernate/tool/hbm2x/DAOExporter.java | 5 ++ .../hibernate/tool/hbm2x/GenericExporter.java | 3 + .../hibernate/tool/hbm2x/Hbm2DDLExporter.java | 5 ++ .../hibernate/tool/hbm2x/QueryExporter.java | 3 + .../tool/hbm2x/ExportersPresenceTest.java | 87 +++++++++++++++++++ 5 files changed, 103 insertions(+) create mode 100644 jbt/src/main/java/org/hibernate/tool/hbm2x/DAOExporter.java create mode 100644 jbt/src/main/java/org/hibernate/tool/hbm2x/GenericExporter.java create mode 100644 jbt/src/main/java/org/hibernate/tool/hbm2x/Hbm2DDLExporter.java create mode 100644 jbt/src/main/java/org/hibernate/tool/hbm2x/QueryExporter.java create mode 100644 jbt/src/test/java/org/hibernate/tool/hbm2x/ExportersPresenceTest.java diff --git a/jbt/src/main/java/org/hibernate/tool/hbm2x/DAOExporter.java b/jbt/src/main/java/org/hibernate/tool/hbm2x/DAOExporter.java new file mode 100644 index 0000000000..263e564e9a --- /dev/null +++ b/jbt/src/main/java/org/hibernate/tool/hbm2x/DAOExporter.java @@ -0,0 +1,5 @@ +package org.hibernate.tool.hbm2x; + +import org.hibernate.tool.internal.export.dao.DaoExporter; + +public class DAOExporter extends DaoExporter {} diff --git a/jbt/src/main/java/org/hibernate/tool/hbm2x/GenericExporter.java b/jbt/src/main/java/org/hibernate/tool/hbm2x/GenericExporter.java new file mode 100644 index 0000000000..3ae36af92d --- /dev/null +++ b/jbt/src/main/java/org/hibernate/tool/hbm2x/GenericExporter.java @@ -0,0 +1,3 @@ +package org.hibernate.tool.hbm2x; + +public class GenericExporter extends org.hibernate.tool.internal.export.common.GenericExporter {} diff --git a/jbt/src/main/java/org/hibernate/tool/hbm2x/Hbm2DDLExporter.java b/jbt/src/main/java/org/hibernate/tool/hbm2x/Hbm2DDLExporter.java new file mode 100644 index 0000000000..ce5334e854 --- /dev/null +++ b/jbt/src/main/java/org/hibernate/tool/hbm2x/Hbm2DDLExporter.java @@ -0,0 +1,5 @@ +package org.hibernate.tool.hbm2x; + +import org.hibernate.tool.internal.export.ddl.DdlExporter; + +public class Hbm2DDLExporter extends DdlExporter {} diff --git a/jbt/src/main/java/org/hibernate/tool/hbm2x/QueryExporter.java b/jbt/src/main/java/org/hibernate/tool/hbm2x/QueryExporter.java new file mode 100644 index 0000000000..cb199780c0 --- /dev/null +++ b/jbt/src/main/java/org/hibernate/tool/hbm2x/QueryExporter.java @@ -0,0 +1,3 @@ +package org.hibernate.tool.hbm2x; + +public class QueryExporter extends org.hibernate.tool.internal.export.query.QueryExporter {} diff --git a/jbt/src/test/java/org/hibernate/tool/hbm2x/ExportersPresenceTest.java b/jbt/src/test/java/org/hibernate/tool/hbm2x/ExportersPresenceTest.java new file mode 100644 index 0000000000..f2b9b0b82c --- /dev/null +++ b/jbt/src/test/java/org/hibernate/tool/hbm2x/ExportersPresenceTest.java @@ -0,0 +1,87 @@ +package org.hibernate.tool.hbm2x; + +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.fail; + +import org.junit.jupiter.api.Test; + +public class ExportersPresenceTest { + + @Test + public void testHbm2DDLExporter() { + try { + ClassLoader cl = getClass().getClassLoader(); + Class ddlExporterClass = cl.loadClass("org.hibernate.tool.hbm2x.Hbm2DDLExporter"); + assertNotNull(ddlExporterClass); + } catch (Throwable t) { + fail(t); + } + } + + @Test + public void testPOJOExporter() { + try { + ClassLoader cl = getClass().getClassLoader(); + Class pojoExporterClass = cl.loadClass("org.hibernate.tool.hbm2x.POJOExporter"); + assertNotNull(pojoExporterClass); + } catch (Throwable t) { + fail(t); + } + } + + @Test + public void testHibernateMappingExporter() { + try { + ClassLoader cl = getClass().getClassLoader(); + Class hibernateMappingExporterClass = cl.loadClass("org.hibernate.tool.hbm2x.HibernateMappingExporter"); + assertNotNull(hibernateMappingExporterClass); + } catch (Throwable t) { + fail(t); + } + } + + @Test + public void testDAOExporter() { + try { + ClassLoader cl = getClass().getClassLoader(); + Class daoExporterClass = cl.loadClass("org.hibernate.tool.hbm2x.DAOExporter"); + assertNotNull(daoExporterClass); + } catch (Throwable t) { + fail(t); + } + } + + @Test + public void testGenericExporter() { + try { + ClassLoader cl = getClass().getClassLoader(); + Class genericExporterClass = cl.loadClass("org.hibernate.tool.hbm2x.GenericExporter"); + assertNotNull(genericExporterClass); + } catch (Throwable t) { + fail(t); + } + } + + @Test + public void testHibernateConfigurationExporter() { + try { + ClassLoader cl = getClass().getClassLoader(); + Class hibernateConfigurationExporterClass = cl.loadClass("org.hibernate.tool.hbm2x.HibernateConfigurationExporter"); + assertNotNull(hibernateConfigurationExporterClass); + } catch (Throwable t) { + fail(t); + } + } + + @Test + public void testQueryExporter() { + try { + ClassLoader cl = getClass().getClassLoader(); + Class hibernateConfigurationExporterClass = cl.loadClass("org.hibernate.tool.hbm2x.QueryExporter"); + assertNotNull(hibernateConfigurationExporterClass); + } catch (Throwable t) { + fail(t); + } + } + +} From 0be114e2a06db9f5e16ee9ccf2b04eca145a5d25 Mon Sep 17 00:00:00 2001 From: Koen Aers Date: Fri, 30 Aug 2024 11:45:40 +0300 Subject: [PATCH 34/58] HBX-2910: Make sure that the Exporter classes needed by plugin 'org.hibernate.eclipse.console' are visible and available - Handle the case for 'org.hibernate.tool.hbm2x.DocExporter' Signed-off-by: Koen Aers --- .../java/org/hibernate/tool/hbm2x/DocExporter.java | 3 +++ .../hibernate/tool/hbm2x/ExportersPresenceTest.java | 11 +++++++++++ 2 files changed, 14 insertions(+) create mode 100644 jbt/src/main/java/org/hibernate/tool/hbm2x/DocExporter.java diff --git a/jbt/src/main/java/org/hibernate/tool/hbm2x/DocExporter.java b/jbt/src/main/java/org/hibernate/tool/hbm2x/DocExporter.java new file mode 100644 index 0000000000..01ea56276e --- /dev/null +++ b/jbt/src/main/java/org/hibernate/tool/hbm2x/DocExporter.java @@ -0,0 +1,3 @@ +package org.hibernate.tool.hbm2x; + +public class DocExporter extends org.hibernate.tool.internal.export.doc.DocExporter {} diff --git a/jbt/src/test/java/org/hibernate/tool/hbm2x/ExportersPresenceTest.java b/jbt/src/test/java/org/hibernate/tool/hbm2x/ExportersPresenceTest.java index f2b9b0b82c..8da80187da 100644 --- a/jbt/src/test/java/org/hibernate/tool/hbm2x/ExportersPresenceTest.java +++ b/jbt/src/test/java/org/hibernate/tool/hbm2x/ExportersPresenceTest.java @@ -84,4 +84,15 @@ public void testQueryExporter() { } } + @Test + public void testDocExporter() { + try { + ClassLoader cl = getClass().getClassLoader(); + Class docExporterClass = cl.loadClass("org.hibernate.tool.hbm2x.DocExporter"); + assertNotNull(docExporterClass); + } catch (Throwable t) { + fail(t); + } + } + } From b40d2be53d1d4578df3a5a545998d461f02406a7 Mon Sep 17 00:00:00 2001 From: fanste Date: Wed, 3 Jul 2024 09:51:17 +0200 Subject: [PATCH 35/58] HBX-2823: Fix foreign key generation Virtual foreign keys defined in the reveng XML are not correctly created in the generated model. --- .../internal/reveng/reader/ForeignKeyProcessor.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/orm/src/main/java/org/hibernate/tool/internal/reveng/reader/ForeignKeyProcessor.java b/orm/src/main/java/org/hibernate/tool/internal/reveng/reader/ForeignKeyProcessor.java index 445e3317c1..55548f45fc 100644 --- a/orm/src/main/java/org/hibernate/tool/internal/reveng/reader/ForeignKeyProcessor.java +++ b/orm/src/main/java/org/hibernate/tool/internal/reveng/reader/ForeignKeyProcessor.java @@ -244,10 +244,9 @@ private void processUserForeignKey( " references unknown or filtered table " + TableIdentifier.create(element.getTable()) ); } else { - dependentTables.put(element.getName(), deptable); - List refColumns = getReferencedColums(referencedTable, element); - referencedColumns.put(element.getName(), refColumns ); - dependentColumns.put(element.getName(), getDependendColumns(refColumns, deptable) ); + dependentTables.put(element.getName(), deptable); + referencedColumns.put(element.getName(), getReferencedColums(referencedTable, element) ); + dependentColumns.put(element.getName(), getDependendColumns(deptable, element) ); } } @@ -264,7 +263,8 @@ private Table determineDependentTable(Map dependentTables, Foreig userfkTable.getName()); } - private List getDependendColumns(List userColumns, Table deptable) { + private List getDependendColumns(Table deptable, ForeignKey element) { + List userColumns = element.getColumns(); List depColumns = new ArrayList(userColumns.size() ); Iterator colIterator = userColumns.iterator(); while(colIterator.hasNext() ) { From f1727daa71f9bc31c5ba8dcb54435881e84be294 Mon Sep 17 00:00:00 2001 From: Koen Aers Date: Wed, 19 Feb 2025 15:06:18 +0100 Subject: [PATCH 36/58] HBX-2840 Prevent Hibernate ORM from trying to load component classes Co-authored-by: marko-bekhta Co-authored-by: Koen Aers Signed-off-by: Koen Aers --- .../reveng/binder/PrimaryKeyBinder.java | 3 +- .../reveng/util/EnhancedComponent.java | 24 +++++++ .../tool/hbm2x/hbx2840/TestCase.java | 71 +++++++++++++++++++ .../hibernate/tool/test/db/DbTestSuite.java | 1 + .../hibernate/tool/hbm2x/hbx2840/create.sql | 2 + .../org/hibernate/tool/hbm2x/hbx2840/drop.sql | 2 + 6 files changed, 102 insertions(+), 1 deletion(-) create mode 100644 orm/src/main/java/org/hibernate/tool/internal/reveng/util/EnhancedComponent.java create mode 100644 test/common/src/main/java/org/hibernate/tool/hbm2x/hbx2840/TestCase.java create mode 100644 test/common/src/main/resources/org/hibernate/tool/hbm2x/hbx2840/create.sql create mode 100644 test/common/src/main/resources/org/hibernate/tool/hbm2x/hbx2840/drop.sql diff --git a/orm/src/main/java/org/hibernate/tool/internal/reveng/binder/PrimaryKeyBinder.java b/orm/src/main/java/org/hibernate/tool/internal/reveng/binder/PrimaryKeyBinder.java index afcaf2d438..62fbfd4140 100644 --- a/orm/src/main/java/org/hibernate/tool/internal/reveng/binder/PrimaryKeyBinder.java +++ b/orm/src/main/java/org/hibernate/tool/internal/reveng/binder/PrimaryKeyBinder.java @@ -24,6 +24,7 @@ import org.hibernate.tool.api.reveng.TableIdentifier; import org.hibernate.tool.internal.reveng.RevengMetadataCollector; import org.hibernate.tool.internal.reveng.binder.ForeignKeyUtils.ForeignKeyForColumns; +import org.hibernate.tool.internal.reveng.util.EnhancedComponent; import org.hibernate.tool.internal.reveng.util.RevengUtils; class PrimaryKeyBinder extends AbstractBinder { @@ -194,7 +195,7 @@ private SimpleValue handleCompositeKey( PersistentClass rc, Set processedColumns, List keyColumns) { - Component result = new Component(getMetadataBuildingContext(), rc); + Component result = new EnhancedComponent(getMetadataBuildingContext(), rc); result.setMetaAttributes(Collections.EMPTY_MAP); result.setEmbedded(false); result.setComponentClassName(getCompositeIdName(rc)); diff --git a/orm/src/main/java/org/hibernate/tool/internal/reveng/util/EnhancedComponent.java b/orm/src/main/java/org/hibernate/tool/internal/reveng/util/EnhancedComponent.java new file mode 100644 index 0000000000..b09c412e72 --- /dev/null +++ b/orm/src/main/java/org/hibernate/tool/internal/reveng/util/EnhancedComponent.java @@ -0,0 +1,24 @@ +package org.hibernate.tool.internal.reveng.util; + +import java.util.Properties; + +import org.hibernate.MappingException; +import org.hibernate.boot.spi.MetadataBuildingContext; +import org.hibernate.mapping.Component; +import org.hibernate.mapping.PersistentClass; + +@SuppressWarnings("serial") +public class EnhancedComponent extends Component { + + public EnhancedComponent(MetadataBuildingContext metadata, PersistentClass owner) throws MappingException { + super(metadata, owner); + } + + @Override + public Class getComponentClass() throws MappingException { + // we prevent ORM from trying to load a component class by name, + // since at the point when we are building these, a corresponding class is not yet created + // (so can't even think about it being compiled and able to load via any classloader) ... + return Object.class; + } +} diff --git a/test/common/src/main/java/org/hibernate/tool/hbm2x/hbx2840/TestCase.java b/test/common/src/main/java/org/hibernate/tool/hbm2x/hbx2840/TestCase.java new file mode 100644 index 0000000000..4ce16a0420 --- /dev/null +++ b/test/common/src/main/java/org/hibernate/tool/hbm2x/hbx2840/TestCase.java @@ -0,0 +1,71 @@ +/* + * Hibernate Tools, Tooling for your Hibernate Projects + * + * Copyright 2004-2021 Red Hat, Inc. + * + * Licensed under the GNU Lesser General Public License (LGPL), + * version 2.1 or later (the "License"). + * You may not use this file except in compliance with the License. + * You may read the licence in the 'lgpl.txt' file in the root folder of + * project or obtain a copy at + * + * http://www.gnu.org/licenses/lgpl-2.1.html + * + * 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. + */ +package org.hibernate.tool.hbm2x.hbx2840; + +import java.io.File; + +import org.hibernate.tool.api.export.Exporter; +import org.hibernate.tool.api.export.ExporterConstants; +import org.hibernate.tool.api.export.ExporterFactory; +import org.hibernate.tool.api.export.ExporterType; +import org.hibernate.tool.api.metadata.MetadataDescriptorFactory; +import org.hibernate.tools.test.util.JUnitUtil; +import org.hibernate.tools.test.util.JdbcUtil; + +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.io.TempDir; + +/** + * Test verifies that a foreign key to a table with a composite ID works. + */ +public class TestCase { + + @TempDir + public File outputDir = new File( "output" ); + + @BeforeEach + void setUp() { + JdbcUtil.createDatabase( this ); + Exporter exporter = ExporterFactory.createExporter( ExporterType.JAVA ); + exporter.getProperties().put( + ExporterConstants.METADATA_DESCRIPTOR, + MetadataDescriptorFactory.createReverseEngineeringDescriptor( null, null ) + ); + exporter.getProperties().put( ExporterConstants.DESTINATION_FOLDER, outputDir ); + exporter.getProperties().put( ExporterConstants.TEMPLATE_PATH, new String[0] ); + exporter.getProperties().setProperty( "ejb3", "true" ); + exporter.start(); + } + + @AfterEach + void tearDown() { + JdbcUtil.dropDatabase( this ); + } + + @Test + void testFileExistence() { + JUnitUtil.assertIsNonEmptyFile( new File( outputDir.getAbsolutePath() + "/Parent.java" ) ); + JUnitUtil.assertIsNonEmptyFile( new File( outputDir.getAbsolutePath() + "/Child.java" ) ); + JUnitUtil.assertIsNonEmptyFile( new File( outputDir.getAbsolutePath() + "/ParentId.java" ) ); + JUnitUtil.assertIsNonEmptyFile( new File( outputDir.getAbsolutePath() + "/ChildId.java" ) ); + } +} diff --git a/test/common/src/main/java/org/hibernate/tool/test/db/DbTestSuite.java b/test/common/src/main/java/org/hibernate/tool/test/db/DbTestSuite.java index c3d24bb19e..d9ef06619b 100644 --- a/test/common/src/main/java/org/hibernate/tool/test/db/DbTestSuite.java +++ b/test/common/src/main/java/org/hibernate/tool/test/db/DbTestSuite.java @@ -53,6 +53,7 @@ public class DbTestSuite { @Nested public class GenerateFromJDBCWithJavaKeyword extends org.hibernate.tool.hbm2x.GenerateFromJDBCWithJavaKeyword.TestCase {} @Nested public class IncrementalSchemaReading extends org.hibernate.tool.hbm2x.IncrementalSchemaReading.TestCase {} @Nested public class JdbcHbm2JavaEjb3 extends org.hibernate.tool.hbm2x.JdbcHbm2JavaEjb3.TestCase {} + @Nested public class HBX2840 extends org.hibernate.tool.hbm2x.hbx2840.TestCase {} @Nested public class QueryExporterTest extends org.hibernate.tool.hbm2x.query.QueryExporterTest.TestCase {} @Nested public class HbmLintTest extends org.hibernate.tool.hbmlint.HbmLintTest.TestCase {} @Nested public class SchemaAnalyzer extends org.hibernate.tool.hbmlint.SchemaAnalyzer.TestCase {} diff --git a/test/common/src/main/resources/org/hibernate/tool/hbm2x/hbx2840/create.sql b/test/common/src/main/resources/org/hibernate/tool/hbm2x/hbx2840/create.sql new file mode 100644 index 0000000000..dfa89c5a98 --- /dev/null +++ b/test/common/src/main/resources/org/hibernate/tool/hbm2x/hbx2840/create.sql @@ -0,0 +1,2 @@ +CREATE TABLE PARENT(ID1_1 INT NOT NULL, ID1_2 INT NOT NULL, PRIMARY KEY (ID1_1, ID1_2)); +CREATE TABLE CHILD (ID2_1 INT NOT NULL, ID2_2 INT NOT NULL, PRIMARY KEY (ID2_1, ID2_2), FOREIGN KEY (ID2_1, ID2_2) REFERENCES PARENT (ID1_1, ID1_2)); diff --git a/test/common/src/main/resources/org/hibernate/tool/hbm2x/hbx2840/drop.sql b/test/common/src/main/resources/org/hibernate/tool/hbm2x/hbx2840/drop.sql new file mode 100644 index 0000000000..6136bd4e90 --- /dev/null +++ b/test/common/src/main/resources/org/hibernate/tool/hbm2x/hbx2840/drop.sql @@ -0,0 +1,2 @@ +DROP TABLE CHILD +DROP TABLE PARENT From 47fbf8907e0fc4c4bba5775260b78963f6b34f03 Mon Sep 17 00:00:00 2001 From: Koen Aers Date: Tue, 25 Feb 2025 17:16:15 +0100 Subject: [PATCH 37/58] HBX-2062: Investigate failing setup of org.hibernate.tool.hbm2x.hbm2hbmxml.TypeParamsTest.Order.TestCase Signed-off-by: Koen Aers --- .../hbm2x/hbm2hbmxml/TypeParamsTest/TestCase.java | 14 ++++++-------- .../hbm2x/hbm2hbmxml/TypeParamsTest/Order.hbm.xml | 2 +- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/test/nodb/src/test/java/org/hibernate/tool/hbm2x/hbm2hbmxml/TypeParamsTest/TestCase.java b/test/nodb/src/test/java/org/hibernate/tool/hbm2x/hbm2hbmxml/TypeParamsTest/TestCase.java index 743ea72b8a..d9de8fa42a 100644 --- a/test/nodb/src/test/java/org/hibernate/tool/hbm2x/hbm2hbmxml/TypeParamsTest/TestCase.java +++ b/test/nodb/src/test/java/org/hibernate/tool/hbm2x/hbm2hbmxml/TypeParamsTest/TestCase.java @@ -45,7 +45,6 @@ import org.hibernate.tools.test.util.HibernateUtil; import org.hibernate.tools.test.util.JUnitUtil; import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; import org.w3c.dom.Document; @@ -82,8 +81,6 @@ public void setUp() throws Exception { hbmexporter.start(); } - // TODO HBX-2062: Investigate and reenable - @Disabled @Test public void testAllFilesExistence() { JUnitUtil.assertIsNonEmptyFile( @@ -92,8 +89,6 @@ public void testAllFilesExistence() { "org/hibernate/tool/hbm2x/hbm2hbmxml/TypeParamsTest/Order.hbm.xml")); } - // TODO HBX-2062: Investigate and reenable - @Disabled @Test public void testReadable() { File orderHbmXml = @@ -102,14 +97,13 @@ public void testReadable() { "org/hibernate/tool/hbm2x/hbm2hbmxml/TypeParamsTest/Order.hbm.xml"); Properties properties = new Properties(); properties.setProperty(AvailableSettings.DIALECT, HibernateUtil.Dialect.class.getName()); + properties.setProperty(AvailableSettings.CONNECTION_PROVIDER, HibernateUtil.ConnectionProvider.class.getName()); File[] files = new File[] { orderHbmXml }; MetadataDescriptor metadataDescriptor = MetadataDescriptorFactory .createNativeDescriptor(null, files, properties); assertNotNull(metadataDescriptor.createMetadata()); } - // TODO HBX-2062: Investigate and reenable - @Disabled @Test public void testTypeParamsElements() throws Exception { File outputXml = new File( @@ -163,10 +157,14 @@ public void testTypeParamsElements() throws Exception { set.contains("enumClass"), "Can't find 'enumClass' param"); assertEquals( - "org.hibernate.tool.hbm2x.hbm2hbmxml.Order$Status", + Status.class.getName(), params.get("enumClass")); assertTrue(nameElement.getElementsByTagName("type").getLength() == 0, "property name should not have any type element"); assertEquals(nameElement.getAttribute("type"), "string"); } + + enum Status { + ON, OFF + } } diff --git a/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/hbm2hbmxml/TypeParamsTest/Order.hbm.xml b/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/hbm2hbmxml/TypeParamsTest/Order.hbm.xml index df9c921d4b..ff4c4a7bfd 100644 --- a/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/hbm2hbmxml/TypeParamsTest/Order.hbm.xml +++ b/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/hbm2hbmxml/TypeParamsTest/Order.hbm.xml @@ -34,7 +34,7 @@ STATUS ORDERS - org.hibernate.tool.hbm2x.hbm2hbmxml.Order$Status + org.hibernate.tool.hbm2x.hbm2hbmxml.TypeParamsTest.TestCase$Status From f515a5a4dc79c6a0b2f9317ac44ae66be267e777 Mon Sep 17 00:00:00 2001 From: Koen Aers Date: Thu, 27 Feb 2025 15:26:48 +0100 Subject: [PATCH 38/58] HBX-2962: Inject the version string during the build Signed-off-by: Koen Aers --- orm/pom.xml | 22 +++++++++++++++++++ .../hibernate/tool/api/version/Version.java | 13 +++++++++-- 2 files changed, 33 insertions(+), 2 deletions(-) diff --git a/orm/pom.xml b/orm/pom.xml index a43fd010a5..7dfd6ba8d4 100644 --- a/orm/pom.xml +++ b/orm/pom.xml @@ -82,4 +82,26 @@ + + + + org.jboss.maven.plugins + maven-injection-plugin + + + + ${project.version} + + + org.hibernate.tool.api.version.Version + versionString + + + + + + + + + diff --git a/orm/src/main/java/org/hibernate/tool/api/version/Version.java b/orm/src/main/java/org/hibernate/tool/api/version/Version.java index ddbaef081a..4447b9615e 100644 --- a/orm/src/main/java/org/hibernate/tool/api/version/Version.java +++ b/orm/src/main/java/org/hibernate/tool/api/version/Version.java @@ -1,7 +1,16 @@ package org.hibernate.tool.api.version; public interface Version { - - final static String CURRENT_VERSION = "6.4.11-SNAPSHOT"; + + /** + * @deprecated Use {@link #versionString()} instead. + */ + @Deprecated + final static String CURRENT_VERSION = versionString(); + + static String versionString() { + // This implementation is replaced during the build with another one that returns the correct value. + return "UNKNOWN"; + } } From b1c8e11bc08f35c468cf0e27c2068aa57573c0c6 Mon Sep 17 00:00:00 2001 From: Koen Aers Date: Tue, 4 Mar 2025 12:02:16 +0100 Subject: [PATCH 39/58] HBX-2964: Resolve the project class path and execute the exporters using that class path in the reverse engineering Maven mojos Signed-off-by: Koen Aers --- maven/pom.xml | 6 +++ .../tool/maven/AbstractGenerationMojo.java | 45 +++++++++++++++---- .../hibernate/tool/maven/GenerateDaoMojo.java | 6 ++- .../hibernate/tool/maven/GenerateDdlMojo.java | 6 ++- .../hibernate/tool/maven/GenerateHbmMojo.java | 6 ++- .../tool/maven/GenerateJavaMojo.java | 8 +++- 6 files changed, 65 insertions(+), 12 deletions(-) diff --git a/maven/pom.xml b/maven/pom.xml index 86cada3c20..dafdec4421 100644 --- a/maven/pom.xml +++ b/maven/pom.xml @@ -73,6 +73,7 @@ 3.5 3.5.2 + 3.9.9 2.9 @@ -92,6 +93,11 @@ maven-plugin-api ${maven-plugin-api.version} + + org.apache.maven + maven-core + ${maven-core.version} + org.apache.maven.plugin-tools maven-plugin-annotations diff --git a/maven/src/main/java/org/hibernate/tool/maven/AbstractGenerationMojo.java b/maven/src/main/java/org/hibernate/tool/maven/AbstractGenerationMojo.java index 56d8433674..ea76fa0f74 100644 --- a/maven/src/main/java/org/hibernate/tool/maven/AbstractGenerationMojo.java +++ b/maven/src/main/java/org/hibernate/tool/maven/AbstractGenerationMojo.java @@ -23,10 +23,18 @@ import java.io.FileInputStream; import java.io.FileNotFoundException; import java.io.IOException; +import java.net.MalformedURLException; +import java.net.URL; +import java.net.URLClassLoader; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashSet; import java.util.Properties; +import org.apache.maven.artifact.DependencyResolutionRequiredException; import org.apache.maven.plugin.AbstractMojo; import org.apache.maven.plugins.annotations.Parameter; +import org.apache.maven.project.MavenProject; import org.apache.tools.ant.BuildException; import org.hibernate.tool.api.metadata.MetadataDescriptor; import org.hibernate.tool.api.metadata.MetadataDescriptorFactory; @@ -83,15 +91,24 @@ public abstract class AbstractGenerationMojo extends AbstractMojo { // Not exposed for now private boolean preferBasicCompositeIds = true; + @Parameter(defaultValue = "${project}", readonly = true, required = true) + private MavenProject project; + public void execute() { - getLog().info("Starting " + this.getClass().getSimpleName() + "..."); - RevengStrategy strategy = setupReverseEngineeringStrategy(); - if (propertyFile.exists()) { - executeExporter(createJdbcDescriptor(strategy, loadPropertiesFile())); - } else { - getLog().info("Property file '" + propertyFile + "' cannot be found, aborting..."); - } - getLog().info("Finished " + this.getClass().getSimpleName() + "!"); + ClassLoader original = Thread.currentThread().getContextClassLoader(); + try { + Thread.currentThread().setContextClassLoader(createExporterClassLoader(original)); + getLog().info("Starting " + this.getClass().getSimpleName() + "..."); + RevengStrategy strategy = setupReverseEngineeringStrategy(); + if (propertyFile.exists()) { + executeExporter(createJdbcDescriptor(strategy, loadPropertiesFile())); + } else { + getLog().info("Property file '" + propertyFile + "' cannot be found, aborting..."); + } + getLog().info("Finished " + this.getClass().getSimpleName() + "!"); + } finally { + Thread.currentThread().setContextClassLoader(original); + } } private RevengStrategy setupReverseEngineeringStrategy() { @@ -134,6 +151,18 @@ private MetadataDescriptor createJdbcDescriptor(RevengStrategy strategy, Propert strategy, properties); } + + private ClassLoader createExporterClassLoader(ClassLoader parent) { + ArrayList urls = new ArrayList(); + try { + for (String cpe : project.getRuntimeClasspathElements()) { + urls.add(new File(cpe).toURI().toURL()); + } + } catch (DependencyResolutionRequiredException | MalformedURLException e) { + throw new RuntimeException("Problem while constructing project classloader", e); + } + return new URLClassLoader(urls.toArray(new URL[0]), parent); + } protected abstract void executeExporter(MetadataDescriptor metadataDescriptor); } diff --git a/maven/src/main/java/org/hibernate/tool/maven/GenerateDaoMojo.java b/maven/src/main/java/org/hibernate/tool/maven/GenerateDaoMojo.java index afbe350dec..98554cf7e5 100644 --- a/maven/src/main/java/org/hibernate/tool/maven/GenerateDaoMojo.java +++ b/maven/src/main/java/org/hibernate/tool/maven/GenerateDaoMojo.java @@ -21,6 +21,7 @@ import org.apache.maven.plugins.annotations.Mojo; import org.apache.maven.plugins.annotations.Parameter; +import org.apache.maven.plugins.annotations.ResolutionScope; import org.hibernate.tool.api.export.Exporter; import org.hibernate.tool.api.export.ExporterConstants; import org.hibernate.tool.api.export.ExporterFactory; @@ -36,7 +37,10 @@ *

* See: https://docs.jboss.org/tools/latest/en/hibernatetools/html_single/#d0e4821 */ -@Mojo(name = "hbm2dao", defaultPhase = GENERATE_SOURCES) +@Mojo( + name = "hbm2dao", + defaultPhase = GENERATE_SOURCES, + requiresDependencyResolution = ResolutionScope.RUNTIME) public class GenerateDaoMojo extends AbstractGenerationMojo { /** The directory into which the DAOs will be generated. */ diff --git a/maven/src/main/java/org/hibernate/tool/maven/GenerateDdlMojo.java b/maven/src/main/java/org/hibernate/tool/maven/GenerateDdlMojo.java index a60958f51b..8ade339a4e 100644 --- a/maven/src/main/java/org/hibernate/tool/maven/GenerateDdlMojo.java +++ b/maven/src/main/java/org/hibernate/tool/maven/GenerateDdlMojo.java @@ -21,6 +21,7 @@ import org.apache.maven.plugins.annotations.Mojo; import org.apache.maven.plugins.annotations.Parameter; +import org.apache.maven.plugins.annotations.ResolutionScope; import org.hibernate.boot.Metadata; import org.hibernate.tool.api.metadata.MetadataDescriptor; import org.hibernate.tool.hbm2ddl.SchemaExport; @@ -37,7 +38,10 @@ *

* See https://docs.jboss.org/tools/latest/en/hibernatetools/html_single/#d0e4651 */ -@Mojo(name = "hbm2ddl", defaultPhase = GENERATE_RESOURCES) +@Mojo( + name = "hbm2ddl", + defaultPhase = GENERATE_RESOURCES, + requiresDependencyResolution = ResolutionScope.RUNTIME) public class GenerateDdlMojo extends AbstractGenerationMojo { /** The directory into which the DDLs will be generated. */ diff --git a/maven/src/main/java/org/hibernate/tool/maven/GenerateHbmMojo.java b/maven/src/main/java/org/hibernate/tool/maven/GenerateHbmMojo.java index 13dc50aa5e..80aa790a4f 100644 --- a/maven/src/main/java/org/hibernate/tool/maven/GenerateHbmMojo.java +++ b/maven/src/main/java/org/hibernate/tool/maven/GenerateHbmMojo.java @@ -21,6 +21,7 @@ import org.apache.maven.plugins.annotations.Mojo; import org.apache.maven.plugins.annotations.Parameter; +import org.apache.maven.plugins.annotations.ResolutionScope; import org.hibernate.tool.api.export.Exporter; import org.hibernate.tool.api.export.ExporterConstants; import org.hibernate.tool.api.export.ExporterFactory; @@ -36,7 +37,10 @@ *

* See: https://docs.jboss.org/tools/latest/en/hibernatetools/html_single/#d0e4821 */ -@Mojo(name = "generateHbm", defaultPhase = GENERATE_SOURCES) +@Mojo( + name = "generateHbm", + defaultPhase = GENERATE_SOURCES, + requiresDependencyResolution = ResolutionScope.RUNTIME) public class GenerateHbmMojo extends AbstractGenerationMojo { /** The directory into which the DAOs will be generated. */ diff --git a/maven/src/main/java/org/hibernate/tool/maven/GenerateJavaMojo.java b/maven/src/main/java/org/hibernate/tool/maven/GenerateJavaMojo.java index 3ec6709185..faf6ae588e 100644 --- a/maven/src/main/java/org/hibernate/tool/maven/GenerateJavaMojo.java +++ b/maven/src/main/java/org/hibernate/tool/maven/GenerateJavaMojo.java @@ -25,6 +25,7 @@ import org.apache.maven.plugins.annotations.Mojo; import org.apache.maven.plugins.annotations.Parameter; +import org.apache.maven.plugins.annotations.ResolutionScope; import org.hibernate.tool.api.export.Exporter; import org.hibernate.tool.api.export.ExporterConstants; import org.hibernate.tool.api.export.ExporterFactory; @@ -36,7 +37,10 @@ *

* See: https://docs.jboss.org/tools/latest/en/hibernatetools/html_single/#d0e4821 */ -@Mojo(name = "hbm2java", defaultPhase = GENERATE_SOURCES) +@Mojo( + name = "hbm2java", + defaultPhase = GENERATE_SOURCES, + requiresDependencyResolution = ResolutionScope.RUNTIME) public class GenerateJavaMojo extends AbstractGenerationMojo { /** The directory into which the JPA entities will be generated. */ @@ -69,6 +73,8 @@ protected void executeExporter(MetadataDescriptor metadataDescriptor) { getLog().info("Starting POJO export to directory: " + outputDirectory + "..."); pojoExporter.start(); } + + } From fd0fd310b3dc571695d9071d9297568099fb3818 Mon Sep 17 00:00:00 2001 From: marko-bekhta Date: Wed, 5 Feb 2025 09:32:43 +0100 Subject: [PATCH 40/58] HBX-2956 Use SHA in the github actions workflow --- .github/workflows/build_test.yml | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build_test.yml b/.github/workflows/build_test.yml index 109aede3b3..e8ca8fe816 100644 --- a/.github/workflows/build_test.yml +++ b/.github/workflows/build_test.yml @@ -9,20 +9,18 @@ jobs: steps: - name: Checkout PR Branch - uses: actions/checkout@v2 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: ref: ${{ github.event.pull_request.head.sha }} fetch-depth: 0 - name: Setup Java 11 - uses: actions/setup-java@v1 + uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.7.0 with: java-version: 11 - java-package: jdk - architecture: x64 + distribution: temurin - name: Build and Test - uses: GabrielBB/xvfb-action@v1 - with: - run: mvn clean install - + uses: GabrielBB/xvfb-action@b706e4e27b14669b486812790492dc50ca16b465 # v1.7 + with: + run: mvn clean install From f5ba24d56b12d62c1ae9e91e168cc56adeacb2c9 Mon Sep 17 00:00:00 2001 From: marko-bekhta Date: Wed, 5 Feb 2025 09:35:47 +0100 Subject: [PATCH 41/58] HBX-2956 Add dependabot config to update GH actions --- .github/dependabot.yml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 .github/dependabot.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 0000000000..2bd7143061 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,17 @@ +# To get started with Dependabot version updates, you'll need to specify which +# package ecosystems to update and where the package manifests are located. +# Please see the documentation for all configuration options: +# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates + +version: 2 +updates: + - package-ecosystem: "github-actions" + directory: "/" + schedule: + interval: "monthly" + groups: + workflow-actions: + patterns: + - "*" + allow: + - dependency-name: "actions/*" From 8356343860b936d19a72f9f0bfb5879c00a80b2b Mon Sep 17 00:00:00 2001 From: Koen Aers Date: Wed, 15 Jan 2025 13:48:25 +0100 Subject: [PATCH 42/58] HBX-2994: Backport automated releases to branch 6.4 - Update dependency on JBoss parent pom to 47 - Add goalPrefix to config of maven-plugin-plugin executions Signed-off-by: Koen Aers --- maven/pom.xml | 6 ++++++ pom.xml | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/maven/pom.xml b/maven/pom.xml index dafdec4421..ce3b868f4b 100644 --- a/maven/pom.xml +++ b/maven/pom.xml @@ -130,12 +130,18 @@ default-descriptor process-classes + + hibernate-tools + help-goal helpmojo + + hibernate-tools + diff --git a/pom.xml b/pom.xml index 108fca8fe0..8d1d2fda54 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ org.jboss jboss-parent - 40 + 47 org.hibernate.tool From ea4444efef8dc13b61279a95fef9ff3ebfc517a2 Mon Sep 17 00:00:00 2001 From: Koen Aers Date: Wed, 15 Jan 2025 15:11:37 +0100 Subject: [PATCH 43/58] HBX-2994: Backport automated releases to branch 6.4 - Add 'build' section with execution of 'maven-wrapper-plugin' - Add generated Maven wrapper - Use Maven wrapper in '.github/workflows/build_test.yml' Signed-off-by: Koen Aers --- .github/workflows/build_test.yml | 2 +- .mvn/wrapper/maven-wrapper.jar | Bin 0 -> 63028 bytes .mvn/wrapper/maven-wrapper.properties | 20 ++ mvnw | 332 ++++++++++++++++++++++++++ mvnw.cmd | 206 ++++++++++++++++ pom.xml | 20 ++ 6 files changed, 579 insertions(+), 1 deletion(-) create mode 100644 .mvn/wrapper/maven-wrapper.jar create mode 100644 .mvn/wrapper/maven-wrapper.properties create mode 100755 mvnw create mode 100644 mvnw.cmd diff --git a/.github/workflows/build_test.yml b/.github/workflows/build_test.yml index e8ca8fe816..38b3308676 100644 --- a/.github/workflows/build_test.yml +++ b/.github/workflows/build_test.yml @@ -23,4 +23,4 @@ jobs: - name: Build and Test uses: GabrielBB/xvfb-action@b706e4e27b14669b486812790492dc50ca16b465 # v1.7 with: - run: mvn clean install + run: ./mvnw clean install diff --git a/.mvn/wrapper/maven-wrapper.jar b/.mvn/wrapper/maven-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..7967f30dd1d25fe1b79a4a6e50e2aaa0e425c02c GIT binary patch literal 63028 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 O(fWavBF*XjpZ){(@cW1W literal 0 HcmV?d00001 diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 0000000000..f5b763a229 --- /dev/null +++ b/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1,20 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# 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://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. +wrapperVersion=3.3.2 +distributionType=bin +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.7/apache-maven-3.9.7-bin.zip +wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.2/maven-wrapper-3.3.2.jar diff --git a/mvnw b/mvnw new file mode 100755 index 0000000000..5e9618cac2 --- /dev/null +++ b/mvnw @@ -0,0 +1,332 @@ +#!/bin/sh +# ---------------------------------------------------------------------------- +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# 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://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. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Apache Maven Wrapper startup batch script, version 3.3.2 +# +# Required ENV vars: +# ------------------ +# JAVA_HOME - location of a JDK home dir +# +# Optional ENV vars +# ----------------- +# MAVEN_OPTS - parameters passed to the Java VM when running Maven +# e.g. to debug Maven itself, use +# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +# MAVEN_SKIP_RC - flag to disable loading of mavenrc files +# ---------------------------------------------------------------------------- + +if [ -z "$MAVEN_SKIP_RC" ]; then + + if [ -f /usr/local/etc/mavenrc ]; then + . /usr/local/etc/mavenrc + fi + + if [ -f /etc/mavenrc ]; then + . /etc/mavenrc + fi + + if [ -f "$HOME/.mavenrc" ]; then + . "$HOME/.mavenrc" + fi + +fi + +# OS specific support. $var _must_ be set to either true or false. +cygwin=false +darwin=false +mingw=false +case "$(uname)" in +CYGWIN*) cygwin=true ;; +MINGW*) mingw=true ;; +Darwin*) + darwin=true + # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home + # See https://developer.apple.com/library/mac/qa/qa1170/_index.html + if [ -z "$JAVA_HOME" ]; then + if [ -x "/usr/libexec/java_home" ]; then + JAVA_HOME="$(/usr/libexec/java_home)" + export JAVA_HOME + else + JAVA_HOME="/Library/Java/Home" + export JAVA_HOME + fi + fi + ;; +esac + +if [ -z "$JAVA_HOME" ]; then + if [ -r /etc/gentoo-release ]; then + JAVA_HOME=$(java-config --jre-home) + fi +fi + +# For Cygwin, ensure paths are in UNIX format before anything is touched +if $cygwin; then + [ -n "$JAVA_HOME" ] \ + && JAVA_HOME=$(cygpath --unix "$JAVA_HOME") + [ -n "$CLASSPATH" ] \ + && CLASSPATH=$(cygpath --path --unix "$CLASSPATH") +fi + +# For Mingw, ensure paths are in UNIX format before anything is touched +if $mingw; then + [ -n "$JAVA_HOME" ] && [ -d "$JAVA_HOME" ] \ + && JAVA_HOME="$( + cd "$JAVA_HOME" || ( + echo "cannot cd into $JAVA_HOME." >&2 + exit 1 + ) + pwd + )" +fi + +if [ -z "$JAVA_HOME" ]; then + javaExecutable="$(which javac)" + if [ -n "$javaExecutable" ] && ! [ "$(expr "$javaExecutable" : '\([^ ]*\)')" = "no" ]; then + # readlink(1) is not available as standard on Solaris 10. + readLink=$(which readlink) + if [ ! "$(expr "$readLink" : '\([^ ]*\)')" = "no" ]; then + if $darwin; then + javaHome="$(dirname "$javaExecutable")" + javaExecutable="$(cd "$javaHome" && pwd -P)/javac" + else + javaExecutable="$(readlink -f "$javaExecutable")" + fi + javaHome="$(dirname "$javaExecutable")" + javaHome=$(expr "$javaHome" : '\(.*\)/bin') + JAVA_HOME="$javaHome" + export JAVA_HOME + fi + fi +fi + +if [ -z "$JAVACMD" ]; then + if [ -n "$JAVA_HOME" ]; then + if [ -x "$JAVA_HOME/jre/sh/java" ]; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + else + JAVACMD="$( + \unset -f command 2>/dev/null + \command -v java + )" + fi +fi + +if [ ! -x "$JAVACMD" ]; then + echo "Error: JAVA_HOME is not defined correctly." >&2 + echo " We cannot execute $JAVACMD" >&2 + exit 1 +fi + +if [ -z "$JAVA_HOME" ]; then + echo "Warning: JAVA_HOME environment variable is not set." >&2 +fi + +# traverses directory structure from process work directory to filesystem root +# first directory with .mvn subdirectory is considered project base directory +find_maven_basedir() { + if [ -z "$1" ]; then + echo "Path not specified to find_maven_basedir" >&2 + return 1 + fi + + basedir="$1" + wdir="$1" + while [ "$wdir" != '/' ]; do + if [ -d "$wdir"/.mvn ]; then + basedir=$wdir + break + fi + # workaround for JBEAP-8937 (on Solaris 10/Sparc) + if [ -d "${wdir}" ]; then + wdir=$( + cd "$wdir/.." || exit 1 + pwd + ) + fi + # end of workaround + done + printf '%s' "$( + cd "$basedir" || exit 1 + pwd + )" +} + +# concatenates all lines of a file +concat_lines() { + if [ -f "$1" ]; then + # Remove \r in case we run on Windows within Git Bash + # and check out the repository with auto CRLF management + # enabled. Otherwise, we may read lines that are delimited with + # \r\n and produce $'-Xarg\r' rather than -Xarg due to word + # splitting rules. + tr -s '\r\n' ' ' <"$1" + fi +} + +log() { + if [ "$MVNW_VERBOSE" = true ]; then + printf '%s\n' "$1" + fi +} + +BASE_DIR=$(find_maven_basedir "$(dirname "$0")") +if [ -z "$BASE_DIR" ]; then + exit 1 +fi + +MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"} +export MAVEN_PROJECTBASEDIR +log "$MAVEN_PROJECTBASEDIR" + +########################################################################################## +# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +# This allows using the maven wrapper in projects that prohibit checking in binary data. +########################################################################################## +wrapperJarPath="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" +if [ -r "$wrapperJarPath" ]; then + log "Found $wrapperJarPath" +else + log "Couldn't find $wrapperJarPath, downloading it ..." + + if [ -n "$MVNW_REPOURL" ]; then + wrapperUrl="$MVNW_REPOURL/org/apache/maven/wrapper/maven-wrapper/3.3.2/maven-wrapper-3.3.2.jar" + else + wrapperUrl="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.2/maven-wrapper-3.3.2.jar" + fi + while IFS="=" read -r key value; do + # Remove '\r' from value to allow usage on windows as IFS does not consider '\r' as a separator ( considers space, tab, new line ('\n'), and custom '=' ) + safeValue=$(echo "$value" | tr -d '\r') + case "$key" in wrapperUrl) + wrapperUrl="$safeValue" + break + ;; + esac + done <"$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.properties" + log "Downloading from: $wrapperUrl" + + if $cygwin; then + wrapperJarPath=$(cygpath --path --windows "$wrapperJarPath") + fi + + if command -v wget >/dev/null; then + log "Found wget ... using wget" + [ "$MVNW_VERBOSE" = true ] && QUIET="" || QUIET="--quiet" + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + wget $QUIET "$wrapperUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath" + else + wget $QUIET --http-user="$MVNW_USERNAME" --http-password="$MVNW_PASSWORD" "$wrapperUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath" + fi + elif command -v curl >/dev/null; then + log "Found curl ... using curl" + [ "$MVNW_VERBOSE" = true ] && QUIET="" || QUIET="--silent" + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + curl $QUIET -o "$wrapperJarPath" "$wrapperUrl" -f -L || rm -f "$wrapperJarPath" + else + curl $QUIET --user "$MVNW_USERNAME:$MVNW_PASSWORD" -o "$wrapperJarPath" "$wrapperUrl" -f -L || rm -f "$wrapperJarPath" + fi + else + log "Falling back to using Java to download" + javaSource="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/MavenWrapperDownloader.java" + javaClass="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/MavenWrapperDownloader.class" + # For Cygwin, switch paths to Windows format before running javac + if $cygwin; then + javaSource=$(cygpath --path --windows "$javaSource") + javaClass=$(cygpath --path --windows "$javaClass") + fi + if [ -e "$javaSource" ]; then + if [ ! -e "$javaClass" ]; then + log " - Compiling MavenWrapperDownloader.java ..." + ("$JAVA_HOME/bin/javac" "$javaSource") + fi + if [ -e "$javaClass" ]; then + log " - Running MavenWrapperDownloader.java ..." + ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$wrapperUrl" "$wrapperJarPath") || rm -f "$wrapperJarPath" + fi + fi + fi +fi +########################################################################################## +# End of extension +########################################################################################## + +# If specified, validate the SHA-256 sum of the Maven wrapper jar file +wrapperSha256Sum="" +while IFS="=" read -r key value; do + case "$key" in wrapperSha256Sum) + wrapperSha256Sum=$value + break + ;; + esac +done <"$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.properties" +if [ -n "$wrapperSha256Sum" ]; then + wrapperSha256Result=false + if command -v sha256sum >/dev/null; then + if echo "$wrapperSha256Sum $wrapperJarPath" | sha256sum -c >/dev/null 2>&1; then + wrapperSha256Result=true + fi + elif command -v shasum >/dev/null; then + if echo "$wrapperSha256Sum $wrapperJarPath" | shasum -a 256 -c >/dev/null 2>&1; then + wrapperSha256Result=true + fi + else + echo "Checksum validation was requested but neither 'sha256sum' or 'shasum' are available." >&2 + echo "Please install either command, or disable validation by removing 'wrapperSha256Sum' from your maven-wrapper.properties." >&2 + exit 1 + fi + if [ $wrapperSha256Result = false ]; then + echo "Error: Failed to validate Maven wrapper SHA-256, your Maven wrapper might be compromised." >&2 + echo "Investigate or delete $wrapperJarPath to attempt a clean download." >&2 + echo "If you updated your Maven version, you need to update the specified wrapperSha256Sum property." >&2 + exit 1 + fi +fi + +MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" + +# For Cygwin, switch paths to Windows format before running java +if $cygwin; then + [ -n "$JAVA_HOME" ] \ + && JAVA_HOME=$(cygpath --path --windows "$JAVA_HOME") + [ -n "$CLASSPATH" ] \ + && CLASSPATH=$(cygpath --path --windows "$CLASSPATH") + [ -n "$MAVEN_PROJECTBASEDIR" ] \ + && MAVEN_PROJECTBASEDIR=$(cygpath --path --windows "$MAVEN_PROJECTBASEDIR") +fi + +# Provide a "standardized" way to retrieve the CLI args that will +# work with both Windows and non-Windows executions. +MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $*" +export MAVEN_CMD_LINE_ARGS + +WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +# shellcheck disable=SC2086 # safe args +exec "$JAVACMD" \ + $MAVEN_OPTS \ + $MAVEN_DEBUG_OPTS \ + -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ + "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ + ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" diff --git a/mvnw.cmd b/mvnw.cmd new file mode 100644 index 0000000000..1204076a90 --- /dev/null +++ b/mvnw.cmd @@ -0,0 +1,206 @@ +@REM ---------------------------------------------------------------------------- +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. You may obtain a copy of the License at +@REM +@REM http://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. +@REM ---------------------------------------------------------------------------- + +@REM ---------------------------------------------------------------------------- +@REM Apache Maven Wrapper startup batch script, version 3.3.2 +@REM +@REM Required ENV vars: +@REM JAVA_HOME - location of a JDK home dir +@REM +@REM Optional ENV vars +@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands +@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending +@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven +@REM e.g. to debug Maven itself, use +@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files +@REM ---------------------------------------------------------------------------- + +@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' +@echo off +@REM set title of command window +title %0 +@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on' +@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% + +@REM set %HOME% to equivalent of $HOME +if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") + +@REM Execute a user defined script before this one +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre +@REM check for pre script, once with legacy .bat ending and once with .cmd ending +if exist "%USERPROFILE%\mavenrc_pre.bat" call "%USERPROFILE%\mavenrc_pre.bat" %* +if exist "%USERPROFILE%\mavenrc_pre.cmd" call "%USERPROFILE%\mavenrc_pre.cmd" %* +:skipRcPre + +@setlocal + +set ERROR_CODE=0 + +@REM To isolate internal variables from possible post scripts, we use another setlocal +@setlocal + +@REM ==== START VALIDATION ==== +if not "%JAVA_HOME%" == "" goto OkJHome + +echo. >&2 +echo Error: JAVA_HOME not found in your environment. >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. >&2 +goto error + +:OkJHome +if exist "%JAVA_HOME%\bin\java.exe" goto init + +echo. >&2 +echo Error: JAVA_HOME is set to an invalid directory. >&2 +echo JAVA_HOME = "%JAVA_HOME%" >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. >&2 +goto error + +@REM ==== END VALIDATION ==== + +:init + +@REM Find the project base dir, i.e. the directory that contains the folder ".mvn". +@REM Fallback to current working directory if not found. + +set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR% +IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir + +set EXEC_DIR=%CD% +set WDIR=%EXEC_DIR% +:findBaseDir +IF EXIST "%WDIR%"\.mvn goto baseDirFound +cd .. +IF "%WDIR%"=="%CD%" goto baseDirNotFound +set WDIR=%CD% +goto findBaseDir + +:baseDirFound +set MAVEN_PROJECTBASEDIR=%WDIR% +cd "%EXEC_DIR%" +goto endDetectBaseDir + +:baseDirNotFound +set MAVEN_PROJECTBASEDIR=%EXEC_DIR% +cd "%EXEC_DIR%" + +:endDetectBaseDir + +IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig + +@setlocal EnableExtensions EnableDelayedExpansion +for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a +@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS% + +:endReadAdditionalConfig + +SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" +set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar" +set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +set WRAPPER_URL="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.2/maven-wrapper-3.3.2.jar" + +FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( + IF "%%A"=="wrapperUrl" SET WRAPPER_URL=%%B +) + +@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +@REM This allows using the maven wrapper in projects that prohibit checking in binary data. +if exist %WRAPPER_JAR% ( + if "%MVNW_VERBOSE%" == "true" ( + echo Found %WRAPPER_JAR% + ) +) else ( + if not "%MVNW_REPOURL%" == "" ( + SET WRAPPER_URL="%MVNW_REPOURL%/org/apache/maven/wrapper/maven-wrapper/3.3.2/maven-wrapper-3.3.2.jar" + ) + if "%MVNW_VERBOSE%" == "true" ( + echo Couldn't find %WRAPPER_JAR%, downloading it ... + echo Downloading from: %WRAPPER_URL% + ) + + powershell -Command "&{"^ + "$webclient = new-object System.Net.WebClient;"^ + "if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^ + "$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^ + "}"^ + "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%WRAPPER_URL%', '%WRAPPER_JAR%')"^ + "}" + if "%MVNW_VERBOSE%" == "true" ( + echo Finished downloading %WRAPPER_JAR% + ) +) +@REM End of extension + +@REM If specified, validate the SHA-256 sum of the Maven wrapper jar file +SET WRAPPER_SHA_256_SUM="" +FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( + IF "%%A"=="wrapperSha256Sum" SET WRAPPER_SHA_256_SUM=%%B +) +IF NOT %WRAPPER_SHA_256_SUM%=="" ( + powershell -Command "&{"^ + "Import-Module $PSHOME\Modules\Microsoft.PowerShell.Utility -Function Get-FileHash;"^ + "$hash = (Get-FileHash \"%WRAPPER_JAR%\" -Algorithm SHA256).Hash.ToLower();"^ + "If('%WRAPPER_SHA_256_SUM%' -ne $hash){"^ + " Write-Error 'Error: Failed to validate Maven wrapper SHA-256, your Maven wrapper might be compromised.';"^ + " Write-Error 'Investigate or delete %WRAPPER_JAR% to attempt a clean download.';"^ + " Write-Error 'If you updated your Maven version, you need to update the specified wrapperSha256Sum property.';"^ + " exit 1;"^ + "}"^ + "}" + if ERRORLEVEL 1 goto error +) + +@REM Provide a "standardized" way to retrieve the CLI args that will +@REM work with both Windows and non-Windows executions. +set MAVEN_CMD_LINE_ARGS=%* + +%MAVEN_JAVA_EXE% ^ + %JVM_CONFIG_MAVEN_PROPS% ^ + %MAVEN_OPTS% ^ + %MAVEN_DEBUG_OPTS% ^ + -classpath %WRAPPER_JAR% ^ + "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" ^ + %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %* +if ERRORLEVEL 1 goto error +goto end + +:error +set ERROR_CODE=1 + +:end +@endlocal & set ERROR_CODE=%ERROR_CODE% + +if not "%MAVEN_SKIP_RC%"=="" goto skipRcPost +@REM check for post script, once with legacy .bat ending and once with .cmd ending +if exist "%USERPROFILE%\mavenrc_post.bat" call "%USERPROFILE%\mavenrc_post.bat" +if exist "%USERPROFILE%\mavenrc_post.cmd" call "%USERPROFILE%\mavenrc_post.cmd" +:skipRcPost + +@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on' +if "%MAVEN_BATCH_PAUSE%"=="on" pause + +if "%MAVEN_TERMINATE_CMD%"=="on" exit %ERROR_CODE% + +cmd /C exit /B %ERROR_CODE% diff --git a/pom.xml b/pom.xml index 8d1d2fda54..019f13db57 100644 --- a/pom.xml +++ b/pom.xml @@ -101,8 +101,12 @@ 19.3.0.0 9.2.1.jre8 + + 3.3.2 + 11 11 + 3.9.7 @@ -255,4 +259,20 @@ + + + + + org.apache.maven.plugins + maven-wrapper-plugin + ${maven-wrapper-plugin.version} + + ${maven.min.version} + bin + + + + + + From ef3ba0abafc3b50d4eb32dd93f97186a2826693f Mon Sep 17 00:00:00 2001 From: marko-bekhta Date: Mon, 2 Dec 2024 11:59:52 +0100 Subject: [PATCH 44/58] HBX-2994: Backport automated releases to branch 6.4 - Use maven-injection-plugin to set the version string in the org.hibernate.tool.api.version.Version --- orm/src/main/java/org/hibernate/tool/api/version/Version.java | 2 +- .../hibernate/tool/internal/export/common/TemplateHelper.java | 2 +- .../src/test/java/org/hibernate/tool/VersionTest/TestCase.java | 2 +- .../org/hibernate/tool/hbm2x/GenericExporterTest/TestCase.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/orm/src/main/java/org/hibernate/tool/api/version/Version.java b/orm/src/main/java/org/hibernate/tool/api/version/Version.java index 4447b9615e..da4f560172 100644 --- a/orm/src/main/java/org/hibernate/tool/api/version/Version.java +++ b/orm/src/main/java/org/hibernate/tool/api/version/Version.java @@ -12,5 +12,5 @@ static String versionString() { // This implementation is replaced during the build with another one that returns the correct value. return "UNKNOWN"; } - + } diff --git a/orm/src/main/java/org/hibernate/tool/internal/export/common/TemplateHelper.java b/orm/src/main/java/org/hibernate/tool/internal/export/common/TemplateHelper.java index 3a8152feef..33722b7ce5 100644 --- a/orm/src/main/java/org/hibernate/tool/internal/export/common/TemplateHelper.java +++ b/orm/src/main/java/org/hibernate/tool/internal/export/common/TemplateHelper.java @@ -177,7 +177,7 @@ public void processString(String template, Writer output) { } public void setupContext() { - getContext().put("version", Version.CURRENT_VERSION); + getContext().put("version", Version.versionString()); getContext().put("ctx", getContext() ); //TODO: I would like to remove this, but don't know another way to actually get the list possible "root" keys for debugging. getContext().put("templates", new Templates()); diff --git a/test/nodb/src/test/java/org/hibernate/tool/VersionTest/TestCase.java b/test/nodb/src/test/java/org/hibernate/tool/VersionTest/TestCase.java index 3447393a51..cbd52f1357 100644 --- a/test/nodb/src/test/java/org/hibernate/tool/VersionTest/TestCase.java +++ b/test/nodb/src/test/java/org/hibernate/tool/VersionTest/TestCase.java @@ -45,7 +45,7 @@ public class TestCase { @Test public void testVersion() throws Exception { assertEquals( - org.hibernate.tool.api.version.Version.CURRENT_VERSION, + org.hibernate.tool.api.version.Version.versionString(), extractVersion(getPomXml())); } diff --git a/test/nodb/src/test/java/org/hibernate/tool/hbm2x/GenericExporterTest/TestCase.java b/test/nodb/src/test/java/org/hibernate/tool/hbm2x/GenericExporterTest/TestCase.java index 3d51e38372..54fc9e3ceb 100644 --- a/test/nodb/src/test/java/org/hibernate/tool/hbm2x/GenericExporterTest/TestCase.java +++ b/test/nodb/src/test/java/org/hibernate/tool/hbm2x/GenericExporterTest/TestCase.java @@ -90,7 +90,7 @@ public void testSingleFileGeneration() { null, FileUtil.findFirstString("$", new File(outputDir, "artifacts.txt"))); assertEquals( - "File for artifacts in " + Version.CURRENT_VERSION, + "File for artifacts in " + Version.versionString(), FileUtil.findFirstString("artifacts", new File( outputDir, "artifacts.txt"))); } From 2a1771e3a249b2a6e9111566a542261a95337a5a Mon Sep 17 00:00:00 2001 From: Koen Aers Date: Mon, 26 May 2025 14:08:40 +0200 Subject: [PATCH 45/58] HBX-2994: Backport automated releases to branch 6.4 - Add 'reports' module - Modify pom.xml with following changes/additions: * Add needed properties for the CI run * Modify the 'distributionManagement' section with the needed deployment info * Add a 'build' section to (1) sign the artefacts to deploy (2) perform deployment to the sonatype repo (3) flatten the pom files * Add a 'profile' section for the release Signed-off-by: Koen Aers --- pom.xml | 208 +++++++++++++++++++++++++++++++++++++++++------- reports/pom.xml | 100 +++++++++++++++++++++++ 2 files changed, 280 insertions(+), 28 deletions(-) create mode 100644 reports/pom.xml diff --git a/pom.xml b/pom.xml index 019f13db57..0a495fbcf1 100644 --- a/pom.xml +++ b/pom.xml @@ -103,6 +103,24 @@ 3.3.2 + 1.7.0 + 1.5.0 + + + true + true + + + ossrh + Sonatype OSSRH Releases + https://oss.sonatype.org/service/local/staging/deploy/maven2 + https://oss.sonatype.org + ossrh + Sonatype OSSRH Snapshots + https://oss.sonatype.org/content/repositories/snapshots 11 11 @@ -227,36 +245,17 @@ - + - - false - - ossrh-releases-repository - Sonatype OSSRH Releases - https://oss.sonatype.org/service/local/staging/deploy/maven2/ + ${ossrh.releases.repo.id} + ${ossrh.releases.repo.name} + ${ossrh.releases.repo.url} - - - true - - ossrh-snapshots-repository - Sonatype OSSRH Snapshots - https://oss.sonatype.org/content/repositories/snapshots/ - - - - - - ossrh-releases-repository - Sonatype OSSRH Releases - https://oss.sonatype.org/service/local/staging/deploy/maven2/ - - - ossrh-snapshots-repository - Sonatype OSSRH Snapshots - https://oss.sonatype.org/content/repositories/snapshots/ - + + ${ossrh.snapshots.repo.id} + ${ossrh.snapshots.repo.name} + ${ossrh.snapshots.repo.url} + @@ -271,8 +270,161 @@ bin + + + org.apache.maven.plugins + maven-gpg-plugin + + + sign-artifacts + verify + + sign + + + ${deploy.skip} + ${env.RELEASE_GPG_HOMEDIR} + + + + + + org.sonatype.plugins + nexus-staging-maven-plugin + ${nexus-staging.plugin.version} + false + + ${deploy.skip} + ${ossrh.releases.repo.id} + + ${ossrh.releases.repo.baseUrl} + + 60 + + + + org.codehaus.mojo + flatten-maven-plugin + ${flatten-maven-plugin.version} + + ${project.build.directory} + + ossrh + + true + + + + flatten-pom + process-resources + + flatten + + + + + + + + org.apache.maven.plugins + maven-deploy-plugin + + ${maven-deploy-plugin.skip} + + + + + org.sonatype.plugins + nexus-staging-maven-plugin + + + default-deploy + deploy + + + deploy + + + + + + org.codehaus.mojo + flatten-maven-plugin + + + org.apache.maven.plugins + maven-enforcer-plugin + + + enforce-java-version + + enforce + + + + + + To build this project JDK ${jdk.min.version} (or greater) is required. Please install it. + ${jdk.min.version} + + + + + + + + + + release + + + performRelease + true + + + + + + org.apache.maven.plugins + maven-gpg-plugin + + + + + + + + build-reports-as-last-module + + + !some.property.that.will.never.exist + + + + reports + + + + + + diff --git a/reports/pom.xml b/reports/pom.xml new file mode 100644 index 0000000000..00c9a871ee --- /dev/null +++ b/reports/pom.xml @@ -0,0 +1,100 @@ + + + + 4.0.0 + + org.hibernate.tool + hibernate-tools-parent + 6.4.11-SNAPSHOT + + hibernate-tools-reports + + Hibernate Tools Reports + Hibernate Tools build reports + pom + + + + org.hibernate.tool + hibernate-tools-utils + ${project.version} + + + org.hibernate.tool + hibernate-tools-orm + ${project.version} + + + org.hibernate.tool + hibernate-tools-orm-jbt + ${project.version} + + + org.hibernate.tool + hibernate-tools-maven + ${project.version} + + + org.hibernate.tool + hibernate-tools-gradle + ${project.version} + + + org.hibernate.tool + hibernate-tools-ant + ${project.version} + + + + + + + + org.sonatype.plugins + nexus-staging-maven-plugin + false + + + + + default-deploy + none + + + + deferred-deploy + deploy + + deploy-staged + + + + + + + From c965ae38852ad10f936a75cf0ecf91fdff2134b3 Mon Sep 17 00:00:00 2001 From: Koen Aers Date: Thu, 16 Jan 2025 13:51:51 +0100 Subject: [PATCH 46/58] HBX-2994: Backport automated releases to branch 6.4 - Add the 'ci/release/Jenkinsfile' Signed-off-by: Koen Aers --- ci/release/Jenkinsfile | 107 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 107 insertions(+) create mode 100644 ci/release/Jenkinsfile diff --git a/ci/release/Jenkinsfile b/ci/release/Jenkinsfile new file mode 100644 index 0000000000..bdd21ccb58 --- /dev/null +++ b/ci/release/Jenkinsfile @@ -0,0 +1,107 @@ +/* + * Hibernate Tools, Tooling for your Hibernate Projects + * + * Copyright 2016-2024 Red Hat, Inc. + * + * Licensed under the GNU Lesser General Public License (LGPL), + * version 2.1 or later (the "License"). + * You may not use this file except in compliance with the License. + * You may read the licence in the 'lgpl.txt' file in the root folder of + * project or obtain a copy at + * + * http://www.gnu.org/licenses/lgpl-2.1.html + * + * 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. + */ +@Library('hibernate-jenkins-pipeline-helpers') _ + +import org.hibernate.jenkins.pipeline.helpers.version.Version + +pipeline { + agent { + label 'Release' + } + tools { + maven 'Apache Maven 3.9' + jdk 'OpenJDK 21 Latest' + } + options { + buildDiscarder logRotator(daysToKeepStr: '30', numToKeepStr: '10') + disableConcurrentBuilds(abortPrevious: false) + } + parameters { + string( + name: 'RELEASE_VERSION', + defaultValue: '', + description: 'The version to be released, e.g. 6.3.3.Final.', + trim: true + ) + string( + name: 'DEVELOPMENT_VERSION', + defaultValue: '', + description: 'The next version to be used after the release, e.g. 6.3.4-SNAPSHOT.', + trim: true + ) + booleanParam( + name: 'RELEASE_DRY_RUN', + defaultValue: false, + description: 'If true, just simulate the release, without pushing any commits or tags, and without uploading any artifacts or documentation.' + ) + } + stages { + stage('Release') { + when { + beforeAgent true + // Releases must be triggered explicitly + // This is just for safety; normally the Jenkins job for this pipeline + // should be configured to "Suppress automatic SCM triggering" + // See https://stackoverflow.com/questions/58259326/prevent-jenkins-multibranch-pipeline-from-triggering-builds-for-new-branches + triggeredBy cause: "UserIdCause" + } + steps { + script { + // Check that all the necessary parameters are set + if (!params.RELEASE_VERSION) { + throw new IllegalArgumentException("Missing value for parameter RELEASE_VERSION.") + } + if (!params.DEVELOPMENT_VERSION) { + throw new IllegalArgumentException("Missing value for parameter DEVELOPMENT_VERSION.") + } + + def releaseVersion = Version.parseReleaseVersion(params.RELEASE_VERSION) + def developmentVersion = Version.parseDevelopmentVersion(params.DEVELOPMENT_VERSION) + echo "Performing full release for version ${releaseVersion.toString()}" + + withMaven(mavenSettingsConfig: params.RELEASE_DRY_RUN ? null : 'ci-hibernate.deploy.settings.maven', + mavenLocalRepo: env.WORKSPACE_TMP + '/.m2repository') { + configFileProvider([configFile(fileId: 'release.config.ssh', targetLocation: env.HOME + '/.ssh/config'), + configFile(fileId: 'release.config.ssh.knownhosts', targetLocation: env.HOME + '/.ssh/known_hosts')]) { + // using MAVEN_GPG_PASSPHRASE (the default env variable name for passphrase in maven gpg plugin) + withCredentials([file(credentialsId: 'release.gpg.private-key', variable: 'RELEASE_GPG_PRIVATE_KEY_PATH'), + string(credentialsId: 'release.gpg.passphrase', variable: 'MAVEN_GPG_PASSPHRASE')]) { + sshagent(['ed25519.Hibernate-CI.github.com', 'hibernate.filemgmt.jboss.org', 'hibernate-ci.frs.sourceforge.net']) { + sh 'cat $HOME/.ssh/config' + sh 'git clone https://github.com/hibernate/hibernate-release-scripts.git' + env.RELEASE_GPG_HOMEDIR = env.WORKSPACE_TMP + '/.gpg' + sh """ + bash -xe hibernate-release-scripts/release.sh ${params.RELEASE_DRY_RUN ? '-d' : ''} \ + tools ${releaseVersion.toString()} ${developmentVersion.toString()} + """ + } + } + } + } + } + } + } + } + post { + always { + notifyBuildResult notifySuccessAfterSuccess: true, maintainers: 'koen@hibernate.org' + } + } +} From 97e7ecde195c18d1c0789aafbdebc914c3eb4066 Mon Sep 17 00:00:00 2001 From: Koen Aers Date: Thu, 16 Jan 2025 15:29:31 +0100 Subject: [PATCH 47/58] HBX-2994: Backport automated releases to branch 6.4 - Use 'OpenJDK 11 Latest' as jdk in 'ci/release/Jenkinsfile' Signed-off-by: Koen Aers --- ci/release/Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/release/Jenkinsfile b/ci/release/Jenkinsfile index bdd21ccb58..e8acfdc375 100644 --- a/ci/release/Jenkinsfile +++ b/ci/release/Jenkinsfile @@ -27,7 +27,7 @@ pipeline { } tools { maven 'Apache Maven 3.9' - jdk 'OpenJDK 21 Latest' + jdk 'OpenJDK 11 Latest' } options { buildDiscarder logRotator(daysToKeepStr: '30', numToKeepStr: '10') From 366a614beb1c94016b0773d4505ea105343e49be Mon Sep 17 00:00:00 2001 From: Koen Aers Date: Thu, 16 Jan 2025 16:52:34 +0100 Subject: [PATCH 48/58] HBX-2994: Backport automated releases to branch 6.4 - Add property 'deploy.skip' = 'false' for modules to be deployed Signed-off-by: Koen Aers --- ant/pom.xml | 5 +++++ jbt/pom.xml | 5 +++++ maven/pom.xml | 3 ++- orm/pom.xml | 5 +++++ utils/pom.xml | 5 +++++ 5 files changed, 22 insertions(+), 1 deletion(-) diff --git a/ant/pom.xml b/ant/pom.xml index 3c43d31822..731603c061 100644 --- a/ant/pom.xml +++ b/ant/pom.xml @@ -30,6 +30,11 @@ Hibernate Tools Ant Tasks jar + + + false + + org.apache.ant diff --git a/jbt/pom.xml b/jbt/pom.xml index d2fa37d3be..9c83ce3320 100644 --- a/jbt/pom.xml +++ b/jbt/pom.xml @@ -35,6 +35,11 @@ Hibernate Tools ORM - JBoss Tools Adapter Hibernate Tools ORM - JBoss Tools Adapter + + + false + + com.h2database diff --git a/maven/pom.xml b/maven/pom.xml index ce3b868f4b..33b6ade59e 100644 --- a/maven/pom.xml +++ b/maven/pom.xml @@ -68,7 +68,8 @@ - false + + false false 3.5 diff --git a/orm/pom.xml b/orm/pom.xml index 7dfd6ba8d4..d479789482 100644 --- a/orm/pom.xml +++ b/orm/pom.xml @@ -35,6 +35,11 @@ Hibernate Tools ORM Hibernate Tools ORM + + + false + + com.google.googlejavaformat diff --git a/utils/pom.xml b/utils/pom.xml index 72d0c7d215..4ebf179acf 100644 --- a/utils/pom.xml +++ b/utils/pom.xml @@ -30,6 +30,11 @@ Hibernate Tools Common Utilities jar + + + false + + org.junit.jupiter From 7174f713e5c8109864904acd28efa6a331df4280 Mon Sep 17 00:00:00 2001 From: Koen Aers Date: Thu, 22 May 2025 17:57:38 +0200 Subject: [PATCH 49/58] HBX-2994: Backport automated releases to branch 6.4 - Update dependency on jboss-parent to version 49 Signed-off-by: Koen Aers --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0a495fbcf1..6dc3193602 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ org.jboss jboss-parent - 47 + 49 org.hibernate.tool From 9852ee8485486fd320afa639159af4f1ddeaf66d Mon Sep 17 00:00:00 2001 From: Koen Aers Date: Thu, 22 May 2025 18:23:06 +0200 Subject: [PATCH 50/58] HBX-2994: Backport automated releases to branch 6.4 - Update of junit-jupiter to version 5.10.2 Signed-off-by: Koen Aers --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6dc3193602..ffb8bdf71e 100644 --- a/pom.xml +++ b/pom.xml @@ -96,7 +96,7 @@ 2.6.1 8.0.1 3.5.3.Final - 5.10.1 + 5.10.2 8.0.22 19.3.0.0 9.2.1.jre8 From 38d81cfef800ce08acf8dfb69243279b2ca154a3 Mon Sep 17 00:00:00 2001 From: Koen Aers Date: Thu, 22 May 2025 19:00:38 +0200 Subject: [PATCH 51/58] HBX-2994: Backport automated releases to branch 6.4 - Update of the commons-collections dependency to 4.5.0 Signed-off-by: Koen Aers --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ffb8bdf71e..38271a83f6 100644 --- a/pom.xml +++ b/pom.xml @@ -87,7 +87,7 @@ 1.10.14 4.13.1 - 4.4 + 4.5.0 2.3.32 1.19.1 2.2.224 From d567f4f29c3a5b331e777c707e390413e87925c0 Mon Sep 17 00:00:00 2001 From: Koen Aers Date: Mon, 26 May 2025 15:52:33 +0200 Subject: [PATCH 52/58] HBX-2994: Backport automated releases to branch 6.4 - Amend the version identifiers in the Jenkinsfile Signed-off-by: Koen Aers --- ci/release/Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/release/Jenkinsfile b/ci/release/Jenkinsfile index e8acfdc375..c23af2ad13 100644 --- a/ci/release/Jenkinsfile +++ b/ci/release/Jenkinsfile @@ -37,13 +37,13 @@ pipeline { string( name: 'RELEASE_VERSION', defaultValue: '', - description: 'The version to be released, e.g. 6.3.3.Final.', + description: 'The version to be released, e.g. 6.4.11.Final.', trim: true ) string( name: 'DEVELOPMENT_VERSION', defaultValue: '', - description: 'The next version to be used after the release, e.g. 6.3.4-SNAPSHOT.', + description: 'The next version to be used after the release, e.g. 6.4.12-SNAPSHOT.', trim: true ) booleanParam( From 647dff87d4e52c164a7d0e7c4009b464b76c0f96 Mon Sep 17 00:00:00 2001 From: marko-bekhta Date: Tue, 13 May 2025 15:23:09 +0200 Subject: [PATCH 53/58] HBX-2994: Backport automated releases to branch 6.4 - Use JReleaser to publish artifacts --- .release/.gitignore | 3 + ci/release/Jenkinsfile | 16 +++-- pom.xml | 129 ++++++----------------------------------- reports/pom.xml | 100 -------------------------------- 4 files changed, 32 insertions(+), 216 deletions(-) create mode 100644 .release/.gitignore delete mode 100644 reports/pom.xml diff --git a/.release/.gitignore b/.release/.gitignore new file mode 100644 index 0000000000..cdd9a17d6b --- /dev/null +++ b/.release/.gitignore @@ -0,0 +1,3 @@ +# The folder into which we checkout our release scripts into +* +!.gitignore \ No newline at end of file diff --git a/ci/release/Jenkinsfile b/ci/release/Jenkinsfile index c23af2ad13..8adda8067d 100644 --- a/ci/release/Jenkinsfile +++ b/ci/release/Jenkinsfile @@ -74,6 +74,7 @@ pipeline { def releaseVersion = Version.parseReleaseVersion(params.RELEASE_VERSION) def developmentVersion = Version.parseDevelopmentVersion(params.DEVELOPMENT_VERSION) + env.JRELEASER_DRY_RUN = params.RELEASE_DRY_RUN echo "Performing full release for version ${releaseVersion.toString()}" withMaven(mavenSettingsConfig: params.RELEASE_DRY_RUN ? null : 'ci-hibernate.deploy.settings.maven', @@ -82,13 +83,20 @@ pipeline { configFile(fileId: 'release.config.ssh.knownhosts', targetLocation: env.HOME + '/.ssh/known_hosts')]) { // using MAVEN_GPG_PASSPHRASE (the default env variable name for passphrase in maven gpg plugin) withCredentials([file(credentialsId: 'release.gpg.private-key', variable: 'RELEASE_GPG_PRIVATE_KEY_PATH'), - string(credentialsId: 'release.gpg.passphrase', variable: 'MAVEN_GPG_PASSPHRASE')]) { + string(credentialsId: 'release.gpg.passphrase', variable: 'JRELEASER_GPG_PASSPHRASE'), + // TODO: Once we switch to maven-central publishing (from nexus2) we need to add a new credentials + // to use the following env variable names to set the user/password: + // JRELEASER_MAVENCENTRAL_USERNAME + // JRELEASER_MAVENCENTRAL_TOKEN + usernamePassword(credentialsId: 'ossrh.sonatype.org', passwordVariable: 'JRELEASER_NEXUS2_PASSWORD', usernameVariable: 'JRELEASER_NEXUS2_USERNAME'), + string(credentialsId: 'Hibernate-CI.github.com', variable: 'JRELEASER_GITHUB_TOKEN')]) { sshagent(['ed25519.Hibernate-CI.github.com', 'hibernate.filemgmt.jboss.org', 'hibernate-ci.frs.sourceforge.net']) { sh 'cat $HOME/.ssh/config' - sh 'git clone https://github.com/hibernate/hibernate-release-scripts.git' - env.RELEASE_GPG_HOMEDIR = env.WORKSPACE_TMP + '/.gpg' + dir('.release/scripts') { + sh 'git clone https://github.com/hibernate/hibernate-release-scripts.git .' + } sh """ - bash -xe hibernate-release-scripts/release.sh ${params.RELEASE_DRY_RUN ? '-d' : ''} \ + bash -xe .release/scripts/release.sh -j ${params.RELEASE_DRY_RUN ? '-d' : ''} \ tools ${releaseVersion.toString()} ${developmentVersion.toString()} """ } diff --git a/pom.xml b/pom.xml index 38271a83f6..6f34fe5fc2 100644 --- a/pom.xml +++ b/pom.xml @@ -103,21 +103,20 @@ 3.3.2 - 1.7.0 - 1.5.0 + 1.7.0 true - true - ossrh - Sonatype OSSRH Releases - https://oss.sonatype.org/service/local/staging/deploy/maven2 - https://oss.sonatype.org + + + staging-deploy + Local Staging Directory Releases Repository + file:${maven.multiModuleProjectDirectory}/target/staging-deploy/maven ossrh Sonatype OSSRH Snapshots https://oss.sonatype.org/content/repositories/snapshots @@ -246,16 +245,16 @@ - - ${ossrh.releases.repo.id} - ${ossrh.releases.repo.name} - ${ossrh.releases.repo.url} - - - ${ossrh.snapshots.repo.id} - ${ossrh.snapshots.repo.name} - ${ossrh.snapshots.repo.url} - + + ${local.staging.releases.repo.id} + ${local.staging.releases.repo.name} + ${local.staging.releases.repo.url} + + + ${ossrh.snapshots.repo.id} + ${ossrh.snapshots.repo.name} + ${ossrh.snapshots.repo.url} + @@ -270,39 +269,6 @@ bin - - - org.apache.maven.plugins - maven-gpg-plugin - - - sign-artifacts - verify - - sign - - - ${deploy.skip} - ${env.RELEASE_GPG_HOMEDIR} - - - - - - org.sonatype.plugins - nexus-staging-maven-plugin - ${nexus-staging.plugin.version} - false - - ${deploy.skip} - ${ossrh.releases.repo.id} - - ${ossrh.releases.repo.baseUrl} - - 60 - - org.codehaus.mojo flatten-maven-plugin @@ -333,30 +299,9 @@ org.apache.maven.plugins maven-deploy-plugin - ${maven-deploy-plugin.skip} + ${deploy.skip} - - - org.sonatype.plugins - nexus-staging-maven-plugin - - - default-deploy - deploy - - - deploy - - - - org.codehaus.mojo flatten-maven-plugin @@ -387,44 +332,4 @@ - - - release - - - performRelease - true - - - - - - org.apache.maven.plugins - maven-gpg-plugin - - - - - - - - build-reports-as-last-module - - - !some.property.that.will.never.exist - - - - reports - - - - - - diff --git a/reports/pom.xml b/reports/pom.xml deleted file mode 100644 index 00c9a871ee..0000000000 --- a/reports/pom.xml +++ /dev/null @@ -1,100 +0,0 @@ - - - - 4.0.0 - - org.hibernate.tool - hibernate-tools-parent - 6.4.11-SNAPSHOT - - hibernate-tools-reports - - Hibernate Tools Reports - Hibernate Tools build reports - pom - - - - org.hibernate.tool - hibernate-tools-utils - ${project.version} - - - org.hibernate.tool - hibernate-tools-orm - ${project.version} - - - org.hibernate.tool - hibernate-tools-orm-jbt - ${project.version} - - - org.hibernate.tool - hibernate-tools-maven - ${project.version} - - - org.hibernate.tool - hibernate-tools-gradle - ${project.version} - - - org.hibernate.tool - hibernate-tools-ant - ${project.version} - - - - - - - - org.sonatype.plugins - nexus-staging-maven-plugin - false - - - - - default-deploy - none - - - - deferred-deploy - deploy - - deploy-staged - - - - - - - From bf807435fdde4f044d671b4e51ded0b3e33dbf77 Mon Sep 17 00:00:00 2001 From: Koen Aers Date: Tue, 20 May 2025 17:26:00 +0200 Subject: [PATCH 54/58] HBX-2993: Use 'true' as the default version for release dry run Signed-off-by: Koen Aers --- ci/release/Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/release/Jenkinsfile b/ci/release/Jenkinsfile index 8adda8067d..1358405a6b 100644 --- a/ci/release/Jenkinsfile +++ b/ci/release/Jenkinsfile @@ -48,7 +48,7 @@ pipeline { ) booleanParam( name: 'RELEASE_DRY_RUN', - defaultValue: false, + defaultValue: true, description: 'If true, just simulate the release, without pushing any commits or tags, and without uploading any artifacts or documentation.' ) } From f296699874cca9e8d0543e54466060b29aef3e82 Mon Sep 17 00:00:00 2001 From: marko-bekhta Date: Mon, 16 Jun 2025 22:50:36 +0200 Subject: [PATCH 55/58] HBX-3011 Switch to Maven Central publishing --- ci/release/Jenkinsfile | 14 ++++++---- pom.xml | 60 +++++++++++++++++++++++++++++++----------- 2 files changed, 53 insertions(+), 21 deletions(-) diff --git a/ci/release/Jenkinsfile b/ci/release/Jenkinsfile index 1358405a6b..88c6b54d98 100644 --- a/ci/release/Jenkinsfile +++ b/ci/release/Jenkinsfile @@ -51,6 +51,11 @@ pipeline { defaultValue: true, description: 'If true, just simulate the release, without pushing any commits or tags, and without uploading any artifacts or documentation.' ) + booleanParam( + name: 'RELEASE_PUBLISH_AUTOMATICALLY', + defaultValue: true, + description: 'If true, staging repository will get closed and published automatically, otherwise the artifacts will only be uploaded and the publishing (releasing the staging repository) has to be performed manually at Maven Central portal.' + ) } stages { stage('Release') { @@ -75,6 +80,9 @@ pipeline { def releaseVersion = Version.parseReleaseVersion(params.RELEASE_VERSION) def developmentVersion = Version.parseDevelopmentVersion(params.DEVELOPMENT_VERSION) env.JRELEASER_DRY_RUN = params.RELEASE_DRY_RUN + if (!params.RELEASE_PUBLISH_AUTOMATICALLY) { + env.JRELEASER_DEPLOY_MAVEN_MAVENCENTRAL_STAGE='UPLOAD' + } echo "Performing full release for version ${releaseVersion.toString()}" withMaven(mavenSettingsConfig: params.RELEASE_DRY_RUN ? null : 'ci-hibernate.deploy.settings.maven', @@ -84,11 +92,7 @@ pipeline { // using MAVEN_GPG_PASSPHRASE (the default env variable name for passphrase in maven gpg plugin) withCredentials([file(credentialsId: 'release.gpg.private-key', variable: 'RELEASE_GPG_PRIVATE_KEY_PATH'), string(credentialsId: 'release.gpg.passphrase', variable: 'JRELEASER_GPG_PASSPHRASE'), - // TODO: Once we switch to maven-central publishing (from nexus2) we need to add a new credentials - // to use the following env variable names to set the user/password: - // JRELEASER_MAVENCENTRAL_USERNAME - // JRELEASER_MAVENCENTRAL_TOKEN - usernamePassword(credentialsId: 'ossrh.sonatype.org', passwordVariable: 'JRELEASER_NEXUS2_PASSWORD', usernameVariable: 'JRELEASER_NEXUS2_USERNAME'), + usernamePassword(credentialsId: 'central.sonatype.com', passwordVariable: 'JRELEASER_MAVENCENTRAL_TOKEN', usernameVariable: 'JRELEASER_MAVENCENTRAL_USERNAME'), string(credentialsId: 'Hibernate-CI.github.com', variable: 'JRELEASER_GITHUB_TOKEN')]) { sshagent(['ed25519.Hibernate-CI.github.com', 'hibernate.filemgmt.jboss.org', 'hibernate-ci.frs.sourceforge.net']) { sh 'cat $HOME/.ssh/config' diff --git a/pom.xml b/pom.xml index 6f34fe5fc2..e7b1775aaf 100644 --- a/pom.xml +++ b/pom.xml @@ -25,13 +25,13 @@ jboss-parent 49 - + org.hibernate.tool hibernate-tools-parent 6.4.11-SNAPSHOT pom - + Hibernate Tools Parent Project http://hibernate.org/tools/ @@ -117,16 +117,20 @@ staging-deploy Local Staging Directory Releases Repository file:${maven.multiModuleProjectDirectory}/target/staging-deploy/maven - ossrh - Sonatype OSSRH Snapshots - https://oss.sonatype.org/content/repositories/snapshots + central-releases + Maven Central Releases Repository + https://central.sonatype.com/api/v1/publisher/ + central-snapshots + Maven Central Snapshots Repository + https://central.sonatype.com/repository/maven-snapshots/ + 11 11 3.9.7 - + @@ -245,16 +249,16 @@ - - ${local.staging.releases.repo.id} - ${local.staging.releases.repo.name} - ${local.staging.releases.repo.url} - - - ${ossrh.snapshots.repo.id} - ${ossrh.snapshots.repo.name} - ${ossrh.snapshots.repo.url} - + + ${central.releases.repo.id} + ${central.releases.repo.name} + ${central.releases.repo.url} + + + ${central.snapshots.repo.id} + ${central.snapshots.repo.name} + ${central.snapshots.repo.url} + @@ -332,4 +336,28 @@ + + + release + + + performRelease + true + + + + + + + org.apache.maven.plugins + maven-deploy-plugin + + ${local.staging.releases.repo.id}::${local.staging.releases.repo.url} + + + + + + + From fb0ffb6b8e866080d9c0c38895860d088a1ffbab Mon Sep 17 00:00:00 2001 From: Koen Aers Date: Mon, 30 Jun 2025 17:01:50 +0200 Subject: [PATCH 56/58] HBX-3011 Switch to Maven Central publishing - change the default value of 'RELEASE_PUBLISH_AUTOMATICALLY' to 'false' - fill out default versions (6.4.11.Final and 6.4.12-SNAPSHOT respectively) Signed-off-by: Koen Aers --- ci/release/Jenkinsfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ci/release/Jenkinsfile b/ci/release/Jenkinsfile index 88c6b54d98..add6875d55 100644 --- a/ci/release/Jenkinsfile +++ b/ci/release/Jenkinsfile @@ -1,7 +1,7 @@ /* * Hibernate Tools, Tooling for your Hibernate Projects * - * Copyright 2016-2024 Red Hat, Inc. + * Copyright 2016-2025 Red Hat, Inc. * * Licensed under the GNU Lesser General Public License (LGPL), * version 2.1 or later (the "License"). @@ -36,13 +36,13 @@ pipeline { parameters { string( name: 'RELEASE_VERSION', - defaultValue: '', + defaultValue: '6.4.11.Final', description: 'The version to be released, e.g. 6.4.11.Final.', trim: true ) string( name: 'DEVELOPMENT_VERSION', - defaultValue: '', + defaultValue: '6.4.12-SNAPSHOT', description: 'The next version to be used after the release, e.g. 6.4.12-SNAPSHOT.', trim: true ) @@ -53,7 +53,7 @@ pipeline { ) booleanParam( name: 'RELEASE_PUBLISH_AUTOMATICALLY', - defaultValue: true, + defaultValue: false, description: 'If true, staging repository will get closed and published automatically, otherwise the artifacts will only be uploaded and the publishing (releasing the staging repository) has to be performed manually at Maven Central portal.' ) } From 80707c5b31655f11c60809a3b8d23b18c14e05d9 Mon Sep 17 00:00:00 2001 From: Jan Schatteman Date: Mon, 4 Aug 2025 17:27:27 +0200 Subject: [PATCH 57/58] HBX-1020 - Correction in javaDoc generation for getXXX() accessors Signed-off-by: Jan Schatteman --- orm/src/main/resources/pojo/PojoPropertyAccessors.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/orm/src/main/resources/pojo/PojoPropertyAccessors.ftl b/orm/src/main/resources/pojo/PojoPropertyAccessors.ftl index b166786237..00097a644e 100644 --- a/orm/src/main/resources/pojo/PojoPropertyAccessors.ftl +++ b/orm/src/main/resources/pojo/PojoPropertyAccessors.ftl @@ -3,7 +3,7 @@ <#if pojo.getMetaAttribAsBool(property, "gen-property", true)> <#if pojo.hasFieldJavaDoc(property)> /** - * ${pojo.getFieldJavaDoc(property, 4)} + ${pojo.getFieldJavaDoc(property, 4)} */ <#include "GetPropertyAnnotation.ftl"/> From 5a8dca5ec7baced98a9a9844cce199b400b49a0c Mon Sep 17 00:00:00 2001 From: Koen Aers Date: Tue, 1 Jul 2025 13:54:18 +0200 Subject: [PATCH 58/58] HBX-3083: Change the protocol of references to the hibernate mapping DTD to 'https' from 'http' Signed-off-by: Koen Aers --- .../tool/orm/jbt/util/MetadataHelperTest.java | 2 +- orm/src/main/resources/hbm/generalhbm.hbm.ftl | 2 +- .../resources/hbm/hibernate-mapping.hbm.ftl | 2 +- .../tool/ant/AntHibernateTool/TopDown.hbm.xml | 2 +- .../tool/ant/GenericExport/TopDown.hbm.xml | 2 +- .../Hbm2JavaConfiguration/SomeClass.hbm.xml | 2 +- .../SomeClass.hbm.xml | 2 +- .../hibernate/tool/ant/HbmLint/Column.hbm.xml | 2 +- .../tool/ant/HbmLint/SchemaIssues.hbm.xml | 2 +- .../tool/ant/Properties/SomeClass.hbm.xml | 2 +- .../hibernate/tool/ant/Query/query.hbm.xml | 2 +- .../ant/SchemaExportWarning/TopDown.hbm.xml | 2 +- .../ant/SchemaUpdateWarning/TopDown.hbm.xml | 2 +- .../query/QueryExporterTest/UserGroup.hbm.xml | 2 +- .../hbmlint/HbmLintTest/BrokenLazy.hbm.xml | 2 +- .../HbmLintTest/CachingSettings.hbm.xml | 2 +- .../HbmLintTest/IdentifierIssues.hbm.xml | 2 +- .../SchemaAnalyzer/SchemaIssues.hbm.xml | 2 +- .../tool/stat/Statistics/UserGroup.hbm.xml | 2 +- .../SchemaAnalyzer/SchemaIssues.hbm.xml | 2 +- .../tool/ant/Exception/TopDown.hbm.xml | 2 +- .../tool/ant/NoConnInfoExport/TopDown.hbm.xml | 2 +- .../hbm2x/DocExporterTest/Customer.hbm.xml | 2 +- .../DocExporterTest/DependentValue.hbm.xml | 2 +- .../hbm2x/DocExporterTest/HelloWorld.hbm.xml | 2 +- .../hbm2x/DocExporterTest/LineItem.hbm.xml | 2 +- .../tool/hbm2x/DocExporterTest/Order.hbm.xml | 2 +- .../hbm2x/DocExporterTest/Product.hbm.xml | 2 +- .../DocExporterTest/UnionSubclass.hbm.xml | 2 +- .../hbm2x/GenericExporterTest/Article.hbm.xml | 2 +- .../hbm2x/GenericExporterTest/Author.hbm.xml | 2 +- .../GenericExporterTest/HelloWorld.hbm.xml | 2 +- .../HashcodeEqualsTest/HashEquals.hbm.xml | 2 +- .../tool/hbm2x/Hbm2CfgTest/HelloWorld.hbm.xml | 2 +- .../tool/hbm2x/Hbm2DaoTest/Article.hbm.xml | 2 +- .../tool/hbm2x/Hbm2DaoTest/Author.hbm.xml | 2 +- .../tool/hbm2x/Hbm2EJBDaoTest/Article.hbm.xml | 2 +- .../tool/hbm2x/Hbm2EJBDaoTest/Author.hbm.xml | 2 +- .../Hbm2HibernateDAOTest/Article.hbm.xml | 2 +- .../hbm2x/Hbm2HibernateDAOTest/Author.hbm.xml | 2 +- .../Constructors.hbm.xml | 2 +- .../GenericModel.hbm.xml | 2 +- .../hbm2x/Hbm2JavaEjb3Test/Article.hbm.xml | 2 +- .../hbm2x/Hbm2JavaEjb3Test/Author.hbm.xml | 2 +- .../hbm2x/Hbm2JavaEjb3Test/Passenger.hbm.xml | 2 +- .../tool/hbm2x/Hbm2JavaEjb3Test/Train.hbm.xml | 2 +- .../Article.hbm.xml | 2 +- .../Hbm2JavaInitializationTest/Author.hbm.xml | 2 +- .../Passenger.hbm.xml | 2 +- .../Hbm2JavaInitializationTest/Train.hbm.xml | 2 +- .../tool/hbm2x/Hbm2JavaTest/Customer.hbm.xml | 2 +- .../hbm2x/Hbm2JavaTest/HelloWorld.hbm.xml | 2 +- .../tool/hbm2x/Hbm2JavaTest/LineItem.hbm.xml | 2 +- .../tool/hbm2x/Hbm2JavaTest/Order.hbm.xml | 2 +- .../tool/hbm2x/Hbm2JavaTest/Passenger.hbm.xml | 2 +- .../tool/hbm2x/Hbm2JavaTest/Product.hbm.xml | 2 +- .../tool/hbm2x/Hbm2JavaTest/Train.hbm.xml | 2 +- .../hbm2x/OtherCfg2HbmTest/Customer.hbm.xml | 2 +- .../hbm2x/OtherCfg2HbmTest/HelloWorld.hbm.xml | 2 +- .../hbm2x/OtherCfg2HbmTest/LineItem.hbm.xml | 2 +- .../tool/hbm2x/OtherCfg2HbmTest/Order.hbm.xml | 2 +- .../hbm2x/OtherCfg2HbmTest/Product.hbm.xml | 2 +- .../hbm2x/PropertiesTest/Properties.hbm.xml | 2 +- .../hbm2x/hbm2hbmxml/AbstractTest/Car.hbm.xml | 2 +- .../hbm2x/hbm2hbmxml/BackrefTest/Car.hbm.xml | 2 +- .../CompositeElementTest/Glarch.hbm.xml | 2 +- .../DynamicComponentTest/Glarch.hbm.xml | 2 +- .../hbm2hbmxml/Hbm2HbmXmlTest/Basic.hbm.xml | 22 +++++++++---------- .../Hbm2HbmXmlTest/BasicCompositeId.hbm.xml | 2 +- .../Hbm2HbmXmlTest/BasicGlobals.hbm.xml | 2 +- .../Hbm2HbmXmlTest/ClassFullAttribute.hbm.xml | 2 +- .../hbm2hbmxml/IdBagTest/UserGroup.hbm.xml | 2 +- .../hbm2hbmxml/InheritanceTest/Aliens.hbm.xml | 2 +- .../hbm2hbmxml/ListArrayTest/Glarch.hbm.xml | 2 +- .../ManyToManyTest/UserGroup.hbm.xml | 2 +- .../hbm2hbmxml/MapAndAnyTest/Person.hbm.xml | 2 +- .../MapAndAnyTest/Properties.hbm.xml | 2 +- .../PersonAddressOneToOnePrimaryKey.hbm.xml | 2 +- .../hbm2hbmxml/SetElementTest/Search.hbm.xml | 2 +- .../hbm2hbmxml/TypeParamsTest/Order.hbm.xml | 2 +- .../completion/ModelCompletion/City.hbm.xml | 2 +- .../ModelCompletion/Product.hbm.xml | 2 +- .../ProductOwnerAddress.hbm.xml | 2 +- .../completion/ModelCompletion/Store.hbm.xml | 2 +- .../ModelCompletion/StoreCity.hbm.xml | 2 +- .../SchemaAnalyzer/SchemaIssues.hbm.xml | 2 +- .../tools/test/util/HelloWorld.hbm.xml | 2 +- 87 files changed, 97 insertions(+), 97 deletions(-) diff --git a/jbt/src/test/java/org/hibernate/tool/orm/jbt/util/MetadataHelperTest.java b/jbt/src/test/java/org/hibernate/tool/orm/jbt/util/MetadataHelperTest.java index b5c8c30f74..8ce2ab03ea 100644 --- a/jbt/src/test/java/org/hibernate/tool/orm/jbt/util/MetadataHelperTest.java +++ b/jbt/src/test/java/org/hibernate/tool/orm/jbt/util/MetadataHelperTest.java @@ -88,7 +88,7 @@ private static class Foo { private static final String TEST_HBM_XML_STRING = "" + + " 'https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd'>" + "" + " " + " " + diff --git a/orm/src/main/resources/hbm/generalhbm.hbm.ftl b/orm/src/main/resources/hbm/generalhbm.hbm.ftl index bf73afd337..5d9d8e982c 100644 --- a/orm/src/main/resources/hbm/generalhbm.hbm.ftl +++ b/orm/src/main/resources/hbm/generalhbm.hbm.ftl @@ -1,7 +1,7 @@ + "https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd"> <#if hmgs?exists && hmgs.hasNonDefaultSettings()> diff --git a/test/common/src/main/resources/org/hibernate/tool/ant/AntHibernateTool/TopDown.hbm.xml b/test/common/src/main/resources/org/hibernate/tool/ant/AntHibernateTool/TopDown.hbm.xml index 7423324ed5..767bd5de29 100644 --- a/test/common/src/main/resources/org/hibernate/tool/ant/AntHibernateTool/TopDown.hbm.xml +++ b/test/common/src/main/resources/org/hibernate/tool/ant/AntHibernateTool/TopDown.hbm.xml @@ -1,7 +1,7 @@ + "https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd"> diff --git a/test/common/src/main/resources/org/hibernate/tool/ant/GenericExport/TopDown.hbm.xml b/test/common/src/main/resources/org/hibernate/tool/ant/GenericExport/TopDown.hbm.xml index 7423324ed5..767bd5de29 100644 --- a/test/common/src/main/resources/org/hibernate/tool/ant/GenericExport/TopDown.hbm.xml +++ b/test/common/src/main/resources/org/hibernate/tool/ant/GenericExport/TopDown.hbm.xml @@ -1,7 +1,7 @@ + "https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd"> diff --git a/test/common/src/main/resources/org/hibernate/tool/ant/Hbm2JavaConfiguration/SomeClass.hbm.xml b/test/common/src/main/resources/org/hibernate/tool/ant/Hbm2JavaConfiguration/SomeClass.hbm.xml index 6f660da374..a18a73271f 100644 --- a/test/common/src/main/resources/org/hibernate/tool/ant/Hbm2JavaConfiguration/SomeClass.hbm.xml +++ b/test/common/src/main/resources/org/hibernate/tool/ant/Hbm2JavaConfiguration/SomeClass.hbm.xml @@ -1,7 +1,7 @@ + "https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd"> diff --git a/test/common/src/main/resources/org/hibernate/tool/ant/Hbm2JavaEJB3Configuration/SomeClass.hbm.xml b/test/common/src/main/resources/org/hibernate/tool/ant/Hbm2JavaEJB3Configuration/SomeClass.hbm.xml index 6f660da374..a18a73271f 100644 --- a/test/common/src/main/resources/org/hibernate/tool/ant/Hbm2JavaEJB3Configuration/SomeClass.hbm.xml +++ b/test/common/src/main/resources/org/hibernate/tool/ant/Hbm2JavaEJB3Configuration/SomeClass.hbm.xml @@ -1,7 +1,7 @@ + "https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd"> diff --git a/test/common/src/main/resources/org/hibernate/tool/ant/HbmLint/Column.hbm.xml b/test/common/src/main/resources/org/hibernate/tool/ant/HbmLint/Column.hbm.xml index 658bef462f..54b5df61c2 100644 --- a/test/common/src/main/resources/org/hibernate/tool/ant/HbmLint/Column.hbm.xml +++ b/test/common/src/main/resources/org/hibernate/tool/ant/HbmLint/Column.hbm.xml @@ -1,7 +1,7 @@ + "https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd"> diff --git a/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/DocExporterTest/HelloWorld.hbm.xml b/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/DocExporterTest/HelloWorld.hbm.xml index 8c4356fb7e..1154536904 100644 --- a/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/DocExporterTest/HelloWorld.hbm.xml +++ b/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/DocExporterTest/HelloWorld.hbm.xml @@ -1,7 +1,7 @@ + "https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd"> + "https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd"> + "https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd"> + "https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd"> + "https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd"> diff --git a/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/Hbm2JavaEjb3Test/Article.hbm.xml b/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/Hbm2JavaEjb3Test/Article.hbm.xml index d8e7735f38..0a482aab98 100644 --- a/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/Hbm2JavaEjb3Test/Article.hbm.xml +++ b/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/Hbm2JavaEjb3Test/Article.hbm.xml @@ -20,7 +20,7 @@ --> + "https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd"> + "https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd"> + "https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd"> diff --git a/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/Hbm2JavaEjb3Test/Train.hbm.xml b/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/Hbm2JavaEjb3Test/Train.hbm.xml index 952b427a73..0c3bde51aa 100644 --- a/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/Hbm2JavaEjb3Test/Train.hbm.xml +++ b/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/Hbm2JavaEjb3Test/Train.hbm.xml @@ -20,7 +20,7 @@ --> + "https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd"> diff --git a/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/Hbm2JavaInitializationTest/Article.hbm.xml b/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/Hbm2JavaInitializationTest/Article.hbm.xml index 9a68082f9a..e9ebd5b664 100644 --- a/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/Hbm2JavaInitializationTest/Article.hbm.xml +++ b/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/Hbm2JavaInitializationTest/Article.hbm.xml @@ -20,7 +20,7 @@ --> + "https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd"> + "https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd"> + "https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd"> diff --git a/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/Hbm2JavaInitializationTest/Train.hbm.xml b/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/Hbm2JavaInitializationTest/Train.hbm.xml index dc0a988503..8d96f024cc 100644 --- a/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/Hbm2JavaInitializationTest/Train.hbm.xml +++ b/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/Hbm2JavaInitializationTest/Train.hbm.xml @@ -20,7 +20,7 @@ --> + "https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd"> diff --git a/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/Hbm2JavaTest/Customer.hbm.xml b/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/Hbm2JavaTest/Customer.hbm.xml index a0b4ec90bc..2f7b495534 100644 --- a/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/Hbm2JavaTest/Customer.hbm.xml +++ b/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/Hbm2JavaTest/Customer.hbm.xml @@ -20,7 +20,7 @@ --> + "https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd"> + "https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd"> + "https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd"> + "https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd"> + "https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd"> diff --git a/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/Hbm2JavaTest/Product.hbm.xml b/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/Hbm2JavaTest/Product.hbm.xml index 85a13d7fd7..e77ea2f095 100644 --- a/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/Hbm2JavaTest/Product.hbm.xml +++ b/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/Hbm2JavaTest/Product.hbm.xml @@ -20,7 +20,7 @@ --> + "https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd"> diff --git a/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/Hbm2JavaTest/Train.hbm.xml b/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/Hbm2JavaTest/Train.hbm.xml index 55f2cbc135..1b3b7fd96a 100644 --- a/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/Hbm2JavaTest/Train.hbm.xml +++ b/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/Hbm2JavaTest/Train.hbm.xml @@ -20,7 +20,7 @@ --> + "https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd"> diff --git a/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/OtherCfg2HbmTest/Customer.hbm.xml b/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/OtherCfg2HbmTest/Customer.hbm.xml index 38653807d2..a62e6a4cff 100644 --- a/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/OtherCfg2HbmTest/Customer.hbm.xml +++ b/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/OtherCfg2HbmTest/Customer.hbm.xml @@ -20,7 +20,7 @@ --> + "https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd"> + "https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd"> + "https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd"> + "https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd"> + "https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd"> diff --git a/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/PropertiesTest/Properties.hbm.xml b/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/PropertiesTest/Properties.hbm.xml index e920773905..5c64f5ed02 100644 --- a/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/PropertiesTest/Properties.hbm.xml +++ b/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/PropertiesTest/Properties.hbm.xml @@ -20,7 +20,7 @@ --> + "https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd"> @@ -24,24 +24,24 @@ next_hi_value - - description - + - + - + - anotherone + anotherone - + diff --git a/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/hbm2hbmxml/Hbm2HbmXmlTest/BasicCompositeId.hbm.xml b/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/hbm2hbmxml/Hbm2HbmXmlTest/BasicCompositeId.hbm.xml index a84fb49183..61302ff3d6 100644 --- a/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/hbm2hbmxml/Hbm2HbmXmlTest/BasicCompositeId.hbm.xml +++ b/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/hbm2hbmxml/Hbm2HbmXmlTest/BasicCompositeId.hbm.xml @@ -1,7 +1,7 @@ + "https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd"> + "https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd"> diff --git a/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/hbm2hbmxml/ManyToManyTest/UserGroup.hbm.xml b/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/hbm2hbmxml/ManyToManyTest/UserGroup.hbm.xml index 9e6bae762d..c17fcaa406 100644 --- a/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/hbm2hbmxml/ManyToManyTest/UserGroup.hbm.xml +++ b/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/hbm2hbmxml/ManyToManyTest/UserGroup.hbm.xml @@ -20,7 +20,7 @@ --> + "https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd"> + "https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd"> diff --git a/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/hbm2hbmxml/MapAndAnyTest/Properties.hbm.xml b/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/hbm2hbmxml/MapAndAnyTest/Properties.hbm.xml index 93589770aa..4a3c2ee60f 100644 --- a/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/hbm2hbmxml/MapAndAnyTest/Properties.hbm.xml +++ b/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/hbm2hbmxml/MapAndAnyTest/Properties.hbm.xml @@ -20,7 +20,7 @@ --> + "https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd"> diff --git a/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/hbm2hbmxml/OneToOneTest/PersonAddressOneToOnePrimaryKey.hbm.xml b/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/hbm2hbmxml/OneToOneTest/PersonAddressOneToOnePrimaryKey.hbm.xml index a9f8cf2b97..1d9dd0fbdd 100644 --- a/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/hbm2hbmxml/OneToOneTest/PersonAddressOneToOnePrimaryKey.hbm.xml +++ b/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/hbm2hbmxml/OneToOneTest/PersonAddressOneToOnePrimaryKey.hbm.xml @@ -20,7 +20,7 @@ --> + "https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd"> diff --git a/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/hbm2hbmxml/SetElementTest/Search.hbm.xml b/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/hbm2hbmxml/SetElementTest/Search.hbm.xml index c1e9209050..0053e91228 100644 --- a/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/hbm2hbmxml/SetElementTest/Search.hbm.xml +++ b/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/hbm2hbmxml/SetElementTest/Search.hbm.xml @@ -20,7 +20,7 @@ --> + "https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd"> + "https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd"> diff --git a/test/nodb/src/test/resources/org/hibernate/tool/ide/completion/ModelCompletion/City.hbm.xml b/test/nodb/src/test/resources/org/hibernate/tool/ide/completion/ModelCompletion/City.hbm.xml index 856c645c75..912a538be2 100644 --- a/test/nodb/src/test/resources/org/hibernate/tool/ide/completion/ModelCompletion/City.hbm.xml +++ b/test/nodb/src/test/resources/org/hibernate/tool/ide/completion/ModelCompletion/City.hbm.xml @@ -19,7 +19,7 @@ ~ limitations under the License. --> + "https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd"> diff --git a/test/nodb/src/test/resources/org/hibernate/tool/ide/completion/ModelCompletion/Product.hbm.xml b/test/nodb/src/test/resources/org/hibernate/tool/ide/completion/ModelCompletion/Product.hbm.xml index 15fa04a68a..a2870a0c40 100644 --- a/test/nodb/src/test/resources/org/hibernate/tool/ide/completion/ModelCompletion/Product.hbm.xml +++ b/test/nodb/src/test/resources/org/hibernate/tool/ide/completion/ModelCompletion/Product.hbm.xml @@ -19,7 +19,7 @@ ~ limitations under the License. --> + "https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd"> diff --git a/test/nodb/src/test/resources/org/hibernate/tool/ide/completion/ModelCompletion/ProductOwnerAddress.hbm.xml b/test/nodb/src/test/resources/org/hibernate/tool/ide/completion/ModelCompletion/ProductOwnerAddress.hbm.xml index 2153e46bf9..d92284e914 100644 --- a/test/nodb/src/test/resources/org/hibernate/tool/ide/completion/ModelCompletion/ProductOwnerAddress.hbm.xml +++ b/test/nodb/src/test/resources/org/hibernate/tool/ide/completion/ModelCompletion/ProductOwnerAddress.hbm.xml @@ -19,7 +19,7 @@ ~ limitations under the License. --> + "https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd"> diff --git a/test/nodb/src/test/resources/org/hibernate/tool/ide/completion/ModelCompletion/Store.hbm.xml b/test/nodb/src/test/resources/org/hibernate/tool/ide/completion/ModelCompletion/Store.hbm.xml index 57ef3c7d89..338c7bdd06 100644 --- a/test/nodb/src/test/resources/org/hibernate/tool/ide/completion/ModelCompletion/Store.hbm.xml +++ b/test/nodb/src/test/resources/org/hibernate/tool/ide/completion/ModelCompletion/Store.hbm.xml @@ -19,7 +19,7 @@ ~ limitations under the License. --> + "https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd"> diff --git a/test/nodb/src/test/resources/org/hibernate/tool/ide/completion/ModelCompletion/StoreCity.hbm.xml b/test/nodb/src/test/resources/org/hibernate/tool/ide/completion/ModelCompletion/StoreCity.hbm.xml index e21ffe69e4..10e6c75fa2 100644 --- a/test/nodb/src/test/resources/org/hibernate/tool/ide/completion/ModelCompletion/StoreCity.hbm.xml +++ b/test/nodb/src/test/resources/org/hibernate/tool/ide/completion/ModelCompletion/StoreCity.hbm.xml @@ -19,7 +19,7 @@ ~ limitations under the License. --> + "https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd"> diff --git a/test/oracle/src/test/resources/org/hibernate/tool/hbmlint/SchemaAnalyzer/SchemaIssues.hbm.xml b/test/oracle/src/test/resources/org/hibernate/tool/hbmlint/SchemaAnalyzer/SchemaIssues.hbm.xml index 84d9e8289c..a31c8dcc3e 100644 --- a/test/oracle/src/test/resources/org/hibernate/tool/hbmlint/SchemaAnalyzer/SchemaIssues.hbm.xml +++ b/test/oracle/src/test/resources/org/hibernate/tool/hbmlint/SchemaAnalyzer/SchemaIssues.hbm.xml @@ -20,7 +20,7 @@ --> + "https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd"> diff --git a/test/utils/src/test/resources/org/hibernate/tools/test/util/HelloWorld.hbm.xml b/test/utils/src/test/resources/org/hibernate/tools/test/util/HelloWorld.hbm.xml index aae3f88b47..27917869c7 100644 --- a/test/utils/src/test/resources/org/hibernate/tools/test/util/HelloWorld.hbm.xml +++ b/test/utils/src/test/resources/org/hibernate/tools/test/util/HelloWorld.hbm.xml @@ -20,7 +20,7 @@ --> + "https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">