branch feature/1371_shade_jar created (now 2dc8b6a)
This is an automated email from the git hooks/post-receive script. New change to branch feature/1371_shade_jar in repository jtimer. See https://gitlab.nuiton.org/chorem/jtimer.git at 2dc8b6a shade release jar This branch includes the following new commits: new 2dc8b6a shade release jar The 1 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 2dc8b6a3b43d18393d98f242917375495c9c5884 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Oct 24 09:34:24 2016 +0200 shade release jar -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/1371_shade_jar in repository jtimer. See https://gitlab.nuiton.org/chorem/jtimer.git commit 2dc8b6a3b43d18393d98f242917375495c9c5884 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Oct 24 09:34:24 2016 +0200 shade release jar --- pom.xml | 137 ++++++++++++++++++++++++++++++++++++++++++++-- src/main/assembly/bin.xml | 12 +--- 2 files changed, 135 insertions(+), 14 deletions(-) diff --git a/pom.xml b/pom.xml index 846d7b2..d257f3e 100644 --- a/pom.xml +++ b/pom.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<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> @@ -100,6 +101,8 @@ <javaVersion>1.8</javaVersion> <signatureArtifactId>java18</signatureArtifactId> <signatureVersion>1.0</signatureVersion> + + <webstartPluginVersion>1.0.0-SNAPSHOT</webstartPluginVersion> </properties> <dependencies> @@ -284,7 +287,6 @@ <groupId>org.codehaus.mojo</groupId> <artifactId>webstart-maven-plugin</artifactId> <configuration> - <!--FIXME Find a way to get correct value of siteDeployClassifier--> <codebase>http://jtimer.chorem.org/v/${siteDeployClassifier}/jnlp</codebase> <libPath>lib</libPath> <makeArchive>false</makeArchive> @@ -293,7 +295,7 @@ <Application-Name>jTimer ${project.version}</Application-Name> <Permissions>all-permissions</Permissions> <Codebase>*</Codebase> - <!--<Application-Library-Allowable-Codebase>*</Application-Library-Allowable-Codebase>--> + <Application-Library-Allowable-Codebase>*</Application-Library-Allowable-Codebase> <!--<Caller-Allowable-Codebase>*</Caller-Allowable-Codebase>--> </updateManifestEntries> <outputJarVersions>false</outputJarVersions> @@ -320,6 +322,7 @@ <pack200> <enabled>false</enabled> </pack200> + <skipDependencies>true</skipDependencies> </configuration> </plugin> </plugins> @@ -336,6 +339,28 @@ </property> </activation> <build> + + <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> <groupId>org.nuiton</groupId> @@ -351,6 +376,104 @@ </executions> </plugin> <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> + </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>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"> + <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.DontIncludeResourceTransformer"> + <resource>NOTICE.txt</resource> + </transformer> + <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/> + <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> + + </transformers> + </configuration> + </execution> + </executions> + </plugin> + + <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>build-helper-maven-plugin</artifactId> <executions> @@ -384,11 +507,15 @@ <maxHeapSize>100</maxHeapSize> </jre> <versionInfo> - <fileVersion>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.0</fileVersion> + <fileVersion> + ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.0 + </fileVersion> <txtFileVersion>${project.version}</txtFileVersion> <fileDescription>${project.description}</fileDescription> <productName>${project.name}</productName> - <productVersion>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.0</productVersion> + <productVersion> + ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.0 + </productVersion> <txtProductVersion>${project.version}</txtProductVersion> <companyName>${project.organization.name}</companyName> <copyright>${project.inceptionYear} - 2016 ${project.organization.name}</copyright> diff --git a/src/main/assembly/bin.xml b/src/main/assembly/bin.xml index aafc9a2..a2e4e63 100644 --- a/src/main/assembly/bin.xml +++ b/src/main/assembly/bin.xml @@ -21,19 +21,13 @@ #L% --> -<assembly 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/assembly-1.1.3.xsd"> +<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 http://maven.apache.org/xsd/assembly-1.1.3.xsd"> <id>bin</id> <formats> <format>zip</format> </formats> - <dependencySets> - <dependencySet> - <outputDirectory>lib</outputDirectory> - <scope>runtime</scope> - <useProjectArtifact>false</useProjectArtifact> - </dependencySet> - </dependencySets> <files> <file> <source>target/${project.build.finalName}.jar</source> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm