Author: tchemit Date: 2013-02-02 16:07:13 +0100 (Sat, 02 Feb 2013) New Revision: 302 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/302 Log: refs #1711: [TECH] V?\195?\169rification de l'existence d'une nouvelle version Added: trunk/src/site/update/ Removed: trunk/src/site/resources/update/ Modified: trunk/pom.xml trunk/src/site/update/update-application.properties trunk/tutti-ui-swing/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-02-02 14:24:01 UTC (rev 301) +++ trunk/pom.xml 2013-02-02 15:07:13 UTC (rev 302) @@ -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> @@ -208,12 +210,6 @@ <classifier>tests</classifier> </dependency> - <dependency> - <groupId>org.apache.struts.xwork</groupId> - <artifactId>xwork-core</artifactId> - <version>${xworkVersion}</version> - </dependency> - <!-- librairie Jaxx --> <dependency> <groupId>org.nuiton.jaxx</groupId> @@ -279,7 +275,6 @@ <version>0.5.0</version> </dependency> - <dependency> <groupId>commons-dbcp</groupId> <artifactId>commons-dbcp</artifactId> @@ -299,37 +294,6 @@ <classifier>allegro</classifier> </dependency> - <dependency> - <groupId>fr.ird</groupId> - <artifactId>msaccess-importer</artifactId> - <version>${msaccessImporterVersion}</version> - <scope>compile</scope> - <exclusions> - <exclusion> - <groupId>com.healthmarketscience.jackcess</groupId> - <artifactId>jackcess</artifactId> - </exclusion> - <exclusion> - <groupId>org.nuiton.topia</groupId> - <artifactId>topia-persistence</artifactId> - </exclusion> - </exclusions> - </dependency> - - <!-- base h2 --> - <dependency> - <groupId>com.h2database</groupId> - <artifactId>h2</artifactId> - <version>${h2Version}</version> - </dependency> - - <!-- base postgres --> - <dependency> - <groupId>postgresql</groupId> - <artifactId>postgresql</artifactId> - <version>${postgresqlVersion}</version> - </dependency> - <!-- Logging --> <dependency> <groupId>org.slf4j</groupId> @@ -343,7 +307,6 @@ <version>${slf4jVersion}</version> </dependency> - <!-- Pour SPRING : --> <dependency> <groupId>org.springframework</groupId> @@ -367,32 +330,12 @@ </dependency> <dependency> <groupId>org.springframework</groupId> - <artifactId>spring-orm</artifactId> - <version>${spring.version}</version> - </dependency> - <dependency> - <groupId>org.springframework</groupId> <artifactId>spring-tx</artifactId> <version>${spring.version}</version> </dependency> - <!-- Spring AOP + AspectJ --> + <dependency> <groupId>org.springframework</groupId> - <artifactId>spring-aop</artifactId> - <version>${spring.version}</version> - </dependency> - <dependency> - <groupId>org.aspectj</groupId> - <artifactId>aspectjrt</artifactId> - <version>${aspectj.version}</version> - </dependency> - <dependency> - <groupId>org.aspectj</groupId> - <artifactId>aspectjweaver</artifactId> - <version>${aspectj.version}</version> - </dependency> - <dependency> - <groupId>org.springframework</groupId> <artifactId>spring-test</artifactId> <version>${spring.version}</version> <scope>test</scope> @@ -415,7 +358,7 @@ <artifactId>yamlbeans</artifactId> <version>1.06</version> </dependency> - + <dependency> <groupId>com.javadocmd</groupId> <artifactId>simplelatlng</artifactId> @@ -583,6 +526,40 @@ </property> </activation> + <build> + <plugins> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <id>copy update-properties to site</id> + <phase>pre-site</phase> + <inherited>false</inherited> + <configuration> + <tasks> + <echo message="Copy model to site"/> + <copy verbose="${maven.verbose}" failonerror="false" + overwrite="true" filtering="true" + todir="${project.reporting.outputDirectory}/update"> + <filterset> + <filter value="${project.version}" token="projectVersion"/> + <filter value="${jreVersion}" token="jreVersion"/> + </filterset> + <fileset dir="${basedir}/src/site/update/"> + <include name="**/*.properties"/> + </fileset> + </copy> + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + <reporting> <plugins> Modified: trunk/src/site/update/update-application.properties =================================================================== --- trunk/src/site/resources/update/update-application.properties 2013-02-02 13:05:14 UTC (rev 299) +++ trunk/src/site/update/update-application.properties 2013-02-02 15:07:13 UTC (rev 302) @@ -21,14 +21,14 @@ # <http://www.gnu.org/licenses/gpl-3.0.html>. # #L% ### -tutti.version=${project.Version} -tutti.url=zip:http://nexus.nuiton.org/nexus/content/repositories/other-releases/fr/ifremer/tutti/tutti-ui-swing/tutti-${project.Version}-standalone.zip -jre.version=${jreVersion} -#linux.amd64.jre.version=${jreVersion} -linux.amd64.jre.url=zip:http://nexus.nuiton.org/nexus/content/repositories/jvm/com/oracle/jre/${jreVersion}/jre-${jreVersion}-linux-x64.jar -#linux.i386.jre.version=${jreVersion} -linux.i386.jre.url=zip:http://nexus.nuiton.org/nexus/content/repositories/jvm/com/oracle/jre/${jreVersion}/jre-${jreVersion}-linux-i586.jar -#windows.amd64.jre.version=${jreVersion} -windows.amd64.jre.url=zip:http://nexus.nuiton.org/nexus/content/repositories/jvm/com/oracle/jre/${jreVersion}/jre-${jreVersion}-windows-x64.jar -#windows.i386.jre.version=${jreVersion} -windows.i386.jre.url=zip:http://nexus.nuiton.org/nexus/content/repositories/jvm/com/oracle/jre/${jreVersion}/jre-${jreVersion}-windows-i586.jar +tutti.version=@projectVersion@ +tutti.url=zip:http://nexus.nuiton.org/nexus/content/repositories/other-releases/fr/ifremer... +jre.version=@jreVersion@ +#linux.amd64.jre.version=@jreVersion@ +linux.amd64.jre.url=zip:http://nexus.nuiton.org/nexus/content/repositories/jvm/com/oracle/jre/@jreVe... +#linux.i386.jre.version=@jreVersion@ +linux.i386.jre.url=zip:http://nexus.nuiton.org/nexus/content/repositories/jvm/com/oracle/jre/@jreVe... +#windows.amd64.jre.version=@jreVersion@ +windows.amd64.jre.url=zip:http://nexus.nuiton.org/nexus/content/repositories/jvm/com/oracle/jre/@jreVe... +#windows.i386.jre.version=@jreVersion@ +windows.i386.jre.url=zip:http://nexus.nuiton.org/nexus/content/repositories/jvm/com/oracle/jre/@jreVe... Modified: trunk/tutti-ui-swing/pom.xml =================================================================== --- trunk/tutti-ui-swing/pom.xml 2013-02-02 14:24:01 UTC (rev 301) +++ trunk/tutti-ui-swing/pom.xml 2013-02-02 15:07:13 UTC (rev 302) @@ -473,21 +473,19 @@ <plugin> <artifactId>maven-assembly-plugin</artifactId> <configuration> - <attach>false</attach> <finalName>${bundlePrefix}</finalName> </configuration> <executions> <execution> + <id>assembly-full</id> <phase>package</phase> <goals> <goal>single</goal> </goals> <configuration> + <attach>false</attach> <descriptors> <descriptor> - src/main/assembly/standalone.xml - </descriptor> - <descriptor> src/main/assembly/full-linux-i586.xml </descriptor> <descriptor> @@ -502,6 +500,21 @@ </descriptors> </configuration> </execution> + <execution> + <id>assembly-standalone</id> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + <configuration> + <attach>true</attach> + <descriptors> + <descriptor> + src/main/assembly/standalone.xml + </descriptor> + </descriptors> + </configuration> + </execution> </executions> </plugin> </plugins>