branch develop updated (77c0615 -> 77ae6b6)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository jtimer. See http://git.chorem.org/jtimer.git from 77c0615 Code cleanup new 77ae6b6 Simplify maven configuration. Remove src assembly. 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 77ae6b69ce69d821c147435752c3e9bd107014ae Author: Eric Chatellier <chatellier@codelutin.com> Date: Mon Feb 29 19:04:46 2016 +0100 Simplify maven configuration. Remove src assembly. Summary of changes: pom.xml | 19 ++++------------- src/main/assembly/bin.xml | 2 +- src/main/assembly/src.xml | 42 -------------------------------------- src/site/{site_en.xml => site.xml} | 0 4 files changed, 5 insertions(+), 58 deletions(-) delete mode 100644 src/main/assembly/src.xml rename src/site/{site_en.xml => site.xml} (100%) -- 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 develop in repository jtimer. See http://git.chorem.org/jtimer.git commit 77ae6b69ce69d821c147435752c3e9bd107014ae Author: Eric Chatellier <chatellier@codelutin.com> Date: Mon Feb 29 19:04:46 2016 +0100 Simplify maven configuration. Remove src assembly. --- pom.xml | 19 ++++------------- src/main/assembly/bin.xml | 2 +- src/main/assembly/src.xml | 42 -------------------------------------- src/site/{site_en.xml => site.xml} | 0 4 files changed, 5 insertions(+), 58 deletions(-) diff --git a/pom.xml b/pom.xml index 44cabce..a7cf280 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>chorempom</artifactId> - <version>6</version> + <version>8</version> </parent> <groupId>org.chorem</groupId> @@ -78,11 +78,6 @@ <properties> <projectId>jtimer</projectId> - - <!-- java 8 --> - <javaVersion>1.8</javaVersion> - <signatureArtifactId>java18</signatureArtifactId> - <signatureVersion>1.0</signatureVersion> <!--Main class in JAR --> <maven.jar.main.class>org.chorem.jtimer.JTimer</maven.jar.main.class> @@ -90,21 +85,15 @@ <!-- license to use --> <license.licenseName>gpl_v3</license.licenseName> - <!-- maven-site locales --> - <locales>en</locales> - <!-- files to deploy to redmine --> - <redmine.releaseFiles> - target/${project.artifactId}-${project.version}-bin.zip, - target/${project.artifactId}-${project.version}-src.zip - </redmine.releaseFiles> + <redmine.releaseFiles>target/${project.artifactId}-${project.version}.zip</redmine.releaseFiles> <!-- Post Release configuration --> <skipPostRelease>false</skipPostRelease> <!-- jnlp configuration --> <jnlpFileName>jTimer.jnlp</jnlpFileName> - <readmeFile>README.md</readmeFile> + <ciViewId>JTimer</ciViewId> </properties> <build> @@ -412,9 +401,9 @@ <configuration> <descriptors> <descriptor>src/main/assembly/bin.xml</descriptor> - <descriptor>src/main/assembly/src.xml</descriptor> </descriptors> <attach>false</attach> + <appendAssemblyId>false</appendAssemblyId> </configuration> </execution> </executions> diff --git a/src/main/assembly/bin.xml b/src/main/assembly/bin.xml index 630a50e..c3f7fa1 100644 --- a/src/main/assembly/bin.xml +++ b/src/main/assembly/bin.xml @@ -3,7 +3,7 @@ #%L jTimer %% - Copyright (C) 2007 - 2011 CodeLutin, Chatellier Eric + Copyright (C) 2007 - 2016 CodeLutin, Chatellier Eric %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/src/main/assembly/src.xml b/src/main/assembly/src.xml deleted file mode 100644 index d535927..0000000 --- a/src/main/assembly/src.xml +++ /dev/null @@ -1,42 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - jTimer - %% - Copyright (C) 2007 - 2011 CodeLutin, Chatellier Eric - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #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.2.xsd"> - <id>src</id> - <formats> - <format>zip</format> - </formats> - <fileSets> - <fileSet> - <includes> - <include>*.txt</include> - <include>*.xml</include> - </includes> - </fileSet> - <fileSet> - <directory>src</directory> - <useDefaultExcludes>true</useDefaultExcludes> - </fileSet> - </fileSets> -</assembly> diff --git a/src/site/site_en.xml b/src/site/site.xml similarity index 100% rename from src/site/site_en.xml rename to src/site/site.xml -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm