branch develop updated (ba09131 -> 0d4c133)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git from ba09131 Correction du problème de rendu des cartes (Fixes #8494) new fd005ba Fix build new 2e56306 Optimize more dependencies + use codelutinpom 10.3 new 0d4c133 Shade application swing (See #8483)" The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 0d4c1337f62f7a01dcb732435c1f3341e905ebc3 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Sep 3 14:16:43 2016 +0200 Shade application swing (See #8483)" commit 2e5630601132e2140efa031c14f4be405e7646fe Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Sep 3 12:49:36 2016 +0200 Optimize more dependencies + use codelutinpom 10.3 commit fd005bac9ef6a53f7343ae5515bff2b7e3356899 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Sep 3 12:48:41 2016 +0200 Fix build Summary of changes: application-swing/pom.xml | 264 ++++++++++++++++++++- application-swing/src/main/assembly/bin.xml | 14 -- .../swing/ui/actions/ReloadStorageAction.java | 2 +- pom.xml | 34 ++- services-runner/pom.xml | 6 + 5 files changed, 296 insertions(+), 24 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit fd005bac9ef6a53f7343ae5515bff2b7e3356899 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Sep 3 12:48:41 2016 +0200 Fix build --- .../ird/observe/application/swing/ui/actions/ReloadStorageAction.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/ReloadStorageAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/ReloadStorageAction.java index 936831a..fab02be 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/ReloadStorageAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/ReloadStorageAction.java @@ -108,7 +108,7 @@ public class ReloadStorageAction extends AbstractObserveAction { context.setNodesToReselect(ids); // attachement a l'ui - context.prepareMainStorage(storage, false); + context.getDataSourcesManager().prepareMainStorage(storage, false); // ouverture du service storage.open(); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 2e5630601132e2140efa031c14f4be405e7646fe Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Sep 3 12:49:36 2016 +0200 Optimize more dependencies + use codelutinpom 10.3 --- pom.xml | 27 ++++++++++++++++++++++++--- services-runner/pom.xml | 6 ++++++ 2 files changed, 30 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 62fda54..d80c3ad 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>codelutinpom</artifactId> - <version>10.2</version> + <version>10.3</version> </parent> <groupId>fr.ird.observe</groupId> @@ -201,8 +201,6 @@ <!--Modèle version--> <observe.model.version>4.905</observe.model.version> - <jrstPluginVersion>2.1</jrstPluginVersion> - </properties> <repositories> @@ -361,6 +359,10 @@ <groupId>javassist</groupId> <artifactId>javassist</artifactId> </exclusion> + <exclusion> + <groupId>org.javassist</groupId> + <artifactId>javassist</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -389,6 +391,12 @@ <artifactId>jaxx-runtime</artifactId> <version>${jaxxVersion}</version> <scope>compile</scope> + <exclusions> + <exclusion> + <groupId>javax.help</groupId> + <artifactId>javahelp</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.nuiton.jaxx</groupId> @@ -437,6 +445,12 @@ <artifactId>jaxx-application-api</artifactId> <version>${jaxxVersion}</version> <scope>compile</scope> + <exclusions> + <exclusion> + <groupId>org.apache.commons</groupId> + <artifactId>commons-vfs2</artifactId> + </exclusion> + </exclusions> </dependency> <!--swingX --> @@ -798,6 +812,12 @@ <groupId>org.reflections</groupId> <artifactId>reflections</artifactId> <version>${reflectionsVersion}</version> + <exclusions> + <exclusion> + <groupId>com.google.code.findbugs</groupId> + <artifactId>annotations</artifactId> + </exclusion> + </exclusions> </dependency> <!-- provided dependencies --> @@ -871,6 +891,7 @@ </exclusion> </exclusions> </dependency> + <dependency> <groupId>org.javassist</groupId> <artifactId>javassist</artifactId> diff --git a/services-runner/pom.xml b/services-runner/pom.xml index a4899e0..e16543e 100644 --- a/services-runner/pom.xml +++ b/services-runner/pom.xml @@ -68,6 +68,12 @@ <artifactId>reflections</artifactId> </dependency> + <!-- on laisse volontairement cette dépendance pour assurer la convergence des versions --> + <dependency> + <groupId>org.javassist</groupId> + <artifactId>javassist</artifactId> + </dependency> + <!-- Logging --> <dependency> <groupId>org.slf4j</groupId> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 0d4c1337f62f7a01dcb732435c1f3341e905ebc3 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Sep 3 14:16:43 2016 +0200 Shade application swing (See #8483)" --- application-swing/pom.xml | 264 +++++++++++++++++++++++++++- application-swing/src/main/assembly/bin.xml | 14 -- pom.xml | 7 +- 3 files changed, 265 insertions(+), 20 deletions(-) diff --git a/application-swing/pom.xml b/application-swing/pom.xml index 26f20cb..75a7131 100644 --- a/application-swing/pom.xml +++ b/application-swing/pom.xml @@ -20,7 +20,8 @@ <http://www.gnu.org/licenses/lgpl-3.0.html>. #L% --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> @@ -510,6 +511,7 @@ </goals> <phase>prepare-package</phase> <configuration> + <skip>${performRelease}</skip> <overWriteReleases>false</overWriteReleases> <overWriteSnapshots>true</overWriteSnapshots> <overWriteIfNewer>true</overWriteIfNewer> @@ -519,7 +521,6 @@ </execution> </executions> </plugin> - <plugin> <artifactId>maven-assembly-plugin</artifactId> <executions> @@ -561,7 +562,7 @@ </profile> <profile> - <id>assembly-profile</id> + <id>release-quality-profile</id> <activation> <property> <name>performRelease</name> @@ -572,11 +573,266 @@ <defaultGoal>package</defaultGoal> <plugins> <plugin> + <artifactId>maven-enforcer-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>enforce</goal> + </goals> + <phase>validate</phase> + <id>ensure-no-duplicated-classes</id> + <configuration> + <rules> + <banDuplicateClasses> + <findAllDuplicates>true</findAllDuplicates> + </banDuplicateClasses> + </rules> + <fail>true</fail> + </configuration> + </execution> + </executions> + <dependencies> + <dependency> + <groupId>org.codehaus.mojo</groupId> + <artifactId>extra-enforcer-rules</artifactId> + <version>1.0-beta-4</version> + </dependency> + </dependencies> + </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-shade-plugin</artifactId> + <version>2.4.3</version> + <executions> + <execution> + <phase>package</phase> + <goals> + <goal>shade</goal> + </goals> + <configuration> + <transformers> + <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer"> + <manifestEntries> + <Main-Class>${maven.jar.main.class}</Main-Class> + <X-Compile-Source-JDK>${maven.compiler.source}</X-Compile-Source-JDK> + <X-Compile-Target-JDK>${maven.compiler.target}</X-Compile-Target-JDK> + </manifestEntries> + </transformer> + <transformer implementation="org.apache.maven.plugins.shade.resource.XmlAppendingTransformer"> + <resource>xwork.xml</resource> + </transformer> + + <transformer + implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer"> + <resource>LICENSE.txt</resource> + </transformer> + <transformer + implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer"> + <resource>README.txt</resource> + </transformer> + <transformer + implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer"> + <resource>README.md</resource> + </transformer> + <transformer + implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer"> + <resource>THIRD-PARTY.txt</resource> + </transformer> + <transformer + implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer"> + <resource>HTTPS___.DSA</resource> + </transformer> + <transformer + implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer"> + <resource>DEPENDENCIES</resource> + </transformer> + <transformer + implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer"> + <resource>HTTPS___.SF</resource> + </transformer> + <transformer + implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer"> + <resource>README</resource> + </transformer> + <transformer + implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer"> + <resource>NOTICE</resource> + </transformer> + <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/> + <!--<transformer implementation="org.apache.maven.plugins.shade.resource.ComponentsXmlResourceTransformer"/>--> + <!--<transformer implementation="org.apache.maven.plugins.shade.resource.PluginXmlResourceTransformer"/>--> + + <transformer implementation="org.apache.maven.plugins.shade.resource.IncludeResourceTransformer"> + <file>README.md</file> + <resource>README.md</resource> + </transformer> + <transformer implementation="org.apache.maven.plugins.shade.resource.IncludeResourceTransformer"> + <file>${project.build.outputDirectory}/THIRD-PARTY.txt</file> + <resource>THIRD-PARTY.txt</resource> + </transformer> + <transformer implementation="org.apache.maven.plugins.shade.resource.IncludeResourceTransformer"> + <file>${project.build.outputDirectory}/META-INF/observe-THIRD-PARTY.txt</file> + <resource>META-INF/observe-THIRD-PARTY.txt</resource> + </transformer> + <transformer implementation="org.apache.maven.plugins.shade.resource.IncludeResourceTransformer"> + <file>${project.build.outputDirectory}/META-INF/observe-LICENSE.txt</file> + <resource>META-INF/observe-LICENSE.txt</resource> + </transformer> + + </transformers> + <!--<minimizeJar>true</minimizeJar>--> + </configuration> + </execution> + </executions> + </plugin> + + </plugins> + </build> + </profile> + + <profile> + <id>shade-profile</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + <build> + <defaultGoal>package</defaultGoal> + + <pluginManagement> + + <plugins> + + <plugin> + <artifactId>maven-jar-plugin</artifactId> + <configuration> + <archive> + <manifest> + <useUniqueVersions>false</useUniqueVersions> + <addClasspath>false</addClasspath> + <classpathPrefix/> + <mainClass>${maven.jar.main.class}</mainClass> + </manifest> + </archive> + </configuration> + </plugin> + + </plugins> + </pluginManagement> + <plugins> + <plugin> + <artifactId>maven-shade-plugin</artifactId> + <executions> + <execution> + <phase>package</phase> + <goals> + <goal>shade</goal> + </goals> + <configuration> + <createDependencyReducedPom>false</createDependencyReducedPom> + <transformers> + <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer"> + <manifestEntries> + <Main-Class>${maven.jar.main.class}</Main-Class> + <X-Compile-Source-JDK>${maven.compiler.source}</X-Compile-Source-JDK> + <X-Compile-Target-JDK>${maven.compiler.target}</X-Compile-Target-JDK> + <Build-Date>${buildDate}</Build-Date> + <Build-Number>${buildNumber}</Build-Number> + <Implementation-Model-Version>${observe.model.version}</Implementation-Model-Version> + </manifestEntries> + </transformer> + <transformer implementation="org.apache.maven.plugins.shade.resource.XmlAppendingTransformer"> + <resource>xwork.xml</resource> + </transformer> + + <transformer + implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer"> + <resource>LICENSE.txt</resource> + </transformer> + <transformer + implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer"> + <resource>README.txt</resource> + </transformer> + <transformer + implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer"> + <resource>README.md</resource> + </transformer> + <transformer + implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer"> + <resource>THIRD-PARTY.txt</resource> + </transformer> + <transformer + implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer"> + <resource>HTTPS___.DSA</resource> + </transformer> + <transformer + implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer"> + <resource>DEPENDENCIES</resource> + </transformer> + <transformer + implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer"> + <resource>HTTPS___.SF</resource> + </transformer> + <transformer + implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer"> + <resource>README</resource> + </transformer> + <transformer + implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer"> + <resource>NOTICE</resource> + </transformer> + <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/> + <!--<transformer implementation="org.apache.maven.plugins.shade.resource.ComponentsXmlResourceTransformer"/>--> + <!--<transformer implementation="org.apache.maven.plugins.shade.resource.PluginXmlResourceTransformer"/>--> + + <transformer implementation="org.apache.maven.plugins.shade.resource.IncludeResourceTransformer"> + <file>README.md</file> + <resource>README.md</resource> + </transformer> + <transformer implementation="org.apache.maven.plugins.shade.resource.IncludeResourceTransformer"> + <file>${project.build.outputDirectory}/THIRD-PARTY.txt</file> + <resource>THIRD-PARTY.txt</resource> + </transformer> + <transformer implementation="org.apache.maven.plugins.shade.resource.IncludeResourceTransformer"> + <file>${project.build.outputDirectory}/META-INF/observe-THIRD-PARTY.txt</file> + <resource>META-INF/observe-THIRD-PARTY.txt</resource> + </transformer> + <transformer implementation="org.apache.maven.plugins.shade.resource.IncludeResourceTransformer"> + <file>${project.build.outputDirectory}/META-INF/observe-LICENSE.txt</file> + <resource>META-INF/observe-LICENSE.txt</resource> + </transformer> + + </transformers> + <!--<minimizeJar>true</minimizeJar>--> + </configuration> + </execution> + </executions> + </plugin> + + </plugins> + </build> + </profile> + + <profile> + <id>assembly-profile</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + <build> + <defaultGoal>verify</defaultGoal> + <plugins> + <plugin> <artifactId>maven-assembly-plugin</artifactId> <executions> <execution> <id>create-application-assembly</id> - <phase>package</phase> + <phase>verify</phase> <goals> <goal>single</goal> </goals> diff --git a/application-swing/src/main/assembly/bin.xml b/application-swing/src/main/assembly/bin.xml index bb44970..0450ea6 100644 --- a/application-swing/src/main/assembly/bin.xml +++ b/application-swing/src/main/assembly/bin.xml @@ -25,20 +25,6 @@ <formats> <format>zip</format> </formats> - <dependencySets> - <dependencySet> - <outputDirectory>lib</outputDirectory> - <scope>runtime</scope> - <excludes> - <exclude> - fr.ird.observe:observe-swing:* - </exclude> - <exclude> - javassist:javassist:* - </exclude> - </excludes> - </dependencySet> - </dependencySets> <fileSets> diff --git a/pom.xml b/pom.xml index d80c3ad..06b6851 100644 --- a/pom.xml +++ b/pom.xml @@ -941,11 +941,14 @@ </plugin> <plugin> + <artifactId>maven-shade-plugin</artifactId> + <version>2.4.3</version> + </plugin> + + <plugin> <groupId>org.nuiton.i18n</groupId> <artifactId>i18n-maven-plugin</artifactId> <version>${nuitonI18nVersion}</version> - <configuration> - </configuration> </plugin> <plugin> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm