Author: tchemit Date: 2013-04-28 21:32:29 +0200 (Sun, 28 Apr 2013) New Revision: 1429 Url: http://nuiton.org/projects/mavenpom/repository/revisions/1429 Log: fixes #2664: Non prise en compte du changement de la configuration des signatures ?\195?\160 v?\195?\169rifier fixes #2672: Add a javaVersion property fixes #2659: Updates httpclient to 4.2.5 Modified: trunk/mavenpomdoc/src/site/apt/mavenpom/properties.apt.vm trunk/pom.xml Modified: trunk/mavenpomdoc/src/site/apt/mavenpom/properties.apt.vm =================================================================== --- trunk/mavenpomdoc/src/site/apt/mavenpom/properties.apt.vm 2013-04-12 14:58:23 UTC (rev 1428) +++ trunk/mavenpomdoc/src/site/apt/mavenpom/properties.apt.vm 2013-04-28 19:32:29 UTC (rev 1429) @@ -66,6 +66,8 @@ *--------------------------------------+--------------------------------------+ | <<Propriété>> | <<Valeur par défaut>> | *--------------------------------------+--------------------------------------+ +| {{javaVersion}} | <<${javaVersion}>> | +*--------------------------------------+--------------------------------------+ | {{mavenVersion}} | <<${mavenVersion}>> | *--------------------------------------+--------------------------------------+ | {{antVersion}} | <<${antVersion}>> | @@ -418,6 +420,12 @@ * Détail des propriétés de versions +** {javaVersion} + + La version de java à utiliser pour la compilation (entrée et sortie) + : <<${javaVersion}>>\ + {{{Propriétés de versions}[remonter]}} + ** {mavenVersion} La version de l'api de maven utilisée (principalement dans les plugins maven) Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-04-12 14:58:23 UTC (rev 1428) +++ trunk/pom.xml 2013-04-28 19:32:29 UTC (rev 1429) @@ -304,7 +304,7 @@ <commonsCollectionsVersion>3.2.1</commonsCollectionsVersion> <commonsEmailVersion>1.3.1</commonsEmailVersion> <commonsHttpclientVersion>3.1</commonsHttpclientVersion> - <httpCommonsHttpclientVersion>4.2.4</httpCommonsHttpclientVersion> + <httpCommonsHttpclientVersion>4.2.5</httpCommonsHttpclientVersion> <commonsIoVersion>2.4</commonsIoVersion> <commonsJxpathVersion>1.3</commonsJxpathVersion> <commonsLangVersion>2.6</commonsLangVersion> @@ -328,8 +328,10 @@ <!-- compiler configuration --> - <maven.compiler.source>1.6</maven.compiler.source> - <maven.compiler.target>1.6</maven.compiler.target> + <javaVersion>1.6</javaVersion> + + <maven.compiler.source>${javaVersion}</maven.compiler.source> + <maven.compiler.target>${javaVersion}</maven.compiler.target> <maven.compiler.showWarnings>true</maven.compiler.showWarnings> <maven.compiler.showDeprecation>true</maven.compiler.showDeprecation> <!-- for the moment we do not want to use incremental compilation --> @@ -764,13 +766,6 @@ <groupId>org.codehaus.mojo</groupId> <artifactId>animal-sniffer-maven-plugin</artifactId> <version>${animalSnifferPluginVersion}</version> - <configuration> - <signature> - <groupId>org.codehaus.mojo.signature</groupId> - <artifactId>${signatureArtifactId}</artifactId> - <version>${signatureVersion}</version> - </signature> - </configuration> </plugin> <plugin> @@ -1250,6 +1245,13 @@ <goals> <goal>check</goal> </goals> + <configuration> + <signature> + <groupId>org.codehaus.mojo.signature</groupId> + <artifactId>${signatureArtifactId}</artifactId> + <version>${signatureVersion}</version> + </signature> + </configuration> </execution> </executions> </plugin>