Author: tchemit Date: 2013-02-25 14:33:57 +0100 (Mon, 25 Feb 2013) New Revision: 459 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/459 Log: prepare incremental release Modified: trunk/README.txt trunk/pom.xml trunk/tutti-ui-swing/pom.xml Modified: trunk/README.txt =================================================================== --- trunk/README.txt 2013-02-22 18:24:33 UTC (rev 458) +++ trunk/README.txt 2013-02-25 13:33:57 UTC (rev 459) @@ -0,0 +1,10 @@ +Faire une nouvelle version +-------------------------- + +Fournir la version de la base à utiliser, renseigner la propriété *dbVersion* + +mvn release:prepare|perform -Darguments=-DdbVersion=2013.02.02 + +Pour préparer une release complête, lancer la commande : + + mvn release:perform -Darguments="-DperformFullRelease -DdbVersion=2013.02.02" \ No newline at end of file Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-02-22 18:24:33 UTC (rev 458) +++ trunk/pom.xml 2013-02-25 13:33:57 UTC (rev 459) @@ -21,7 +21,9 @@ #L% --> -<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> @@ -165,7 +167,7 @@ <jreVersion>1.7.10</jreVersion> <!-- Last tutti db version --> - <dbVersion>2013.02.02</dbVersion> + <!--<dbVersion>2013.02.02</dbVersion>--> </properties> @@ -474,6 +476,46 @@ <profiles> <profile> + <id>check-release-profile</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + + <build> + <plugins> + <plugin> + <artifactId>maven-enforcer-plugin</artifactId> + <executions> + <execution> + <id>check-project-files</id> + <goals> + <goal>enforce</goal> + </goals> + <phase>initialize</phase> + <configuration> + <rules> + <requireProperty> + <property>dbVersion</property> + <message>You must set a dbVersion property!</message> + </requireProperty> + </rules> + <ignoreCache>true</ignoreCache> + <failFast>true</failFast> + <fail>true</fail> + + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + + + </profile> + <profile> <id>license-profile</id> <activation> <property> @@ -513,71 +555,74 @@ </profile> <profile> - <id>deploy-update</id> - <activation> - <property> - <name>performRelease</name> - <value>true</value> - </property> - </activation> + <id>deploy-update</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> - <build> - <plugins> - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <id>copy update-properties to site</id> - <phase>package</phase> - <inherited>false</inherited> - <configuration> - <tasks> - <echo message="Copy model to site" /> - <copy verbose="true" failonerror="false" overwrite="true" filtering="true" todir="${project.build.directory}/update"> - <filterset> - <filter value="${project.version}" token="projectVersion" /> - <filter value="${jreVersion}" token="jreVersion" /> - <filter value="${dbVersion}" token="dbVersion" /> - </filterset> - <fileset dir="${basedir}/src/update/"> - <include name="update-tutti.properties" /> - </fileset> - </copy> - </tasks> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - </executions> - </plugin> + <build> + <plugins> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <id>copy update-properties to site</id> + <phase>package</phase> + <inherited>false</inherited> + <configuration> + <tasks> + <echo message="Copy model to site"/> + <copy verbose="true" failonerror="false" overwrite="true" + filtering="true" + todir="${project.build.directory}/update"> + <filterset> + <filter value="${project.version}" + token="projectVersion"/> + <filter value="${jreVersion}" token="jreVersion"/> + <filter value="${dbVersion}" token="dbVersion"/> + </filterset> + <fileset dir="${basedir}/src/update/"> + <include name="update-tutti.properties"/> + </fileset> + </copy> + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>wagon-maven-plugin</artifactId> - <version>1.0-beta-4</version> - <executions> - <execution> - <phase>deploy</phase> - <inherited>false</inherited> - <goals> - <goal>upload-single</goal> - </goals> - <configuration> - <serverId>forge.codelutin.com</serverId> - <fromFile> - ${project.build.directory}/update/update-tutti.properties - </fromFile> - <url> - scpexe://forge.codelutin.com/var/www/ApplicationUpdate/http/tutti - </url> - </configuration> - </execution> - </executions> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>wagon-maven-plugin</artifactId> + <version>1.0-beta-4</version> + <executions> + <execution> + <phase>deploy</phase> + <inherited>false</inherited> + <goals> + <goal>upload-single</goal> + </goals> + <configuration> + <serverId>forge.codelutin.com</serverId> + <fromFile> + ${project.build.directory}/update/update-tutti.properties + </fromFile> + <url> + scpexe://forge.codelutin.com/var/www/ApplicationUpdate/http/tutti + </url> + </configuration> + </execution> + </executions> - </plugin> - </plugins> - </build> + </plugin> + </plugins> + </build> </profile> Modified: trunk/tutti-ui-swing/pom.xml =================================================================== --- trunk/tutti-ui-swing/pom.xml 2013-02-22 18:24:33 UTC (rev 458) +++ trunk/tutti-ui-swing/pom.xml 2013-02-25 13:33:57 UTC (rev 459) @@ -67,13 +67,6 @@ <bundlePrefix>tutti-${project.version}</bundlePrefix> - <redmine.releaseFiles> - target/${bundlePrefix}-full-windows-i586.zip, - target/${bundlePrefix}-full-windows-x64.zip, - target/${bundlePrefix}-full-linux-i586.zip, - target/${bundlePrefix}-full-linux-x64.zip - </redmine.releaseFiles> - <tutti.log.file>\$\{java.io.tmpdir\}\tutti-${project.version}.log</tutti.log.file> </properties> @@ -417,10 +410,32 @@ </profile> <profile> + <id>prepare-full-release</id> + <activation> + <property> + <name>performFullRelease</name> + <value>true</value> + </property> + </activation> + <properties> + + <redmine.releaseFiles> + target/${bundlePrefix}-full-windows-i586.zip, + target/${bundlePrefix}-full-windows-x64.zip, + target/${bundlePrefix}-full-linux-i586.zip, + target/${bundlePrefix}-full-linux-x64.zip + </redmine.releaseFiles> + </properties> + <build> + + </build> + </profile> + + <profile> <id>linux-x64-bundle</id> <activation> <property> - <name>performRelease</name> + <name>performFullRelease</name> <value>true</value> </property> </activation> @@ -486,7 +501,7 @@ <id>linux-i586-bundle</id> <activation> <property> - <name>performRelease</name> + <name>performFullRelease</name> <value>true</value> </property> </activation> @@ -552,7 +567,7 @@ <id>windows-i586-bundle</id> <activation> <property> - <name>performRelease</name> + <name>performFullRelease</name> <value>true</value> </property> </activation> @@ -618,7 +633,7 @@ <id>window-x64-bundle</id> <activation> <property> - <name>performRelease</name> + <name>performFullRelease</name> <value>true</value> </property> </activation>