svn commit: r1359539 - /maven/pom/trunk/maven/pom.xml
Author: tchemit Date: Tue Jul 10 09:35:01 2012 New Revision: 1359539 URL: http://svn.apache.org/viewvc?rev=1359539view=rev Log: add myself as new commiter Modified: maven/pom/trunk/maven/pom.xml Modified: maven/pom/trunk/maven/pom.xml URL: http://svn.apache.org/viewvc/maven/pom/trunk/maven/pom.xml?rev=1359539r1=1359538r2=1359539view=diff == --- maven/pom/trunk/maven/pom.xml (original) +++ maven/pom/trunk/maven/pom.xml Tue Jul 10 09:35:01 2012 @@ -436,6 +436,16 @@ under the License. timezone+1/timezone /developer developer + idtchemit/id + nameTony Chemit/name + emailtche...@apache.org/email + organizationCodeLutin/organization + roles +roleCommitter/role + /roles + timezoneEurope/Paris/timezone +/developer +developer idvmassol/id nameVincent Massol/name emailvmas...@apache.org/email
svn commit: r1359551 - /maven/project/KEYS
Author: tchemit Date: Tue Jul 10 09:55:05 2012 New Revision: 1359551 URL: http://svn.apache.org/viewvc?rev=1359551view=rev Log: add my gpg key Modified: maven/project/KEYS Modified: maven/project/KEYS URL: http://svn.apache.org/viewvc/maven/project/KEYS?rev=1359551r1=1359550r2=1359551view=diff == --- maven/project/KEYS (original) +++ maven/project/KEYS Tue Jul 10 09:55:05 2012 @@ -2086,3 +2086,55 @@ nwCwOsUy5bW4BWvnFKODTHG9sRR1AZc4LLblVkn2 MTiatN44MuW2D5THxkQn74IS9rVSHzRrCH9wMl1hIl7CgAkfTFwRdLS721dXPlzj =k8jY -END PGP PUBLIC KEY BLOCK- + +pub 4096R/F65C0178 2012-07-10 +uid Tony Chemit (CODE SIGNING KEY) tche...@apache.org +sub 4096R/C59244F2 2012-07-10 + +-BEGIN PGP PUBLIC KEY BLOCK- +Version: SKS 1.1.0 + +mQINBE/76bcBEACrM4VkHe0XAOeOJekMv6UgnCu5Q4SUfulxtnkJkeZ6p2Ca/Qn4RTPYw3vc +ietOMk6RyfRjXDVrdV7QrZKS2dIRMnc16gfjc5u5Ze/spFNWnnofXdVENvtpz1+y+quZzn8j +ZIX4XMiE3BDz3EpWPTof7YMiWyM8IJnjX1kimn9W/aDBddW3Q9ejo2kmAcaiCaIRq5l9bWUb +1+RlUsu6LDwjzR/Wz5hCsJy75oDEmYhjJEtTs5NoVAAXCWbPhNWgaa6acz/Xc3qMNIcehJNf +dmzq3XRYWAKZXF2c9PpFtpNjXCCazoJFALwAnTL7sv7ntIvNzZYstu7FWkSxmX1w3UA7ei/x +o/+R6BukVEfboIvyKaFnCdRYFhmkJxA+P+CXl+RWUbz0fXDUcH1a0/SFNjioCnmV0pBGWy92 +MftSVPKdVyFUhj9OTdvT8IvvGNZgk0sBR4yCYwGwGxhevVXzRVw/eiXPs1CrhvtFpIY/Bewb +mwB/3jfIbOqjBKMk/SMFB7gybuVHfLgc0VLac3u5p5sC6Qbf0PaIkyKFCfG1DHFcMnW7YObL +STGk/0FDhbqLG7DxjIXmBGy4c+W1KvCrSdNWIK/INbyQifH3UGnw87UjXTKTLNhZgcjpivqZ +96ElqndafrCjDd74EAIbHUuZA8uPUSeDnbsq5ExGqlvr5lIh1QARAQABtDNUb255IENoZW1p +dCAoQ09ERSBTSUdOSU5HIEtFWSkgPHRjaGVtaXRAYXBhY2hlLm9yZz6JAjcEEwEKACEFAk/7 +6bcCGwMFCwkIBwMFFQoJCAsFFgIDAQACHgECF4AACgkQ85fXdvZcAXgfdxAAlvyW+HwoSeei +tcuoIY+vmiA51rN1Lk+S3cM93pQLQNMkHMtM4QPyIS+ke3hne06AoObzticoMCkSZICtuTx6 +jDWMbpKMqiFj95s5ulmGF81TLG2a/wlD1p2rCltAUFaYm1uX3oVjtUVJDv5QPWnmq94178Eu +SeTcKBTPsMpXRvRghHoifBHUjCKvwrPcm3X2Apb5BPS6oV5DhDR5eXBhxNCLmhOBpPNXx5LI +ublSteU2SxtVxOee46orYx0oJbHWAWdbpwb79SvdUWKqz2hXK5CdLy3oa58exqAFFUDk/ZLS +zgJ9jCRJDyx9OHChv9YAmTsPO7IV7IO/C85hUwahR/A8pLuA8gV0w1kkJeDL2Auc6MXOWo94 +jWZBq+NlvjSEp5sUYndf7kp/qq+owniy1mEwFYcbGuhCC/xMMoh6/czLjWMLWYx2OmqJpkbi +zkPqXDWiPUqqURPQHJU2ONQ89WosNp01P17xwQ7T1PCUokCeLi6inrPAGlO2H/ib1wDX8JWC +WCv06lyRVuY/LsGik3oKaXx1RHwZ9bav5IlDzrvnqq7OZRTOkec9f/aL1syvYvQwVuF9zOwP +B1WaFWdI8D5lOOksVXdIEAothVk+AbLuhxeC+zujehOLqLUmSYArHop0iW6s7wwqM2gF3Wso +DZeDkJFiVA83VQl5zdfpLwm5Ag0ET/vptwEQAPaprGfQaTYuTk/y2jR7n08A5/W65w8Ur73/ +0b34v62DQ2+2AEo09c0oyHEtOfpBxC06beFIf6HWB5u4IlBdiBv7yrEDgaj1ApSuKupHqClc +mFYMkznxJdh7xR/tBBwCYnP0bGXIw1f1tn//F0kvnH738cNLXkB0x7JWsvBhXQ6FwcMy6ezW +D5KLvoVW/qKlnNPs1Rp3mHU8Xb94vzqgnW8haboBebsKUTv0z9ERIkYiNwaw9iwN9rQmvBED +sdMfQr6QrKE3TPYwWuCGIU190Nc9+DQ12X3+NCsGzqz2t+fbLasrgtX418zpuKCQ4XX60phN +L2vOg7SgCgRXTCgAUJAkA8A2vL2XcwLexjskOfvfwRs/c7nfZ+k5n0dPpIYrvH3FxnRXHc/+ +25cQTNH6vyAwFqn3Lw3Bb/hlMHQowrxmXB2eRn6Ioqavb+22AVgXAK2/ZCKwfTBqKaKi3jIM +82gdj8vzp/miq+kbZuwTDETXQ5sY14jhJbT4DPboY1tob5WwQzKWo39yWWNsxcpqs6yUUGn/ +HCL5yHi2QF2RAeRzvNgfqSca6ks1MeR/WBjgOAB7f7gC6KZqTCzBV6gMHZ4smpUFgQqXO6P1 +OvPFcfbMzJmwztnBKFSoQR/YHPV0sPYkLYSQJVRIhao/QuME9ylR3ZdA3rk/6GBJPujRHeIT +ABEBAAGJAh8EGAEKAAkFAk/76bcCGwwACgkQ85fXdvZcAXhUcg/9EAZTclBCyU+nSYQP2EBE +wMgJf8QBX7E4ItC2CmFOfhCJ9BbWn7WsunTLvYEpLGTxj2nUgEyfl+/eEpGptA+JtBc8xHRZ +tRF8mbHQaOoMt7i/twqtFNdouvg4h40O9DHc+bGPbdKfban6zX5vxgotemRO1YHJzl5kJQDV +21+YHPRJeUEZx6lxpz24AxCxPQtm92aRqfhpC7E1viCA4yNm6sbVNDdaJVRp4WejsY6yOx1W +lVn5G+djJzgVaNK7DP7/66f3p8yiCgPSuGqYEH4lE/M1IS3x3etllggcwAtk1fpLD1mNxHr1 +Xay48Z12R777et0jnXFnCgvU1+6NAybJlXErKqBV6ulHUqIVo1iG1d/PXzP7/0mwb+QJB7jk +2WHRNgUYy+7kRfwk46a0Jonq4pbTkteg7g0HIjuHXl7DdUmR3pE+eYY3knbtFaFV5A6P8V1u +0ptG0YV+MhyQ13WPMqM0kSvaYaR8qf8CUMCKgAv6GF8ImQ2jlqa5ESJc+cRnA3jcd5ik910Q +6O36LP+FcEQsBYS0QV2A1al3rxIV2V/sqoNOsEumCstOttlDwCXHpo3wDH4Zu3tp0W5Vih3B +uI2jfGy/0/H7j27jiJyKqWbgz36caBPIYTsc7OT7ODjGPQlD388RGwA0M1YGx9z5bKqCnp/F +oI1O3+XFmN8lBbQ= +=DCNV +-END PGP PUBLIC KEY BLOCK-
svn commit: r1359622 - in /maven/plugins/trunk/maven-jarsigner-plugin: ./ src/main/java/org/apache/maven/plugins/jarsigner/
Author: tchemit
Date: Tue Jul 10 11:55:56 2012
New Revision: 1359622
URL: http://svn.apache.org/viewvc?rev=1359622view=rev
Log:
[MJARSIGNER-25] use maven-plugin-tools' java 5 annotations
Modified:
maven/plugins/trunk/maven-jarsigner-plugin/pom.xml
maven/plugins/trunk/maven-jarsigner-plugin/src/main/java/org/apache/maven/plugins/jarsigner/AbstractJarsignerMojo.java
maven/plugins/trunk/maven-jarsigner-plugin/src/main/java/org/apache/maven/plugins/jarsigner/JarsignerSignMojo.java
maven/plugins/trunk/maven-jarsigner-plugin/src/main/java/org/apache/maven/plugins/jarsigner/JarsignerVerifyMojo.java
Modified: maven/plugins/trunk/maven-jarsigner-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jarsigner-plugin/pom.xml?rev=1359622r1=1359621r2=1359622view=diff
==
--- maven/plugins/trunk/maven-jarsigner-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-jarsigner-plugin/pom.xml Tue Jul 10 11:55:56 2012
@@ -80,6 +80,12 @@ under the License.
version${mavenVersion}/version
/dependency
dependency
+ groupIdorg.apache.maven.plugin-tools/groupId
+ artifactIdmaven-plugin-annotations/artifactId
+ version3.1/version
+ scopecompile/scope
+/dependency
+dependency
groupIdorg.codehaus.plexus/groupId
artifactIdplexus-utils/artifactId
version2.0.0/version
@@ -92,6 +98,35 @@ under the License.
/dependencies
+ build
+
+pluginManagement
+ plugins
+plugin
+ artifactIdmaven-plugin-plugin/artifactId
+ version3.1/version
+ configuration
+skipErrorNoDescriptorsFoundtrue/skipErrorNoDescriptorsFound
+ /configuration
+/plugin
+ /plugins
+/pluginManagement
+
+plugins
+ plugin
+artifactIdmaven-plugin-plugin/artifactId
+executions
+ execution
+idgenerate-descriptor/id
+goals
+ goaldescriptor/goal
+/goals
+ /execution
+/executions
+ /plugin
+/plugins
+ /build
+
profiles
profile
idrun-its/id
Modified:
maven/plugins/trunk/maven-jarsigner-plugin/src/main/java/org/apache/maven/plugins/jarsigner/AbstractJarsignerMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jarsigner-plugin/src/main/java/org/apache/maven/plugins/jarsigner/AbstractJarsignerMojo.java?rev=1359622r1=1359621r2=1359622view=diff
==
---
maven/plugins/trunk/maven-jarsigner-plugin/src/main/java/org/apache/maven/plugins/jarsigner/AbstractJarsignerMojo.java
(original)
+++
maven/plugins/trunk/maven-jarsigner-plugin/src/main/java/org/apache/maven/plugins/jarsigner/AbstractJarsignerMojo.java
Tue Jul 10 11:55:56 2012
@@ -22,6 +22,8 @@ package org.apache.maven.plugins.jarsign
import org.apache.maven.artifact.Artifact;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugins.annotations.Component;
+import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.project.MavenProject;
import org.apache.maven.shared.jarsigner.JarSigner;
import org.apache.maven.shared.jarsigner.JarSignerException;
@@ -54,32 +56,29 @@ public abstract class AbstractJarsignerM
/**
* See a
href=http://java.sun.com/javase/6/docs/technotes/tools/windows/jarsigner.html#Options;options/a.
- *
- * @parameter expression=${jarsigner.verbose} default-value=false
*/
+@Parameter( property = jarsigner.verbose, defaultValue = false )
private boolean verbose;
/**
* The maximum memory available to the JAR signer, e.g. code256M/code.
See a
*
href=http://java.sun.com/javase/6/docs/technotes/tools/windows/java.html#Xms;-Xmx/a
for more details.
- *
- * @parameter expression=${jarsigner.maxMemory}
*/
+@Parameter( property = jarsigner.maxMemory )
private String maxMemory;
/**
* Archive to process. If set, neither the project artifact nor any
attachments or archive sets are processed.
- *
- * @parameter expression=${jarsigner.archive}
*/
+@Parameter( property = jarsigner.archive )
private File archive;
/**
* The base directory to scan for JAR files using Ant-like
inclusion/exclusion patterns.
*
- * @parameter expression=${jarsigner.archiveDirectory}
* @since 1.1
*/
+@Parameter( property = jarsigner.archiveDirectory )
private File archiveDirectory;
/**
@@ -87,97 +86,92 @@ public abstract class AbstractJarsignerM
* directory given by the parameter {@link #archiveDirectory}. By default,
the pattern
* code#42;#42;/#42;.?ar/code is used.
*
- * @parameter
* @since 1.1
*/
+@Parameter
private String[] includes = { **/*.?ar
svn commit: r1359667 - in /maven/plugins/trunk/maven-verifier-plugin: pom.xml src/main/java/org/apache/maven/plugin/verifier/VerifierMojo.java
Author: tchemit
Date: Tue Jul 10 13:42:46 2012
New Revision: 1359667
URL: http://svn.apache.org/viewvc?rev=1359667view=rev
Log:
[MVERIFIER-13] use maven-plugin-tools' java 5 annotations
Modified:
maven/plugins/trunk/maven-verifier-plugin/pom.xml
maven/plugins/trunk/maven-verifier-plugin/src/main/java/org/apache/maven/plugin/verifier/VerifierMojo.java
Modified: maven/plugins/trunk/maven-verifier-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-verifier-plugin/pom.xml?rev=1359667r1=1359666r2=1359667view=diff
==
--- maven/plugins/trunk/maven-verifier-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-verifier-plugin/pom.xml Tue Jul 10 13:42:46 2012
@@ -25,7 +25,7 @@ under the License.
parent
artifactIdmaven-plugins/artifactId
groupIdorg.apache.maven.plugins/groupId
-version21/version
+version22/version
relativePath../maven-plugins/pom.xml/relativePath
/parent
@@ -60,6 +60,15 @@ under the License.
artifactIdmaven-plugin-api/artifactId
version${mavenVersion}/version
/dependency
+
+!-- dependencies to annotations --
+dependency
+ groupIdorg.apache.maven.plugin-tools/groupId
+ artifactIdmaven-plugin-annotations/artifactId
+ version3.1/version
+ scopecompile/scope
+/dependency
+
dependency
groupIdjunit/groupId
artifactIdjunit/artifactId
@@ -74,8 +83,34 @@ under the License.
/dependencies
build
+
+pluginManagement
+ plugins
+plugin
+ groupIdorg.apache.maven.plugins/groupId
+ artifactIdmaven-plugin-plugin/artifactId
+ version3.1/version
+ configuration
+skipErrorNoDescriptorsFoundtrue/skipErrorNoDescriptorsFound
+ /configuration
+/plugin
+ /plugins
+/pluginManagement
+
plugins
plugin
+groupIdorg.apache.maven.plugins/groupId
+artifactIdmaven-plugin-plugin/artifactId
+executions
+ execution
+idmojo-descriptor/id
+goals
+ goaldescriptor/goal
+/goals
+ /execution
+/executions
+ /plugin
+ plugin
groupIdorg.codehaus.modello/groupId
artifactIdmodello-maven-plugin/artifactId
executions
Modified:
maven/plugins/trunk/maven-verifier-plugin/src/main/java/org/apache/maven/plugin/verifier/VerifierMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-verifier-plugin/src/main/java/org/apache/maven/plugin/verifier/VerifierMojo.java?rev=1359667r1=1359666r2=1359667view=diff
==
---
maven/plugins/trunk/maven-verifier-plugin/src/main/java/org/apache/maven/plugin/verifier/VerifierMojo.java
(original)
+++
maven/plugins/trunk/maven-verifier-plugin/src/main/java/org/apache/maven/plugin/verifier/VerifierMojo.java
Tue Jul 10 13:42:46 2012
@@ -23,6 +23,9 @@ import org.apache.maven.plugin.AbstractM
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.verifier.model.Verifications;
import org.apache.maven.plugin.verifier.model.io.xpp3.VerificationsXpp3Reader;
+import org.apache.maven.plugins.annotations.LifecyclePhase;
+import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.plugins.annotations.Parameter;
import org.codehaus.plexus.util.FileUtils;
import org.codehaus.plexus.util.IOUtil;
@@ -37,37 +40,30 @@ import java.util.regex.Pattern;
/**
* Verifies the existence or non-existence of files/directories and optionally
checks file content against a regular expression.
*
- * @goal verify
- * @phase integration-test
- *
* @author a href=vmas...@apache.orgVincent Massol/a
* @version $Id$
*/
+@Mojo( name = verify, defaultPhase = LifecyclePhase.INTEGRATION_TEST )
public class VerifierMojo
extends AbstractMojo
{
/**
* Project base directory (prepended to relative file paths).
- *
- * @parameter expression=${basedir}
- * @required
*/
+@Parameter( property = basedir, required = true )
private File basedir;
/**
* The file containing the verifications to perform.
- *
- * @parameter
default-value=${basedir}/src/test/verifier/verifications.xml
expression=${verifier.verificationFile}
- * @required
*/
+@Parameter( property = verifier.verificationFile, defaultValue =
${basedir}/src/test/verifier/verifications.xml,
+required = true )
private File verificationFile;
/**
* Whether the build will fail on verification errors.
- *
- * @parameter default-value=true expression=${verifier.failOnError}
- * @required
*/
+@Parameter( property = verifier.failOnError, defaultValue = true,
required = true )
private boolean failOnError;
private VerificationResultPrinter resultPrinter = new
svn commit: r1359710 - in /maven/plugins/trunk/maven-ear-plugin: ./ src/main/java/org/apache/maven/plugin/ear/
Author: tchemit
Date: Tue Jul 10 14:53:53 2012
New Revision: 1359710
URL: http://svn.apache.org/viewvc?rev=1359710view=rev
Log:
[MEAR-152] use maven-plugin-tools' java 5 annotations
Modified:
maven/plugins/trunk/maven-ear-plugin/pom.xml
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/AbstractEarMojo.java
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarMojo.java
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/GenerateApplicationXmlMojo.java
Modified: maven/plugins/trunk/maven-ear-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/pom.xml?rev=1359710r1=1359709r2=1359710view=diff
==
--- maven/plugins/trunk/maven-ear-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-ear-plugin/pom.xml Tue Jul 10 14:53:53 2012
@@ -85,6 +85,12 @@ under the License.
version${mavenArchiverVersion}/version
/dependency
dependency
+ groupIdorg.apache.maven.plugin-tools/groupId
+ artifactIdmaven-plugin-annotations/artifactId
+ version3.1/version
+ scopecompile/scope
+/dependency
+dependency
groupIdorg.codehaus.plexus/groupId
artifactIdplexus-archiver/artifactId
version2.1.1/version
@@ -125,8 +131,35 @@ under the License.
/dependencies
build
+
+pluginManagement
+ plugins
+plugin
+ artifactIdmaven-plugin-plugin/artifactId
+ version3.1/version
+ configuration
+skipErrorNoDescriptorsFoundtrue/skipErrorNoDescriptorsFound
+ /configuration
+/plugin
+ /plugins
+/pluginManagement
+
plugins
plugin
+artifactIdmaven-plugin-plugin/artifactId
+configuration
+ skipErrorNoDescriptorsFoundtrue/skipErrorNoDescriptorsFound
+/configuration
+executions
+ execution
+idgenerate-descriptor/id
+goals
+ goaldescriptor/goal
+/goals
+ /execution
+/executions
+ /plugin
+ plugin
artifactIdmaven-surefire-plugin/artifactId
configuration
includes
Modified:
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/AbstractEarMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/AbstractEarMojo.java?rev=1359710r1=1359709r2=1359710view=diff
==
---
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/AbstractEarMojo.java
(original)
+++
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/AbstractEarMojo.java
Tue Jul 10 14:53:53 2012
@@ -31,6 +31,8 @@ import org.apache.maven.plugin.MojoExecu
import org.apache.maven.plugin.MojoFailureException;
import org.apache.maven.plugin.ear.util.ArtifactTypeMappingService;
import org.apache.maven.plugin.ear.util.JavaEEVersion;
+import org.apache.maven.plugins.annotations.Component;
+import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.project.MavenProject;
import org.codehaus.plexus.configuration.PlexusConfiguration;
import org.codehaus.plexus.configuration.PlexusConfigurationException;
@@ -53,76 +55,63 @@ public abstract class AbstractEarMojo
/**
* The version of the application.xml to generate. Valid values
* are 1.3, 1.4, 5 and 6.
- *
- * @parameter default-value=1.3
*/
+@Parameter( defaultValue = 1.3 )
protected String version;
/**
* Character encoding for the auto-generated deployment file(s).
- *
- * @parameter default-value=UTF-8
*/
+@Parameter( defaultValue = UTF-8 )
protected String encoding;
/**
* Directory where the deployment descriptor file(s) will be
auto-generated.
- *
- * @parameter default-value=${project.build.directory}
*/
+@Parameter( defaultValue = ${project.build.directory} )
protected String generatedDescriptorLocation;
/**
* The maven project.
- *
- * @parameter default-value=${project}
- * @required
- * @readonly
*/
+@Component
protected MavenProject project;
/**
* The ear modules configuration.
- *
- * @parameter
*/
+@Parameter
private EarModule[] modules;
/**
* The artifact type mappings.
- *
- * @parameter
*/
+@Parameter
protected PlexusConfiguration artifactTypeMappings;
/**
* The default bundle dir for libraries.
- *
- * @parameter alias=defaultJavaBundleDir
*/
+@Parameter( alias = defaultJavaBundleDir )
protected String defaultLibBundleDir;
/**
* Should libraries be added in application.xml
- *
- * @parameter default-value
svn commit: r1359723 - in /maven/plugins/trunk/maven-ant-plugin: pom.xml src/main/java/org/apache/maven/plugin/ant/AntCleanMojo.java src/main/java/org/apache/maven/plugin/ant/AntMojo.java
Author: tchemit
Date: Tue Jul 10 15:17:13 2012
New Revision: 1359723
URL: http://svn.apache.org/viewvc?rev=1359723view=rev
Log:
[MANT-69] use maven-plugin-tools' java 5 annotations
Modified:
maven/plugins/trunk/maven-ant-plugin/pom.xml
maven/plugins/trunk/maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/AntCleanMojo.java
maven/plugins/trunk/maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/AntMojo.java
Modified: maven/plugins/trunk/maven-ant-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ant-plugin/pom.xml?rev=1359723r1=1359722r2=1359723view=diff
==
--- maven/plugins/trunk/maven-ant-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-ant-plugin/pom.xml Tue Jul 10 15:17:13 2012
@@ -25,7 +25,7 @@ under the License.
parent
artifactIdmaven-plugins/artifactId
groupIdorg.apache.maven.plugins/groupId
-version21/version
+version22/version
relativePath../maven-plugins/pom.xml/relativePath
/parent
@@ -87,6 +87,11 @@ under the License.
version${mavenVersion}/version
/dependency
dependency
+ groupIdorg.apache.maven.plugin-tools/groupId
+ artifactIdmaven-plugin-annotations/artifactId
+ version3.1/version
+/dependency
+dependency
groupIdorg.codehaus.plexus/groupId
artifactIdplexus-utils/artifactId
version1.5.8/version
@@ -140,6 +145,36 @@ under the License.
/dependency
/dependencies
+ build
+pluginManagement
+ plugins
+plugin
+ groupIdorg.apache.maven.plugins/groupId
+ artifactIdmaven-plugin-plugin/artifactId
+ version3.1/version
+ configuration
+skipErrorNoDescriptorsFoundtrue/skipErrorNoDescriptorsFound
+ /configuration
+/plugin
+ /plugins
+/pluginManagement
+
+plugins
+ plugin
+groupIdorg.apache.maven.plugins/groupId
+artifactIdmaven-plugin-plugin/artifactId
+executions
+ execution
+idmojo-descriptor/id
+goals
+ goaldescriptor/goal
+/goals
+ /execution
+/executions
+ /plugin
+/plugins
+ /build
+
profiles
profile
idrun-its/id
Modified:
maven/plugins/trunk/maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/AntCleanMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/AntCleanMojo.java?rev=1359723r1=1359722r2=1359723view=diff
==
---
maven/plugins/trunk/maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/AntCleanMojo.java
(original)
+++
maven/plugins/trunk/maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/AntCleanMojo.java
Tue Jul 10 15:17:13 2012
@@ -19,19 +19,22 @@ package org.apache.maven.plugin.ant;
* under the License.
*/
-import java.io.File;
-
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugins.annotations.Component;
+import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.project.MavenProject;
+import java.io.File;
+
/**
* Clean all Ant build files.
*
* @author a href=mailto:vincent.sive...@gmail.com;Vincent Siveton/a
* @version $Id$
- * @goal clean
*/
+@Mojo( name = clean )
public class AntCleanMojo
extends AbstractMojo
{
@@ -45,22 +48,21 @@ public class AntCleanMojo
/**
* The working project.
- *
- * @parameter default-value=${project}
- * @required
- * @readonly
*/
+@Component
private MavenProject project;
/**
* Forcing the deletion of the custom codebuild.xml/code.
*
- * @parameter expression=${deleteCustomFiles} default-value=false
* @since 2.2
*/
+@Parameter( property = deleteCustomFiles, defaultValue = false )
private boolean deleteCustomFiles;
-/** {@inheritDoc} */
+/**
+ * {@inheritDoc}
+ */
public void execute()
throws MojoExecutionException
{
@@ -76,9 +78,8 @@ public class AntCleanMojo
}
else if ( getLog().isInfoEnabled() )
{
-getLog().info(
- Not deleting custom + buildXml.getName()
- + , use -DdeleteCustomFiles=true to force
its deletion );
+getLog().info( Not deleting custom + buildXml.getName() +
+ , use -DdeleteCustomFiles=true to force
its deletion );
}
}
@@ -88,16 +89,14 @@ public class AntCleanMojo
throw new MojoExecutionException( Cannot delete +
mavenBuildXml.getAbsolutePath() );
}
-File mavenBuildProperties =
-new
svn commit: r1359728 - in /maven/plugins/trunk/maven-antrun-plugin: pom.xml src/main/java/org/apache/maven/plugin/antrun/AntRunMojo.java
Author: tchemit
Date: Tue Jul 10 15:26:31 2012
New Revision: 1359728
URL: http://svn.apache.org/viewvc?rev=1359728view=rev
Log:
[MANTRUN-176] use maven-plugin-tools' java 5 annotations
Modified:
maven/plugins/trunk/maven-antrun-plugin/pom.xml
maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugin/antrun/AntRunMojo.java
Modified: maven/plugins/trunk/maven-antrun-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-antrun-plugin/pom.xml?rev=1359728r1=1359727r2=1359728view=diff
==
--- maven/plugins/trunk/maven-antrun-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-antrun-plugin/pom.xml Tue Jul 10 15:26:31 2012
@@ -71,6 +71,11 @@ under the License.
version${mavenVersion}/version
/dependency
dependency
+ groupIdorg.apache.maven.plugin-tools/groupId
+ artifactIdmaven-plugin-annotations/artifactId
+ version3.1/version
+/dependency
+dependency
groupIdorg.codehaus.plexus/groupId
artifactIdplexus-utils/artifactId
version2.0.5/version
@@ -81,4 +86,35 @@ under the License.
version1.8.2/version
/dependency
/dependencies
+
+ build
+pluginManagement
+ plugins
+plugin
+ groupIdorg.apache.maven.plugins/groupId
+ artifactIdmaven-plugin-plugin/artifactId
+ version3.1/version
+ configuration
+skipErrorNoDescriptorsFoundtrue/skipErrorNoDescriptorsFound
+ /configuration
+/plugin
+ /plugins
+/pluginManagement
+
+plugins
+ plugin
+groupIdorg.apache.maven.plugins/groupId
+artifactIdmaven-plugin-plugin/artifactId
+executions
+ execution
+idmojo-descriptor/id
+goals
+ goaldescriptor/goal
+/goals
+ /execution
+/executions
+ /plugin
+/plugins
+ /build
+
/project
Modified:
maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugin/antrun/AntRunMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugin/antrun/AntRunMojo.java?rev=1359728r1=1359727r2=1359728view=diff
==
---
maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugin/antrun/AntRunMojo.java
(original)
+++
maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugin/antrun/AntRunMojo.java
Tue Jul 10 15:26:31 2012
@@ -19,22 +19,15 @@ package org.apache.maven.plugin.antrun;
* under the License.
*/
-import java.io.File;
-import java.io.IOException;
-import java.io.LineNumberReader;
-import java.io.StringWriter;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Set;
-
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.DependencyResolutionRequiredException;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugins.annotations.Component;
+import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.plugins.annotations.Parameter;
+import org.apache.maven.plugins.annotations.ResolutionScope;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.MavenProjectHelper;
import org.apache.tools.ant.BuildException;
@@ -50,6 +43,17 @@ import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.ReaderFactory;
import org.codehaus.plexus.util.StringUtils;
+import java.io.File;
+import java.io.IOException;
+import java.io.LineNumberReader;
+import java.io.StringWriter;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Set;
+
/**
* Maven AntRun Mojo. br/
* This plugin provides the capability of calling Ant tasks from a POM by
running the nested ant tasks inside the
@@ -59,10 +63,8 @@ import org.codehaus.plexus.util.StringUt
* @author a href=mailto:ken...@apache.org;Kenney Westerhof/a
* @author a href=mailto:vincent.sive...@gmail.com;Vincent Siveton/a
* @version $Id$
- * @goal run
- * @threadSafe
- * @requiresDependencyResolution test
*/
+@Mojo( name = run, threadSafe = true, requiresDependencyResolution =
ResolutionScope.TEST )
public class AntRunMojo
extends AbstractMojo
{
@@ -103,122 +105,113 @@ public class AntRunMojo
/**
* The Maven project object
- *
- * @parameter expression=${project}
- * @readonly
*/
+@Component
private MavenProject project;
/**
* The Maven project helper object
- *
- * @component
*/
+@Component
private MavenProjectHelper
svn commit: r1359773 - in /maven/plugins/trunk/maven-assembly-plugin: ./ src/main/java/org/apache/maven/plugin/assembly/mojos/
Author: tchemit
Date: Tue Jul 10 16:43:50 2012
New Revision: 1359773
URL: http://svn.apache.org/viewvc?rev=1359773view=rev
Log:
[MASSEMBLY-618] use maven-plugin-tools' java 5 annotations
Modified:
maven/plugins/trunk/maven-assembly-plugin/pom.xml
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/AbstractAssemblyMojo.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/AssemblyMojo.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/AttachedAssemblyMojo.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/DirectoryInlineMojo.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/DirectoryMojo.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/DirectorySingleMojo.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/SingleAssemblyMojo.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/UnpackMojo.java
Modified: maven/plugins/trunk/maven-assembly-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/pom.xml?rev=1359773r1=1359772r2=1359773view=diff
==
--- maven/plugins/trunk/maven-assembly-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/pom.xml Tue Jul 10 16:43:50 2012
@@ -90,6 +90,13 @@ under the License.
version1.4/version
/dependency
dependency
+ groupIdorg.apache.maven.plugin-tools/groupId
+ artifactIdmaven-plugin-annotations/artifactId
+ version3.1/version
+ scopecompile/scope
+/dependency
+
+dependency
groupIdorg.codehaus.plexus/groupId
artifactIdplexus-interpolation/artifactId
version1.15/version
@@ -260,11 +267,31 @@ under the License.
/execution
/executions
/plugin
+ plugin
+groupIdorg.apache.maven.plugins/groupId
+artifactIdmaven-plugin-plugin/artifactId
+executions
+ execution
+idmojo-descriptor/id
+goals
+ goaldescriptor/goal
+/goals
+ /execution
+/executions
+ /plugin
/plugins
pluginManagement
plugins
plugin
groupIdorg.apache.maven.plugins/groupId
+ artifactIdmaven-plugin-plugin/artifactId
+ version3.1/version
+ configuration
+skipErrorNoDescriptorsFoundtrue/skipErrorNoDescriptorsFound
+ /configuration
+/plugin
+plugin
+ groupIdorg.apache.maven.plugins/groupId
artifactIdmaven-surefire-plugin/artifactId
configuration
excludes
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/AbstractAssemblyMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/AbstractAssemblyMojo.java?rev=1359773r1=1359772r2=1359773view=diff
==
---
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/AbstractAssemblyMojo.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/AbstractAssemblyMojo.java
Tue Jul 10 16:43:50 2012
@@ -35,6 +35,8 @@ import org.apache.maven.plugin.assembly.
import org.apache.maven.plugin.assembly.model.Assembly;
import org.apache.maven.plugin.assembly.utils.AssemblyFormatUtils;
import org.apache.maven.plugin.logging.Log;
+import org.apache.maven.plugins.annotations.Component;
+import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.MavenProjectHelper;
import org.apache.maven.shared.filtering.MavenFileFilter;
@@ -55,92 +57,72 @@ public abstract class AbstractAssemblyMo
extends AbstractMojo
implements AssemblerConfigurationSource
{
- /**
+/**
* The character encoding scheme to be applied when filtering resources.
- *
- * @parameter expression=${encoding}
default-value=${project.build.sourceEncoding}
*/
+@Parameter( property = encoding, defaultValue =
${project.build.sourceEncoding} )
protected String encoding;
/**
* Flag allowing one or more executions of the assembly plugin to be
configured as skipped for a particular build.
* This makes the assembly plugin more controllable from profiles.
- *
- * @parameter expression=${assembly.skipAssembly} default-value=false
*/
+@Parameter( property = assembly.skipAssembly, defaultValue
svn commit: r1359783 - in /maven/plugins/trunk/maven-project-info-reports-plugin: ./ src/main/java/org/apache/maven/report/projectinfo/
Author: tchemit Date: Tue Jul 10 16:57:48 2012 New Revision: 1359783 URL: http://svn.apache.org/viewvc?rev=1359783view=rev Log: [MPIR-246] use maven-plugin-tools' java 5 annotations + reformat mojo code Modified: maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/CimReport.java maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependenciesReport.java maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependencyConvergenceReport.java maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependencyInformationReport.java maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependencyManagementReport.java maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DistributionManagementReport.java maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/IssueTrackingReport.java maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/LicenseReport.java maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/MailingListsReport.java maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ModulesReport.java maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/PluginManagementReport.java maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/PluginsReport.java maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ProjectIndexPageReport.java maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ProjectSummaryReport.java maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ScmReport.java maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/TeamListReport.java Modified: maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml?rev=1359783r1=1359782r2=1359783view=diff == --- maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml Tue Jul 10 16:57:48 2012 @@ -155,6 +155,13 @@ under the License. version1.1/version /dependency +dependency + groupIdorg.apache.maven.plugin-tools/groupId + artifactIdmaven-plugin-annotations/artifactId + version3.1/version + scopecompile/scope +/dependency + !-- Wagon -- dependency groupIdorg.apache.maven.wagon/groupId @@ -364,6 +371,14 @@ under the License. /configuration /plugin plugin + groupIdorg.apache.maven.plugins/groupId + artifactIdmaven-plugin-plugin/artifactId + version3.1/version + configuration +skipErrorNoDescriptorsFoundtrue/skipErrorNoDescriptorsFound + /configuration +/plugin +plugin groupIdorg.codehaus.mojo/groupId artifactIdkeytool-maven-plugin/artifactId version1.0/version @@ -408,6 +423,18 @@ under the License. /executions /plugin plugin +groupIdorg.apache.maven.plugins/groupId +artifactIdmaven-plugin-plugin/artifactId +executions + execution +idmojo-descriptor/id +goals + goaldescriptor/goal +/goals + /execution +/executions + /plugin + plugin groupIdorg.codehaus.mojo/groupId artifactIdkeytool-maven-plugin/artifactId executions Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java?rev=1359783r1=1359782r2=1359783view=diff == --- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java
svn commit: r1359830 - in /maven/plugins/trunk/maven-remote-resources-plugin: ./ src/main/java/org/apache/maven/plugin/resources/remote/
Author: tchemit
Date: Tue Jul 10 18:41:26 2012
New Revision: 1359830
URL: http://svn.apache.org/viewvc?rev=1359830view=rev
Log:
[MRRESOURCES-63] use maven-plugin-tools' java 5 annotations
Modified:
maven/plugins/trunk/maven-remote-resources-plugin/pom.xml
maven/plugins/trunk/maven-remote-resources-plugin/src/main/java/org/apache/maven/plugin/resources/remote/BundleRemoteResourcesMojo.java
maven/plugins/trunk/maven-remote-resources-plugin/src/main/java/org/apache/maven/plugin/resources/remote/ProcessRemoteResourcesMojo.java
Modified: maven/plugins/trunk/maven-remote-resources-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-remote-resources-plugin/pom.xml?rev=1359830r1=1359829r2=1359830view=diff
==
--- maven/plugins/trunk/maven-remote-resources-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-remote-resources-plugin/pom.xml Tue Jul 10
18:41:26 2012
@@ -99,6 +99,12 @@ under the License.
version${mavenVersion}/version
/dependency
+dependency
+ groupIdorg.apache.maven.plugin-tools/groupId
+ artifactIdmaven-plugin-annotations/artifactId
+ version3.1/version
+/dependency
+
!-- maven shared --
dependency
groupIdorg.apache.maven.shared/groupId
@@ -194,6 +200,13 @@ under the License.
pluginManagement
plugins
plugin
+ artifactIdmaven-plugin-plugin/artifactId
+ version3.1/version
+ configuration
+skipErrorNoDescriptorsFoundtrue/skipErrorNoDescriptorsFound
+ /configuration
+/plugin
+plugin
artifactIdmaven-surefire-plugin/artifactId
configuration
includes
@@ -294,6 +307,17 @@ under the License.
/execution
/executions
/plugin
+ plugin
+artifactIdmaven-plugin-plugin/artifactId
+executions
+ execution
+idgenerate-descriptor/id
+goals
+ goaldescriptor/goal
+/goals
+ /execution
+/executions
+ /plugin
/plugins
/build
Modified:
maven/plugins/trunk/maven-remote-resources-plugin/src/main/java/org/apache/maven/plugin/resources/remote/BundleRemoteResourcesMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-remote-resources-plugin/src/main/java/org/apache/maven/plugin/resources/remote/BundleRemoteResourcesMojo.java?rev=1359830r1=1359829r2=1359830view=diff
==
---
maven/plugins/trunk/maven-remote-resources-plugin/src/main/java/org/apache/maven/plugin/resources/remote/BundleRemoteResourcesMojo.java
(original)
+++
maven/plugins/trunk/maven-remote-resources-plugin/src/main/java/org/apache/maven/plugin/resources/remote/BundleRemoteResourcesMojo.java
Tue Jul 10 18:41:26 2012
@@ -22,6 +22,9 @@ package org.apache.maven.plugin.resource
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
import
org.apache.maven.plugin.resources.remote.io.xpp3.RemoteResourcesBundleXpp3Writer;
+import org.apache.maven.plugins.annotations.LifecyclePhase;
+import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.plugins.annotations.Parameter;
import org.codehaus.plexus.util.DirectoryScanner;
import org.codehaus.plexus.util.FileUtils;
import org.codehaus.plexus.util.StringUtils;
@@ -35,34 +38,26 @@ import java.util.List;
/**
* Bundle up resources that should be considered as a remote-resource.
- *
- * @goal bundle
- * @phase generate-resources
- * @threadSafe
*/
+@Mojo( name = bundle, defaultPhase = LifecyclePhase.GENERATE_RESOURCES,
threadSafe = true )
public class BundleRemoteResourcesMojo
extends AbstractMojo
{
public static final String RESOURCES_MANIFEST =
META-INF/maven/remote-resources.xml;
-private static final String[] DEFAULT_INCLUDES = new String [] {
- **/*.txt,
- **/*.vm,
- };
+private static final String[] DEFAULT_INCLUDES = new String[]{ **/*.txt,
**/*.vm, };
/**
* The directory which contains the resources you want packaged up in this
resource bundle.
- *
- * @parameter default-value=${basedir}/src/main/resources
*/
+@Parameter( defaultValue = ${basedir}/src/main/resources )
private File resourcesDirectory;
/**
* The directory where you want the resource bundle manifest written to.
- *
- * @parameter default-value=${project.build.outputDirectory}
*/
+@Parameter( defaultValue = ${project.build.outputDirectory} )
private File outputDirectory;
/**
@@ -70,26 +65,25 @@ public class BundleRemoteResourcesMojo
* The default includes are
* code**#47;*.txt
svn commit: r1359834 - in /maven/plugins/trunk/maven-toolchains-plugin: pom.xml src/main/java/org/apache/maven/plugin/toolchain/ToolchainMojo.java
Author: tchemit
Date: Tue Jul 10 18:51:11 2012
New Revision: 1359834
URL: http://svn.apache.org/viewvc?rev=1359834view=rev
Log:
[MTOOLCHAINS-4] use maven-plugin-tools' java 5 annotations
Modified:
maven/plugins/trunk/maven-toolchains-plugin/pom.xml
maven/plugins/trunk/maven-toolchains-plugin/src/main/java/org/apache/maven/plugin/toolchain/ToolchainMojo.java
Modified: maven/plugins/trunk/maven-toolchains-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-toolchains-plugin/pom.xml?rev=1359834r1=1359833r2=1359834view=diff
==
--- maven/plugins/trunk/maven-toolchains-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-toolchains-plugin/pom.xml Tue Jul 10 18:51:11 2012
@@ -25,7 +25,7 @@ under the License.
parent
artifactIdmaven-plugins/artifactId
groupIdorg.apache.maven.plugins/groupId
-version21/version
+version22/version
relativePath../maven-plugins/pom.xml/relativePath
/parent
@@ -65,6 +65,11 @@ under the License.
version${mavenVersion}/version
/dependency
dependency
+ groupIdorg.apache.maven.plugin-tools/groupId
+ artifactIdmaven-plugin-annotations/artifactId
+ version3.1/version
+/dependency
+dependency
groupIdjunit/groupId
artifactIdjunit/artifactId
version3.8.1/version
@@ -72,6 +77,34 @@ under the License.
/dependency
/dependencies
+ build
+pluginManagement
+ plugins
+plugin
+ artifactIdmaven-plugin-plugin/artifactId
+ version3.1/version
+ configuration
+skipErrorNoDescriptorsFoundtrue/skipErrorNoDescriptorsFound
+ /configuration
+/plugin
+ /plugins
+/pluginManagement
+
+plugins
+ plugin
+artifactIdmaven-plugin-plugin/artifactId
+executions
+ execution
+idgenerate-descriptor/id
+goals
+ goaldescriptor/goal
+/goals
+ /execution
+/executions
+ /plugin
+/plugins
+
+ /build
reporting
plugins
plugin
Modified:
maven/plugins/trunk/maven-toolchains-plugin/src/main/java/org/apache/maven/plugin/toolchain/ToolchainMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-toolchains-plugin/src/main/java/org/apache/maven/plugin/toolchain/ToolchainMojo.java?rev=1359834r1=1359833r2=1359834view=diff
==
---
maven/plugins/trunk/maven-toolchains-plugin/src/main/java/org/apache/maven/plugin/toolchain/ToolchainMojo.java
(original)
+++
maven/plugins/trunk/maven-toolchains-plugin/src/main/java/org/apache/maven/plugin/toolchain/ToolchainMojo.java
Tue Jul 10 18:51:11 2012
@@ -19,51 +19,48 @@ package org.apache.maven.plugin.toolchai
* under the License.
*/
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
+import org.apache.maven.plugins.annotations.Component;
+import org.apache.maven.plugins.annotations.LifecyclePhase;
+import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.toolchain.MisconfiguredToolchainException;
import org.apache.maven.toolchain.ToolchainManagerPrivate;
import org.apache.maven.toolchain.ToolchainPrivate;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
/**
- * @goal toolchain
- * @phase validate
- * @configurator override
- *
* @author mkleint
*/
+@Mojo( name = toolchain, defaultPhase = LifecyclePhase.VALIDATE )
public class ToolchainMojo
extends AbstractMojo
{
/**
- *
- * @component
*/
+@Component
private ToolchainManagerPrivate toolchainManager;
/**
* The current build session instance. This is used for
* toolchain manager API calls.
- *
- * @parameter expression=${session}
- * @required
- * @readonly
*/
+@Component
private MavenSession session;
/**
- * @parameter
- * @required
*/
+@Parameter( required = true )
private Toolchains toolchains;
public ToolchainMojo()
svn commit: r1359842 - in /maven/plugins/trunk/maven-rar-plugin: pom.xml src/main/java/org/apache/maven/plugin/rar/RarMojo.java
Author: tchemit
Date: Tue Jul 10 19:02:19 2012
New Revision: 1359842
URL: http://svn.apache.org/viewvc?rev=1359842view=rev
Log:
[MRAR-31] use maven-plugin-tools' java 5 annotations
Modified:
maven/plugins/trunk/maven-rar-plugin/pom.xml
maven/plugins/trunk/maven-rar-plugin/src/main/java/org/apache/maven/plugin/rar/RarMojo.java
Modified: maven/plugins/trunk/maven-rar-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-rar-plugin/pom.xml?rev=1359842r1=1359841r2=1359842view=diff
==
--- maven/plugins/trunk/maven-rar-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-rar-plugin/pom.xml Tue Jul 10 19:02:19 2012
@@ -25,7 +25,7 @@ under the License.
parent
artifactIdmaven-plugins/artifactId
groupIdorg.apache.maven.plugins/groupId
-version21/version
+version22/version
relativePath../maven-plugins/pom.xml/relativePath
/parent
@@ -72,6 +72,11 @@ under the License.
version${mavenVersion}/version
/dependency
dependency
+ groupIdorg.apache.maven.plugin-tools/groupId
+ artifactIdmaven-plugin-annotations/artifactId
+ version3.1/version
+/dependency
+dependency
groupIdorg.codehaus.plexus/groupId
artifactIdplexus-utils/artifactId
version2.0.5/version
@@ -89,6 +94,33 @@ under the License.
/dependency
/dependencies
+ build
+pluginManagement
+ plugins
+plugin
+ artifactIdmaven-plugin-plugin/artifactId
+ version3.1/version
+ configuration
+skipErrorNoDescriptorsFoundtrue/skipErrorNoDescriptorsFound
+ /configuration
+/plugin
+ /plugins
+/pluginManagement
+
+plugins
+ plugin
+artifactIdmaven-plugin-plugin/artifactId
+executions
+ execution
+idgenerate-descriptor/id
+goals
+ goaldescriptor/goal
+/goals
+ /execution
+/executions
+ /plugin
+/plugins
+ /build
profiles
profile
idrun-its/id
Modified:
maven/plugins/trunk/maven-rar-plugin/src/main/java/org/apache/maven/plugin/rar/RarMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-rar-plugin/src/main/java/org/apache/maven/plugin/rar/RarMojo.java?rev=1359842r1=1359841r2=1359842view=diff
==
---
maven/plugins/trunk/maven-rar-plugin/src/main/java/org/apache/maven/plugin/rar/RarMojo.java
(original)
+++
maven/plugins/trunk/maven-rar-plugin/src/main/java/org/apache/maven/plugin/rar/RarMojo.java
Tue Jul 10 19:02:19 2012
@@ -19,115 +19,103 @@ package org.apache.maven.plugin.rar;
* under the License.
*/
+import org.apache.maven.archiver.MavenArchiveConfiguration;
+import org.apache.maven.archiver.MavenArchiver;
+import org.apache.maven.artifact.Artifact;
+import org.apache.maven.artifact.resolver.filter.ScopeArtifactFilter;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.archiver.MavenArchiver;
-import org.apache.maven.archiver.MavenArchiveConfiguration;
+import org.apache.maven.plugins.annotations.Component;
+import org.apache.maven.plugins.annotations.LifecyclePhase;
+import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.plugins.annotations.Parameter;
+import org.apache.maven.plugins.annotations.ResolutionScope;
import org.apache.maven.project.MavenProject;
-import org.apache.maven.artifact.Artifact;
+import org.codehaus.plexus.archiver.Archiver;
import org.codehaus.plexus.archiver.jar.JarArchiver;
-import org.codehaus.plexus.util.FileUtils;
import org.codehaus.plexus.util.DirectoryScanner;
+import org.codehaus.plexus.util.FileUtils;
import java.io.File;
import java.io.IOException;
import java.util.Iterator;
import java.util.Set;
-import org.apache.maven.artifact.resolver.filter.ScopeArtifactFilter;
/**
* Builds J2EE Resource Adapter Archive (RAR) files.
*
* @author a href=stephane.nic...@gmail.comStephane Nicoll/a
* @version $Id$
- * @goal rar
- * @threadSafe
- * @phase package
- * @requiresDependencyResolution test
*/
+@Mojo( name = rar, threadSafe = true, defaultPhase = LifecyclePhase.PACKAGE,
+ requiresDependencyResolution = ResolutionScope.TEST )
public class RarMojo
extends AbstractMojo
{
public static final String RA_XML_URI = META-INF/ra.xml;
-private static final String[] DEFAULT_INCLUDES = {**/**};
+private static final String[] DEFAULT_INCLUDES = { **/** };
/**
* Single directory for extra files to include in the RAR.
- *
- * @parameter default-value=${basedir}/src/main/rar
- * @required
*/
+@Parameter( defaultValue = ${basedir}/src/main/rar, required = true )
private File rarSourceDirectory;
/**
* The location of the ra.xml file to be used within the rar
svn commit: r1359867 - in /maven/plugins/trunk/maven-pmd-plugin: ./ src/main/java/org/apache/maven/plugin/pmd/
Author: tchemit
Date: Tue Jul 10 19:59:19 2012
New Revision: 1359867
URL: http://svn.apache.org/viewvc?rev=1359867view=rev
Log:
[MPMD-156] use maven-plugin-tools' java 5 annotations
Modified:
maven/plugins/trunk/maven-pmd-plugin/pom.xml
maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/AbstractPmdReport.java
maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/AbstractPmdViolationCheckMojo.java
maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/CpdReport.java
maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/CpdViolationCheckMojo.java
maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/PmdReport.java
maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/PmdViolationCheckMojo.java
Modified: maven/plugins/trunk/maven-pmd-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pmd-plugin/pom.xml?rev=1359867r1=1359866r2=1359867view=diff
==
--- maven/plugins/trunk/maven-pmd-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-pmd-plugin/pom.xml Tue Jul 10 19:59:19 2012
@@ -72,6 +72,18 @@ under the License.
/properties
build
+pluginManagement
+ plugins
+plugin
+ artifactIdmaven-plugin-plugin/artifactId
+ version3.1/version
+ configuration
+skipErrorNoDescriptorsFoundtrue/skipErrorNoDescriptorsFound
+ /configuration
+/plugin
+ /plugins
+/pluginManagement
+
plugins
plugin
groupIdorg.codehaus.modello/groupId
@@ -95,6 +107,17 @@ under the License.
/execution
/executions
/plugin
+ plugin
+artifactIdmaven-plugin-plugin/artifactId
+executions
+ execution
+idgenerate-descriptor/id
+goals
+ goaldescriptor/goal
+/goals
+ /execution
+/executions
+ /plugin
/plugins
/build
@@ -115,6 +138,11 @@ under the License.
artifactIdmaven-project/artifactId
version${mavenVersion}/version
/dependency
+dependency
+ groupIdorg.apache.maven.plugin-tools/groupId
+ artifactIdmaven-plugin-annotations/artifactId
+ version3.1/version
+/dependency
!-- shared --
dependency
@@ -162,6 +190,13 @@ under the License.
groupIdnet.sourceforge.pmd/groupId
artifactIdpmd/artifactId
version${pmdVersion}/version
+ !-- Workaround to fix http://jira.codehaus.org/browse/MPLUGIN-221 --
+ exclusions
+exclusion
+ groupIdcom.ibm.icu/groupId
+ artifactIdicu4j/artifactId
+/exclusion
+ /exclusions
/dependency
!-- test --
Modified:
maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/AbstractPmdReport.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/AbstractPmdReport.java?rev=1359867r1=1359866r2=1359867view=diff
==
---
maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/AbstractPmdReport.java
(original)
+++
maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/AbstractPmdReport.java
Tue Jul 10 19:59:19 2012
@@ -22,6 +22,8 @@ package org.apache.maven.plugin.pmd;
import net.sourceforge.pmd.PMD;
import org.apache.maven.doxia.siterenderer.Renderer;
import org.apache.maven.model.ReportPlugin;
+import org.apache.maven.plugins.annotations.Component;
+import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.project.MavenProject;
import org.apache.maven.reporting.AbstractMavenReport;
import org.codehaus.plexus.util.FileUtils;
@@ -52,36 +54,28 @@ public abstract class AbstractPmdReport
{
/**
* The output directory for the intermediate XML report.
- *
- * @parameter expression=${project.build.directory}
- * @required
*/
+@Parameter( property = project.build.directory, required = true )
protected File targetDirectory;
/**
* The output directory for the final HTML report. Note that this
parameter is only evaluated if the goal is run
* directly from the command line or during the default lifecycle. If the
goal is run indirectly as part of a site
* generation, the output directory configured in the Maven Site Plugin is
used instead.
- *
- * @parameter expression=${project.reporting.outputDirectory}
- * @required
*/
+@Parameter( property = project.reporting.outputDirectory, required =
true )
protected File outputDirectory;
/**
* Site rendering component for generating the HTML report.
- *
- * @component
*/
+@Component
private
svn commit: r1360049 - in /maven/plugins/trunk/maven-ejb-plugin: pom.xml src/main/java/org/apache/maven/plugin/ejb/EjbMojo.java
Author: tchemit
Date: Wed Jul 11 08:10:15 2012
New Revision: 1360049
URL: http://svn.apache.org/viewvc?rev=1360049view=rev
Log:
[MEJB-59] use maven-plugin-tools' java 5 annotations
Modified:
maven/plugins/trunk/maven-ejb-plugin/pom.xml
maven/plugins/trunk/maven-ejb-plugin/src/main/java/org/apache/maven/plugin/ejb/EjbMojo.java
Modified: maven/plugins/trunk/maven-ejb-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ejb-plugin/pom.xml?rev=1360049r1=1360048r2=1360049view=diff
==
--- maven/plugins/trunk/maven-ejb-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-ejb-plugin/pom.xml Wed Jul 11 08:10:15 2012
@@ -25,7 +25,7 @@ under the License.
parent
groupIdorg.apache.maven.plugins/groupId
artifactIdmaven-plugins/artifactId
-version21/version
+version22/version
relativePath../maven-plugins/pom.xml/relativePath
/parent
@@ -84,6 +84,11 @@ under the License.
/exclusions
/dependency
dependency
+ groupIdorg.apache.maven.plugin-tools/groupId
+ artifactIdmaven-plugin-annotations/artifactId
+ version3.1/version
+/dependency
+dependency
groupIdorg.apache.maven.shared/groupId
artifactIdmaven-filtering/artifactId
version${mavenFilteringVersion}/version
@@ -112,6 +117,34 @@ under the License.
/dependency
/dependencies
+ build
+pluginManagement
+ plugins
+plugin
+ artifactIdmaven-plugin-plugin/artifactId
+ version3.1/version
+ configuration
+skipErrorNoDescriptorsFoundtrue/skipErrorNoDescriptorsFound
+ /configuration
+/plugin
+ /plugins
+/pluginManagement
+
+plugins
+ plugin
+artifactIdmaven-plugin-plugin/artifactId
+executions
+ execution
+idgenerate-descriptor/id
+goals
+ goaldescriptor/goal
+/goals
+ /execution
+/executions
+ /plugin
+/plugins
+ /build
+
profiles
profile
idrun-its/id
Modified:
maven/plugins/trunk/maven-ejb-plugin/src/main/java/org/apache/maven/plugin/ejb/EjbMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ejb-plugin/src/main/java/org/apache/maven/plugin/ejb/EjbMojo.java?rev=1360049r1=1360048r2=1360049view=diff
==
---
maven/plugins/trunk/maven-ejb-plugin/src/main/java/org/apache/maven/plugin/ejb/EjbMojo.java
(original)
+++
maven/plugins/trunk/maven-ejb-plugin/src/main/java/org/apache/maven/plugin/ejb/EjbMojo.java
Wed Jul 11 08:10:15 2012
@@ -25,11 +25,17 @@ import org.apache.maven.artifact.Depende
import org.apache.maven.execution.MavenSession;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugins.annotations.Component;
+import org.apache.maven.plugins.annotations.LifecyclePhase;
+import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.plugins.annotations.Parameter;
+import org.apache.maven.plugins.annotations.ResolutionScope;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.MavenProjectHelper;
import org.apache.maven.shared.filtering.MavenFileFilter;
import org.apache.maven.shared.filtering.MavenFilteringException;
import org.apache.maven.shared.filtering.MavenResourcesExecution;
+import org.codehaus.plexus.archiver.Archiver;
import org.codehaus.plexus.archiver.ArchiverException;
import org.codehaus.plexus.archiver.jar.JarArchiver;
import org.codehaus.plexus.archiver.jar.ManifestException;
@@ -45,67 +51,58 @@ import java.util.List;
*
* @author a href=eveni...@apache.orgEmmanuel Venisse/a
* @version $Id$
- * @goal ejb
- * @requiresDependencyResolution runtime
- * @threadSafe
- * @phase package
*/
+@Mojo( name = ejb, requiresDependencyResolution = ResolutionScope.RUNTIME,
threadSafe = true,
+ defaultPhase = LifecyclePhase.PACKAGE )
public class EjbMojo
extends AbstractMojo
{
private static final String EJB_JAR_XML = META-INF/ejb-jar.xml;
// TODO: will null work instead?
-private static final String[] DEFAULT_INCLUDES = new String[]{**/**};
+private static final String[] DEFAULT_INCLUDES = new String[]{ **/** };
-private static final String[] DEFAULT_EXCLUDES = new String[]{EJB_JAR_XML,
**/package.html};
+private static final String[] DEFAULT_EXCLUDES = new String[]{
EJB_JAR_XML, **/package.html };
private static final String[] DEFAULT_CLIENT_EXCLUDES =
-new String[]{**/*Bean.class, **/*CMP.class, **/*Session.class,
**/package.html};
+new String[]{ **/*Bean.class, **/*CMP.class, **/*Session.class,
**/package.html };
private static final String[] EMPTY_STRING_ARRAY = new String[0];
/**
* The directory for the generated EJB.
- *
- * @parameter
svn commit: r1360065 - in /maven/plugins/trunk/maven-acr-plugin: pom.xml src/main/java/org/apache/maven/plugin/acr/AcrMojo.java
Author: tchemit
Date: Wed Jul 11 08:47:58 2012
New Revision: 1360065
URL: http://svn.apache.org/viewvc?rev=1360065view=rev
Log:
[MACR-6] use maven-plugin-tools' java 5 annotations
Modified:
maven/plugins/trunk/maven-acr-plugin/pom.xml
maven/plugins/trunk/maven-acr-plugin/src/main/java/org/apache/maven/plugin/acr/AcrMojo.java
Modified: maven/plugins/trunk/maven-acr-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-acr-plugin/pom.xml?rev=1360065r1=1360064r2=1360065view=diff
==
--- maven/plugins/trunk/maven-acr-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-acr-plugin/pom.xml Wed Jul 11 08:47:58 2012
@@ -25,7 +25,7 @@ under the License.
parent
groupIdorg.apache.maven.plugins/groupId
artifactIdmaven-plugins/artifactId
-version21/version
+version22/version
relativePath../maven-plugins/pom.xml/relativePath
/parent
@@ -83,6 +83,11 @@ under the License.
/exclusions
/dependency
dependency
+ groupIdorg.apache.maven.plugin-tools/groupId
+ artifactIdmaven-plugin-annotations/artifactId
+ version3.1/version
+/dependency
+dependency
groupIdorg.apache.maven.shared/groupId
artifactIdmaven-filtering/artifactId
version1.0/version
@@ -116,6 +121,34 @@ under the License.
/dependency
/dependencies
+ build
+pluginManagement
+ plugins
+plugin
+ artifactIdmaven-plugin-plugin/artifactId
+ version3.1/version
+ configuration
+skipErrorNoDescriptorsFoundtrue/skipErrorNoDescriptorsFound
+ /configuration
+/plugin
+ /plugins
+/pluginManagement
+
+plugins
+ plugin
+artifactIdmaven-plugin-plugin/artifactId
+executions
+ execution
+idgenerate-descriptor/id
+goals
+ goaldescriptor/goal
+/goals
+ /execution
+/executions
+ /plugin
+/plugins
+ /build
+
profiles
profile
idrun-its/id
Modified:
maven/plugins/trunk/maven-acr-plugin/src/main/java/org/apache/maven/plugin/acr/AcrMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-acr-plugin/src/main/java/org/apache/maven/plugin/acr/AcrMojo.java?rev=1360065r1=1360064r2=1360065view=diff
==
---
maven/plugins/trunk/maven-acr-plugin/src/main/java/org/apache/maven/plugin/acr/AcrMojo.java
(original)
+++
maven/plugins/trunk/maven-acr-plugin/src/main/java/org/apache/maven/plugin/acr/AcrMojo.java
Wed Jul 11 08:47:58 2012
@@ -25,10 +25,16 @@ import org.apache.maven.artifact.Depende
import org.apache.maven.execution.MavenSession;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugins.annotations.Component;
+import org.apache.maven.plugins.annotations.LifecyclePhase;
+import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.plugins.annotations.Parameter;
+import org.apache.maven.plugins.annotations.ResolutionScope;
import org.apache.maven.project.MavenProject;
import org.apache.maven.shared.filtering.MavenFileFilter;
import org.apache.maven.shared.filtering.MavenFilteringException;
import org.apache.maven.shared.filtering.MavenResourcesExecution;
+import org.codehaus.plexus.archiver.Archiver;
import org.codehaus.plexus.archiver.ArchiverException;
import org.codehaus.plexus.archiver.jar.JarArchiver;
import org.codehaus.plexus.archiver.jar.ManifestException;
@@ -45,11 +51,9 @@ import java.util.List;
* @author a href=pa...@anahata-it.comPablo Rodriguez/a
* @author a href=snic...@apache.orgStephane Nicoll/a
* @version $Id:
- * @goal acr
- * @requiresDependencyResolution runtime
- * @threadSafe
- * @phase package
*/
+@Mojo( name = acr, requiresDependencyResolution = ResolutionScope.RUNTIME,
threadSafe = true,
+ defaultPhase = LifecyclePhase.PACKAGE )
public class AcrMojo
extends AbstractMojo
{
@@ -65,25 +69,20 @@ public class AcrMojo
/**
* The directory for the generated jar.
- *
- * @parameter default-value=${project.build.directory}
- * @required
- * @readonly
*/
+@Parameter( defaultValue = ${project.build.directory}, required = true,
readonly = true )
private File basedir;
/**
* Directory that resources are copied to during the build.
- *
- * @parameter default-value=${project.build.outputDirectory}
expression=${outputDirectory}
*/
+@Parameter( property = outputDirectory, defaultValue =
${project.build.outputDirectory} )
private File outputDirectory;
/**
* The name of the Application client JAR file to generate.
- *
- * @parameter default-value=${project.build.finalName}
expression=${jarName}
*/
+@Parameter( property = jarName, defaultValue
svn commit: r1360089 - in /maven/plugins/trunk/maven-checkstyle-plugin: ./ src/main/java/org/apache/maven/plugin/checkstyle/
Author: tchemit
Date: Wed Jul 11 09:51:32 2012
New Revision: 1360089
URL: http://svn.apache.org/viewvc?rev=1360089view=rev
Log:
[MCHECKSTYLE-178] use maven-plugin-tools' java 5 annotations
Modified:
maven/plugins/trunk/maven-checkstyle-plugin/pom.xml
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/AbstractCheckstyleReport.java
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleAggregateReport.java
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReport.java
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleViolationCheckMojo.java
Modified: maven/plugins/trunk/maven-checkstyle-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/pom.xml?rev=1360089r1=1360088r2=1360089view=diff
==
--- maven/plugins/trunk/maven-checkstyle-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-checkstyle-plugin/pom.xml Wed Jul 11 09:51:32 2012
@@ -87,6 +87,11 @@ under the License.
artifactIdmaven-project/artifactId
version${mavenVersion}/version
/dependency
+dependency
+ groupIdorg.apache.maven.plugin-tools/groupId
+ artifactIdmaven-plugin-annotations/artifactId
+ version3.1/version
+/dependency
!-- shared --
dependency
@@ -220,6 +225,13 @@ under the License.
pluginManagement
plugins
plugin
+ artifactIdmaven-plugin-plugin/artifactId
+ version3.1/version
+ configuration
+skipErrorNoDescriptorsFoundtrue/skipErrorNoDescriptorsFound
+ /configuration
+/plugin
+plugin
groupIdorg.apache.maven.plugins/groupId
artifactIdmaven-site-plugin/artifactId
version${sitePluginVersion}/version
@@ -238,6 +250,17 @@ under the License.
/execution
/executions
/plugin
+ plugin
+artifactIdmaven-plugin-plugin/artifactId
+executions
+ execution
+idgenerate-descriptor/id
+goals
+ goaldescriptor/goal
+/goals
+ /execution
+/executions
+ /plugin
/plugins
/build
Modified:
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/AbstractCheckstyleReport.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/AbstractCheckstyleReport.java?rev=1360089r1=1360088r2=1360089view=diff
==
---
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/AbstractCheckstyleReport.java
(original)
+++
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/AbstractCheckstyleReport.java
Wed Jul 11 09:51:32 2012
@@ -19,22 +19,17 @@ package org.apache.maven.plugin.checksty
* under the License.
*/
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.Calendar;
-import java.util.Iterator;
-import java.util.Locale;
-import java.util.ResourceBundle;
-
+import com.puppycrawl.tools.checkstyle.DefaultLogger;
+import com.puppycrawl.tools.checkstyle.XMLLogger;
+import com.puppycrawl.tools.checkstyle.api.AuditListener;
+import com.puppycrawl.tools.checkstyle.api.CheckstyleException;
import org.apache.maven.doxia.siterenderer.Renderer;
import org.apache.maven.doxia.tools.SiteTool;
import org.apache.maven.model.ReportPlugin;
import org.apache.maven.plugin.checkstyle.rss.CheckstyleRssGenerator;
import org.apache.maven.plugin.checkstyle.rss.CheckstyleRssGeneratorRequest;
+import org.apache.maven.plugins.annotations.Component;
+import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.project.MavenProject;
import org.apache.maven.reporting.AbstractMavenReport;
import org.apache.maven.reporting.MavenReportException;
@@ -43,15 +38,21 @@ import org.codehaus.plexus.resource.load
import org.codehaus.plexus.util.PathTool;
import org.codehaus.plexus.util.StringUtils;
-import com.puppycrawl.tools.checkstyle.DefaultLogger;
-import com.puppycrawl.tools.checkstyle.XMLLogger;
-import com.puppycrawl.tools.checkstyle.api.AuditListener;
-import com.puppycrawl.tools.checkstyle.api.CheckstyleException;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.util.Calendar;
+import java.util.Iterator;
+import java.util.Locale;
+import java.util.ResourceBundle
svn commit: r1360128 - in /maven/plugins/trunk/maven-patch-plugin: pom.xml src/main/java/org/apache/maven/plugin/patch/ApplyMojo.java
Author: tchemit
Date: Wed Jul 11 11:48:28 2012
New Revision: 1360128
URL: http://svn.apache.org/viewvc?rev=1360128view=rev
Log:
[MPATCH-14] use maven-plugin-tools' java 5 annotations
Modified:
maven/plugins/trunk/maven-patch-plugin/pom.xml
maven/plugins/trunk/maven-patch-plugin/src/main/java/org/apache/maven/plugin/patch/ApplyMojo.java
Modified: maven/plugins/trunk/maven-patch-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-patch-plugin/pom.xml?rev=1360128r1=1360127r2=1360128view=diff
==
--- maven/plugins/trunk/maven-patch-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-patch-plugin/pom.xml Wed Jul 11 11:48:28 2012
@@ -25,7 +25,7 @@ under the License.
parent
groupIdorg.apache.maven.plugins/groupId
artifactIdmaven-plugins/artifactId
-version21/version
+version22/version
relativePath../maven-plugins/pom.xml/relativePath
/parent
@@ -61,6 +61,11 @@ under the License.
artifactIdmaven-plugin-api/artifactId
version${mavenVersion}/version
/dependency
+dependency
+ groupIdorg.apache.maven.plugin-tools/groupId
+ artifactIdmaven-plugin-annotations/artifactId
+ version3.1/version
+/dependency
!-- Plexus --
dependency
@@ -78,6 +83,33 @@ under the License.
/dependency
/dependencies
+ build
+pluginManagement
+ plugins
+plugin
+ artifactIdmaven-plugin-plugin/artifactId
+ version3.1/version
+ configuration
+skipErrorNoDescriptorsFoundtrue/skipErrorNoDescriptorsFound
+ /configuration
+/plugin
+ /plugins
+/pluginManagement
+plugins
+ plugin
+artifactIdmaven-plugin-plugin/artifactId
+executions
+ execution
+idgenerate-descriptor/id
+goals
+ goaldescriptor/goal
+/goals
+ /execution
+/executions
+ /plugin
+/plugins
+ /build
+
profiles
profile
idrun-its/id
Modified:
maven/plugins/trunk/maven-patch-plugin/src/main/java/org/apache/maven/plugin/patch/ApplyMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-patch-plugin/src/main/java/org/apache/maven/plugin/patch/ApplyMojo.java?rev=1360128r1=1360127r2=1360128view=diff
==
---
maven/plugins/trunk/maven-patch-plugin/src/main/java/org/apache/maven/plugin/patch/ApplyMojo.java
(original)
+++
maven/plugins/trunk/maven-patch-plugin/src/main/java/org/apache/maven/plugin/patch/ApplyMojo.java
Wed Jul 11 11:48:28 2012
@@ -22,6 +22,9 @@ package org.apache.maven.plugin.patch;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
+import org.apache.maven.plugins.annotations.LifecyclePhase;
+import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.plugins.annotations.Parameter;
import org.codehaus.plexus.util.FileUtils;
import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.cli.CommandLineException;
@@ -44,10 +47,8 @@ import java.util.Map.Entry;
/**
* Apply one or more patches to project sources.
- *
- * @goal apply
- * @phase process-sources
*/
+@Mojo( name = apply, defaultPhase = LifecyclePhase.PROCESS_SOURCES )
public class ApplyMojo
extends AbstractMojo
{
@@ -85,25 +86,22 @@ public class ApplyMojo
/**
* Whether to exclude default ignored patch items, such as
code.svn/code or codeCVS/code directories.
- *
- * @parameter default-value=true
*/
+@Parameter( defaultValue = true )
private boolean useDefaultIgnores;
/**
* The list of patch file names, supplying the order in which patches
should be applied. The path names in this list
* must be relative to the base directory specified by the parameter
codepatchDirectory/code. This parameter
* is mutually exclusive with the codepatchfile/code parameter.
- *
- * @parameter
*/
+@Parameter
protected List patches;
/**
* Whether to skip this goal's execution.
- *
- * @parameter default-value=false alias=patch.apply.skip
*/
+@Parameter( alias = patch.apply.skip, defaultValue = false )
private boolean skipApplication;
/**
@@ -113,9 +111,8 @@ public class ApplyMojo
* re-unpacking project sources, we need to make sure we don't reapply
patches.br/ strongNote:/strong If the
* list of patches changes and this flag is enabled, a codemvn
clean/code must be executed before the next
* build, to remove the tracking file.
- *
- * @parameter default-value=true
*/
+@Parameter( defaultValue = true )
private boolean optimizations;
/**
@@ -123,39 +120,34 @@ public class ApplyMojo
* are currently in the target
svn commit: r1360130 - in /maven/plugins/trunk/maven-pdf-plugin: pom.xml src/main/java/org/apache/maven/plugins/pdf/PdfMojo.java
Author: tchemit
Date: Wed Jul 11 12:05:39 2012
New Revision: 1360130
URL: http://svn.apache.org/viewvc?rev=1360130view=rev
Log:
[MPDF-58] use maven-plugin-tools' java 5 annotations
Modified:
maven/plugins/trunk/maven-pdf-plugin/pom.xml
maven/plugins/trunk/maven-pdf-plugin/src/main/java/org/apache/maven/plugins/pdf/PdfMojo.java
Modified: maven/plugins/trunk/maven-pdf-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pdf-plugin/pom.xml?rev=1360130r1=1360129r2=1360130view=diff
==
--- maven/plugins/trunk/maven-pdf-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-pdf-plugin/pom.xml Wed Jul 11 12:05:39 2012
@@ -130,6 +130,11 @@ under the License.
version${mavenVersion}/version
/dependency
dependency
+ groupIdorg.apache.maven.plugin-tools/groupId
+ artifactIdmaven-plugin-annotations/artifactId
+ version3.1/version
+/dependency
+dependency
groupIdorg.apache.maven.reporting/groupId
artifactIdmaven-reporting-api/artifactId
version${mavenVersion}/version
@@ -305,6 +310,13 @@ under the License.
artifactIdmaven-pdf-plugin/artifactId
version1.1/version
/plugin
+plugin
+ artifactIdmaven-plugin-plugin/artifactId
+ version3.1/version
+ configuration
+skipErrorNoDescriptorsFoundtrue/skipErrorNoDescriptorsFound
+ /configuration
+/plugin
/plugins
/pluginManagement
@@ -328,6 +340,17 @@ under the License.
/executions
/plugin
!-- END SNIPPET: configuration --
+ plugin
+artifactIdmaven-plugin-plugin/artifactId
+executions
+ execution
+idgenerate-descriptor/id
+goals
+ goaldescriptor/goal
+/goals
+ /execution
+/executions
+ /plugin
!-- Backward compatibility with Maven 2.0.x, see MNG-3402 --
plugin
artifactIdmaven-shade-plugin/artifactId
Modified:
maven/plugins/trunk/maven-pdf-plugin/src/main/java/org/apache/maven/plugins/pdf/PdfMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pdf-plugin/src/main/java/org/apache/maven/plugins/pdf/PdfMojo.java?rev=1360130r1=1360129r2=1360130view=diff
==
---
maven/plugins/trunk/maven-pdf-plugin/src/main/java/org/apache/maven/plugins/pdf/PdfMojo.java
(original)
+++
maven/plugins/trunk/maven-pdf-plugin/src/main/java/org/apache/maven/plugins/pdf/PdfMojo.java
Wed Jul 11 12:05:39 2012
@@ -19,24 +19,6 @@ package org.apache.maven.plugins.pdf;
* under the License.
*/
-import java.io.File;
-import java.io.IOException;
-import java.io.Reader;
-import java.io.StringReader;
-import java.io.StringWriter;
-import java.io.Writer;
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.Method;
-import java.lang.reflect.Proxy;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-
-import javax.swing.text.AttributeSet;
-
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.factory.ArtifactFactory;
import org.apache.maven.artifact.repository.ArtifactRepository;
@@ -86,6 +68,9 @@ import org.apache.maven.plugin.descripto
import org.apache.maven.plugin.descriptor.PluginDescriptor;
import org.apache.maven.plugin.version.PluginVersionNotFoundException;
import org.apache.maven.plugin.version.PluginVersionResolutionException;
+import org.apache.maven.plugins.annotations.Component;
+import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.MavenProjectBuilder;
import org.apache.maven.project.ProjectBuildingException;
@@ -104,18 +89,36 @@ import org.codehaus.plexus.util.WriterFa
import org.codehaus.plexus.util.xml.XmlStreamReader;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
+import javax.swing.text.AttributeSet;
+import java.io.File;
+import java.io.IOException;
+import java.io.Reader;
+import java.io.StringReader;
+import java.io.StringWriter;
+import java.io.Writer;
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.Method;
+import java.lang.reflect.Proxy;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+
/**
* Generates a PDF document for a project.
*
* @author ltheussl
* @version $Id$
- * @goal pdf
- * @threadSafe
*/
+@Mojo( name = pdf, threadSafe = true )
public class PdfMojo
extends AbstractMojo
{
-/** The vm line separator */
+/**
+ * The vm line separator
+ */
private static final String EOL = System.getProperty
svn commit: r1360148 - in /maven/plugins/trunk/maven-reactor-plugin: ./ src/main/java/org/apache/maven/plugin/reactor/
Author: tchemit
Date: Wed Jul 11 12:31:36 2012
New Revision: 1360148
URL: http://svn.apache.org/viewvc?rev=1360148view=rev
Log:
[MREACTOR-21] use maven-plugin-tools' java 5 annotations
Modified:
maven/plugins/trunk/maven-reactor-plugin/pom.xml
maven/plugins/trunk/maven-reactor-plugin/src/main/java/org/apache/maven/plugin/reactor/MakeDependentsMojo.java
maven/plugins/trunk/maven-reactor-plugin/src/main/java/org/apache/maven/plugin/reactor/MakeMojo.java
maven/plugins/trunk/maven-reactor-plugin/src/main/java/org/apache/maven/plugin/reactor/MakeScmChanges.java
maven/plugins/trunk/maven-reactor-plugin/src/main/java/org/apache/maven/plugin/reactor/ResumeMojo.java
Modified: maven/plugins/trunk/maven-reactor-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-reactor-plugin/pom.xml?rev=1360148r1=1360147r2=1360148view=diff
==
--- maven/plugins/trunk/maven-reactor-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-reactor-plugin/pom.xml Wed Jul 11 12:31:36 2012
@@ -25,7 +25,7 @@ under the License.
parent
artifactIdmaven-plugins/artifactId
groupIdorg.apache.maven.plugins/groupId
-version21/version
+version22/version
relativePath../maven-plugins/pom.xml/relativePath
/parent
@@ -74,6 +74,11 @@ under the License.
version${mavenVersion}/version
/dependency
dependency
+ groupIdorg.apache.maven.plugin-tools/groupId
+ artifactIdmaven-plugin-annotations/artifactId
+ version3.1/version
+/dependency
+dependency
groupIdorg.apache.maven.shared/groupId
artifactIdmaven-invoker/artifactId
version2.0.10/version
@@ -101,4 +106,30 @@ under the License.
scopetest/scope
/dependency
/dependencies
+ build
+pluginManagement
+ plugins
+plugin
+ artifactIdmaven-plugin-plugin/artifactId
+ version3.1/version
+ configuration
+skipErrorNoDescriptorsFoundtrue/skipErrorNoDescriptorsFound
+ /configuration
+/plugin
+ /plugins
+/pluginManagement
+plugins
+ plugin
+artifactIdmaven-plugin-plugin/artifactId
+executions
+ execution
+idgenerate-descriptor/id
+goals
+ goaldescriptor/goal
+/goals
+ /execution
+/executions
+ /plugin
+/plugins
+ /build
/project
Modified:
maven/plugins/trunk/maven-reactor-plugin/src/main/java/org/apache/maven/plugin/reactor/MakeDependentsMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-reactor-plugin/src/main/java/org/apache/maven/plugin/reactor/MakeDependentsMojo.java?rev=1360148r1=1360147r2=1360148view=diff
==
---
maven/plugins/trunk/maven-reactor-plugin/src/main/java/org/apache/maven/plugin/reactor/MakeDependentsMojo.java
(original)
+++
maven/plugins/trunk/maven-reactor-plugin/src/main/java/org/apache/maven/plugin/reactor/MakeDependentsMojo.java
Wed Jul 11 12:31:36 2012
@@ -19,19 +19,19 @@ package org.apache.maven.plugin.reactor;
* under the License.
*/
+import org.apache.maven.plugins.annotations.LifecyclePhase;
+import org.apache.maven.plugins.annotations.Mojo;
+import org.codehaus.plexus.util.dag.Vertex;
+
import java.util.List;
import java.util.Set;
-import org.codehaus.plexus.util.dag.Vertex;
-
/**
* Goal to build a project X and all of the reactor projects that depend on X
*
* @author a href=mailto:dfabul...@apache.org;Dan Fabulich/a
- * @goal make-dependents
- * @aggregator
- * @phase process-sources
*/
+@Mojo( name = make-dependents, aggregator = true, defaultPhase =
LifecyclePhase.PROCESS_SOURCES )
public class MakeDependentsMojo
extends MakeMojo
{
Modified:
maven/plugins/trunk/maven-reactor-plugin/src/main/java/org/apache/maven/plugin/reactor/MakeMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-reactor-plugin/src/main/java/org/apache/maven/plugin/reactor/MakeMojo.java?rev=1360148r1=1360147r2=1360148view=diff
==
---
maven/plugins/trunk/maven-reactor-plugin/src/main/java/org/apache/maven/plugin/reactor/MakeMojo.java
(original)
+++
maven/plugins/trunk/maven-reactor-plugin/src/main/java/org/apache/maven/plugin/reactor/MakeMojo.java
Wed Jul 11 12:31:36 2012
@@ -19,101 +19,99 @@ package org.apache.maven.plugin.reactor;
* under the License.
*/
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
import org.apache.maven.artifact.ArtifactUtils;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
+import org.apache.maven.plugins.annotations.Component
svn commit: r1360155 - in /maven/plugins/trunk/maven-repository-plugin: pom.xml src/main/java/org/apache/maven/plugins/repository/BundleCreateMojo.java src/main/java/org/apache/maven/plugins/repositor
Author: tchemit
Date: Wed Jul 11 12:52:09 2012
New Revision: 1360155
URL: http://svn.apache.org/viewvc?rev=1360155view=rev
Log:
[MREPOSITORY-26] use maven-plugin-tools' java 5 annotations
Modified:
maven/plugins/trunk/maven-repository-plugin/pom.xml
maven/plugins/trunk/maven-repository-plugin/src/main/java/org/apache/maven/plugins/repository/BundleCreateMojo.java
maven/plugins/trunk/maven-repository-plugin/src/main/java/org/apache/maven/plugins/repository/BundlePackMojo.java
Modified: maven/plugins/trunk/maven-repository-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-repository-plugin/pom.xml?rev=1360155r1=1360154r2=1360155view=diff
==
--- maven/plugins/trunk/maven-repository-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-repository-plugin/pom.xml Wed Jul 11 12:52:09 2012
@@ -102,6 +102,11 @@ under the License.
version${mavenVersion}/version
/dependency
dependency
+ groupIdorg.apache.maven.plugin-tools/groupId
+ artifactIdmaven-plugin-annotations/artifactId
+ version3.1/version
+/dependency
+dependency
groupIdorg.apache.maven.shared/groupId
artifactIdmaven-plugin-testing-harness/artifactId
version1.0-beta-1/version
@@ -157,6 +162,13 @@ under the License.
pluginManagement
plugins
plugin
+ artifactIdmaven-plugin-plugin/artifactId
+ version3.1/version
+ configuration
+skipErrorNoDescriptorsFoundtrue/skipErrorNoDescriptorsFound
+ /configuration
+/plugin
+plugin
groupIdorg.apache.maven.plugins/groupId
artifactIdmaven-surefire-plugin/artifactId
version2.12/version
@@ -171,6 +183,20 @@ under the License.
/plugin
/plugins
/pluginManagement
+
+ plugins
+ plugin
+ artifactIdmaven-plugin-plugin/artifactId
+ executions
+ execution
+ idgenerate-descriptor/id
+ goals
+ goaldescriptor/goal
+ /goals
+ /execution
+ /executions
+ /plugin
+ /plugins
/build
profiles
Modified:
maven/plugins/trunk/maven-repository-plugin/src/main/java/org/apache/maven/plugins/repository/BundleCreateMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-repository-plugin/src/main/java/org/apache/maven/plugins/repository/BundleCreateMojo.java?rev=1360155r1=1360154r2=1360155view=diff
==
---
maven/plugins/trunk/maven-repository-plugin/src/main/java/org/apache/maven/plugins/repository/BundleCreateMojo.java
(original)
+++
maven/plugins/trunk/maven-repository-plugin/src/main/java/org/apache/maven/plugins/repository/BundleCreateMojo.java
Wed Jul 11 12:52:09 2012
@@ -21,8 +21,14 @@ package org.apache.maven.plugins.reposit
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugins.annotations.Component;
+import org.apache.maven.plugins.annotations.Execute;
+import org.apache.maven.plugins.annotations.LifecyclePhase;
+import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.project.MavenProject;
import org.apache.maven.settings.Settings;
+import org.codehaus.plexus.archiver.Archiver;
import org.codehaus.plexus.archiver.jar.JarArchiver;
import org.codehaus.plexus.components.interactivity.InputHandler;
import org.codehaus.plexus.util.StringUtils;
@@ -34,10 +40,10 @@ import java.util.List;
/**
* Goal which creates an upload bundle for a project built with Maven.
*
- * @goal bundle-create
- * @execute phase=package
* @since 2.0
*/
+@Mojo( name = bundle-create )
+@Execute( phase = LifecyclePhase.PACKAGE )
public class BundleCreateMojo
extends AbstractMojo
{
@@ -45,44 +51,38 @@ public class BundleCreateMojo
/**
* Output directory.
- *
- * @parameter default-value=${project.build.directory}
- * @readonly
*/
+@Parameter( defaultValue = ${project.build.directory}, readonly = true )
private File outputDirectory;
/**
* The current Maven project.
- *
- * @parameter default-value=${project}
- * @readonly
*/
+@Component
private MavenProject project;
-
+
/**
* Disable validations to make sure bundle supports project
materialization.
* br/
* bWARNING: This means your project will be MUCH harder to use./b
- * @parameter expression=${bundle.disableMaterialization}
default-value=false
*/
+@Parameter( property = bundle.disableMaterialization, defaultValue =
false )
private boolean disableMaterialization;
/**
* Jar archiver.
- *
- * @component role=org.codehaus.plexus.archiver.Archiver roleHint=jar
*/
+@Component( role
svn commit: r1360161 - in /maven/plugins/trunk/maven-stage-plugin: pom.xml src/main/java/org/apache/maven/plugins/stage/CopyRepositoryMojo.java
Author: tchemit
Date: Wed Jul 11 12:56:51 2012
New Revision: 1360161
URL: http://svn.apache.org/viewvc?rev=1360161view=rev
Log:
[MSTAGE-15] use maven-plugin-tools' java 5 annotations
Modified:
maven/plugins/trunk/maven-stage-plugin/pom.xml
maven/plugins/trunk/maven-stage-plugin/src/main/java/org/apache/maven/plugins/stage/CopyRepositoryMojo.java
Modified: maven/plugins/trunk/maven-stage-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-stage-plugin/pom.xml?rev=1360161r1=1360160r2=1360161view=diff
==
--- maven/plugins/trunk/maven-stage-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-stage-plugin/pom.xml Wed Jul 11 12:56:51 2012
@@ -25,7 +25,7 @@ under the License.
parent
groupIdorg.apache.maven.plugins/groupId
artifactIdmaven-plugins/artifactId
-version21/version
+version22/version
relativePath../maven-plugins/pom.xml/relativePath
/parent
@@ -79,6 +79,11 @@ under the License.
version${mavenVersion}/version
/dependency
dependency
+ groupIdorg.apache.maven.plugin-tools/groupId
+ artifactIdmaven-plugin-annotations/artifactId
+ version3.1/version
+/dependency
+dependency
groupIdorg.apache.maven.wagon/groupId
artifactIdwagon-file/artifactId
version${wagonVersion}/version
@@ -114,7 +119,7 @@ under the License.
dependency
groupIdorg.codehaus.plexus/groupId
artifactIdplexus-utils/artifactId
- version1.4.1/version
+ version3.0.1/version
/dependency
dependency
groupIdjunit/groupId
@@ -128,6 +133,13 @@ under the License.
pluginManagement
plugins
plugin
+ artifactIdmaven-plugin-plugin/artifactId
+ version3.1/version
+ configuration
+skipErrorNoDescriptorsFoundtrue/skipErrorNoDescriptorsFound
+ /configuration
+/plugin
+plugin
groupIdorg.apache.maven.plugins/groupId
artifactIdmaven-site-plugin/artifactId
version2.0/version
@@ -148,6 +160,17 @@ under the License.
/executions
/plugin
plugin
+artifactIdmaven-plugin-plugin/artifactId
+executions
+ execution
+idgenerate-descriptor/id
+goals
+ goaldescriptor/goal
+/goals
+ /execution
+/executions
+ /plugin
+ plugin
groupIdorg.apache.maven.plugins/groupId
artifactIdmaven-surefire-plugin/artifactId
configuration
Modified:
maven/plugins/trunk/maven-stage-plugin/src/main/java/org/apache/maven/plugins/stage/CopyRepositoryMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-stage-plugin/src/main/java/org/apache/maven/plugins/stage/CopyRepositoryMojo.java?rev=1360161r1=1360160r2=1360161view=diff
==
---
maven/plugins/trunk/maven-stage-plugin/src/main/java/org/apache/maven/plugins/stage/CopyRepositoryMojo.java
(original)
+++
maven/plugins/trunk/maven-stage-plugin/src/main/java/org/apache/maven/plugins/stage/CopyRepositoryMojo.java
Wed Jul 11 12:56:51 2012
@@ -21,6 +21,9 @@ package org.apache.maven.plugins.stage;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugins.annotations.Component;
+import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.wagon.WagonException;
import org.apache.maven.wagon.repository.Repository;
@@ -30,43 +33,38 @@ import java.io.IOException;
* Copies artifacts from one repository to another repository.
*
* @author Jason van Zyl
- * @requiresProject false
- * @goal copy
*/
+@Mojo( name = copy, requiresProject = false )
public class CopyRepositoryMojo
extends AbstractMojo
{
/**
* The URL to the source repository.
- *
- * @parameter expression=${source}
*/
+@Parameter( property = source )
private String source;
/**
* The URL to the target repository.
- *
+ * p/
* p
* strongNote:/strong currently only codescp:/code URLs are allowed
* as a target URL.
* /p
- *
- * @parameter expression=${target}
*/
+@Parameter( property = target )
private String target;
/**
* The id of the source repository, required if you need the configuration
from the user settings.
- *
- * @parameter expression=${sourceRepositoryId} default-value=source
*/
+@Parameter( property = sourceRepositoryId, defaultValue = source )
private String sourceRepositoryId;
/**
* The id of the target repository, required if you need the configuration
from the user settings.
- *
- * @parameter expression=${targetRepositoryId} default-value=target
svn commit: r1360165 - in /maven/plugins/trunk/maven-linkcheck-plugin: pom.xml src/main/java/org/apache/maven/plugins/linkcheck/LinkcheckReport.java
Author: tchemit
Date: Wed Jul 11 13:06:38 2012
New Revision: 1360165
URL: http://svn.apache.org/viewvc?rev=1360165view=rev
Log:
[MLINKCHECK-11] use maven-plugin-tools' java 5 annotations
Modified:
maven/plugins/trunk/maven-linkcheck-plugin/pom.xml
maven/plugins/trunk/maven-linkcheck-plugin/src/main/java/org/apache/maven/plugins/linkcheck/LinkcheckReport.java
Modified: maven/plugins/trunk/maven-linkcheck-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-linkcheck-plugin/pom.xml?rev=1360165r1=1360164r2=1360165view=diff
==
--- maven/plugins/trunk/maven-linkcheck-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-linkcheck-plugin/pom.xml Wed Jul 11 13:06:38 2012
@@ -25,7 +25,7 @@ under the License.
parent
groupIdorg.apache.maven.plugins/groupId
artifactIdmaven-plugins/artifactId
-version19/version
+version22/version
relativePath../maven-plugins/pom.xml/relativePath
/parent
@@ -84,6 +84,11 @@ under the License.
version${mavenVersion}/version
/dependency
dependency
+ groupIdorg.apache.maven.plugin-tools/groupId
+ artifactIdmaven-plugin-annotations/artifactId
+ version3.1/version
+/dependency
+dependency
groupIdorg.apache.maven.reporting/groupId
artifactIdmaven-reporting-api/artifactId
version${mavenVersion}/version
@@ -161,6 +166,33 @@ under the License.
/dependency
/dependencies
+ build
+pluginManagement
+ plugins
+plugin
+ artifactIdmaven-plugin-plugin/artifactId
+ version3.1/version
+ configuration
+skipErrorNoDescriptorsFoundtrue/skipErrorNoDescriptorsFound
+ /configuration
+/plugin
+ /plugins
+/pluginManagement
+plugins
+ plugin
+artifactIdmaven-plugin-plugin/artifactId
+executions
+ execution
+idgenerate-descriptor/id
+goals
+ goaldescriptor/goal
+/goals
+ /execution
+/executions
+ /plugin
+/plugins
+ /build
+
profiles
profile
idreporting/id
Modified:
maven/plugins/trunk/maven-linkcheck-plugin/src/main/java/org/apache/maven/plugins/linkcheck/LinkcheckReport.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-linkcheck-plugin/src/main/java/org/apache/maven/plugins/linkcheck/LinkcheckReport.java?rev=1360165r1=1360164r2=1360165view=diff
==
---
maven/plugins/trunk/maven-linkcheck-plugin/src/main/java/org/apache/maven/plugins/linkcheck/LinkcheckReport.java
(original)
+++
maven/plugins/trunk/maven-linkcheck-plugin/src/main/java/org/apache/maven/plugins/linkcheck/LinkcheckReport.java
Wed Jul 11 13:06:38 2012
@@ -19,15 +19,6 @@ package org.apache.maven.plugins.linkche
* under the License.
*/
-import java.io.File;
-import java.io.IOException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Locale;
-import java.util.Properties;
-
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.doxia.linkcheck.HttpBean;
import org.apache.maven.doxia.linkcheck.LinkCheck;
@@ -35,6 +26,9 @@ import org.apache.maven.doxia.linkcheck.
import org.apache.maven.doxia.linkcheck.model.LinkcheckModel;
import org.apache.maven.doxia.siterenderer.Renderer;
import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugins.annotations.Component;
+import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.project.MavenProject;
import org.apache.maven.reporting.AbstractMavenReport;
import org.apache.maven.reporting.MavenReportException;
@@ -45,14 +39,23 @@ import org.codehaus.plexus.util.FileUtil
import org.codehaus.plexus.util.ReaderFactory;
import org.codehaus.plexus.util.StringUtils;
+import java.io.File;
+import java.io.IOException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Locale;
+import java.util.Properties;
+
/**
* Generates a codeLinkcheck/code report.
*
* @author a href=mailto:vincent.sive...@gmail.com;Vincent Siveton/a
* @version $Id$
* @since 1.0
- * @goal linkcheck
*/
+@Mojo( name = linkcheck )
public class LinkcheckReport
extends AbstractMavenReport
{
@@ -62,23 +65,20 @@ public class LinkcheckReport
/**
* Internationalization.
- *
- * @component
*/
+@Component
private I18N i18n;
/**
* Doxia Site Renderer.
- *
- * @component
*/
+@Component
private Renderer siteRenderer;
/**
* LinkCheck component.
- *
- * @component
*/
+@Component
private LinkCheck linkCheck
svn commit: r1360251 [2/2] - in /maven/plugins/trunk/maven-javadoc-plugin: ./ src/main/java/org/apache/maven/plugin/javadoc/
Modified:
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/TestResourcesBundleMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/TestResourcesBundleMojo.java?rev=1360251r1=1360250r2=1360251view=diff
==
---
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/TestResourcesBundleMojo.java
(original)
+++
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/TestResourcesBundleMojo.java
Wed Jul 11 16:01:25 2012
@@ -19,28 +19,32 @@ package org.apache.maven.plugin.javadoc;
* under the License.
*/
+import org.apache.maven.plugins.annotations.LifecyclePhase;
+import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.plugins.annotations.Parameter;
+import org.apache.maven.plugins.annotations.ResolutionScope;
+
import java.io.File;
/**
- * Bundle {@link TestJavadocJar#testJavadocDirectory}, along with javadoc
configuration options from
- * {@link AbstractJavadocMojo} such as taglet, doclet, and link information
into a deployable
- * artifact. This artifact can then be consumed by the javadoc plugin mojos
when used by the
- * codeincludeDependencySources/code option, to generate javadocs that are
somewhat consistent
+ * Bundle {@link TestJavadocJar#testJavadocDirectory}, along with javadoc
configuration options from
+ * {@link AbstractJavadocMojo} such as taglet, doclet, and link information
into a deployable
+ * artifact. This artifact can then be consumed by the javadoc plugin mojos
when used by the
+ * codeincludeDependencySources/code option, to generate javadocs that are
somewhat consistent
* with those generated in the original project itself.
- *
- * @goal test-resource-bundle
- * @phase package
+ *
* @since 2.7
*/
+@Mojo( name = test-resource-bundle, defaultPhase = LifecyclePhase.PACKAGE,
+ requiresDependencyResolution = ResolutionScope.TEST )
public class TestResourcesBundleMojo
extends ResourcesBundleMojo
{
-
+
/**
* Specifies the Test Javadoc resources directory to be included in the
Javadoc (i.e. package.html, images...).
- *
- * @parameter default-value=${basedir}/src/test/javadoc
alias=javadocDirectory
*/
+@Parameter( alias = javadocDirectory, defaultValue =
${basedir}/src/test/javadoc )
private File testJavadocDirectory;
@Override
@@ -54,5 +58,5 @@ public class TestResourcesBundleMojo
{
return testJavadocDirectory;
}
-
+
}
svn commit: r1360280 - in /maven/plugins/trunk/maven-changelog-plugin: ./ src/main/java/org/apache/maven/plugin/changelog/
Author: tchemit
Date: Wed Jul 11 16:31:03 2012
New Revision: 1360280
URL: http://svn.apache.org/viewvc?rev=1360280view=rev
Log:
[MCHANGELOG-129] use maven-plugin-tools' java 5 annotations
Modified:
maven/plugins/trunk/maven-changelog-plugin/pom.xml
maven/plugins/trunk/maven-changelog-plugin/src/main/java/org/apache/maven/plugin/changelog/ChangeLogReport.java
maven/plugins/trunk/maven-changelog-plugin/src/main/java/org/apache/maven/plugin/changelog/DeveloperActivityReport.java
maven/plugins/trunk/maven-changelog-plugin/src/main/java/org/apache/maven/plugin/changelog/FileActivityReport.java
Modified: maven/plugins/trunk/maven-changelog-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changelog-plugin/pom.xml?rev=1360280r1=1360279r2=1360280view=diff
==
--- maven/plugins/trunk/maven-changelog-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-changelog-plugin/pom.xml Wed Jul 11 16:31:03 2012
@@ -157,6 +157,11 @@ under the License.
artifactIdmaven-settings/artifactId
version${mavenVersion}/version
/dependency
+dependency
+ groupIdorg.apache.maven.plugin-tools/groupId
+ artifactIdmaven-plugin-annotations/artifactId
+ version3.1/version
+/dependency
!-- shared --
dependency
@@ -310,10 +315,34 @@ under the License.
plugin
groupIdorg.apache.maven.plugins/groupId
artifactIdmaven-site-plugin/artifactId
- version3.0/version
+ version${sitePluginVersion}/version
+/plugin
+plugin
+ groupIdorg.apache.maven.plugins/groupId
+ artifactIdmaven-plugin-plugin/artifactId
+ version3.1/version
+ configuration
+skipErrorNoDescriptorsFoundtrue/skipErrorNoDescriptorsFound
+ /configuration
/plugin
/plugins
/pluginManagement
+
+plugins
+ plugin
+groupIdorg.apache.maven.plugins/groupId
+artifactIdmaven-plugin-plugin/artifactId
+executions
+ execution
+idmojo-descriptor/id
+phaseprocess-classes/phase
+goals
+ goaldescriptor/goal
+/goals
+ /execution
+/executions
+ /plugin
+/plugins
/build
reporting
Modified:
maven/plugins/trunk/maven-changelog-plugin/src/main/java/org/apache/maven/plugin/changelog/ChangeLogReport.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changelog-plugin/src/main/java/org/apache/maven/plugin/changelog/ChangeLogReport.java?rev=1360280r1=1360279r2=1360280view=diff
==
---
maven/plugins/trunk/maven-changelog-plugin/src/main/java/org/apache/maven/plugin/changelog/ChangeLogReport.java
(original)
+++
maven/plugins/trunk/maven-changelog-plugin/src/main/java/org/apache/maven/plugin/changelog/ChangeLogReport.java
Wed Jul 11 16:31:03 2012
@@ -19,38 +19,13 @@ package org.apache.maven.plugin.changelo
* under the License.
*/
-import java.io.BufferedOutputStream;
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.StringReader;
-import java.io.UnsupportedEncodingException;
-import java.io.Writer;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Properties;
-import java.util.ResourceBundle;
-import java.util.StringTokenizer;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
import org.apache.maven.doxia.sink.Sink;
import org.apache.maven.doxia.siterenderer.Renderer;
import org.apache.maven.model.Developer;
import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugins.annotations.Component;
+import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.project.MavenProject;
import org.apache.maven.reporting.AbstractMavenReport;
import org.apache.maven.reporting.MavenReportException;
@@ -75,12 +50,40 @@ import org.codehaus.plexus.util.ReaderFa
import org.codehaus.plexus.util.StringUtils;
import org.codehaus.plexus.util.WriterFactory;
+import java.io.BufferedOutputStream;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.StringReader;
+import java.io.UnsupportedEncodingException;
+import java.io.Writer;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import
svn commit: r1360289 - in /maven/plugins/trunk/maven-doap-plugin: pom.xml src/main/java/org/apache/maven/plugin/doap/DoapMojo.java
Author: tchemit
Date: Wed Jul 11 16:47:08 2012
New Revision: 1360289
URL: http://svn.apache.org/viewvc?rev=1360289view=rev
Log:
[MDOAP-37] use maven-plugin-tools' java 5 annotations
Modified:
maven/plugins/trunk/maven-doap-plugin/pom.xml
maven/plugins/trunk/maven-doap-plugin/src/main/java/org/apache/maven/plugin/doap/DoapMojo.java
Modified: maven/plugins/trunk/maven-doap-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-doap-plugin/pom.xml?rev=1360289r1=1360288r2=1360289view=diff
==
--- maven/plugins/trunk/maven-doap-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-doap-plugin/pom.xml Wed Jul 11 16:47:08 2012
@@ -25,7 +25,7 @@ under the License.
parent
groupIdorg.apache.maven.plugins/groupId
artifactIdmaven-plugins/artifactId
-version21/version
+version22/version
relativePath../maven-plugins/pom.xml/relativePath
/parent
@@ -67,6 +67,11 @@ under the License.
artifactIdmaven-plugin-api/artifactId
version${mavenVersion}/version
/dependency
+dependency
+ groupIdorg.apache.maven.plugin-tools/groupId
+ artifactIdmaven-plugin-annotations/artifactId
+ version3.1/version
+/dependency
!-- scm --
dependency
@@ -159,6 +164,13 @@ under the License.
/configuration
/plugin
plugin
+ artifactIdmaven-plugin-plugin/artifactId
+ version3.1/version
+ configuration
+skipErrorNoDescriptorsFoundtrue/skipErrorNoDescriptorsFound
+ /configuration
+/plugin
+plugin
groupIdorg.codehaus.modello/groupId
artifactIdmodello-maven-plugin/artifactId
version1.4.1/version
@@ -170,6 +182,17 @@ under the License.
/pluginManagement
plugins
plugin
+artifactIdmaven-plugin-plugin/artifactId
+executions
+ execution
+idgenerate-descriptor/id
+goals
+ goaldescriptor/goal
+/goals
+ /execution
+/executions
+ /plugin
+ plugin
groupIdorg.codehaus.modello/groupId
artifactIdmodello-maven-plugin/artifactId
executions
Modified:
maven/plugins/trunk/maven-doap-plugin/src/main/java/org/apache/maven/plugin/doap/DoapMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-doap-plugin/src/main/java/org/apache/maven/plugin/doap/DoapMojo.java?rev=1360289r1=1360288r2=1360289view=diff
==
---
maven/plugins/trunk/maven-doap-plugin/src/main/java/org/apache/maven/plugin/doap/DoapMojo.java
(original)
+++
maven/plugins/trunk/maven-doap-plugin/src/main/java/org/apache/maven/plugin/doap/DoapMojo.java
Wed Jul 11 16:47:08 2012
@@ -19,26 +19,6 @@ package org.apache.maven.plugin.doap;
* under the License.
*/
-import java.io.File;
-import java.io.IOException;
-import java.io.Writer;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.text.DateFormat;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Date;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-import java.util.TimeZone;
-
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.factory.ArtifactFactory;
import org.apache.maven.artifact.repository.ArtifactRepository;
@@ -60,6 +40,9 @@ import org.apache.maven.plugin.doap.opti
import org.apache.maven.plugin.doap.options.DoapOptions;
import org.apache.maven.plugin.doap.options.ExtOptions;
import org.apache.maven.plugin.doap.options.Standard;
+import org.apache.maven.plugins.annotations.Component;
+import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.MavenProjectBuilder;
import org.apache.maven.project.ProjectBuildingException;
@@ -77,6 +60,26 @@ import org.codehaus.plexus.util.WriterFa
import org.codehaus.plexus.util.xml.PrettyPrintXMLWriter;
import org.codehaus.plexus.util.xml.XMLWriter;
+import java.io.File;
+import java.io.IOException;
+import java.io.Writer;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+import java.util.TimeZone;
+
/**
* Generate a a href=http://usefulinc.com/ns/doap;Description of a Project
(DOAP
svn commit: r1360317 - in /maven/plugins/trunk/maven-help-plugin: ./ src/main/java/org/apache/maven/plugins/help/
Author: tchemit
Date: Wed Jul 11 17:47:50 2012
New Revision: 1360317
URL: http://svn.apache.org/viewvc?rev=1360317view=rev
Log:
[MPH-89] use maven-plugin-tools' java 5 annotations
Modified:
maven/plugins/trunk/maven-help-plugin/pom.xml
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/AbstractHelpMojo.java
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/ActiveProfilesMojo.java
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/AllProfilesMojo.java
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/DescribeMojo.java
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/EffectivePomMojo.java
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/EffectiveSettingsMojo.java
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/EvaluateMojo.java
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/ExpressionsMojo.java
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/SystemMojo.java
Modified: maven/plugins/trunk/maven-help-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-help-plugin/pom.xml?rev=1360317r1=1360316r2=1360317view=diff
==
--- maven/plugins/trunk/maven-help-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-help-plugin/pom.xml Wed Jul 11 17:47:50 2012
@@ -25,7 +25,7 @@ under the License.
parent
artifactIdmaven-plugins/artifactId
groupIdorg.apache.maven.plugins/groupId
-version21/version
+version22/version
relativePath../maven-plugins/pom.xml/relativePath
/parent
@@ -119,6 +119,11 @@ under the License.
artifactIdmaven-plugin-tools-api/artifactId
version2.4.3/version
/dependency
+dependency
+ groupIdorg.apache.maven.plugin-tools/groupId
+ artifactIdmaven-plugin-annotations/artifactId
+ version3.1/version
+/dependency
!-- plexus --
dependency
@@ -182,8 +187,31 @@ under the License.
/dependencies
build
+pluginManagement
+ plugins
+plugin
+ artifactIdmaven-plugin-plugin/artifactId
+ version3.1/version
+ configuration
+skipErrorNoDescriptorsFoundtrue/skipErrorNoDescriptorsFound
+helpPackageNameorg.apache.maven.plugins.help/helpPackageName
+ /configuration
+/plugin
+ /plugins
+/pluginManagement
plugins
plugin
+artifactIdmaven-plugin-plugin/artifactId
+executions
+ execution
+idgenerate-descriptor/id
+goals
+ goaldescriptor/goal
+/goals
+ /execution
+/executions
+ /plugin
+ plugin
groupIdorg.codehaus.plexus/groupId
artifactIdplexus-component-metadata/artifactId
executions
Modified:
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/AbstractHelpMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/AbstractHelpMojo.java?rev=1360317r1=1360316r2=1360317view=diff
==
---
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/AbstractHelpMojo.java
(original)
+++
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/AbstractHelpMojo.java
Wed Jul 11 17:47:50 2012
@@ -19,14 +19,15 @@ package org.apache.maven.plugins.help;
* under the License.
*/
-import java.io.File;
-import java.io.IOException;
-import java.io.Writer;
-
import org.apache.maven.plugin.AbstractMojo;
+import org.apache.maven.plugins.annotations.Parameter;
import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.WriterFactory;
+import java.io.File;
+import java.io.IOException;
+import java.io.Writer;
+
/**
* Base class with some Help Mojo functionalities.
*
@@ -44,9 +45,8 @@ public abstract class AbstractHelpMojo
* Optional parameter to write the output of this help in a given file,
instead of writing to the console.
* br/
* bNote/b: Could be a relative path.
- *
- * @parameter expression=${output}
*/
+@Parameter( property = output )
protected File output;
/**
Modified:
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/ActiveProfilesMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/ActiveProfilesMojo.java?rev=1360317r1=1360316r2=1360317view=diff
==
---
maven/plugins/trunk/maven-help-plugin/src/main/java/org
svn commit: r1360367 - /maven/plugins/trunk/maven-jarsigner-plugin/src/main/java/org/apache/maven/shared/
Author: tchemit Date: Wed Jul 11 19:32:31 2012 New Revision: 1360367 URL: http://svn.apache.org/viewvc?rev=1360367view=rev Log: remove obsolete package Removed: maven/plugins/trunk/maven-jarsigner-plugin/src/main/java/org/apache/maven/shared/
svn commit: r1370872 - /maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java
Author: tchemit
Date: Wed Aug 8 18:23:40 2012
New Revision: 1370872
URL: http://svn.apache.org/viewvc?rev=1370872view=rev
Log:
MPIR-248 NPE while DependenciesReport
Do not treat system scope artifact with no file for dependencies report
Modified:
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java
Modified:
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java?rev=1370872r1=1370871r2=1370872view=diff
==
---
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java
(original)
+++
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java
Wed Aug 8 18:23:40 2012
@@ -1418,8 +1418,14 @@ public class DependenciesRenderer
for ( Artifact artifact : artifacts )
{
// TODO site:run Why do we need to resolve this...
-if ( artifact.getFile() == null !Artifact.SCOPE_SYSTEM.equals(
artifact.getScope() ) )
+if ( artifact.getFile() == null )
{
+if ( Artifact.SCOPE_SYSTEM.equals( artifact.getScope() ) ) {
+
+// can not resolve system scope artifact file
+continue;
+}
+
try
{
repoUtils.resolve( artifact );
svn commit: r1435829 - /maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/compiler/AbstractCompilerMojo.java
Author: tchemit Date: Sun Jan 20 11:57:04 2013 New Revision: 1435829 URL: http://svn.apache.org/viewvc?rev=1435829view=rev Log: MCOMPILER-198 Some parameters introduced in version 3.0 are annoted with since 2.6 Modified: maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/compiler/AbstractCompilerMojo.java Modified: maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/compiler/AbstractCompilerMojo.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/compiler/AbstractCompilerMojo.java?rev=1435829r1=1435828r2=1435829view=diff == --- maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/compiler/AbstractCompilerMojo.java (original) +++ maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/compiler/AbstractCompilerMojo.java Sun Jan 20 11:57:04 2013 @@ -329,13 +329,13 @@ public abstract class AbstractCompilerMo * compiler can now use javax.tools if available in your current jdk, you can disable this feature * using -Dmaven.compiler.forceJavacCompilerUse=true or in the plugin configuration * - * @since 2.6 + * @since 3.0 */ @Parameter ( defaultValue = false, property = maven.compiler.forceJavacCompilerUse ) private boolean forceJavacCompilerUse; /** - * @since 2.6 needed for storing the status for the incremental build support. + * @since 3.0 needed for storing the status for the incremental build support. */ @Parameter ( property = mojoExecution ) private MojoExecution mojoExecution; @@ -343,7 +343,7 @@ public abstract class AbstractCompilerMo /** * We need this to determine the start timestamp of the build. * - * @since 2.6 + * @since 3.0 */ @Component protected MavenSession mavenSession;
svn commit: r1536094 - /maven/site/trunk/content/resources/xsd/decoration-1.4.0.xsd
Author: tchemit Date: Sun Oct 27 11:10:21 2013 New Revision: 1536094 URL: http://svn.apache.org/r1536094 Log: Add missing xsd file Added: maven/site/trunk/content/resources/xsd/decoration-1.4.0.xsd (with props) Added: maven/site/trunk/content/resources/xsd/decoration-1.4.0.xsd URL: http://svn.apache.org/viewvc/maven/site/trunk/content/resources/xsd/decoration-1.4.0.xsd?rev=1536094view=auto == Binary file - no diff available. Propchange: maven/site/trunk/content/resources/xsd/decoration-1.4.0.xsd -- svn:mime-type = application/xml
svn commit: r884313 - in /websites/production/maven/content: ./ ant-tasks-archives/ ant-tasks/ apache-resource-bundles/ archetype-archives/ archetype/ core-its/ enforcer-archives/ enforcer/ jxr/ maven
Author: tchemit Date: Sun Oct 27 11:17:32 2013 New Revision: 884313 Log: Publishing svnmucc operation to maven site by tchemit Added: websites/production/maven/content/ - copied from r884312, websites/staging/maven/trunk/content/ websites/production/maven/content/ant-tasks/ - copied from r884312, websites/production/maven/content/ant-tasks/ websites/production/maven/content/ant-tasks-archives/ - copied from r884312, websites/production/maven/content/ant-tasks-archives/ websites/production/maven/content/apache-resource-bundles/ - copied from r884312, websites/production/maven/content/apache-resource-bundles/ websites/production/maven/content/archetype/ - copied from r884312, websites/production/maven/content/archetype/ websites/production/maven/content/archetype-archives/ - copied from r884312, websites/production/maven/content/archetype-archives/ websites/production/maven/content/core-its/ - copied from r884312, websites/production/maven/content/core-its/ websites/production/maven/content/enforcer/ - copied from r884312, websites/production/maven/content/enforcer/ websites/production/maven/content/enforcer-archives/ - copied from r884312, websites/production/maven/content/enforcer-archives/ websites/production/maven/content/jxr/ - copied from r884312, websites/production/maven/content/jxr/ websites/production/maven/content/maven-1.x/ - copied from r884312, websites/production/maven/content/maven-1.x/ websites/production/maven/content/maven-archetype-bundles/ - copied from r884312, websites/production/maven/content/maven-archetype-bundles/ websites/production/maven/content/maven-indexer/ - copied from r884312, websites/production/maven/content/maven-indexer/ websites/production/maven/content/maven-indexer-archives/ - copied from r884312, websites/production/maven/content/maven-indexer-archives/ websites/production/maven/content/maven-release/ - copied from r884312, websites/production/maven/content/maven-release/ websites/production/maven/content/maven-release-archives/ - copied from r884312, websites/production/maven/content/maven-release-archives/ websites/production/maven/content/plugin-testing/ - copied from r884312, websites/production/maven/content/plugin-testing/ websites/production/maven/content/plugin-tools/ - copied from r884312, websites/production/maven/content/plugin-tools/ websites/production/maven/content/plugin-tools-archives/ - copied from r884312, websites/production/maven/content/plugin-tools-archives/ websites/production/maven/content/plugins-archives/ - copied from r884312, websites/production/maven/content/plugins-archives/ websites/production/maven/content/plugins/maven-acr-plugin/ - copied from r884312, websites/production/maven/content/plugins/maven-acr-plugin/ websites/production/maven/content/plugins/maven-ant-plugin/ - copied from r884312, websites/production/maven/content/plugins/maven-ant-plugin/ websites/production/maven/content/plugins/maven-antrun-plugin/ - copied from r884312, websites/production/maven/content/plugins/maven-antrun-plugin/ websites/production/maven/content/plugins/maven-archetype-plugin/ - copied from r884312, websites/production/maven/content/plugins/maven-archetype-plugin/ websites/production/maven/content/plugins/maven-assembly-plugin/ - copied from r884312, websites/production/maven/content/plugins/maven-assembly-plugin/ websites/production/maven/content/plugins/maven-changelog-plugin/ - copied from r884312, websites/production/maven/content/plugins/maven-changelog-plugin/ websites/production/maven/content/plugins/maven-changes-plugin/ - copied from r884312, websites/production/maven/content/plugins/maven-changes-plugin/ websites/production/maven/content/plugins/maven-checkstyle-plugin/ - copied from r884312, websites/production/maven/content/plugins/maven-checkstyle-plugin/ websites/production/maven/content/plugins/maven-clean-plugin/ - copied from r884312, websites/production/maven/content/plugins/maven-clean-plugin/ websites/production/maven/content/plugins/maven-compiler-plugin/ - copied from r884312, websites/production/maven/content/plugins/maven-compiler-plugin/ websites/production/maven/content/plugins/maven-dependency-plugin/ - copied from r884312, websites/production/maven/content/plugins/maven-dependency-plugin/ websites/production/maven/content/plugins/maven-deploy-plugin/ - copied from r884312, websites/production/maven/content/plugins/maven-deploy-plugin/ websites/production/maven/content/plugins/maven-doap-plugin/ - copied from r884312, websites/production/maven/content/plugins/maven-doap-plugin/ websites/production/maven/content/plugins/maven-docck-plugin/ - copied from r884312
svn commit: r1537302 - /maven/plugins/trunk/maven-rar-plugin/src/main/java/org/apache/maven/plugin/rar/RarMojo.java
Author: tchemit
Date: Wed Oct 30 21:01:01 2013
New Revision: 1537302
URL: http://svn.apache.org/r1537302
Log:
MRAR-34 - provide skip parameter for the plugin
Modified:
maven/plugins/trunk/maven-rar-plugin/src/main/java/org/apache/maven/plugin/rar/RarMojo.java
Modified:
maven/plugins/trunk/maven-rar-plugin/src/main/java/org/apache/maven/plugin/rar/RarMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-rar-plugin/src/main/java/org/apache/maven/plugin/rar/RarMojo.java?rev=1537302r1=1537301r2=1537302view=diff
==
---
maven/plugins/trunk/maven-rar-plugin/src/main/java/org/apache/maven/plugin/rar/RarMojo.java
(original)
+++
maven/plugins/trunk/maven-rar-plugin/src/main/java/org/apache/maven/plugin/rar/RarMojo.java
Wed Oct 30 21:01:01 2013
@@ -265,12 +265,26 @@ public class RarMojo
@Parameter( property = warnOnMissingRaXml, defaultValue = true )
protected boolean warnOnMissingRaXml = true;
+/**
+ * To skip execution of the rar mojo.
+ *
+ * @since 2.4
+ */
+@Parameter( property = maven.rar.skip )
+private boolean skip;
+
private File buildDir;
public void execute()
throws MojoExecutionException
{
+
+if ( skip )
+{
+getLog().info( Skipping rar generation. );
+}
+
getLog().debug( === RarMojo settings === );
getLog().debug( rarSourceDirectory[ + rarSourceDirectory + ] );
getLog().debug( manifestFile[ + manifestFile + ] );
svn commit: r1537337 - /maven/plugins/trunk/maven-rar-plugin/src/main/java/org/apache/maven/plugin/rar/RarMojo.java
Author: tchemit
Date: Wed Oct 30 23:16:46 2013
New Revision: 1537337
URL: http://svn.apache.org/r1537337
Log:
MRAR-34 - provide skip parameter for the plugin
Modified:
maven/plugins/trunk/maven-rar-plugin/src/main/java/org/apache/maven/plugin/rar/RarMojo.java
Modified:
maven/plugins/trunk/maven-rar-plugin/src/main/java/org/apache/maven/plugin/rar/RarMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-rar-plugin/src/main/java/org/apache/maven/plugin/rar/RarMojo.java?rev=1537337r1=1537336r2=1537337view=diff
==
---
maven/plugins/trunk/maven-rar-plugin/src/main/java/org/apache/maven/plugin/rar/RarMojo.java
(original)
+++
maven/plugins/trunk/maven-rar-plugin/src/main/java/org/apache/maven/plugin/rar/RarMojo.java
Wed Oct 30 23:16:46 2013
@@ -283,6 +283,7 @@ public class RarMojo
if ( skip )
{
getLog().info( Skipping rar generation. );
+return;
}
getLog().debug( === RarMojo settings === );
svn commit: r1537390 - in /maven/plugins/trunk/maven-rar-plugin/src: main/java/org/apache/maven/plugin/rar/RarMojo.java test/java/org/apache/maven/plugin/rar/RarMojoTest.java
Author: tchemit
Date: Thu Oct 31 07:14:51 2013
New Revision: 1537390
URL: http://svn.apache.org/r1537390
Log:
MRAR-28 - Add Support for Classifier
Submitted by: Marvin Addison
Modified:
maven/plugins/trunk/maven-rar-plugin/src/main/java/org/apache/maven/plugin/rar/RarMojo.java
maven/plugins/trunk/maven-rar-plugin/src/test/java/org/apache/maven/plugin/rar/RarMojoTest.java
Modified:
maven/plugins/trunk/maven-rar-plugin/src/main/java/org/apache/maven/plugin/rar/RarMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-rar-plugin/src/main/java/org/apache/maven/plugin/rar/RarMojo.java?rev=1537390r1=1537389r2=1537390view=diff
==
---
maven/plugins/trunk/maven-rar-plugin/src/main/java/org/apache/maven/plugin/rar/RarMojo.java
(original)
+++
maven/plugins/trunk/maven-rar-plugin/src/main/java/org/apache/maven/plugin/rar/RarMojo.java
Thu Oct 31 07:14:51 2013
@@ -98,7 +98,7 @@ public class RarMojo
* The directory for the generated RAR.
*/
@Parameter( defaultValue = ${project.build.directory}, required = true )
-private String outputDirectory;
+private File outputDirectory;
/**
* The name of the RAR file to generate.
@@ -113,6 +113,13 @@ public class RarMojo
private MavenProject project;
/**
+ * Classifier to add to the artifact generated. If given, the artifact
will be an attachment instead.
+ *
+ * @parameter
+ */
+private String classifier;
+
+/**
* The Jar archiver.
*/
@Component( role = Archiver.class, hint = jar )
@@ -293,6 +300,7 @@ public class RarMojo
getLog().debug( workDirectory[ + workDirectory + ] );
getLog().debug( outputDirectory[ + outputDirectory + ] );
getLog().debug( finalName[ + finalName + ] );
+getLog().debug( classifier[ + classifier + ] );
// Check if jar file is there and if requested, copy it
try
@@ -419,7 +427,7 @@ public class RarMojo
try
{
-File rarFile = new File( outputDirectory, finalName + .rar );
+File rarFile = getRarFile(outputDirectory, finalName, classifier);
MavenArchiver archiver = new MavenArchiver();
archiver.setArchiver( jarArchiver );
archiver.setOutputFile( rarFile );
@@ -447,6 +455,20 @@ public class RarMojo
return buildDir;
}
+protected static File getRarFile( File basedir, String finalName, String
classifier )
+{
+if ( classifier == null )
+{
+classifier = ;
+}
+else if ( classifier.trim().length() 0 !classifier.startsWith(
- ) )
+{
+classifier = - + classifier;
+}
+
+return new File( basedir, finalName + classifier + .rar );
+}
+
private void includeCustomManifestFile()
throws IOException
{
Modified:
maven/plugins/trunk/maven-rar-plugin/src/test/java/org/apache/maven/plugin/rar/RarMojoTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-rar-plugin/src/test/java/org/apache/maven/plugin/rar/RarMojoTest.java?rev=1537390r1=1537389r2=1537390view=diff
==
---
maven/plugins/trunk/maven-rar-plugin/src/test/java/org/apache/maven/plugin/rar/RarMojoTest.java
(original)
+++
maven/plugins/trunk/maven-rar-plugin/src/test/java/org/apache/maven/plugin/rar/RarMojoTest.java
Thu Oct 31 07:14:51 2013
@@ -19,20 +19,19 @@ package org.apache.maven.plugin.rar;
* under the License.
*/
-import org.apache.maven.plugin.testing.AbstractMojoTestCase;
-import org.codehaus.plexus.archiver.zip.ZipEntry;
-import org.codehaus.plexus.archiver.zip.ZipFile;
-import org.codehaus.plexus.util.FileUtils;
-
import java.io.File;
import java.util.ArrayList;
import java.util.Enumeration;
import java.util.List;
+import org.apache.maven.plugin.testing.AbstractMojoTestCase;
+import org.codehaus.plexus.archiver.zip.ZipEntry;
+import org.codehaus.plexus.archiver.zip.ZipFile;
+import org.codehaus.plexus.util.FileUtils;
+
/**
* @author a href=mailto:arami...@apache.org;Allan Ramirez/a
*/
-@SuppressWarnings(ConstantConditions)
public class RarMojoTest
extends AbstractMojoTestCase
{
@@ -59,7 +58,7 @@ public class RarMojoTest
String workDir = (String) getVariableValueFromObject( mojo,
workDirectory );
-String outputDir = (String) getVariableValueFromObject( mojo,
outputDirectory );
+File outputDir = ( File ) getVariableValueFromObject( mojo,
outputDirectory );
Boolean includeJar = (Boolean) getVariableValueFromObject( mojo,
includeJar );
@@ -68,7 +67,7 @@ public class RarMojoTest
//include the project jar to the rar
File projectJar = new File( getBasedir(),
src/test/resources/unit/basic-rar-test/target/test-rar.jar );
-FileUtils.copyFileToDirectory( projectJar, new File
svn commit: r1537392 - /maven/plugins/trunk/maven-rar-plugin/src/main/java/org/apache/maven/plugin/rar/RarMojo.java
Author: tchemit Date: Thu Oct 31 07:17:34 2013 New Revision: 1537392 URL: http://svn.apache.org/r1537392 Log: MRAR-28 - Add Support for Classifier o Add since annotation on classifier parameter Modified: maven/plugins/trunk/maven-rar-plugin/src/main/java/org/apache/maven/plugin/rar/RarMojo.java Modified: maven/plugins/trunk/maven-rar-plugin/src/main/java/org/apache/maven/plugin/rar/RarMojo.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-rar-plugin/src/main/java/org/apache/maven/plugin/rar/RarMojo.java?rev=1537392r1=1537391r2=1537392view=diff == --- maven/plugins/trunk/maven-rar-plugin/src/main/java/org/apache/maven/plugin/rar/RarMojo.java (original) +++ maven/plugins/trunk/maven-rar-plugin/src/main/java/org/apache/maven/plugin/rar/RarMojo.java Thu Oct 31 07:17:34 2013 @@ -115,6 +115,8 @@ public class RarMojo /** * Classifier to add to the artifact generated. If given, the artifact will be an attachment instead. * + * @since 2.4 + * * @parameter */ private String classifier;
svn commit: r1537397 - /maven/plugins/trunk/maven-rar-plugin/src/main/java/org/apache/maven/plugin/rar/RarMojo.java
Author: tchemit
Date: Thu Oct 31 07:46:36 2013
New Revision: 1537397
URL: http://svn.apache.org/r1537397
Log:
MRAR-28 - Add Support for Classifier
o Use java 1.5 annotation
o Fix java documentation (+ make it as told a simple atached file if classifer
is used)
Modified:
maven/plugins/trunk/maven-rar-plugin/src/main/java/org/apache/maven/plugin/rar/RarMojo.java
Modified:
maven/plugins/trunk/maven-rar-plugin/src/main/java/org/apache/maven/plugin/rar/RarMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-rar-plugin/src/main/java/org/apache/maven/plugin/rar/RarMojo.java?rev=1537397r1=1537396r2=1537397view=diff
==
---
maven/plugins/trunk/maven-rar-plugin/src/main/java/org/apache/maven/plugin/rar/RarMojo.java
(original)
+++
maven/plugins/trunk/maven-rar-plugin/src/main/java/org/apache/maven/plugin/rar/RarMojo.java
Thu Oct 31 07:46:36 2013
@@ -33,6 +33,7 @@ import org.apache.maven.plugins.annotati
import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.plugins.annotations.ResolutionScope;
import org.apache.maven.project.MavenProject;
+import org.apache.maven.project.MavenProjectHelper;
import org.apache.maven.shared.filtering.MavenFilteringException;
import org.apache.maven.shared.filtering.MavenResourcesExecution;
import org.apache.maven.shared.filtering.MavenResourcesFiltering;
@@ -61,8 +62,6 @@ public class RarMojo
{
public static final String RA_XML_URI = META-INF/ra.xml;
-private static final String[] DEFAULT_INCLUDES = { **/** };
-
/**
* Single directory for extra files to include in the RAR.
*/
@@ -107,27 +106,17 @@ public class RarMojo
private String finalName;
/**
- * The maven project.
- */
-@Component
-private MavenProject project;
-
-/**
- * Classifier to add to the artifact generated. If given, the artifact
will be an attachment instead.
+ * Classifier to add to the artifact generated. If given, the artifact
will be attached.
*
- * @since 2.4
+ * If this is not given, it will merely be written to the output directory
+ * according to the finalName.
*
- * @parameter
+ * @since 2.4
*/
+@Parameter( property = maven.rar.classifier, defaultValue = )
private String classifier;
/**
- * The Jar archiver.
- */
-@Component( role = Archiver.class, hint = jar )
-private JarArchiver jarArchiver;
-
-/**
* The archive configuration to use.
* See a
href=http://maven.apache.org/shared/maven-archiver/index.html;Maven Archiver
Reference/a.
*/
@@ -142,13 +131,6 @@ public class RarMojo
@Parameter( property = rar.filterRarSourceDirectory, defaultValue =
false )
private boolean filterRarSourceDirectory;
-
-/**
- * @since 2.3
- */
-@Component( role = MavenResourcesFiltering.class, hint = default )
-protected MavenResourcesFiltering mavenResourcesFiltering;
-
/**
* @since 2.3
*/
@@ -282,6 +264,30 @@ public class RarMojo
@Parameter( property = maven.rar.skip )
private boolean skip;
+/**
+ * The maven project.
+ */
+@Component
+private MavenProject project;
+
+/**
+ * The Jar archiver.
+ */
+@Component( role = Archiver.class, hint = jar )
+private JarArchiver jarArchiver;
+
+/**
+ * @since 2.3
+ */
+@Component( role = MavenResourcesFiltering.class, hint = default )
+protected MavenResourcesFiltering mavenResourcesFiltering;
+
+/**
+ * @since 2.4
+ */
+@Component
+private MavenProjectHelper projectHelper;
+
private File buildDir;
@@ -427,9 +433,9 @@ public class RarMojo
getLog().warn( Connector deployment descriptor: +
ddFile.getAbsolutePath() + does not exist. );
}
+File rarFile = getRarFile(outputDirectory, finalName, classifier);
try
{
-File rarFile = getRarFile(outputDirectory, finalName, classifier);
MavenArchiver archiver = new MavenArchiver();
archiver.setArchiver( jarArchiver );
archiver.setOutputFile( rarFile );
@@ -439,13 +445,20 @@ public class RarMojo
archiver.getArchiver().addDirectory( getBuildDir() );
archiver.createArchive( session, project, archive );
-
-project.getArtifact().setFile( rarFile );
}
catch ( Exception e )
{
throw new MojoExecutionException( Error assembling RAR, e );
}
+
+if ( classifier != null )
+{
+projectHelper.attachArtifact( project, rar, classifier, rarFile
);
+}
+else
+{
+project.getArtifact().setFile( rarFile );
+}
}
protected File getBuildDir()
svn commit: r1537963 - in /maven/plugins/trunk/maven-jar-plugin/src: main/java/org/apache/maven/plugin/jar/ site/apt/ test/java/org/apache/maven/plugin/jar/ test/resources/sign-0/
Author: tchemit
Date: Fri Nov 1 15:40:27 2013
New Revision: 1537963
URL: http://svn.apache.org/r1537963
Log:
MJAR-171 - Remove deprecated mojo jar-sign and jar-sign-verify
Removed:
maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/JarSignMojo.java
maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/JarSignVerifyMojo.java
maven/plugins/trunk/maven-jar-plugin/src/test/java/org/apache/maven/plugin/jar/JarSignMojoTest.java
maven/plugins/trunk/maven-jar-plugin/src/test/java/org/apache/maven/plugin/jar/JarSignVerifyMojoTest.java
maven/plugins/trunk/maven-jar-plugin/src/test/resources/sign-0/
Modified:
maven/plugins/trunk/maven-jar-plugin/src/site/apt/usage.apt.vm
Modified: maven/plugins/trunk/maven-jar-plugin/src/site/apt/usage.apt.vm
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jar-plugin/src/site/apt/usage.apt.vm?rev=1537963r1=1537962r2=1537963view=diff
==
--- maven/plugins/trunk/maven-jar-plugin/src/site/apt/usage.apt.vm (original)
+++ maven/plugins/trunk/maven-jar-plugin/src/site/apt/usage.apt.vm Fri Nov 1
15:40:27 2013
@@ -39,7 +39,8 @@ Usage
Note: Originally, this plugin was meant to sign JARs as well. As of
version 2.3, the corresponding goals are no
longer supported and users are advised to use the dedicated
- {{{http://maven.apache.org/plugins/maven-jarsigner-plugin/}Maven Jarsigner
Plugin}} instead.
+ {{{http://maven.apache.org/plugins/maven-jarsigner-plugin/}Maven Jarsigner
Plugin}} instead. As of version 2.5, the
+ corresponding goals were removed.
* How to build a JAR file
svn commit: r1540141 - in /maven/shared/trunk/maven-jarsigner/src/main/java/org/apache/maven/shared/jarsigner: JarSignerCommandLineBuilder.java JarSignerSignRequest.java
Author: tchemit
Date: Fri Nov 8 18:17:49 2013
New Revision: 1540141
URL: http://svn.apache.org/r1540141
Log:
MSHARED-299 - Add support for -tsa during signing (Trusted Timestamping)
Note: Add also the -tsacert option
Modified:
maven/shared/trunk/maven-jarsigner/src/main/java/org/apache/maven/shared/jarsigner/JarSignerCommandLineBuilder.java
maven/shared/trunk/maven-jarsigner/src/main/java/org/apache/maven/shared/jarsigner/JarSignerSignRequest.java
Modified:
maven/shared/trunk/maven-jarsigner/src/main/java/org/apache/maven/shared/jarsigner/JarSignerCommandLineBuilder.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-jarsigner/src/main/java/org/apache/maven/shared/jarsigner/JarSignerCommandLineBuilder.java?rev=1540141r1=1540140r2=1540141view=diff
==
---
maven/shared/trunk/maven-jarsigner/src/main/java/org/apache/maven/shared/jarsigner/JarSignerCommandLineBuilder.java
(original)
+++
maven/shared/trunk/maven-jarsigner/src/main/java/org/apache/maven/shared/jarsigner/JarSignerCommandLineBuilder.java
Fri Nov 8 18:17:49 2013
@@ -172,6 +172,20 @@ public class JarSignerCommandLineBuilder
cli.createArg().setValue( sigfile );
}
+String tsaLocation = request.getTsaLocation();
+if ( StringUtils.isNotBlank( tsaLocation ) )
+{
+cli.createArg().setValue( -tsa );
+cli.createArg().setValue( tsaLocation );
+}
+
+String tsaAlias = request.getTsaAlias();
+if ( StringUtils.isNotBlank( tsaAlias ) )
+{
+cli.createArg().setValue( -tsacert );
+cli.createArg().setValue( tsaAlias );
+}
+
File signedjar = request.getSignedjar();
if ( signedjar != null )
{
Modified:
maven/shared/trunk/maven-jarsigner/src/main/java/org/apache/maven/shared/jarsigner/JarSignerSignRequest.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-jarsigner/src/main/java/org/apache/maven/shared/jarsigner/JarSignerSignRequest.java?rev=1540141r1=1540140r2=1540141view=diff
==
---
maven/shared/trunk/maven-jarsigner/src/main/java/org/apache/maven/shared/jarsigner/JarSignerSignRequest.java
(original)
+++
maven/shared/trunk/maven-jarsigner/src/main/java/org/apache/maven/shared/jarsigner/JarSignerSignRequest.java
Fri Nov 8 18:17:49 2013
@@ -79,6 +79,16 @@ public class JarSignerSignRequest
/**
* See a
href=http://java.sun.com/javase/6/docs/technotes/tools/windows/jarsigner.html#Options;options/a.
*/
+private String tsaLocation;
+
+/**
+ * See a
href=http://java.sun.com/javase/6/docs/technotes/tools/windows/jarsigner.html#Options;options/a.
+ */
+private String tsaAlias;
+
+/**
+ * See a
href=http://java.sun.com/javase/6/docs/technotes/tools/windows/jarsigner.html#Options;options/a.
+ */
protected File signedjar;
@@ -127,6 +137,16 @@ public class JarSignerSignRequest
return alias;
}
+public String getTsaLocation()
+{
+return tsaLocation;
+}
+
+public String getTsaAlias()
+{
+return tsaAlias;
+}
+
public void setKeystore( String keystore )
{
this.keystore = keystore;
@@ -172,6 +192,16 @@ public class JarSignerSignRequest
this.alias = alias;
}
+public void setTsaLocation( String tsaLocation )
+{
+this.tsaLocation = tsaLocation;
+}
+
+public void setTsaAlias( String tsaAlias )
+{
+this.tsaAlias = tsaAlias;
+}
+
public File getSignedjar()
{
return signedjar;
svn commit: r1540152 - in /maven/shared/trunk/maven-jarsigner/src/main/java/org/apache/maven/shared/jarsigner: AbstractJarSignerRequest.java JarSignerSignRequest.java JarSignerVerifyRequest.java
Author: tchemit
Date: Fri Nov 8 18:48:29 2013
New Revision: 1540152
URL: http://svn.apache.org/r1540152
Log:
MSHARED-300 - Update javadoc links
Modified:
maven/shared/trunk/maven-jarsigner/src/main/java/org/apache/maven/shared/jarsigner/AbstractJarSignerRequest.java
maven/shared/trunk/maven-jarsigner/src/main/java/org/apache/maven/shared/jarsigner/JarSignerSignRequest.java
maven/shared/trunk/maven-jarsigner/src/main/java/org/apache/maven/shared/jarsigner/JarSignerVerifyRequest.java
Modified:
maven/shared/trunk/maven-jarsigner/src/main/java/org/apache/maven/shared/jarsigner/AbstractJarSignerRequest.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-jarsigner/src/main/java/org/apache/maven/shared/jarsigner/AbstractJarSignerRequest.java?rev=1540152r1=1540151r2=1540152view=diff
==
---
maven/shared/trunk/maven-jarsigner/src/main/java/org/apache/maven/shared/jarsigner/AbstractJarSignerRequest.java
(original)
+++
maven/shared/trunk/maven-jarsigner/src/main/java/org/apache/maven/shared/jarsigner/AbstractJarSignerRequest.java
Fri Nov 8 18:48:29 2013
@@ -34,13 +34,13 @@ public abstract class AbstractJarSignerR
implements JarSignerRequest
{
/**
- * See a
href=http://java.sun.com/javase/6/docs/technotes/tools/windows/jarsigner.html#Options;options/a.
+ * See a
href=http://docs.oracle.com/javase/6/docs/technotes/tools/windows/jarsigner.html#Options;options/a.
*/
private boolean verbose;
/**
* The maximum memory available to the JAR signer, e.g. code256M/code.
See a
- *
href=http://java.sun.com/javase/6/docs/technotes/tools/windows/java.html#Xms;-Xmx/a
for more details.
+ *
href=http://docs.oracle.com/javase/6/docs/technotes/tools/windows/java.html#Xms;-Xmx/a
for more details.
*/
private String maxMemory;
Modified:
maven/shared/trunk/maven-jarsigner/src/main/java/org/apache/maven/shared/jarsigner/JarSignerSignRequest.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-jarsigner/src/main/java/org/apache/maven/shared/jarsigner/JarSignerSignRequest.java?rev=1540152r1=1540151r2=1540152view=diff
==
---
maven/shared/trunk/maven-jarsigner/src/main/java/org/apache/maven/shared/jarsigner/JarSignerSignRequest.java
(original)
+++
maven/shared/trunk/maven-jarsigner/src/main/java/org/apache/maven/shared/jarsigner/JarSignerSignRequest.java
Fri Nov 8 18:48:29 2013
@@ -32,62 +32,62 @@ public class JarSignerSignRequest
extends AbstractJarSignerRequest
{
/**
- * See a
href=http://java.sun.com/javase/6/docs/technotes/tools/windows/jarsigner.html#Options;options/a.
+ * See a
href=http://docs.oracle.com/javase/6/docs/technotes/tools/windows/jarsigner.html#Options;options/a.
*/
private String keystore;
/**
- * See a
href=http://java.sun.com/javase/6/docs/technotes/tools/windows/jarsigner.html#Options;options/a.
+ * See a
href=http://docs.oracle.com/javase/6/docs/technotes/tools/windows/jarsigner.html#Options;options/a.
*/
private String storepass;
/**
- * See a
href=http://java.sun.com/javase/6/docs/technotes/tools/windows/jarsigner.html#Options;options/a.
+ * See a
href=http://docs.oracle.com/javase/6/docs/technotes/tools/windows/jarsigner.html#Options;options/a.
*/
private String keypass;
/**
- * See a
href=http://java.sun.com/javase/6/docs/technotes/tools/windows/jarsigner.html#Options;options/a.
+ * See a
href=http://docs.oracle.com/javase/6/docs/technotes/tools/windows/jarsigner.html#Options;options/a.
*/
private String sigfile;
/**
- * See a
href=http://java.sun.com/javase/6/docs/technotes/tools/windows/jarsigner.html#Options;options/a.
+ * See a
href=http://docs.oracle.com/javase/6/docs/technotes/tools/windows/jarsigner.html#Options;options/a.
*/
private String storetype;
/**
- * See a
href=http://java.sun.com/javase/6/docs/technotes/tools/windows/jarsigner.html#Options;options/a.
+ * See a
href=http://docs.oracle.com/javase/6/docs/technotes/tools/windows/jarsigner.html#Options;options/a.
*/
private String providerName;
/**
- * See a
href=http://java.sun.com/javase/6/docs/technotes/tools/windows/jarsigner.html#Options;options/a.
+ * See a
href=http://docs.oracle.com/javase/6/docs/technotes/tools/windows/jarsigner.html#Options;options/a.
*/
private String providerClass;
/**
- * See a
href=http://java.sun.com/javase/6/docs/technotes/tools/windows/jarsigner.html#Options;options/a.
+ * See a
href=http://docs.oracle.com/javase/6/docs/technotes/tools/windows/jarsigner.html#Options;options/a.
*/
private String providerArg;
/**
- * See a
href=http://java.sun.com/javase/6/docs/technotes/tools/windows/jarsigner.html#Options;options
svn commit: r1540158 - in /maven/shared/trunk/maven-jarsigner/src: main/java/org/apache/maven/shared/jarsigner/JarSignerUtil.java test/java/org/apache/maven/shared/jarsigner/JarSignerUtilTest.java tes
Author: tchemit
Date: Fri Nov 8 19:35:23 2013
New Revision: 1540158
URL: http://svn.apache.org/r1540158
Log:
MSHARED-277 - JarSignerUtil.unsignArchive invalid entry compressed size
Submitted by: Timo Meinen timomei...@gmail.com
Comment: Add a junit test to test it
Added:
maven/shared/trunk/maven-jarsigner/src/test/java/org/apache/maven/shared/jarsigner/JarSignerUtilTest.java
(with props)
maven/shared/trunk/maven-jarsigner/src/test/javax.persistence_2.0.5.v201212031355.jar
(with props)
Modified:
maven/shared/trunk/maven-jarsigner/src/main/java/org/apache/maven/shared/jarsigner/JarSignerUtil.java
Modified:
maven/shared/trunk/maven-jarsigner/src/main/java/org/apache/maven/shared/jarsigner/JarSignerUtil.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-jarsigner/src/main/java/org/apache/maven/shared/jarsigner/JarSignerUtil.java?rev=1540158r1=1540157r2=1540158view=diff
==
---
maven/shared/trunk/maven-jarsigner/src/main/java/org/apache/maven/shared/jarsigner/JarSignerUtil.java
(original)
+++
maven/shared/trunk/maven-jarsigner/src/main/java/org/apache/maven/shared/jarsigner/JarSignerUtil.java
Fri Nov 8 19:35:23 2013
@@ -104,7 +104,7 @@ public class JarSignerUtil
continue;
}
-zos.putNextEntry( ze );
+zos.putNextEntry(new ZipEntry(ze.getName()));
IOUtil.copy( zis, zos );
}
Added:
maven/shared/trunk/maven-jarsigner/src/test/java/org/apache/maven/shared/jarsigner/JarSignerUtilTest.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-jarsigner/src/test/java/org/apache/maven/shared/jarsigner/JarSignerUtilTest.java?rev=1540158view=auto
==
---
maven/shared/trunk/maven-jarsigner/src/test/java/org/apache/maven/shared/jarsigner/JarSignerUtilTest.java
(added)
+++
maven/shared/trunk/maven-jarsigner/src/test/java/org/apache/maven/shared/jarsigner/JarSignerUtilTest.java
Fri Nov 8 19:35:23 2013
@@ -0,0 +1,60 @@
+package org.apache.maven.shared.jarsigner;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * License); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import junit.framework.TestCase;
+import org.apache.maven.shared.utils.io.FileUtils;
+
+import java.io.File;
+
+/**
+ * Created on 11/8/13.
+ *
+ * @author Tony Chemit che...@codelutin.com
+ * @version $Id$
+ * @since 1.1
+ */
+public class JarSignerUtilTest
+extends TestCase
+{
+
+// Fix MSHARED-277
+public void testUnsignArchive()
+throws Exception
+{
+
+File file = new File(
src/test/javax.persistence_2.0.5.v201212031355.jar );
+File target = new File( target/, file.getName() );
+
+if ( target.exists() )
+{
+FileUtils.forceDelete( target );
+}
+
+FileUtils.copyFile( file, target );
+
+assertTrue( JarSignerUtil.isArchiveSigned( target ) );
+
+JarSignerUtil.unsignArchive( target );
+
+assertFalse( JarSignerUtil.isArchiveSigned( target ) );
+
+}
+}
Propchange:
maven/shared/trunk/maven-jarsigner/src/test/java/org/apache/maven/shared/jarsigner/JarSignerUtilTest.java
--
svn:eol-style = native
Propchange:
maven/shared/trunk/maven-jarsigner/src/test/java/org/apache/maven/shared/jarsigner/JarSignerUtilTest.java
--
svn:keywords = Author Date Id Revision
Added:
maven/shared/trunk/maven-jarsigner/src/test/javax.persistence_2.0.5.v201212031355.jar
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-jarsigner/src/test/javax.persistence_2.0.5.v201212031355.jar?rev=1540158view=auto
==
Binary file - no diff available.
Propchange:
maven/shared/trunk/maven-jarsigner/src/test/javax.persistence_2.0.5.v201212031355.jar
--
svn:mime-type = application/zip
svn commit: r1540159 - in /maven/shared/trunk/maven-jarsigner: README.TXT src/test/javax.persistence_2.0.5.v201212031355.jar src/test/keystore src/test/simple.jar
Author: tchemit Date: Fri Nov 8 19:36:06 2013 New Revision: 1540159 URL: http://svn.apache.org/r1540159 Log: add missing svn properties Modified: maven/shared/trunk/maven-jarsigner/README.TXT (props changed) maven/shared/trunk/maven-jarsigner/src/test/javax.persistence_2.0.5.v201212031355.jar (props changed) maven/shared/trunk/maven-jarsigner/src/test/keystore (props changed) maven/shared/trunk/maven-jarsigner/src/test/simple.jar (props changed) Propchange: maven/shared/trunk/maven-jarsigner/README.TXT -- svn:keywords = Author Date Id Revision Propchange: maven/shared/trunk/maven-jarsigner/src/test/javax.persistence_2.0.5.v201212031355.jar -- svn:keywords = Author Date Id Revision Propchange: maven/shared/trunk/maven-jarsigner/src/test/keystore -- svn:keywords = Author Date Id Revision Propchange: maven/shared/trunk/maven-jarsigner/src/test/simple.jar -- svn:keywords = Author Date Id Revision
svn commit: r1540264 - /maven/shared/trunk/maven-jarsigner/pom.xml
Author: tchemit Date: Sat Nov 9 07:16:42 2013 New Revision: 1540264 URL: http://svn.apache.org/r1540264 Log: [maven-release-plugin] prepare release maven-jarsigner-1.1 Modified: maven/shared/trunk/maven-jarsigner/pom.xml Modified: maven/shared/trunk/maven-jarsigner/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-jarsigner/pom.xml?rev=1540264r1=1540263r2=1540264view=diff == --- maven/shared/trunk/maven-jarsigner/pom.xml (original) +++ maven/shared/trunk/maven-jarsigner/pom.xml Sat Nov 9 07:16:42 2013 @@ -28,7 +28,7 @@ /parent artifactIdmaven-jarsigner/artifactId - version1.1-SNAPSHOT/version + version1.1/version nameApache Maven Jarsigner/name descriptionA component to assist in signing jars./description @@ -38,9 +38,9 @@ /prerequisites scm - connectionscm:svn:http://svn.apache.org/repos/asf/maven/shared/trunk/maven-jarsigner/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/shared/trunk/maven-jarsigner/developerConnection -urlhttp://svn.apache.org/viewvc/maven/shared/trunk/maven-jarsigner/url + connectionscm:svn:http://svn.apache.org/repos/asf/maven/shared/tags/maven-jarsigner-1.1/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/shared/tags/maven-jarsigner-1.1/developerConnection + urlhttp://svn.apache.org/viewvc/maven/shared/tags/maven-jarsigner-1.1/url /scm issueManagement systemjira/system
svn commit: r1540265 - /maven/shared/tags/maven-jarsigner-1.1/
Author: tchemit Date: Sat Nov 9 07:17:45 2013 New Revision: 1540265 URL: http://svn.apache.org/r1540265 Log: [maven-release-plugin] copy for tag maven-jarsigner-1.1 Added: maven/shared/tags/maven-jarsigner-1.1/ - copied from r1540264, maven/shared/trunk/maven-jarsigner/
svn commit: r1540266 - /maven/shared/trunk/maven-jarsigner/pom.xml
Author: tchemit Date: Sat Nov 9 07:17:51 2013 New Revision: 1540266 URL: http://svn.apache.org/r1540266 Log: [maven-release-plugin] prepare for next development iteration Modified: maven/shared/trunk/maven-jarsigner/pom.xml Modified: maven/shared/trunk/maven-jarsigner/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-jarsigner/pom.xml?rev=1540266r1=1540265r2=1540266view=diff == --- maven/shared/trunk/maven-jarsigner/pom.xml (original) +++ maven/shared/trunk/maven-jarsigner/pom.xml Sat Nov 9 07:17:51 2013 @@ -28,7 +28,7 @@ /parent artifactIdmaven-jarsigner/artifactId - version1.1/version + version1.2-SNAPSHOT/version nameApache Maven Jarsigner/name descriptionA component to assist in signing jars./description @@ -38,9 +38,9 @@ /prerequisites scm - connectionscm:svn:http://svn.apache.org/repos/asf/maven/shared/tags/maven-jarsigner-1.1/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/shared/tags/maven-jarsigner-1.1/developerConnection - urlhttp://svn.apache.org/viewvc/maven/shared/tags/maven-jarsigner-1.1/url + connectionscm:svn:http://svn.apache.org/repos/asf/maven/shared/trunk/maven-jarsigner/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/shared/trunk/maven-jarsigner/developerConnection +urlhttp://svn.apache.org/viewvc/maven/shared/trunk/maven-jarsigner/url /scm issueManagement systemjira/system
svn commit: r885972 - /websites/production/maven/content/shared-archives/maven-jarsigner-1.1/
Author: tchemit Date: Sat Nov 9 07:26:48 2013 New Revision: 885972 Log: Automatic svn path creation: https://svn.apache.org/repos/infra/websites/production/maven/content/shared-archives/maven-jarsigner-1.1 Added: websites/production/maven/content/shared-archives/maven-jarsigner-1.1/
svn commit: r885977 [5/22] - in /websites/production/maven/content/shared/maven-jarsigner: ./ apidocs/ apidocs/org/apache/maven/shared/jarsigner/ apidocs/org/apache/maven/shared/jarsigner/class-use/ a
Modified:
websites/production/maven/content/shared/maven-jarsigner/apidocs/org/apache/maven/shared/jarsigner/DefaultJarSignerResult.html
==
---
websites/production/maven/content/shared/maven-jarsigner/apidocs/org/apache/maven/shared/jarsigner/DefaultJarSignerResult.html
(original)
+++
websites/production/maven/content/shared/maven-jarsigner/apidocs/org/apache/maven/shared/jarsigner/DefaultJarSignerResult.html
Sat Nov 9 07:38:36 2013
@@ -1,294 +1,284 @@
!DOCTYPE HTML PUBLIC -//W3C//DTD HTML 4.01 Transitional//EN
http://www.w3.org/TR/html4/loose.dtd;
-!--NewPage--
-HTML
-HEAD
-!-- Generated by javadoc (build 1.6.0_29) on Wed Nov 16 11:53:28 CET 2011 --
-META http-equiv=Content-Type content=text/html; charset=UTF-8
-TITLE
-DefaultJarSignerResult (Maven Jarsigner 1.0 API)
-/TITLE
-
-META NAME=date CONTENT=2011-11-16
-
-LINK REL =stylesheet TYPE=text/css HREF=../../../../../stylesheet.css
TITLE=Style
-
-SCRIPT type=text/javascript
-function windowTitle()
-{
+!-- NewPage --
+html lang=en
+head
+meta http-equiv=Content-Type content=text/html charset=UTF-8
+titleDefaultJarSignerResult (Apache Maven Jarsigner 1.1 API)/title
+link rel=stylesheet type=text/css href=../../../../../stylesheet.css
title=Style
+/head
+body
+script type=text/javascript!--
if (location.href.indexOf('is-external=true') == -1) {
-parent.document.title=DefaultJarSignerResult (Maven Jarsigner 1.0
API);
+parent.document.title=DefaultJarSignerResult (Apache Maven Jarsigner
1.1 API);
}
-}
-/SCRIPT
-NOSCRIPT
-/NOSCRIPT
-
-/HEAD
-
-BODY BGCOLOR=white onload=windowTitle();
-HR
-
-
+//--
+/script
+noscript
+divJavaScript is disabled on your browser./div
+/noscript
!-- = START OF TOP NAVBAR === --
-A NAME=navbar_top!-- --/A
-A HREF=#skip-navbar_top title=Skip navigation links/A
-TABLE BORDER=0 WIDTH=100% CELLPADDING=1 CELLSPACING=0 SUMMARY=
-TR
-TD COLSPAN=2 BGCOLOR=#FF CLASS=NavBarCell1
-A NAME=navbar_top_firstrow!-- --/A
-TABLE BORDER=0 CELLPADDING=0 CELLSPACING=3 SUMMARY=
- TR ALIGN=center VALIGN=top
- TD BGCOLOR=#FF CLASS=NavBarCell1A
HREF=../../../../../org/apache/maven/shared/jarsigner/package-summary.htmlFONT
CLASS=NavBarFont1BPackage/B/FONT/Anbsp;/TD
- TD BGCOLOR=#FF CLASS=NavBarCell1Rev nbsp;FONT
CLASS=NavBarFont1RevBClass/B/FONTnbsp;/TD
- TD BGCOLOR=#FF CLASS=NavBarCell1A
HREF=class-use/DefaultJarSignerResult.htmlFONT
CLASS=NavBarFont1BUse/B/FONT/Anbsp;/TD
- TD BGCOLOR=#FF CLASS=NavBarCell1A
HREF=package-tree.htmlFONT
CLASS=NavBarFont1BTree/B/FONT/Anbsp;/TD
- TD BGCOLOR=#FF CLASS=NavBarCell1A
HREF=../../../../../deprecated-list.htmlFONT
CLASS=NavBarFont1BDeprecated/B/FONT/Anbsp;/TD
- TD BGCOLOR=#FF CLASS=NavBarCell1A
HREF=../../../../../index-all.htmlFONT
CLASS=NavBarFont1BIndex/B/FONT/Anbsp;/TD
- TD BGCOLOR=#FF CLASS=NavBarCell1A
HREF=../../../../../help-doc.htmlFONT
CLASS=NavBarFont1BHelp/B/FONT/Anbsp;/TD
- /TR
-/TABLE
-/TD
-TD ALIGN=right VALIGN=top ROWSPAN=3EM
-/EM
-/TD
-/TR
-
-TR
-TD BGCOLOR=white CLASS=NavBarCell2FONT SIZE=-2
-nbsp;A
HREF=../../../../../org/apache/maven/shared/jarsigner/DefaultJarSigner.html
title=class in org.apache.maven.shared.jarsignerBPREV CLASS/B/Anbsp;
-nbsp;A
HREF=../../../../../org/apache/maven/shared/jarsigner/JarSigner.html
title=interface in org.apache.maven.shared.jarsignerBNEXT
CLASS/B/A/FONT/TD
-TD BGCOLOR=white CLASS=NavBarCell2FONT SIZE=-2
- A
HREF=../../../../../index.html?org/apache/maven/shared/jarsigner/DefaultJarSignerResult.html
target=_topBFRAMES/B/A nbsp;
-nbsp;A HREF=DefaultJarSignerResult.html target=_topBNO FRAMES/B/A
nbsp;
-nbsp;SCRIPT type=text/javascript
- !--
+div class=topNava name=navbar_top
+!-- --
+/aa href=#skip-navbar_top title=Skip navigation links/aa
name=navbar_top_firstrow
+!-- --
+/a
+ul class=navList title=Navigation
+lia
href=../../../../../org/apache/maven/shared/jarsigner/package-summary.htmlPackage/a/li
+li class=navBarCell1RevClass/li
+lia href=class-use/DefaultJarSignerResult.htmlUse/a/li
+lia href=package-tree.htmlTree/a/li
+lia href=../../../../../deprecated-list.htmlDeprecated/a/li
+lia href=../../../../../index-all.htmlIndex/a/li
+lia href=../../../../../help-doc.htmlHelp/a/li
+/ul
+/div
+div class=subNav
+ul class=navList
+lia
href=../../../../../org/apache/maven/shared/jarsigner/DefaultJarSigner.html
title=class in org.apache.maven.shared.jarsignerspan class=strongPrev
Class/span/a/li
+lia href=../../../../../org/apache/maven/shared/jarsigner/JarSigner.html
title=interface in org.apache.maven.shared.jarsignerspan
class=strongNext Class/span/a/li
+/ul
+ul class=navList
+lia
href=../../../../../index.html?org/apache/maven/shared/jarsigner/DefaultJarSignerResult.html
target=_topFrames/a/li
+lia href=DefaultJarSignerResult.html target=_topNo Frames/a/li
+/ul
+ul class=navList id=allclasses_navbar_top
+lia
svn commit: r885977 [18/22] - in /websites/production/maven/content/shared/maven-jarsigner: ./ apidocs/ apidocs/org/apache/maven/shared/jarsigner/ apidocs/org/apache/maven/shared/jarsigner/class-use/
Modified:
websites/production/maven/content/shared/maven-jarsigner/testapidocs/deprecated-list.html
==
---
websites/production/maven/content/shared/maven-jarsigner/testapidocs/deprecated-list.html
(original)
+++
websites/production/maven/content/shared/maven-jarsigner/testapidocs/deprecated-list.html
Sat Nov 9 07:38:36 2013
@@ -1,145 +1,113 @@
!DOCTYPE HTML PUBLIC -//W3C//DTD HTML 4.01 Transitional//EN
http://www.w3.org/TR/html4/loose.dtd;
-!--NewPage--
-HTML
-HEAD
-!-- Generated by javadoc (build 1.6.0_29) on Wed Nov 16 11:53:36 CET 2011 --
-META http-equiv=Content-Type content=text/html; charset=UTF-8
-TITLE
-Deprecated List (Maven Jarsigner 1.0 Test API)
-/TITLE
-
-META NAME=date CONTENT=2011-11-16
-
-LINK REL =stylesheet TYPE=text/css HREF=stylesheet.css TITLE=Style
-
-SCRIPT type=text/javascript
-function windowTitle()
-{
+!-- NewPage --
+html lang=en
+head
+meta http-equiv=Content-Type content=text/html charset=UTF-8
+titleDeprecated List (Apache Maven Jarsigner 1.1 Test API)/title
+link rel=stylesheet type=text/css href=stylesheet.css title=Style
+/head
+body
+script type=text/javascript!--
if (location.href.indexOf('is-external=true') == -1) {
-parent.document.title=Deprecated List (Maven Jarsigner 1.0 Test API);
+parent.document.title=Deprecated List (Apache Maven Jarsigner 1.1
Test API);
}
-}
-/SCRIPT
-NOSCRIPT
-/NOSCRIPT
-
-/HEAD
-
-BODY BGCOLOR=white onload=windowTitle();
-HR
-
-
+//--
+/script
+noscript
+divJavaScript is disabled on your browser./div
+/noscript
!-- = START OF TOP NAVBAR === --
-A NAME=navbar_top!-- --/A
-A HREF=#skip-navbar_top title=Skip navigation links/A
-TABLE BORDER=0 WIDTH=100% CELLPADDING=1 CELLSPACING=0 SUMMARY=
-TR
-TD COLSPAN=2 BGCOLOR=#FF CLASS=NavBarCell1
-A NAME=navbar_top_firstrow!-- --/A
-TABLE BORDER=0 CELLPADDING=0 CELLSPACING=3 SUMMARY=
- TR ALIGN=center VALIGN=top
- TD BGCOLOR=#FF CLASS=NavBarCell1A
HREF=org/apache/maven/shared/jarsigner/package-summary.htmlFONT
CLASS=NavBarFont1BPackage/B/FONT/Anbsp;/TD
- TD BGCOLOR=#FF CLASS=NavBarCell1FONT
CLASS=NavBarFont1Class/FONTnbsp;/TD
- TD BGCOLOR=#FF CLASS=NavBarCell1FONT
CLASS=NavBarFont1Use/FONTnbsp;/TD
- TD BGCOLOR=#FF CLASS=NavBarCell1A
HREF=org/apache/maven/shared/jarsigner/package-tree.htmlFONT
CLASS=NavBarFont1BTree/B/FONT/Anbsp;/TD
- TD BGCOLOR=#FF CLASS=NavBarCell1Rev nbsp;FONT
CLASS=NavBarFont1RevBDeprecated/B/FONTnbsp;/TD
- TD BGCOLOR=#FF CLASS=NavBarCell1A HREF=index-all.htmlFONT
CLASS=NavBarFont1BIndex/B/FONT/Anbsp;/TD
- TD BGCOLOR=#FF CLASS=NavBarCell1A HREF=help-doc.htmlFONT
CLASS=NavBarFont1BHelp/B/FONT/Anbsp;/TD
- /TR
-/TABLE
-/TD
-TD ALIGN=right VALIGN=top ROWSPAN=3EM
-/EM
-/TD
-/TR
-
-TR
-TD BGCOLOR=white CLASS=NavBarCell2FONT SIZE=-2
-nbsp;PREVnbsp;
-nbsp;NEXT/FONT/TD
-TD BGCOLOR=white CLASS=NavBarCell2FONT SIZE=-2
- A HREF=index.html?deprecated-list.html target=_topBFRAMES/B/A
nbsp;
-nbsp;A HREF=deprecated-list.html target=_topBNO FRAMES/B/A nbsp;
-nbsp;SCRIPT type=text/javascript
- !--
+div class=topNava name=navbar_top
+!-- --
+/aa href=#skip-navbar_top title=Skip navigation links/aa
name=navbar_top_firstrow
+!-- --
+/a
+ul class=navList title=Navigation
+lia
href=org/apache/maven/shared/jarsigner/package-summary.htmlPackage/a/li
+liClass/li
+liUse/li
+lia href=org/apache/maven/shared/jarsigner/package-tree.htmlTree/a/li
+li class=navBarCell1RevDeprecated/li
+lia href=index-all.htmlIndex/a/li
+lia href=help-doc.htmlHelp/a/li
+/ul
+/div
+div class=subNav
+ul class=navList
+liPrev/li
+liNext/li
+/ul
+ul class=navList
+lia href=index.html?deprecated-list.html target=_topFrames/a/li
+lia href=deprecated-list.html target=_topNo Frames/a/li
+/ul
+ul class=navList id=allclasses_navbar_top
+lia href=allclasses-noframe.htmlAll Classes/a/li
+/ul
+div
+script type=text/javascript!--
+ allClassesLink = document.getElementById(allclasses_navbar_top);
if(window==top) {
-document.writeln('A HREF=allclasses-noframe.htmlBAll
Classes/B/A');
+allClassesLink.style.display = block;
+ }
+ else {
+allClassesLink.style.display = none;
}
//--
-/SCRIPT
-NOSCRIPT
- A HREF=allclasses-noframe.htmlBAll Classes/B/A
-/NOSCRIPT
-
-
-/FONT/TD
-/TR
-/TABLE
-A NAME=skip-navbar_top/A
+/script
+/div
+a name=skip-navbar_top
+!-- --
+/a/div
!-- = END OF TOP NAVBAR = --
-
-HR
-CENTER
-H2
-BDeprecated API/B/H2
-/CENTER
-HR SIZE=4 NOSHADE
-BContents/BUL
-/UL
-
-HR
-
-
+div class=header
+h1 title=Deprecated API class=titleDeprecated API/h1
+h2 title=ContentsContents/h2
+/div
!-- === START OF BOTTOM NAVBAR == --
-A NAME=navbar_bottom!-- --/A
-A HREF=#skip-navbar_bottom title=Skip navigation links/A
-TABLE BORDER=0 WIDTH=100% CELLPADDING=1 CELLSPACING=0 SUMMARY=
-TR
-TD COLSPAN=2 BGCOLOR=#FF CLASS=NavBarCell1
-A NAME=navbar_bottom_firstrow!-- --/A
-TABLE BORDER=0
svn commit: r885977 [22/22] - in /websites/production/maven/content/shared/maven-jarsigner: ./ apidocs/ apidocs/org/apache/maven/shared/jarsigner/ apidocs/org/apache/maven/shared/jarsigner/class-use/
Modified: websites/production/maven/content/shared/maven-jarsigner/xref/overview-summary.html == --- websites/production/maven/content/shared/maven-jarsigner/xref/overview-summary.html (original) +++ websites/production/maven/content/shared/maven-jarsigner/xref/overview-summary.html Sat Nov 9 07:38:36 2013 @@ -1,64 +1,64 @@ - -!DOCTYPE html PUBLIC -//W3C//DTD XHTML 1.0 Transitional//EN DTD/xhtml1-transitional.dtd -html xml:lang=en lang=en - head - meta http-equiv=content-type content=text/html; charset=UTF-8 / - titleMaven Jarsigner 1.0 Reference/title - link rel=stylesheet type=text/css href=stylesheet.css title=style / - /head - body - div class=overview - ul - li class=selectedOverview/li - liPackage/li - /ul - /div - div class=framenoframe - ul - li - a href=index.html target=_topFRAMES/a - /li - li - a href=overview-summary.html target=_topNO FRAMES/a - /li - /ul - /div - - h2Maven Jarsigner 1.0 Reference/h2 - - table class=summary - thead - tr - thPackages/th - /tr - /thead - tbody - tr - td - a href=org/apache/maven/shared/jarsigner/package-summary.htmlorg.apache.maven.shared.jarsigner/a - /td - /tr - /tbody - /table - - div class=overview - ul - li class=selectedOverview/li - liPackage/li - /ul - /div - div class=framenoframe - ul - li - a href=index.html target=_topFRAMES/a - /li - li - a href=overview-summary.html target=_topNO FRAMES/a - /li - /ul - /div - - hr / - Copyright #169; 2002-2011 The Apache Software Foundation. All Rights Reserved. - /body + +!DOCTYPE html PUBLIC -//W3C//DTD XHTML 1.0 Transitional//EN DTD/xhtml1-transitional.dtd +html xml:lang=en lang=en + head + meta http-equiv=content-type content=text/html; charset=UTF-8 / + titleApache Maven Jarsigner 1.1 Reference/title + link rel=stylesheet type=text/css href=stylesheet.css title=style / + /head + body + div class=overview + ul + li class=selectedOverview/li + liPackage/li + /ul + /div + div class=framenoframe + ul + li + a href=index.html target=_topFRAMES/a + /li + li + a href=overview-summary.html target=_topNO FRAMES/a + /li + /ul + /div + + h2Apache Maven Jarsigner 1.1 Reference/h2 + + table class=summary + thead + tr + thPackages/th + /tr + /thead + tbody + tr + td + a href=org/apache/maven/shared/jarsigner/package-summary.htmlorg.apache.maven.shared.jarsigner/a + /td + /tr + /tbody + /table + + div class=overview + ul + li class=selectedOverview/li + liPackage/li + /ul + /div + div class=framenoframe + ul + li + a href=index.html target=_topFRAMES/a + /li + li + a href=overview-summary.html target=_topNO FRAMES/a + /li + /ul +
svn commit: r885980 [2/2] - in /websites/production/maven/content/shared-archives/maven-jarsigner-1.1: ./ apidocs/ apidocs/org/ apidocs/org/apache/ apidocs/org/apache/maven/ apidocs/org/apache/maven/s
Added: websites/production/maven/content/shared-archives/maven-jarsigner-1.1/source-repository.html == --- websites/production/maven/content/shared-archives/maven-jarsigner-1.1/source-repository.html (added) +++ websites/production/maven/content/shared-archives/maven-jarsigner-1.1/source-repository.html Sat Nov 9 07:46:52 2013 @@ -0,0 +1,252 @@ +!DOCTYPE html PUBLIC -//W3C//DTD XHTML 1.0 Transitional//EN http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd; +!-- + | Generated by Apache Maven Doxia at 2013-11-09 + | Rendered using Apache Maven Stylus Skin 1.5 +-- +html xmlns=http://www.w3.org/1999/xhtml; + head +titleApache Maven Jarsigner - Source Repository/title +style type=text/css media=all + @import url(./css/maven-base.css); + @import url(./css/maven-theme.css); + @import url(./css/site.css); +/style +link rel=stylesheet href=./css/print.css type=text/css media=print / +meta name=Date-Revision-mmdd content=20131109 / +meta http-equiv=Content-Type content=text/html; charset=UTF-8 / + +script src=http://www.google-analytics.com/urchin.js; type=text/javascript/script + +script type=text/javascript_uacct = UA-140879-1; +urchinTracker();/script + /head + body class=composite +div id=banner + a href=../../ id=bannerLeft +img src=../../images/apache-maven-project-2.png alt= / +/a +span id=bannerRight +img src=../../images/maven-logo-2.gif alt= / +/span +div class=clear +hr/ + /div +/div +div id=breadcrumbs + + div class=xleft + a href=http://www.apache.org/; class=externalLinkApache/a +gt; + a href=../../index.htmlMaven/a +gt; + a href=../index.htmlShared Components/a +gt; + a href=./Apache Maven Jarsigner/a +gt; +Source Repository +/div +div class=xright +Last Published: 2013-11-09 + nbsp;| Version: 1.1 +/div + div class=clear +hr/ + /div +/div +div id=leftColumn + div id=navcolumn + + h5Overview/h5 + ul + li class=none + a href=index.htmlIntroduction/a +/li + li class=none + a href=apidocs/index.htmlJavaDocs/a +/li + li class=none + a href=xref/index.htmlSource Xref/a +/li + /ul + h5Parent Project/h5 + ul + li class=none + a href=../index.htmlMaven Shared Components/a +/li + /ul + h5Project Documentation/h5 + ul + li class=expanded + a href=project-info.htmlProject Information/a +ul + li class=none + a href=index.htmlAbout/a +/li + li class=none + a href=project-summary.htmlProject Summary/a +/li + li class=none + a href=dependency-info.htmlDependency Information/a +/li + li class=none + a href=license.htmlProject License/a +/li + li class=none + a href=team-list.htmlProject Team/a +/li + li class=none +strongSource Repository/strong + /li + li class=none + a href=issue-tracking.htmlIssue Tracking/a +/li + li class=none + a href=mail-lists.htmlMailing Lists/a +/li + li class=none + a href=dependency-management.htmlDependency Management/a +/li + li class=none + a href=dependencies.htmlDependencies/a +/li + li class=none + a href=integration.htmlContinuous Integration/a +/li +
svn commit: r885983 [9/9] - in /websites/production/maven/content/shared/maven-jarsigner: ./ apidocs/ apidocs/org/apache/maven/shared/jarsigner/ apidocs/org/apache/maven/shared/jarsigner/class-use/ co
Modified:
websites/production/maven/content/shared/maven-jarsigner/xref/org/apache/maven/shared/jarsigner/JarSignerUtil.html
==
---
websites/production/maven/content/shared/maven-jarsigner/xref/org/apache/maven/shared/jarsigner/JarSignerUtil.html
(original)
+++
websites/production/maven/content/shared/maven-jarsigner/xref/org/apache/maven/shared/jarsigner/JarSignerUtil.html
Sat Nov 9 08:01:33 2013
@@ -29,8 +29,8 @@
a class=jxr_linenumber name=19 href=#1919/a em
class=jxr_comment * under the License./em
a class=jxr_linenumber name=20 href=#2020/a em
class=jxr_comment *//em
a class=jxr_linenumber name=21 href=#2121/a
-a class=jxr_linenumber name=22 href=#/a strong
class=jxr_keywordimport/strong org.apache.maven.shared.utils.io.FileUtils;
-a class=jxr_linenumber name=23 href=#2323/a strong
class=jxr_keywordimport/strong org.apache.maven.shared.utils.io.IOUtil;
+a class=jxr_linenumber name=22 href=#/a strong
class=jxr_keywordimport/strong org.codehaus.plexus.util.FileUtils;
+a class=jxr_linenumber name=23 href=#2323/a strong
class=jxr_keywordimport/strong org.codehaus.plexus.util.IOUtil;
a class=jxr_linenumber name=24 href=#2424/a
a class=jxr_linenumber name=25 href=#2525/a strong
class=jxr_keywordimport/strong java.io.BufferedInputStream;
a class=jxr_linenumber name=26 href=#2626/a strong
class=jxr_keywordimport/strong java.io.BufferedOutputStream;
@@ -46,7 +46,7 @@
a class=jxr_linenumber name=36 href=#3636/a em
class=jxr_javadoccomment * Useful methods./em
a class=jxr_linenumber name=37 href=#3737/a em
class=jxr_javadoccomment */em
a class=jxr_linenumber name=38 href=#3838/a em
class=jxr_javadoccomment * @author tchemit lt;che...@codelutin.comgt;/em
-a class=jxr_linenumber name=39 href=#3939/a em
class=jxr_javadoccomment * @version $Id: JarSignerUtil.java 1540158
2013-11-08 19:35:23Z tchemit $/em
+a class=jxr_linenumber name=39 href=#3939/a em
class=jxr_javadoccomment * @version $Id: JarSignerUtil.java 1195937
2011-11-01 11:38:37Z olamy $/em
a class=jxr_linenumber name=40 href=#4040/a em
class=jxr_javadoccomment * @since 1.0/em
a class=jxr_linenumber name=41 href=#4141/a em
class=jxr_javadoccomment *//em
a class=jxr_linenumber name=42 href=#4242/a strong
class=jxr_keywordpublic/strong strong class=jxr_keywordclass/strong
a
href=../../../../../org/apache/maven/shared/jarsigner/JarSignerUtil.htmlJarSignerUtil/a
@@ -114,7 +114,7 @@
a class=jxr_linenumber name=104 href=#104104/a
strong class=jxr_keywordcontinue/strong;
a class=jxr_linenumber name=105 href=#105105/a }
a class=jxr_linenumber name=106 href=#106106/a
-a class=jxr_linenumber name=107 href=#107107/a
zos.putNextEntry(strong class=jxr_keywordnew/strong
ZipEntry(ze.getName()));
+a class=jxr_linenumber name=107 href=#107107/a
zos.putNextEntry( ze );
a class=jxr_linenumber name=108 href=#108108/a
a class=jxr_linenumber name=109 href=#109109/a
IOUtil.copy( zis, zos );
a class=jxr_linenumber name=110 href=#110110/a }
@@ -131,98 +131,37 @@
a class=jxr_linenumber name=121 href=#121121/a }
a class=jxr_linenumber name=122 href=#122122/a
a class=jxr_linenumber name=123 href=#123123/a em
class=jxr_javadoccomment/**/em
-a class=jxr_linenumber name=124 href=#124124/a em
class=jxr_javadoccomment * Scans an archive for existing signatures./em
-a class=jxr_linenumber name=125 href=#125125/a em
class=jxr_javadoccomment */em
-a class=jxr_linenumber name=126 href=#126126/a em
class=jxr_javadoccomment * @param jarFile The archive to scan, must not
be lt;codegt;nulllt;/codegt;./em
-a class=jxr_linenumber name=127 href=#127127/a em
class=jxr_javadoccomment */em
-a class=jxr_linenumber name=128 href=#128128/a em
class=jxr_javadoccomment * @return lt;codegt;truelt;/codegt;, if the
archive contains at least one signature file; lt;codegt;falselt;/codegt;,
if the/em
-a class=jxr_linenumber name=129 href=#129129/a em
class=jxr_javadoccomment * archive does not contain any signature
files./em
-a class=jxr_linenumber name=130 href=#130130/a em
class=jxr_javadoccomment */em
-a class=jxr_linenumber name=131 href=#131131/a em
class=jxr_javadoccomment * @throws IOException if scanning
lt;codegt;jarFilelt;/codegt; fails./em
-a class=jxr_linenumber name=132 href=#132132/a em
class=jxr_javadoccomment *//em
-a class=jxr_linenumber name=133 href=#133133/a strong
class=jxr_keywordpublic/strong strong class=jxr_keywordstatic/strong
strong class=jxr_keywordboolean/strong isArchiveSigned( strong
class=jxr_keywordfinal/strong File jarFile )
-a class=jxr_linenumber name=134 href=#134134/a strong
class=jxr_keywordthrows/strong IOException
-a class=jxr_linenumber name=135 href=#135135/a {
-a class=jxr_linenumber name=136 href=#136136/a strong
class=jxr_keywordif
svn commit: r886306 [5/5] - in /websites/production/maven/content/shared/maven-jarsigner: ./ apidocs/ apidocs/org/apache/maven/shared/jarsigner/ apidocs/org/apache/maven/shared/jarsigner/class-use/ co
Modified:
websites/production/maven/content/shared/maven-jarsigner/xref/org/apache/maven/shared/jarsigner/JarSignerUtil.html
==
---
websites/production/maven/content/shared/maven-jarsigner/xref/org/apache/maven/shared/jarsigner/JarSignerUtil.html
(original)
+++
websites/production/maven/content/shared/maven-jarsigner/xref/org/apache/maven/shared/jarsigner/JarSignerUtil.html
Tue Nov 12 13:00:24 2013
@@ -29,8 +29,8 @@
a class=jxr_linenumber name=19 href=#1919/a em
class=jxr_comment * under the License./em
a class=jxr_linenumber name=20 href=#2020/a em
class=jxr_comment *//em
a class=jxr_linenumber name=21 href=#2121/a
-a class=jxr_linenumber name=22 href=#/a strong
class=jxr_keywordimport/strong org.codehaus.plexus.util.FileUtils;
-a class=jxr_linenumber name=23 href=#2323/a strong
class=jxr_keywordimport/strong org.codehaus.plexus.util.IOUtil;
+a class=jxr_linenumber name=22 href=#/a strong
class=jxr_keywordimport/strong org.apache.maven.shared.utils.io.FileUtils;
+a class=jxr_linenumber name=23 href=#2323/a strong
class=jxr_keywordimport/strong org.apache.maven.shared.utils.io.IOUtil;
a class=jxr_linenumber name=24 href=#2424/a
a class=jxr_linenumber name=25 href=#2525/a strong
class=jxr_keywordimport/strong java.io.BufferedInputStream;
a class=jxr_linenumber name=26 href=#2626/a strong
class=jxr_keywordimport/strong java.io.BufferedOutputStream;
@@ -46,7 +46,7 @@
a class=jxr_linenumber name=36 href=#3636/a em
class=jxr_javadoccomment * Useful methods./em
a class=jxr_linenumber name=37 href=#3737/a em
class=jxr_javadoccomment */em
a class=jxr_linenumber name=38 href=#3838/a em
class=jxr_javadoccomment * @author tchemit lt;che...@codelutin.comgt;/em
-a class=jxr_linenumber name=39 href=#3939/a em
class=jxr_javadoccomment * @version $Id: JarSignerUtil.java 1195937
2011-11-01 11:38:37Z olamy $/em
+a class=jxr_linenumber name=39 href=#3939/a em
class=jxr_javadoccomment * @version $Id: JarSignerUtil.java 1540158
2013-11-08 19:35:23Z tchemit $/em
a class=jxr_linenumber name=40 href=#4040/a em
class=jxr_javadoccomment * @since 1.0/em
a class=jxr_linenumber name=41 href=#4141/a em
class=jxr_javadoccomment *//em
a class=jxr_linenumber name=42 href=#4242/a strong
class=jxr_keywordpublic/strong strong class=jxr_keywordclass/strong
a
href=../../../../../org/apache/maven/shared/jarsigner/JarSignerUtil.htmlJarSignerUtil/a
@@ -114,7 +114,7 @@
a class=jxr_linenumber name=104 href=#104104/a
strong class=jxr_keywordcontinue/strong;
a class=jxr_linenumber name=105 href=#105105/a }
a class=jxr_linenumber name=106 href=#106106/a
-a class=jxr_linenumber name=107 href=#107107/a
zos.putNextEntry( ze );
+a class=jxr_linenumber name=107 href=#107107/a
zos.putNextEntry(strong class=jxr_keywordnew/strong
ZipEntry(ze.getName()));
a class=jxr_linenumber name=108 href=#108108/a
a class=jxr_linenumber name=109 href=#109109/a
IOUtil.copy( zis, zos );
a class=jxr_linenumber name=110 href=#110110/a }
@@ -131,37 +131,98 @@
a class=jxr_linenumber name=121 href=#121121/a }
a class=jxr_linenumber name=122 href=#122122/a
a class=jxr_linenumber name=123 href=#123123/a em
class=jxr_javadoccomment/**/em
-a class=jxr_linenumber name=124 href=#124124/a em
class=jxr_javadoccomment * Checks whether the specified JAR file entry
denotes a signature-related file, i.e. matches/em
-a class=jxr_linenumber name=125 href=#125125/a em
class=jxr_javadoccomment * lt;codegt;META-INF/*.SFlt;/codegt;,
lt;codegt;META-INF/*.DSAlt;/codegt; or
lt;codegt;META-INF/*.RSAlt;/codegt;./em
-a class=jxr_linenumber name=126 href=#126126/a em
class=jxr_javadoccomment */em
-a class=jxr_linenumber name=127 href=#127127/a em
class=jxr_javadoccomment * @param entryName The name of the JAR file
entry to check, must not be lt;codegt;nulllt;/codegt;./em
-a class=jxr_linenumber name=128 href=#128128/a em
class=jxr_javadoccomment * @return lt;codegt;truelt;/codegt; if the
entry is related to a signature, lt;codegt;falselt;/codegt; otherwise./em
-a class=jxr_linenumber name=129 href=#129129/a em
class=jxr_javadoccomment *//em
-a class=jxr_linenumber name=130 href=#130130/a strong
class=jxr_keywordprivate/strong strong
class=jxr_keywordstatic/strong strong
class=jxr_keywordboolean/strong isSignatureFile( String entryName )
-a class=jxr_linenumber name=131 href=#131131/a {
-a class=jxr_linenumber name=132 href=#132132/a strong
class=jxr_keywordif/strong ( entryName.regionMatches( strong
class=jxr_keywordtrue/strong, 0, span
class=jxr_stringMETA-INF/span, 0, 8 ) )
-a class=jxr_linenumber name=133 href=#133133/a {
-a class=jxr_linenumber name=134 href=#134134/a entryName
= entryName.replace( '#92;#92;', '/' );
-a class=jxr_linenumber name=135 href=#135135
svn commit: r1541091 - /maven/shared/trunk/maven-jarsigner/src/main/java/org/apache/maven/shared/jarsigner/DefaultJarSigner.java
Author: tchemit Date: Tue Nov 12 14:45:48 2013 New Revision: 1541091 URL: http://svn.apache.org/r1541091 Log: MSHARED-301 - use plexus java 5 annotations instead of plexus javadoc tags Modified: maven/shared/trunk/maven-jarsigner/src/main/java/org/apache/maven/shared/jarsigner/DefaultJarSigner.java Modified: maven/shared/trunk/maven-jarsigner/src/main/java/org/apache/maven/shared/jarsigner/DefaultJarSigner.java URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-jarsigner/src/main/java/org/apache/maven/shared/jarsigner/DefaultJarSigner.java?rev=1541091r1=1541090r2=1541091view=diff == --- maven/shared/trunk/maven-jarsigner/src/main/java/org/apache/maven/shared/jarsigner/DefaultJarSigner.java (original) +++ maven/shared/trunk/maven-jarsigner/src/main/java/org/apache/maven/shared/jarsigner/DefaultJarSigner.java Tue Nov 12 14:45:48 2013 @@ -19,6 +19,7 @@ package org.apache.maven.shared.jarsigne * under the License. */ +import org.codehaus.plexus.component.annotations.Component; import org.codehaus.plexus.logging.AbstractLogEnabled; import org.apache.maven.shared.utils.Os; import org.apache.maven.shared.utils.StringUtils; @@ -37,9 +38,9 @@ import java.util.Map; * * @author tchemit che...@codelutin.com * @version $Id$ - * @plexus.component role=org.apache.maven.shared.jarsigner.JarSigner role-hint=default * @since 1.0 */ +@Component( role = JarSigner.class, hint = default ) public class DefaultJarSigner extends AbstractLogEnabled implements JarSigner
svn commit: r1541092 - /maven/shared/trunk/maven-jarsigner/pom.xml
Author: tchemit Date: Tue Nov 12 14:50:54 2013 New Revision: 1541092 URL: http://svn.apache.org/r1541092 Log: MSHARED-301 - use plexus java 5 annotations instead of plexus javadoc tags Modified: maven/shared/trunk/maven-jarsigner/pom.xml Modified: maven/shared/trunk/maven-jarsigner/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-jarsigner/pom.xml?rev=1541092r1=1541091r2=1541092view=diff == --- maven/shared/trunk/maven-jarsigner/pom.xml (original) +++ maven/shared/trunk/maven-jarsigner/pom.xml Tue Nov 12 14:50:54 2013 @@ -67,6 +67,12 @@ dependency groupIdorg.codehaus.plexus/groupId + artifactIdplexus-component-annotations/artifactId + version1.5.5/version +/dependency + +dependency + groupIdorg.codehaus.plexus/groupId artifactIdplexus-container-default/artifactId version1.0-alpha-9-stable-1/version /dependency
svn commit: r1541100 - /maven/shared/trunk/maven-jarsigner/pom.xml
Author: tchemit Date: Tue Nov 12 15:19:25 2013 New Revision: 1541100 URL: http://svn.apache.org/r1541100 Log: MSHARED-301 - use plexus java 5 annotations instead of plexus javadoc tags Modified: maven/shared/trunk/maven-jarsigner/pom.xml Modified: maven/shared/trunk/maven-jarsigner/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-jarsigner/pom.xml?rev=1541100r1=1541099r2=1541100view=diff == --- maven/shared/trunk/maven-jarsigner/pom.xml (original) +++ maven/shared/trunk/maven-jarsigner/pom.xml Tue Nov 12 15:19:25 2013 @@ -93,7 +93,6 @@ executions execution idcreate-component-descriptor/id -phasegenerate-resources/phase goals goalgenerate-metadata/goal /goals
svn commit: r1541103 - /maven/plugins/trunk/maven-jarsigner-plugin/pom.xml
Author: tchemit Date: Tue Nov 12 15:27:44 2013 New Revision: 1541103 URL: http://svn.apache.org/r1541103 Log: MJARSIGNER-27 - Use maven-jarsigner 1.1 Modified: maven/plugins/trunk/maven-jarsigner-plugin/pom.xml Modified: maven/plugins/trunk/maven-jarsigner-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jarsigner-plugin/pom.xml?rev=1541103r1=1541102r2=1541103view=diff == --- maven/plugins/trunk/maven-jarsigner-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-jarsigner-plugin/pom.xml Tue Nov 12 15:27:44 2013 @@ -100,7 +100,7 @@ under the License. dependency groupIdorg.apache.maven.shared/groupId artifactIdmaven-jarsigner/artifactId - version1.0/version + version1.1/version /dependency /dependencies
svn commit: r1541101 - /maven/shared/trunk/maven-jarsigner/src/main/java/org/apache/maven/shared/jarsigner/
Author: tchemit
Date: Tue Nov 12 15:21:23 2013
New Revision: 1541101
URL: http://svn.apache.org/r1541101
Log:
MSHARED-302 - Use java 5 codestyle
+ add some javadoc @inheritDoc
Modified:
maven/shared/trunk/maven-jarsigner/src/main/java/org/apache/maven/shared/jarsigner/AbstractJarSignerRequest.java
maven/shared/trunk/maven-jarsigner/src/main/java/org/apache/maven/shared/jarsigner/DefaultJarSigner.java
maven/shared/trunk/maven-jarsigner/src/main/java/org/apache/maven/shared/jarsigner/DefaultJarSignerResult.java
maven/shared/trunk/maven-jarsigner/src/main/java/org/apache/maven/shared/jarsigner/JarSignerCommandLineBuilder.java
maven/shared/trunk/maven-jarsigner/src/main/java/org/apache/maven/shared/jarsigner/JarSignerRequest.java
maven/shared/trunk/maven-jarsigner/src/main/java/org/apache/maven/shared/jarsigner/JarSignerUtil.java
Modified:
maven/shared/trunk/maven-jarsigner/src/main/java/org/apache/maven/shared/jarsigner/AbstractJarSignerRequest.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-jarsigner/src/main/java/org/apache/maven/shared/jarsigner/AbstractJarSignerRequest.java?rev=1541101r1=1541100r2=1541101view=diff
==
---
maven/shared/trunk/maven-jarsigner/src/main/java/org/apache/maven/shared/jarsigner/AbstractJarSignerRequest.java
(original)
+++
maven/shared/trunk/maven-jarsigner/src/main/java/org/apache/maven/shared/jarsigner/AbstractJarSignerRequest.java
Tue Nov 12 15:21:23 2013
@@ -69,71 +69,113 @@ public abstract class AbstractJarSignerR
*/
private StreamConsumer systemErrorStreamConsumer;
+/**
+ * {@inheritDoc}
+ */
public boolean isVerbose()
{
return verbose;
}
+/**
+ * {@inheritDoc}
+ */
public String getMaxMemory()
{
return maxMemory;
}
+/**
+ * {@inheritDoc}
+ */
public String[] getArguments()
{
return arguments;
}
+/**
+ * {@inheritDoc}
+ */
public File getWorkingDirectory()
{
return workingDirectory;
}
+/**
+ * {@inheritDoc}
+ */
public File getArchive()
{
return archive;
}
+/**
+ * {@inheritDoc}
+ */
public StreamConsumer getSystemOutStreamConsumer()
{
return systemOutStreamConsumer;
}
+/**
+ * {@inheritDoc}
+ */
public StreamConsumer getSystemErrorStreamConsumer()
{
return systemErrorStreamConsumer;
}
+/**
+ * {@inheritDoc}
+ */
public void setVerbose( boolean verbose )
{
this.verbose = verbose;
}
+/**
+ * {@inheritDoc}
+ */
public void setMaxMemory( String maxMemory )
{
this.maxMemory = maxMemory;
}
-public void setArguments( String[] arguments )
+/**
+ * {@inheritDoc}
+ */
+public void setArguments( String... arguments )
{
this.arguments = arguments;
}
+/**
+ * {@inheritDoc}
+ */
public void setWorkingDirectory( File workingDirectory )
{
this.workingDirectory = workingDirectory;
}
+/**
+ * {@inheritDoc}
+ */
public void setArchive( File archive )
{
this.archive = archive;
}
+/**
+ * {@inheritDoc}
+ */
public void setSystemOutStreamConsumer( StreamConsumer
systemOutStreamConsumer )
{
this.systemOutStreamConsumer = systemOutStreamConsumer;
}
+/**
+ * {@inheritDoc}
+ */
public void setSystemErrorStreamConsumer( StreamConsumer
systemErrorStreamConsumer )
{
this.systemErrorStreamConsumer = systemErrorStreamConsumer;
Modified:
maven/shared/trunk/maven-jarsigner/src/main/java/org/apache/maven/shared/jarsigner/DefaultJarSigner.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-jarsigner/src/main/java/org/apache/maven/shared/jarsigner/DefaultJarSigner.java?rev=1541101r1=1541100r2=1541101view=diff
==
---
maven/shared/trunk/maven-jarsigner/src/main/java/org/apache/maven/shared/jarsigner/DefaultJarSigner.java
(original)
+++
maven/shared/trunk/maven-jarsigner/src/main/java/org/apache/maven/shared/jarsigner/DefaultJarSigner.java
Tue Nov 12 15:21:23 2013
@@ -19,14 +19,14 @@ package org.apache.maven.shared.jarsigne
* under the License.
*/
-import org.codehaus.plexus.component.annotations.Component;
-import org.codehaus.plexus.logging.AbstractLogEnabled;
import org.apache.maven.shared.utils.Os;
import org.apache.maven.shared.utils.StringUtils;
import org.apache.maven.shared.utils.cli.CommandLineException;
import org.apache.maven.shared.utils.cli.CommandLineUtils;
import org.apache.maven.shared.utils.cli.Commandline;
import org.apache.maven.shared.utils.cli.StreamConsumer;
+import org.codehaus.plexus.component.annotations.Component
svn commit: r1541114 - in /maven/plugins/trunk/maven-jarsigner-plugin: ./ src/main/java/org/apache/maven/plugins/jarsigner/
Author: tchemit
Date: Tue Nov 12 15:44:38 2013
New Revision: 1541114
URL: http://svn.apache.org/r1541114
Log:
MJARSIGNER-16 - Add the option -tsa to the configuration
MJARSIGNER-27 - Use maven-jarsigner 1.1 (migrates to maven-share-utils)
Add some missing @Override and @inheritDoc
Modified:
maven/plugins/trunk/maven-jarsigner-plugin/pom.xml
maven/plugins/trunk/maven-jarsigner-plugin/src/main/java/org/apache/maven/plugins/jarsigner/AbstractJarsignerMojo.java
maven/plugins/trunk/maven-jarsigner-plugin/src/main/java/org/apache/maven/plugins/jarsigner/JarsignerSignMojo.java
maven/plugins/trunk/maven-jarsigner-plugin/src/main/java/org/apache/maven/plugins/jarsigner/JarsignerVerifyMojo.java
Modified: maven/plugins/trunk/maven-jarsigner-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jarsigner-plugin/pom.xml?rev=1541114r1=1541113r2=1541114view=diff
==
--- maven/plugins/trunk/maven-jarsigner-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-jarsigner-plugin/pom.xml Tue Nov 12 15:44:38 2013
@@ -87,9 +87,9 @@ under the License.
scopeprovided/scope
/dependency
dependency
- groupIdorg.codehaus.plexus/groupId
- artifactIdplexus-utils/artifactId
- version3.0.15/version
+ groupIdorg.apache.maven.shared/groupId
+ artifactIdmaven-shared-utils/artifactId
+ version0.3/version
/dependency
dependency
groupIdorg.sonatype.plexus/groupId
Modified:
maven/plugins/trunk/maven-jarsigner-plugin/src/main/java/org/apache/maven/plugins/jarsigner/AbstractJarsignerMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jarsigner-plugin/src/main/java/org/apache/maven/plugins/jarsigner/AbstractJarsignerMojo.java?rev=1541114r1=1541113r2=1541114view=diff
==
---
maven/plugins/trunk/maven-jarsigner-plugin/src/main/java/org/apache/maven/plugins/jarsigner/AbstractJarsignerMojo.java
(original)
+++
maven/plugins/trunk/maven-jarsigner-plugin/src/main/java/org/apache/maven/plugins/jarsigner/AbstractJarsignerMojo.java
Tue Nov 12 15:44:38 2013
@@ -30,9 +30,9 @@ import org.apache.maven.shared.jarsigner
import org.apache.maven.shared.jarsigner.JarSignerRequest;
import org.apache.maven.shared.jarsigner.JarSignerResult;
import org.apache.maven.shared.jarsigner.JarSignerUtil;
-import org.codehaus.plexus.util.FileUtils;
-import org.codehaus.plexus.util.StringUtils;
-import org.codehaus.plexus.util.cli.Commandline;
+import org.apache.maven.shared.utils.StringUtils;
+import org.apache.maven.shared.utils.cli.Commandline;
+import org.apache.maven.shared.utils.io.FileUtils;
import java.io.File;
import java.io.IOException;
Modified:
maven/plugins/trunk/maven-jarsigner-plugin/src/main/java/org/apache/maven/plugins/jarsigner/JarsignerSignMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jarsigner-plugin/src/main/java/org/apache/maven/plugins/jarsigner/JarsignerSignMojo.java?rev=1541114r1=1541113r2=1541114view=diff
==
---
maven/plugins/trunk/maven-jarsigner-plugin/src/main/java/org/apache/maven/plugins/jarsigner/JarsignerSignMojo.java
(original)
+++
maven/plugins/trunk/maven-jarsigner-plugin/src/main/java/org/apache/maven/plugins/jarsigner/JarsignerSignMojo.java
Tue Nov 12 15:44:38 2013
@@ -27,8 +27,8 @@ import org.apache.maven.plugins.annotati
import org.apache.maven.shared.jarsigner.JarSignerRequest;
import org.apache.maven.shared.jarsigner.JarSignerSignRequest;
import org.apache.maven.shared.jarsigner.JarSignerUtil;
-import org.codehaus.plexus.util.StringUtils;
-import org.codehaus.plexus.util.cli.Commandline;
+import org.apache.maven.shared.utils.StringUtils;
+import org.apache.maven.shared.utils.cli.Commandline;
import org.sonatype.plexus.components.sec.dispatcher.SecDispatcher;
import org.sonatype.plexus.components.sec.dispatcher.SecDispatcherException;
@@ -111,11 +111,28 @@ public class JarsignerSignMojo
private boolean removeExistingSignatures;
/**
+ * See a
href=http://java.sun.com/javase/6/docs/technotes/tools/windows/jarsigner.html#Options;options/a.
+ *
+ * @since 1.3
+ */
+@Parameter( property = jarsigner.tsa )
+private String tsa;
+
+/**
+ * See a
href=http://java.sun.com/javase/6/docs/technotes/tools/windows/jarsigner.html#Options;options/a.
+ *
+ * @since 1.3
+ */
+@Parameter( property = jarsigner.tsacert )
+private String tsacert;
+
+/**
* @since 1.3
*/
@Component( hint = mng-4384)
private SecDispatcher securityDispatcher;
+@Override
protected String getCommandlineInfo( final Commandline commandLine )
{
String commandLineInfo = commandLine != null ? commandLine.toString()
: null;
@@ -129,6 +146,7 @@ public class JarsignerSignMojo
svn commit: r1541120 - in /maven/shared/trunk/maven-jarsigner/src/main/java/org/apache/maven/shared/jarsigner: AbstractJarSignerRequest.java JarSignerCommandLineBuilder.java JarSignerRequest.java
Author: tchemit
Date: Tue Nov 12 15:59:57 2013
New Revision: 1541120
URL: http://svn.apache.org/r1541120
Log:
MSHARED-303 - Jar Signer does not support protected authentication path
Submitted by: Michael Gruebsch (see MJARSIGNER-26)
Modified:
maven/shared/trunk/maven-jarsigner/src/main/java/org/apache/maven/shared/jarsigner/AbstractJarSignerRequest.java
maven/shared/trunk/maven-jarsigner/src/main/java/org/apache/maven/shared/jarsigner/JarSignerCommandLineBuilder.java
maven/shared/trunk/maven-jarsigner/src/main/java/org/apache/maven/shared/jarsigner/JarSignerRequest.java
Modified:
maven/shared/trunk/maven-jarsigner/src/main/java/org/apache/maven/shared/jarsigner/AbstractJarSignerRequest.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-jarsigner/src/main/java/org/apache/maven/shared/jarsigner/AbstractJarSignerRequest.java?rev=1541120r1=1541119r2=1541120view=diff
==
---
maven/shared/trunk/maven-jarsigner/src/main/java/org/apache/maven/shared/jarsigner/AbstractJarSignerRequest.java
(original)
+++
maven/shared/trunk/maven-jarsigner/src/main/java/org/apache/maven/shared/jarsigner/AbstractJarSignerRequest.java
Tue Nov 12 15:59:57 2013
@@ -70,6 +70,11 @@ public abstract class AbstractJarSignerR
private StreamConsumer systemErrorStreamConsumer;
/**
+ * See a
href=http://java.sun.com/javase/6/docs/technotes/tools/windows/jarsigner.html#Options;options/a.
+ */
+protected boolean protectedAuthenticationPath;
+
+/**
* {@inheritDoc}
*/
public boolean isVerbose()
@@ -128,6 +133,14 @@ public abstract class AbstractJarSignerR
/**
* {@inheritDoc}
*/
+public boolean isProtectedAuthenticationPath()
+{
+ return protectedAuthenticationPath;
+}
+
+/**
+ * {@inheritDoc}
+ */
public void setVerbose( boolean verbose )
{
this.verbose = verbose;
@@ -180,4 +193,12 @@ public abstract class AbstractJarSignerR
{
this.systemErrorStreamConsumer = systemErrorStreamConsumer;
}
+
+/**
+ * {@inheritDoc}
+ */
+public void setProtectedAuthenticationPath(boolean protect)
+{
+ this.protectedAuthenticationPath = protect;
+}
}
Modified:
maven/shared/trunk/maven-jarsigner/src/main/java/org/apache/maven/shared/jarsigner/JarSignerCommandLineBuilder.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-jarsigner/src/main/java/org/apache/maven/shared/jarsigner/JarSignerCommandLineBuilder.java?rev=1541120r1=1541119r2=1541120view=diff
==
---
maven/shared/trunk/maven-jarsigner/src/main/java/org/apache/maven/shared/jarsigner/JarSignerCommandLineBuilder.java
(original)
+++
maven/shared/trunk/maven-jarsigner/src/main/java/org/apache/maven/shared/jarsigner/JarSignerCommandLineBuilder.java
Tue Nov 12 15:59:57 2013
@@ -65,6 +65,11 @@ public class JarSignerCommandLineBuilder
cli.createArg().setValue( -verbose );
}
+if (request.isProtectedAuthenticationPath())
+{
+cli.createArg().setValue( -protected );
+}
+
String maxMemory = request.getMaxMemory();
if ( StringUtils.isNotEmpty( maxMemory ) )
{
Modified:
maven/shared/trunk/maven-jarsigner/src/main/java/org/apache/maven/shared/jarsigner/JarSignerRequest.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-jarsigner/src/main/java/org/apache/maven/shared/jarsigner/JarSignerRequest.java?rev=1541120r1=1541119r2=1541120view=diff
==
---
maven/shared/trunk/maven-jarsigner/src/main/java/org/apache/maven/shared/jarsigner/JarSignerRequest.java
(original)
+++
maven/shared/trunk/maven-jarsigner/src/main/java/org/apache/maven/shared/jarsigner/JarSignerRequest.java
Tue Nov 12 15:59:57 2013
@@ -92,6 +92,13 @@ public interface JarSignerRequest
StreamConsumer getSystemErrorStreamConsumer();
/**
+ * Gets the value of the command line tool parameter preprotected/pre
+ * @return true iff the password must be given via a protected
+ * authentication path such as a dedicated PIN reader
+ */
+boolean isProtectedAuthenticationPath();
+
+/**
* Sets the new given value to the field {@code verbose} of the request.
*
* @param verbose the new value of the field {@code verbose}.
@@ -140,5 +147,11 @@ public interface JarSignerRequest
*/
void setSystemErrorStreamConsumer( StreamConsumer
systemErrorStreamConsumer );
+/**
+ * Sets the value of the command line tool parameter preprotected/pre
+ * @param protectedAuthenticationPath iff the password must be given via a
protected
+ * authentication path such as a dedicated PIN reader
+ */
+void setProtectedAuthenticationPath(boolean protectedAuthenticationPath);
}
svn commit: r1541123 - /maven/plugins/trunk/maven-jarsigner-plugin/pom.xml
Author: tchemit Date: Tue Nov 12 16:04:52 2013 New Revision: 1541123 URL: http://svn.apache.org/r1541123 Log: MJARSIGNER-27 - Use maven-jarsigner 1.2 Still in snapshot Modified: maven/plugins/trunk/maven-jarsigner-plugin/pom.xml Modified: maven/plugins/trunk/maven-jarsigner-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jarsigner-plugin/pom.xml?rev=1541123r1=1541122r2=1541123view=diff == --- maven/plugins/trunk/maven-jarsigner-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-jarsigner-plugin/pom.xml Tue Nov 12 16:04:52 2013 @@ -100,7 +100,7 @@ under the License. dependency groupIdorg.apache.maven.shared/groupId artifactIdmaven-jarsigner/artifactId - version1.1/version + version1.2-SNAPSHOT/version /dependency /dependencies
svn commit: r1541126 - /maven/plugins/trunk/maven-jarsigner-plugin/src/main/java/org/apache/maven/plugins/jarsigner/AbstractJarsignerMojo.java
Author: tchemit
Date: Tue Nov 12 16:08:35 2013
New Revision: 1541126
URL: http://svn.apache.org/r1541126
Log:
MJARSIGNER-26 - Jar Signer does not support protected authentication path
Submitted by: Michael Gruebsch
Modified:
maven/plugins/trunk/maven-jarsigner-plugin/src/main/java/org/apache/maven/plugins/jarsigner/AbstractJarsignerMojo.java
Modified:
maven/plugins/trunk/maven-jarsigner-plugin/src/main/java/org/apache/maven/plugins/jarsigner/AbstractJarsignerMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jarsigner-plugin/src/main/java/org/apache/maven/plugins/jarsigner/AbstractJarsignerMojo.java?rev=1541126r1=1541125r2=1541126view=diff
==
---
maven/plugins/trunk/maven-jarsigner-plugin/src/main/java/org/apache/maven/plugins/jarsigner/AbstractJarsignerMojo.java
(original)
+++
maven/plugins/trunk/maven-jarsigner-plugin/src/main/java/org/apache/maven/plugins/jarsigner/AbstractJarsignerMojo.java
Tue Nov 12 16:08:35 2013
@@ -129,6 +129,15 @@ public abstract class AbstractJarsignerM
private boolean processAttachedArtifacts;
/**
+ * Must be set to true if the password must be given via a protected
+ * authentication path such as a dedicated PIN reader.
+ *
+ * @since 1.3
+ */
+@Parameter( property = jarsigner.protectedAuthenticationPath,
defaultValue = false )
+private boolean protectedAuthenticationPath;
+
+/**
* Controls processing of project attachments.
*
* @deprecated As of version 1.1 in favor of the new parameter
codeprocessAttachedArtifacts/code.
@@ -388,6 +397,7 @@ public abstract class AbstractJarsignerM
request.setWorkingDirectory( workingDirectory );
request.setMaxMemory( maxMemory );
request.setArguments( arguments );
+request.setProtectedAuthenticationPath( protectedAuthenticationPath );
try
{
svn commit: r1541296 - /maven/site/trunk/content/apt/shared/index.apt
Author: tchemit
Date: Tue Nov 12 22:54:25 2013
New Revision: 1541296
URL: http://svn.apache.org/r1541296
Log:
maven-jarsigner 1.1 released
Modified:
maven/site/trunk/content/apt/shared/index.apt
Modified: maven/site/trunk/content/apt/shared/index.apt
URL:
http://svn.apache.org/viewvc/maven/site/trunk/content/apt/shared/index.apt?rev=1541296r1=1541295r2=1541296view=diff
==
--- maven/site/trunk/content/apt/shared/index.apt (original)
+++ maven/site/trunk/content/apt/shared/index.apt Tue Nov 12 22:54:25 2013
@@ -31,7 +31,7 @@ Shared Components
*+--+---+--++-+
| {{{/shared/maven-invoker/} maven-invoker}} |
2.1.1| 2012-11-12| Fires up a Maven build in a new JVM. |
{{{http://svn.apache.org/repos/asf/maven/shared/trunk/maven-invoker/}SVN}} |
{{{http://jira.codehaus.org/browse/MSHARED/component/13271}JIRA}}
*+--+---+--++-+
-| {{{/shared/maven-jarsigner/} maven-jarsigner}} |
1.0 | 2011-11-21| This component provides some utilities to
sign/verify jars/files in your Mojos. |
{{{http://svn.apache.org/repos/asf/maven/shared/trunk/maven-jarsigner/}SVN}} |
{{{http://jira.codehaus.org/browse/MSHARED/component/15255}JIRA}}
+| {{{/shared/maven-jarsigner/} maven-jarsigner}} |
1.1 | 2013-11-12| This component provides some utilities to
sign/verify jars/files in your Mojos. |
{{{http://svn.apache.org/repos/asf/maven/shared/trunk/maven-jarsigner/}SVN}} |
{{{http://jira.codehaus.org/browse/MSHARED/component/15255}JIRA}}
*+--+---+--++-+
| {{{/shared/maven-mapping/} maven-mapping}} |
1.0 | 2013-08-14| A shared component for all plugins that need
to do mapping. |
{{{http://svn.apache.org/repos/asf/maven/shared/trunk/maven-mapping/}SVN}} |
{{{http://jira.codehaus.org/browse/MSHARED/component/16150}JIRA}}
*+--+---+--++-+
svn commit: r886439 - in /websites/production/maven/content: ./ ant-tasks-archives/ ant-tasks/ apache-resource-bundles/ archetype-archives/ archetype/ core-its/ enforcer-archives/ enforcer/ jxr/ maven
Author: tchemit Date: Tue Nov 12 22:59:44 2013 New Revision: 886439 Log: Publishing svnmucc operation to maven site by tchemit Added: websites/production/maven/content/ - copied from r886438, websites/staging/maven/trunk/content/ websites/production/maven/content/ant-tasks/ - copied from r886438, websites/production/maven/content/ant-tasks/ websites/production/maven/content/ant-tasks-archives/ - copied from r886438, websites/production/maven/content/ant-tasks-archives/ websites/production/maven/content/apache-resource-bundles/ - copied from r886438, websites/production/maven/content/apache-resource-bundles/ websites/production/maven/content/archetype/ - copied from r886438, websites/production/maven/content/archetype/ websites/production/maven/content/archetype-archives/ - copied from r886438, websites/production/maven/content/archetype-archives/ websites/production/maven/content/core-its/ - copied from r886438, websites/production/maven/content/core-its/ websites/production/maven/content/enforcer/ - copied from r886438, websites/production/maven/content/enforcer/ websites/production/maven/content/enforcer-archives/ - copied from r886438, websites/production/maven/content/enforcer-archives/ websites/production/maven/content/jxr/ - copied from r886438, websites/production/maven/content/jxr/ websites/production/maven/content/maven-1.x/ - copied from r886438, websites/production/maven/content/maven-1.x/ websites/production/maven/content/maven-archetype-bundles/ - copied from r886438, websites/production/maven/content/maven-archetype-bundles/ websites/production/maven/content/maven-indexer/ - copied from r886438, websites/production/maven/content/maven-indexer/ websites/production/maven/content/maven-indexer-archives/ - copied from r886438, websites/production/maven/content/maven-indexer-archives/ websites/production/maven/content/maven-release/ - copied from r886438, websites/production/maven/content/maven-release/ websites/production/maven/content/maven-release-archives/ - copied from r886438, websites/production/maven/content/maven-release-archives/ websites/production/maven/content/plugin-testing/ - copied from r886438, websites/production/maven/content/plugin-testing/ websites/production/maven/content/plugin-tools/ - copied from r886438, websites/production/maven/content/plugin-tools/ websites/production/maven/content/plugin-tools-archives/ - copied from r886438, websites/production/maven/content/plugin-tools-archives/ websites/production/maven/content/plugins-archives/ - copied from r886438, websites/production/maven/content/plugins-archives/ websites/production/maven/content/plugins/maven-acr-plugin/ - copied from r886438, websites/production/maven/content/plugins/maven-acr-plugin/ websites/production/maven/content/plugins/maven-ant-plugin/ - copied from r886438, websites/production/maven/content/plugins/maven-ant-plugin/ websites/production/maven/content/plugins/maven-antrun-plugin/ - copied from r886438, websites/production/maven/content/plugins/maven-antrun-plugin/ websites/production/maven/content/plugins/maven-archetype-plugin/ - copied from r886438, websites/production/maven/content/plugins/maven-archetype-plugin/ websites/production/maven/content/plugins/maven-assembly-plugin/ - copied from r886438, websites/production/maven/content/plugins/maven-assembly-plugin/ websites/production/maven/content/plugins/maven-changelog-plugin/ - copied from r886438, websites/production/maven/content/plugins/maven-changelog-plugin/ websites/production/maven/content/plugins/maven-changes-plugin/ - copied from r886438, websites/production/maven/content/plugins/maven-changes-plugin/ websites/production/maven/content/plugins/maven-checkstyle-plugin/ - copied from r886438, websites/production/maven/content/plugins/maven-checkstyle-plugin/ websites/production/maven/content/plugins/maven-clean-plugin/ - copied from r886438, websites/production/maven/content/plugins/maven-clean-plugin/ websites/production/maven/content/plugins/maven-compiler-plugin/ - copied from r886438, websites/production/maven/content/plugins/maven-compiler-plugin/ websites/production/maven/content/plugins/maven-dependency-plugin/ - copied from r886438, websites/production/maven/content/plugins/maven-dependency-plugin/ websites/production/maven/content/plugins/maven-deploy-plugin/ - copied from r886438, websites/production/maven/content/plugins/maven-deploy-plugin/ websites/production/maven/content/plugins/maven-doap-plugin/ - copied from r886438, websites/production/maven/content/plugins/maven-doap-plugin/ websites/production/maven/content/plugins/maven-docck-plugin/ - copied from r886438
svn commit: r1541695 - in /maven/shared/trunk/maven-shared-utils: ./ src/main/java/org/apache/maven/shared/utils/cli/javatool/
Author: tchemit
Date: Wed Nov 13 20:35:00 2013
New Revision: 1541695
URL: http://svn.apache.org/r1541695
Log:
MSHARED-304 - Create a API for java tool
Added:
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/javatool/
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/javatool/AbstractJavaTool.java
(with props)
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/javatool/AbstractJavaToolRequest.java
(with props)
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/javatool/AbstractJavaToolResult.java
(with props)
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/javatool/JavaTool.java
(with props)
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/javatool/JavaToolException.java
(with props)
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/javatool/JavaToolRequest.java
(with props)
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/javatool/JavaToolResult.java
(with props)
Modified:
maven/shared/trunk/maven-shared-utils/pom.xml
Modified: maven/shared/trunk/maven-shared-utils/pom.xml
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/pom.xml?rev=1541695r1=1541694r2=1541695view=diff
==
--- maven/shared/trunk/maven-shared-utils/pom.xml (original)
+++ maven/shared/trunk/maven-shared-utils/pom.xml Wed Nov 13 20:35:00 2013
@@ -92,6 +92,13 @@
artifactIdjsr305/artifactId
version2.0.1/version
/dependency
+!-- used for the javatool api --
+dependency
+ groupIdorg.apache.maven/groupId
+ artifactIdmaven-toolchain/artifactId
+ version${mavenVersion}/version
+ scopeprovided/scope
+/dependency
/dependencies
build
Added:
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/javatool/AbstractJavaTool.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/javatool/AbstractJavaTool.java?rev=1541695view=auto
==
---
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/javatool/AbstractJavaTool.java
(added)
+++
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/javatool/AbstractJavaTool.java
Wed Nov 13 20:35:00 2013
@@ -0,0 +1,289 @@
+package org.apache.maven.shared.utils.cli.javatool;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * License); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import org.apache.maven.shared.utils.Os;
+import org.apache.maven.shared.utils.StringUtils;
+import org.apache.maven.shared.utils.cli.CommandLineException;
+import org.apache.maven.shared.utils.cli.CommandLineUtils;
+import org.apache.maven.shared.utils.cli.Commandline;
+import org.apache.maven.shared.utils.cli.StreamConsumer;
+import org.apache.maven.toolchain.Toolchain;
+import org.codehaus.plexus.logging.AbstractLogEnabled;
+
+import java.io.File;
+import java.io.InputStream;
+import java.util.Map;
+
+/**
+ * Abstract implementation of a {@link JavaTool}.
+ *
+ * @author Tony Chemit che...@codelutin.com
+ * @since 0.5
+ */
+public abstract class AbstractJavaToolRequest extends JavaToolRequest, Result
extends JavaToolResult
+extends AbstractLogEnabled
+implements JavaToolRequest, Result
+{
+
+/**
+ * The java tool name to find out in the jdk.
+ */
+private final String javaToolName;
+
+/**
+ * The location of the java tool executable file.
+ */
+private String javaToolFile;
+
+/**
+ * Optional toolChain used to find java tool executable file.
+ */
+private Toolchain toolchain;
+
+protected AbstractJavaTool( String javaToolName )
+{
+this.javaToolName = javaToolName;
+}
+
+/**
+ * Create the commandline object given the request.
+ *
+ * @param request User request on the java tool
svn commit: r1541704 - in /maven/shared/trunk/maven-jarsigner: ./ src/main/java/org/apache/maven/shared/jarsigner/
Author: tchemit
Date: Wed Nov 13 20:50:12 2013
New Revision: 1541704
URL: http://svn.apache.org/r1541704
Log:
MSHARED-305 - Use maven-shared-utils javatool API
Removed:
maven/shared/trunk/maven-jarsigner/src/main/java/org/apache/maven/shared/jarsigner/JarSignerException.java
Modified:
maven/shared/trunk/maven-jarsigner/pom.xml
maven/shared/trunk/maven-jarsigner/src/main/java/org/apache/maven/shared/jarsigner/AbstractJarSignerRequest.java
maven/shared/trunk/maven-jarsigner/src/main/java/org/apache/maven/shared/jarsigner/DefaultJarSigner.java
maven/shared/trunk/maven-jarsigner/src/main/java/org/apache/maven/shared/jarsigner/DefaultJarSignerResult.java
maven/shared/trunk/maven-jarsigner/src/main/java/org/apache/maven/shared/jarsigner/JarSigner.java
maven/shared/trunk/maven-jarsigner/src/main/java/org/apache/maven/shared/jarsigner/JarSignerRequest.java
maven/shared/trunk/maven-jarsigner/src/main/java/org/apache/maven/shared/jarsigner/JarSignerResult.java
Modified: maven/shared/trunk/maven-jarsigner/pom.xml
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-jarsigner/pom.xml?rev=1541704r1=1541703r2=1541704view=diff
==
--- maven/shared/trunk/maven-jarsigner/pom.xml (original)
+++ maven/shared/trunk/maven-jarsigner/pom.xml Wed Nov 13 20:50:12 2013
@@ -54,7 +54,7 @@
/distributionManagement
properties
-mavenVersion2.0.6/mavenVersion
+mavenVersion2.1.0/mavenVersion
maven.site.pathshared-archives/${project.artifactId}-LATEST/maven.site.path
/properties
@@ -62,7 +62,7 @@
dependency
groupIdorg.apache.maven.shared/groupId
artifactIdmaven-shared-utils/artifactId
- version0.3/version
+ version0.5-SNAPSHOT/version
/dependency
dependency
@@ -76,6 +76,11 @@
artifactIdplexus-container-default/artifactId
version1.0-alpha-9-stable-1/version
/dependency
+dependency
+ groupIdorg.apache.maven/groupId
+ artifactIdmaven-toolchain/artifactId
+ version${mavenVersion}/version
+/dependency
dependency
groupIdjunit/groupId
Modified:
maven/shared/trunk/maven-jarsigner/src/main/java/org/apache/maven/shared/jarsigner/AbstractJarSignerRequest.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-jarsigner/src/main/java/org/apache/maven/shared/jarsigner/AbstractJarSignerRequest.java?rev=1541704r1=1541703r2=1541704view=diff
==
---
maven/shared/trunk/maven-jarsigner/src/main/java/org/apache/maven/shared/jarsigner/AbstractJarSignerRequest.java
(original)
+++
maven/shared/trunk/maven-jarsigner/src/main/java/org/apache/maven/shared/jarsigner/AbstractJarSignerRequest.java
Wed Nov 13 20:50:12 2013
@@ -19,7 +19,7 @@ package org.apache.maven.shared.jarsigne
* under the License.
*/
-import org.apache.maven.shared.utils.cli.StreamConsumer;
+import org.apache.maven.shared.utils.cli.javatool.AbstractJavaToolRequest;
import java.io.File;
@@ -31,6 +31,7 @@ import java.io.File;
* @since 1.0
*/
public abstract class AbstractJarSignerRequest
+extends AbstractJavaToolRequest
implements JarSignerRequest
{
/**
@@ -60,16 +61,6 @@ public abstract class AbstractJarSignerR
private File archive;
/**
- * Optional system out stream consumer used by the commandline execution.
- */
-private StreamConsumer systemOutStreamConsumer;
-
-/**
- * Optional system error stream consumer used by the commandline execution.
- */
-private StreamConsumer systemErrorStreamConsumer;
-
-/**
* See a
href=http://java.sun.com/javase/6/docs/technotes/tools/windows/jarsigner.html#Options;options/a.
*/
protected boolean protectedAuthenticationPath;
@@ -117,25 +108,9 @@ public abstract class AbstractJarSignerR
/**
* {@inheritDoc}
*/
-public StreamConsumer getSystemOutStreamConsumer()
-{
-return systemOutStreamConsumer;
-}
-
-/**
- * {@inheritDoc}
- */
-public StreamConsumer getSystemErrorStreamConsumer()
-{
-return systemErrorStreamConsumer;
-}
-
-/**
- * {@inheritDoc}
- */
public boolean isProtectedAuthenticationPath()
{
- return protectedAuthenticationPath;
+return protectedAuthenticationPath;
}
/**
@@ -181,24 +156,8 @@ public abstract class AbstractJarSignerR
/**
* {@inheritDoc}
*/
-public void setSystemOutStreamConsumer( StreamConsumer
systemOutStreamConsumer )
-{
-this.systemOutStreamConsumer = systemOutStreamConsumer;
-}
-
-/**
- * {@inheritDoc}
- */
-public void setSystemErrorStreamConsumer( StreamConsumer
systemErrorStreamConsumer )
-{
-this.systemErrorStreamConsumer = systemErrorStreamConsumer;
-}
-
-/**
- * {@inheritDoc}
- */
-public void
svn commit: r1541710 - in /maven/shared/trunk/maven-jarsigner/src: main/java/org/apache/maven/shared/jarsigner/ test/ test/java/org/apache/maven/shared/jarsigner/
Author: tchemit
Date: Wed Nov 13 21:01:00 2013
New Revision: 1541710
URL: http://svn.apache.org/r1541710
Log:
MSHARED-306 - keystore and alias parameters can be used for both sign and
verify jarsigner tool
+ add a little file in the jar to sign (jarsigner 1.7 consider it as not signer
if jar is empty)
Modified:
maven/shared/trunk/maven-jarsigner/src/main/java/org/apache/maven/shared/jarsigner/AbstractJarSignerRequest.java
maven/shared/trunk/maven-jarsigner/src/main/java/org/apache/maven/shared/jarsigner/JarSignerCommandLineBuilder.java
maven/shared/trunk/maven-jarsigner/src/main/java/org/apache/maven/shared/jarsigner/JarSignerRequest.java
maven/shared/trunk/maven-jarsigner/src/main/java/org/apache/maven/shared/jarsigner/JarSignerSignRequest.java
maven/shared/trunk/maven-jarsigner/src/test/java/org/apache/maven/shared/jarsigner/SimpleJarSignTest.java
maven/shared/trunk/maven-jarsigner/src/test/simple.jar
Modified:
maven/shared/trunk/maven-jarsigner/src/main/java/org/apache/maven/shared/jarsigner/AbstractJarSignerRequest.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-jarsigner/src/main/java/org/apache/maven/shared/jarsigner/AbstractJarSignerRequest.java?rev=1541710r1=1541709r2=1541710view=diff
==
---
maven/shared/trunk/maven-jarsigner/src/main/java/org/apache/maven/shared/jarsigner/AbstractJarSignerRequest.java
(original)
+++
maven/shared/trunk/maven-jarsigner/src/main/java/org/apache/maven/shared/jarsigner/AbstractJarSignerRequest.java
Wed Nov 13 21:01:00 2013
@@ -40,6 +40,16 @@ public abstract class AbstractJarSignerR
private boolean verbose;
/**
+ * See a
href=http://docs.oracle.com/javase/6/docs/technotes/tools/windows/jarsigner.html#Options;options/a.
+ */
+private String keystore;
+
+/**
+ * See a
href=http://docs.oracle.com/javase/6/docs/technotes/tools/windows/jarsigner.html#Options;options/a.
+ */
+private String alias;
+
+/**
* The maximum memory available to the JAR signer, e.g. code256M/code.
See a
*
href=http://docs.oracle.com/javase/6/docs/technotes/tools/windows/java.html#Xms;-Xmx/a
for more details.
*/
@@ -76,6 +86,22 @@ public abstract class AbstractJarSignerR
/**
* {@inheritDoc}
*/
+public String getKeystore()
+{
+return keystore;
+}
+
+/**
+ * {@inheritDoc}
+ */
+public String getAlias()
+{
+return alias;
+}
+
+/**
+ * {@inheritDoc}
+ */
public String getMaxMemory()
{
return maxMemory;
@@ -124,6 +150,22 @@ public abstract class AbstractJarSignerR
/**
* {@inheritDoc}
*/
+public void setKeystore( String keystore )
+{
+this.keystore = keystore;
+}
+
+/**
+ * {@inheritDoc}
+ */
+public void setAlias( String alias )
+{
+this.alias = alias;
+}
+
+/**
+ * {@inheritDoc}
+ */
public void setMaxMemory( String maxMemory )
{
this.maxMemory = maxMemory;
Modified:
maven/shared/trunk/maven-jarsigner/src/main/java/org/apache/maven/shared/jarsigner/JarSignerCommandLineBuilder.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-jarsigner/src/main/java/org/apache/maven/shared/jarsigner/JarSignerCommandLineBuilder.java?rev=1541710r1=1541709r2=1541710view=diff
==
---
maven/shared/trunk/maven-jarsigner/src/main/java/org/apache/maven/shared/jarsigner/JarSignerCommandLineBuilder.java
(original)
+++
maven/shared/trunk/maven-jarsigner/src/main/java/org/apache/maven/shared/jarsigner/JarSignerCommandLineBuilder.java
Wed Nov 13 21:01:00 2013
@@ -65,7 +65,14 @@ public class JarSignerCommandLineBuilder
cli.createArg().setValue( -verbose );
}
-if (request.isProtectedAuthenticationPath())
+String keystore = request.getKeystore();
+if ( !StringUtils.isEmpty( keystore ) )
+{
+cli.createArg().setValue( -keystore );
+cli.createArg().setValue( keystore );
+}
+
+if ( request.isProtectedAuthenticationPath() )
{
cli.createArg().setValue( -protected );
}
@@ -92,6 +99,14 @@ public class JarSignerCommandLineBuilder
build( (JarSignerVerifyRequest) request, cli );
}
+cli.createArg().setFile( request.getArchive() );
+
+String alias = request.getAlias();
+if ( !StringUtils.isEmpty( alias ) )
+{
+cli.createArg().setValue( alias );
+}
+
return cli;
}
@@ -121,13 +136,6 @@ public class JarSignerCommandLineBuilder
protected void build( JarSignerSignRequest request, Commandline cli )
{
-String keystore = request.getKeystore();
-if ( !StringUtils.isEmpty( keystore ) )
-{
-cli.createArg
svn commit: r1541717 - in /maven/plugins/trunk/maven-jarsigner-plugin: pom.xml src/main/java/org/apache/maven/plugins/jarsigner/AbstractJarsignerMojo.java
Author: tchemit
Date: Wed Nov 13 21:09:30 2013
New Revision: 1541717
URL: http://svn.apache.org/r1541717
Log:
MJARSIGNER-9 - Add toolchain in JarSignMojo.java#getJDKCommandExe()
Comment: need then to use the last version of maven-share-utils (with the
javatool api)
Modified:
maven/plugins/trunk/maven-jarsigner-plugin/pom.xml
maven/plugins/trunk/maven-jarsigner-plugin/src/main/java/org/apache/maven/plugins/jarsigner/AbstractJarsignerMojo.java
Modified: maven/plugins/trunk/maven-jarsigner-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jarsigner-plugin/pom.xml?rev=1541717r1=1541716r2=1541717view=diff
==
--- maven/plugins/trunk/maven-jarsigner-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-jarsigner-plugin/pom.xml Wed Nov 13 21:09:30 2013
@@ -96,7 +96,7 @@ under the License.
dependency
groupIdorg.apache.maven.shared/groupId
artifactIdmaven-shared-utils/artifactId
- version0.3/version
+ version0.5-SNAPSHOT/version
/dependency
dependency
groupIdorg.sonatype.plexus/groupId
Modified:
maven/plugins/trunk/maven-jarsigner-plugin/src/main/java/org/apache/maven/plugins/jarsigner/AbstractJarsignerMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jarsigner-plugin/src/main/java/org/apache/maven/plugins/jarsigner/AbstractJarsignerMojo.java?rev=1541717r1=1541716r2=1541717view=diff
==
---
maven/plugins/trunk/maven-jarsigner-plugin/src/main/java/org/apache/maven/plugins/jarsigner/AbstractJarsignerMojo.java
(original)
+++
maven/plugins/trunk/maven-jarsigner-plugin/src/main/java/org/apache/maven/plugins/jarsigner/AbstractJarsignerMojo.java
Wed Nov 13 21:09:30 2013
@@ -20,19 +20,22 @@ package org.apache.maven.plugins.jarsign
*/
import org.apache.maven.artifact.Artifact;
+import org.apache.maven.execution.MavenSession;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugins.annotations.Component;
import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.project.MavenProject;
import org.apache.maven.shared.jarsigner.JarSigner;
-import org.apache.maven.shared.jarsigner.JarSignerException;
import org.apache.maven.shared.jarsigner.JarSignerRequest;
import org.apache.maven.shared.jarsigner.JarSignerResult;
import org.apache.maven.shared.jarsigner.JarSignerUtil;
import org.apache.maven.shared.utils.StringUtils;
import org.apache.maven.shared.utils.cli.Commandline;
+import org.apache.maven.shared.utils.cli.javatool.JavaToolException;
import org.apache.maven.shared.utils.io.FileUtils;
+import org.apache.maven.toolchain.Toolchain;
+import org.apache.maven.toolchain.ToolchainManager;
import java.io.File;
import java.io.IOException;
@@ -182,11 +185,35 @@ public abstract class AbstractJarsignerM
@Component
private JarSigner jarSigner;
+/**
+ * The current build session instance. This is used for
+ * toolchain manager API calls.
+ *
+ * @since 1.3
+ */
+@Component
+private MavenSession session;
+
+/**
+ * To obtain a toolchain if possible.
+ *
+ * @since 1.3
+ */
+@Component
+private ToolchainManager toolchainManager;
+
public final void execute()
throws MojoExecutionException
{
if ( !this.skip )
{
+Toolchain toolchain = getToolchain();
+
+if ( toolchain != null )
+{
+jarSigner.setToolchain(toolchain);
+}
+
int processed = 0;
if ( this.archive != null )
@@ -414,7 +441,7 @@ public abstract class AbstractJarsignerM
}
}
-catch ( JarSignerException e )
+catch ( JavaToolException e )
{
throw new MojoExecutionException( getMessage(
commandLineException, e.getMessage() ), e );
}
@@ -456,4 +483,21 @@ public abstract class AbstractJarsignerM
return getMessage( key, new Object[]{ arg1, arg2 } );
}
+/**
+ * FIXME tchemit-20123-11-13, need to find out how to do this...
+ * TODO remove the part with ToolchainManager lookup once we depend on
+ * 2.0.9 (have it as prerequisite). Define as regular component field then.
+ *
+ * @return Toolchain instance
+ */
+private Toolchain getToolchain()
+{
+Toolchain tc = null;
+if ( toolchainManager != null )
+{
+tc = toolchainManager.getToolchainFromBuildContext( jdk, session
);
+}
+
+return tc;
+}
}
svn commit: r1541727 - in /maven/plugins/trunk/maven-jarsigner-plugin/src/main/java/org/apache/maven/plugins/jarsigner: AbstractJarsignerMojo.java JarsignerSignMojo.java JarsignerVerifyMojo.java
Author: tchemit
Date: Wed Nov 13 21:22:15 2013
New Revision: 1541727
URL: http://svn.apache.org/r1541727
Log:
MJARSIGNER-28 - verify mojo can also use keystore and alias parameters
Modified:
maven/plugins/trunk/maven-jarsigner-plugin/src/main/java/org/apache/maven/plugins/jarsigner/AbstractJarsignerMojo.java
maven/plugins/trunk/maven-jarsigner-plugin/src/main/java/org/apache/maven/plugins/jarsigner/JarsignerSignMojo.java
maven/plugins/trunk/maven-jarsigner-plugin/src/main/java/org/apache/maven/plugins/jarsigner/JarsignerVerifyMojo.java
Modified:
maven/plugins/trunk/maven-jarsigner-plugin/src/main/java/org/apache/maven/plugins/jarsigner/AbstractJarsignerMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jarsigner-plugin/src/main/java/org/apache/maven/plugins/jarsigner/AbstractJarsignerMojo.java?rev=1541727r1=1541726r2=1541727view=diff
==
---
maven/plugins/trunk/maven-jarsigner-plugin/src/main/java/org/apache/maven/plugins/jarsigner/AbstractJarsignerMojo.java
(original)
+++
maven/plugins/trunk/maven-jarsigner-plugin/src/main/java/org/apache/maven/plugins/jarsigner/AbstractJarsignerMojo.java
Wed Nov 13 21:22:15 2013
@@ -63,6 +63,12 @@ public abstract class AbstractJarsignerM
private boolean verbose;
/**
+ * See a
href=http://java.sun.com/javase/6/docs/technotes/tools/windows/jarsigner.html#Options;options/a.
+ */
+@Parameter( property = jarsigner.keystore )
+private String keystore;
+
+/**
* The maximum memory available to the JAR signer, e.g. code256M/code.
See a
*
href=http://java.sun.com/javase/6/docs/technotes/tools/windows/java.html#Xms;-Xmx/a
for more details.
*/
@@ -421,6 +427,7 @@ public abstract class AbstractJarsignerM
JarSignerRequest request = createRequest( archive );
request.setArchive( archive );
+request.setKeystore( keystore );
request.setWorkingDirectory( workingDirectory );
request.setMaxMemory( maxMemory );
request.setArguments( arguments );
Modified:
maven/plugins/trunk/maven-jarsigner-plugin/src/main/java/org/apache/maven/plugins/jarsigner/JarsignerSignMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jarsigner-plugin/src/main/java/org/apache/maven/plugins/jarsigner/JarsignerSignMojo.java?rev=1541727r1=1541726r2=1541727view=diff
==
---
maven/plugins/trunk/maven-jarsigner-plugin/src/main/java/org/apache/maven/plugins/jarsigner/JarsignerSignMojo.java
(original)
+++
maven/plugins/trunk/maven-jarsigner-plugin/src/main/java/org/apache/maven/plugins/jarsigner/JarsignerSignMojo.java
Wed Nov 13 21:22:15 2013
@@ -50,12 +50,6 @@ public class JarsignerSignMojo
/**
* See a
href=http://java.sun.com/javase/6/docs/technotes/tools/windows/jarsigner.html#Options;options/a.
*/
-@Parameter( property = jarsigner.keystore )
-private String keystore;
-
-/**
- * See a
href=http://java.sun.com/javase/6/docs/technotes/tools/windows/jarsigner.html#Options;options/a.
- */
@Parameter( property = jarsigner.storepass )
private String storepass;
@@ -171,7 +165,6 @@ public class JarsignerSignMojo
{
JarSignerSignRequest request = new JarSignerSignRequest();
request.setAlias( alias );
-request.setKeystore( keystore );
request.setProviderArg( providerArg );
request.setProviderClass( providerClass );
request.setProviderName( providerName );
Modified:
maven/plugins/trunk/maven-jarsigner-plugin/src/main/java/org/apache/maven/plugins/jarsigner/JarsignerVerifyMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jarsigner-plugin/src/main/java/org/apache/maven/plugins/jarsigner/JarsignerVerifyMojo.java?rev=1541727r1=1541726r2=1541727view=diff
==
---
maven/plugins/trunk/maven-jarsigner-plugin/src/main/java/org/apache/maven/plugins/jarsigner/JarsignerVerifyMojo.java
(original)
+++
maven/plugins/trunk/maven-jarsigner-plugin/src/main/java/org/apache/maven/plugins/jarsigner/JarsignerVerifyMojo.java
Wed Nov 13 21:22:15 2013
@@ -46,11 +46,18 @@ public class JarsignerVerifyMojo
private boolean certs;
/**
+ * See a
href=http://java.sun.com/javase/6/docs/technotes/tools/windows/jarsigner.html#Options;options/a.
+ */
+@Parameter( property = jarsigner.alias )
+private String alias;
+
+/**
* {@inheritDoc}
*/
protected JarSignerRequest createRequest( File archive )
{
JarSignerVerifyRequest request = new JarSignerVerifyRequest();
+request.setAlias( alias );
request.setCerts( certs );
return request;
}
svn commit: r1541731 - /maven/plugins/trunk/maven-jarsigner-plugin/src/main/java/org/apache/maven/plugins/jarsigner/AbstractJarsignerMojo.java
Author: tchemit Date: Wed Nov 13 21:28:28 2013 New Revision: 1541731 URL: http://svn.apache.org/r1541731 Log: MJARSIGNER-29 - verbose parameter is not filled in jarsigner requests Modified: maven/plugins/trunk/maven-jarsigner-plugin/src/main/java/org/apache/maven/plugins/jarsigner/AbstractJarsignerMojo.java Modified: maven/plugins/trunk/maven-jarsigner-plugin/src/main/java/org/apache/maven/plugins/jarsigner/AbstractJarsignerMojo.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jarsigner-plugin/src/main/java/org/apache/maven/plugins/jarsigner/AbstractJarsignerMojo.java?rev=1541731r1=1541730r2=1541731view=diff == --- maven/plugins/trunk/maven-jarsigner-plugin/src/main/java/org/apache/maven/plugins/jarsigner/AbstractJarsignerMojo.java (original) +++ maven/plugins/trunk/maven-jarsigner-plugin/src/main/java/org/apache/maven/plugins/jarsigner/AbstractJarsignerMojo.java Wed Nov 13 21:28:28 2013 @@ -426,6 +426,7 @@ public abstract class AbstractJarsignerM } JarSignerRequest request = createRequest( archive ); +request.setVerbose( verbose ); request.setArchive( archive ); request.setKeystore( keystore ); request.setWorkingDirectory( workingDirectory );
svn commit: r1541835 - in /maven/plugins/trunk/maven-jarsigner-plugin/src: it/verify-fail-if-not-signed/ main/java/org/apache/maven/plugins/jarsigner/ main/resources/
Author: tchemit Date: Thu Nov 14 06:29:17 2013 New Revision: 1541835 URL: http://svn.apache.org/r1541835 Log: MJARSIGNER-18 - Support for Jar plugin's errorWhenNotSigned option Added: maven/plugins/trunk/maven-jarsigner-plugin/src/it/verify-fail-if-not-signed/ maven/plugins/trunk/maven-jarsigner-plugin/src/it/verify-fail-if-not-signed/invoker.properties (with props) maven/plugins/trunk/maven-jarsigner-plugin/src/it/verify-fail-if-not-signed/pom.xml (with props) Modified: maven/plugins/trunk/maven-jarsigner-plugin/src/main/java/org/apache/maven/plugins/jarsigner/AbstractJarsignerMojo.java maven/plugins/trunk/maven-jarsigner-plugin/src/main/java/org/apache/maven/plugins/jarsigner/JarsignerVerifyMojo.java maven/plugins/trunk/maven-jarsigner-plugin/src/main/resources/jarsigner.properties maven/plugins/trunk/maven-jarsigner-plugin/src/main/resources/jarsigner_de.properties maven/plugins/trunk/maven-jarsigner-plugin/src/main/resources/jarsigner_fr.properties Added: maven/plugins/trunk/maven-jarsigner-plugin/src/it/verify-fail-if-not-signed/invoker.properties URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jarsigner-plugin/src/it/verify-fail-if-not-signed/invoker.properties?rev=1541835view=auto == --- maven/plugins/trunk/maven-jarsigner-plugin/src/it/verify-fail-if-not-signed/invoker.properties (added) +++ maven/plugins/trunk/maven-jarsigner-plugin/src/it/verify-fail-if-not-signed/invoker.properties Thu Nov 14 06:29:17 2013 @@ -0,0 +1,18 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# License); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +invoker.buildResult = failure Propchange: maven/plugins/trunk/maven-jarsigner-plugin/src/it/verify-fail-if-not-signed/invoker.properties -- svn:eol-style = native Propchange: maven/plugins/trunk/maven-jarsigner-plugin/src/it/verify-fail-if-not-signed/invoker.properties -- svn:keywords = Author Date Id Revision Added: maven/plugins/trunk/maven-jarsigner-plugin/src/it/verify-fail-if-not-signed/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jarsigner-plugin/src/it/verify-fail-if-not-signed/pom.xml?rev=1541835view=auto == --- maven/plugins/trunk/maven-jarsigner-plugin/src/it/verify-fail-if-not-signed/pom.xml (added) +++ maven/plugins/trunk/maven-jarsigner-plugin/src/it/verify-fail-if-not-signed/pom.xml Thu Nov 14 06:29:17 2013 @@ -0,0 +1,79 @@ +?xml version=1.0 encoding=UTF-8? + +!-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +License); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +-- + +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; + modelVersion4.0.0/modelVersion + + groupIdorg.apache.maven.its.jarsigner/groupId + artifactIdtest/artifactId + version1.0/version + + description +Tests that verification of a none signed JAR fails when having the errorWhenNotsigned flag to true (see MJARSIGNED-18). + /description + + properties +maven.test.skiptrue/maven.test.skip + + /properties + + build +plugins + plugin +groupIdorg.apache.maven.plugins/groupId +artifactIdmaven-compiler-plugin/artifactId +version2.0.2/version + /plugin
svn commit: r1551722 - in /maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/javatool: AbstractJavaTool.java AbstractJavaToolResult.java JavaTool.java JavaToolResul
Author: tchemit
Date: Tue Dec 17 21:29:15 2013
New Revision: 1551722
URL: http://svn.apache.org/r1551722
Log:
MSHARED-304 - Create a API for java tool
Simplify API ( move JavaToolResult contract to a simple Pojo )
Removed:
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/javatool/AbstractJavaToolResult.java
Modified:
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/javatool/AbstractJavaTool.java
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/javatool/JavaTool.java
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/javatool/JavaToolResult.java
Modified:
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/javatool/AbstractJavaTool.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/javatool/AbstractJavaTool.java?rev=1551722r1=1551721r2=1551722view=diff
==
---
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/javatool/AbstractJavaTool.java
(original)
+++
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/javatool/AbstractJavaTool.java
Tue Dec 17 21:29:15 2013
@@ -38,9 +38,9 @@ import java.util.Map;
* @author Tony Chemit che...@codelutin.com
* @since 0.5
*/
-public abstract class AbstractJavaToolRequest extends JavaToolRequest, Result
extends JavaToolResult
+public abstract class AbstractJavaToolRequest extends JavaToolRequest
extends AbstractLogEnabled
-implements JavaToolRequest, Result
+implements JavaToolRequest
{
/**
@@ -74,8 +74,6 @@ public abstract class AbstractJavaToolR
protected abstract Commandline createCommandLine( Request request, String
javaToolFile )
throws JavaToolException;
-protected abstract Result createResult();
-
/**
* {@inheritDoc}
*/
@@ -95,7 +93,7 @@ public abstract class AbstractJavaToolR
/**
* {@inheritDoc}
*/
-public Result execute( Request request )
+public JavaToolResult execute( Request request )
throws JavaToolException
{
@@ -118,7 +116,7 @@ public abstract class AbstractJavaToolR
Commandline cli = createCommandLine( request, javaToolFile );
// execute it
-Result result = executeCommandLine( cli, request );
+JavaToolResult result = executeCommandLine( cli, request );
// return result
return result;
@@ -141,14 +139,14 @@ public abstract class AbstractJavaToolR
return systemIn;
}
-protected Result executeCommandLine( Commandline cli, Request request )
+protected JavaToolResult executeCommandLine( Commandline cli, Request
request )
{
if ( getLogger().isDebugEnabled() )
{
getLogger().debug( Executing: + cli );
}
-Result result = createResult();
+JavaToolResult result = createResult();
result.setCommandline( cli );
@@ -218,6 +216,11 @@ public abstract class AbstractJavaToolR
return systemOut;
}
+protected JavaToolResult createResult()
+{
+return new JavaToolResult();
+}
+
protected String findJavaToolExecutable()
{
String command = javaToolName + ( Os.isFamily( Os.FAMILY_WINDOWS ) ?
.exe : );
Modified:
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/javatool/JavaTool.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/javatool/JavaTool.java?rev=1551722r1=1551721r2=1551722view=diff
==
---
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/javatool/JavaTool.java
(original)
+++
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/javatool/JavaTool.java
Tue Dec 17 21:29:15 2013
@@ -33,14 +33,14 @@ import org.apache.maven.toolchain.Toolch
* @author Tony Chemit che...@codelutin.com
* @since 0.5
*/
-public interface JavaToolRequest extends JavaToolRequest, Result extends
JavaToolResult
+public interface JavaToolRequest extends JavaToolRequest
{
/**
* Return the name of the java tool. This is exactly the name (without his
extension) of the executable to
* find in the {@code jdk/bin} directory.
* p/
- * For example: {@code jarsigner, keytoll, javadoc, ...}
+ * For example: {@code jarsigner, keytool, javadoc, ...}
*
* @return the name of the java tool.
*/
@@ -58,13 +58,13 @@ public interface JavaToolRequest extend
* p/
* If could not create the java tool invocation, a {@link
JavaToolException} will be thrown.
* p
svn commit: r1551725 - in /maven/shared/trunk/maven-jarsigner/src: main/java/org/apache/maven/shared/jarsigner/ test/java/org/apache/maven/shared/jarsigner/
Author: tchemit
Date: Tue Dec 17 21:37:16 2013
New Revision: 1551725
URL: http://svn.apache.org/r1551725
Log:
MSHARED-305 - Use maven-shared-utils javatool API
use the simplify API (no more specialized JarSignerResult, use instead the
simple JavaToolResult)
Removed:
maven/shared/trunk/maven-jarsigner/src/main/java/org/apache/maven/shared/jarsigner/DefaultJarSignerResult.java
maven/shared/trunk/maven-jarsigner/src/main/java/org/apache/maven/shared/jarsigner/JarSignerResult.java
Modified:
maven/shared/trunk/maven-jarsigner/src/main/java/org/apache/maven/shared/jarsigner/DefaultJarSigner.java
maven/shared/trunk/maven-jarsigner/src/main/java/org/apache/maven/shared/jarsigner/JarSigner.java
maven/shared/trunk/maven-jarsigner/src/test/java/org/apache/maven/shared/jarsigner/SimpleJarSignTest.java
Modified:
maven/shared/trunk/maven-jarsigner/src/main/java/org/apache/maven/shared/jarsigner/DefaultJarSigner.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-jarsigner/src/main/java/org/apache/maven/shared/jarsigner/DefaultJarSigner.java?rev=1551725r1=1551724r2=1551725view=diff
==
---
maven/shared/trunk/maven-jarsigner/src/main/java/org/apache/maven/shared/jarsigner/DefaultJarSigner.java
(original)
+++
maven/shared/trunk/maven-jarsigner/src/main/java/org/apache/maven/shared/jarsigner/DefaultJarSigner.java
Tue Dec 17 21:37:16 2013
@@ -34,7 +34,7 @@ import org.codehaus.plexus.component.ann
*/
@Component( role = JarSigner.class, hint = default )
public class DefaultJarSigner
-extends AbstractJavaToolJarSignerRequest, JarSignerResult
+extends AbstractJavaToolJarSignerRequest
implements JarSigner
{
@@ -44,12 +44,6 @@ public class DefaultJarSigner
}
@Override
-protected JarSignerResult createResult()
-{
-return new DefaultJarSignerResult();
-}
-
-@Override
protected Commandline createCommandLine( JarSignerRequest request, String
javaToolFile )
throws JavaToolException
{
Modified:
maven/shared/trunk/maven-jarsigner/src/main/java/org/apache/maven/shared/jarsigner/JarSigner.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-jarsigner/src/main/java/org/apache/maven/shared/jarsigner/JarSigner.java?rev=1551725r1=1551724r2=1551725view=diff
==
---
maven/shared/trunk/maven-jarsigner/src/main/java/org/apache/maven/shared/jarsigner/JarSigner.java
(original)
+++
maven/shared/trunk/maven-jarsigner/src/main/java/org/apache/maven/shared/jarsigner/JarSigner.java
Tue Dec 17 21:37:16 2013
@@ -29,7 +29,7 @@ import org.apache.maven.shared.utils.cli
* @since 1.0
*/
public interface JarSigner
-extends JavaToolJarSignerRequest, JarSignerResult
+extends JavaToolJarSignerRequest
{
}
Modified:
maven/shared/trunk/maven-jarsigner/src/test/java/org/apache/maven/shared/jarsigner/SimpleJarSignTest.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-jarsigner/src/test/java/org/apache/maven/shared/jarsigner/SimpleJarSignTest.java?rev=1551725r1=1551724r2=1551725view=diff
==
---
maven/shared/trunk/maven-jarsigner/src/test/java/org/apache/maven/shared/jarsigner/SimpleJarSignTest.java
(original)
+++
maven/shared/trunk/maven-jarsigner/src/test/java/org/apache/maven/shared/jarsigner/SimpleJarSignTest.java
Tue Dec 17 21:37:16 2013
@@ -18,6 +18,7 @@ package org.apache.maven.shared.jarsigne
* under the License.
*/
+import org.apache.maven.shared.utils.cli.javatool.JavaToolResult;
import org.codehaus.plexus.PlexusTestCase;
import org.apache.maven.shared.utils.io.FileUtils;
@@ -47,7 +48,7 @@ public class SimpleJarSignTest
JarSigner jarSigner = (JarSigner) lookup( JarSigner.class.getName() );
-JarSignerResult jarSignerResult = jarSigner.execute( jarSignerRequest
);
+JavaToolResult jarSignerResult = jarSigner.execute( jarSignerRequest );
assertEquals( not exit code 0 +
jarSignerResult.getExecutionException(), 0, jarSignerResult.getExitCode() );
@@ -70,7 +71,7 @@ public class SimpleJarSignTest
JarSigner jarSigner = (JarSigner) lookup( JarSigner.class.getName() );
-JarSignerResult jarSignerResult = jarSigner.execute( jarSignerRequest
);
+JavaToolResult jarSignerResult = jarSigner.execute( jarSignerRequest );
assertEquals( not exit code 0 +
jarSignerResult.getExecutionException(), 0, jarSignerResult.getExitCode() );
svn commit: r1551728 - /maven/plugins/trunk/maven-jarsigner-plugin/src/main/java/org/apache/maven/plugins/jarsigner/AbstractJarsignerMojo.java
Author: tchemit
Date: Tue Dec 17 21:41:45 2013
New Revision: 1551728
URL: http://svn.apache.org/r1551728
Log:
MJARSIGNER-27 - Use maven-jarsigner 1.2
Use simplify API
Modified:
maven/plugins/trunk/maven-jarsigner-plugin/src/main/java/org/apache/maven/plugins/jarsigner/AbstractJarsignerMojo.java
Modified:
maven/plugins/trunk/maven-jarsigner-plugin/src/main/java/org/apache/maven/plugins/jarsigner/AbstractJarsignerMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jarsigner-plugin/src/main/java/org/apache/maven/plugins/jarsigner/AbstractJarsignerMojo.java?rev=1551728r1=1551727r2=1551728view=diff
==
---
maven/plugins/trunk/maven-jarsigner-plugin/src/main/java/org/apache/maven/plugins/jarsigner/AbstractJarsignerMojo.java
(original)
+++
maven/plugins/trunk/maven-jarsigner-plugin/src/main/java/org/apache/maven/plugins/jarsigner/AbstractJarsignerMojo.java
Tue Dec 17 21:41:45 2013
@@ -28,11 +28,11 @@ import org.apache.maven.plugins.annotati
import org.apache.maven.project.MavenProject;
import org.apache.maven.shared.jarsigner.JarSigner;
import org.apache.maven.shared.jarsigner.JarSignerRequest;
-import org.apache.maven.shared.jarsigner.JarSignerResult;
import org.apache.maven.shared.jarsigner.JarSignerUtil;
import org.apache.maven.shared.utils.StringUtils;
import org.apache.maven.shared.utils.cli.Commandline;
import org.apache.maven.shared.utils.cli.javatool.JavaToolException;
+import org.apache.maven.shared.utils.cli.javatool.JavaToolResult;
import org.apache.maven.shared.utils.io.FileUtils;
import org.apache.maven.toolchain.Toolchain;
import org.apache.maven.toolchain.ToolchainManager;
@@ -436,7 +436,7 @@ public abstract class AbstractJarsignerM
try
{
-JarSignerResult result = jarSigner.execute( request );
+JavaToolResult result = jarSigner.execute( request );
Commandline commandLine = result.getCommandline();
svn commit: r1551758 - /maven/shared/trunk/maven-shared-utils/pom.xml
Author: tchemit Date: Tue Dec 17 23:39:09 2013 New Revision: 1551758 URL: http://svn.apache.org/r1551758 Log: [maven-release-plugin] prepare release maven-shared-utils-0.5 Modified: maven/shared/trunk/maven-shared-utils/pom.xml Modified: maven/shared/trunk/maven-shared-utils/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/pom.xml?rev=1551758r1=1551757r2=1551758view=diff == --- maven/shared/trunk/maven-shared-utils/pom.xml (original) +++ maven/shared/trunk/maven-shared-utils/pom.xml Tue Dec 17 23:39:09 2013 @@ -17,8 +17,7 @@ specific language governing permissions and limitations under the License. -- -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; modelVersion4.0.0/modelVersion parent @@ -29,7 +28,7 @@ /parent artifactIdmaven-shared-utils/artifactId - version0.5-SNAPSHOT/version + version0.5/version nameApache Maven Shared Utils/name descriptionShared utils without any further dependencies/description @@ -39,10 +38,10 @@ /prerequisites scm - connectionscm:svn:http://svn.apache.org/repos/asf/maven/shared/trunk/maven-shared-utils/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/shared/trunk/maven-shared-utils + connectionscm:svn:http://svn.apache.org/repos/asf/maven/shared/tags/maven-shared-utils-0.5/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/shared/tags/maven-shared-utils-0.5 /developerConnection - urlhttp://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/url + urlhttp://svn.apache.org/viewvc/maven/shared/tags/maven-shared-utils-0.5/url /scm issueManagement systemjira/system
svn commit: r1551760 - /maven/shared/tags/maven-shared-utils-0.5/
Author: tchemit Date: Tue Dec 17 23:40:32 2013 New Revision: 1551760 URL: http://svn.apache.org/r1551760 Log: [maven-release-plugin] copy for tag maven-shared-utils-0.5 Added: maven/shared/tags/maven-shared-utils-0.5/ - copied from r1551759, maven/shared/trunk/maven-shared-utils/
svn commit: r1551761 - /maven/shared/trunk/maven-shared-utils/pom.xml
Author: tchemit Date: Tue Dec 17 23:40:38 2013 New Revision: 1551761 URL: http://svn.apache.org/r1551761 Log: [maven-release-plugin] prepare for next development iteration Modified: maven/shared/trunk/maven-shared-utils/pom.xml Modified: maven/shared/trunk/maven-shared-utils/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/pom.xml?rev=1551761r1=1551760r2=1551761view=diff == --- maven/shared/trunk/maven-shared-utils/pom.xml (original) +++ maven/shared/trunk/maven-shared-utils/pom.xml Tue Dec 17 23:40:38 2013 @@ -28,7 +28,7 @@ /parent artifactIdmaven-shared-utils/artifactId - version0.5/version + version0.6-SNAPSHOT/version nameApache Maven Shared Utils/name descriptionShared utils without any further dependencies/description @@ -38,10 +38,10 @@ /prerequisites scm - connectionscm:svn:http://svn.apache.org/repos/asf/maven/shared/tags/maven-shared-utils-0.5/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/shared/tags/maven-shared-utils-0.5 + connectionscm:svn:http://svn.apache.org/repos/asf/maven/shared/trunk/maven-shared-utils/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/shared/trunk/maven-shared-utils /developerConnection - urlhttp://svn.apache.org/viewvc/maven/shared/tags/maven-shared-utils-0.5/url + urlhttp://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/url /scm issueManagement systemjira/system
svn commit: r1551773 - /maven/shared/trunk/maven-jarsigner/pom.xml
Author: tchemit Date: Wed Dec 18 00:13:49 2013 New Revision: 1551773 URL: http://svn.apache.org/r1551773 Log: [maven-release-plugin] prepare release maven-jarsigner-1.2 Modified: maven/shared/trunk/maven-jarsigner/pom.xml Modified: maven/shared/trunk/maven-jarsigner/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-jarsigner/pom.xml?rev=1551773r1=1551772r2=1551773view=diff == --- maven/shared/trunk/maven-jarsigner/pom.xml (original) +++ maven/shared/trunk/maven-jarsigner/pom.xml Wed Dec 18 00:13:49 2013 @@ -28,7 +28,7 @@ /parent artifactIdmaven-jarsigner/artifactId - version1.2-SNAPSHOT/version + version1.2/version nameApache Maven Jarsigner/name descriptionA component to assist in signing jars./description @@ -38,9 +38,9 @@ /prerequisites scm - connectionscm:svn:http://svn.apache.org/repos/asf/maven/shared/trunk/maven-jarsigner/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/shared/trunk/maven-jarsigner/developerConnection -urlhttp://svn.apache.org/viewvc/maven/shared/trunk/maven-jarsigner/url + connectionscm:svn:http://svn.apache.org/repos/asf/maven/shared/tags/maven-jarsigner-1.2/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/shared/tags/maven-jarsigner-1.2/developerConnection + urlhttp://svn.apache.org/viewvc/maven/shared/tags/maven-jarsigner-1.2/url /scm issueManagement systemjira/system @@ -62,7 +62,7 @@ dependency groupIdorg.apache.maven.shared/groupId artifactIdmaven-shared-utils/artifactId - version0.5-SNAPSHOT/version + version0.5/version /dependency dependency
svn commit: r1551776 - /maven/shared/trunk/maven-jarsigner/pom.xml
Author: tchemit Date: Wed Dec 18 00:14:03 2013 New Revision: 1551776 URL: http://svn.apache.org/r1551776 Log: [maven-release-plugin] prepare for next development iteration Modified: maven/shared/trunk/maven-jarsigner/pom.xml Modified: maven/shared/trunk/maven-jarsigner/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-jarsigner/pom.xml?rev=1551776r1=1551775r2=1551776view=diff == --- maven/shared/trunk/maven-jarsigner/pom.xml (original) +++ maven/shared/trunk/maven-jarsigner/pom.xml Wed Dec 18 00:14:03 2013 @@ -28,7 +28,7 @@ /parent artifactIdmaven-jarsigner/artifactId - version1.2/version + version1.3-SNAPSHOT/version nameApache Maven Jarsigner/name descriptionA component to assist in signing jars./description @@ -38,9 +38,9 @@ /prerequisites scm - connectionscm:svn:http://svn.apache.org/repos/asf/maven/shared/tags/maven-jarsigner-1.2/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/shared/tags/maven-jarsigner-1.2/developerConnection - urlhttp://svn.apache.org/viewvc/maven/shared/tags/maven-jarsigner-1.2/url + connectionscm:svn:http://svn.apache.org/repos/asf/maven/shared/trunk/maven-jarsigner/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/shared/trunk/maven-jarsigner/developerConnection +urlhttp://svn.apache.org/viewvc/maven/shared/trunk/maven-jarsigner/url /scm issueManagement systemjira/system
svn commit: r1551775 - /maven/shared/tags/maven-jarsigner-1.2/
Author: tchemit Date: Wed Dec 18 00:13:58 2013 New Revision: 1551775 URL: http://svn.apache.org/r1551775 Log: [maven-release-plugin] copy for tag maven-jarsigner-1.2 Added: maven/shared/tags/maven-jarsigner-1.2/ - copied from r1551773, maven/shared/trunk/maven-jarsigner/
svn commit: r890789 - in /websites/production/maven/content/shared-archives/maven-shared-utils-LATEST: ./ apidocs/ apidocs/org/ apidocs/org/apache/ apidocs/org/apache/maven/ apidocs/org/apache/maven/s
Author: tchemit Date: Wed Dec 18 00:29:12 2013 New Revision: 890789 Log: Site checkin for project Apache Maven Shared Utils [This commit notification would consist of 94 parts, which exceeds the limit of 50 ones, so it was shortened to the summary.]
svn commit: r1551783 - in /maven/shared/trunk/maven-jarsigner: pom.xml src/site/apt/index.apt.vm
Author: tchemit
Date: Wed Dec 18 00:50:16 2013
New Revision: 1551783
URL: http://svn.apache.org/r1551783
Log:
MSHARED-305 - Use maven-shared-utils javatool API
update docs + use maven-site-plugin 3.3 to generate site
Modified:
maven/shared/trunk/maven-jarsigner/pom.xml
maven/shared/trunk/maven-jarsigner/src/site/apt/index.apt.vm
Modified: maven/shared/trunk/maven-jarsigner/pom.xml
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-jarsigner/pom.xml?rev=1551783r1=1551782r2=1551783view=diff
==
--- maven/shared/trunk/maven-jarsigner/pom.xml (original)
+++ maven/shared/trunk/maven-jarsigner/pom.xml Wed Dec 18 00:50:16 2013
@@ -91,6 +91,17 @@
/dependencies
build
+!-- push back this in maven-shared-components 20 --
+pluginManagement
+ plugins
+plugin
+ groupIdorg.apache.maven.plugins/groupId
+ artifactIdmaven-site-plugin/artifactId
+ version3.3/version
+/plugin
+ /plugins
+/pluginManagement
+
plugins
plugin
groupIdorg.codehaus.plexus/groupId
Modified: maven/shared/trunk/maven-jarsigner/src/site/apt/index.apt.vm
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-jarsigner/src/site/apt/index.apt.vm?rev=1551783r1=1551782r2=1551783view=diff
==
--- maven/shared/trunk/maven-jarsigner/src/site/apt/index.apt.vm (original)
+++ maven/shared/trunk/maven-jarsigner/src/site/apt/index.apt.vm Wed Dec 18
00:50:16 2013
@@ -46,14 +46,14 @@ ${project.name}
+-
-JarSignerSignRequest jarSignerRequest = new JarSignerSignRequest();
-jarSignerRequest.setArchive( target );
-jarSignerRequest.setKeystore( src/test/keystore );
-jarSignerRequest.setVerbose( true );
-jarSignerRequest.setAlias( foo_alias );
-jarSignerRequest.setKeypass( key-passwd );
-jarSignerRequest.setStorepass( changeit );
-jarSignerRequest.setSignedjar( new File( target/ssimple.jar ) );
+JarSignerSignRequest request = new JarSignerSignRequest();
+request.setArchive( target );
+request.setKeystore( src/test/keystore );
+request.setVerbose( true );
+request.setAlias( foo_alias );
+request.setKeypass( key-passwd );
+request.setStorepass( changeit );
+request.setSignedjar( new File( target/ssimple.jar ) );
+-
@@ -61,11 +61,11 @@ ${project.name}
+-
-JarSignerResult jarSignerResult = jarSigner.execute( jarSignerRequest );
+JavaToolResult result = jarSigner.execute( jarSignerRequest );
// control the execution result
-jarSignerResult.getExitCode()
+result.getExitCode()
// get exception
-jarSignerResult.getExecutionException()
+result.getExecutionException()
+-
@@ -76,17 +76,19 @@ ${project.name}
+--
JarSignerVerifyRequest request = new JarSignerVerifyRequest();
request.setCerts( true );
+request.setKeystore( src/test/keystore );
request.setVerbose( true );
+request.setAlias( foo_alias );
request.setArchive( new File( target/ssimple.jar ) );
+--
Now you can use the component to verify your signe jar:
+--
-JarSignerResult jarSignerResult = jarSigner.execute( request );
+JavaToolResult result = jarSigner.execute( request );
// control the execution result
-jarSignerResult.getExitCode()
+result.getExitCode()
// get exception
-jarSignerResult.getExecutionException()
+result.getExecutionException()
+--
svn commit: r1551784 - /maven/shared/trunk/maven-jarsigner/pom.xml
Author: tchemit Date: Wed Dec 18 00:53:24 2013 New Revision: 1551784 URL: http://svn.apache.org/r1551784 Log: [maven-release-plugin] prepare release maven-jarsigner-1.2 Modified: maven/shared/trunk/maven-jarsigner/pom.xml Modified: maven/shared/trunk/maven-jarsigner/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-jarsigner/pom.xml?rev=1551784r1=1551783r2=1551784view=diff == --- maven/shared/trunk/maven-jarsigner/pom.xml (original) +++ maven/shared/trunk/maven-jarsigner/pom.xml Wed Dec 18 00:53:24 2013 @@ -28,7 +28,7 @@ /parent artifactIdmaven-jarsigner/artifactId - version1.3-SNAPSHOT/version + version1.2/version nameApache Maven Jarsigner/name descriptionA component to assist in signing jars./description @@ -38,9 +38,9 @@ /prerequisites scm - connectionscm:svn:http://svn.apache.org/repos/asf/maven/shared/trunk/maven-jarsigner/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/shared/trunk/maven-jarsigner/developerConnection -urlhttp://svn.apache.org/viewvc/maven/shared/trunk/maven-jarsigner/url + connectionscm:svn:http://svn.apache.org/repos/asf/maven/shared/tags/maven-jarsigner-1.2/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/shared/tags/maven-jarsigner-1.2/developerConnection + urlhttp://svn.apache.org/viewvc/maven/shared/tags/maven-jarsigner-1.2/url /scm issueManagement systemjira/system
svn commit: r1551786 - /maven/shared/tags/maven-jarsigner-1.2/
Author: tchemit Date: Wed Dec 18 00:55:14 2013 New Revision: 1551786 URL: http://svn.apache.org/r1551786 Log: remove bad release of maven-jarsigner-1.2 Removed: maven/shared/tags/maven-jarsigner-1.2/
svn commit: r1551787 - /maven/shared/tags/maven-jarsigner-1.2/
Author: tchemit Date: Wed Dec 18 00:55:31 2013 New Revision: 1551787 URL: http://svn.apache.org/r1551787 Log: [maven-release-plugin] copy for tag maven-jarsigner-1.2 Added: maven/shared/tags/maven-jarsigner-1.2/ - copied from r1551786, maven/shared/trunk/maven-jarsigner/
svn commit: r1551789 - /maven/shared/trunk/maven-jarsigner/pom.xml
Author: tchemit Date: Wed Dec 18 00:55:36 2013 New Revision: 1551789 URL: http://svn.apache.org/r1551789 Log: [maven-release-plugin] prepare for next development iteration Modified: maven/shared/trunk/maven-jarsigner/pom.xml Modified: maven/shared/trunk/maven-jarsigner/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-jarsigner/pom.xml?rev=1551789r1=1551788r2=1551789view=diff == --- maven/shared/trunk/maven-jarsigner/pom.xml (original) +++ maven/shared/trunk/maven-jarsigner/pom.xml Wed Dec 18 00:55:36 2013 @@ -28,7 +28,7 @@ /parent artifactIdmaven-jarsigner/artifactId - version1.2/version + version1.3-SNAPSHOT/version nameApache Maven Jarsigner/name descriptionA component to assist in signing jars./description @@ -38,9 +38,9 @@ /prerequisites scm - connectionscm:svn:http://svn.apache.org/repos/asf/maven/shared/tags/maven-jarsigner-1.2/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/shared/tags/maven-jarsigner-1.2/developerConnection - urlhttp://svn.apache.org/viewvc/maven/shared/tags/maven-jarsigner-1.2/url + connectionscm:svn:http://svn.apache.org/repos/asf/maven/shared/trunk/maven-jarsigner/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/shared/trunk/maven-jarsigner/developerConnection +urlhttp://svn.apache.org/viewvc/maven/shared/trunk/maven-jarsigner/url /scm issueManagement systemjira/system
svn commit: r890791 - in /websites/production/maven/content/shared-archives/maven-jarsigner-LATEST: index.html pmd.xml rat-report.html surefire-report.html
Author: tchemit
Date: Wed Dec 18 00:58:17 2013
New Revision: 890791
Log:
Site checkin for project Apache Maven Jarsigner
Modified:
websites/production/maven/content/shared-archives/maven-jarsigner-LATEST/index.html
websites/production/maven/content/shared-archives/maven-jarsigner-LATEST/pmd.xml
websites/production/maven/content/shared-archives/maven-jarsigner-LATEST/rat-report.html
websites/production/maven/content/shared-archives/maven-jarsigner-LATEST/surefire-report.html
Modified:
websites/production/maven/content/shared-archives/maven-jarsigner-LATEST/index.html
==
---
websites/production/maven/content/shared-archives/maven-jarsigner-LATEST/index.html
(original)
+++
websites/production/maven/content/shared-archives/maven-jarsigner-LATEST/index.html
Wed Dec 18 00:58:17 2013
@@ -213,23 +213,23 @@
pYou must construct a JarSignerSignRequest. See a
href=./apidocs/org/apache/maven/shared/jarsigner/JarSignerSignRequest.htmljavadoc/a
for more available options./p
div class=source
pre
-JarSignerSignRequest jarSignerRequest = new JarSignerSignRequest();
-jarSignerRequest.setArchive( target );
-jarSignerRequest.setKeystore( quot;src/test/keystorequot; );
-jarSignerRequest.setVerbose( true );
-jarSignerRequest.setAlias( quot;foo_aliasquot; );
-jarSignerRequest.setKeypass( quot;key-passwdquot; );
-jarSignerRequest.setStorepass( quot;changeitquot; );
-jarSignerRequest.setSignedjar( new File( quot;target/ssimple.jarquot; )
);
+JarSignerSignRequest request = new JarSignerSignRequest();
+request.setArchive( target );
+request.setKeystore( quot;src/test/keystorequot; );
+request.setVerbose( true );
+request.setAlias( quot;foo_aliasquot; );
+request.setKeypass( quot;key-passwdquot; );
+request.setStorepass( quot;changeitquot; );
+request.setSignedjar( new File( quot;target/ssimple.jarquot; ) );
/pre/div
pNow you can use the component to sign your jar:/p
div class=source
pre
-JarSignerResult jarSignerResult = jarSigner.execute( jarSignerRequest );
+JavaToolResult result = jarSigner.execute( jarSignerRequest );
// control the execution result
-jarSignerResult.getExitCode()
+result.getExitCode()
// get exception
-jarSignerResult.getExecutionException()
+result.getExecutionException()
/pre/div/div
div class=section
h3Verify a signed jara name=Verify_a_signed_jar/a/h3
@@ -237,15 +237,17 @@
div class=source
preJarSignerVerifyRequest request = new JarSignerVerifyRequest();
request.setCerts( true );
+request.setKeystore( quot;src/test/keystorequot; );
request.setVerbose( true );
+request.setAlias( quot;foo_aliasquot; );
request.setArchive( new File( quot;target/ssimple.jarquot; )
);/pre/div
pNow you can use the component to verify your signe jar:/p
div class=source
-preJarSignerResult jarSignerResult = jarSigner.execute( request );
+preJavaToolResult result = jarSigner.execute( request );
// control the execution result
-jarSignerResult.getExitCode()
+result.getExitCode()
// get exception
-jarSignerResult.getExecutionException()/pre/div/div/div
+result.getExecutionException()/pre/div/div/div
/div
/div
div class=clear
Modified:
websites/production/maven/content/shared-archives/maven-jarsigner-LATEST/pmd.xml
==
Binary files - no diff available.
Modified:
websites/production/maven/content/shared-archives/maven-jarsigner-LATEST/rat-report.html
==
---
websites/production/maven/content/shared-archives/maven-jarsigner-LATEST/rat-report.html
(original)
+++
websites/production/maven/content/shared-archives/maven-jarsigner-LATEST/rat-report.html
Wed Dec 18 00:58:17 2013
@@ -76,7 +76,7 @@
*
Summary
---
-Generated at: 2013-12-18T01:12:38+01:00
+Generated at: 2013-12-18T01:54:05+01:00
Notes: 1
Binaries: 1
Archives: 2
Modified:
websites/production/maven/content/shared-archives/maven-jarsigner-LATEST/surefire-report.html
==
---
websites/production/maven/content/shared-archives/maven-jarsigner-LATEST/surefire-report.html
(original)
+++
websites/production/maven/content/shared-archives/maven-jarsigner-LATEST/surefire-report.html
Wed Dec 18 00:58:17 2013
@@ -222,7 +222,7 @@ function toggleDisplay(elementId) {
td0/td
td0/td
td100%/td
-td2.034/td/tr/tablebr /
+td1.945/td/tr/tablebr /
pNote: failures are anticipated and checked for with assertions while errors
are unanticipated./pbr //div
div class=section
h2Package Lista name=Package_List/a/h2a name=Package_List/a
@@ -243,7 +243,7 @@ function toggleDisplay(elementId) {
td0/td
td0/td
td100%/td
svn commit: r891371 - /websites/production/maven/content/shared-archives/maven-shared-utils-0.5/
Author: tchemit Date: Sat Dec 21 17:54:30 2013 New Revision: 891371 Log: promote maven-shared-utils 0.5 release Added: websites/production/maven/content/shared-archives/maven-shared-utils-0.5/ - copied from r891370, websites/production/maven/content/shared-archives/maven-shared-utils-LATEST/
svn commit: r891372 - /websites/production/maven/content/shared/maven-shared-utils/
Author: tchemit Date: Sat Dec 21 17:56:32 2013 New Revision: 891372 Log: promote maven-shared-utils 0.5 release Removed: websites/production/maven/content/shared/maven-shared-utils/
svn commit: r891373 - /websites/production/maven/content/shared/maven-shared-utils/
Author: tchemit Date: Sat Dec 21 18:02:13 2013 New Revision: 891373 Log: promote maven-shared-utils 0.5 release Added: websites/production/maven/content/shared/maven-shared-utils/ - copied from r891372, websites/production/maven/content/shared-archives/maven-shared-utils-0.5/
svn commit: r891374 - /websites/production/maven/content/shared-archives/maven-jarsigner-1.2/
Author: tchemit Date: Sat Dec 21 18:04:32 2013 New Revision: 891374 Log: promote maven-jarsigner 1.2 release Added: websites/production/maven/content/shared-archives/maven-jarsigner-1.2/ - copied from r891373, websites/production/maven/content/shared-archives/maven-jarsigner-LATEST/
svn commit: r891375 - /websites/production/maven/content/shared/maven-jarsigner/
Author: tchemit Date: Sat Dec 21 18:05:29 2013 New Revision: 891375 Log: promote maven-jarsigner 1.2 release Removed: websites/production/maven/content/shared/maven-jarsigner/
svn commit: r891376 - /websites/production/maven/content/shared/maven-jarsigner/
Author: tchemit Date: Sat Dec 21 18:07:55 2013 New Revision: 891376 Log: promote maven-jarsigner 1.2 release Added: websites/production/maven/content/shared/maven-jarsigner/ - copied from r891375, websites/production/maven/content/shared-archives/maven-jarsigner-1.2/
svn commit: r1552931 - /maven/plugins/trunk/maven-jarsigner-plugin/pom.xml
Author: tchemit Date: Sat Dec 21 18:17:55 2013 New Revision: 1552931 URL: http://svn.apache.org/r1552931 Log: MJARSIGNER-27 - Use maven-jarsigner 1.2 Modified: maven/plugins/trunk/maven-jarsigner-plugin/pom.xml Modified: maven/plugins/trunk/maven-jarsigner-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jarsigner-plugin/pom.xml?rev=1552931r1=1552930r2=1552931view=diff == --- maven/plugins/trunk/maven-jarsigner-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-jarsigner-plugin/pom.xml Sat Dec 21 18:17:55 2013 @@ -107,7 +107,7 @@ under the License. dependency groupIdorg.apache.maven.shared/groupId artifactIdmaven-jarsigner/artifactId - version1.2-SNAPSHOT/version + version1.2/version /dependency /dependencies
svn commit: r1552932 - /maven/plugins/trunk/maven-jarsigner-plugin/pom.xml
Author: tchemit Date: Sat Dec 21 18:24:38 2013 New Revision: 1552932 URL: http://svn.apache.org/r1552932 Log: MJARSIGNER-31 - Update maven-shared-utils to 0.5 Modified: maven/plugins/trunk/maven-jarsigner-plugin/pom.xml Modified: maven/plugins/trunk/maven-jarsigner-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jarsigner-plugin/pom.xml?rev=1552932r1=1552931r2=1552932view=diff == --- maven/plugins/trunk/maven-jarsigner-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-jarsigner-plugin/pom.xml Sat Dec 21 18:24:38 2013 @@ -96,7 +96,7 @@ under the License. dependency groupIdorg.apache.maven.shared/groupId artifactIdmaven-shared-utils/artifactId - version0.5-SNAPSHOT/version + version0.5/version /dependency dependency groupIdorg.sonatype.plexus/groupId
svn commit: r1552959 - /maven/site/trunk/content/apt/shared/index.apt
Author: tchemit
Date: Sun Dec 22 00:18:17 2013
New Revision: 1552959
URL: http://svn.apache.org/r1552959
Log:
CMS commit to maven by tchemit
Modified:
maven/site/trunk/content/apt/shared/index.apt
Modified: maven/site/trunk/content/apt/shared/index.apt
URL:
http://svn.apache.org/viewvc/maven/site/trunk/content/apt/shared/index.apt?rev=1552959r1=1552958r2=1552959view=diff
==
--- maven/site/trunk/content/apt/shared/index.apt (original)
+++ maven/site/trunk/content/apt/shared/index.apt Sun Dec 22 00:18:17 2013
@@ -31,7 +31,7 @@ Shared Components
*+--+---+--++-+
| {{{/shared/maven-invoker/} maven-invoker}} |
2.1.1| 2012-11-12| Fires up a Maven build in a new JVM. |
{{{http://svn.apache.org/repos/asf/maven/shared/trunk/maven-invoker/}SVN}} |
{{{http://jira.codehaus.org/browse/MSHARED/component/13271}JIRA}}
*+--+---+--++-+
-| {{{/shared/maven-jarsigner/} maven-jarsigner}} |
1.1 | 2013-11-12| This component provides some utilities to
sign/verify jars/files in your Mojos. |
{{{http://svn.apache.org/repos/asf/maven/shared/trunk/maven-jarsigner/}SVN}} |
{{{http://jira.codehaus.org/browse/MSHARED/component/15255}JIRA}}
+| {{{/shared/maven-jarsigner/} maven-jarsigner}} |
1.2 | 2013-12-22| This component provides some utilities to
sign/verify jars/files in your Mojos. |
{{{http://svn.apache.org/repos/asf/maven/shared/trunk/maven-jarsigner/}SVN}} |
{{{http://jira.codehaus.org/browse/MSHARED/component/15255}JIRA}}
*+--+---+--++-+
| {{{/shared/maven-mapping/} maven-mapping}} |
1.0 | 2013-08-14| A shared component for all plugins that need
to do mapping. |
{{{http://svn.apache.org/repos/asf/maven/shared/trunk/maven-mapping/}SVN}} |
{{{http://jira.codehaus.org/browse/MSHARED/component/16150}JIRA}}
*+--+---+--++-+
@@ -53,7 +53,7 @@ Shared Components
*+--+---+--++-+
| {{{/shared/maven-shared-resources/} maven-shared-resources}} |
1| 2011-05-07| This is a collection of templates that are
specific to the Maven project. |
{{{http://svn.apache.org/repos/asf/maven/shared/trunk/maven-shared-resources/}SVN}}
| {{{http://jira.codehaus.org/browse/MSHARED/component/14715}JIRA}}
*+--+---+--++-+
-| {{{/shared/maven-shared-utils/} maven-shared-utils}} |
0.4 | 2013-04-10| Utilities functions for use within maven. |
{{{http://svn.apache.org/repos/asf/maven/shared/trunk/maven-shared-utils/}SVN}}
| {{{http://jira.codehaus.org/browse/MSHARED/component/15606}JIRA}}
+| {{{/shared/maven-shared-utils/} maven-shared-utils}} |
0.5 | 2013-12-22| Utilities functions for use within maven. |
{{{http://svn.apache.org/repos/asf/maven/shared/trunk/maven-shared-utils/}SVN}}
| {{{http://jira.codehaus.org/browse/MSHARED/component/15606}JIRA}}
*+--+---+--++-+
| {{{/shared/maven-verifier/} maven-verifier}} |
1.5 | 2013-12-06| Used to run Maven builds as part of tests. |
{{{http://svn.apache.org/repos/asf/maven/shared/trunk/maven-verifier/}SVN}} |
{{{http://jira.codehaus.org/browse/MSHARED/component/13281}JIRA}}
*+--+---+--++-+
svn commit: r891403 - in /websites/production/maven/content: ./ ant-tasks-archives/ ant-tasks/ apache-resource-bundles/ archetype-archives/ archetype/ core-its/ enforcer-archives/ enforcer/ jxr-archiv
Author: tchemit Date: Sun Dec 22 00:24:00 2013 New Revision: 891403 Log: maven-shared-utils 0.5 release maven-jarsigner 1.2 release Added: websites/production/maven/content/ - copied from r891401, websites/staging/maven/trunk/content/ websites/production/maven/content/ant-tasks/ - copied from r891402, websites/production/maven/content/ant-tasks/ websites/production/maven/content/ant-tasks-archives/ - copied from r891402, websites/production/maven/content/ant-tasks-archives/ websites/production/maven/content/apache-resource-bundles/ - copied from r891402, websites/production/maven/content/apache-resource-bundles/ websites/production/maven/content/archetype/ - copied from r891402, websites/production/maven/content/archetype/ websites/production/maven/content/archetype-archives/ - copied from r891402, websites/production/maven/content/archetype-archives/ websites/production/maven/content/core-its/ - copied from r891402, websites/production/maven/content/core-its/ websites/production/maven/content/enforcer/ - copied from r891402, websites/production/maven/content/enforcer/ websites/production/maven/content/enforcer-archives/ - copied from r891402, websites/production/maven/content/enforcer-archives/ websites/production/maven/content/jxr/ - copied from r891402, websites/production/maven/content/jxr/ websites/production/maven/content/jxr-archives/ - copied from r891402, websites/production/maven/content/jxr-archives/ websites/production/maven/content/maven-1.x/ - copied from r891402, websites/production/maven/content/maven-1.x/ websites/production/maven/content/maven-archetype-bundles/ - copied from r891402, websites/production/maven/content/maven-archetype-bundles/ websites/production/maven/content/maven-indexer/ - copied from r891402, websites/production/maven/content/maven-indexer/ websites/production/maven/content/maven-indexer-archives/ - copied from r891402, websites/production/maven/content/maven-indexer-archives/ websites/production/maven/content/maven-release/ - copied from r891402, websites/production/maven/content/maven-release/ websites/production/maven/content/maven-release-archives/ - copied from r891402, websites/production/maven/content/maven-release-archives/ websites/production/maven/content/plugin-testing/ - copied from r891402, websites/production/maven/content/plugin-testing/ websites/production/maven/content/plugin-testing-archives/ - copied from r891402, websites/production/maven/content/plugin-testing-archives/ websites/production/maven/content/plugin-tools/ - copied from r891402, websites/production/maven/content/plugin-tools/ websites/production/maven/content/plugin-tools-archives/ - copied from r891402, websites/production/maven/content/plugin-tools-archives/ websites/production/maven/content/plugins-archives/ - copied from r891402, websites/production/maven/content/plugins-archives/ websites/production/maven/content/plugins/maven-acr-plugin/ - copied from r891402, websites/production/maven/content/plugins/maven-acr-plugin/ websites/production/maven/content/plugins/maven-ant-plugin/ - copied from r891402, websites/production/maven/content/plugins/maven-ant-plugin/ websites/production/maven/content/plugins/maven-antrun-plugin/ - copied from r891402, websites/production/maven/content/plugins/maven-antrun-plugin/ websites/production/maven/content/plugins/maven-archetype-plugin/ - copied from r891402, websites/production/maven/content/plugins/maven-archetype-plugin/ websites/production/maven/content/plugins/maven-assembly-plugin/ - copied from r891402, websites/production/maven/content/plugins/maven-assembly-plugin/ websites/production/maven/content/plugins/maven-changelog-plugin/ - copied from r891402, websites/production/maven/content/plugins/maven-changelog-plugin/ websites/production/maven/content/plugins/maven-changes-plugin/ - copied from r891402, websites/production/maven/content/plugins/maven-changes-plugin/ websites/production/maven/content/plugins/maven-checkstyle-plugin/ - copied from r891402, websites/production/maven/content/plugins/maven-checkstyle-plugin/ websites/production/maven/content/plugins/maven-clean-plugin/ - copied from r891402, websites/production/maven/content/plugins/maven-clean-plugin/ websites/production/maven/content/plugins/maven-compiler-plugin/ - copied from r891402, websites/production/maven/content/plugins/maven-compiler-plugin/ websites/production/maven/content/plugins/maven-dependency-plugin/ - copied from r891402, websites/production/maven/content/plugins/maven-dependency-plugin/ websites/production/maven/content/plugins/maven-deploy-plugin/ - copied from r891402, websites/production/maven
svn commit: r1553841 - in /maven/shared/trunk/maven-jarsigner/src: main/java/org/apache/maven/shared/jarsigner/JarSignerUtil.java test/java/org/apache/maven/shared/jarsigner/JarSignerUtilTest.java
Author: tchemit
Date: Sat Dec 28 14:50:33 2013
New Revision: 1553841
URL: http://svn.apache.org/r1553841
Log:
MSHARED-314 - Unsign jar still have some signatures in the manisfest
Modified:
maven/shared/trunk/maven-jarsigner/src/main/java/org/apache/maven/shared/jarsigner/JarSignerUtil.java
maven/shared/trunk/maven-jarsigner/src/test/java/org/apache/maven/shared/jarsigner/JarSignerUtilTest.java
Modified:
maven/shared/trunk/maven-jarsigner/src/main/java/org/apache/maven/shared/jarsigner/JarSignerUtil.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-jarsigner/src/main/java/org/apache/maven/shared/jarsigner/JarSignerUtil.java?rev=1553841r1=1553840r2=1553841view=diff
==
---
maven/shared/trunk/maven-jarsigner/src/main/java/org/apache/maven/shared/jarsigner/JarSignerUtil.java
(original)
+++
maven/shared/trunk/maven-jarsigner/src/main/java/org/apache/maven/shared/jarsigner/JarSignerUtil.java
Sat Dec 28 14:50:33 2013
@@ -28,6 +28,9 @@ import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
+import java.util.Map;
+import java.util.jar.Attributes;
+import java.util.jar.Manifest;
import java.util.zip.ZipEntry;
import java.util.zip.ZipInputStream;
import java.util.zip.ZipOutputStream;
@@ -82,7 +85,7 @@ public class JarSignerUtil
* output JAR to retain as much metadata from the original JAR as possible.
*
* @param jarFile The JAR file to unsign, must not be codenull/code.
- * @throws java.io.IOException
+ * @throws IOException
*/
public static void unsignArchive( File jarFile )
throws IOException
@@ -107,6 +110,18 @@ public class JarSignerUtil
zos.putNextEntry( new ZipEntry( ze.getName() ) );
+if ( isManifestFile( ze.getName() ) )
+{
+
+// build a new manifest while removing all digest entries
+// see https://jira.codehaus.org/browse/MSHARED-314
+Manifest oldManifest = new Manifest( zis );
+Manifest newManifest = buildUnsignedManifest( oldManifest
);
+newManifest.write( zos );
+
+continue;
+}
+
IOUtil.copy( zis, zos );
}
@@ -122,11 +137,48 @@ public class JarSignerUtil
}
/**
+ * Build a new manifest from the given one removing any signing
information inside it.
+ *
+ * This is done by removing any attributes containing some digest
informations.
+ * If a entry has then no more attributes, then it will not be readd in
the result manifest.
+ *
+ * @param manifest manifest to clean
+ * @return the build manifest with no digest attributes
+ * @since 1.3
+ */
+protected static Manifest buildUnsignedManifest( Manifest manifest ) {
+
+Manifest result = new Manifest( manifest );
+result.getMainAttributes().clear();
+
+for ( Map.EntryString, Attributes entry :
manifest.getEntries().entrySet() )
+{
+Attributes oldAttributes = entry.getValue();
+Attributes newAttributes = new Attributes();
+for ( Map.EntryObject, Object objectEntry :
oldAttributes.entrySet() )
+{
+String attributeKey = String.valueOf( objectEntry.getKey() );
+if ( !attributeKey.contains( -Digest ) )
+{
+// can add this attribute
+newAttributes.put( objectEntry.getKey(),
objectEntry.getValue() );
+}
+}
+if ( !newAttributes.isEmpty() )
+{
+// can add this entry
+result.getEntries().put( entry.getKey(), newAttributes );
+}
+}
+return result;
+}
+
+/**
* Scans an archive for existing signatures.
*
* @param jarFile The archive to scan, must not be codenull/code.
* @return codetrue/code, if the archive contains at least one
signature file; codefalse/code, if the archive
- * does not contain any signature files.
+ * does not contain any signature files.
* @throws IOException if scanning codejarFile/code fails.
*/
public static boolean isArchiveSigned( final File jarFile )
@@ -183,7 +235,7 @@ public class JarSignerUtil
* @param entryName The name of the JAR file entry to check, must not be
codenull/code.
* @return codetrue/code if the entry is related to a signature,
codefalse/code otherwise.
*/
-private static boolean isSignatureFile( String entryName )
+protected static boolean isSignatureFile( String entryName )
{
boolean result = false;
if ( entryName.regionMatches( true, 0, META-INF, 0, 8 ) )
@@ -212,4 +264,22 @@ public class JarSignerUtil
}
return result
svn commit: r1553842 - /maven/plugins/trunk/maven-jarsigner-plugin/pom.xml
Author: tchemit Date: Sat Dec 28 15:00:16 2013 New Revision: 1553842 URL: http://svn.apache.org/r1553842 Log: MJARSIGNER-27 - Use maven-jarsigner 1.3 Modified: maven/plugins/trunk/maven-jarsigner-plugin/pom.xml Modified: maven/plugins/trunk/maven-jarsigner-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jarsigner-plugin/pom.xml?rev=1553842r1=1553841r2=1553842view=diff == --- maven/plugins/trunk/maven-jarsigner-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-jarsigner-plugin/pom.xml Sat Dec 28 15:00:16 2013 @@ -107,7 +107,7 @@ under the License. dependency groupIdorg.apache.maven.shared/groupId artifactIdmaven-jarsigner/artifactId - version1.2/version + version1.3-SNAPSHOT/version /dependency /dependencies
svn commit: r1553858 - in /maven/plugins/trunk/maven-jarsigner-plugin: pom.xml src/site/apt/usage.apt.vm
Author: tchemit
Date: Sat Dec 28 16:04:09 2013
New Revision: 1553858
URL: http://svn.apache.org/r1553858
Log:
MJARSIGNER-24 - Use Password Encryption in pom.xml
add doc + make site generation possible
Modified:
maven/plugins/trunk/maven-jarsigner-plugin/pom.xml
maven/plugins/trunk/maven-jarsigner-plugin/src/site/apt/usage.apt.vm
Modified: maven/plugins/trunk/maven-jarsigner-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jarsigner-plugin/pom.xml?rev=1553858r1=1553857r2=1553858view=diff
==
--- maven/plugins/trunk/maven-jarsigner-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-jarsigner-plugin/pom.xml Sat Dec 28 16:04:09 2013
@@ -116,6 +116,10 @@ under the License.
pluginManagement
plugins
+plugin!-- TODO: remove when upgrading to maven-plugins 25 --
+ artifactIdmaven-site-plugin/artifactId
+ version3.3/version
+/plugin
plugin
groupIdorg.apache.maven.plugins/groupId
artifactIdmaven-plugin-plugin/artifactId
Modified: maven/plugins/trunk/maven-jarsigner-plugin/src/site/apt/usage.apt.vm
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jarsigner-plugin/src/site/apt/usage.apt.vm?rev=1553858r1=1553857r2=1553858view=diff
==
--- maven/plugins/trunk/maven-jarsigner-plugin/src/site/apt/usage.apt.vm
(original)
+++ maven/plugins/trunk/maven-jarsigner-plugin/src/site/apt/usage.apt.vm Sat
Dec 28 16:04:09 2013
@@ -68,6 +68,11 @@ Usage
/project
+-+
+ Since version 1.3 you can encrypt keypass and storepass
using the
+ maven encryption mecanism.
+
+ See {{{Maven encryption
guide}http://maven.apache.org/guides/mini/guide-encryption.html}}.
+
* Verifying the signature of a project artifact and attachments
If you need to verify the signatures of a project artifact and all attached
@@ -118,3 +123,7 @@ mvn ... -Djarsigner.skip=true
+-+
For full documentation, please see the respective {{{./plugin-info.html}goal
documentation}}.
+
+* How to use encrypted password
+
+ Since version 1.3, you can pass to the plugin some password encrypted by the
maven encryption mecanism.
svn commit: r1553860 - /maven/plugins/trunk/maven-jarsigner-plugin/pom.xml
Author: tchemit
Date: Sat Dec 28 16:07:40 2013
New Revision: 1553860
URL: http://svn.apache.org/r1553860
Log:
MJARSIGNER-32 - Update requirements to maven 2.1.0
Modified:
maven/plugins/trunk/maven-jarsigner-plugin/pom.xml
Modified: maven/plugins/trunk/maven-jarsigner-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jarsigner-plugin/pom.xml?rev=1553860r1=1553859r2=1553860view=diff
==
--- maven/plugins/trunk/maven-jarsigner-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-jarsigner-plugin/pom.xml Sat Dec 28 16:07:40 2013
@@ -66,7 +66,7 @@ under the License.
/distributionManagement
properties
-mavenVersion2.0.6/mavenVersion
+mavenVersion2.1.0/mavenVersion
mavenPluginPluginVersion3.2/mavenPluginPluginVersion
maven.site.pathplugins-archives/${project.artifactId}-LATEST/maven.site.path
/properties
svn commit: r1553915 - /maven/plugins/trunk/maven-jarsigner-plugin/src/site/fml/faq.fml
Author: tchemit Date: Sat Dec 28 20:58:35 2013 New Revision: 1553915 URL: http://svn.apache.org/r1553915 Log: MJARSIGNER-13 - signing in multi-module project fails on windows Modified: maven/plugins/trunk/maven-jarsigner-plugin/src/site/fml/faq.fml Modified: maven/plugins/trunk/maven-jarsigner-plugin/src/site/fml/faq.fml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jarsigner-plugin/src/site/fml/faq.fml?rev=1553915r1=1553914r2=1553915view=diff == --- maven/plugins/trunk/maven-jarsigner-plugin/src/site/fml/faq.fml (original) +++ maven/plugins/trunk/maven-jarsigner-plugin/src/site/fml/faq.fml Sat Dec 28 20:58:35 2013 @@ -57,5 +57,16 @@ under the License. /p /answer /faq + faq id=sign_and_assembly +questionWhy if I want to sign an artifact and then assembly there is some problem under windows?/question +answer + p +To fix the problem, just move the assembly execution so it comes strongafter/strong the jarsigner execution in the pom. + /p + p + The hole story of the problem can be found in a href=http://jira.codehaus.org/browse/MJARSIGNER-13;MJARSIGNER-13/a issue. + /p +/answer + /faq /part /faqs
