Tony CHEMIT pushed to branch develop-5.x at ultreiaio / ird-observe Commits: bbf265de by Tony CHEMIT at 2017-06-08T09:33:42+02:00 Erreur lors de synchros avec la base IEO (See #772) - - - - - 85a40b54 by Tony CHEMIT at 2017-06-08T09:44:42+02:00 prepare release 5.4 - - - - - 4 changed files: - application-swing/pom.xml - pom.xml - services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/sql/InsertSqlWithCascadeStatementGenerator.java - services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/sql/UpdateSqlWithCascadeStatementGenerator.java Changes: ===================================== application-swing/pom.xml ===================================== --- a/application-swing/pom.xml +++ b/application-swing/pom.xml @@ -35,7 +35,6 @@ <description>ObServe Application Swing</description> <properties> - <maven.deploy.skip>true</maven.deploy.skip> <!-- jaxx configuration --> <jaxx.addProjectClassPath>true</jaxx.addProjectClassPath> @@ -955,7 +954,9 @@ <transformer implementation="org.apache.maven.plugins.shade.resource.XmlAppendingTransformer"> <resource>xwork.xml</resource> </transformer> - + <transformer implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer"> + <resource>CHANGELOG.txt</resource> + </transformer> <transformer implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer"> <resource>LICENSE.txt</resource> </transformer> @@ -1001,12 +1002,7 @@ <transformer implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer"> <resource>NOTICE.txt</resource> </transformer> - <transformer implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer"> - <resource>META-INF/CHANGELOG.txt</resource> - </transformer> <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" /> - <!--<templates implementation="org.apache.maven.plugins.shade.resource.ComponentsXmlResourceTransformer" />--> - <!--<templates implementation="org.apache.maven.plugins.shade.resource.PluginXmlResourceTransformer" />--> <transformer implementation="org.apache.maven.plugins.shade.resource.IncludeResourceTransformer"> <file>README.md</file> @@ -1024,9 +1020,12 @@ <file>${project.build.outputDirectory}/META-INF/${applicationName}-LICENSE.txt</file> <resource>META-INF/${applicationName}-LICENSE.txt</resource> </transformer> - <transformer implementation="org.apache.maven.plugins.shade.resource.IncludeResourceTransformer"> - <file>${project.build.directory}/generated-sources/licenses/META-INF/${applicationName}-CHANGELOG.txt</file> + <file>${project.build.directory}/generated-sources/license/CHANGELOG.txt</file> + <resource>CHANGELOG.txt</resource> + </transformer> + <transformer implementation="org.apache.maven.plugins.shade.resource.IncludeResourceTransformer"> + <file>${project.build.directory}/generated-sources/license/META-INF/${applicationName}-CHANGELOG.txt</file> <resource>META-INF/${applicationName}-CHANGELOG.txt</resource> </transformer> ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>9</version> + <version>10</version> </parent> <groupId>fr.ird.observe</groupId> @@ -35,7 +35,7 @@ <version>5.3.8-SNAPSHOT</version> <packaging>pom</packaging> - <name>ObServe</name> + <name>ObServe :: Pom</name> <description>Projet ObServe</description> <url>https://ultreiaio.gitlab.io/ird-observe</url> <inceptionYear>2008</inceptionYear> @@ -228,6 +228,8 @@ <jgitflow.developBranchName>develop-5.x</jgitflow.developBranchName> <jgitflow.masterBranchName>master-5.x</jgitflow.masterBranchName> + <!-- deploy nothing --> + <maven.deploy.skip>true</maven.deploy.skip> </properties> <dependencyManagement> @@ -793,6 +795,11 @@ <artifactId>nuiton-version</artifactId> <version>${nuitonVersionVersion}</version> </dependency> + <dependency> + <groupId>org.apache.velocity</groupId> + <artifactId>velocity</artifactId> + <version>1.7</version> + </dependency> </dependencies> </plugin> @@ -871,7 +878,7 @@ <releaseArtifact> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <name>Client</name> + <name>Application</name> <type>zip</type> </releaseArtifact> <releaseArtifact> @@ -905,6 +912,9 @@ <modules> <module>observe</module> </modules> + <properties> + <devMode>false</devMode> + </properties> </profile> <profile> ===================================== services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/sql/InsertSqlWithCascadeStatementGenerator.java ===================================== --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/sql/InsertSqlWithCascadeStatementGenerator.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/sql/InsertSqlWithCascadeStatementGenerator.java @@ -25,12 +25,11 @@ package fr.ird.observe.services.topia.service.actions.synchro.referential.sql; import com.google.common.collect.Multimap; import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.referential.ReferentialReference; +import java.util.List; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.topia.persistence.metadata.TopiaMetadataEntity; -import java.util.List; - /** * Pour générer une requète sql d'ajout à partir d'un référentiel donné et aussi tous les inserts manquants * @@ -79,6 +78,9 @@ public abstract class InsertSqlWithCascadeStatementGenerator<R extends Referenti public String generateSql(R referentialDto) { + if (sqlBuilder.length() > 0) { + sqlBuilder.delete(0, sqlBuilder.length()); + } String sql = delegateGenerator.generateSql(referentialDto); sqlBuilder.append(sql); return sqlBuilder.toString(); ===================================== services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/sql/UpdateSqlWithCascadeStatementGenerator.java ===================================== --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/sql/UpdateSqlWithCascadeStatementGenerator.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/sql/UpdateSqlWithCascadeStatementGenerator.java @@ -76,7 +76,9 @@ public abstract class UpdateSqlWithCascadeStatementGenerator<R extends Referenti protected abstract <D extends ReferentialDto> String insertMissingReferential(Class<D> referentialType, String id); public String generateSql(R referentialDto) { - + if (sqlBuilder.length() > 0) { + sqlBuilder.delete(0, sqlBuilder.length()); + } String sql = delegateGenerator.generateSql(referentialDto); sqlBuilder.append(sql); return sqlBuilder.toString(); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/a5f7d0b5ba129adc8316c8b7559... --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/a5f7d0b5ba129adc8316c8b7559... You're receiving this email because of your account on gitlab.com.