This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository topia. See https://gitlab.nuiton.org/nuiton/topia.git commit 358254082d57d0f4e440f13dd639cf129344e52b Author: Eric Chatellier <chatellier@codelutin.com> Date: Thu Aug 31 10:50:42 2017 +0200 fixes #653: Update libs fixes #650: Update to hibernate 5.2.10 --- pom.xml | 10 +--------- topia-it/pom.xml | 3 +-- .../org/nuiton/topia/it/legacy/persistence/NaturalIdTest.java | 5 +++-- topia-junit/pom.xml | 2 +- topia-persistence/pom.xml | 8 +------- .../topia/persistence/jdbc/JdbcConfigurationBuilder.java | 2 -- .../java/org/nuiton/topia/persistence/util/EntityOperator.java | 1 - topia-service-csv/pom.xml | 2 +- topia-service-flyway/pom.xml | 2 +- .../topia/flyway/TopiaServiceFlywayInitOnCreateSchemaTest.java | 1 - topia-service-liquibase/pom.xml | 2 +- topia-service-migration/pom.xml | 2 +- topia-service-replication/pom.xml | 2 +- .../org/nuiton/topia/replication/model/ReplicationModel.java | 2 -- topia-templates/pom.xml | 7 +------ .../java/org/nuiton/topia/templates/TopiaMetaTransformer.java | 1 - .../org/nuiton/topia/templates/TopiaCoreTagValuesTest.java | 1 - 17 files changed, 13 insertions(+), 40 deletions(-) diff --git a/pom.xml b/pom.xml index 0aacd123..90180050 100644 --- a/pom.xml +++ b/pom.xml @@ -225,8 +225,7 @@ <h2Version>1.3.176</h2Version> <hamcrestVersion>1.3</hamcrestVersion> - <hibernateVersion>5.1.8.Final</hibernateVersion> - <javassistVersion>3.20.0-GA</javassistVersion> + <hibernateVersion>5.2.10.Final</hibernateVersion> <junitVersion>4.12</junitVersion> <liquibaseVersion>3.5.3</liquibaseVersion> <log4jVersion>1.2.17</log4jVersion> @@ -333,13 +332,6 @@ </dependency> <dependency> - <groupId>org.javassist</groupId> - <artifactId>javassist</artifactId> - <version>${javassistVersion}</version> - <scope>runtime</scope> - </dependency> - - <dependency> <groupId>org.flywaydb</groupId> <artifactId>flyway-core</artifactId> <version>${flywayVersion}</version> diff --git a/topia-it/pom.xml b/topia-it/pom.xml index 7795c128..5ad4d59a 100644 --- a/topia-it/pom.xml +++ b/topia-it/pom.xml @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.2.2-SNAPSHOT</version> + <version>3.3-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> @@ -82,7 +82,6 @@ <dependency> <groupId>org.hibernate.javax.persistence</groupId> <artifactId>hibernate-jpa-2.1-api</artifactId> - <scope>runtime</scope> </dependency> <dependency> diff --git a/topia-it/src/test/java/org/nuiton/topia/it/legacy/persistence/NaturalIdTest.java b/topia-it/src/test/java/org/nuiton/topia/it/legacy/persistence/NaturalIdTest.java index 5edb1e5e..34fae2a3 100644 --- a/topia-it/src/test/java/org/nuiton/topia/it/legacy/persistence/NaturalIdTest.java +++ b/topia-it/src/test/java/org/nuiton/topia/it/legacy/persistence/NaturalIdTest.java @@ -26,7 +26,6 @@ package org.nuiton.topia.it.legacy.persistence; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.hibernate.HibernateException; import org.hibernate.PropertyValueException; import org.junit.Assert; import org.junit.Rule; @@ -38,6 +37,8 @@ import org.nuiton.topia.it.legacy.topiatest.NaturalizedEntity; import org.nuiton.topia.it.legacy.topiatest.NaturalizedEntityTopiaDao; import org.nuiton.topia.persistence.TopiaException; +import javax.persistence.PersistenceException; + /** * NaturalIdTest * @@ -116,7 +117,7 @@ public class NaturalIdTest { entity.setNaturalIdNotNull(8); persistenceContext.commit(); } catch (TopiaException eee) { - Assert.assertEquals(HibernateException.class, eee.getCause().getClass()); + Assert.assertEquals(PersistenceException.class, eee.getCause().getClass()); } } diff --git a/topia-junit/pom.xml b/topia-junit/pom.xml index 9f1568d2..371f6a03 100644 --- a/topia-junit/pom.xml +++ b/topia-junit/pom.xml @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.2.2-SNAPSHOT</version> + <version>3.3-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-persistence/pom.xml b/topia-persistence/pom.xml index d50bd438..7543bc74 100644 --- a/topia-persistence/pom.xml +++ b/topia-persistence/pom.xml @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.2.2-SNAPSHOT</version> + <version>3.3-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> @@ -94,12 +94,6 @@ <dependency> <groupId>org.hibernate.javax.persistence</groupId> <artifactId>hibernate-jpa-2.1-api</artifactId> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>org.javassist</groupId> - <artifactId>javassist</artifactId> </dependency> <dependency> diff --git a/topia-persistence/src/main/java/org/nuiton/topia/persistence/jdbc/JdbcConfigurationBuilder.java b/topia-persistence/src/main/java/org/nuiton/topia/persistence/jdbc/JdbcConfigurationBuilder.java index 3d704748..545c71ba 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/persistence/jdbc/JdbcConfigurationBuilder.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/persistence/jdbc/JdbcConfigurationBuilder.java @@ -29,11 +29,9 @@ import com.google.common.io.Files; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.topia.persistence.TopiaException; import org.nuiton.util.FileUtil; import java.io.File; -import java.io.IOException; import java.sql.Driver; /** diff --git a/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/EntityOperator.java b/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/EntityOperator.java index 184e2660..740a2fc9 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/EntityOperator.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/EntityOperator.java @@ -29,7 +29,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.topia.persistence.TopiaEntityEnum; -import org.nuiton.util.ObjectUtil; import java.beans.BeanInfo; import java.beans.IntrospectionException; diff --git a/topia-service-csv/pom.xml b/topia-service-csv/pom.xml index 137ecdb3..b69576a7 100644 --- a/topia-service-csv/pom.xml +++ b/topia-service-csv/pom.xml @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.2.2-SNAPSHOT</version> + <version>3.3-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-flyway/pom.xml b/topia-service-flyway/pom.xml index 7b4b18eb..613894f2 100644 --- a/topia-service-flyway/pom.xml +++ b/topia-service-flyway/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.2.2-SNAPSHOT</version> + <version>3.3-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-flyway/src/test/java/org/nuiton/topia/flyway/TopiaServiceFlywayInitOnCreateSchemaTest.java b/topia-service-flyway/src/test/java/org/nuiton/topia/flyway/TopiaServiceFlywayInitOnCreateSchemaTest.java index f7009419..1115aa83 100644 --- a/topia-service-flyway/src/test/java/org/nuiton/topia/flyway/TopiaServiceFlywayInitOnCreateSchemaTest.java +++ b/topia-service-flyway/src/test/java/org/nuiton/topia/flyway/TopiaServiceFlywayInitOnCreateSchemaTest.java @@ -30,7 +30,6 @@ import org.junit.Ignore; import org.junit.Test; import org.nuiton.topia.it.mapping.TopiaItMappingTopiaApplicationContext; import org.nuiton.topia.persistence.BeanTopiaConfiguration; -import org.nuiton.topia.persistence.TopiaConfiguration; import org.nuiton.topia.persistence.TopiaConfigurationBuilder; import org.nuiton.topia.persistence.jdbc.JdbcH2Helper; diff --git a/topia-service-liquibase/pom.xml b/topia-service-liquibase/pom.xml index 835b87f4..776007a4 100644 --- a/topia-service-liquibase/pom.xml +++ b/topia-service-liquibase/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.2.2-SNAPSHOT</version> + <version>3.3-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-migration/pom.xml b/topia-service-migration/pom.xml index 758e3495..25abb73d 100644 --- a/topia-service-migration/pom.xml +++ b/topia-service-migration/pom.xml @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.2.2-SNAPSHOT</version> + <version>3.3-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-replication/pom.xml b/topia-service-replication/pom.xml index 3c741ec6..c61129c3 100644 --- a/topia-service-replication/pom.xml +++ b/topia-service-replication/pom.xml @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.2.2-SNAPSHOT</version> + <version>3.3-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-replication/src/main/java/org/nuiton/topia/replication/model/ReplicationModel.java b/topia-service-replication/src/main/java/org/nuiton/topia/replication/model/ReplicationModel.java index 82cbefed..29c5726a 100644 --- a/topia-service-replication/src/main/java/org/nuiton/topia/replication/model/ReplicationModel.java +++ b/topia-service-replication/src/main/java/org/nuiton/topia/replication/model/ReplicationModel.java @@ -38,10 +38,8 @@ import org.nuiton.topia.replication.operation.AttachLink; import org.nuiton.topia.replication.operation.DettachAssociation; import org.nuiton.topia.replication.operation.Duplicate; import org.nuiton.topia.replication.operation.LoadLink; -import org.nuiton.util.ArrayUtil; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collection; import java.util.Collections; import java.util.HashMap; diff --git a/topia-templates/pom.xml b/topia-templates/pom.xml index b70c978b..b6b6a4bd 100644 --- a/topia-templates/pom.xml +++ b/topia-templates/pom.xml @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.2.2-SNAPSHOT</version> + <version>3.3-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> @@ -97,11 +97,6 @@ </dependency> <dependency> - <groupId>org.javassist</groupId> - <artifactId>javassist</artifactId> - </dependency> - - <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> </dependency> diff --git a/topia-templates/src/main/java/org/nuiton/topia/templates/TopiaMetaTransformer.java b/topia-templates/src/main/java/org/nuiton/topia/templates/TopiaMetaTransformer.java index 39f7ef80..a5f0c5dd 100644 --- a/topia-templates/src/main/java/org/nuiton/topia/templates/TopiaMetaTransformer.java +++ b/topia-templates/src/main/java/org/nuiton/topia/templates/TopiaMetaTransformer.java @@ -29,7 +29,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.eugene.AbstractMetaTransformer; import org.nuiton.eugene.java.BeanTransformer; -import org.nuiton.eugene.java.JavaBeanTransformer; import org.nuiton.eugene.java.JavaEnumerationTransformer; import org.nuiton.eugene.java.JavaInterfaceTransformer; import org.nuiton.eugene.models.object.ObjectModel; diff --git a/topia-templates/src/test/java/org/nuiton/topia/templates/TopiaCoreTagValuesTest.java b/topia-templates/src/test/java/org/nuiton/topia/templates/TopiaCoreTagValuesTest.java index b4d960e6..a7856e3a 100644 --- a/topia-templates/src/test/java/org/nuiton/topia/templates/TopiaCoreTagValuesTest.java +++ b/topia-templates/src/test/java/org/nuiton/topia/templates/TopiaCoreTagValuesTest.java @@ -33,7 +33,6 @@ import org.nuiton.eugene.models.object.ObjectModel; import org.nuiton.eugene.models.object.ObjectModelAttribute; import org.nuiton.eugene.models.object.ObjectModelClassifier; import org.nuiton.eugene.models.object.ObjectModelPackage; -import org.nuiton.eugene.models.object.xml.ObjectModelAttributeImpl; import org.nuiton.eugene.models.object.xml.ObjectModelClassImpl; import org.nuiton.eugene.models.object.xml.ObjectModelImpl; import org.nuiton.eugene.models.object.xml.ObjectModelPackageImpl; -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.