svn commit: r816990 - /maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/PluginManagementReportTest.java
Author: olamy Date: Sun Sep 20 07:48:12 2009 New Revision: 816990 URL: http://svn.apache.org/viewvc?rev=816990view=rev Log: fix junit Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/PluginManagementReportTest.java Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/PluginManagementReportTest.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/PluginManagementReportTest.java?rev=816990r1=816989r2=816990view=diff == --- maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/PluginManagementReportTest.java (original) +++ maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/PluginManagementReportTest.java Sun Sep 20 07:48:12 2009 @@ -72,7 +72,7 @@ assertEquals( webTables.length, 1 ); assertEquals( webTables[0].getColumnCount(), 3 ); -assertEquals( webTables[0].getRowCount(), 1 + getTestMavenProject().getPluginManagement().getPlugins().size() ); +assertEquals( 3, webTables[0].getRowCount() ); // Test the texts TextBlock[] textBlocks = response.getTextBlocks();
svn commit: r817008 - /maven/plugins/trunk/maven-ear-plugin/src/it/jboss/pom.xml
Author: bentmann Date: Sun Sep 20 11:06:00 2009 New Revision: 817008 URL: http://svn.apache.org/viewvc?rev=817008view=rev Log: o Fixed IT Modified: maven/plugins/trunk/maven-ear-plugin/src/it/jboss/pom.xml Modified: maven/plugins/trunk/maven-ear-plugin/src/it/jboss/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/it/jboss/pom.xml?rev=817008r1=817007r2=817008view=diff == --- maven/plugins/trunk/maven-ear-plugin/src/it/jboss/pom.xml (original) +++ maven/plugins/trunk/maven-ear-plugin/src/it/jboss/pom.xml Sun Sep 20 11:06:00 2009 @@ -35,7 +35,7 @@ plugin groupIdorg.apache.maven.plugins/groupId artifactIdmaven-ear-plugin/artifactId -version2.3.3-SNAPSHOT/version +version@project.version@/version configuration generateApplicationXmltrue/generateApplicationXml jboss
svn commit: r817011 - in /maven/plugins/trunk/maven-invoker-plugin/src: main/java/org/apache/maven/plugin/invoker/InvokerReport.java site/apt/examples/integration-test-verify.apt.vm site/apt/index.apt
Author: bentmann
Date: Sun Sep 20 11:52:30 2009
New Revision: 817011
URL: http://svn.apache.org/viewvc?rev=817011view=rev
Log:
o Polished site
Modified:
maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InvokerReport.java
maven/plugins/trunk/maven-invoker-plugin/src/site/apt/examples/integration-test-verify.apt.vm
maven/plugins/trunk/maven-invoker-plugin/src/site/apt/index.apt
maven/plugins/trunk/maven-invoker-plugin/src/site/fml/faq.fml
Modified:
maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InvokerReport.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InvokerReport.java?rev=817011r1=817010r2=817011view=diff
==
---
maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InvokerReport.java
(original)
+++
maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InvokerReport.java
Sun Sep 20 11:52:30 2009
@@ -57,7 +57,7 @@
/**
* The Maven Project.
*
- * @parameter expression=${project}
+ * @parameter default-value=${project}
* @required
* @readonly
*/
@@ -82,7 +82,7 @@
* the command line. 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}
+ * @parameter default-value=${project.reporting.outputDirectory}
* @required
*/
protected File outputDirectory;
Modified:
maven/plugins/trunk/maven-invoker-plugin/src/site/apt/examples/integration-test-verify.apt.vm
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/site/apt/examples/integration-test-verify.apt.vm?rev=817011r1=817010r2=817011view=diff
==
---
maven/plugins/trunk/maven-invoker-plugin/src/site/apt/examples/integration-test-verify.apt.vm
(original)
+++
maven/plugins/trunk/maven-invoker-plugin/src/site/apt/examples/integration-test-verify.apt.vm
Sun Sep 20 11:52:30 2009
@@ -30,7 +30,7 @@
If you are using other integration test frameworks, or if you need to setup
an integration test enviroment prior to
test execution and tear that envronment down afterwards, then you need to
use the invoker:integration-test and
- invoker:verify goals in place of invoker:run. For example:
+ invoker:verify goals in place of invoker:run. For example:
+
project
Modified: maven/plugins/trunk/maven-invoker-plugin/src/site/apt/index.apt
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/site/apt/index.apt?rev=817011r1=817010r2=817011view=diff
==
--- maven/plugins/trunk/maven-invoker-plugin/src/site/apt/index.apt (original)
+++ maven/plugins/trunk/maven-invoker-plugin/src/site/apt/index.apt Sun Sep 20
11:52:30 2009
@@ -36,18 +36,24 @@
* Goals Overview
- The Invoker Plugin has two goals:
+ The plugin has four goals meant to participate in the default build
lifecycle:
- * {{{./install-mojo.html}invoker:install}} copies the project artifacts of
the main build into the local repository to
-prepare the execution of the selected sub projects.
-
- * {{{./run-mojo.html}invoker:run}} runs a set of Maven projects in a
directory and verifies the result (this is
-equivalent to running both invoker:integration-test and
invoker:verify).
+ * {{{./install-mojo.html}invoker:install}} copies the project artifacts and
dependencies of the main build into a
+dedicated local repository to prepare the execution of the selected sub
projects in an isolated environment.
* {{{./integration-test-mojo.html}invoker:integration-test}} runs a set of
Maven projects in a directory.
* {{{./verify-mojo.html}invoker:verify}} verifies the result of
invoker:integration-test.
+ * {{{./run-mojo.html}invoker:run}} runs a set of Maven projects in a
directory and verifies the result. This is
+equivalent to running both invoker:integration-test and
invoker:verify.
+
+ []
+
+ This last goal is intended for usage with the site lifecycle:
+
+ * {{{./report-mojo.html}invoker:report}} integrates the results from
previous builds into the site.
+
[]
* Usage
Modified: maven/plugins/trunk/maven-invoker-plugin/src/site/fml/faq.fml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/site/fml/faq.fml?rev=817011r1=817010r2=817011view=diff
==
--- maven/plugins/trunk/maven-invoker-plugin/src/site/fml/faq.fml (original)
+++ maven/plugins/trunk/maven-invoker-plugin/src/site/fml/faq.fml Sun Sep 20
svn commit: r817016 - /maven/plugins/trunk/maven-invoker-plugin/src/it/local-repo-path/pom.xml
Author: bentmann Date: Sun Sep 20 12:27:29 2009 New Revision: 817016 URL: http://svn.apache.org/viewvc?rev=817016view=rev Log: o Stabilized IT Modified: maven/plugins/trunk/maven-invoker-plugin/src/it/local-repo-path/pom.xml Modified: maven/plugins/trunk/maven-invoker-plugin/src/it/local-repo-path/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/it/local-repo-path/pom.xml?rev=817016r1=817015r2=817016view=diff == --- maven/plugins/trunk/maven-invoker-plugin/src/it/local-repo-path/pom.xml (original) +++ maven/plugins/trunk/maven-invoker-plugin/src/it/local-repo-path/pom.xml Sun Sep 20 12:27:29 2009 @@ -40,7 +40,7 @@ plugin !-- This triggers the download of a known version of this plugin which can then be safely invoked by the IT project -- groupIdorg.apache.maven.plugins/groupId -artifactIdmaven-resources-plugin/artifactId +artifactIdmaven-clean-plugin/artifactId version2.2/version /plugin plugin @@ -54,7 +54,7 @@ /pomIncludes settingsFilesrc/it/settings.xml/settingsFile goals - goalorg.apache.maven.plugins:maven-resources-plugin:2.2:resources/goal +goalorg.apache.maven.plugins:maven-clean-plugin:2.2:clean/goal /goals /configuration executions
svn commit: r817018 - /maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ProjectInfoReportUtils.java
Author: olamy
Date: Sun Sep 20 12:30:57 2009
New Revision: 817018
URL: http://svn.apache.org/viewvc?rev=817018view=rev
Log:
fix junit (prevent NPE in core)
Modified:
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ProjectInfoReportUtils.java
Modified:
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ProjectInfoReportUtils.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ProjectInfoReportUtils.java?rev=817018r1=817017r2=817018view=diff
==
---
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ProjectInfoReportUtils.java
(original)
+++
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ProjectInfoReportUtils.java
Sun Sep 20 12:30:57 2009
@@ -24,6 +24,7 @@
import java.net.Authenticator;
import java.net.PasswordAuthentication;
import java.net.URL;
+import java.util.Collections;
import java.util.List;
import java.util.Properties;
@@ -168,8 +169,10 @@
}
try
{
-MavenProject pluginProject =
mavenProjectBuilder.buildFromRepository( copyArtifact, remoteRepositories,
-
localRepository );
+MavenProject pluginProject =
+mavenProjectBuilder.buildFromRepository( copyArtifact,
+ remoteRepositories ==
null ? Collections.EMPTY_LIST
+ :
remoteRepositories, localRepository );
if ( isArtifactUrlValid( pluginProject.getUrl() ) )
{
svn commit: r817032 - in /maven/shared/trunk/maven-invoker: pom.xml src/main/assembly/ src/main/assembly/source-release.xml
Author: bentmann
Date: Sun Sep 20 14:00:41 2009
New Revision: 817032
URL: http://svn.apache.org/viewvc?rev=817032view=rev
Log:
o Added an assembly descriptor that produces a proper source distro
Added:
maven/shared/trunk/maven-invoker/src/main/assembly/ (with props)
maven/shared/trunk/maven-invoker/src/main/assembly/source-release.xml
- copied, changed from r817018,
maven/resources/trunk/apache-source-release-assembly-descriptor/src/main/resources/assemblies/source-release.xml
Modified:
maven/shared/trunk/maven-invoker/pom.xml
Modified: maven/shared/trunk/maven-invoker/pom.xml
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-invoker/pom.xml?rev=817032r1=817031r2=817032view=diff
==
--- maven/shared/trunk/maven-invoker/pom.xml (original)
+++ maven/shared/trunk/maven-invoker/pom.xml Sun Sep 20 14:00:41 2009
@@ -116,5 +116,36 @@
/plugins
/reporting
/profile
+profile
+ idapache-release/id
+ build
+plugins
+ plugin
+artifactIdmaven-assembly-plugin/artifactId
+executions
+ execution
+idsource-release-assembly/id
+configuration
+ skipAssemblytrue/skipAssembly
+/configuration
+ /execution
+ execution
+idsource-release-assembly-fixed/id
+phasepackage/phase
+goals
+ goalsingle/goal
+/goals
+configuration
+ descriptors
+
descriptorsrc/main/assembly/source-release.xml/descriptor
+ /descriptors
+ tarLongFileFormatgnu/tarLongFileFormat
+/configuration
+ /execution
+/executions
+ /plugin
+/plugins
+ /build
+/profile
/profiles
/project
Propchange: maven/shared/trunk/maven-invoker/src/main/assembly/
--
--- bugtraq:logregex (added)
+++ bugtraq:logregex Sun Sep 20 14:00:41 2009
@@ -0,0 +1 @@
+MSHARED-\d+
Propchange: maven/shared/trunk/maven-invoker/src/main/assembly/
--
bugtraq:url = http://jira.codehaus.org/browse/%BUGID%
Copied: maven/shared/trunk/maven-invoker/src/main/assembly/source-release.xml
(from r817018,
maven/resources/trunk/apache-source-release-assembly-descriptor/src/main/resources/assemblies/source-release.xml)
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-invoker/src/main/assembly/source-release.xml?p2=maven/shared/trunk/maven-invoker/src/main/assembly/source-release.xmlp1=maven/resources/trunk/apache-source-release-assembly-descriptor/src/main/resources/assemblies/source-release.xmlr1=817018r2=817032rev=817032view=diff
==
---
maven/resources/trunk/apache-source-release-assembly-descriptor/src/main/resources/assemblies/source-release.xml
(original)
+++ maven/shared/trunk/maven-invoker/src/main/assembly/source-release.xml Sun
Sep 20 14:00:41 2009
@@ -31,7 +31,11 @@
useDefaultExcludestrue/useDefaultExcludes
excludes
!-- build output --
-exclude%regex[(?!.*src/).*${project.build.directory}.*]/exclude
+!--
+NOTE: The apache-source-release-assembly-descriptor:1.0 includes stuff
from target/ so we're back to a
+hand-crafted assembly descriptor.
+--
+exclude${project.build.directory}/**/exclude
!-- NOTE: Most of the following excludes should not be required
if the standard release process is followed. This is because the
svn commit: r817033 - /maven/shared/trunk/maven-invoker/pom.xml
Author: bentmann Date: Sun Sep 20 14:07:46 2009 New Revision: 817033 URL: http://svn.apache.org/viewvc?rev=817033view=rev Log: [maven-release-plugin] prepare release maven-invoker-2.0.11 Modified: maven/shared/trunk/maven-invoker/pom.xml Modified: maven/shared/trunk/maven-invoker/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-invoker/pom.xml?rev=817033r1=817032r2=817033view=diff == --- maven/shared/trunk/maven-invoker/pom.xml (original) +++ maven/shared/trunk/maven-invoker/pom.xml Sun Sep 20 14:07:46 2009 @@ -19,7 +19,7 @@ under the License. -- -project 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' xmlns='http://maven.apache.org/POM/4.0.0' +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,15 +29,15 @@ /parent artifactIdmaven-invoker/artifactId - version2.0.11-SNAPSHOT/version + version2.0.11/version nameMaven Invoker/name descriptionA component to programmatically invoke Maven./description scm - connectionscm:svn:http://svn.apache.org/repos/asf/maven/shared/trunk/maven-invoker/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/shared/trunk/maven-invoker/developerConnection -urlhttp://svn.apache.org/viewvc/maven/shared/trunk/maven-invoker/url + connectionscm:svn:http://svn.apache.org/repos/asf/maven/shared/tags/maven-invoker-2.0.11/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/shared/tags/maven-invoker-2.0.11/developerConnection + urlhttp://svn.apache.org/viewvc/maven/shared/tags/maven-invoker-2.0.11/url /scm issueManagement systemjira/system
svn commit: r817034 - /maven/shared/tags/maven-invoker-2.0.11/
Author: bentmann Date: Sun Sep 20 14:08:08 2009 New Revision: 817034 URL: http://svn.apache.org/viewvc?rev=817034view=rev Log: [maven-scm] copy for tag maven-invoker-2.0.11 Added: maven/shared/tags/maven-invoker-2.0.11/ - copied from r817033, maven/shared/trunk/maven-invoker/
svn commit: r817035 - /maven/shared/trunk/maven-invoker/pom.xml
Author: bentmann Date: Sun Sep 20 14:08:22 2009 New Revision: 817035 URL: http://svn.apache.org/viewvc?rev=817035view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: maven/shared/trunk/maven-invoker/pom.xml Modified: maven/shared/trunk/maven-invoker/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-invoker/pom.xml?rev=817035r1=817034r2=817035view=diff == --- maven/shared/trunk/maven-invoker/pom.xml (original) +++ maven/shared/trunk/maven-invoker/pom.xml Sun Sep 20 14:08:22 2009 @@ -29,15 +29,15 @@ /parent artifactIdmaven-invoker/artifactId - version2.0.11/version + version2.0.12-SNAPSHOT/version nameMaven Invoker/name descriptionA component to programmatically invoke Maven./description scm - connectionscm:svn:http://svn.apache.org/repos/asf/maven/shared/tags/maven-invoker-2.0.11/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/shared/tags/maven-invoker-2.0.11/developerConnection - urlhttp://svn.apache.org/viewvc/maven/shared/tags/maven-invoker-2.0.11/url + connectionscm:svn:http://svn.apache.org/repos/asf/maven/shared/trunk/maven-invoker/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/shared/trunk/maven-invoker/developerConnection +urlhttp://svn.apache.org/viewvc/maven/shared/trunk/maven-invoker/url /scm issueManagement systemjira/system
svn commit: r817038 - /maven/plugins/trunk/maven-invoker-plugin/pom.xml
Author: bentmann Date: Sun Sep 20 14:57:16 2009 New Revision: 817038 URL: http://svn.apache.org/viewvc?rev=817038view=rev Log: o Updated to maven-invoker:2.0.11 Modified: maven/plugins/trunk/maven-invoker-plugin/pom.xml Modified: maven/plugins/trunk/maven-invoker-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/pom.xml?rev=817038r1=817037r2=817038view=diff == --- maven/plugins/trunk/maven-invoker-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-invoker-plugin/pom.xml Sun Sep 20 14:57:16 2009 @@ -62,7 +62,7 @@ dependency groupIdorg.apache.maven.shared/groupId artifactIdmaven-invoker/artifactId - version2.0.11-SNAPSHOT/version + version2.0.11/version /dependency dependency groupIdorg.apache.maven/groupId
svn commit: r817039 - /maven/plugins/trunk/maven-invoker-plugin/pom.xml
Author: bentmann Date: Sun Sep 20 15:08:54 2009 New Revision: 817039 URL: http://svn.apache.org/viewvc?rev=817039view=rev Log: [maven-release-plugin] prepare release maven-invoker-plugin-1.4 Modified: maven/plugins/trunk/maven-invoker-plugin/pom.xml Modified: maven/plugins/trunk/maven-invoker-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/pom.xml?rev=817039r1=817038r2=817039view=diff == --- maven/plugins/trunk/maven-invoker-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-invoker-plugin/pom.xml Sun Sep 20 15:08:54 2009 @@ -19,7 +19,7 @@ under the License. -- -project 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' xmlns='http://maven.apache.org/POM/4.0.0' +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 +29,7 @@ /parent artifactIdmaven-invoker-plugin/artifactId - version1.4-SNAPSHOT/version + version1.4/version packagingmaven-plugin/packaging nameMaven Invoker Plugin/name @@ -43,9 +43,9 @@ /prerequisites scm - connectionscm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-invoker-plugin//connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-invoker-plugin//developerConnection - urlhttp://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin//url + connectionscm:svn:http://svn.apache.org/repos/asf/maven/plugins/tags/maven-invoker-plugin-1.4/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-invoker-plugin-1.4/developerConnection + urlhttp://svn.apache.org/viewvc/maven/plugins/tags/maven-invoker-plugin-1.4/url /scm issueManagement systemjira/system
svn commit: r817040 - /maven/plugins/tags/maven-invoker-plugin-1.4/
Author: bentmann Date: Sun Sep 20 15:09:26 2009 New Revision: 817040 URL: http://svn.apache.org/viewvc?rev=817040view=rev Log: [maven-scm] copy for tag maven-invoker-plugin-1.4 Added: maven/plugins/tags/maven-invoker-plugin-1.4/ - copied from r817039, maven/plugins/trunk/maven-invoker-plugin/
svn commit: r817041 - /maven/plugins/trunk/maven-invoker-plugin/pom.xml
Author: bentmann Date: Sun Sep 20 15:09:40 2009 New Revision: 817041 URL: http://svn.apache.org/viewvc?rev=817041view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: maven/plugins/trunk/maven-invoker-plugin/pom.xml Modified: maven/plugins/trunk/maven-invoker-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/pom.xml?rev=817041r1=817040r2=817041view=diff == --- maven/plugins/trunk/maven-invoker-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-invoker-plugin/pom.xml Sun Sep 20 15:09:40 2009 @@ -29,7 +29,7 @@ /parent artifactIdmaven-invoker-plugin/artifactId - version1.4/version + version1.5-SNAPSHOT/version packagingmaven-plugin/packaging nameMaven Invoker Plugin/name @@ -43,9 +43,9 @@ /prerequisites scm - connectionscm:svn:http://svn.apache.org/repos/asf/maven/plugins/tags/maven-invoker-plugin-1.4/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-invoker-plugin-1.4/developerConnection - urlhttp://svn.apache.org/viewvc/maven/plugins/tags/maven-invoker-plugin-1.4/url + connectionscm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-invoker-plugin//connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-invoker-plugin//developerConnection + urlhttp://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin//url /scm issueManagement systemjira/system
svn commit: r817056 - in /maven/plugins/trunk/maven-jarsigner-plugin/src: it/type-detection/pom.xml it/type-detection/some.zip it/type-detection/verify.bsh main/java/org/apache/maven/plugins/jarsigner
Author: bentmann
Date: Sun Sep 20 17:24:16 2009
New Revision: 817056
URL: http://svn.apache.org/viewvc?rev=817056view=rev
Log:
[MJARSIGNER-7] jarsigner plugin to support all types of zip files
Added:
maven/plugins/trunk/maven-jarsigner-plugin/src/it/type-detection/some.zip
(with props)
Modified:
maven/plugins/trunk/maven-jarsigner-plugin/src/it/type-detection/pom.xml
maven/plugins/trunk/maven-jarsigner-plugin/src/it/type-detection/verify.bsh
maven/plugins/trunk/maven-jarsigner-plugin/src/main/java/org/apache/maven/plugins/jarsigner/AbstractJarsignerMojo.java
Modified:
maven/plugins/trunk/maven-jarsigner-plugin/src/it/type-detection/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jarsigner-plugin/src/it/type-detection/pom.xml?rev=817056r1=817055r2=817056view=diff
==
--- maven/plugins/trunk/maven-jarsigner-plugin/src/it/type-detection/pom.xml
(original)
+++ maven/plugins/trunk/maven-jarsigner-plugin/src/it/type-detection/pom.xml
Sun Sep 20 17:24:16 2009
@@ -78,6 +78,12 @@
typebar/type
classifierb/classifier
/artifact
+artifact
+ !-- see MJARSIGNER-7 --
+ filesome.zip/file
+ typezip/type
+ classifierc/classifier
+/artifact
/artifacts
/configuration
/execution
Added: maven/plugins/trunk/maven-jarsigner-plugin/src/it/type-detection/some.zip
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jarsigner-plugin/src/it/type-detection/some.zip?rev=817056view=auto
==
Binary file - no diff available.
Propchange:
maven/plugins/trunk/maven-jarsigner-plugin/src/it/type-detection/some.zip
--
svn:mime-type = application/octet-stream
Modified:
maven/plugins/trunk/maven-jarsigner-plugin/src/it/type-detection/verify.bsh
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jarsigner-plugin/src/it/type-detection/verify.bsh?rev=817056r1=817055r2=817056view=diff
==
--- maven/plugins/trunk/maven-jarsigner-plugin/src/it/type-detection/verify.bsh
(original)
+++ maven/plugins/trunk/maven-jarsigner-plugin/src/it/type-detection/verify.bsh
Sun Sep 20 17:24:16 2009
@@ -1,5 +1,5 @@
import java.io.*;
-import java.util.jar.*;
+import java.util.zip.*;
File attachedJarFile = new File( basedir, jar-with-unusual.ext );
System.out.println( Checking for existence of + attachedJarFile );
@@ -8,7 +8,7 @@
throw new Exception( missing + attachedJarFile );
}
-JarFile attachedJar = new JarFile( attachedJarFile );
+ZipFile attachedJar = new ZipFile( attachedJarFile );
System.out.println( Checking for existence of + attachedJarFile.getName() +
!/META-INF/TESTING.SF );
if ( attachedJar.getEntry( META-INF/TESTING.SF ) == null )
{
@@ -21,4 +21,24 @@
}
attachedJar.close();
+File attachedZipFile = new File( basedir, some.zip );
+System.out.println( Checking for existence of + attachedZipFile );
+if ( !attachedZipFile.isFile() )
+{
+throw new Exception( missing + attachedZipFile );
+}
+
+ZipFile attachedZip = new ZipFile( attachedZipFile );
+System.out.println( Checking for existence of + attachedZipFile.getName() +
!/META-INF/TESTING.SF );
+if ( attachedZip.getEntry( META-INF/TESTING.SF ) == null )
+{
+throw new Exception( missing + attachedZipFile.getName() +
!/META-INF/TESTING.SF );
+}
+System.out.println( Checking for existence of + attachedZipFile.getName() +
!/META-INF/TESTING.DSA );
+if ( attachedZip.getEntry( META-INF/TESTING.DSA ) == null )
+{
+throw new Exception( missing + attachedZipFile.getName() +
!/META-INF/TESTING.DSA );
+}
+attachedZip.close();
+
return true;
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=817056r1=817055r2=817056view=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
Sun Sep 20 17:24:16 2009
@@ -28,7 +28,6 @@
import java.util.List;
import java.util.Properties;
import java.util.ResourceBundle;
-import java.util.zip.ZipEntry;
import java.util.zip.ZipInputStream;
import org.apache.maven.artifact.Artifact;
@@ -126,8 +125,8 @@
private boolean processMainArtifact;
/**
- *
svn commit: r817065 - in /maven/plugins/trunk/maven-jarsigner-plugin/src: it/attachment-selection/ it/attachment-selection/src/ it/attachment-selection/src/main/ it/attachment-selection/src/main/resou
Author: bentmann Date: Sun Sep 20 17:51:11 2009 New Revision: 817065 URL: http://svn.apache.org/viewvc?rev=817065view=rev Log: [MJARSIGNER-8] Allow to exclude specific attachments from signing/verification Added: maven/plugins/trunk/maven-jarsigner-plugin/src/it/attachment-selection/ maven/plugins/trunk/maven-jarsigner-plugin/src/it/attachment-selection/excluded.jar (with props) maven/plugins/trunk/maven-jarsigner-plugin/src/it/attachment-selection/pom.xml (with props) maven/plugins/trunk/maven-jarsigner-plugin/src/it/attachment-selection/src/ maven/plugins/trunk/maven-jarsigner-plugin/src/it/attachment-selection/src/main/ maven/plugins/trunk/maven-jarsigner-plugin/src/it/attachment-selection/src/main/resources/ maven/plugins/trunk/maven-jarsigner-plugin/src/it/attachment-selection/src/main/resources/test.properties (with props) maven/plugins/trunk/maven-jarsigner-plugin/src/it/attachment-selection/verify.bsh (with props) Modified: maven/plugins/trunk/maven-jarsigner-plugin/src/it/type-detection/pom.xml maven/plugins/trunk/maven-jarsigner-plugin/src/main/java/org/apache/maven/plugins/jarsigner/AbstractJarsignerMojo.java Added: maven/plugins/trunk/maven-jarsigner-plugin/src/it/attachment-selection/excluded.jar URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jarsigner-plugin/src/it/attachment-selection/excluded.jar?rev=817065view=auto == Binary file - no diff available. Propchange: maven/plugins/trunk/maven-jarsigner-plugin/src/it/attachment-selection/excluded.jar -- svn:mime-type = application/octet-stream Added: maven/plugins/trunk/maven-jarsigner-plugin/src/it/attachment-selection/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jarsigner-plugin/src/it/attachment-selection/pom.xml?rev=817065view=auto == --- maven/plugins/trunk/maven-jarsigner-plugin/src/it/attachment-selection/pom.xml (added) +++ maven/plugins/trunk/maven-jarsigner-plugin/src/it/attachment-selection/pom.xml Sun Sep 20 17:51:11 2009 @@ -0,0 +1,112 @@ +?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 + packagingjar/packaging + + description +Tests the selection of specific attachments. + /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 + plugin +groupIdorg.apache.maven.plugins/groupId +artifactIdmaven-jar-plugin/artifactId +version2.1/version + /plugin + plugin +groupIdorg.apache.maven.plugins/groupId +artifactIdmaven-resources-plugin/artifactId +version2.2/version + /plugin + plugin +groupIdorg.codehaus.mojo/groupId +artifactIdbuild-helper-maven-plugin/artifactId +version1.2/version +executions + execution +idattach-artifacts/id +goals + goalattach-artifact/goal +/goals +configuration + artifacts +artifact + fileexcluded.jar/file + typejar/type + classifierunsigned/classifier +/artifact + /artifacts +/configuration + /execution +/executions + /plugin + plugin +groupIdorg.apache.maven.plugins/groupId +artifactIdmaven-surefire-plugin/artifactId +version2.3.1/version + /plugin + plugin +groupIdorg.apache.maven.plugins/groupId +
svn commit: r817079 - /maven/repository-tools/trunk/src/bin/synchronize/m2-sync/sync.csv
Author: carlos Date: Sun Sep 20 18:55:53 2009 New Revision: 817079 URL: http://svn.apache.org/viewvc?rev=817079view=rev Log: [MAVENUPLOAD-2578] Modified: maven/repository-tools/trunk/src/bin/synchronize/m2-sync/sync.csv Modified: maven/repository-tools/trunk/src/bin/synchronize/m2-sync/sync.csv URL: http://svn.apache.org/viewvc/maven/repository-tools/trunk/src/bin/synchronize/m2-sync/sync.csv?rev=817079r1=817078r2=817079view=diff == --- maven/repository-tools/trunk/src/bin/synchronize/m2-sync/sync.csv (original) +++ maven/repository-tools/trunk/src/bin/synchronize/m2-sync/sync.csv Sun Sep 20 18:55:53 2009 @@ -231,6 +231,7 @@ org.criticalsection,rs...@criticalsection.org:/srv/maven/repositories/cs-releases,rsync_ssh,Tim Kettler,t...@criticalsection.org,, org.cyclopsgroup,mavens...@web.sourceforge.net:/home/groups/c/cy/cyclops-group/m2-export,rsync_ssh,Jiaqi Guo,jiaqi@gmail.com,, org.databene,mavens...@web.sourceforge.net:/home/groups/b/be/benerator/htdocs/m2/repository,rsync_ssh,Volker Bergmann,vol...@databene.org,, +org.datanucleus,j...@www.datanucleus.org:/home/jpox/htdocs/downloads/maven2,rsync_ssh,Andy Jefferson,i...@datanucleus.org,, org.dbunit,mavens...@web.sourceforge.net:/home/groups/d/db/dbunit/htdocs/m2repo,rsync_ssh,Roberto Lo Giacco,rlogia...@users.sourceforge.net,, org.domdrides,mavens...@web.sourceforge.net:/home/groups/d/do/domdrides/htdocs/m2repo/releases,rsync_ssh,James Carman,ja...@carmanconsulting.com,, org.drizzle.jdbc,mavens...@jdbc.drizzle.org:mavenrepo/releases,rsync_ssh,Marcus Eriksson,krum...@gmail.com,,
