Author: tchemit Date: 2012-07-05 18:08:02 +0200 (Thu, 05 Jul 2012) New Revision: 2383 Url: http://nuiton.org/repositories/revision/jaxx/2383 Log: refs #2166: Updates to mavenpom 3.3.4 fixes #2167: Updates to eugene 2.4.2 fixes #2168: Updates to maven-verifier 1.3 fixes #2169: Updates to plexus-utils 3.0.1 Modified: trunk/jaxx-maven-plugin/pom.xml trunk/pom.xml Modified: trunk/jaxx-maven-plugin/pom.xml =================================================================== --- trunk/jaxx-maven-plugin/pom.xml 2012-07-05 14:56:58 UTC (rev 2382) +++ trunk/jaxx-maven-plugin/pom.xml 2012-07-05 16:08:02 UTC (rev 2383) @@ -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> @@ -76,6 +78,11 @@ <artifactId>maven-project</artifactId> </dependency> + <dependency> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-annotations</artifactId> + </dependency> + <!-- other dependencies --> <dependency> @@ -92,7 +99,7 @@ <groupId>org.nuiton.i18n</groupId> <artifactId>nuiton-i18n</artifactId> </dependency> - + <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> @@ -107,7 +114,7 @@ <groupId>javax.help</groupId> <artifactId>javahelp</artifactId> </dependency> - + <!-- pour acceder aux BeansInfos swing via Introspector --> <dependency> <groupId>com.sun</groupId> @@ -145,11 +152,11 @@ </dependency> <!-- FIXME si on ne le rajoute pas, on se retrouve avec la version 1.1 qui ne convient pas --> - <dependency> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-utils</artifactId> - <scope>compile</scope> - </dependency> + <dependency> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-utils</artifactId> + <scope>compile</scope> + </dependency> <dependency> <groupId>log4j</groupId> @@ -175,36 +182,30 @@ <packaging>maven-plugin</packaging> - <profiles> - <!-- by default jnlp is only perform on a release stage when using the maven-release-plugin --> - <profile> - <id>release-profile</id> - <activation> - <property> - <name>performRelease</name> - <value>true</value> - </property> - </activation> - <build> - <plugins> + <build> + <plugins> - <plugin> - <artifactId>maven-plugin-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>helpmojo</goal> - </goals> - </execution> - </executions> - </plugin> + <plugin> + <artifactId>maven-plugin-plugin</artifactId> + <configuration> + <skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound> + </configuration> + <executions> + <execution> + <goals> + <goal>helpmojo</goal> + <goal>descriptor</goal> + </goals> + </execution> + </executions> + </plugin> - </plugins> + </plugins> - </build> - </profile> + </build> - <!-- by default jnlp is only perform on a release stage when using the maven-release-plugin --> + <profiles> + <profile> <id>reporting</id> <activation> @@ -222,6 +223,35 @@ <version>${pluginPluginVersion}</version> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + <version>${javadocPluginVersion}</version> + <configuration> + <quiet>true</quiet> + <tagletArtifacts> + <tagletArtifact> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-tools-javadoc</artifactId> + <version>${pluginPluginVersion}</version> + </tagletArtifact> + <tagletArtifact> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-component-javadoc</artifactId> + <version>1.5.5</version> + </tagletArtifact> + </tagletArtifacts> + </configuration> + <reportSets> + <reportSet> + <reports> + <report>javadoc</report> + <report>test-javadoc</report> + </reports> + </reportSet> + </reportSets> + </plugin> + </plugins> </reporting> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-07-05 14:56:58 UTC (rev 2382) +++ trunk/pom.xml 2012-07-05 16:08:02 UTC (rev 2383) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>3.3.3</version> + <version>3.3.4-SNAPSHOT</version> </parent> <artifactId>jaxx</artifactId> @@ -109,12 +109,11 @@ <projectId>jaxx</projectId> <nuitonUtilsVersion>2.5</nuitonUtilsVersion> <nuitonI18nVersion>2.4.1</nuitonI18nVersion> - <eugeneVersion>2.3.2</eugeneVersion> + <eugeneVersion>2.4.2</eugeneVersion> <xworkVersion>2.3.1.2</xworkVersion> <jxLayerVersion>3.0.4</jxLayerVersion> <javaHelpVersion>2.0.05</javaHelpVersion> <swingXVersion>1.6.2-2</swingXVersion> - <jrstPluginVersion>2.0.1</jrstPluginVersion> <!-- i18n configuration --> <i18n.bundles>fr_FR,en_GB,es_ES</i18n.bundles> @@ -174,6 +173,10 @@ <artifactId>jaxen</artifactId> </exclusion> <exclusion> + <groupId>net.sourceforge.saxon</groupId> + <artifactId>saxon</artifactId> + </exclusion> + <exclusion> <groupId>xerces</groupId> <artifactId>xercesImpl</artifactId> </exclusion> @@ -349,12 +352,6 @@ </dependency> <!-- rsyntaxtextarea dependency --> - <!--dependency> - <groupId>org.nuiton.thirdparty</groupId> - <artifactId>rsyntaxtextarea</artifactId> - <version>1.4.1</version> - </dependency--> - <dependency> <groupId>com.fifesoft</groupId> <artifactId>rsyntaxtextarea</artifactId> @@ -396,10 +393,18 @@ </exclusions> </dependency> + <!-- dependencies to mojo annotations --> <dependency> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-annotations</artifactId> + <version>${pluginPluginVersion}</version> + <scope>compile</scope> + </dependency> + + <dependency> <groupId>org.apache.maven.shared</groupId> <artifactId>maven-verifier</artifactId> - <version>1.0</version> + <version>1.3</version> <scope>test</scope> </dependency> @@ -442,7 +447,7 @@ <dependency> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-utils</artifactId> - <version>1.5.15</version> + <version>3.0.1</version> <scope>compile</scope> </dependency>