Author: tchemit Date: 2011-01-26 15:07:26 +0100 (Wed, 26 Jan 2011) New Revision: 2170 Url: http://nuiton.org/repositories/revision/jaxx/2170 Log: clean poms : optimize dependencies + pass to level 1.6 all tutorials Modified: trunk/jaxx-demo/pom.xml trunk/jaxx-tutorial-css/pom.xml trunk/jaxx-tutorial-databinding/pom.xml trunk/jaxx-tutorial-helloworld/pom.xml trunk/jaxx-tutorial-helloworld2/pom.xml trunk/jaxx-tutorial/pom.xml trunk/jaxx-validator/pom.xml trunk/jaxx-widgets/pom.xml trunk/maven-jaxx-plugin/pom.xml trunk/pom.xml Modified: trunk/jaxx-demo/pom.xml =================================================================== --- trunk/jaxx-demo/pom.xml 2011-01-26 14:05:44 UTC (rev 2169) +++ trunk/jaxx-demo/pom.xml 2011-01-26 14:07:26 UTC (rev 2170) @@ -183,7 +183,6 @@ <configuration> <archive> <manifest> - <!--<mainClass>${maven.jar.main.class}</mainClass>--> <useUniqueVersions>false</useUniqueVersions> <addClasspath>true</addClasspath> <classpathPrefix>./lib/</classpathPrefix> Modified: trunk/jaxx-tutorial/pom.xml =================================================================== --- trunk/jaxx-tutorial/pom.xml 2011-01-26 14:05:44 UTC (rev 2169) +++ trunk/jaxx-tutorial/pom.xml 2011-01-26 14:07:26 UTC (rev 2170) @@ -112,7 +112,7 @@ <plugin> <groupId>org.nuiton.i18n</groupId> <artifactId>maven-i18n-plugin</artifactId> - <version>2.1</version> + <version>2.2</version> </plugin> </plugins> Modified: trunk/jaxx-tutorial-css/pom.xml =================================================================== --- trunk/jaxx-tutorial-css/pom.xml 2011-01-26 14:05:44 UTC (rev 2169) +++ trunk/jaxx-tutorial-css/pom.xml 2011-01-26 14:07:26 UTC (rev 2170) @@ -56,8 +56,8 @@ <!-- compiler configuration --> - <maven.compiler.source>1.5</maven.compiler.source> - <maven.compiler.source>1.5</maven.compiler.source> + <maven.compiler.source>1.6</maven.compiler.source> + <maven.compiler.source>1.6</maven.compiler.source> <!-- default encoding --> Modified: trunk/jaxx-tutorial-databinding/pom.xml =================================================================== --- trunk/jaxx-tutorial-databinding/pom.xml 2011-01-26 14:05:44 UTC (rev 2169) +++ trunk/jaxx-tutorial-databinding/pom.xml 2011-01-26 14:07:26 UTC (rev 2170) @@ -61,8 +61,8 @@ <!-- compiler configuration --> - <maven.compiler.source>1.5</maven.compiler.source> - <maven.compiler.source>1.5</maven.compiler.source> + <maven.compiler.source>1.6</maven.compiler.source> + <maven.compiler.source>1.6</maven.compiler.source> <!-- default encoding --> Modified: trunk/jaxx-tutorial-helloworld/pom.xml =================================================================== --- trunk/jaxx-tutorial-helloworld/pom.xml 2011-01-26 14:05:44 UTC (rev 2169) +++ trunk/jaxx-tutorial-helloworld/pom.xml 2011-01-26 14:07:26 UTC (rev 2170) @@ -68,8 +68,8 @@ <!-- compiler configuration --> - <maven.compiler.source>1.5</maven.compiler.source> - <maven.compiler.source>1.5</maven.compiler.source> + <maven.compiler.source>1.6</maven.compiler.source> + <maven.compiler.source>1.6</maven.compiler.source> <!-- default encoding --> Modified: trunk/jaxx-tutorial-helloworld2/pom.xml =================================================================== --- trunk/jaxx-tutorial-helloworld2/pom.xml 2011-01-26 14:05:44 UTC (rev 2169) +++ trunk/jaxx-tutorial-helloworld2/pom.xml 2011-01-26 14:07:26 UTC (rev 2170) @@ -67,8 +67,8 @@ <!-- compiler configuration --> - <maven.compiler.source>1.5</maven.compiler.source> - <maven.compiler.source>1.5</maven.compiler.source> + <maven.compiler.source>1.6</maven.compiler.source> + <maven.compiler.source>1.6</maven.compiler.source> <!-- default encoding --> Modified: trunk/jaxx-validator/pom.xml =================================================================== --- trunk/jaxx-validator/pom.xml 2011-01-26 14:05:44 UTC (rev 2169) +++ trunk/jaxx-validator/pom.xml 2011-01-26 14:07:26 UTC (rev 2170) @@ -72,11 +72,6 @@ </dependency> <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - </dependency> - - <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> </dependency> @@ -86,14 +81,7 @@ <artifactId>jxlayer</artifactId> </dependency> - <!-- validation framework --> - <dependency> - <groupId>com.opensymphony</groupId> - <artifactId>xwork</artifactId> - </dependency> - - <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> <scope>test</scope> Modified: trunk/jaxx-widgets/pom.xml =================================================================== --- trunk/jaxx-widgets/pom.xml 2011-01-26 14:05:44 UTC (rev 2169) +++ trunk/jaxx-widgets/pom.xml 2011-01-26 14:07:26 UTC (rev 2170) @@ -126,13 +126,6 @@ <build> <resources> - <!-- TC20091016 do not expose jaxx files --> - <!--resource> - <directory>src/main/java</directory> - <includes> - <include>**/*.jaxx</include> - </includes> - </resource--> <resource> <directory>src/main/resources</directory> <includes> Modified: trunk/maven-jaxx-plugin/pom.xml =================================================================== --- trunk/maven-jaxx-plugin/pom.xml 2011-01-26 14:05:44 UTC (rev 2169) +++ trunk/maven-jaxx-plugin/pom.xml 2011-01-26 14:07:26 UTC (rev 2170) @@ -63,12 +63,6 @@ <version>${project.version}</version> </dependency> - <!--dependency> - <groupId>${project.groupId}</groupId> - <artifactId>jaxx-swing-action</artifactId> - <version>${project.version}</version> - </dependency--> - <!-- maven plugin project dependencies --> <dependency> @@ -112,7 +106,6 @@ <dependency> <groupId>com.sun</groupId> <artifactId>dt</artifactId> - <!--version>${java.version}</version--> <scope>system</scope> <systemPath>/${java.home}/../lib/dt.jar</systemPath> </dependency> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-01-26 14:05:44 UTC (rev 2169) +++ trunk/pom.xml 2011-01-26 14:07:26 UTC (rev 2170) @@ -263,20 +263,6 @@ <scope>provided</scope> </dependency> - <!-- xworks dependencies --> - - <dependency> - <groupId>com.opensymphony</groupId> - <artifactId>xwork</artifactId> - <version>2.1.3</version> - <exclusions> - <exclusion> - <groupId>org.springframework</groupId> - <artifactId>spring-test</artifactId> - </exclusion> - </exclusions> - </dependency> - <!-- rsyntaxtextarea dependency --> <dependency> <groupId>org.nuiton.thirdparty</groupId> @@ -299,17 +285,6 @@ <scope>compile</scope> </dependency> - <!--dependency> - <groupId>org.swinglabs</groupId> - <artifactId>swing-worker</artifactId> - <version>1.1</version> - </dependency--> - - <!--dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </dependency--> - <dependency> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-velocity</artifactId> @@ -330,12 +305,6 @@ </exclusions> </dependency> - <!--dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency--> - <dependency> <groupId>org.apache.maven.shared</groupId> <artifactId>maven-verifier</artifactId> @@ -375,12 +344,6 @@ <artifactId>maven-reporting-api</artifactId> </exclusion> - <!-- FIXME shoudl use the maven-ocre of mavenVersion... - <exclusion> - <groupId>org.apache.maven</groupId> - <artifactId>maven-core</artifactId> - </exclusion--> - </exclusions> </dependency> @@ -423,12 +386,10 @@ <!-- pour un muli module on doit fixer le projectId --> <projectId>jaxx</projectId> - <nuitonUtilsVersion>2.0-SNAPSHOT</nuitonUtilsVersion> + <nuitonUtilsVersion>2.0</nuitonUtilsVersion> <nuitonI18nVersion>2.2</nuitonI18nVersion> - - + <xworkVersion>2.2.1.1</xworkVersion> <jxLayerVersion>3.0.3</jxLayerVersion> - <javaHelpVersion>2.0.02</javaHelpVersion> </properties>