branch develop updated (0a48322 -> f5cf4e1)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository echobase. See http://git.codelutin.com/echobase.git from 0a48322 [jgitflow-maven-plugin]Updating develop poms back to pre merge state new f5cf4e1 fix release build 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 f5cf4e1ee0e732db8c8752fd648ac9f8fb7380e1 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Dec 8 20:13:32 2014 +0100 fix release build Summary of changes: echobase-ui/pom.xml | 108 ++++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 92 insertions(+), 16 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 echobase. See http://git.codelutin.com/echobase.git commit f5cf4e1ee0e732db8c8752fd648ac9f8fb7380e1 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Dec 8 20:13:32 2014 +0100 fix release build --- echobase-ui/pom.xml | 108 ++++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 92 insertions(+), 16 deletions(-) diff --git a/echobase-ui/pom.xml b/echobase-ui/pom.xml index fa7d113..5f431be 100644 --- a/echobase-ui/pom.xml +++ b/echobase-ui/pom.xml @@ -1,6 +1,7 @@ <?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> @@ -35,7 +36,8 @@ <!-- release configuration --> <redmine.releaseFiles> ${project.build.directory}/${fullWarName}.war, - ${project.build.directory}/${embeddedWarName}.zip + ${project.build.directory}/${embeddedWarName}.zip, + ${project.build.directory}/${lizmapZipName}.zip </redmine.releaseFiles> <!-- Post Release configuration --> @@ -167,6 +169,14 @@ </configuration> </plugin> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <configuration> + <attach>false</attach> + <appendAssemblyId>false</appendAssemblyId> + </configuration> + </plugin> + </plugins> </pluginManagement> </build> @@ -369,7 +379,7 @@ </profile> <profile> - <id>assembly</id> + <id>build-embedded-war</id> <activation> <property> <name>skipAssembly</name> @@ -393,7 +403,7 @@ <phase>generate-resources</phase> <configuration> <target> - <mkdir dir="${embeddedTmpWarDir}/WEB-INF/classes" /> + <mkdir dir="${embeddedTmpWarDir}/WEB-INF/classes"/> </target> </configuration> <goals> @@ -503,14 +513,11 @@ </executions> </plugin> - <!-- Build embedded zip + full war --> + <!-- Build embedded zip --> <plugin> <artifactId>maven-assembly-plugin</artifactId> - <configuration> - <attach>false</attach> - <appendAssemblyId>false</appendAssemblyId> - </configuration> + <executions> <execution> <id>create-embedded-zip</id> @@ -525,31 +532,100 @@ <finalName>${embeddedWarName}</finalName> </configuration> </execution> + + </executions> + </plugin> + </plugins> + </build> + </profile> + + <profile> + <id>build-lizmap-zip</id> + <activation> + <property> + <name>skipAssembly</name> + <value>!true</value> + </property> + </activation> + <build> + <defaultGoal>package</defaultGoal> + <plugins> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <executions> <execution> - <id>create-full-war</id> + <id>create-lizmap-zip</id> <phase>package</phase> <goals> <goal>single</goal> </goals> <configuration> <descriptors> - <descriptor>src/main/assembly/full-war.xml</descriptor> + <descriptor>src/main/assembly/lizmap-zip.xml</descriptor> </descriptors> - <finalName>${fullWarName}</finalName> - <attach>true</attach> + <finalName>${lizmapZipName}</finalName> </configuration> </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + + <profile> + <id>build-full-war</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + <build> + <defaultGoal>package</defaultGoal> + <plugins> + + <!-- Build full war --> + + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <configuration> + <appendAssemblyId>false</appendAssemblyId> + <attach>false</attach> + </configuration> + <executions> <execution> - <id>create-lizmap-zip</id> + <id>create-full-war</id> <phase>package</phase> <goals> <goal>single</goal> </goals> <configuration> <descriptors> - <descriptor>src/main/assembly/lizmap-zip.xml</descriptor> + <descriptor>src/main/assembly/full-war.xml</descriptor> </descriptors> - <finalName>${lizmapZipName}</finalName> + <finalName>${fullWarName}</finalName> + <attach>true</attach> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + <version>1.9.1</version> + <executions> + <execution> + <goals> + <goal>attach-artifact</goal> + </goals> + <configuration> + <artifacts> + <artifact> + <file>${project.build.directory}/${fullWarName}.war</file> + <type>war</type> + <classifier>full</classifier> + </artifact> + </artifacts> </configuration> </execution> </executions> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm