From 3e98676fc14935be1ee17114dd69b51cca0ea22f Mon Sep 17 00:00:00 2001 From: Anuj Dodhia Date: Wed, 3 Mar 2021 21:05:37 +0000 Subject: [PATCH 1/9] [maven-release-plugin] prepare release 1.3.5-RC1 --- morf-core/pom.xml | 2 +- morf-excel/pom.xml | 2 +- morf-h2/pom.xml | 2 +- morf-integration-test/pom.xml | 2 +- morf-mysql/pom.xml | 2 +- morf-nuodb/pom.xml | 2 +- morf-oracle/pom.xml | 2 +- morf-postgresql/pom.xml | 2 +- morf-sqlserver/pom.xml | 2 +- morf-testsupport/pom.xml | 2 +- pom.xml | 4 ++-- 11 files changed, 12 insertions(+), 12 deletions(-) diff --git a/morf-core/pom.xml b/morf-core/pom.xml index 7e162c156..63abe821b 100755 --- a/morf-core/pom.xml +++ b/morf-core/pom.xml @@ -4,7 +4,7 @@ org.alfasoftware morf-parent - 1.3.5-SNAPSHOT + 1.3.5-RC1 Morf - Core diff --git a/morf-excel/pom.xml b/morf-excel/pom.xml index 43de41fc8..a60a021ff 100755 --- a/morf-excel/pom.xml +++ b/morf-excel/pom.xml @@ -4,7 +4,7 @@ org.alfasoftware morf-parent - 1.3.5-SNAPSHOT + 1.3.5-RC1 Morf - Excel diff --git a/morf-h2/pom.xml b/morf-h2/pom.xml index 9c9464094..74c707709 100755 --- a/morf-h2/pom.xml +++ b/morf-h2/pom.xml @@ -4,7 +4,7 @@ org.alfasoftware morf-parent - 1.3.5-SNAPSHOT + 1.3.5-RC1 Morf - H2 diff --git a/morf-integration-test/pom.xml b/morf-integration-test/pom.xml index 4391c8a60..3903944cf 100755 --- a/morf-integration-test/pom.xml +++ b/morf-integration-test/pom.xml @@ -4,7 +4,7 @@ org.alfasoftware morf-parent - 1.3.5-SNAPSHOT + 1.3.5-RC1 Morf - Integration Test diff --git a/morf-mysql/pom.xml b/morf-mysql/pom.xml index c9f11ef2f..c31978af9 100755 --- a/morf-mysql/pom.xml +++ b/morf-mysql/pom.xml @@ -4,7 +4,7 @@ org.alfasoftware morf-parent - 1.3.5-SNAPSHOT + 1.3.5-RC1 Morf - MySQL diff --git a/morf-nuodb/pom.xml b/morf-nuodb/pom.xml index 35d5a5ea5..13bb59e19 100755 --- a/morf-nuodb/pom.xml +++ b/morf-nuodb/pom.xml @@ -4,7 +4,7 @@ org.alfasoftware morf-parent - 1.3.5-SNAPSHOT + 1.3.5-RC1 Morf - NuoDB diff --git a/morf-oracle/pom.xml b/morf-oracle/pom.xml index d166fa4e1..6ebb6a3a7 100755 --- a/morf-oracle/pom.xml +++ b/morf-oracle/pom.xml @@ -4,7 +4,7 @@ org.alfasoftware morf-parent - 1.3.5-SNAPSHOT + 1.3.5-RC1 Morf - Oracle diff --git a/morf-postgresql/pom.xml b/morf-postgresql/pom.xml index be7241cb0..c2c6aca58 100644 --- a/morf-postgresql/pom.xml +++ b/morf-postgresql/pom.xml @@ -4,7 +4,7 @@ org.alfasoftware morf-parent - 1.3.5-SNAPSHOT + 1.3.5-RC1 Morf - PostgreSQL diff --git a/morf-sqlserver/pom.xml b/morf-sqlserver/pom.xml index b86d4cc8e..ba07cc168 100755 --- a/morf-sqlserver/pom.xml +++ b/morf-sqlserver/pom.xml @@ -4,7 +4,7 @@ org.alfasoftware morf-parent - 1.3.5-SNAPSHOT + 1.3.5-RC1 Morf - SQL Server diff --git a/morf-testsupport/pom.xml b/morf-testsupport/pom.xml index c3893e180..fc311dce6 100755 --- a/morf-testsupport/pom.xml +++ b/morf-testsupport/pom.xml @@ -4,7 +4,7 @@ org.alfasoftware morf-parent - 1.3.5-SNAPSHOT + 1.3.5-RC1 Morf - Test Support diff --git a/pom.xml b/pom.xml index 9b3af6588..c1b240516 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ org.alfasoftware morf-parent - 1.3.5-SNAPSHOT + 1.3.5-RC1 pom Morf @@ -505,7 +505,7 @@ scm:git:https://github.com/alfasoftware/morf.git scm:git:git@github.com:alfasoftware/morf.git https://github.com/alfasoftware/morf - HEAD + 1.3.5-RC1 From f7ac4630587ada20fb2b5e8d8bf4fbdf3a385f92 Mon Sep 17 00:00:00 2001 From: Anuj Dodhia Date: Wed, 3 Mar 2021 21:05:39 +0000 Subject: [PATCH 2/9] [maven-release-plugin] prepare for next development iteration --- morf-core/pom.xml | 2 +- morf-excel/pom.xml | 2 +- morf-h2/pom.xml | 2 +- morf-integration-test/pom.xml | 2 +- morf-mysql/pom.xml | 2 +- morf-nuodb/pom.xml | 2 +- morf-oracle/pom.xml | 2 +- morf-postgresql/pom.xml | 2 +- morf-sqlserver/pom.xml | 2 +- morf-testsupport/pom.xml | 2 +- pom.xml | 4 ++-- 11 files changed, 12 insertions(+), 12 deletions(-) diff --git a/morf-core/pom.xml b/morf-core/pom.xml index 63abe821b..b2d5b183c 100755 --- a/morf-core/pom.xml +++ b/morf-core/pom.xml @@ -4,7 +4,7 @@ org.alfasoftware morf-parent - 1.3.5-RC1 + 1.3.6-SNAPSHOT Morf - Core diff --git a/morf-excel/pom.xml b/morf-excel/pom.xml index a60a021ff..335b78d17 100755 --- a/morf-excel/pom.xml +++ b/morf-excel/pom.xml @@ -4,7 +4,7 @@ org.alfasoftware morf-parent - 1.3.5-RC1 + 1.3.6-SNAPSHOT Morf - Excel diff --git a/morf-h2/pom.xml b/morf-h2/pom.xml index 74c707709..0692f1fee 100755 --- a/morf-h2/pom.xml +++ b/morf-h2/pom.xml @@ -4,7 +4,7 @@ org.alfasoftware morf-parent - 1.3.5-RC1 + 1.3.6-SNAPSHOT Morf - H2 diff --git a/morf-integration-test/pom.xml b/morf-integration-test/pom.xml index 3903944cf..e7c35c6f1 100755 --- a/morf-integration-test/pom.xml +++ b/morf-integration-test/pom.xml @@ -4,7 +4,7 @@ org.alfasoftware morf-parent - 1.3.5-RC1 + 1.3.6-SNAPSHOT Morf - Integration Test diff --git a/morf-mysql/pom.xml b/morf-mysql/pom.xml index c31978af9..16d980e2c 100755 --- a/morf-mysql/pom.xml +++ b/morf-mysql/pom.xml @@ -4,7 +4,7 @@ org.alfasoftware morf-parent - 1.3.5-RC1 + 1.3.6-SNAPSHOT Morf - MySQL diff --git a/morf-nuodb/pom.xml b/morf-nuodb/pom.xml index 13bb59e19..d5e52cd30 100755 --- a/morf-nuodb/pom.xml +++ b/morf-nuodb/pom.xml @@ -4,7 +4,7 @@ org.alfasoftware morf-parent - 1.3.5-RC1 + 1.3.6-SNAPSHOT Morf - NuoDB diff --git a/morf-oracle/pom.xml b/morf-oracle/pom.xml index 6ebb6a3a7..0750638a6 100755 --- a/morf-oracle/pom.xml +++ b/morf-oracle/pom.xml @@ -4,7 +4,7 @@ org.alfasoftware morf-parent - 1.3.5-RC1 + 1.3.6-SNAPSHOT Morf - Oracle diff --git a/morf-postgresql/pom.xml b/morf-postgresql/pom.xml index c2c6aca58..8738d49db 100644 --- a/morf-postgresql/pom.xml +++ b/morf-postgresql/pom.xml @@ -4,7 +4,7 @@ org.alfasoftware morf-parent - 1.3.5-RC1 + 1.3.6-SNAPSHOT Morf - PostgreSQL diff --git a/morf-sqlserver/pom.xml b/morf-sqlserver/pom.xml index ba07cc168..d96377852 100755 --- a/morf-sqlserver/pom.xml +++ b/morf-sqlserver/pom.xml @@ -4,7 +4,7 @@ org.alfasoftware morf-parent - 1.3.5-RC1 + 1.3.6-SNAPSHOT Morf - SQL Server diff --git a/morf-testsupport/pom.xml b/morf-testsupport/pom.xml index fc311dce6..54a538d04 100755 --- a/morf-testsupport/pom.xml +++ b/morf-testsupport/pom.xml @@ -4,7 +4,7 @@ org.alfasoftware morf-parent - 1.3.5-RC1 + 1.3.6-SNAPSHOT Morf - Test Support diff --git a/pom.xml b/pom.xml index c1b240516..26e5bd519 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ org.alfasoftware morf-parent - 1.3.5-RC1 + 1.3.6-SNAPSHOT pom Morf @@ -505,7 +505,7 @@ scm:git:https://github.com/alfasoftware/morf.git scm:git:git@github.com:alfasoftware/morf.git https://github.com/alfasoftware/morf - 1.3.5-RC1 + HEAD From 4872e4e033a13319f1f0f8ce1c8ad1ff17746550 Mon Sep 17 00:00:00 2001 From: wnicholson Date: Tue, 9 Mar 2021 14:56:12 +0000 Subject: [PATCH 3/9] Migrated to travis-ci.com - update the badge --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 4fd35f862..6e8479cfd 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # ![Alfa Morf](https://github.com/alfasoftware/morf/wiki/morf.png) [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0) -[![Build Status](https://travis-ci.org/alfasoftware/morf.svg?branch=master)](https://travis-ci.org/alfasoftware/morf) +[![Build Status](https://travis-ci.com/alfasoftware/morf.svg?branch=master)](https://travis-ci.com/alfasoftware/morf) [![Quality Gate](https://sonarcloud.io/api/project_badges/measure?project=org.alfasoftware%3Amorf-parent&metric=alert_status)](https://sonarcloud.io/dashboard/index/org.alfasoftware:morf-parent) Morf is a library for cross-platform evolutionary relational database mechanics, database access and database imaging/cloning. It has been developed over many years at Alfa and is used to manage all of our RDBMS-backed applications. From e523dfb2d130e540b8009fedcaf824f9cabc33d7 Mon Sep 17 00:00:00 2001 From: Dan Lindsay Date: Mon, 15 Mar 2021 16:49:52 +0000 Subject: [PATCH 4/9] postgres-tempTableSchema-fix - Postgres keeps temporary tables in their own special schema. Fix issue whereby schemas are specified when commenting on temporary tables. --- .../morf/jdbc/postgresql/PostgreSQLDialect.java | 16 ++++++++++++---- .../jdbc/postgresql/TestPostgreSQLDialect.java | 6 +++--- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/morf-postgresql/src/main/java/org/alfasoftware/morf/jdbc/postgresql/PostgreSQLDialect.java b/morf-postgresql/src/main/java/org/alfasoftware/morf/jdbc/postgresql/PostgreSQLDialect.java index 5c7abb1fb..1489775fa 100644 --- a/morf-postgresql/src/main/java/org/alfasoftware/morf/jdbc/postgresql/PostgreSQLDialect.java +++ b/morf-postgresql/src/main/java/org/alfasoftware/morf/jdbc/postgresql/PostgreSQLDialect.java @@ -207,14 +207,22 @@ protected Collection internalTableDeploymentStatements(Table table) { return ImmutableList.builder() .addAll(preStatements) .add(createTableStatement.toString()) - .add(addTableComment(table.getName())) + .add(addTableComment(table)) .addAll(postStatements) .build(); } - private String addTableComment(String tableName) { - return "COMMENT ON TABLE " + schemaNamePrefix() + tableName + " IS 'REALNAME:[" + tableName + "]'"; + private String addTableComment(Table table) { + StringBuilder sqlBuilder = new StringBuilder("COMMENT ON TABLE "); + if (!table.isTemporary()) { + sqlBuilder.append(schemaNamePrefix()); + } + return sqlBuilder.append(table.getName()) + .append(" IS 'REALNAME:[") + .append(table.getName()) + .append("]'") + .toString(); } @@ -234,7 +242,7 @@ public Collection renameTableStatements(Table from, Table to) { .addAll(renameTable) .addAll(renamePk) .addAll(renameSeq) - .add(addTableComment(to.getName())) + .add(addTableComment(to)) .build(); } diff --git a/morf-postgresql/src/test/java/org/alfasoftware/morf/jdbc/postgresql/TestPostgreSQLDialect.java b/morf-postgresql/src/test/java/org/alfasoftware/morf/jdbc/postgresql/TestPostgreSQLDialect.java index d62bd7004..22a2c38f6 100644 --- a/morf-postgresql/src/test/java/org/alfasoftware/morf/jdbc/postgresql/TestPostgreSQLDialect.java +++ b/morf-postgresql/src/test/java/org/alfasoftware/morf/jdbc/postgresql/TestPostgreSQLDialect.java @@ -125,7 +125,7 @@ protected List expectedCreateTemporaryTableStatements() { return Arrays .asList( "CREATE TEMP TABLE TempTest (id NUMERIC(19) NOT NULL, version INTEGER DEFAULT 0, stringField VARCHAR(3) COLLATE \"POSIX\", intField INTEGER, floatField DECIMAL(13,2) NOT NULL, dateField DATE, booleanField BOOLEAN, charField VARCHAR(1) COLLATE \"POSIX\", blobField BYTEA, bigIntegerField NUMERIC(19) DEFAULT 12345, clobField TEXT, CONSTRAINT TempTest_PK PRIMARY KEY(id))", - "COMMENT ON TABLE testschema.TempTest IS 'REALNAME:[TempTest]'", + "COMMENT ON TABLE TempTest IS 'REALNAME:[TempTest]'", "COMMENT ON COLUMN TempTest.id IS 'REALNAME:[id]/TYPE:[BIG_INTEGER]'", "COMMENT ON COLUMN TempTest.version IS 'REALNAME:[version]/TYPE:[INTEGER]'", "COMMENT ON COLUMN TempTest.stringField IS 'REALNAME:[stringField]/TYPE:[STRING]'", @@ -142,14 +142,14 @@ protected List expectedCreateTemporaryTableStatements() { "CREATE INDEX TempTest_1 ON TempTest (intField,floatField)", "COMMENT ON INDEX TempTest_1 IS 'REALNAME:[TempTest_1]'", "CREATE TEMP TABLE TempAlternate (id NUMERIC(19) NOT NULL, version INTEGER DEFAULT 0, stringField VARCHAR(3) COLLATE \"POSIX\", CONSTRAINT TempAlternate_PK PRIMARY KEY(id))", - "COMMENT ON TABLE testschema.TempAlternate IS 'REALNAME:[TempAlternate]'", + "COMMENT ON TABLE TempAlternate IS 'REALNAME:[TempAlternate]'", "COMMENT ON COLUMN TempAlternate.id IS 'REALNAME:[id]/TYPE:[BIG_INTEGER]'", "COMMENT ON COLUMN TempAlternate.version IS 'REALNAME:[version]/TYPE:[INTEGER]'", "COMMENT ON COLUMN TempAlternate.stringField IS 'REALNAME:[stringField]/TYPE:[STRING]'", "CREATE INDEX TempAlternate_1 ON TempAlternate (stringField)", "COMMENT ON INDEX TempAlternate_1 IS 'REALNAME:[TempAlternate_1]'", "CREATE TEMP TABLE TempNonNull (id NUMERIC(19) NOT NULL, version INTEGER DEFAULT 0, stringField VARCHAR(3) COLLATE \"POSIX\" NOT NULL, intField DECIMAL(8,0) NOT NULL, booleanField BOOLEAN NOT NULL, dateField DATE NOT NULL, blobField BYTEA NOT NULL, CONSTRAINT TempNonNull_PK PRIMARY KEY(id))", - "COMMENT ON TABLE testschema.TempNonNull IS 'REALNAME:[TempNonNull]'", + "COMMENT ON TABLE TempNonNull IS 'REALNAME:[TempNonNull]'", "COMMENT ON COLUMN TempNonNull.id IS 'REALNAME:[id]/TYPE:[BIG_INTEGER]'", "COMMENT ON COLUMN TempNonNull.version IS 'REALNAME:[version]/TYPE:[INTEGER]'", "COMMENT ON COLUMN TempNonNull.stringField IS 'REALNAME:[stringField]/TYPE:[STRING]'", From 3e7ad5291cba946f7915928e61ca05de34d622d0 Mon Sep 17 00:00:00 2001 From: Dan Lindsay Date: Tue, 16 Mar 2021 13:49:23 +0000 Subject: [PATCH 5/9] postgres-tempTableSchema-fix - Remove use of StringBuilder --- .../morf/jdbc/postgresql/PostgreSQLDialect.java | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/morf-postgresql/src/main/java/org/alfasoftware/morf/jdbc/postgresql/PostgreSQLDialect.java b/morf-postgresql/src/main/java/org/alfasoftware/morf/jdbc/postgresql/PostgreSQLDialect.java index 1489775fa..3b8312631 100644 --- a/morf-postgresql/src/main/java/org/alfasoftware/morf/jdbc/postgresql/PostgreSQLDialect.java +++ b/morf-postgresql/src/main/java/org/alfasoftware/morf/jdbc/postgresql/PostgreSQLDialect.java @@ -214,15 +214,7 @@ protected Collection internalTableDeploymentStatements(Table table) { private String addTableComment(Table table) { - StringBuilder sqlBuilder = new StringBuilder("COMMENT ON TABLE "); - if (!table.isTemporary()) { - sqlBuilder.append(schemaNamePrefix()); - } - return sqlBuilder.append(table.getName()) - .append(" IS 'REALNAME:[") - .append(table.getName()) - .append("]'") - .toString(); + return "COMMENT ON TABLE " + schemaNamePrefix(table) + table.getName() + " IS 'REALNAME:[" + table.getName() + "]'"; } From bd8bc7007827874c79d9ce8392ae799d0d45716b Mon Sep 17 00:00:00 2001 From: jsimlo Date: Tue, 16 Mar 2021 17:40:23 +0000 Subject: [PATCH 6/9] PostgreSQL: Avoiding ERROR: current transaction is aborted, commands ignored until end of transaction block. --- .../morf/dataset/TableLoader.java | 43 +++++++++++++++++-- 1 file changed, 40 insertions(+), 3 deletions(-) diff --git a/morf-core/src/main/java/org/alfasoftware/morf/dataset/TableLoader.java b/morf-core/src/main/java/org/alfasoftware/morf/dataset/TableLoader.java index 6d7feefc9..2906466e7 100755 --- a/morf-core/src/main/java/org/alfasoftware/morf/dataset/TableLoader.java +++ b/morf-core/src/main/java/org/alfasoftware/morf/dataset/TableLoader.java @@ -21,6 +21,7 @@ import java.sql.Connection; import java.sql.PreparedStatement; +import java.sql.SQLException; import org.alfasoftware.morf.dataset.TableLoaderBuilder.TableLoaderBuilderImpl; import org.alfasoftware.morf.jdbc.RuntimeSqlException; @@ -89,6 +90,13 @@ public static TableLoaderBuilder builder() { this.insertingUnderAutonumLimit = insertingUnderAutonumLimit; this.truncateBeforeLoad = truncateBeforeLoad; this.batchSize = batchSize; + + if (truncateBeforeLoad && !explicitCommit) { + // This is because PostgreSQL needs to be able to commit/rollback, for TRUNCATE fallback to DELETE to work + // It could potentially be relaxed, if the DELETE fallback after a failed TRUNCATE is not needed. + // It also could potentially be relaxed, if running on PostgreSQL is of no concern to the caller. + throw new UnsupportedOperationException("Cannot TRUNCATE before load without permission to commit explicitly"); + } } @@ -100,7 +108,7 @@ public static TableLoaderBuilder builder() { public void load(final Iterable records) { if (truncateBeforeLoad) { - truncate(table, connection); + truncate(table); } insertOrMergeRecords(records); @@ -112,14 +120,16 @@ public void load(final Iterable records) { * * @param table */ - private void truncate(Table table, Connection connection) { + private void truncate(Table table) { // Get our own table definition based on the name to avoid case sensitivity bugs on some database vendors log.debug("Clearing table [" + table.getName() + "]"); // Try to use a truncate try { + runRecoverably(() -> { sqlExecutor.execute(sqlDialect.truncateTableStatements(table), connection); - } catch (RuntimeSqlException e) { + }); + } catch (SQLException | RuntimeSqlException e) { // If that has failed try to use a delete log.debug("Failed to truncate table, attempting a delete", e); sqlExecutor.execute(sqlDialect.deleteAllFromTableStatements(table), connection); @@ -127,6 +137,33 @@ private void truncate(Table table, Connection connection) { } + /** + * PostgreSQL does not like failing commands, and marks connections as "dirty" after errors: + * ERROR: current transaction is aborted, commands ignored until end of transaction block. + * + *

To recover a connection, one has to issue a rollback.

+ * + * @param runnable + */ + private void runRecoverably(Runnable runnable) throws SQLException { + // make sure we commit if we can + if (explicitCommit) { + connection.commit(); + } + + try { + runnable.run(); + } + catch (Exception e) { + // make sure we rollback if we can + if (explicitCommit) { + connection.rollback(); + } + throw e; + } + } + + /** * Insert the records into the database using a {@link PreparedStatement}. * From 7be9a4fe3aba1a5b49fac530b5a4616588d79fad Mon Sep 17 00:00:00 2001 From: jsimlo Date: Wed, 17 Mar 2021 19:08:50 +0000 Subject: [PATCH 7/9] Formatting. --- .../java/org/alfasoftware/morf/dataset/TableLoader.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/morf-core/src/main/java/org/alfasoftware/morf/dataset/TableLoader.java b/morf-core/src/main/java/org/alfasoftware/morf/dataset/TableLoader.java index 2906466e7..22f86f976 100755 --- a/morf-core/src/main/java/org/alfasoftware/morf/dataset/TableLoader.java +++ b/morf-core/src/main/java/org/alfasoftware/morf/dataset/TableLoader.java @@ -126,9 +126,9 @@ private void truncate(Table table) { // Try to use a truncate try { - runRecoverably(() -> { - sqlExecutor.execute(sqlDialect.truncateTableStatements(table), connection); - }); + runRecoverably(() -> + sqlExecutor.execute(sqlDialect.truncateTableStatements(table), connection) + ); } catch (SQLException | RuntimeSqlException e) { // If that has failed try to use a delete log.debug("Failed to truncate table, attempting a delete", e); From 8272c77233c59f92bffa02149cef512d8c210cdd Mon Sep 17 00:00:00 2001 From: Anuj Dodhia Date: Thu, 18 Mar 2021 11:12:28 +0000 Subject: [PATCH 8/9] [maven-release-plugin] prepare release 1.3.6 --- morf-core/pom.xml | 2 +- morf-excel/pom.xml | 2 +- morf-h2/pom.xml | 2 +- morf-integration-test/pom.xml | 2 +- morf-mysql/pom.xml | 2 +- morf-nuodb/pom.xml | 2 +- morf-oracle/pom.xml | 2 +- morf-postgresql/pom.xml | 2 +- morf-sqlserver/pom.xml | 2 +- morf-testsupport/pom.xml | 2 +- pom.xml | 4 ++-- 11 files changed, 12 insertions(+), 12 deletions(-) diff --git a/morf-core/pom.xml b/morf-core/pom.xml index b2d5b183c..cad6d7f03 100755 --- a/morf-core/pom.xml +++ b/morf-core/pom.xml @@ -4,7 +4,7 @@ org.alfasoftware morf-parent - 1.3.6-SNAPSHOT + 1.3.6 Morf - Core diff --git a/morf-excel/pom.xml b/morf-excel/pom.xml index 335b78d17..2693c1290 100755 --- a/morf-excel/pom.xml +++ b/morf-excel/pom.xml @@ -4,7 +4,7 @@ org.alfasoftware morf-parent - 1.3.6-SNAPSHOT + 1.3.6 Morf - Excel diff --git a/morf-h2/pom.xml b/morf-h2/pom.xml index 0692f1fee..bbd32cac4 100755 --- a/morf-h2/pom.xml +++ b/morf-h2/pom.xml @@ -4,7 +4,7 @@ org.alfasoftware morf-parent - 1.3.6-SNAPSHOT + 1.3.6 Morf - H2 diff --git a/morf-integration-test/pom.xml b/morf-integration-test/pom.xml index e7c35c6f1..19a7f285f 100755 --- a/morf-integration-test/pom.xml +++ b/morf-integration-test/pom.xml @@ -4,7 +4,7 @@ org.alfasoftware morf-parent - 1.3.6-SNAPSHOT + 1.3.6 Morf - Integration Test diff --git a/morf-mysql/pom.xml b/morf-mysql/pom.xml index 16d980e2c..47078c5af 100755 --- a/morf-mysql/pom.xml +++ b/morf-mysql/pom.xml @@ -4,7 +4,7 @@ org.alfasoftware morf-parent - 1.3.6-SNAPSHOT + 1.3.6 Morf - MySQL diff --git a/morf-nuodb/pom.xml b/morf-nuodb/pom.xml index d5e52cd30..d68f33b55 100755 --- a/morf-nuodb/pom.xml +++ b/morf-nuodb/pom.xml @@ -4,7 +4,7 @@ org.alfasoftware morf-parent - 1.3.6-SNAPSHOT + 1.3.6 Morf - NuoDB diff --git a/morf-oracle/pom.xml b/morf-oracle/pom.xml index 0750638a6..58b800465 100755 --- a/morf-oracle/pom.xml +++ b/morf-oracle/pom.xml @@ -4,7 +4,7 @@ org.alfasoftware morf-parent - 1.3.6-SNAPSHOT + 1.3.6 Morf - Oracle diff --git a/morf-postgresql/pom.xml b/morf-postgresql/pom.xml index 8738d49db..b1ff9b36e 100644 --- a/morf-postgresql/pom.xml +++ b/morf-postgresql/pom.xml @@ -4,7 +4,7 @@ org.alfasoftware morf-parent - 1.3.6-SNAPSHOT + 1.3.6 Morf - PostgreSQL diff --git a/morf-sqlserver/pom.xml b/morf-sqlserver/pom.xml index d96377852..7b65cac89 100755 --- a/morf-sqlserver/pom.xml +++ b/morf-sqlserver/pom.xml @@ -4,7 +4,7 @@ org.alfasoftware morf-parent - 1.3.6-SNAPSHOT + 1.3.6 Morf - SQL Server diff --git a/morf-testsupport/pom.xml b/morf-testsupport/pom.xml index 54a538d04..bc7e14cdf 100755 --- a/morf-testsupport/pom.xml +++ b/morf-testsupport/pom.xml @@ -4,7 +4,7 @@ org.alfasoftware morf-parent - 1.3.6-SNAPSHOT + 1.3.6 Morf - Test Support diff --git a/pom.xml b/pom.xml index 26e5bd519..641f31134 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ org.alfasoftware morf-parent - 1.3.6-SNAPSHOT + 1.3.6 pom Morf @@ -505,7 +505,7 @@ scm:git:https://github.com/alfasoftware/morf.git scm:git:git@github.com:alfasoftware/morf.git https://github.com/alfasoftware/morf - HEAD + 1.3.6 From d49862dd3cc9969b9240b77ae4d1ab3c8126f81f Mon Sep 17 00:00:00 2001 From: Anuj Dodhia Date: Thu, 18 Mar 2021 11:12:30 +0000 Subject: [PATCH 9/9] [maven-release-plugin] prepare for next development iteration --- morf-core/pom.xml | 2 +- morf-excel/pom.xml | 2 +- morf-h2/pom.xml | 2 +- morf-integration-test/pom.xml | 2 +- morf-mysql/pom.xml | 2 +- morf-nuodb/pom.xml | 2 +- morf-oracle/pom.xml | 2 +- morf-postgresql/pom.xml | 2 +- morf-sqlserver/pom.xml | 2 +- morf-testsupport/pom.xml | 2 +- pom.xml | 4 ++-- 11 files changed, 12 insertions(+), 12 deletions(-) diff --git a/morf-core/pom.xml b/morf-core/pom.xml index cad6d7f03..681d75f4b 100755 --- a/morf-core/pom.xml +++ b/morf-core/pom.xml @@ -4,7 +4,7 @@ org.alfasoftware morf-parent - 1.3.6 + 1.3.7-SNAPSHOT Morf - Core diff --git a/morf-excel/pom.xml b/morf-excel/pom.xml index 2693c1290..7ba3bf9ee 100755 --- a/morf-excel/pom.xml +++ b/morf-excel/pom.xml @@ -4,7 +4,7 @@ org.alfasoftware morf-parent - 1.3.6 + 1.3.7-SNAPSHOT Morf - Excel diff --git a/morf-h2/pom.xml b/morf-h2/pom.xml index bbd32cac4..8c3b28ac0 100755 --- a/morf-h2/pom.xml +++ b/morf-h2/pom.xml @@ -4,7 +4,7 @@ org.alfasoftware morf-parent - 1.3.6 + 1.3.7-SNAPSHOT Morf - H2 diff --git a/morf-integration-test/pom.xml b/morf-integration-test/pom.xml index 19a7f285f..d8c88d72e 100755 --- a/morf-integration-test/pom.xml +++ b/morf-integration-test/pom.xml @@ -4,7 +4,7 @@ org.alfasoftware morf-parent - 1.3.6 + 1.3.7-SNAPSHOT Morf - Integration Test diff --git a/morf-mysql/pom.xml b/morf-mysql/pom.xml index 47078c5af..bfabee85d 100755 --- a/morf-mysql/pom.xml +++ b/morf-mysql/pom.xml @@ -4,7 +4,7 @@ org.alfasoftware morf-parent - 1.3.6 + 1.3.7-SNAPSHOT Morf - MySQL diff --git a/morf-nuodb/pom.xml b/morf-nuodb/pom.xml index d68f33b55..5a451f7d3 100755 --- a/morf-nuodb/pom.xml +++ b/morf-nuodb/pom.xml @@ -4,7 +4,7 @@ org.alfasoftware morf-parent - 1.3.6 + 1.3.7-SNAPSHOT Morf - NuoDB diff --git a/morf-oracle/pom.xml b/morf-oracle/pom.xml index 58b800465..760c7ebb7 100755 --- a/morf-oracle/pom.xml +++ b/morf-oracle/pom.xml @@ -4,7 +4,7 @@ org.alfasoftware morf-parent - 1.3.6 + 1.3.7-SNAPSHOT Morf - Oracle diff --git a/morf-postgresql/pom.xml b/morf-postgresql/pom.xml index b1ff9b36e..ae8708722 100644 --- a/morf-postgresql/pom.xml +++ b/morf-postgresql/pom.xml @@ -4,7 +4,7 @@ org.alfasoftware morf-parent - 1.3.6 + 1.3.7-SNAPSHOT Morf - PostgreSQL diff --git a/morf-sqlserver/pom.xml b/morf-sqlserver/pom.xml index 7b65cac89..525bee37b 100755 --- a/morf-sqlserver/pom.xml +++ b/morf-sqlserver/pom.xml @@ -4,7 +4,7 @@ org.alfasoftware morf-parent - 1.3.6 + 1.3.7-SNAPSHOT Morf - SQL Server diff --git a/morf-testsupport/pom.xml b/morf-testsupport/pom.xml index bc7e14cdf..68fe99d00 100755 --- a/morf-testsupport/pom.xml +++ b/morf-testsupport/pom.xml @@ -4,7 +4,7 @@ org.alfasoftware morf-parent - 1.3.6 + 1.3.7-SNAPSHOT Morf - Test Support diff --git a/pom.xml b/pom.xml index 641f31134..510505154 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ org.alfasoftware morf-parent - 1.3.6 + 1.3.7-SNAPSHOT pom Morf @@ -505,7 +505,7 @@ scm:git:https://github.com/alfasoftware/morf.git scm:git:git@github.com:alfasoftware/morf.git https://github.com/alfasoftware/morf - 1.3.6 + HEAD