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 e5adb63424d783cfc81b30f392f20ba7eff25039 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Sep 5 15:57:38 2016 +0200 -mfix release build order (assembly must be done in package phase --- application-swing/pom.xml | 146 ++++++++++++---------------------------------- 1 file changed, 36 insertions(+), 110 deletions(-) diff --git a/application-swing/pom.xml b/application-swing/pom.xml index 83adead..be98223 100644 --- a/application-swing/pom.xml +++ b/application-swing/pom.xml @@ -606,104 +606,12 @@ </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> - <filters> - <filter> - <artifact>log4j:log4j</artifact> - <includes> - <include>**</include> - </includes> - </filter> - <filter> - <artifact>commons-logging:commons-logging</artifact> - <includes> - <include>**</include> - </includes> - </filter> - </filters> - </configuration> - </execution> - </executions> - </plugin> - </plugins> </build> </profile> <profile> - <id>shade-profile</id> + <id>assembly-profile</id> <activation> <property> <name>performRelease</name> @@ -763,6 +671,21 @@ <resource>LICENSE.txt</resource> </transformer> <transformer implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer"> + <resource>LICENSE</resource> + </transformer> + <transformer implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer"> + <resource>hsqldb_lic.txt</resource> + </transformer> + <transformer implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer"> + <resource>hypersonic_lic.txt</resource> + </transformer> + <transformer implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer"> + <resource>info.xml</resource> + </transformer> + <transformer implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer"> + <resource>jdom-info.xml</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"> @@ -786,6 +709,9 @@ <transformer implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer"> <resource>NOTICE</resource> </transformer> + <transformer implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer"> + <resource>NOTICE.txt</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" />--> @@ -808,33 +734,32 @@ </transformer> </transformers> - <!--<minimizeJar>true</minimizeJar>--> + <!--minimizeJar>true</minimizeJar> + <filters> + <filter> + <artifact>log4j:log4j</artifact> + <includes> + <include>**</include> + </includes> + </filter> + <filter> + <artifact>commons-logging:commons-logging</artifact> + <includes> + <include>**</include> + </includes> + </filter> + </filters--> </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>verify</phase> + <phase>package</phase> <goals> <goal>single</goal> </goals> @@ -850,6 +775,7 @@ </execution> </executions> </plugin> + </plugins> </build> </profile> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.