branch develop updated (259d5dd -> 5e0ca79)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git from 259d5dd Amélioration de la documentation et du démarrage de l'application web new 5e0ca79 Improve name of release files 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 5e0ca79e8bb5807c10d4c560e8fbd9ef82ae998e Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Sep 22 13:01:48 2016 +0200 Improve name of release files Summary of changes: application-swing/pom.xml | 37 ++++++++++++++++------------- application-swing/src/main/assembly/bin.xml | 2 +- application-web/pom.xml | 18 +++++++------- 3 files changed, 32 insertions(+), 25 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
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 5e0ca79e8bb5807c10d4c560e8fbd9ef82ae998e Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Sep 22 13:01:48 2016 +0200 Improve name of release files --- application-swing/pom.xml | 37 ++++++++++++++++------------- application-swing/src/main/assembly/bin.xml | 2 +- application-web/pom.xml | 18 +++++++------- 3 files changed, 32 insertions(+), 25 deletions(-) diff --git a/application-swing/pom.xml b/application-swing/pom.xml index e0f0149..e0be63b 100644 --- a/application-swing/pom.xml +++ b/application-swing/pom.xml @@ -57,20 +57,22 @@ <!-- main class in JAR --> <maven.jar.main.class>fr.ird.observe.application.swing.RunObserve</maven.jar.main.class> - <i18n.bundleOutputName>${projectId}-i18n</i18n.bundleOutputName> - <i18n.bundleCsvFile>${projectId}-i18n.csv</i18n.bundleCsvFile> + <applicationName>${projectId}</applicationName> + + <i18n.bundleOutputName>${applicationName}-i18n</i18n.bundleOutputName> + <i18n.bundleCsvFile>${applicationName}-i18n.csv</i18n.bundleCsvFile> <i18n.bundleCsvSeparator>|</i18n.bundleCsvSeparator> <!-- generate license bundled files --> <license.generateBundle>true</license.generateBundle> - <license.bundleThirdPartyPath>META-INF/${projectId}-THIRD-PARTY.txt</license.bundleThirdPartyPath> - <license.bundleLicensePath>META-INF/${projectId}-LICENSE.txt</license.bundleLicensePath> + <license.bundleThirdPartyPath>META-INF/${applicationName}-THIRD-PARTY.txt</license.bundleThirdPartyPath> + <license.bundleLicensePath>META-INF/${applicationName}-LICENSE.txt</license.bundleLicensePath> <!-- Post Release configuration --> <skipPostRelease>false</skipPostRelease> <redmine.releaseFiles> - target/${projectId}-${project.version}.zip + ${project.build.directory}/${project.build.finalName}.zip </redmine.releaseFiles> <!-- by default, we are in dev mode --> @@ -339,6 +341,9 @@ </dependencies> <build> + + <finalName>${applicationName}-${project.version}</finalName> + <resources> <resource> <directory>src/main/filters</directory> @@ -730,12 +735,12 @@ <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> + <file>${project.build.outputDirectory}/META-INF/${applicationName}-THIRD-PARTY.txt</file> + <resource>META-INF/${applicationName}-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> + <file>${project.build.outputDirectory}/META-INF/${applicationName}-LICENSE.txt</file> + <resource>META-INF/${applicationName}-LICENSE.txt</resource> </transformer> </transformers> @@ -785,9 +790,9 @@ <configuration> <dontWrapJar>true</dontWrapJar> <headerType>gui</headerType> - <outfile>target/observe.exe</outfile> + <outfile>${project.build.directory}/${project.build.finalName}.exe</outfile> <jar>${project.build.finalName}.jar</jar> - <errTitle>${project.name}</errTitle> + <errTitle>${project.parent.name}</errTitle> <jre> <minVersion>1.8.0</minVersion> <maxHeapSize>256</maxHeapSize> @@ -795,14 +800,14 @@ <versionInfo> <fileVersion>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.0</fileVersion> <txtFileVersion>${project.version}</txtFileVersion> - <fileDescription>${project.description}</fileDescription> - <productName>${project.name}</productName> + <fileDescription>${project.parent.description}</fileDescription> + <productName>${project.parent.name}</productName> <productVersion>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.0</productVersion> <txtProductVersion>${project.version}</txtProductVersion> <companyName>${project.organization.name}</companyName> <copyright>${project.inceptionYear} 2009 - 2016 ${project.organization.name}</copyright> <internalName>observe</internalName> - <originalFilename>observe.exe</originalFilename> + <originalFilename>${project.build.finalName}.exe</originalFilename> </versionInfo> </configuration> </execution> @@ -823,7 +828,7 @@ <descriptor>src/main/assembly/bin.xml</descriptor> </descriptors> <attach>false</attach> - <finalName>observe-${project.version}</finalName> + <finalName>${project.build.finalName}</finalName> <appendAssemblyId>false</appendAssemblyId> <outputDirectory>${project.build.directory}</outputDirectory> </configuration> @@ -885,7 +890,7 @@ <configuration> <target> <copy failonerror="true" overwrite="true" file="${project.build.directory}/changelog/${project.parent.artifactId}-${project.version}-changelog.pom" tofile="${project.build.directory}/generated-sources/license/CHANGELOG.txt" /> - <copy failonerror="true" overwrite="true" file="${project.build.directory}/changelog/${project.parent.artifactId}-${project.version}-changelog.pom" tofile="${project.build.directory}/generated-sources/license/META-INF/observe-CHANGELOG.txt" /> + <copy failonerror="true" overwrite="true" file="${project.build.directory}/changelog/${project.parent.artifactId}-${project.version}-changelog.pom" tofile="${project.build.directory}/generated-sources/license/META-INF/${applicationName}-CHANGELOG.txt" /> </target> </configuration> <goals> diff --git a/application-swing/src/main/assembly/bin.xml b/application-swing/src/main/assembly/bin.xml index 41cc8e6..8d41f04 100644 --- a/application-swing/src/main/assembly/bin.xml +++ b/application-swing/src/main/assembly/bin.xml @@ -34,7 +34,7 @@ <fileMode>0755</fileMode> <includes> <include>${project.build.finalName}.jar</include> - <include>observe.exe</include> + <include>${project.build.finalName}.exe</include> </includes> </fileSet> diff --git a/application-web/pom.xml b/application-web/pom.xml index ee92038..8e31dc1 100644 --- a/application-web/pom.xml +++ b/application-web/pom.xml @@ -16,21 +16,21 @@ <properties> - <!-- Webapp configuration --> - <defaultWebContextPath>observeweb</defaultWebContextPath> + <applicationName>observeweb</applicationName> - <i18n.bundleOutputName>${projectId}web-i18n</i18n.bundleOutputName> + <i18n.bundleOutputName>${applicationName}-i18n</i18n.bundleOutputName> <!-- deploy configuration --> - <deployFiles>${project.build.directory}/${project.artifactId}-${project.version}.war</deployFiles> + <deployFiles>${project.build.directory}/${project.build.finalName}.war</deployFiles> <!-- add war to release file --> - <redmine.releaseFiles>${project.build.directory}/${project.artifactId}-${project.version}.war</redmine.releaseFiles> + <redmine.releaseFiles>${project.build.directory}/${project.build.finalName}.war</redmine.releaseFiles> - <!-- aloow to deploy artifacts --> + <!-- allow to deploy artifacts --> <maven.deploy.skip>false</maven.deploy.skip> </properties> + <dependencies> <!-- sibling dependencies --> @@ -166,6 +166,8 @@ <build> + <finalName>${applicationName}-${project.version}</finalName> + <resources> <resource> <directory>${project.basedir}/src/main/resources</directory> @@ -260,7 +262,7 @@ <stopPort>1270</stopPort> <contextXml>${basedir}/src/jetty/jetty-context.xml</contextXml> <webAppConfig> - <contextPath>/${defaultWebContextPath}</contextPath> + <contextPath>/${applicationName}</contextPath> </webAppConfig> </configuration> </plugin> @@ -269,7 +271,7 @@ <groupId>org.apache.tomcat.maven</groupId> <artifactId>tomcat7-maven-plugin</artifactId> <configuration> - <path>/${defaultWebContextPath}</path> + <path>/${applicationName}</path> <uriEncoding>UTF-8</uriEncoding> </configuration> </plugin> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm