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>.