October 2010 - Guix-commits - mailman.cloud.codelutin.com

r1660 - trunk
by tchemit＠users.nuiton.org Oct. 29, 2010

Oct. 29, 2010

Author: tchemit Date: 2010-10-29 10:30:13 +0200 (Fri, 29 Oct 2010) New Revision: 1660 Url: http://nuiton.org/repositories/revision/guix/1660 Log: Update mavenpom4redmine to 2.4. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-10-26 14:43:19 UTC (rev 1659) +++ trunk/pom.xml 2010-10-29 08:30:13 UTC (rev 1660) @@ -1,7 +1,5 @@ <?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/maven-v4_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/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -11,7 +9,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.4-SNAPSHOT</version> + <version>2.4</version> </parent> <artifactId>guix</artifactId>

1 0

r1659 - in trunk: . guix-compiler-gwt guix-test-gwt maven-guix-gwt-archetype maven-guix-plugin maven-guix-swing-archetype
by tchemit＠users.nuiton.org Oct. 26, 2010

Oct. 26, 2010

Author: tchemit Date: 2010-10-26 16:43:19 +0200 (Tue, 26 Oct 2010) New Revision: 1659 Url: http://nuiton.org/repositories/revision/guix/1659 Log: fix all warnings of this dirty thing + use mavenpom 2.4-SNAPSHOT Modified: trunk/guix-compiler-gwt/pom.xml trunk/guix-test-gwt/pom.xml trunk/maven-guix-gwt-archetype/pom.xml trunk/maven-guix-plugin/pom.xml trunk/maven-guix-swing-archetype/pom.xml trunk/pom.xml Modified: trunk/guix-compiler-gwt/pom.xml =================================================================== --- trunk/guix-compiler-gwt/pom.xml 2010-10-17 01:39:08 UTC (rev 1658) +++ trunk/guix-compiler-gwt/pom.xml 2010-10-26 14:43:19 UTC (rev 1659) @@ -1,135 +1,138 @@ <?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/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> +<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/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> -  -  -  - <parent> - <groupId>org.nuiton</groupId> - <artifactId>guix</artifactId> - <version>1.0.1-SNAPSHOT</version> - </parent> +  +  +  + <parent> + <groupId>org.nuiton</groupId> + <artifactId>guix</artifactId> + <version>1.0.1-SNAPSHOT</version> + </parent> - <groupId>org.nuiton.guix</groupId> - <artifactId>guix-compiler-gwt</artifactId> + <groupId>org.nuiton.guix</groupId> + <artifactId>guix-compiler-gwt</artifactId> - <dependencies> + <dependencies> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>guix-compiler</artifactId> - <version>${project.version}</version> - </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>guix-compiler</artifactId> + <version>${project.version}</version> + </dependency> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </dependency> - <dependency> - <groupId>com.google.gwt</groupId> - <artifactId>gwt-servlet</artifactId> - <scope>runtime</scope> - </dependency> + <dependency> + <groupId>com.google.gwt</groupId> + <artifactId>gwt-servlet</artifactId> + <scope>runtime</scope> + </dependency> - <dependency> - <groupId>com.google.gwt</groupId> - <artifactId>gwt-user</artifactId> - <scope>provided</scope> - </dependency> + <dependency> + <groupId>com.google.gwt</groupId> + <artifactId>gwt-user</artifactId> + <scope>provided</scope> + </dependency> - <dependency> - <groupId>com.google.gwt</groupId> - <artifactId>gwt-dev</artifactId> - <type>zip</type> - <classifier>${gwtplatform}-libs</classifier> - <scope>libs</scope> - </dependency> + <dependency> + <groupId>com.google.gwt</groupId> + <artifactId>gwt-dev</artifactId> + <type>zip</type> + <classifier>${gwtplatform}-libs</classifier> + <scope>provided</scope> + </dependency> - <dependency> - <groupId>com.google.gwt</groupId> - <artifactId>gwt-dev</artifactId> - <classifier>${gwtplatform}</classifier> - <scope>provided</scope> - </dependency> + <dependency> + <groupId>com.google.gwt</groupId> + <artifactId>gwt-dev</artifactId> + <classifier>${gwtplatform}</classifier> + <scope>provided</scope> + </dependency> - <dependency> - <groupId>net.sf.gwt-widget</groupId> - <artifactId>gwt-widgets</artifactId> - <version>0.2.0</version> - </dependency> + <dependency> + <groupId>net.sf.gwt-widget</groupId> + <artifactId>gwt-widgets</artifactId> + </dependency> - <dependency> - <groupId>xpp3</groupId> - <artifactId>xpp3</artifactId> - </dependency> + <dependency> + <groupId>xpp3</groupId> + <artifactId>xpp3</artifactId> + </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </dependency> - </dependencies> + </dependencies> -  -  -  - <name>guix-compiler-gwt</name> - <description>Guix compiler for GWT</description> +  +  +  + <name>guix-compiler-gwt</name> + <description>Guix compiler for GWT</description> -  -  -  +  +  +  - <packaging>jar</packaging> + <packaging>jar</packaging> -  -  -  - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <id>unpack</id> - <phase>compile</phase> - <goals> - <goal>unpack</goal> - </goals> - <configuration> - <artifactItems> - <artifactItem> - <groupId>com.google.gwt</groupId> - <artifactId>gwt-dev</artifactId> - <version>${gwt.version}</version> - <classifier>${gwtplatform}-libs</classifier> - <type>zip</type> - <overWrite>false</overWrite> - <outputDirectory>${settings.localRepository}/com/google/gwt/gwt-dev/${gwt.version}</outputDirectory> - </artifactItem> - </artifactItems> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> +  +  +  + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <id>unpack</id> + <phase>compile</phase> + <goals> + <goal>unpack</goal> + </goals> + <configuration> + <artifactItems> + <artifactItem> + <groupId>com.google.gwt</groupId> + <artifactId>gwt-dev</artifactId> + <version>${gwtVersion}</version> + <classifier>${gwtplatform}-libs</classifier> + <type>zip</type> + <overWrite>false</overWrite> + <outputDirectory> + ${settings.localRepository}/com/google/gwt/gwt-dev/${gwtVersion} + </outputDirectory> + </artifactItem> + </artifactItems> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> - <repositories> - <repository> - <id>gwt-maven</id> - <url>http://gwt-maven.googlecode.com/svn/trunk/mavenrepo/</url> - </repository> - </repositories> - <pluginRepositories> - <pluginRepository> - <id>gwt-maven-plugins</id> - <url>http://gwt-maven.googlecode.com/svn/trunk/mavenrepo/</url> - </pluginRepository> - </pluginRepositories> + <repositories> + <repository> + <id>gwt-maven</id> + <url>http://gwt-maven.googlecode.com/svn/trunk/mavenrepo/</url> + </repository> + </repositories> + <pluginRepositories> + <pluginRepository> + <id>gwt-maven-plugins</id> + <url>http://gwt-maven.googlecode.com/svn/trunk/mavenrepo/</url> + </pluginRepository> + </pluginRepositories> </project> Modified: trunk/guix-test-gwt/pom.xml =================================================================== --- trunk/guix-test-gwt/pom.xml 2010-10-17 01:39:08 UTC (rev 1658) +++ trunk/guix-test-gwt/pom.xml 2010-10-26 14:43:19 UTC (rev 1659) @@ -1,233 +1,237 @@ <?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/maven-v4_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/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> - <parent> - <artifactId>guix</artifactId> - <groupId>org.nuiton</groupId> - <version>1.0.1-SNAPSHOT</version> - </parent> - - <groupId>org.nuiton.guix</groupId> - <artifactId>guix-test-gwt</artifactId> + <modelVersion>4.0.0</modelVersion> + <parent> + <artifactId>guix</artifactId> + <groupId>org.nuiton</groupId> + <version>1.0.1-SNAPSHOT</version> + </parent> - <dependencies> - <dependency> - <groupId>com.google.gwt</groupId> - <artifactId>gwt-servlet</artifactId> - <scope>runtime</scope> - </dependency> + <groupId>org.nuiton.guix</groupId> + <artifactId>guix-test-gwt</artifactId> - <dependency> - <groupId>com.google.gwt</groupId> - <artifactId>gwt-user</artifactId> - <scope>provided</scope> - </dependency> + <dependencies> + <dependency> + <groupId>com.google.gwt</groupId> + <artifactId>gwt-servlet</artifactId> + <scope>runtime</scope> + </dependency> - <dependency> - <groupId>com.google.gwt</groupId> - <artifactId>gwt-dev</artifactId> - <type>zip</type> - <classifier>${gwtplatform}-libs</classifier> - <scope>provided</scope> - </dependency> + <dependency> + <groupId>com.google.gwt</groupId> + <artifactId>gwt-user</artifactId> + <scope>provided</scope> + </dependency> - <dependency> - <groupId>com.google.gwt</groupId> - <artifactId>gwt-dev</artifactId> - <classifier>${gwtplatform}</classifier> - <scope>provided</scope> - </dependency> + <dependency> + <groupId>com.google.gwt</groupId> + <artifactId>gwt-dev</artifactId> + <type>zip</type> + <classifier>${gwtplatform}-libs</classifier> + <scope>provided</scope> + </dependency> - <dependency> - <groupId>com.google.code.gwtx</groupId> - <artifactId>gwtx</artifactId> - <version>1.5.0</version> - </dependency> + <dependency> + <groupId>com.google.gwt</groupId> + <artifactId>gwt-dev</artifactId> + <classifier>${gwtplatform}</classifier> + <scope>provided</scope> + </dependency> - <dependency> - <groupId>net.sf.gwt-widget</groupId> - <artifactId>gwt-widgets</artifactId> - <version>0.2.0</version> - </dependency> + <dependency> + <groupId>com.google.code.gwtx</groupId> + <artifactId>gwtx</artifactId> + </dependency> - <dependency> - <groupId>com.google.code.gwt-math</groupId> - <artifactId>gwt-math</artifactId> - <version>2.0.3</version> - </dependency> + <dependency> + <groupId>net.sf.gwt-widget</groupId> + <artifactId>gwt-widgets</artifactId> + </dependency> - <dependency> - <groupId>com.google.code.gwtx</groupId> - <artifactId>gwtx</artifactId> - <version>1.5.0</version> - </dependency> + <dependency> + <groupId>com.google.code.gwt-math</groupId> + <artifactId>gwt-math</artifactId> + </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </dependency> - </dependencies> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </dependency> + </dependencies> -  -  -  - <packaging>war</packaging> +  +  +  + <packaging>war</packaging> -  -  -  - <name>guix-test-gwt</name> - <description>Guix test for GWT</description> +  +  +  + <name>guix-test-gwt</name> + <description>Guix test for GWT</description> - <build> - <resources> - <resource> - <directory>${project.basedir}/src/main/java</directory> - <includes> - <include>**/*</include> - </includes> - </resource> - <resource> - <directory>${project.basedir}/target/generatedFiles/java</directory> - <includes> - <include>**/*</include> - </includes> - </resource> - </resources> - <plugins> - <plugin> - <groupId>org.mortbay.jetty</groupId> - <artifactId>maven-jetty-plugin</artifactId> - </plugin> -  - <plugin> - <groupId>org.nuiton</groupId> - <artifactId>maven-i18n-plugin</artifactId> - <version>1.0.0-alpha-1</version> - </plugin> + <build> + <resources> + <resource> + <directory>${project.basedir}/src/main/java</directory> + <includes> + <include>**/*</include> + </includes> + </resource> + <resource> + <directory>${project.basedir}/target/generatedFiles/java</directory> + <includes> + <include>**/*</include> + </includes> + </resource> + </resources> -  - <plugin> - <groupId>com.totsp.gwt</groupId> - <artifactId>maven-googlewebtoolkit2-plugin</artifactId> - <version>2.0-RC1</version> - <configuration> - <logLevel>INFO</logLevel> - <compileTargets> - <value>org.nuiton.guix.Index</value> - </compileTargets> - <runTarget>org.nuiton.guix.Index/Index.html</runTarget> - <style>DETAILED</style> - <noServer>false</noServer> - <extraJvmArgs>-Xmx512m</extraJvmArgs> -  -  - <gwtVersion>${gwt.version}</gwtVersion> - </configuration> - <executions> - <execution> - <goals> - <goal>compile</goal> - </goals> - </execution> - </executions> - </plugin> -  -  - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <id>unpack</id> - <phase>compile</phase> - <goals> - <goal>unpack</goal> - </goals> - <configuration> - <artifactItems> - <artifactItem> - <groupId>com.google.gwt</groupId> - <artifactId>gwt-dev</artifactId> - <version>${gwt.version}</version> - <classifier>${gwtplatform}-libs</classifier> - <type>zip</type> - <overWrite>false</overWrite> - <outputDirectory>${settings.localRepository}/com/google/gwt/gwt-dev/${gwt.version}</outputDirectory> - </artifactItem> - </artifactItems> - </configuration> - </execution> - </executions> - </plugin> -  - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-war-plugin</artifactId> - <configuration> - <warSourceDirectory>${basedir}/target/generatedFiles/webapp</warSourceDirectory> - <warSourceExcludes>.gwt-tmp/**</warSourceExcludes> - </configuration> - </plugin> -  - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.6</source> - <target>1.6</target> - </configuration> - </plugin> + <pluginManagement> + <plugins> + <plugin> + <artifactId>maven-dependency-plugin</artifactId> + <configuration> + <outputDirectory>${project.build.directory}/lib</outputDirectory> + </configuration> + </plugin> + </plugins> + </pluginManagement> + <plugins> + <plugin> + <groupId>org.mortbay.jetty</groupId> + <artifactId>maven-jetty-plugin</artifactId> + </plugin> +  + <plugin> + <groupId>org.nuiton</groupId> + <artifactId>maven-i18n-plugin</artifactId> + <version>1.0.0-alpha-1</version> + </plugin> - <plugin> - <groupId>org.nuiton.guix</groupId> - <artifactId>maven-guix-plugin</artifactId> - <version>${project.version}</version> - <configuration> - <guixFilesDir>${project.basedir}/src/main/java/org/nuiton/guix/client/demo/</guixFilesDir> - <targetDirectory>${project.basedir}/target/generatedFiles/</targetDirectory> - <mainClass>org.nuiton.guix.client.demo.GuixDemo</mainClass> - <launcherName>org.nuiton.guix.Index</launcherName> - <generationLanguage>GWT</generationLanguage> - </configuration> - <executions> - <execution> - <goals> - <goal>generate</goal> - </goals> - </execution> - </executions> - </plugin> +  + <plugin> + <groupId>com.totsp.gwt</groupId> + <artifactId>maven-googlewebtoolkit2-plugin</artifactId> + <version>2.0-RC1</version> + <configuration> + <logLevel>INFO</logLevel> + <compileTargets> + <value>org.nuiton.guix.Index</value> + </compileTargets> + <runTarget>org.nuiton.guix.Index/Index.html</runTarget> + <style>DETAILED</style> + <noServer>false</noServer> + <extraJvmArgs>-Xmx512m</extraJvmArgs> +  +  + <gwtVersion>${gwtVersion}</gwtVersion> + </configuration> + <executions> + <execution> + <goals> + <goal>compile</goal> + </goals> + </execution> + </executions> + </plugin> +  +  + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <id>unpack</id> + <phase>compile</phase> + <goals> + <goal>unpack</goal> + </goals> + <configuration> + <artifactItems> + <artifactItem> + <groupId>com.google.gwt</groupId> + <artifactId>gwt-dev</artifactId> + <version>${gwtVersion}</version> + <classifier>${gwtplatform}-libs</classifier> + <type>zip</type> + <overWrite>false</overWrite> + <outputDirectory> + ${settings.localRepository}/com/google/gwt/gwt-dev/${gwtVersion} + </outputDirectory> + </artifactItem> + </artifactItems> + </configuration> + </execution> + </executions> + </plugin> +  + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-war-plugin</artifactId> + <configuration> + <warSourceDirectory>${basedir}/target/generatedFiles/webapp + </warSourceDirectory> + <warSourceExcludes>.gwt-tmp/**</warSourceExcludes> + </configuration> + </plugin> +  + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>1.6</source> + <target>1.6</target> + </configuration> + </plugin> - <plugin> - <artifactId>maven-dependency-plugin</artifactId> - <configuration> - <outputDirectory>${project.build.directory}/lib</outputDirectory> - </configuration> - </plugin> - </plugins> - </build> + <plugin> + <groupId>org.nuiton.guix</groupId> + <artifactId>maven-guix-plugin</artifactId> + <version>${project.version}</version> + <configuration> + <guixFilesDir> + ${project.basedir}/src/main/java/org/nuiton/guix/client/demo/ + </guixFilesDir> + <targetDirectory>${project.basedir}/target/generatedFiles/ + </targetDirectory> + <mainClass>org.nuiton.guix.client.demo.GuixDemo</mainClass> + <launcherName>org.nuiton.guix.Index</launcherName> + <generationLanguage>GWT</generationLanguage> + </configuration> + <executions> + <execution> + <goals> + <goal>generate</goal> + </goals> + </execution> + </executions> + </plugin> - <repositories> - <repository> - <id>gwt-maven</id> - <url>http://gwt-maven.googlecode.com/svn/trunk/mavenrepo/</url> - </repository> - </repositories> - <pluginRepositories> - <pluginRepository> - <id>gwt-maven-plugins</id> - <url>http://gwt-maven.googlecode.com/svn/trunk/mavenrepo/</url> - </pluginRepository> - </pluginRepositories> + </plugins> + </build> + <repositories> + <repository> + <id>gwt-maven</id> + <url>http://gwt-maven.googlecode.com/svn/trunk/mavenrepo/</url> + </repository> + </repositories> + <pluginRepositories> + <pluginRepository> + <id>gwt-maven-plugins</id> + <url>http://gwt-maven.googlecode.com/svn/trunk/mavenrepo/</url> + </pluginRepository> + </pluginRepositories> + </project> Modified: trunk/maven-guix-gwt-archetype/pom.xml =================================================================== --- trunk/maven-guix-gwt-archetype/pom.xml 2010-10-17 01:39:08 UTC (rev 1658) +++ trunk/maven-guix-gwt-archetype/pom.xml 2010-10-26 14:43:19 UTC (rev 1659) @@ -6,7 +6,7 @@ <groupId>org.nuiton</groupId> <version>1.0.1-SNAPSHOT</version> </parent> - <name>${artifactId}</name> + <name>${project.artifactId}</name> <groupId>org.nuiton.guix</groupId> <artifactId>maven-guix-gwt-archetype</artifactId> <packaging>jar</packaging> Modified: trunk/maven-guix-plugin/pom.xml =================================================================== --- trunk/maven-guix-plugin/pom.xml 2010-10-17 01:39:08 UTC (rev 1658) +++ trunk/maven-guix-plugin/pom.xml 2010-10-26 14:43:19 UTC (rev 1659) @@ -1,146 +1,160 @@ <?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> + <modelVersion>4.0.0</modelVersion> -  -  -  +  +  +  - <parent> - <groupId>org.nuiton</groupId> - <artifactId>guix</artifactId> - <version>1.0.1-SNAPSHOT</version> - </parent> + <parent> + <groupId>org.nuiton</groupId> + <artifactId>guix</artifactId> + <version>1.0.1-SNAPSHOT</version> + </parent> - <groupId>org.nuiton.guix</groupId> - <artifactId>maven-guix-plugin</artifactId> + <groupId>org.nuiton.guix</groupId> + <artifactId>maven-guix-plugin</artifactId> - <dependencies> + <dependencies> -  +  - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>guix-compiler-swing</artifactId> - <version>${project.version}</version> - </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>guix-compiler-swing</artifactId> + <version>${project.version}</version> + </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>guix-compiler-gwt</artifactId> - <version>${project.version}</version> - </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>guix-compiler-gwt</artifactId> + <version>${project.version}</version> + </dependency> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </dependency> - -  + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </dependency> - <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-plugin-api</artifactId> - </dependency> +  - <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-project</artifactId> - </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-plugin-api</artifactId> + </dependency> -  + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-project</artifactId> + </dependency> - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>maven-helper-plugin</artifactId> - </dependency> +  -  - <dependency> - <groupId>com.sun</groupId> - <artifactId>dt</artifactId> -  - <scope>system</scope> - <systemPath>/${java.home}/../lib/dt.jar</systemPath> - </dependency> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>maven-helper-plugin</artifactId> + </dependency> -  +  + <dependency> + <groupId>com.sun</groupId> + <artifactId>dt</artifactId> +  + <scope>system</scope> + <systemPath>/${java.home}/../lib/dt.jar</systemPath> + </dependency> - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>maven-helper-plugin</artifactId> - <classifier>tests</classifier> - <scope>test</scope> - </dependency> +  -  +  - <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - </dependency> + <dependency> + <groupId>org.apache.velocity</groupId> + <artifactId>velocity</artifactId> + </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </dependency> + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + </dependency> - </dependencies> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </dependency> -  -  -  + </dependencies> - <name>maven-guix-plugin</name> - <description>Maven 2 plugin to generate java source from ui interface definitions - in guix format.</description> +  +  +  -  -  -  + <name>maven-guix-plugin</name> + <description>Maven 2 plugin to generate java source from ui interface + definitions + in guix format. + </description> - <packaging>maven-plugin</packaging> - <build> - <plugins> +  +  +  - <plugin> - <artifactId>maven-plugin-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>helpmojo</goal> - </goals> - </execution> - </executions> - </plugin> + <packaging>maven-plugin</packaging> + <build> - </plugins> - </build> + <pluginManagement> + <plugins> + <plugin> + <artifactId>maven-plugin-plugin</artifactId> + <version>2.6</version> + </plugin> + </plugins> + </pluginManagement> + <plugins> - <reporting> - <plugins> - <plugin> - <artifactId>maven-plugin-plugin</artifactId> - </plugin> - </plugins> - </reporting> + <plugin> + <artifactId>maven-plugin-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>helpmojo</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + + <reporting> + <plugins> + <plugin> + <artifactId>maven-plugin-plugin</artifactId> + <version>2.6</version> + </plugin> + </plugins> + </reporting> + </project> Modified: trunk/maven-guix-swing-archetype/pom.xml =================================================================== --- trunk/maven-guix-swing-archetype/pom.xml 2010-10-17 01:39:08 UTC (rev 1658) +++ trunk/maven-guix-swing-archetype/pom.xml 2010-10-26 14:43:19 UTC (rev 1659) @@ -6,7 +6,7 @@ <groupId>org.nuiton</groupId> <version>1.0.1-SNAPSHOT</version> </parent> - <name>${artifactId}</name> + <name>${project.artifactId}</name> <groupId>org.nuiton.guix</groupId> <artifactId>maven-guix-swing-archetype</artifactId> <packaging>jar</packaging> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-10-17 01:39:08 UTC (rev 1658) +++ trunk/pom.xml 2010-10-26 14:43:19 UTC (rev 1659) @@ -1,388 +1,410 @@ <?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/maven-v4_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/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> + <modelVersion>4.0.0</modelVersion> -  -  -  - <parent> - <groupId>org.nuiton</groupId> - <artifactId>mavenpom4redmine</artifactId> - <version>2.3.2</version> - </parent> +  +  +  + <parent> + <groupId>org.nuiton</groupId> + <artifactId>mavenpom4redmine</artifactId> + <version>2.4-SNAPSHOT</version> + </parent> - <artifactId>guix</artifactId> - <version>1.0.1-SNAPSHOT</version> + <artifactId>guix</artifactId> + <version>1.0.1-SNAPSHOT</version> - <modules> - <module>guix-compiler</module> - <module>guix-compiler-swing</module> - <module>guix-compiler-gwt</module> - <module>maven-guix-plugin</module> - <module>guix-test-swing</module> - <module>guix-test-gwt</module> - <module>maven-guix-swing-archetype</module> - <module>maven-guix-gwt-archetype</module> + <modules> + <module>guix-compiler</module> + <module>guix-compiler-swing</module> + <module>guix-compiler-gwt</module> + <module>maven-guix-plugin</module> + <module>guix-test-swing</module> + <module>guix-test-gwt</module> + <module>maven-guix-swing-archetype</module> + <module>maven-guix-gwt-archetype</module> - </modules> + </modules> - <dependencyManagement> - <dependencies> + <dependencyManagement> + <dependencies> -  +  - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> - <version>1.1.0</version> - </dependency> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + <version>1.1.0</version> + </dependency> - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>maven-helper-plugin</artifactId> - <version>${helper.version}</version> - <scope>compile</scope> - <exclusions> - <exclusion> - <groupId>org.apache.maven</groupId> - <artifactId>maven-artifact</artifactId> - </exclusion> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>maven-helper-plugin</artifactId> + <version>${helperPluginVersion}</version> + <scope>compile</scope> + <exclusions> + <exclusion> + <groupId>org.apache.maven</groupId> + <artifactId>maven-artifact</artifactId> + </exclusion> - <exclusion> - <groupId>org.apache.maven</groupId> - <artifactId>maven-artifact-manager</artifactId> - </exclusion> + <exclusion> + <groupId>org.apache.maven</groupId> + <artifactId>maven-artifact-manager</artifactId> + </exclusion> - <exclusion> - <groupId>org.apache.maven</groupId> - <artifactId>maven-model</artifactId> - </exclusion> + <exclusion> + <groupId>org.apache.maven</groupId> + <artifactId>maven-model</artifactId> + </exclusion> - <exclusion> - <groupId>org.apache.maven</groupId> - <artifactId>maven-profile</artifactId> - </exclusion> + <exclusion> + <groupId>org.apache.maven</groupId> + <artifactId>maven-profile</artifactId> + </exclusion> - <exclusion> - <groupId>org.apache.maven</groupId> - <artifactId>maven-settings</artifactId> - </exclusion> - <exclusion> - <groupId>commons-httpclient</groupId> - <artifactId>commons-httpclient</artifactId> - </exclusion> + <exclusion> + <groupId>org.apache.maven</groupId> + <artifactId>maven-settings</artifactId> + </exclusion> + <exclusion> + <groupId>commons-httpclient</groupId> + <artifactId>commons-httpclient</artifactId> + </exclusion> - <exclusion> - <groupId>plexus</groupId> - <artifactId>plexus-mail-sender-simple</artifactId> - </exclusion> + <exclusion> + <groupId>plexus</groupId> + <artifactId>plexus-mail-sender-simple</artifactId> + </exclusion> - <exclusion> - <groupId>plexus</groupId> - <artifactId>plexus-mail-sender-api</artifactId> - </exclusion> + <exclusion> + <groupId>plexus</groupId> + <artifactId>plexus-mail-sender-api</artifactId> + </exclusion> - <exclusion> - <groupId>plexus</groupId> - <artifactId>plexus-mail-sender-javamail</artifactId> - </exclusion> + <exclusion> + <groupId>plexus</groupId> + <artifactId>plexus-mail-sender-javamail</artifactId> + </exclusion> - <exclusion> - <groupId>javax.mail</groupId> - <artifactId>mail</artifactId> - </exclusion> + <exclusion> + <groupId>javax.mail</groupId> + <artifactId>mail</artifactId> + </exclusion> - <exclusion> - <groupId>org.sonatype.plexus</groupId> - <artifactId>plexus-cipher</artifactId> - </exclusion> + <exclusion> + <groupId>org.sonatype.plexus</groupId> + <artifactId>plexus-cipher</artifactId> + </exclusion> - <exclusion> - <groupId>org.sonatype.plexus</groupId> - <artifactId>plexus-sec-dispatcher</artifactId> - </exclusion> + <exclusion> + <groupId>org.sonatype.plexus</groupId> + <artifactId>plexus-sec-dispatcher</artifactId> + </exclusion> - </exclusions> - </dependency> + </exclusions> + </dependency> -  +  - <dependency> - <groupId>commons-jxpath</groupId> - <artifactId>commons-jxpath</artifactId> - <version>1.3</version> - </dependency> +  -  +  - <dependency> - <groupId>com.sun</groupId> - <artifactId>dt</artifactId> - <version>${java.version}</version> - <scope>system</scope> - <systemPath>/${java.home}/../lib/dt.jar</systemPath> - </dependency> + <dependency> + <groupId>com.sun</groupId> + <artifactId>dt</artifactId> + <version>${java.version}</version> + <scope>system</scope> + <systemPath>/${java.home}/../lib/dt.jar</systemPath> + </dependency> - <dependency> - <groupId>javax.help</groupId> - <artifactId>javahelp</artifactId> - <version>2.0.02</version> - </dependency> + <dependency> + <groupId>javax.help</groupId> + <artifactId>javahelp</artifactId> + <version>2.0.02</version> + </dependency> -  +  - <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-plugin-api</artifactId> - <version>${maven.version}</version> - <scope>provided</scope> - </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-plugin-api</artifactId> + <version>${mavenVersion}</version> + <scope>provided</scope> + </dependency> - <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-project</artifactId> - <version>${maven.version}</version> - <scope>provided</scope> - </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-project</artifactId> + <version>${mavenVersion}</version> + <scope>provided</scope> + </dependency> -  +  - <dependency> - <groupId>com.opensymphony</groupId> - <artifactId>xwork</artifactId> - <version>2.1.3</version> - </dependency> + <dependency> + <groupId>com.opensymphony</groupId> + <artifactId>xwork</artifactId> + <version>2.1.3</version> + </dependency> -  +  - <dependency> - <groupId>org.swinglabs</groupId> - <artifactId>jxlayer</artifactId> - <version>3.0.3</version> - </dependency> + <dependency> + <groupId>org.swinglabs</groupId> + <artifactId>jxlayer</artifactId> + <version>3.0.3</version> + </dependency> - <dependency> - <groupId>xpp3</groupId> - <artifactId>xpp3</artifactId> - <version>1.1.4c</version> - </dependency> + <dependency> + <groupId>xpp3</groupId> + <artifactId>xpp3</artifactId> + <version>1.1.4c</version> + </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-core</artifactId> - <version>${spring.version}</version> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-beans</artifactId> - <version>${spring.version}</version> - </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-core</artifactId> + <version>${springVersion}</version> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-beans</artifactId> + <version>${springVersion}</version> + </dependency> - <dependency> - <groupId>org.apache.velocity</groupId> - <artifactId>velocity</artifactId> - <version>1.5</version> - </dependency> + <dependency> + <groupId>org.apache.velocity</groupId> + <artifactId>velocity</artifactId> + <version>1.5</version> + </dependency> - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>maven-helper-plugin</artifactId> - <version>${helper.version}</version> - <classifier>tests</classifier> - <exclusions> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>maven-helper-plugin</artifactId> + <version>${helperPluginVersion}</version> + <classifier>tests</classifier> + <exclusions> - <exclusion> - <groupId>org.apache.maven.shared</groupId> - <artifactId>maven-dependency-tree</artifactId> - </exclusion> + <exclusion> + <groupId>org.apache.maven.shared</groupId> + <artifactId>maven-dependency-tree</artifactId> + </exclusion> - <exclusion> - <groupId>commons-httpclient</groupId> - <artifactId>commons-httpclient</artifactId> - </exclusion> + <exclusion> + <groupId>commons-httpclient</groupId> + <artifactId>commons-httpclient</artifactId> + </exclusion> - <exclusion> - <groupId>plexus</groupId> - <artifactId>plexus-mail-sender-simple</artifactId> - </exclusion> + <exclusion> + <groupId>plexus</groupId> + <artifactId>plexus-mail-sender-simple</artifactId> + </exclusion> - <exclusion> - <groupId>plexus</groupId> - <artifactId>plexus-mail-sender-api</artifactId> - </exclusion> + <exclusion> + <groupId>plexus</groupId> + <artifactId>plexus-mail-sender-api</artifactId> + </exclusion> - <exclusion> - <groupId>plexus</groupId> - <artifactId>plexus-mail-sender-javamail</artifactId> - </exclusion> + <exclusion> + <groupId>plexus</groupId> + <artifactId>plexus-mail-sender-javamail</artifactId> + </exclusion> - <exclusion> - <groupId>javax.mail</groupId> - <artifactId>mail</artifactId> - </exclusion> + <exclusion> + <groupId>javax.mail</groupId> + <artifactId>mail</artifactId> + </exclusion> - <exclusion> - <groupId>org.sonatype.plexus</groupId> - <artifactId>plexus-cipher</artifactId> - </exclusion> + <exclusion> + <groupId>org.sonatype.plexus</groupId> + <artifactId>plexus-cipher</artifactId> + </exclusion> - <exclusion> - <groupId>org.sonatype.plexus</groupId> - <artifactId>plexus-sec-dispatcher</artifactId> - </exclusion> + <exclusion> + <groupId>org.sonatype.plexus</groupId> + <artifactId>plexus-sec-dispatcher</artifactId> + </exclusion> - </exclusions> - </dependency> + </exclusions> + </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.7</version> - <scope>test</scope> - </dependency> +  - <dependency> - <groupId>com.google.gwt</groupId> - <artifactId>gwt-servlet</artifactId> - <version>${gwt.version}</version> - <scope>runtime</scope> - </dependency> + <dependency> + <groupId>com.google.gwt</groupId> + <artifactId>gwt-servlet</artifactId> + <version>${gwtVersion}</version> + <scope>runtime</scope> + </dependency> - <dependency> - <groupId>com.google.gwt</groupId> - <artifactId>gwt-user</artifactId> - <version>${gwt.version}</version> - <scope>provided</scope> - </dependency> + <dependency> + <groupId>com.google.gwt</groupId> + <artifactId>gwt-user</artifactId> + <version>${gwtVersion}</version> + <scope>provided</scope> + </dependency> - <dependency> - <groupId>com.google.gwt</groupId> - <artifactId>gwt-dev</artifactId> - <version>${gwt.version}</version> - <type>zip</type> - <classifier>${gwtplatform}-libs</classifier> - <scope>provided</scope> - </dependency> + <dependency> + <groupId>com.google.gwt</groupId> + <artifactId>gwt-dev</artifactId> + <version>${gwtVersion}</version> + <type>zip</type> + <classifier>${gwtplatform}-libs</classifier> + <scope>provided</scope> + </dependency> - <dependency> - <groupId>com.google.gwt</groupId> - <artifactId>gwt-dev</artifactId> - <version>${gwt.version}</version> - <classifier>${gwtplatform}</classifier> - <scope>provided</scope> - </dependency> + <dependency> + <groupId>com.google.gwt</groupId> + <artifactId>gwt-dev</artifactId> + <version>${gwtVersion}</version> + <classifier>${gwtplatform}</classifier> + <scope>provided</scope> + </dependency> - </dependencies> - </dependencyManagement> -  -  -  + <dependency> + <groupId>com.google.code.gwtx</groupId> + <artifactId>gwtx</artifactId> + <version>1.5.0</version> + </dependency> - <name>${project.artifactId}</name> - <description>Guix lutin library parent pom</description> - <inceptionYear>2009</inceptionYear> + <dependency> + <groupId>net.sf.gwt-widget</groupId> + <artifactId>gwt-widgets</artifactId> + <version>0.2.0</version> + </dependency> -  -  -  + <dependency> + <groupId>com.google.code.gwt-math</groupId> + <artifactId>gwt-math</artifactId> + <version>2.0.3</version> + </dependency> - <packaging>pom</packaging> + </dependencies> + </dependencyManagement> - <properties> +  +  +  - <projectId>guix</projectId> + <name>${project.artifactId}</name> + <description>Guix lutin library parent pom</description> + <inceptionYear>2009</inceptionYear> -  - <spring.version>2.0.5</spring.version> - <maven.version>2.0.10</maven.version> - <gwt.version>1.7.0</gwt.version> +  +  +  - </properties> + <packaging>pom</packaging> - <build> + <properties> - <pluginManagement> - <plugins> + <projectId>guix</projectId> - <plugin> - <artifactId>maven-site-plugin</artifactId> - <dependencies> - <dependency> - <groupId>org.nuiton.jrst</groupId> - <artifactId>doxia-module-jrst</artifactId> - <version>1.0.0</version> - </dependency> - </dependencies> - </plugin> +  + <springVersion>2.0.5</springVersion> + <mavenVersion>2.0.10</mavenVersion> + <gwtVersion>1.7.0</gwtVersion> - </plugins> - </pluginManagement> + </properties> - </build> + <build> -  -  -  + <pluginManagement> + <plugins> - <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/guix/trunk</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/guix/trunk</developerConnection> - <url>http://www.nuiton.org/repositories/browse/guix/trunk</url> - </scm> + <plugin> + <artifactId>maven-site-plugin</artifactId> + <dependencies> + <dependency> + <groupId>org.nuiton.jrst</groupId> + <artifactId>doxia-module-jrst</artifactId> + <version>${jrstPluginVersion}</version> + </dependency> + </dependencies> + </plugin> - <profiles> - <profile> - <id>gwt-dev-windows</id> - <properties> - <gwtplatform>windows</gwtplatform> - </properties> - <activation> - <activeByDefault>false</activeByDefault> - <os> - <family>windows</family> - </os> - </activation> - </profile> - <profile> - <id>gwt-dev-mac</id> - <properties> - <gwtplatform>mac</gwtplatform> - </properties> - <activation> - <activeByDefault>false</activeByDefault> - <os> - <family>mac</family> - </os> - </activation> - </profile> - <profile> - <id>gwt-dev-linux</id> - <activation> - <activeByDefault>true</activeByDefault> - <os> - <name>Linux</name> - </os> - </activation> - <properties> - <gwtplatform>linux</gwtplatform> - </properties> - </profile> - </profiles> + </plugins> + </pluginManagement> + </build> + +  +  +  + + <scm> + <connection>scm:svn:http://svn.nuiton.org/svn/guix/trunk</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/guix/trunk + </developerConnection> + <url>http://www.nuiton.org/repositories/browse/guix/trunk</url> + </scm> + + <profiles> + <profile> + <id>gwt-dev-windows</id> + <properties> + <gwtplatform>windows</gwtplatform> + </properties> + <activation> + <activeByDefault>false</activeByDefault> + <os> + <family>windows</family> + </os> + </activation> + </profile> + <profile> + <id>gwt-dev-mac</id> + <properties> + <gwtplatform>mac</gwtplatform> + </properties> + <activation> + <activeByDefault>false</activeByDefault> + <os> + <family>mac</family> + </os> + </activation> + </profile> + <profile> + <id>gwt-dev-linux</id> + <activation> + <activeByDefault>true</activeByDefault> + <os> + <name>Linux</name> + </os> + </activation> + <properties> + <gwtplatform>linux</gwtplatform> + </properties> + </profile> + </profiles> + </project>

