Jtimer-commits

Download

jtimer-commits@list.chorem.org

September 2016

1 participants
2 discussions

01/01: Use chorempom 10.4 + tidy pom + fix Bad webstart generation on snapshot site (Fixes #1370)
by chorem.org scm 13 Sep '16

13 Sep '16

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository jtimer. See https://gitlab.nuiton.org/chorem/jtimer.git commit e3af9d1d232f8f5061cae737af55fcdf43b3f95d Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Sep 13 18:17:39 2016 +0200 Use chorempom 10.4 + tidy pom + fix Bad webstart generation on snapshot site (Fixes #1370) --- pom.xml | 249 +++++++++++++++++++++++++++++++++------------------------------- 1 file changed, 129 insertions(+), 120 deletions(-) diff --git a/pom.xml b/pom.xml index 2c9240a..846d7b2 100644 --- a/pom.xml +++ b/pom.xml @@ -1,12 +1,11 @@ <?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> <groupId>org.nuiton</groupId> <artifactId>chorempom</artifactId> - <version>10.2</version> + <version>10.4</version> </parent> <groupId>org.chorem</groupId> @@ -19,7 +18,6 @@ </description> <url>http://jtimer.chorem.org</url> <inceptionYear>2007</inceptionYear> - <licenses> <license> <name>General Public License (GPL)</name> @@ -63,7 +61,6 @@ </roles> </developer> </developers> - <contributors> <contributor> <name>Stéphane Chorlet</name> @@ -105,6 +102,119 @@ <signatureVersion>1.0</signatureVersion> </properties> + <dependencies> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-config</artifactId> + <version>3.0-rc-4</version> + <scope>compile</scope> + <exclusions> + <exclusion> + <groupId>commons-primitives</groupId> + <artifactId>commons-primitives</artifactId> + </exclusion> + <exclusion> + <groupId>org.nuiton.i18n</groupId> + <artifactId>nuiton-i18n</artifactId> + </exclusion> + <exclusion> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.jdesktop.bsaf</groupId> + <artifactId>bsaf</artifactId> + <version>1.9.2</version> + <scope>compile</scope> + <exclusions> + <exclusion> + <groupId>javax.jnlp</groupId> + <artifactId>jnlp</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.swinglabs.swingx</groupId> + <artifactId>swingx-core</artifactId> + <version>1.6.5-1</version> + <scope>compile</scope> + <exclusions> + <exclusion> + <groupId>org.swinglabs.swingx</groupId> + <artifactId>swingx-autocomplete</artifactId> + </exclusion> + <exclusion> + <groupId>org.swinglabs.swingx</groupId> + <artifactId>swingx-graphics</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>net.java.dev.jna</groupId> + <artifactId>jna</artifactId> + <version>4.2.2</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> + <version>2.6.2</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-jcl</artifactId> + <version>2.6.2</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.freemarker</groupId> + <artifactId>freemarker</artifactId> + <version>2.3.25-incubating</version> + </dependency> + <dependency> + <groupId>org.yaml</groupId> + <artifactId>snakeyaml</artifactId> + <version>1.17</version> + </dependency> + <dependency> + <groupId>com.google.code.gson</groupId> + <artifactId>gson</artifactId> + <version>2.7</version> + </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + <version>3.4</version> + </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>1.2</version> + </dependency> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + <version>2.5</version> + </dependency> + +  + <dependency> + <groupId>org.testng</groupId> + <artifactId>testng</artifactId> + <version>6.9.10</version> + <scope>test</scope> + <exclusions> + <exclusion> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </exclusion> + </exclusions> + </dependency> + </dependencies> + <build> <resources> <resource> @@ -175,7 +285,7 @@ <artifactId>webstart-maven-plugin</artifactId> <configuration>  - <codebase>http://jtimer.chorem.org/v/${project.version}/jnlp</codebase> + <codebase>http://jtimer.chorem.org/v/${siteDeployClassifier}/jnlp</codebase> <libPath>lib</libPath> <makeArchive>false</makeArchive>  @@ -216,119 +326,6 @@ </pluginManagement> </build> - <dependencies> - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-config</artifactId> - <version>3.0-rc-4</version> - <scope>compile</scope> - <exclusions> - <exclusion> - <groupId>commons-primitives</groupId> - <artifactId>commons-primitives</artifactId> - </exclusion> - <exclusion> - <groupId>org.nuiton.i18n</groupId> - <artifactId>nuiton-i18n</artifactId> - </exclusion> - <exclusion> - <artifactId>guava</artifactId> - <groupId>com.google.guava</groupId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.jdesktop.bsaf</groupId> - <artifactId>bsaf</artifactId> - <version>1.9.2</version> - <scope>compile</scope> - <exclusions> - <exclusion> - <groupId>javax.jnlp</groupId> - <artifactId>jnlp</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.swinglabs.swingx</groupId> - <artifactId>swingx-core</artifactId> - <version>1.6.5-1</version> - <scope>compile</scope> - <exclusions> - <exclusion> - <artifactId>swingx-autocomplete</artifactId> - <groupId>org.swinglabs.swingx</groupId> - </exclusion> - <exclusion> - <artifactId>swingx-graphics</artifactId> - <groupId>org.swinglabs.swingx</groupId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>net.java.dev.jna</groupId> - <artifactId>jna</artifactId> - <version>4.2.2</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-core</artifactId> - <version>2.6.2</version> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-jcl</artifactId> - <version>2.6.2</version> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>org.freemarker</groupId> - <artifactId>freemarker</artifactId> - <version>2.3.25-incubating</version> - </dependency> - <dependency> - <groupId>org.yaml</groupId> - <artifactId>snakeyaml</artifactId> - <version>1.17</version> - </dependency> - <dependency> - <groupId>com.google.code.gson</groupId> - <artifactId>gson</artifactId> - <version>2.7</version> - </dependency> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-lang3</artifactId> - <version>3.4</version> - </dependency> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <version>1.2</version> - </dependency> - <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - <version>2.5</version> - </dependency> - -  - <dependency> - <groupId>org.testng</groupId> - <artifactId>testng</artifactId> - <version>6.9.10</version> - <scope>test</scope> - <exclusions> - <exclusion> - <artifactId>junit</artifactId> - <groupId>junit</groupId> - </exclusion> - </exclusions> - </dependency> - </dependencies> - <profiles> <profile> <id>release-profile</id> @@ -341,9 +338,21 @@ <build> <plugins> <plugin> + <groupId>org.nuiton</groupId> + <artifactId>helper-maven-plugin</artifactId> + <executions> + <execution> + <id>compute-distribution-site-url</id> + <goals> + <goal>compute-distribution-site-url</goal> + </goals> + <phase>validate</phase> + </execution> + </executions> + </plugin> + <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>build-helper-maven-plugin</artifactId> - <version>1.10</version> <executions> <execution> <id>parse-version</id> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

branch develop updated (e4c1d77 -> e3af9d1)
by chorem.org scm 13 Sep '16

13 Sep '16

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository jtimer. See https://gitlab.nuiton.org/chorem/jtimer.git from e4c1d77 Fix release new e3af9d1 Use chorempom 10.4 + tidy pom + fix Bad webstart generation on snapshot site (Fixes #1370) 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 e3af9d1d232f8f5061cae737af55fcdf43b3f95d Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Sep 13 18:17:39 2016 +0200 Use chorempom 10.4 + tidy pom + fix Bad webstart generation on snapshot site (Fixes #1370) Summary of changes: pom.xml | 249 +++++++++++++++++++++++++++++++++------------------------------- 1 file changed, 129 insertions(+), 120 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0