Author: tchemit Date: 2010-05-13 12:18:44 +0200 (Thu, 13 May 2010) New Revision: 1902 Url: http://nuiton.org/repositories/revision/jaxx/1902 Log: Anomalie #606: Fix logging issues in plugin (since nuiton-utils 1.3) Anomalie #607: Fix release of demo and tutorials Modified: trunk/jaxx-compiler/pom.xml trunk/jaxx-demo/pom.xml trunk/jaxx-runtime/pom.xml trunk/jaxx-tutorial-config/pom.xml trunk/jaxx-tutorial-helloworld/pom.xml trunk/jaxx-tutorial-helloworld2/pom.xml trunk/jaxx-widgets/pom.xml trunk/maven-jaxx-plugin/pom.xml trunk/pom.xml Modified: trunk/jaxx-compiler/pom.xml =================================================================== --- trunk/jaxx-compiler/pom.xml 2010-05-11 16:38:01 UTC (rev 1901) +++ trunk/jaxx-compiler/pom.xml 2010-05-13 10:18:44 UTC (rev 1902) @@ -55,6 +55,12 @@ <artifactId>junit</artifactId> </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <scope>test</scope> + </dependency> + </dependencies> <!-- ************************************************************* --> Modified: trunk/jaxx-demo/pom.xml =================================================================== --- trunk/jaxx-demo/pom.xml 2010-05-11 16:38:01 UTC (rev 1901) +++ trunk/jaxx-demo/pom.xml 2010-05-13 10:18:44 UTC (rev 1902) @@ -78,6 +78,12 @@ <artifactId>rsyntaxtextarea</artifactId> </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <scope>runtime</scope> + </dependency> + </dependencies> <!-- ************************************************************* --> Modified: trunk/jaxx-runtime/pom.xml =================================================================== --- trunk/jaxx-runtime/pom.xml 2010-05-11 16:38:01 UTC (rev 1901) +++ trunk/jaxx-runtime/pom.xml 2010-05-13 10:18:44 UTC (rev 1902) @@ -76,6 +76,12 @@ </dependency> <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <scope>test</scope> + </dependency> + + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> </dependency> Modified: trunk/jaxx-tutorial-config/pom.xml =================================================================== --- trunk/jaxx-tutorial-config/pom.xml 2010-05-11 16:38:01 UTC (rev 1901) +++ trunk/jaxx-tutorial-config/pom.xml 2010-05-13 10:18:44 UTC (rev 1902) @@ -53,12 +53,20 @@ <artifactId>jaxx-runtime</artifactId> <version>${jaxx.version}</version> </dependency> + <dependency> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-widgets</artifactId> <version>${jaxx.version}</version> </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>1.2.16</version> + <scope>runtime</scope> + </dependency> + </dependencies> <!-- ************************************************************* --> @@ -99,7 +107,7 @@ <!-- extra files to include in release --> <redmine.releaseFiles>${redmine.libReleaseFiles}</redmine.releaseFiles> - + </properties> <build> Modified: trunk/jaxx-tutorial-helloworld/pom.xml =================================================================== --- trunk/jaxx-tutorial-helloworld/pom.xml 2010-05-11 16:38:01 UTC (rev 1901) +++ trunk/jaxx-tutorial-helloworld/pom.xml 2010-05-13 10:18:44 UTC (rev 1902) @@ -29,6 +29,13 @@ <version>${jaxx.version}</version> </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>1.2.16</version> + <scope>runtime</scope> + </dependency> + </dependencies> <!-- ************************************************************* --> @@ -62,16 +69,16 @@ <maven.compiler.source>1.5</maven.compiler.source> <!-- default encoding --> - + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> - + <!-- to generate jnlp launcher while releasing jaxx --> <jnlp.skip>false</jnlp.skip> <!-- extra files to include in release --> <redmine.releaseFiles>${redmine.libReleaseFiles}</redmine.releaseFiles> - + </properties> <build> Modified: trunk/jaxx-tutorial-helloworld2/pom.xml =================================================================== --- trunk/jaxx-tutorial-helloworld2/pom.xml 2010-05-11 16:38:01 UTC (rev 1901) +++ trunk/jaxx-tutorial-helloworld2/pom.xml 2010-05-13 10:18:44 UTC (rev 1902) @@ -28,6 +28,13 @@ <version>${jaxx.version}</version> </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>1.2.16</version> + <scope>runtime</scope> + </dependency> + </dependencies> <!-- ************************************************************* --> @@ -58,19 +65,19 @@ <!-- compiler configuration --> <maven.compiler.source>1.5</maven.compiler.source> - <maven.compiler.source>1.5</maven.compiler.source> + <maven.compiler.source>1.5</maven.compiler.source> <!-- default encoding --> - + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> - + <!-- to generate jnlp launcher while releasing jaxx --> <jnlp.skip>false</jnlp.skip> <!-- extra files to include in release --> <redmine.releaseFiles>${redmine.libReleaseFiles}</redmine.releaseFiles> - + </properties> <build> Modified: trunk/jaxx-widgets/pom.xml =================================================================== --- trunk/jaxx-widgets/pom.xml 2010-05-11 16:38:01 UTC (rev 1901) +++ trunk/jaxx-widgets/pom.xml 2010-05-13 10:18:44 UTC (rev 1902) @@ -67,6 +67,12 @@ </dependency> <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <scope>test</scope> + </dependency> + + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> </dependency> Modified: trunk/maven-jaxx-plugin/pom.xml =================================================================== --- trunk/maven-jaxx-plugin/pom.xml 2010-05-11 16:38:01 UTC (rev 1901) +++ trunk/maven-jaxx-plugin/pom.xml 2010-05-13 10:18:44 UTC (rev 1902) @@ -24,7 +24,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> @@ -87,6 +89,11 @@ <artifactId>plexus-velocity</artifactId> </dependency> + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + </dependency> + <!-- pour acceder aux BeansInfos swing via Introspector --> <dependency> <groupId>com.sun</groupId> @@ -127,7 +134,7 @@ <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> - <scope>test</scope> + <scope>runtime</scope> </dependency> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-05-11 16:38:01 UTC (rev 1901) +++ trunk/pom.xml 2010-05-13 10:18:44 UTC (rev 1902) @@ -208,6 +208,12 @@ <artifactId>commons-io</artifactId> <version>1.4</version> </dependency> + + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + <version>3.2.1</version> + </dependency> <!-- sun dependencies --> @@ -451,6 +457,13 @@ </configuration> </plugin> + <plugin> + <artifactId>maven-release-plugin</artifactId> + <configuration> + <prepareVerifyArgs>-Ptutorial -Pdemo</prepareVerifyArgs> + </configuration> + </plugin> + </plugins> </pluginManagement>