1 0

r1658 - trunk
by tchemit＠users.nuiton.org Oct. 17, 2010

Oct. 17, 2010

Author: tchemit Date: 2010-10-17 03:39:08 +0200 (Sun, 17 Oct 2010) New Revision: 1658 Url: http://nuiton.org/repositories/revision/guix/1658 Log: Update mavenpom4redmine to 2.3.2. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-10-08 23:51:37 UTC (rev 1657) +++ trunk/pom.xml 2010-10-17 01:39:08 UTC (rev 1658) @@ -9,7 +9,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.3.1</version> + <version>2.3.2</version> </parent> <artifactId>guix</artifactId>

1 0

r1657 - trunk
by tchemit＠users.nuiton.org Oct. 8, 2010

Oct. 8, 2010

Author: tchemit Date: 2010-10-09 01:51:37 +0200 (Sat, 09 Oct 2010) New Revision: 1657 Url: http://nuiton.org/repositories/revision/guix/1657 Log: Update mavenpom4redmine to 2.3.1. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-10-03 15:54:33 UTC (rev 1656) +++ trunk/pom.xml 2010-10-08 23:51:37 UTC (rev 1657) @@ -9,7 +9,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.3</version> + <version>2.3.1</version> </parent> <artifactId>guix</artifactId>

1 0

r1656 - trunk
by tchemit＠users.nuiton.org Oct. 3, 2010

Oct. 3, 2010

Author: tchemit Date: 2010-10-03 17:54:33 +0200 (Sun, 03 Oct 2010) New Revision: 1656 Url: http://nuiton.org/repositories/revision/guix/1656 Log: Update mavenpom4redmine to 2.3. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-09-29 08:10:30 UTC (rev 1655) +++ trunk/pom.xml 2010-10-03 15:54:33 UTC (rev 1656) @@ -9,7 +9,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.2.6</version> + <version>2.3</version> </parent> <artifactId>guix</artifactId>

1 0