svn commit: r596980 - in /maven/archiva/trunk: archiva-docs/ archiva-docs/pom.xml archiva-docs/release-readme.txt archiva-docs/src/ archiva-site/ pom.xml
Author: brett
Date: Wed Nov 21 00:26:57 2007
New Revision: 596980
URL: http://svn.apache.org/viewvc?rev=596980view=rev
Log:
site - docs
Added:
maven/archiva/trunk/archiva-docs/
- copied from r596933, maven/archiva/trunk/archiva-site/
maven/archiva/trunk/archiva-docs/pom.xml
- copied, changed from r596979, maven/archiva/trunk/archiva-site/pom.xml
maven/archiva/trunk/archiva-docs/release-readme.txt
- copied unchanged from r596979,
maven/archiva/trunk/archiva-site/release-readme.txt
maven/archiva/trunk/archiva-docs/src/
- copied from r596979, maven/archiva/trunk/archiva-site/src/
Removed:
maven/archiva/trunk/archiva-site/
Modified:
maven/archiva/trunk/pom.xml
Copied: maven/archiva/trunk/archiva-docs/pom.xml (from r596979,
maven/archiva/trunk/archiva-site/pom.xml)
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-docs/pom.xml?p2=maven/archiva/trunk/archiva-docs/pom.xmlp1=maven/archiva/trunk/archiva-site/pom.xmlr1=596979r2=596980rev=596980view=diff
==
--- maven/archiva/trunk/archiva-site/pom.xml (original)
+++ maven/archiva/trunk/archiva-docs/pom.xml Wed Nov 21 00:26:57 2007
@@ -24,7 +24,7 @@
version1.0-SNAPSHOT/version
/parent
modelVersion4.0.0/modelVersion
- artifactIdarchiva-site/artifactId
+ artifactIdarchiva-docs/artifactId
packagingpom/packaging
nameArchiva Documentation/name
urlhttp://maven.apache.org/archiva/docs/${project.version}//url
@@ -68,12 +68,6 @@
/plugin
/plugins
/reporting
- !-- prevent automatic artifactId appending --
- scm
-
connectionscm:svn:http://svn.apache.org/repos/asf/maven/archiva/trunk//connection
-
developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/archiva/trunk//developerConnection
-urlhttp://svn.apache.org/viewcvs.cgi/maven/archiva/trunk//url
- /scm
distributionManagement
site
Modified: maven/archiva/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/pom.xml?rev=596980r1=596979r2=596980view=diff
==
--- maven/archiva/trunk/pom.xml (original)
+++ maven/archiva/trunk/pom.xml Wed Nov 21 00:26:57 2007
@@ -173,7 +173,7 @@
modulearchiva-scheduled/module
modulearchiva-web/module
modulearchiva-cli/module
-modulearchiva-site/module
+modulearchiva-docs/module
/modules
dependencies
dependency
svn commit: r596996 - /maven/archiva/trunk/archiva-web/archiva-webapp/src/main/resources/log4j.xml
Author: oching Date: Wed Nov 21 00:57:46 2007 New Revision: 596996 URL: http://svn.apache.org/viewvc?rev=596996view=rev Log: [MRM-587] -set archiva log level to info instead of debug Modified: maven/archiva/trunk/archiva-web/archiva-webapp/src/main/resources/log4j.xml Modified: maven/archiva/trunk/archiva-web/archiva-webapp/src/main/resources/log4j.xml URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-web/archiva-webapp/src/main/resources/log4j.xml?rev=596996r1=596995r2=596996view=diff == --- maven/archiva/trunk/archiva-web/archiva-webapp/src/main/resources/log4j.xml (original) +++ maven/archiva/trunk/archiva-web/archiva-webapp/src/main/resources/log4j.xml Wed Nov 21 00:57:46 2007 @@ -34,7 +34,7 @@ /logger logger name=org.apache.maven.archiva -level value=debug / +level value=info / /logger logger name=org.apache.archiva.AuditLog
svn commit: r597023 - in /maven/archiva/trunk/archiva-docs/src/site: apt/adminguide/webapp.apt apt/guides/getting-started.apt apt/quick-start.apt site.xml
Author: brett
Date: Wed Nov 21 02:40:22 2007
New Revision: 597023
URL: http://svn.apache.org/viewvc?rev=597023view=rev
Log:
start the quick start guide
Added:
maven/archiva/trunk/archiva-docs/src/site/apt/quick-start.apt
- copied, changed from r596980,
maven/archiva/trunk/archiva-docs/src/site/apt/guides/getting-started.apt
Removed:
maven/archiva/trunk/archiva-docs/src/site/apt/guides/getting-started.apt
Modified:
maven/archiva/trunk/archiva-docs/src/site/apt/adminguide/webapp.apt
maven/archiva/trunk/archiva-docs/src/site/site.xml
Modified: maven/archiva/trunk/archiva-docs/src/site/apt/adminguide/webapp.apt
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-docs/src/site/apt/adminguide/webapp.apt?rev=597023r1=597022r2=597023view=diff
==
--- maven/archiva/trunk/archiva-docs/src/site/apt/adminguide/webapp.apt
(original)
+++ maven/archiva/trunk/archiva-docs/src/site/apt/adminguide/webapp.apt Wed Nov
21 02:40:22 2007
@@ -4,8 +4,77 @@
Installing Apache Archiva as a Web Application
- :STUB: This is a documentation stub.
-
-~~TODO: show example using Tomcat 6.
~~TODO: link to wiki location for other application servers
+To deploy Archiva on Tomcat 5.5
+
+ * Create a directory in tomcat called archiva, at the same level as bin,
conf, logs and the others.
+
+ * Copy the war file from apps/archiva/lib into the new directory
+
+ * Create a conf/Catalina/localhost/archiva.xml file with the following data:
+
++-+
+ ?xml version=1.0 encoding=UTF-8?
+ Context path=/archiva
+ docBase=${catalina.home}/archiva/archiva-webapp-1.0-SNAPSHOT.war
+
+ Resource name=jdbc/users auth=Container type=javax.sql.DataSource
+ username=sa
+ password=
+ driverClassName=org.apache.derby.jdbc.EmbeddedDriver
+ url=jdbc:derby:database/archiva;create=true /
+
+ Resource name=jdbc/archiva auth=Container type=javax.sql.DataSource
+ username=sa
+ password=
+ driverClassName=org.apache.derby.jdbc.EmbeddedDriver
+ url=jdbc:derby:database/archiva;create=true /
+
+ Resource name=mail/Session auth=Container
+type=javax.mail.Session
+mail.smtp.host=localhost/
+ /Context
++-+
+
+ * Note: Tomcat 5.5.20 and 5.5.23 are missing MailSessionFactory and a
+ few other classes. JNDI mail sessions will not work. Use Tomcat 5.5.17
+ instead, or see {{{http://issues.apache.org/bugzilla/show_bug.cgi?id=40668}
+ Bug 40668}} for a workaround.
+
+ * Copy $HOME/.m2/org/apache/derby/derby/10.1.3.1/derby-10.1.3.1.jar (or
from the remote repository) into the Tomcat
+ common/lib
+
+ * To deal with a current bug, you'll also need to add the following to your
${catalina.home}/conf/web.xml in the
+ relevant section (search for jspx):
+
++-+
+ servlet-mapping
+servlet-namejsp/servlet-name
+url-pattern*.jspf/url-pattern
+ /servlet-mapping
++-+
+
+ When you first start Archiva, you will see an Exception that schema SA does
not exist - however it doesn't appear to
+ cause a problem. If you use a username other than 'sa', such as 'archiva',
then you seem to get the same error but
+ Tomcat fails to start the context and you have to shutdown and restart again.
+
+Updating Archiva within a Tomcat
+
+ While exploring Archiva, or perhaps while developing with it, you will want
to delete the
+ current state. Presuming you followed the instructions above, you will need
to remove the
+ following files from the ${catalina.home} directory. Ensure your Tomcat has
first been
+ shutdown.
+
++-+
+ # Remove the database
+ rm -r bin/database/ bin/derby.log
+ # Remove the archiva configuration
+ rm $HOME/.m2/archiva.xml
+ # Remove the temporary Tomcat files
+ rm webapps/archiva/ work/Catalina/localhost/archiva/ logs/*
+ # Remove the war file (if you're deploying a new one)
+ rm archiva/*.war
++-+
+
+~~TODO: what next? revise above too
Copied: maven/archiva/trunk/archiva-docs/src/site/apt/quick-start.apt (from
r596980,
maven/archiva/trunk/archiva-docs/src/site/apt/guides/getting-started.apt)
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-docs/src/site/apt/quick-start.apt?p2=maven/archiva/trunk/archiva-docs/src/site/apt/quick-start.aptp1=maven/archiva/trunk/archiva-docs/src/site/apt/guides/getting-started.aptr1=596980r2=597023rev=597023view=diff
==
---
svn commit: r597026 - /maven/archiva/trunk/archiva-docs/src/site/apt/index.apt
Author: brett
Date: Wed Nov 21 02:44:36 2007
New Revision: 597026
URL: http://svn.apache.org/viewvc?rev=597026view=rev
Log:
fix paths
Modified:
maven/archiva/trunk/archiva-docs/src/site/apt/index.apt
Modified: maven/archiva/trunk/archiva-docs/src/site/apt/index.apt
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-docs/src/site/apt/index.apt?rev=597026r1=597025r2=597026view=diff
==
--- maven/archiva/trunk/archiva-docs/src/site/apt/index.apt (original)
+++ maven/archiva/trunk/archiva-docs/src/site/apt/index.apt Wed Nov 21 02:44:36
2007
@@ -16,10 +16,10 @@
To get started with Archiva, read the following documentation:
-* {{{/quick-start.html} A Quick Getting Started Guide}}
+* {{{quick-start.html} A Quick Getting Started Guide}}
-* {{{/userguide/index.html} User's Guide}}
+* {{{userguide/index.html} User's Guide}}
-* {{{/adminguide/index.html} Administrator's Guide}}
+* {{{adminguide/index.html} Administrator's Guide}}
[]
svn commit: r597035 - in /maven/archiva/trunk/archiva-docs/src/site/resources/images: graph-multimodule.dot graph-multimodule.png scheduling.svg
Author: brett Date: Wed Nov 21 03:06:11 2007 New Revision: 597035 URL: http://svn.apache.org/viewvc?rev=597035view=rev Log: remove some old resources Removed: maven/archiva/trunk/archiva-docs/src/site/resources/images/graph-multimodule.dot maven/archiva/trunk/archiva-docs/src/site/resources/images/graph-multimodule.png maven/archiva/trunk/archiva-docs/src/site/resources/images/scheduling.svg
svn commit: r595896 - in /maven/surefire/trunk/maven-surefire-plugin/src/it: test1/src/test/java/ test2/src/test/java/ test3/src/test/java/ testArgLine/src/test/java/
Author: dfabulich
Date: Fri Nov 16 18:12:38 2007
New Revision: 595896
URL: http://svn.apache.org/viewvc?rev=595896view=rev
Log:
Renaming tests to match default patterns. These ITs were 'passing' with 0
tests run.
Added:
maven/surefire/trunk/maven-surefire-plugin/src/it/test1/src/test/java/TestSurefire1.java
- copied, changed from r595859,
maven/surefire/trunk/maven-surefire-plugin/src/it/test1/src/test/java/SurefireTest1.java
maven/surefire/trunk/maven-surefire-plugin/src/it/test2/src/test/java/TestSurefire2.java
- copied, changed from r595859,
maven/surefire/trunk/maven-surefire-plugin/src/it/test2/src/test/java/SurefireTest2.java
maven/surefire/trunk/maven-surefire-plugin/src/it/test3/src/test/java/TestSurefire3.java
- copied, changed from r595859,
maven/surefire/trunk/maven-surefire-plugin/src/it/test3/src/test/java/SurefireTest3.java
maven/surefire/trunk/maven-surefire-plugin/src/it/testArgLine/src/test/java/TestSurefireArgLine.java
- copied, changed from r595859,
maven/surefire/trunk/maven-surefire-plugin/src/it/testArgLine/src/test/java/SurefireTest1.java
Removed:
maven/surefire/trunk/maven-surefire-plugin/src/it/test1/src/test/java/SurefireTest1.java
maven/surefire/trunk/maven-surefire-plugin/src/it/test2/src/test/java/SurefireTest2.java
maven/surefire/trunk/maven-surefire-plugin/src/it/test3/src/test/java/SurefireTest3.java
maven/surefire/trunk/maven-surefire-plugin/src/it/testArgLine/src/test/java/SurefireTest1.java
Copied:
maven/surefire/trunk/maven-surefire-plugin/src/it/test1/src/test/java/TestSurefire1.java
(from r595859,
maven/surefire/trunk/maven-surefire-plugin/src/it/test1/src/test/java/SurefireTest1.java)
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-plugin/src/it/test1/src/test/java/TestSurefire1.java?p2=maven/surefire/trunk/maven-surefire-plugin/src/it/test1/src/test/java/TestSurefire1.javap1=maven/surefire/trunk/maven-surefire-plugin/src/it/test1/src/test/java/SurefireTest1.javar1=595859r2=595896rev=595896view=diff
==
---
maven/surefire/trunk/maven-surefire-plugin/src/it/test1/src/test/java/SurefireTest1.java
(original)
+++
maven/surefire/trunk/maven-surefire-plugin/src/it/test1/src/test/java/TestSurefire1.java
Fri Nov 16 18:12:38 2007
@@ -3,7 +3,7 @@
import junit.framework.TestCase;
import junit.framework.TestSuite;
-public class SurefireTest1
+public class TestSurefire1
extends TestCase
{
@@ -11,7 +11,7 @@
private static boolean tearDownCalled = false;
-public SurefireTest1( String name, String extraName )
+public TestSurefire1( String name, String extraName )
{
super( name );
}
@@ -19,7 +19,7 @@
public static Test suite()
{
TestSuite suite = new TestSuite();
-Test test = new SurefireTest1( testSetUp, dummy );
+Test test = new TestSurefire1( testSetUp, dummy );
suite.addTest( test );
TestSetup setup = new TestSetup( suite )
{
Copied:
maven/surefire/trunk/maven-surefire-plugin/src/it/test2/src/test/java/TestSurefire2.java
(from r595859,
maven/surefire/trunk/maven-surefire-plugin/src/it/test2/src/test/java/SurefireTest2.java)
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-plugin/src/it/test2/src/test/java/TestSurefire2.java?p2=maven/surefire/trunk/maven-surefire-plugin/src/it/test2/src/test/java/TestSurefire2.javap1=maven/surefire/trunk/maven-surefire-plugin/src/it/test2/src/test/java/SurefireTest2.javar1=595859r2=595896rev=595896view=diff
==
---
maven/surefire/trunk/maven-surefire-plugin/src/it/test2/src/test/java/SurefireTest2.java
(original)
+++
maven/surefire/trunk/maven-surefire-plugin/src/it/test2/src/test/java/TestSurefire2.java
Fri Nov 16 18:12:38 2007
@@ -3,7 +3,7 @@
import junit.framework.TestCase;
import junit.framework.TestSuite;
-public class SurefireTest2
+public class TestSurefire2
extends TestCase
{
@@ -11,7 +11,7 @@
private static boolean tearDownCalled = false;
-public SurefireTest2( String name, String extraName )
+public TestSurefire2( String name, String extraName )
{
super( name );
}
@@ -19,7 +19,7 @@
public static Test suite()
{
TestSuite suite = new TestSuite();
-Test test = new SurefireTest2( testSetUp, dummy );
+Test test = new TestSurefire2( testSetUp, dummy );
suite.addTest( test );
TestSetup setup = new TestSetup( suite )
{
Copied:
maven/surefire/trunk/maven-surefire-plugin/src/it/test3/src/test/java/TestSurefire3.java
(from r595859,
maven/surefire/trunk/maven-surefire-plugin/src/it/test3/src/test/java/SurefireTest3.java)
URL:
svn commit: r596826 - /maven/surefire/trunk/maven-surefire-plugin/src/it/
Author: dfabulich Date: Tue Nov 20 13:02:14 2007 New Revision: 596826 URL: http://svn.apache.org/viewvc?rev=596826view=rev Log: These old ITs are obsolete; replaced with separate surefire-integration-tests module Removed: maven/surefire/trunk/maven-surefire-plugin/src/it/
svn commit: r596846 - in /maven/surefire/trunk/surefire-integration-tests/src/test: java/org/apache/maven/surefire/its/TestJUnit44.java java/org/apache/maven/surefire/its/TestJUnit44Hamcrest.java reso
Author: dfabulich
Date: Tue Nov 20 14:09:51 2007
New Revision: 596846
URL: http://svn.apache.org/viewvc?rev=596846view=rev
Log:
Accidentally checked in too early in previous revision. Creating JUnit44
Hamcrest test.
Added:
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestJUnit44Hamcrest.java
- copied, changed from r596843,
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestJUnit44.java
maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit44-hamcrest/
- copied from r596843,
maven/surefire/trunk/surefire-integration-tests/src/test/resources/default-junit44/
Removed:
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestJUnit44.java
maven/surefire/trunk/surefire-integration-tests/src/test/resources/default-junit44/
Copied:
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestJUnit44Hamcrest.java
(from r596843,
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestJUnit44.java)
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestJUnit44Hamcrest.java?p2=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestJUnit44Hamcrest.javap1=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestJUnit44.javar1=596843r2=596846rev=596846view=diff
==
---
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestJUnit44.java
(original)
+++
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestJUnit44Hamcrest.java
Tue Nov 20 14:09:51 2007
@@ -12,13 +12,13 @@
* @author a href=mailto:[EMAIL PROTECTED]Dan Fabulich/a
*
*/
-public class TestJUnit44
+public class TestJUnit44Hamcrest
extends AbstractMavenIntegrationTestCase
{
-public void testJUnit44 ()
+public void testJUnit44Hamcrest ()
throws Exception
{
-File testDir = ResourceExtractor.simpleExtractResources( getClass(),
/default-junit44 );
+File testDir = ResourceExtractor.simpleExtractResources( getClass(),
/junit44-hamcrest );
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
verifier.executeGoal( test );
svn commit: r596843 - in /maven/surefire/trunk/surefire-integration-tests/src/test: java/org/apache/maven/surefire/its/ resources/default-junit44/ resources/default-junit44/src/ resources/default-juni
Author: dfabulich
Date: Tue Nov 20 14:04:27 2007
New Revision: 596843
URL: http://svn.apache.org/viewvc?rev=596843view=rev
Log:
JUnit 4.4 test
Added:
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestJUnit44.java
maven/surefire/trunk/surefire-integration-tests/src/test/resources/default-junit44/
maven/surefire/trunk/surefire-integration-tests/src/test/resources/default-junit44/pom.xml
maven/surefire/trunk/surefire-integration-tests/src/test/resources/default-junit44/src/
maven/surefire/trunk/surefire-integration-tests/src/test/resources/default-junit44/src/test/
maven/surefire/trunk/surefire-integration-tests/src/test/resources/default-junit44/src/test/java/
maven/surefire/trunk/surefire-integration-tests/src/test/resources/default-junit44/src/test/java/BasicTest.java
Added:
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestJUnit44.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestJUnit44.java?rev=596843view=auto
==
---
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestJUnit44.java
(added)
+++
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestJUnit44.java
Tue Nov 20 14:04:27 2007
@@ -0,0 +1,30 @@
+package org.apache.maven.surefire.its;
+
+import java.io.File;
+
+import org.apache.maven.integrationtests.AbstractMavenIntegrationTestCase;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.util.ResourceExtractor;
+
+/**
+ * Test project using JUnit4.4 (including Hamcrest extensions)
+ *
+ * @author a href=mailto:[EMAIL PROTECTED]Dan Fabulich/a
+ *
+ */
+public class TestJUnit44
+extends AbstractMavenIntegrationTestCase
+{
+public void testJUnit44 ()
+throws Exception
+{
+File testDir = ResourceExtractor.simpleExtractResources( getClass(),
/default-junit44 );
+
+Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+verifier.executeGoal( test );
+verifier.verifyErrorFreeLog();
+verifier.resetStreams();
+
+HelperAssertions.assertTestSuiteResults( 1, 0, 0, 0, testDir );
+}
+}
Added:
maven/surefire/trunk/surefire-integration-tests/src/test/resources/default-junit44/pom.xml
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/resources/default-junit44/pom.xml?rev=596843view=auto
==
---
maven/surefire/trunk/surefire-integration-tests/src/test/resources/default-junit44/pom.xml
(added)
+++
maven/surefire/trunk/surefire-integration-tests/src/test/resources/default-junit44/pom.xml
Tue Nov 20 14:04:27 2007
@@ -0,0 +1,54 @@
+?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/maven-v4_0_0.xsd;
+ modelVersion4.0.0/modelVersion
+
+ groupIdorg.apache.maven.plugins.surefire/groupId
+ artifactIdjunit44/artifactId
+ version1.0-SNAPSHOT/version
+ nameTest for default configuration/name
+ descriptionTest for default surefire configuration/description
+
+ dependencies
+dependency
+ groupIdjunit/groupId
+ artifactIdjunit/artifactId
+ version4.4/version
+ scopetest/scope
+/dependency
+ /dependencies
+
+ build
+plugins
+ plugin
+groupIdorg.apache.maven.plugins/groupId
+artifactIdmaven-compiler-plugin/artifactId
+configuration
+ source1.5/source
+ target1.5/target
+/configuration
+ /plugin
+/plugins
+ /build
+
+/project
Added:
maven/surefire/trunk/surefire-integration-tests/src/test/resources/default-junit44/src/test/java/BasicTest.java
URL:
svn commit: r596852 - in /maven/surefire/trunk/surefire-integration-tests/src/test: java/org/apache/maven/surefire/its/ resources/junit44-dep/ resources/junit44-dep/src/ resources/junit44-dep/src/test
Author: dfabulich
Date: Tue Nov 20 14:26:37 2007
New Revision: 596852
URL: http://svn.apache.org/viewvc?rev=596852view=rev
Log:
[SUREFIRE-378] junit4.4-dep isn't detected
Added:
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit44Dep.java
maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit44-dep/
maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit44-dep/pom.xml
maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit44-dep/src/
maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit44-dep/src/test/
maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit44-dep/src/test/java/
maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit44-dep/src/test/java/BasicTest.java
Added:
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit44Dep.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit44Dep.java?rev=596852view=auto
==
---
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit44Dep.java
(added)
+++
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit44Dep.java
Tue Nov 20 14:26:37 2007
@@ -0,0 +1,30 @@
+package org.apache.maven.surefire.its;
+
+import java.io.File;
+
+import org.apache.maven.integrationtests.AbstractMavenIntegrationTestCase;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.util.ResourceExtractor;
+
+/**
+ * Test project using JUnit4.4 -dep. junit-dep includes only junit.* classes,
and depends explicitly on hamcrest-core
+ *
+ * @author a href=mailto:[EMAIL PROTECTED]Dan Fabulich/a
+ *
+ */
+public class JUnit44Dep
+extends AbstractMavenIntegrationTestCase
+{
+public void testJUnit44Dep ()
+throws Exception
+{
+File testDir = ResourceExtractor.simpleExtractResources( getClass(),
/junit44-dep );
+
+Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+verifier.executeGoal( test );
+verifier.verifyErrorFreeLog();
+verifier.resetStreams();
+
+HelperAssertions.assertTestSuiteResults( 1, 0, 0, 0, testDir );
+}
+}
Added:
maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit44-dep/pom.xml
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit44-dep/pom.xml?rev=596852view=auto
==
---
maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit44-dep/pom.xml
(added)
+++
maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit44-dep/pom.xml
Tue Nov 20 14:26:37 2007
@@ -0,0 +1,54 @@
+?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/maven-v4_0_0.xsd;
+ modelVersion4.0.0/modelVersion
+
+ groupIdorg.apache.maven.plugins.surefire/groupId
+ artifactIdjunit44-dep/artifactId
+ version1.0-SNAPSHOT/version
+ nameTest for default configuration/name
+ descriptionTest for junit-dep; the -dep jar includes only junit.* classes,
and depends explicitly on hamcrest-core/description
+
+ dependencies
+dependency
+ groupIdjunit/groupId
+ artifactIdjunit-dep/artifactId
+ version4.4/version
+ scopetest/scope
+/dependency
+ /dependencies
+
+ build
+plugins
+ plugin
+groupIdorg.apache.maven.plugins/groupId
+artifactIdmaven-compiler-plugin/artifactId
+configuration
+ source1.5/source
+ target1.5/target
+/configuration
+ /plugin
+/plugins
+ /build
+
+/project
Added:
svn commit: r596856 - /maven/surefire/trunk/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java
Author: dfabulich
Date: Tue Nov 20 14:34:53 2007
New Revision: 596856
URL: http://svn.apache.org/viewvc?rev=596856view=rev
Log:
Updating documentation to indicate which parameters are ignored when
suiteXmlFiles are specified.
Modified:
maven/surefire/trunk/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java
Modified:
maven/surefire/trunk/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java?rev=596856r1=596855r2=596856view=diff
==
---
maven/surefire/trunk/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java
(original)
+++
maven/surefire/trunk/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java
Tue Nov 20 14:34:53 2007
@@ -165,7 +165,8 @@
/**
* List of patterns (separated by commas) used to specify the tests that
should be included in testing. When not
* specified and when the codetest/code parameter is not specified,
the default includes will be
- * code**#47;Test*.java **#47;*Test.java
**#47;*TestCase.java/code
+ * code**#47;Test*.java **#47;*Test.java
**#47;*TestCase.java/code. This parameter is ignored if
+ * TestNG suiteXmlFiles are specified.
*
* @parameter
*/
@@ -174,7 +175,8 @@
/**
* List of patterns (separated by commas) used to specify the tests that
should be excluded in testing. When not
* specified and when the codetest/code parameter is not specified,
the default excludes will be
- * code**#47;Abstract*Test.java **#47;Abstract*TestCase.java
**#47;*$*/code
+ * code**#47;Abstract*Test.java **#47;Abstract*TestCase.java
**#47;*$*/code. This parameter is ignored if
+ * TestNG suiteXmlFiles are specified.
*
* @parameter
*/
@@ -299,23 +301,23 @@
private boolean childDelegation;
/**
- * Groups for this test. Only classes/methods/etc decorated with one of
the groups specified here will be included
- * in test run, if specified.
+ * (TestNG only) Groups for this test. Only classes/methods/etc decorated
with one of the groups specified here will be included
+ * in test run, if specified. This parameter is overridden if
suiteXmlFiles are specified.
*
* @parameter expression=${groups}
*/
private String groups;
/**
- * Excluded groups. Any methods/classes/etc with one of the groups
specified in this list will specifically not be
- * run.
+ * (TestNG only) Excluded groups. Any methods/classes/etc with one of the
groups specified in this list will specifically not be
+ * run. This parameter is overridden if suiteXmlFiles are specified.
*
* @parameter expression=${excludedGroups}
*/
private String excludedGroups;
/**
- * List of TestNG suite xml file locations, seperated by commas. It should
be noted that if suiteXmlFiles is
+ * (TestNG only) List of TestNG suite xml file locations, seperated by
commas. It should be noted that if suiteXmlFiles is
* specified, bno/b other tests will be run, ignoring other
parameters, like includes and excludes.
*
* @parameter
@@ -323,7 +325,7 @@
private File[] suiteXmlFiles;
/**
- * The attribute thread-count allows you to specify how many threads
should be allocated for this execution. Only
+ * (TestNG only) The attribute thread-count allows you to specify how many
threads should be allocated for this execution. Only
* makes sense to use in conjunction with parallel.
*
* @parameter expression=${threadCount} default-value=5
@@ -331,7 +333,7 @@
private int threadCount;
/**
- * When you use the parallel attribute, TestNG will try to run all your
test methods in separate threads, except for
+ * (TestNG only) When you use the parallel attribute, TestNG will try to
run all your test methods in separate threads, except for
* methods that depend on each other, which will be run in the same thread
in order to respect their order of
* execution.
*
svn commit: r596870 - in /maven/surefire/trunk/surefire-integration-tests/src/test: java/org/apache/maven/surefire/its/ resources/testng-beforeMethodFailure/ resources/testng-beforeMethodFailure/src/
Author: dfabulich
Date: Tue Nov 20 15:06:48 2007
New Revision: 596870
URL: http://svn.apache.org/viewvc?rev=596870view=rev
Log:
[SUREFIRE-379] Added integration test; this test doesn't fail yet, though,
because the test results are numerically correct; the problem is the missing
exception
Added:
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgBeforeMethodFailure.java
maven/surefire/trunk/surefire-integration-tests/src/test/resources/testng-beforeMethodFailure/
maven/surefire/trunk/surefire-integration-tests/src/test/resources/testng-beforeMethodFailure/pom.xml
maven/surefire/trunk/surefire-integration-tests/src/test/resources/testng-beforeMethodFailure/src/
maven/surefire/trunk/surefire-integration-tests/src/test/resources/testng-beforeMethodFailure/src/test/
maven/surefire/trunk/surefire-integration-tests/src/test/resources/testng-beforeMethodFailure/src/test/java/
maven/surefire/trunk/surefire-integration-tests/src/test/resources/testng-beforeMethodFailure/src/test/java/TestNGSuiteTest.java
Added:
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgBeforeMethodFailure.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgBeforeMethodFailure.java?rev=596870view=auto
==
---
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgBeforeMethodFailure.java
(added)
+++
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgBeforeMethodFailure.java
Tue Nov 20 15:06:48 2007
@@ -0,0 +1,30 @@
+package org.apache.maven.surefire.its;
+
+import java.io.File;
+
+import org.apache.maven.integrationtests.AbstractMavenIntegrationTestCase;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.util.ResourceExtractor;
+
+/**
+ * Test failures in @BeforeMethod annotation on TestNg suite
+ *
+ * @author a href=mailto:[EMAIL PROTECTED]Dan Fabulich/a
+ *
+ */
+public class TestNgBeforeMethodFailure
+extends AbstractMavenIntegrationTestCase
+{
+public void testTestNgBeforeMethodFailure ()
+throws Exception
+{
+File testDir = ResourceExtractor.simpleExtractResources( getClass(),
/testng-beforeMethodFailure );
+
+Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+verifier.executeGoal( test );
+verifier.verifyErrorFreeLog();
+verifier.resetStreams();
+
+HelperAssertions.assertTestSuiteResults( 1, 0, 0, 1, testDir );
+}
+}
Added:
maven/surefire/trunk/surefire-integration-tests/src/test/resources/testng-beforeMethodFailure/pom.xml
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/resources/testng-beforeMethodFailure/pom.xml?rev=596870view=auto
==
---
maven/surefire/trunk/surefire-integration-tests/src/test/resources/testng-beforeMethodFailure/pom.xml
(added)
+++
maven/surefire/trunk/surefire-integration-tests/src/test/resources/testng-beforeMethodFailure/pom.xml
Tue Nov 20 15:06:48 2007
@@ -0,0 +1,60 @@
+?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/maven-v4_0_0.xsd;
+ modelVersion4.0.0/modelVersion
+
+ groupIdorg.apache.maven.plugins.surefire/groupId
+ artifactIdtestng-beforeMethodFailure/artifactId
+ version1.0-SNAPSHOT/version
+ nameTestNG Suites/name
+ descriptionThrows failure in @BeforeMethod annotation/description
+
+ properties
+ testNgVersion5.7/testNgVersion
+ /properties
+
+ dependencies
+dependency
+ groupIdorg.testng/groupId
+ artifactIdtestng/artifactId
+ version${testNgVersion}/version
+ classifierjdk15/classifier
+ scopetest/scope
+/dependency
+
svn commit: r596883 - in /maven/surefire/trunk/surefire-integration-tests/src/test: java/org/apache/maven/surefire/its/ resources/testng-path with spaces/ resources/testng-path with spaces/src/ resour
Author: dfabulich
Date: Tue Nov 20 15:55:01 2007
New Revision: 596883
URL: http://svn.apache.org/viewvc?rev=596883view=rev
Log:
[SUREFIRE-307] Test path with spaces
Added:
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgPathWithSpaces.java
maven/surefire/trunk/surefire-integration-tests/src/test/resources/testng-path
with spaces/
maven/surefire/trunk/surefire-integration-tests/src/test/resources/testng-path
with spaces/pom.xml
maven/surefire/trunk/surefire-integration-tests/src/test/resources/testng-path
with spaces/src/
maven/surefire/trunk/surefire-integration-tests/src/test/resources/testng-path
with spaces/src/test/
maven/surefire/trunk/surefire-integration-tests/src/test/resources/testng-path
with spaces/src/test/java/
maven/surefire/trunk/surefire-integration-tests/src/test/resources/testng-path
with spaces/src/test/java/TestNGSuiteTest.java
maven/surefire/trunk/surefire-integration-tests/src/test/resources/testng-path
with spaces/src/test/resources/
maven/surefire/trunk/surefire-integration-tests/src/test/resources/testng-path
with spaces/src/test/resources/test.txt
Added:
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgPathWithSpaces.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgPathWithSpaces.java?rev=596883view=auto
==
---
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgPathWithSpaces.java
(added)
+++
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgPathWithSpaces.java
Tue Nov 20 15:55:01 2007
@@ -0,0 +1,32 @@
+package org.apache.maven.surefire.its;
+
+
+
+import java.io.File;
+
+import org.apache.maven.integrationtests.AbstractMavenIntegrationTestCase;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.util.ResourceExtractor;
+
+/**
+ * Test TestNG test in a directory with spaces
+ *
+ * @author a href=mailto:[EMAIL PROTECTED]Dan Fabulich/a
+ *
+ */
+public class TestNgPathWithSpaces
+extends AbstractMavenIntegrationTestCase
+{
+public void testTestNgTestWithSpaces ()
+throws Exception
+{
+File testDir = ResourceExtractor.simpleExtractResources( getClass(),
/testng-path with spaces );
+
+Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+verifier.executeGoal( test );
+verifier.verifyErrorFreeLog();
+verifier.resetStreams();
+
+HelperAssertions.assertTestSuiteResults( 1, 0, 0, 0, testDir );
+}
+}
Added:
maven/surefire/trunk/surefire-integration-tests/src/test/resources/testng-path
with spaces/pom.xml
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/resources/testng-path%20with%20spaces/pom.xml?rev=596883view=auto
==
---
maven/surefire/trunk/surefire-integration-tests/src/test/resources/testng-path
with spaces/pom.xml (added)
+++
maven/surefire/trunk/surefire-integration-tests/src/test/resources/testng-path
with spaces/pom.xml Tue Nov 20 15:55:01 2007
@@ -0,0 +1,60 @@
+?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/maven-v4_0_0.xsd;
+ modelVersion4.0.0/modelVersion
+
+ groupIdorg.apache.maven.plugins.surefire/groupId
+ artifactIdtestng-path-with-spaces/artifactId
+ version1.0-SNAPSHOT/version
+ nameTestNG Suites/name
+ descriptionRuns testng tests in a path with spaces/description
+
+ properties
+ testNgVersion5.7/testNgVersion
+ /properties
+
+ dependencies
+dependency
+ groupIdorg.testng/groupId
+ artifactIdtestng/artifactId
+ version${testNgVersion}/version
+ classifierjdk15/classifier
+
svn commit: r597039 - /maven/surefire/trunk/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java
Author: mauro
Date: Wed Nov 21 03:18:42 2007
New Revision: 597039
URL: http://svn.apache.org/viewvc?rev=597039view=rev
Log:
Made junit and testNG artifact names configurable and defaulting to junit:junit
and org.testng:testng
Modified:
maven/surefire/trunk/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java
Modified:
maven/surefire/trunk/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java?rev=597039r1=597038r2=597039view=diff
==
---
maven/surefire/trunk/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java
(original)
+++
maven/surefire/trunk/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java
Wed Nov 21 03:18:42 2007
@@ -323,7 +323,21 @@
* @parameter
*/
private File[] suiteXmlFiles;
-
+
+/**
+ * Allows you to specify the name of the JUnit artifact. If not set,
codejunit:junit/code will be used.
+ *
+ * @parameter expression=${junitArtifactName} default-value=junit:junit
+ */
+private String junitArtifactName;
+
+/**
+ * Allows you to specify the name of the TestNG artifact. If not set,
codeorg.testng:testng/code will be used.
+ *
+ * @parameter expression=${testNGArtifactName}
default-value=org.testng:testng
+ */
+private String testNGArtifactName;
+
/**
* (TestNG only) The attribute thread-count allows you to specify how many
threads should be allocated for this execution. Only
* makes sense to use in conjunction with parallel.
@@ -526,10 +540,10 @@
{
addArtifact( surefireBooter, surefireArtifact );
-junitArtifact = (Artifact) projectArtifactMap.get( junit:junit );
+junitArtifact = (Artifact) projectArtifactMap.get(
junitArtifactName );
// TODO: this is pretty manual, but I'd rather not require the
plugin dependencies section right now
-testNgArtifact = (Artifact) projectArtifactMap.get(
org.testng:testng );
+testNgArtifact = (Artifact) projectArtifactMap.get(
testNGArtifactName );
if ( testNgArtifact != null )
{
svn commit: r597179 - /maven/surefire/trunk/surefire-integration-tests/
Author: dfabulich Date: Wed Nov 21 10:52:52 2007 New Revision: 597179 URL: http://svn.apache.org/viewvc?rev=597179view=rev Log: Ignore derived files Modified: maven/surefire/trunk/surefire-integration-tests/ (props changed) Propchange: maven/surefire/trunk/surefire-integration-tests/ -- --- svn:ignore (original) +++ svn:ignore Wed Nov 21 10:52:52 2007 @@ -1 +1,4 @@ +.classpath +.project target +.settings
svn commit: r597235 - /maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgBeforeMethodFailure.java
Author: dfabulich Date: Wed Nov 21 14:36:18 2007 New Revision: 597235 URL: http://svn.apache.org/viewvc?rev=597235view=rev Log: Missed a file Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgBeforeMethodFailure.java Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgBeforeMethodFailure.java URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgBeforeMethodFailure.java?rev=597235r1=597234r2=597235view=diff == --- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgBeforeMethodFailure.java (original) +++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgBeforeMethodFailure.java Wed Nov 21 14:36:18 2007 @@ -26,6 +26,6 @@ //verifier.verifyErrorFreeLog(); verifier.resetStreams(); -HelperAssertions.assertTestSuiteResults( 1, 0, 0, 1, testDir ); +HelperAssertions.assertTestSuiteResults( 2, 0, 1, 1, testDir ); } }
svn commit: r597190 - in /maven/surefire/trunk: maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/ maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/repor
Author: dfabulich
Date: Wed Nov 21 11:43:06 2007
New Revision: 597190
URL: http://svn.apache.org/viewvc?rev=597190view=rev
Log:
[SUREFIRE-384] Allow TestNG to generate its native XML output
Modified:
maven/surefire/trunk/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java
maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportParser.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/HelperAssertions.java
maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGDirectoryTestSuite.java
maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGExecutor.java
maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGXmlTestSuite.java
Modified:
maven/surefire/trunk/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java?rev=597190r1=597189r2=597190view=diff
==
---
maven/surefire/trunk/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java
(original)
+++
maven/surefire/trunk/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java
Wed Nov 21 11:43:06 2007
@@ -602,7 +602,7 @@
// TODO: properties should be passed in here too
surefireBooter.addTestSuite(
org.apache.maven.surefire.testng.TestNGXmlTestSuite, new Object[]{
-suiteXmlFiles, testSourceDirectory.getAbsolutePath(),
testNgArtifact.getVersion()} );
+suiteXmlFiles, testSourceDirectory.getAbsolutePath(),
testNgArtifact.getVersion(), reportsDirectory} );
}
else
{
@@ -656,7 +656,7 @@
{
surefireBooter.addTestSuite(
org.apache.maven.surefire.testng.TestNGDirectoryTestSuite, new Object[] {
testClassesDirectory, includes, excludes,
testSourceDirectory.getAbsolutePath(),
-testNgArtifact.getVersion(), properties} );
+testNgArtifact.getVersion(), properties, reportsDirectory}
);
}
else
{
Modified:
maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportParser.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportParser.java?rev=597190r1=597189r2=597190view=diff
==
---
maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportParser.java
(original)
+++
maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportParser.java
Wed Nov 21 11:43:06 2007
@@ -63,7 +63,7 @@
{
if ( reportsDirectory.exists() )
{
-String[] xmlReportFiles = getIncludedFiles( reportsDirectory,
*.xml, *.txt );
+String[] xmlReportFiles = getIncludedFiles( reportsDirectory,
*.xml, *.txt, testng-failed.xml, testng-results.xml );
for ( int index = 0; index xmlReportFiles.length; index++ )
{
Modified:
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/HelperAssertions.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/HelperAssertions.java?rev=597190r1=597189r2=597190view=diff
==
---
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/HelperAssertions.java
(original)
+++
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/HelperAssertions.java
Wed Nov 21 11:43:06 2007
@@ -33,7 +33,12 @@
File reportsDir = new File( testDir, target/surefire-reports );
Assert.assertTrue( Reports directory is missing: +
reportsDir.getAbsolutePath(), reportsDir.exists() );
parser.setReportsDirectory( reportsDir );
-List reports = parser.parseXMLReportFiles();
+List reports;
+try {
+reports = parser.parseXMLReportFiles();
+} catch (Exception e) {
+throw new RuntimeException(Couldn't parse XML reports: +
reportsDir.getAbsolutePath(), e);
+}
Assert.assertTrue( No reports!, reports.size() 0 );
ReportTestSuite suite = (ReportTestSuite)
svn commit: r597234 - in /maven/surefire/trunk: surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testn
Author: dfabulich Date: Wed Nov 21 14:33:36 2007 New Revision: 597234 URL: http://svn.apache.org/viewvc?rev=597234view=rev Log: [SUREFIRE-376] [SUREFIRE-379] @AfterSuite failures were ignored, @BeforeMethod exceptions weren't recorded Added: maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/ConfigurationAwareTestNGReporter.java Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire376TestNgAfterSuiteFailure.java maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgBeforeMethodFailure.java maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGExecutor.java maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGReporter.java Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire376TestNgAfterSuiteFailure.java URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire376TestNgAfterSuiteFailure.java?rev=597234r1=597233r2=597234view=diff == --- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire376TestNgAfterSuiteFailure.java (original) +++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire376TestNgAfterSuiteFailure.java Wed Nov 21 14:33:36 2007 @@ -26,7 +26,7 @@ // verifier.verifyErrorFreeLog(); verifier.resetStreams(); -HelperAssertions.assertTestSuiteResults( 1, 0, 1, 0, testDir ); +HelperAssertions.assertTestSuiteResults( 2, 0, 1, 0, testDir ); } } Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgBeforeMethodFailure.java URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgBeforeMethodFailure.java?rev=597234r1=597233r2=597234view=diff == --- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgBeforeMethodFailure.java (original) +++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgBeforeMethodFailure.java Wed Nov 21 14:33:36 2007 @@ -22,7 +22,8 @@ Verifier verifier = new Verifier( testDir.getAbsolutePath() ); verifier.executeGoal( test ); -verifier.verifyErrorFreeLog(); +//errors are expected +//verifier.verifyErrorFreeLog(); verifier.resetStreams(); HelperAssertions.assertTestSuiteResults( 1, 0, 0, 1, testDir ); Added: maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/ConfigurationAwareTestNGReporter.java URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/ConfigurationAwareTestNGReporter.java?rev=597234view=auto == --- maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/ConfigurationAwareTestNGReporter.java (added) +++ maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/ConfigurationAwareTestNGReporter.java Wed Nov 21 14:33:36 2007 @@ -0,0 +1,41 @@ +package org.apache.maven.surefire.testng; + +/* + * 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.surefire.report.ReporterManager; +import org.apache.maven.surefire.suite.SurefireTestSuite; +import org.testng.internal.IResultListener; + +/** Just like TestNGReporter, but explicitly implements IResultListener; this interface is new in TestNG 5.5 + * + * @author Dan Fabulich + */ +public class ConfigurationAwareTestNGReporter +
svn commit: r597007 - /maven/surefire/trunk/surefire-providers/surefire-testng/pom.xml
Author: dfabulich Date: Wed Nov 21 01:34:18 2007 New Revision: 597007 URL: http://svn.apache.org/viewvc?rev=597007view=rev Log: Upgrade to latest TestNG 5.7 Modified: maven/surefire/trunk/surefire-providers/surefire-testng/pom.xml Modified: maven/surefire/trunk/surefire-providers/surefire-testng/pom.xml URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-testng/pom.xml?rev=597007r1=597006r2=597007view=diff == --- maven/surefire/trunk/surefire-providers/surefire-testng/pom.xml (original) +++ maven/surefire/trunk/surefire-providers/surefire-testng/pom.xml Wed Nov 21 01:34:18 2007 @@ -45,7 +45,7 @@ dependency groupIdorg.testng/groupId artifactIdtestng/artifactId - version5.5/version + version5.7/version classifierjdk14/classifier /dependency /dependencies @@ -59,7 +59,7 @@ dependency groupIdorg.testng/groupId artifactIdtestng/artifactId - version5.5/version + version5.7/version classifierjdk15/classifier /dependency /dependencies
svn commit: r596833 - in /maven/surefire/trunk/surefire-integration-tests/src/test: java/org/apache/maven/surefire/its/ resources/testng-beforeMethod/ resources/testng-beforeMethod/src/ resources/test
Author: dfabulich
Date: Tue Nov 20 13:43:51 2007
New Revision: 596833
URL: http://svn.apache.org/viewvc?rev=596833view=rev
Log:
[SUREFIRE-168] Added test for @BeforeMethod annotation
Added:
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgBeforeMethod.java
maven/surefire/trunk/surefire-integration-tests/src/test/resources/testng-beforeMethod/
maven/surefire/trunk/surefire-integration-tests/src/test/resources/testng-beforeMethod/pom.xml
maven/surefire/trunk/surefire-integration-tests/src/test/resources/testng-beforeMethod/src/
maven/surefire/trunk/surefire-integration-tests/src/test/resources/testng-beforeMethod/src/test/
maven/surefire/trunk/surefire-integration-tests/src/test/resources/testng-beforeMethod/src/test/java/
maven/surefire/trunk/surefire-integration-tests/src/test/resources/testng-beforeMethod/src/test/java/TestNGSuiteTest.java
Added:
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgBeforeMethod.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgBeforeMethod.java?rev=596833view=auto
==
---
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgBeforeMethod.java
(added)
+++
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgBeforeMethod.java
Tue Nov 20 13:43:51 2007
@@ -0,0 +1,30 @@
+package org.apache.maven.surefire.its;
+
+import java.io.File;
+
+import org.apache.maven.integrationtests.AbstractMavenIntegrationTestCase;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.util.ResourceExtractor;
+
+/**
+ * Test @BeforeMethod annotation on TestNg suite
+ *
+ * @author a href=mailto:[EMAIL PROTECTED]Dan Fabulich/a
+ *
+ */
+public class TestNgBeforeMethod
+extends AbstractMavenIntegrationTestCase
+{
+public void testTestNgBeforeMethod ()
+throws Exception
+{
+File testDir = ResourceExtractor.simpleExtractResources( getClass(),
/testng-beforeMethod );
+
+Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+verifier.executeGoal( test );
+verifier.verifyErrorFreeLog();
+verifier.resetStreams();
+
+HelperAssertions.assertTestSuiteResults( 1, 0, 0, 0, testDir );
+}
+}
Added:
maven/surefire/trunk/surefire-integration-tests/src/test/resources/testng-beforeMethod/pom.xml
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/resources/testng-beforeMethod/pom.xml?rev=596833view=auto
==
---
maven/surefire/trunk/surefire-integration-tests/src/test/resources/testng-beforeMethod/pom.xml
(added)
+++
maven/surefire/trunk/surefire-integration-tests/src/test/resources/testng-beforeMethod/pom.xml
Tue Nov 20 13:43:51 2007
@@ -0,0 +1,60 @@
+?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/maven-v4_0_0.xsd;
+ modelVersion4.0.0/modelVersion
+
+ groupIdorg.apache.maven.plugins.surefire/groupId
+ artifactIdtestng-beforeMethod/artifactId
+ version1.0-SNAPSHOT/version
+ nameTestNG Suites/name
+ descriptionUses @BeforeMethod annotation/description
+
+ properties
+ testNgVersion5.7/testNgVersion
+ /properties
+
+ dependencies
+dependency
+ groupIdorg.testng/groupId
+ artifactIdtestng/artifactId
+ version${testNgVersion}/version
+ classifierjdk15/classifier
+ scopetest/scope
+/dependency
+ /dependencies
+
+ build
+plugins
+ plugin
+groupIdorg.apache.maven.plugins/groupId
+artifactIdmaven-compiler-plugin/artifactId
+configuration
+ source1.5/source
+ target1.5/target
+/configuration
+ /plugin
+
svn commit: r596894 - /maven/surefire/trunk/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java
Author: dfabulich
Date: Tue Nov 20 16:58:42 2007
New Revision: 596894
URL: http://svn.apache.org/viewvc?rev=596894view=rev
Log:
[SUREFIRE-361] Don't set threadcount or parallel by default; these defaults
confuse TestNG 5.7
Modified:
maven/surefire/trunk/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java
Modified:
maven/surefire/trunk/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java?rev=596894r1=596893r2=596894view=diff
==
---
maven/surefire/trunk/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java
(original)
+++
maven/surefire/trunk/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java
Tue Nov 20 16:58:42 2007
@@ -328,7 +328,7 @@
* (TestNG only) The attribute thread-count allows you to specify how many
threads should be allocated for this execution. Only
* makes sense to use in conjunction with parallel.
*
- * @parameter expression=${threadCount} default-value=5
+ * @parameter expression=${threadCount}
*/
private int threadCount;
@@ -337,7 +337,7 @@
* methods that depend on each other, which will be run in the same thread
in order to respect their order of
* execution.
*
- * @parameter expression=${parallel} default-value=false
+ * @parameter expression=${parallel}
* @todo test how this works with forking, and console/file output
parallelism
*/
private String parallel;
svn commit: r597177 - /maven/surefire/trunk/surefire-integration-tests/src/test/resources/testng-suite-xml/pom.xml
Author: dfabulich Date: Wed Nov 21 10:49:00 2007 New Revision: 597177 URL: http://svn.apache.org/viewvc?rev=597177view=rev Log: Use TestNG 5.7 by default except where version is being explicitly tested Modified: maven/surefire/trunk/surefire-integration-tests/src/test/resources/testng-suite-xml/pom.xml Modified: maven/surefire/trunk/surefire-integration-tests/src/test/resources/testng-suite-xml/pom.xml URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/resources/testng-suite-xml/pom.xml?rev=597177r1=597176r2=597177view=diff == --- maven/surefire/trunk/surefire-integration-tests/src/test/resources/testng-suite-xml/pom.xml (original) +++ maven/surefire/trunk/surefire-integration-tests/src/test/resources/testng-suite-xml/pom.xml Wed Nov 21 10:49:00 2007 @@ -30,7 +30,7 @@ descriptionUses suite xml file definitions to invoke testng tests/description properties - testNgVersion5.5/testNgVersion + testNgVersion5.7/testNgVersion /properties dependencies
svn commit: r597061 - /maven/surefire/trunk/surefire-integration-tests/
Author: mauro Date: Wed Nov 21 04:51:22 2007 New Revision: 597061 URL: http://svn.apache.org/viewvc?rev=597061view=rev Log: Added target to svn:ignore. Modified: maven/surefire/trunk/surefire-integration-tests/ (props changed) Propchange: maven/surefire/trunk/surefire-integration-tests/ -- --- svn:ignore (added) +++ svn:ignore Wed Nov 21 04:51:22 2007 @@ -0,0 +1 @@ +target
svn commit: r597279 - in /maven/surefire/trunk/surefire-integration-tests/src/test: java/org/apache/maven/surefire/its/ resources/junit-twoTestCases/ resources/junit-twoTestCases/src/ resources/junit-
Author: dfabulich
Date: Wed Nov 21 16:52:50 2007
New Revision: 597279
URL: http://svn.apache.org/viewvc?rev=597279view=rev
Log:
[SUREFIRE-52] Test for multiple test cases, which apparently used to have some
kind of cumulative behavior. Seems to be fixed now.
Added:
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TwoTestCasesTest.java
maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit-twoTestCases/
(with props)
maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit-twoTestCases/pom.xml
maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit-twoTestCases/src/
maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit-twoTestCases/src/test/
maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit-twoTestCases/src/test/java/
maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit-twoTestCases/src/test/java/BasicTest.java
maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit-twoTestCases/src/test/java/TestTwo.java
Added:
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TwoTestCasesTest.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TwoTestCasesTest.java?rev=597279view=auto
==
---
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TwoTestCasesTest.java
(added)
+++
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TwoTestCasesTest.java
Wed Nov 21 16:52:50 2007
@@ -0,0 +1,30 @@
+package org.apache.maven.surefire.its;
+
+import java.io.File;
+
+import org.apache.maven.integrationtests.AbstractMavenIntegrationTestCase;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.util.ResourceExtractor;
+
+/**
+ * Test basic default configuration, runs the JUnit 3 test in the src/test
directory.
+ *
+ * @author a href=mailto:[EMAIL PROTECTED]Dan Fabulich/a
+ *
+ */
+public class TwoTestCasesTest
+extends AbstractMavenIntegrationTestCase
+{
+public void testDefaultConfiguration ()
+throws Exception
+{
+File testDir = ResourceExtractor.simpleExtractResources( getClass(),
/junit-twoTestCases );
+
+Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+verifier.executeGoal( test );
+verifier.verifyErrorFreeLog();
+verifier.resetStreams();
+
+HelperAssertions.assertTestSuiteResults( 2, 0, 0, 0, testDir );
+}
+}
Propchange:
maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit-twoTestCases/
--
--- svn:ignore (added)
+++ svn:ignore Wed Nov 21 16:52:50 2007
@@ -0,0 +1,4 @@
+.classpath
+.project
+target
+.settings
Added:
maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit-twoTestCases/pom.xml
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit-twoTestCases/pom.xml?rev=597279view=auto
==
---
maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit-twoTestCases/pom.xml
(added)
+++
maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit-twoTestCases/pom.xml
Wed Nov 21 16:52:50 2007
@@ -0,0 +1,41 @@
+?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/maven-v4_0_0.xsd;
+ modelVersion4.0.0/modelVersion
+
+ groupIdorg.apache.maven.plugins.surefire/groupId
+ artifactIdjunit-twoTestCases/artifactId
+ version1.0-SNAPSHOT/version
+ nameTest for two test cases/name
+ descriptionTest for two test cases/description
+
+ dependencies
+
svn commit: r597060 - in /maven/plugins/trunk/maven-eclipse-plugin/src: main/java/org/apache/maven/plugin/eclipse/writers/rad/ main/java/org/apache/maven/plugin/eclipse/writers/wtp/ main/java/org/apac
Author: aheritier Date: Wed Nov 21 04:49:31 2007 New Revision: 597060 URL: http://svn.apache.org/viewvc?rev=597060view=rev Log: MECLIPSE-346 : Fix previous commit. Add a test case to validate the new behavior Added: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/ (with props) maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ear/ (with props) maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ear/expected/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ear/expected/.project (with props) maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ear/expected/.settings/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ear/expected/.settings/org.eclipse.jdt.core.prefs maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ear/expected/.settings/org.eclipse.wst.common.component maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ear/expected/.settings/org.eclipse.wst.common.project.facet.core.xml (with props) maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ear/pom.xml (with props) maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ear/src/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ear/src/main/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ear/src/main/java/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ear/src/main/resources/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ear/src/test/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ear/src/test/java/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ear/src/test/resources/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ejb/ (with props) maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ejb/expected/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ejb/expected/.classpath (with props) maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ejb/expected/.project (with props) maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ejb/expected/.settings/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ejb/expected/.settings/org.eclipse.jdt.core.prefs maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ejb/expected/.settings/org.eclipse.wst.common.component maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ejb/expected/.settings/org.eclipse.wst.common.project.facet.core.xml (with props) maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ejb/pom.xml (with props) maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ejb/src/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ejb/src/main/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ejb/src/main/java/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ejb/src/main/java/example/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ejb/src/main/java/example/Hello.java (with props) maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ejb/src/main/java/example/HelloBean.java (with props) maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ejb/src/main/resources/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ejb/src/test/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ejb/src/test/java/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ejb/src/test/resources/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/pom.xml (with props) Modified: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/rad/RadApplicationXMLWriter.java maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/rad/RadJ2EEWriter.java maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/rad/RadWebSettingsWriter.java
svn commit: r597064 - /maven/shared/trunk/maven-shared-io/pom.xml
Author: vsiveton
Date: Wed Nov 21 05:07:08 2007
New Revision: 597064
URL: http://svn.apache.org/viewvc?rev=597064view=rev
Log:
o bumped to parent:8
o cleaned POM
Modified:
maven/shared/trunk/maven-shared-io/pom.xml
Modified: maven/shared/trunk/maven-shared-io/pom.xml
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-io/pom.xml?rev=597064r1=597063r2=597064view=diff
==
--- maven/shared/trunk/maven-shared-io/pom.xml (original)
+++ maven/shared/trunk/maven-shared-io/pom.xml Wed Nov 21 05:07:08 2007
@@ -17,14 +17,13 @@
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/maven-v4_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/maven-v4_0_0.xsd;
modelVersion4.0.0/modelVersion
parent
groupIdorg.apache.maven.shared/groupId
artifactIdmaven-shared-components/artifactId
-version7/version
+version8/version
/parent
artifactIdmaven-shared-io/artifactId
@@ -90,21 +89,6 @@
build
plugins
- !--
-plugin
-artifactIdmaven-clean-plugin/artifactId
-configuration
-filesets
-fileset
-directory${basedir}/directory
-includes
-includecobertura.ser/include
-/includes
-/fileset
-/filesets
-/configuration
-/plugin
- --
plugin
artifactIdmaven-surefire-plugin/artifactId
version2.3/version
svn commit: r597067 - /maven/sandbox/trunk/plugins/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java
Author: mauro Date: Wed Nov 21 05:19:44 2007 New Revision: 597067 URL: http://svn.apache.org/viewvc?rev=597067view=rev Log: Ensure runtime dependency resolution. Modified: maven/sandbox/trunk/plugins/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java Modified: maven/sandbox/trunk/plugins/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/plugins/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java?rev=597067r1=597066r2=597067view=diff == --- maven/sandbox/trunk/plugins/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java (original) +++ maven/sandbox/trunk/plugins/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java Wed Nov 21 05:19:44 2007 @@ -43,10 +43,13 @@ import org.apache.maven.project.MavenProjectHelper; /** + * Mojo that performs shading delegating to the Shader component. + * * @author Jason van Zyl * @author Mauro Talevi * @goal shade * @phase package + * @requiresDependencyResolution runtime */ public class ShadeMojo extends AbstractMojo
svn commit: r597070 - /maven/shared/trunk/maven-shared-io/pom.xml
Author: vsiveton Date: Wed Nov 21 05:25:37 2007 New Revision: 597070 URL: http://svn.apache.org/viewvc?rev=597070view=rev Log: o removed reporting part, preferred parent Modified: maven/shared/trunk/maven-shared-io/pom.xml Modified: maven/shared/trunk/maven-shared-io/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-io/pom.xml?rev=597070r1=597069r2=597070view=diff == --- maven/shared/trunk/maven-shared-io/pom.xml (original) +++ maven/shared/trunk/maven-shared-io/pom.xml Wed Nov 21 05:25:37 2007 @@ -101,15 +101,6 @@ /plugins /build - reporting -plugins - plugin -groupIdorg.codehaus.mojo/groupId -artifactIdcobertura-maven-plugin/artifactId - /plugin -/plugins - /reporting - scm connectionscm:svn:http://svn.apache.org/repos/asf/maven/shared/trunk/maven-shared-io/connection developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/shared/trunk/maven-shared-io/developerConnection
svn commit: r597073 - /maven/components/branches/maven-2.0.x/maven-core/pom.xml
Author: mauro Date: Wed Nov 21 05:29:04 2007 New Revision: 597073 URL: http://svn.apache.org/viewvc?rev=597073view=rev Log: Upgraded shade plugin. Modified: maven/components/branches/maven-2.0.x/maven-core/pom.xml Modified: maven/components/branches/maven-2.0.x/maven-core/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-core/pom.xml?rev=597073r1=597072r2=597073view=diff == --- maven/components/branches/maven-2.0.x/maven-core/pom.xml (original) +++ maven/components/branches/maven-2.0.x/maven-core/pom.xml Wed Nov 21 05:29:04 2007 @@ -34,9 +34,8 @@ build plugins plugin -artifactIdshade-maven-plugin/artifactId -groupIdorg.codehaus.mojo/groupId -version1.0-alpha-12/version +artifactIdmaven-shade-plugin/artifactId +version1.0-alpha-13-SNAPSHOT/version executions execution phasepackage/phase @@ -53,7 +52,7 @@ /keepDependenciesWithProvidedScope transformers transformer - implementation=org.codehaus.mojo.shade.resource.ComponentsXmlResourceTransformer / + implementation=org.apache.maven.plugins.shade.resource.ComponentsXmlResourceTransformer / /transformers artifactSet excludes
svn commit: r597078 - /maven/shared/trunk/maven-shared-io/pom.xml
Author: vsiveton Date: Wed Nov 21 05:36:40 2007 New Revision: 597078 URL: http://svn.apache.org/viewvc?rev=597078view=rev Log: [maven-release-plugin] prepare release maven-shared-io-1.1 Modified: maven/shared/trunk/maven-shared-io/pom.xml Modified: maven/shared/trunk/maven-shared-io/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-io/pom.xml?rev=597078r1=597077r2=597078view=diff == --- maven/shared/trunk/maven-shared-io/pom.xml (original) +++ maven/shared/trunk/maven-shared-io/pom.xml Wed Nov 21 05:36:40 2007 @@ -27,7 +27,7 @@ /parent artifactIdmaven-shared-io/artifactId - version1.1-SNAPSHOT/version + version1.1/version nameMaven Shared I/O API/name descriptionAPI for I/O support like logging, download or file scanning./description @@ -102,9 +102,9 @@ /build scm - connectionscm:svn:http://svn.apache.org/repos/asf/maven/shared/trunk/maven-shared-io/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/shared/trunk/maven-shared-io/developerConnection - urlhttp://svn.apache.org/viewcvs.cgi/maven/shared/trunk/maven-shared-io/url + connectionscm:svn:http://svn.apache.org/repos/asf/maven/shared/tags/maven-shared-io-1.1/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/shared/tags/maven-shared-io-1.1/developerConnection + urlhttp://svn.apache.org/viewcvs.cgi/maven/shared/tags/maven-shared-io-1.1/url /scm distributionManagement
svn commit: r597079 - in /maven/shared/tags/maven-shared-io-1.1: ./ pom.xml src/main/java/org/apache/maven/shared/io/logging/DefaultMessageHolder.java
Author: vsiveton Date: Wed Nov 21 05:36:47 2007 New Revision: 597079 URL: http://svn.apache.org/viewvc?rev=597079view=rev Log: [maven-release-plugin] copy for tag maven-shared-io-1.1 Added: maven/shared/tags/maven-shared-io-1.1/ - copied from r595956, maven/shared/trunk/maven-shared-io/ maven/shared/tags/maven-shared-io-1.1/pom.xml - copied unchanged from r597078, maven/shared/trunk/maven-shared-io/pom.xml maven/shared/tags/maven-shared-io-1.1/src/main/java/org/apache/maven/shared/io/logging/DefaultMessageHolder.java - copied unchanged from r596634, maven/shared/trunk/maven-shared-io/src/main/java/org/apache/maven/shared/io/logging/DefaultMessageHolder.java
svn commit: r597080 - /maven/shared/trunk/maven-shared-io/pom.xml
Author: vsiveton Date: Wed Nov 21 05:36:50 2007 New Revision: 597080 URL: http://svn.apache.org/viewvc?rev=597080view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: maven/shared/trunk/maven-shared-io/pom.xml Modified: maven/shared/trunk/maven-shared-io/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-io/pom.xml?rev=597080r1=597079r2=597080view=diff == --- maven/shared/trunk/maven-shared-io/pom.xml (original) +++ maven/shared/trunk/maven-shared-io/pom.xml Wed Nov 21 05:36:50 2007 @@ -27,7 +27,7 @@ /parent artifactIdmaven-shared-io/artifactId - version1.1/version + version1.2-SNAPSHOT/version nameMaven Shared I/O API/name descriptionAPI for I/O support like logging, download or file scanning./description @@ -102,9 +102,9 @@ /build scm - connectionscm:svn:http://svn.apache.org/repos/asf/maven/shared/tags/maven-shared-io-1.1/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/shared/tags/maven-shared-io-1.1/developerConnection - urlhttp://svn.apache.org/viewcvs.cgi/maven/shared/tags/maven-shared-io-1.1/url + connectionscm:svn:http://svn.apache.org/repos/asf/maven/shared/trunk/maven-shared-io/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/shared/trunk/maven-shared-io/developerConnection + urlhttp://svn.apache.org/viewcvs.cgi/maven/shared/trunk/maven-shared-io/url /scm distributionManagement
svn commit: r597081 - /maven/sandbox/trunk/plugins/maven-shade-plugin/pom.xml
Author: mauro Date: Wed Nov 21 05:37:33 2007 New Revision: 597081 URL: http://svn.apache.org/viewvc?rev=597081view=rev Log: [maven-release-plugin] prepare release maven-shade-plugin-1.0-alpha-13 Modified: maven/sandbox/trunk/plugins/maven-shade-plugin/pom.xml Modified: maven/sandbox/trunk/plugins/maven-shade-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/plugins/maven-shade-plugin/pom.xml?rev=597081r1=597080r2=597081view=diff == --- maven/sandbox/trunk/plugins/maven-shade-plugin/pom.xml (original) +++ maven/sandbox/trunk/plugins/maven-shade-plugin/pom.xml Wed Nov 21 05:37:33 2007 @@ -1,105 +1,92 @@ -?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/maven-v4_0_0.xsd; - modelVersion4.0.0/modelVersion - parent - artifactIdmaven-plugins/artifactId - groupIdorg.apache.maven.plugins/groupId - version8/version - /parent - artifactIdmaven-shade-plugin/artifactId - packagingmaven-plugin/packaging - version1.0-alpha-13-SNAPSHOT/version - namemaven-shade-plugin/name - licenses -license - nameApache License 2.0/name - urlhttp://www.apache.org/licenses/LICENSE-2.0.txt/url - distributionrepo/distribution -/license - /licenses +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/maven-v4_0_0.xsd; + modelVersion4.0.0/modelVersion + parent + artifactIdmaven-plugins/artifactId + groupIdorg.apache.maven.plugins/groupId + version8/version + /parent + artifactIdmaven-shade-plugin/artifactId + packagingmaven-plugin/packaging + version1.0-alpha-13/version + namemaven-shade-plugin/name + licenses +license + nameApache License 2.0/name + urlhttp://www.apache.org/licenses/LICENSE-2.0.txt/url + distributionrepo/distribution +/license + /licenses developers developer idjvanzyl/id nameJason van Zyl/name timezone-8/timezone -/developer +/developer developer idmauro/id nameMauro Talevi/name timezone0/timezone /developer - /developers - - dependencies -dependency - groupIdasm/groupId - artifactIdasm-all/artifactId - version20070324/version -/dependency -dependency - groupIdjdom/groupId - artifactIdjdom/artifactId - version1.0/version -/dependency -dependency - groupIdorg.codehaus.plexus/groupId - artifactIdplexus-utils/artifactId - version1.4.1/version -/dependency -dependency - groupIdorg.apache.maven/groupId - artifactIdmaven-plugin-api/artifactId - version2.0.6/version -/dependency -dependency - groupIdorg.apache.maven/groupId - artifactIdmaven-model/artifactId - version2.0.6/version -/dependency -dependency - groupIdorg.apache.maven/groupId - artifactIdmaven-project/artifactId - version2.0.6/version -/dependency -dependency - groupIdjunit/groupId - artifactIdjunit/artifactId - version3.8.1/version - scopetest/scope -/dependency - /dependencies - build - plugins - plugin -groupIdorg.codehaus.plexus/groupId -artifactIdplexus-maven-plugin/artifactId -version1.3.5/version -executions - execution -goals - goaldescriptor/goal -/goals - /execution -/executions - /plugin -/plugins - /build + /developers + + dependencies +dependency + groupIdasm/groupId + artifactIdasm-all/artifactId + version20070324/version +/dependency +dependency + groupIdjdom/groupId + artifactIdjdom/artifactId + version1.0/version +/dependency +dependency + groupIdorg.codehaus.plexus/groupId + artifactIdplexus-utils/artifactId + version1.4.1/version +/dependency +dependency +
svn commit: r597082 - in /maven/plugins/tags/maven-shade-plugin-1.0-alpha-13: ./ pom.xml src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java
Author: mauro Date: Wed Nov 21 05:37:50 2007 New Revision: 597082 URL: http://svn.apache.org/viewvc?rev=597082view=rev Log: [maven-scm] copy for tag maven-shade-plugin-1.0-alpha-13 Added: maven/plugins/tags/maven-shade-plugin-1.0-alpha-13/ - copied from r597066, maven/sandbox/trunk/plugins/maven-shade-plugin/ maven/plugins/tags/maven-shade-plugin-1.0-alpha-13/pom.xml - copied unchanged from r597081, maven/sandbox/trunk/plugins/maven-shade-plugin/pom.xml maven/plugins/tags/maven-shade-plugin-1.0-alpha-13/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java - copied unchanged from r597067, maven/sandbox/trunk/plugins/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java
svn commit: r597083 - /maven/sandbox/trunk/plugins/maven-shade-plugin/pom.xml
Author: mauro Date: Wed Nov 21 05:38:02 2007 New Revision: 597083 URL: http://svn.apache.org/viewvc?rev=597083view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: maven/sandbox/trunk/plugins/maven-shade-plugin/pom.xml Modified: maven/sandbox/trunk/plugins/maven-shade-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/plugins/maven-shade-plugin/pom.xml?rev=597083r1=597082r2=597083view=diff == --- maven/sandbox/trunk/plugins/maven-shade-plugin/pom.xml (original) +++ maven/sandbox/trunk/plugins/maven-shade-plugin/pom.xml Wed Nov 21 05:38:02 2007 @@ -7,7 +7,7 @@ /parent artifactIdmaven-shade-plugin/artifactId packagingmaven-plugin/packaging - version1.0-alpha-13/version + version1.0-alpha-14-SNAPSHOT/version namemaven-shade-plugin/name licenses license @@ -83,10 +83,4 @@ /plugin /plugins /build - - scm - connectionscm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-shade-plugin-1.0-alpha-13/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-shade-plugin-1.0-alpha-13/developerConnection - urlhttps://svn.apache.org/repos/asf/maven/plugins/tags/maven-shade-plugin-1.0-alpha-13/url - /scm /project
svn commit: r597085 - /maven/components/branches/maven-2.0.x/pom.xml
Author: brianf Date: Wed Nov 21 05:42:45 2007 New Revision: 597085 URL: http://svn.apache.org/viewvc?rev=597085view=rev Log: bumping the parent to 6 and locking down all plugins Modified: maven/components/branches/maven-2.0.x/pom.xml Modified: maven/components/branches/maven-2.0.x/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/pom.xml?rev=597085r1=597084r2=597085view=diff == --- maven/components/branches/maven-2.0.x/pom.xml (original) +++ maven/components/branches/maven-2.0.x/pom.xml Wed Nov 21 05:42:45 2007 @@ -22,7 +22,7 @@ parent groupIdorg.apache.maven/groupId artifactIdmaven-parent/artifactId -version5/version +version6/version relativePath../pom/maven/pom.xml/relativePath /parent artifactIdmaven/artifactId @@ -62,6 +62,11 @@ artifactIdmaven-jar-plugin/artifactId version2.1/version /plugin + plugin + groupIdorg.apache.maven.plugins/groupId + artifactIdmaven-compiler-plugin/artifactId + version2.0.2/version +/plugin plugin artifactIdmaven-assembly-plugin/artifactId version2.2-beta-1/version @@ -81,6 +86,18 @@ plugin artifactIdmaven-site-plugin/artifactId version2.0-beta-5/version +/plugin + plugin + artifactIdmaven-resources-plugin/artifactId + version2.2/version +/plugin + plugin + artifactIdmaven-remote-resources-plugin/artifactId + version1.0-alpha-15/version +/plugin + plugin + artifactIdmaven-clean-plugin/artifactId + version2.1.1/version /plugin plugin artifactIdmaven-release-plugin/artifactId
svn commit: r597091 - /maven/components/branches/maven-2.0.x/maven-core/pom.xml
Author: brianf Date: Wed Nov 21 06:00:57 2007 New Revision: 597091 URL: http://svn.apache.org/viewvc?rev=597091view=rev Log: repaired shade Modified: maven/components/branches/maven-2.0.x/maven-core/pom.xml Modified: maven/components/branches/maven-2.0.x/maven-core/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-core/pom.xml?rev=597091r1=597090r2=597091view=diff == --- maven/components/branches/maven-2.0.x/maven-core/pom.xml (original) +++ maven/components/branches/maven-2.0.x/maven-core/pom.xml Wed Nov 21 06:00:57 2007 @@ -35,7 +35,7 @@ plugins plugin artifactIdmaven-shade-plugin/artifactId -version1.0-alpha-13-SNAPSHOT/version +version1.0-alpha-13/version executions execution phasepackage/phase
svn commit: r597093 - in /maven/components/branches/maven-2.0.x: ./ maven-artifact-manager/ maven-artifact-test/ maven-artifact/ maven-core/ maven-error-diagnostics/ maven-model/ maven-monitor/ maven-
Author: brianf Date: Wed Nov 21 06:06:33 2007 New Revision: 597093 URL: http://svn.apache.org/viewvc?rev=597093view=rev Log: [maven-release-plugin] prepare release maven-2.0.8 Modified: maven/components/branches/maven-2.0.x/maven-artifact-manager/pom.xml maven/components/branches/maven-2.0.x/maven-artifact-test/pom.xml maven/components/branches/maven-2.0.x/maven-artifact/pom.xml maven/components/branches/maven-2.0.x/maven-core/pom.xml maven/components/branches/maven-2.0.x/maven-error-diagnostics/pom.xml maven/components/branches/maven-2.0.x/maven-model/pom.xml maven/components/branches/maven-2.0.x/maven-monitor/pom.xml maven/components/branches/maven-2.0.x/maven-plugin-api/pom.xml maven/components/branches/maven-2.0.x/maven-plugin-descriptor/pom.xml maven/components/branches/maven-2.0.x/maven-plugin-parameter-documenter/pom.xml maven/components/branches/maven-2.0.x/maven-plugin-registry/pom.xml maven/components/branches/maven-2.0.x/maven-profile/pom.xml maven/components/branches/maven-2.0.x/maven-project/pom.xml maven/components/branches/maven-2.0.x/maven-reporting/maven-reporting-api/pom.xml maven/components/branches/maven-2.0.x/maven-reporting/pom.xml maven/components/branches/maven-2.0.x/maven-repository-metadata/pom.xml maven/components/branches/maven-2.0.x/maven-script/maven-script-ant/pom.xml maven/components/branches/maven-2.0.x/maven-script/maven-script-beanshell/pom.xml maven/components/branches/maven-2.0.x/maven-script/pom.xml maven/components/branches/maven-2.0.x/maven-settings/pom.xml maven/components/branches/maven-2.0.x/pom.xml Modified: maven/components/branches/maven-2.0.x/maven-artifact-manager/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-artifact-manager/pom.xml?rev=597093r1=597092r2=597093view=diff == --- maven/components/branches/maven-2.0.x/maven-artifact-manager/pom.xml (original) +++ maven/components/branches/maven-2.0.x/maven-artifact-manager/pom.xml Wed Nov 21 06:06:33 2007 @@ -23,7 +23,7 @@ parent artifactIdmaven/artifactId groupIdorg.apache.maven/groupId -version2.0.8-SNAPSHOT/version +version2.0.8/version /parent modelVersion4.0.0/modelVersion artifactIdmaven-artifact-manager/artifactId Modified: maven/components/branches/maven-2.0.x/maven-artifact-test/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-artifact-test/pom.xml?rev=597093r1=597092r2=597093view=diff == --- maven/components/branches/maven-2.0.x/maven-artifact-test/pom.xml (original) +++ maven/components/branches/maven-2.0.x/maven-artifact-test/pom.xml Wed Nov 21 06:06:33 2007 @@ -23,7 +23,7 @@ parent artifactIdmaven/artifactId groupIdorg.apache.maven/groupId -version2.0.8-SNAPSHOT/version +version2.0.8/version /parent modelVersion4.0.0/modelVersion artifactIdmaven-artifact-test/artifactId Modified: maven/components/branches/maven-2.0.x/maven-artifact/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-artifact/pom.xml?rev=597093r1=597092r2=597093view=diff == --- maven/components/branches/maven-2.0.x/maven-artifact/pom.xml (original) +++ maven/components/branches/maven-2.0.x/maven-artifact/pom.xml Wed Nov 21 06:06:33 2007 @@ -23,7 +23,7 @@ parent artifactIdmaven/artifactId groupIdorg.apache.maven/groupId -version2.0.8-SNAPSHOT/version +version2.0.8/version /parent modelVersion4.0.0/modelVersion artifactIdmaven-artifact/artifactId Modified: maven/components/branches/maven-2.0.x/maven-core/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-core/pom.xml?rev=597093r1=597092r2=597093view=diff == --- maven/components/branches/maven-2.0.x/maven-core/pom.xml (original) +++ maven/components/branches/maven-2.0.x/maven-core/pom.xml Wed Nov 21 06:06:33 2007 @@ -1,32 +1,8 @@ -?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 t - his 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
svn commit: r597094 - in /maven/components/tags/maven-2.0.8: ./ maven-artifact-manager/ maven-artifact-test/ maven-artifact/ maven-core/ maven-error-diagnostics/ maven-model/ maven-monitor/ maven-plug
Author: brianf Date: Wed Nov 21 06:07:05 2007 New Revision: 597094 URL: http://svn.apache.org/viewvc?rev=597094view=rev Log: [maven-release-plugin] copy for tag maven-2.0.8 Added: maven/components/tags/maven-2.0.8/ - copied from r597091, maven/components/branches/maven-2.0.x/ maven/components/tags/maven-2.0.8/maven-artifact-manager/pom.xml - copied unchanged from r597093, maven/components/branches/maven-2.0.x/maven-artifact-manager/pom.xml maven/components/tags/maven-2.0.8/maven-artifact-test/pom.xml - copied unchanged from r597093, maven/components/branches/maven-2.0.x/maven-artifact-test/pom.xml maven/components/tags/maven-2.0.8/maven-artifact/pom.xml - copied unchanged from r597093, maven/components/branches/maven-2.0.x/maven-artifact/pom.xml maven/components/tags/maven-2.0.8/maven-core/pom.xml - copied unchanged from r597093, maven/components/branches/maven-2.0.x/maven-core/pom.xml maven/components/tags/maven-2.0.8/maven-error-diagnostics/pom.xml - copied unchanged from r597093, maven/components/branches/maven-2.0.x/maven-error-diagnostics/pom.xml maven/components/tags/maven-2.0.8/maven-model/pom.xml - copied unchanged from r597093, maven/components/branches/maven-2.0.x/maven-model/pom.xml maven/components/tags/maven-2.0.8/maven-monitor/pom.xml - copied unchanged from r597093, maven/components/branches/maven-2.0.x/maven-monitor/pom.xml maven/components/tags/maven-2.0.8/maven-plugin-api/pom.xml - copied unchanged from r597093, maven/components/branches/maven-2.0.x/maven-plugin-api/pom.xml maven/components/tags/maven-2.0.8/maven-plugin-descriptor/pom.xml - copied unchanged from r597093, maven/components/branches/maven-2.0.x/maven-plugin-descriptor/pom.xml maven/components/tags/maven-2.0.8/maven-plugin-parameter-documenter/pom.xml - copied unchanged from r597093, maven/components/branches/maven-2.0.x/maven-plugin-parameter-documenter/pom.xml maven/components/tags/maven-2.0.8/maven-plugin-registry/pom.xml - copied unchanged from r597093, maven/components/branches/maven-2.0.x/maven-plugin-registry/pom.xml maven/components/tags/maven-2.0.8/maven-profile/pom.xml - copied unchanged from r597093, maven/components/branches/maven-2.0.x/maven-profile/pom.xml maven/components/tags/maven-2.0.8/maven-project/pom.xml - copied unchanged from r597093, maven/components/branches/maven-2.0.x/maven-project/pom.xml maven/components/tags/maven-2.0.8/maven-reporting/maven-reporting-api/pom.xml - copied unchanged from r597093, maven/components/branches/maven-2.0.x/maven-reporting/maven-reporting-api/pom.xml maven/components/tags/maven-2.0.8/maven-reporting/pom.xml - copied unchanged from r597093, maven/components/branches/maven-2.0.x/maven-reporting/pom.xml maven/components/tags/maven-2.0.8/maven-repository-metadata/pom.xml - copied unchanged from r597093, maven/components/branches/maven-2.0.x/maven-repository-metadata/pom.xml maven/components/tags/maven-2.0.8/maven-script/maven-script-ant/pom.xml - copied unchanged from r597093, maven/components/branches/maven-2.0.x/maven-script/maven-script-ant/pom.xml maven/components/tags/maven-2.0.8/maven-script/maven-script-beanshell/pom.xml - copied unchanged from r597093, maven/components/branches/maven-2.0.x/maven-script/maven-script-beanshell/pom.xml maven/components/tags/maven-2.0.8/maven-script/pom.xml - copied unchanged from r597093, maven/components/branches/maven-2.0.x/maven-script/pom.xml maven/components/tags/maven-2.0.8/maven-settings/pom.xml - copied unchanged from r597093, maven/components/branches/maven-2.0.x/maven-settings/pom.xml maven/components/tags/maven-2.0.8/pom.xml - copied unchanged from r597093, maven/components/branches/maven-2.0.x/pom.xml
svn commit: r597095 - in /maven/components/branches/maven-2.0.x: ./ maven-artifact-manager/ maven-artifact-test/ maven-artifact/ maven-core/ maven-error-diagnostics/ maven-model/ maven-monitor/ maven-
Author: brianf Date: Wed Nov 21 06:07:32 2007 New Revision: 597095 URL: http://svn.apache.org/viewvc?rev=597095view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: maven/components/branches/maven-2.0.x/maven-artifact-manager/pom.xml maven/components/branches/maven-2.0.x/maven-artifact-test/pom.xml maven/components/branches/maven-2.0.x/maven-artifact/pom.xml maven/components/branches/maven-2.0.x/maven-core/pom.xml maven/components/branches/maven-2.0.x/maven-error-diagnostics/pom.xml maven/components/branches/maven-2.0.x/maven-model/pom.xml maven/components/branches/maven-2.0.x/maven-monitor/pom.xml maven/components/branches/maven-2.0.x/maven-plugin-api/pom.xml maven/components/branches/maven-2.0.x/maven-plugin-descriptor/pom.xml maven/components/branches/maven-2.0.x/maven-plugin-parameter-documenter/pom.xml maven/components/branches/maven-2.0.x/maven-plugin-registry/pom.xml maven/components/branches/maven-2.0.x/maven-profile/pom.xml maven/components/branches/maven-2.0.x/maven-project/pom.xml maven/components/branches/maven-2.0.x/maven-reporting/maven-reporting-api/pom.xml maven/components/branches/maven-2.0.x/maven-reporting/pom.xml maven/components/branches/maven-2.0.x/maven-repository-metadata/pom.xml maven/components/branches/maven-2.0.x/maven-script/maven-script-ant/pom.xml maven/components/branches/maven-2.0.x/maven-script/maven-script-beanshell/pom.xml maven/components/branches/maven-2.0.x/maven-script/pom.xml maven/components/branches/maven-2.0.x/maven-settings/pom.xml maven/components/branches/maven-2.0.x/pom.xml Modified: maven/components/branches/maven-2.0.x/maven-artifact-manager/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-artifact-manager/pom.xml?rev=597095r1=597094r2=597095view=diff == --- maven/components/branches/maven-2.0.x/maven-artifact-manager/pom.xml (original) +++ maven/components/branches/maven-2.0.x/maven-artifact-manager/pom.xml Wed Nov 21 06:07:32 2007 @@ -23,7 +23,7 @@ parent artifactIdmaven/artifactId groupIdorg.apache.maven/groupId -version2.0.8/version +version2.0.9-SNAPSHOT/version /parent modelVersion4.0.0/modelVersion artifactIdmaven-artifact-manager/artifactId Modified: maven/components/branches/maven-2.0.x/maven-artifact-test/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-artifact-test/pom.xml?rev=597095r1=597094r2=597095view=diff == --- maven/components/branches/maven-2.0.x/maven-artifact-test/pom.xml (original) +++ maven/components/branches/maven-2.0.x/maven-artifact-test/pom.xml Wed Nov 21 06:07:32 2007 @@ -23,7 +23,7 @@ parent artifactIdmaven/artifactId groupIdorg.apache.maven/groupId -version2.0.8/version +version2.0.9-SNAPSHOT/version /parent modelVersion4.0.0/modelVersion artifactIdmaven-artifact-test/artifactId Modified: maven/components/branches/maven-2.0.x/maven-artifact/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-artifact/pom.xml?rev=597095r1=597094r2=597095view=diff == --- maven/components/branches/maven-2.0.x/maven-artifact/pom.xml (original) +++ maven/components/branches/maven-2.0.x/maven-artifact/pom.xml Wed Nov 21 06:07:32 2007 @@ -23,7 +23,7 @@ parent artifactIdmaven/artifactId groupIdorg.apache.maven/groupId -version2.0.8/version +version2.0.9-SNAPSHOT/version /parent modelVersion4.0.0/modelVersion artifactIdmaven-artifact/artifactId Modified: maven/components/branches/maven-2.0.x/maven-core/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-core/pom.xml?rev=597095r1=597094r2=597095view=diff == --- maven/components/branches/maven-2.0.x/maven-core/pom.xml (original) +++ maven/components/branches/maven-2.0.x/maven-core/pom.xml Wed Nov 21 06:07:32 2007 @@ -2,7 +2,7 @@ parent artifactIdmaven/artifactId groupIdorg.apache.maven/groupId -version2.0.8/version +version2.0.9-SNAPSHOT/version /parent modelVersion4.0.0/modelVersion artifactIdmaven-core/artifactId Modified: maven/components/branches/maven-2.0.x/maven-error-diagnostics/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-error-diagnostics/pom.xml?rev=597095r1=597094r2=597095view=diff == --- maven/components/branches/maven-2.0.x/maven-error-diagnostics/pom.xml (original) +++ maven/components/branches/maven-2.0.x/maven-error-diagnostics/pom.xml Wed Nov 21 06:07:32 2007 @@ -23,7 +23,7 @@
svn commit: r597116 - /maven/components/branches/maven-2.0.x/maven-core/src/assemble/bin.xml
Author: brianf Date: Wed Nov 21 07:37:00 2007 New Revision: 597116 URL: http://svn.apache.org/viewvc?rev=597116view=rev Log: include debug script for unix assemblies Modified: maven/components/branches/maven-2.0.x/maven-core/src/assemble/bin.xml Modified: maven/components/branches/maven-2.0.x/maven-core/src/assemble/bin.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-core/src/assemble/bin.xml?rev=597116r1=597115r2=597116view=diff == --- maven/components/branches/maven-2.0.x/maven-core/src/assemble/bin.xml (original) +++ maven/components/branches/maven-2.0.x/maven-core/src/assemble/bin.xml Wed Nov 21 07:37:00 2007 @@ -55,6 +55,7 @@ includes includem2/include includemvn/include + includemvnDebug/include /includes lineEndingunix/lineEnding fileMode0755/fileMode
svn commit: r597122 - in /maven/components/branches/maven-2.0.x: ./ maven-artifact-manager/ maven-artifact-test/ maven-artifact/ maven-core/ maven-error-diagnostics/ maven-model/ maven-monitor/ maven-
Author: brianf Date: Wed Nov 21 07:46:01 2007 New Revision: 597122 URL: http://svn.apache.org/viewvc?rev=597122view=rev Log: rolling back again. Modified: maven/components/branches/maven-2.0.x/maven-artifact-manager/pom.xml maven/components/branches/maven-2.0.x/maven-artifact-test/pom.xml maven/components/branches/maven-2.0.x/maven-artifact/pom.xml maven/components/branches/maven-2.0.x/maven-core/pom.xml maven/components/branches/maven-2.0.x/maven-error-diagnostics/pom.xml maven/components/branches/maven-2.0.x/maven-model/pom.xml maven/components/branches/maven-2.0.x/maven-monitor/pom.xml maven/components/branches/maven-2.0.x/maven-plugin-api/pom.xml maven/components/branches/maven-2.0.x/maven-plugin-descriptor/pom.xml maven/components/branches/maven-2.0.x/maven-plugin-parameter-documenter/pom.xml maven/components/branches/maven-2.0.x/maven-plugin-registry/pom.xml maven/components/branches/maven-2.0.x/maven-profile/pom.xml maven/components/branches/maven-2.0.x/maven-project/pom.xml maven/components/branches/maven-2.0.x/maven-reporting/maven-reporting-api/pom.xml maven/components/branches/maven-2.0.x/maven-reporting/pom.xml maven/components/branches/maven-2.0.x/maven-repository-metadata/pom.xml maven/components/branches/maven-2.0.x/maven-script/maven-script-ant/pom.xml maven/components/branches/maven-2.0.x/maven-script/maven-script-beanshell/pom.xml maven/components/branches/maven-2.0.x/maven-script/pom.xml maven/components/branches/maven-2.0.x/maven-settings/pom.xml maven/components/branches/maven-2.0.x/pom.xml Modified: maven/components/branches/maven-2.0.x/maven-artifact-manager/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-artifact-manager/pom.xml?rev=597122r1=597121r2=597122view=diff == --- maven/components/branches/maven-2.0.x/maven-artifact-manager/pom.xml (original) +++ maven/components/branches/maven-2.0.x/maven-artifact-manager/pom.xml Wed Nov 21 07:46:01 2007 @@ -23,7 +23,7 @@ parent artifactIdmaven/artifactId groupIdorg.apache.maven/groupId -version2.0.9-SNAPSHOT/version +version2.0.8-SNAPSHOT/version /parent modelVersion4.0.0/modelVersion artifactIdmaven-artifact-manager/artifactId Modified: maven/components/branches/maven-2.0.x/maven-artifact-test/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-artifact-test/pom.xml?rev=597122r1=597121r2=597122view=diff == --- maven/components/branches/maven-2.0.x/maven-artifact-test/pom.xml (original) +++ maven/components/branches/maven-2.0.x/maven-artifact-test/pom.xml Wed Nov 21 07:46:01 2007 @@ -23,7 +23,7 @@ parent artifactIdmaven/artifactId groupIdorg.apache.maven/groupId -version2.0.9-SNAPSHOT/version +version2.0.8-SNAPSHOT/version /parent modelVersion4.0.0/modelVersion artifactIdmaven-artifact-test/artifactId Modified: maven/components/branches/maven-2.0.x/maven-artifact/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-artifact/pom.xml?rev=597122r1=597121r2=597122view=diff == --- maven/components/branches/maven-2.0.x/maven-artifact/pom.xml (original) +++ maven/components/branches/maven-2.0.x/maven-artifact/pom.xml Wed Nov 21 07:46:01 2007 @@ -23,7 +23,7 @@ parent artifactIdmaven/artifactId groupIdorg.apache.maven/groupId -version2.0.9-SNAPSHOT/version +version2.0.8-SNAPSHOT/version /parent modelVersion4.0.0/modelVersion artifactIdmaven-artifact/artifactId Modified: maven/components/branches/maven-2.0.x/maven-core/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-core/pom.xml?rev=597122r1=597121r2=597122view=diff == --- maven/components/branches/maven-2.0.x/maven-core/pom.xml (original) +++ maven/components/branches/maven-2.0.x/maven-core/pom.xml Wed Nov 21 07:46:01 2007 @@ -1,8 +1,32 @@ -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/maven-v4_0_0.xsd; +?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 t + his 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
svn commit: r597147 - /maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/EclipsePluginTest.java
Author: aheritier
Date: Wed Nov 21 09:02:01 2007
New Revision: 597147
URL: http://svn.apache.org/viewvc?rev=597147view=rev
Log:
Fix testMECLIPSE-346 : Remove clean in test
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/EclipsePluginTest.java
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/EclipsePluginTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/EclipsePluginTest.java?rev=597147r1=597146r2=597147view=diff
==
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/EclipsePluginTest.java
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/EclipsePluginTest.java
Wed Nov 21 09:02:01 2007
@@ -369,22 +369,6 @@
testProject( project-34 );
}
-public void testJeeSimple()
-throws Exception
-{
-// Install artefacts
-File basedir = getTestFile( target/test-classes/projects/j2ee-simple
);
-File pom = new File( basedir, pom.xml );
-List goals = new ArrayList();
-goals.add( install );
-goals.add( clean );
-executeMaven( pom, new Properties(), goals );
-// Test project
-testProject( j2ee-simple );
-checkContextRoot( basedir, servlets/servlet, ear, servlet );
-
-}
-
public void testProject35()
throws Exception
{
@@ -422,6 +406,34 @@
}
}
}
+
+public void testProject36()
+throws Exception
+{
+// Install artefacts
+File basedir = getTestFile( target/test-classes/projects/project-36
);
+File pom = new File( basedir, pom.xml );
+List goals = new ArrayList();
+goals.add( install );
+executeMaven( pom, new Properties(), goals );
+// Test
+testProject( project-36 );
+}
+
+public void testJeeSimple()
+throws Exception
+{
+// Install artefacts
+File basedir = getTestFile( target/test-classes/projects/j2ee-simple
);
+File pom = new File( basedir, pom.xml );
+List goals = new ArrayList();
+goals.add( install );
+executeMaven( pom, new Properties(), goals );
+// Test project
+testProject( j2ee-simple );
+checkContextRoot( basedir, servlets/servlet, ear, servlet );
+
+}
private void checkContextRoot( File basedir, String warModule, String
earModule, String expectedContextRoot )
throws FileNotFoundException, XmlPullParserException, IOException
@@ -456,7 +468,6 @@
}
}
}
-
/**
* MECLIPSE-287 : dependencies with and without classifiers MECLIPSE-151 :
test jar source attachments
*
@@ -468,25 +479,10 @@
* file-comparing step which at the moment just does line by line
comparison project 7 is affected by this as well.
* public void testProject33() throws Exception { testProject(
project-33 ); }
*/
-
+
/*
* TODO: Add a test for downloadJavadocs. Currently, eclipse doesn't
support having variables in the javadoc path.
* This means that the expected .classpath can't match the final result as
the result will have the absolute path to
* the user's local repo.
*/
-
-public void testProject36()
-throws Exception
-{
-// Install artefacts
-File basedir = getTestFile( target/test-classes/projects/project-36
);
-File pom = new File( basedir, pom.xml );
-List goals = new ArrayList();
-goals.add( install );
-goals.add( clean );
-executeMaven( pom, new Properties(), goals );
-// Test
-testProject( project-36 );
-}
-
}
svn commit: r597162 - in /maven/components/trunk: maven-embedder/src/main/java/org/apache/maven/embedder/ maven-project/src/main/java/org/apache/maven/project/ maven-project/src/test/java/org/apache/m
Author: jvanzyl
Date: Wed Nov 21 09:51:56 2007
New Revision: 597162
URL: http://svn.apache.org/viewvc?rev=597162view=rev
Log:
o adding backward compat method in the project builder
Modified:
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProjectBuilder.java
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java
Modified:
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java?rev=597162r1=597161r2=597162view=diff
==
---
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
(original)
+++
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
Wed Nov 21 09:51:56 2007
@@ -405,7 +405,7 @@
try
{
-projectBuildingResult = mavenProjectBuilder.buildWithDependencies(
+projectBuildingResult =
mavenProjectBuilder.buildProjectWithDependencies(
request.getPom(),
request.getLocalRepository(),
request.getProfileManager() );
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java?rev=597162r1=597161r2=597162view=diff
==
---
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
(original)
+++
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
Wed Nov 21 09:51:56 2007
@@ -247,7 +247,17 @@
return superProject;
}
-public MavenProjectBuildingResult buildWithDependencies( File
projectDescriptor,
+/** @since 2.0.x */
+public MavenProject buildWithDependencies( File projectDescriptor,
+ ArtifactRepository
localRepository,
+ ProfileManager profileManager )
+throws ProjectBuildingException
+{
+return buildProjectWithDependencies( projectDescriptor,
localRepository, profileManager ).getProject();
+}
+
+/** @since 2.1 */
+public MavenProjectBuildingResult buildProjectWithDependencies( File
projectDescriptor,
ArtifactRepository localRepository,
ProfileManager
profileManager )
throws ProjectBuildingException
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProjectBuilder.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProjectBuilder.java?rev=597162r1=597161r2=597162view=diff
==
---
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProjectBuilder.java
(original)
+++
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProjectBuilder.java
Wed Nov 21 09:51:56 2007
@@ -62,12 +62,17 @@
ProfileManager globalProfileManager )
throws ProjectBuildingException;
+MavenProject buildWithDependencies( File project,
+ArtifactRepository localRepository,
+ProfileManager globalProfileManager )
+throws ProjectBuildingException;
-MavenProjectBuildingResult buildWithDependencies( File project,
- ArtifactRepository
localRepository,
- ProfileManager
globalProfileManager )
+MavenProjectBuildingResult buildProjectWithDependencies( File project,
+
ArtifactRepository localRepository,
+ ProfileManager
globalProfileManager )
throws ProjectBuildingException;
+
MavenProject buildFromRepository( Artifact artifact,
List remoteArtifactRepositories,
ArtifactRepository localRepository )
@@ -81,7 +86,6 @@
throws ProjectBuildingException;
svn commit: r597154 - /maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java
Author: mkleint Date: Wed Nov 21 09:40:39 2007 New Revision: 597154 URL: http://svn.apache.org/viewvc?rev=597154view=rev Log: add maven-toolchain to the list of default excludes. necessary for proper retrieval from MavenSession's plugin context. Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java?rev=597154r1=597153r2=597154view=diff == --- maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java (original) +++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java Wed Nov 21 09:40:39 2007 @@ -59,6 +59,9 @@ artifacts.add( maven-reporting-api ); artifacts.add( maven-repository-metadata ); artifacts.add( maven-settings ); +//adding shared/maven-toolchain project here, even though not part of the default +//distro yet. +artifacts.add( maven-toolchain ); artifacts.add( plexus-component-api ); artifacts.add( plexus-container-default ); artifacts.add( plexus-interactivity-api );
svn commit: r597160 - in /maven/shared/trunk/maven-toolchain: ./ src/main/java/org/apache/maven/toolchain/ src/main/java/org/apache/maven/toolchain/java/
Author: mkleint
Date: Wed Nov 21 09:49:21 2007
New Revision: 597160
URL: http://svn.apache.org/viewvc?rev=597160view=rev
Log:
rewrite toolchains to use MavenSession plugin context instead of build-context
artifact.
Modified:
maven/shared/trunk/maven-toolchain/pom.xml
maven/shared/trunk/maven-toolchain/src/main/java/org/apache/maven/toolchain/DefaultToolchain.java
maven/shared/trunk/maven-toolchain/src/main/java/org/apache/maven/toolchain/DefaultToolchainManager.java
maven/shared/trunk/maven-toolchain/src/main/java/org/apache/maven/toolchain/Toolchain.java
maven/shared/trunk/maven-toolchain/src/main/java/org/apache/maven/toolchain/ToolchainFactory.java
maven/shared/trunk/maven-toolchain/src/main/java/org/apache/maven/toolchain/ToolchainManager.java
maven/shared/trunk/maven-toolchain/src/main/java/org/apache/maven/toolchain/ToolchainManagerPrivate.java
maven/shared/trunk/maven-toolchain/src/main/java/org/apache/maven/toolchain/ToolchainPrivate.java
maven/shared/trunk/maven-toolchain/src/main/java/org/apache/maven/toolchain/java/DefaultJavaToolChain.java
maven/shared/trunk/maven-toolchain/src/main/java/org/apache/maven/toolchain/java/DefaultJavaToolchainFactory.java
Modified: maven/shared/trunk/maven-toolchain/pom.xml
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-toolchain/pom.xml?rev=597160r1=597159r2=597160view=diff
==
--- maven/shared/trunk/maven-toolchain/pom.xml (original)
+++ maven/shared/trunk/maven-toolchain/pom.xml Wed Nov 21 09:49:21 2007
@@ -19,7 +19,7 @@
/dependency
dependency
groupIdorg.apache.maven/groupId
-artifactIdmaven-build-context/artifactId
+artifactIdmaven-core/artifactId
version2.1-SNAPSHOT/version
/dependency
dependency
Modified:
maven/shared/trunk/maven-toolchain/src/main/java/org/apache/maven/toolchain/DefaultToolchain.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-toolchain/src/main/java/org/apache/maven/toolchain/DefaultToolchain.java?rev=597160r1=597159r2=597160view=diff
==
---
maven/shared/trunk/maven-toolchain/src/main/java/org/apache/maven/toolchain/DefaultToolchain.java
(original)
+++
maven/shared/trunk/maven-toolchain/src/main/java/org/apache/maven/toolchain/DefaultToolchain.java
Wed Nov 21 09:49:21 2007
@@ -21,6 +21,7 @@
import java.util.HashMap;
import java.util.Map;
+import org.apache.maven.toolchain.model.ToolchainModel;
/**
*
@@ -35,13 +36,17 @@
private Map provides = new HashMap /*String,RequirementMatcher*/ ( );
public static final String KEY_TYPE = type; //NOI18N
+
+private ToolchainModel model;
-protected DefaultToolchain( )
+protected DefaultToolchain( ToolchainModel model )
{
+this.model = model;
}
-protected DefaultToolchain( String type )
+protected DefaultToolchain( ToolchainModel model, String type )
{
+this(model);
this.type = type;
}
@@ -50,22 +55,10 @@
return type;
}
-public final String getStorageKey( )
+
+public final ToolchainModel getModel( )
{
-return toolchain- + type; //NOI18N
-}
-
-public Map getData( )
-{
-Map data = new HashMap( 2 );
-data.put( KEY_TYPE, type );
-
-return data;
-}
-
-public void setData( Map data )
-{
-type = (String) data.get( KEY_TYPE );
+return model;
}
public final void addProvideToken( String type,
Modified:
maven/shared/trunk/maven-toolchain/src/main/java/org/apache/maven/toolchain/DefaultToolchainManager.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-toolchain/src/main/java/org/apache/maven/toolchain/DefaultToolchainManager.java?rev=597160r1=597159r2=597160view=diff
==
---
maven/shared/trunk/maven-toolchain/src/main/java/org/apache/maven/toolchain/DefaultToolchainManager.java
(original)
+++
maven/shared/trunk/maven-toolchain/src/main/java/org/apache/maven/toolchain/DefaultToolchainManager.java
Wed Nov 21 09:49:21 2007
@@ -27,7 +27,8 @@
import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import org.apache.maven.context.BuildContext;
+import org.apache.maven.execution.MavenSession;
+import org.apache.maven.plugin.descriptor.PluginDescriptor;
import org.apache.maven.toolchain.model.PersistedToolchains;
import org.apache.maven.toolchain.model.ToolchainModel;
import org.apache.maven.toolchain.model.io.xpp3.MavenToolchainsXpp3Reader;
@@ -70,7 +71,7 @@
{
try
{
-PersistedToolchains pers = readToolchainSettings();
+PersistedToolchains pers = readToolchainSettings ();
Map factories = container.lookupMap(
svn commit: r597161 - /maven/plugins/trunk/maven-toolchains-plugin/src/main/java/org/apache/maven/plugin/toolchain/ToolchainMojo.java
Author: mkleint
Date: Wed Nov 21 09:51:45 2007
New Revision: 597161
URL: http://svn.apache.org/viewvc?rev=597161view=rev
Log:
rewrite toolchain-plugin to use MavenSession plugin context instead of removed
build-context.
Modified:
maven/plugins/trunk/maven-toolchains-plugin/src/main/java/org/apache/maven/plugin/toolchain/ToolchainMojo.java
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=597161r1=597160r2=597161view=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
Wed Nov 21 09:51:45 2007
@@ -24,7 +24,7 @@
import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import org.apache.maven.context.BuildContextManager;
+import org.apache.maven.execution.MavenSession;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
@@ -51,10 +51,14 @@
private ToolchainManagerPrivate toolchainManager;
/**
+ * The current build session instance. This is used for
+ * toolchain manager API calls.
*
- * @component
+ * @parameter expression=${session}
+ * @required
+ * @readonly
*/
-private BuildContextManager buildContextManager;
+private MavenSession session;
/**
* @parameter
@@ -88,7 +92,7 @@
{
getLog( ).info( Toolchain ( + type + )
matched: + tcs[i] );
toolchainManager.storeToolchainToBuildContext(
tcs[i],
-buildContextManager.readBuildContext( true ) );
+session );
matched = true;
break;
}
@@ -127,7 +131,7 @@
}
}
getLog().error( str );
-throw new MojoFailureException( Please make sure you define
the required toolchains in your ~/.m2/toolchains.xml file. );
+throw new MojoFailureException( str + \nPlease make sure you
define the required toolchains in your ~/.m2/toolchains.xml file. );
}
}
else
svn commit: r597174 - in /maven/plugins/branches/MNG-468/maven-surefire-plugin: pom.xml src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java
Author: mkleint
Date: Wed Nov 21 10:35:21 2007
New Revision: 597174
URL: http://svn.apache.org/viewvc?rev=597174view=rev
Log:
use MavenSession for ToolchainManager calls, plugin requires 2.1-SNAPSHOT now
Modified:
maven/plugins/branches/MNG-468/maven-surefire-plugin/pom.xml
maven/plugins/branches/MNG-468/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java
Modified: maven/plugins/branches/MNG-468/maven-surefire-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/branches/MNG-468/maven-surefire-plugin/pom.xml?rev=597174r1=597173r2=597174view=diff
==
--- maven/plugins/branches/MNG-468/maven-surefire-plugin/pom.xml (original)
+++ maven/plugins/branches/MNG-468/maven-surefire-plugin/pom.xml Wed Nov 21
10:35:21 2007
@@ -30,7 +30,7 @@
packagingmaven-plugin/packaging
nameMaven Surefire Plugin/name
prerequisites
-maven2.0/maven
+maven2.1-SNAPSHOT/maven
/prerequisites
mailingLists
!-- duplication from maven-plugins pom - temporary until they inherit
properly --
@@ -112,7 +112,7 @@
artifactIdmaven-toolchain/artifactId
version1.0-SNAPSHOT/version
/dependency
- /dependencies
+/dependencies
profiles
!-- Force JDK 1.4 for this one, plugins can never be built on 1.3 --
Modified:
maven/plugins/branches/MNG-468/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java
URL:
http://svn.apache.org/viewvc/maven/plugins/branches/MNG-468/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java?rev=597174r1=597173r2=597174view=diff
==
---
maven/plugins/branches/MNG-468/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java
(original)
+++
maven/plugins/branches/MNG-468/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java
Wed Nov 21 10:35:21 2007
@@ -56,7 +56,7 @@
import java.util.List;
import java.util.Map;
import java.util.Properties;
-import org.apache.maven.context.BuildContextManager;
+import org.apache.maven.execution.MavenSession;
import org.apache.maven.toolchain.Toolchain;
import org.apache.maven.toolchain.ToolchainManager;
@@ -396,10 +396,14 @@
private ToolchainManager toolchainManager;
/**
+ * The current build session instance. This is used for
+ * toolchain manager API calls.
*
- * @component
+ * @parameter expression=${session}
+ * @required
+ * @readonly
*/
-private BuildContextManager buildContextManager;
+private MavenSession session;
public void execute()
@@ -676,8 +680,8 @@
surefireBooter.addClassPathUrl( classpathElement );
}
-Toolchain tc = toolchainManager.getToolchainFromBuildContext(jdk,
//NOI18N
-buildContextManager.readBuildContext(true));
+Toolchain tc = toolchainManager.getToolchainFromBuildContext( jdk,
//NOI18N
+session );
if (tc != null) {
getLog().info(Toolchain in surefire-plugin: + tc);
if (ForkConfiguration.FORK_NEVER.equals( forkMode ) ) {
svn commit: r597171 - in /maven/plugins/branches/MNG-468/maven-javadoc-plugin: pom.xml src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java
Author: mkleint
Date: Wed Nov 21 10:28:16 2007
New Revision: 597171
URL: http://svn.apache.org/viewvc?rev=597171view=rev
Log:
use MavenSession for ToolchainManager calls, plugin requires 2.1-SNAPSHOT now
Modified:
maven/plugins/branches/MNG-468/maven-javadoc-plugin/pom.xml
maven/plugins/branches/MNG-468/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java
Modified: maven/plugins/branches/MNG-468/maven-javadoc-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/branches/MNG-468/maven-javadoc-plugin/pom.xml?rev=597171r1=597170r2=597171view=diff
==
--- maven/plugins/branches/MNG-468/maven-javadoc-plugin/pom.xml (original)
+++ maven/plugins/branches/MNG-468/maven-javadoc-plugin/pom.xml Wed Nov 21
10:28:16 2007
@@ -43,7 +43,7 @@
/issueManagement
prerequisites
-maven2.0.6/maven
+maven2.1-SNAPSHOT/maven
/prerequisites
build
Modified:
maven/plugins/branches/MNG-468/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/branches/MNG-468/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java?rev=597171r1=597170r2=597171view=diff
==
---
maven/plugins/branches/MNG-468/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java
(original)
+++
maven/plugins/branches/MNG-468/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java
Wed Nov 21 10:28:16 2007
@@ -53,7 +53,7 @@
import org.apache.maven.artifact.resolver.ArtifactResolutionException;
import org.apache.maven.artifact.resolver.ArtifactResolutionResult;
import org.apache.maven.artifact.resolver.ArtifactResolver;
-import org.apache.maven.context.BuildContextManager;
+import org.apache.maven.execution.MavenSession;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.javadoc.options.Group;
import org.apache.maven.plugin.javadoc.options.DocletArtifact;
@@ -97,10 +97,14 @@
private ToolchainManager toolchainManager;
/**
+ * The current build session instance. This is used for
+ * toolchain manager API calls.
*
- * @component
+ * @parameter expression=${session}
+ * @required
+ * @readonly
*/
-private BuildContextManager buildContextManager;
+private MavenSession session;
/**
* The current class directory
@@ -2059,14 +2063,18 @@
private String getJavadocExecutable()
throws IOException
{
-Toolchain tc = toolchainManager.getToolchainFromBuildContext(jdk,
//NOI18N
-buildContextManager.readBuildContext(true));
-if (tc != null) {
-getLog().info(Toolchain in javadoc-plugin: + tc);
-if ( javadocExecutable != null) {
-getLog().warn(Toolchains are ignored, 'javadocExecutable'
parameter is set to + javadocExecutable);
-} else {
-javadocExecutable = tc.findTool(javadoc); //NOI18N
+Toolchain tc = toolchainManager.getToolchainFromBuildContext( jdk,
//NOI18N
+session );
+if ( tc != null )
+{
+getLog().info( Toolchain in javadoc-plugin: + tc );
+if ( javadocExecutable != null)
+{
+getLog().warn( Toolchains are ignored, 'javadocExecutable'
parameter is set to + javadocExecutable );
+}
+else
+{
+javadocExecutable = tc.findTool( javadoc ); //NOI18N
}
}
svn commit: r597168 - in /maven/plugins/branches/MNG-468/maven-compiler-plugin: pom.xml src/main/java/org/apache/maven/plugin/AbstractCompilerMojo.java
Author: mkleint
Date: Wed Nov 21 10:20:35 2007
New Revision: 597168
URL: http://svn.apache.org/viewvc?rev=597168view=rev
Log:
use MavenSession for ToolchainManager calls, plugin requires 2.1-SNAPSHOT now
Modified:
maven/plugins/branches/MNG-468/maven-compiler-plugin/pom.xml
maven/plugins/branches/MNG-468/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/AbstractCompilerMojo.java
Modified: maven/plugins/branches/MNG-468/maven-compiler-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/branches/MNG-468/maven-compiler-plugin/pom.xml?rev=597168r1=597167r2=597168view=diff
==
--- maven/plugins/branches/MNG-468/maven-compiler-plugin/pom.xml (original)
+++ maven/plugins/branches/MNG-468/maven-compiler-plugin/pom.xml Wed Nov 21
10:20:35 2007
@@ -11,7 +11,7 @@
version2.1-SNAPSHOT/version
inceptionYear2001/inceptionYear
prerequisites
-maven2.0/maven
+maven2.1-SNAPSHOT/maven
/prerequisites
issueManagement
systemJIRA/system
Modified:
maven/plugins/branches/MNG-468/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/AbstractCompilerMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/branches/MNG-468/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/AbstractCompilerMojo.java?rev=597168r1=597167r2=597168view=diff
==
---
maven/plugins/branches/MNG-468/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/AbstractCompilerMojo.java
(original)
+++
maven/plugins/branches/MNG-468/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/AbstractCompilerMojo.java
Wed Nov 21 10:20:35 2007
@@ -41,7 +41,7 @@
import java.util.List;
import java.util.Map;
import java.util.Set;
-import org.apache.maven.context.BuildContextManager;
+import org.apache.maven.execution.MavenSession;
import org.apache.maven.toolchain.Toolchain;
import org.apache.maven.toolchain.ToolchainManager;
@@ -249,10 +249,14 @@
private ToolchainManager toolchainManager;
/**
+ * The current build session instance. This is used for
+ * toolchain manager API calls.
*
- * @component
+ * @parameter expression=${session}
+ * @required
+ * @readonly
*/
-private BuildContextManager buildContextManager;
+private MavenSession session;
protected abstract SourceInclusionScanner getSourceInclusionScanner( int
staleMillis );
@@ -288,16 +292,20 @@
}
//use the compilerId as identifier for toolchains as well.
-Toolchain tc =
toolchainManager.getToolchainFromBuildContext(compilerId,
-buildContextManager.readBuildContext(true));
-if (tc != null) {
-getLog().info(Toolchain in compiler-plugin: + tc);
-if ( executable != null) {
-getLog().warn(Toolchains are ignored, 'executable' parameter
is set to + executable);
-} else {
+Toolchain tc = toolchainManager.getToolchainFromBuildContext(
compilerId,
+session );
+if ( tc != null )
+{
+getLog().info( Toolchain in compiler-plugin: + tc );
+if ( executable != null )
+{
+getLog().warn( Toolchains are ignored, 'executable' parameter
is set to + executable );
+}
+else
+{
fork = true;
//TODO somehow shaky dependency between compilerId and tool
executable.
-executable = tc.findTool(compilerId);
+executable = tc.findTool( compilerId );
}
}
//
--
svn commit: r597213 - /maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java
Author: hboutemy
Date: Wed Nov 21 13:28:24 2007
New Revision: 597213
URL: http://svn.apache.org/viewvc?rev=597213view=rev
Log:
[MANTTASKS-98] fixed NPE if user settings file doesn't exist
Submitted by: Pete Muir
Modified:
maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java
Modified:
maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java
URL:
http://svn.apache.org/viewvc/maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java?rev=597213r1=597212r2=597213view=diff
==
---
maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java
(original)
+++
maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java
Wed Nov 21 13:28:24 2007
@@ -308,6 +308,8 @@
if ( settings == null )
{
settings = new Settings();
+RuntimeInfo rtInfo = new RuntimeInfo(settings);
+settings.setRuntimeInfo(rtInfo);
}
return settings;
svn commit: r597214 - /maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java
Author: hboutemy
Date: Wed Nov 21 13:29:45 2007
New Revision: 597214
URL: http://svn.apache.org/viewvc?rev=597214view=rev
Log:
[MANTTASKS-98] fixed NPE if user settings file doesn't exist
Submitted by: Pete Muir
Modified:
maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java
Modified:
maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java
URL:
http://svn.apache.org/viewvc/maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java?rev=597214r1=597213r2=597214view=diff
==
---
maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java
(original)
+++
maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java
Wed Nov 21 13:29:45 2007
@@ -308,6 +308,8 @@
if ( settings == null )
{
settings = new Settings();
+RuntimeInfo rtInfo = new RuntimeInfo(settings);
+settings.setRuntimeInfo(rtInfo);
}
return settings;
svn commit: r597229 - /maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/JeeUtils.java
Author: aheritier
Date: Wed Nov 21 14:10:22 2007
New Revision: 597229
URL: http://svn.apache.org/viewvc?rev=597229view=rev
Log:
Remove unused vars
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/JeeUtils.java
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/JeeUtils.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/JeeUtils.java?rev=597229r1=597228r2=597229view=diff
==
---
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/JeeUtils.java
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/JeeUtils.java
Wed Nov 21 14:10:22 2007
@@ -148,7 +148,8 @@
{
// No JEE dependency detected. Try to resolve the JEE
// version from SERVLET.
-JeeDescriptor descriptor = getJeeDescriptorFromServletVersion(
findServletVersionInDependencies( artifacts ) );
+JeeDescriptor descriptor =
+getJeeDescriptorFromServletVersion(
findServletVersionInDependencies( artifacts ) );
if ( descriptor != null )
version = descriptor.getJeeVersion();
}
@@ -187,7 +188,8 @@
{
// No jsp dependency detected. Try to resolve the jsp
// version from Servlet.
-JeeDescriptor descriptor = getJeeDescriptorFromServletVersion(
findServletVersionInDependencies( artifacts ) );
+JeeDescriptor descriptor =
+getJeeDescriptorFromServletVersion(
findServletVersionInDependencies( artifacts ) );
if ( descriptor != null )
version = descriptor.getJspVersion();
}
@@ -246,9 +248,8 @@
private static String findJeeVersionInDependencies( IdeDependency[]
artifacts )
{
-String[] artifactIds = new String[] { javaee-api, j2ee,
geronimo-spec-j2ee }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-
-String version = IdeUtils.getArtifactVersion( artifactIds, artifacts,
3 );
+String version =
+IdeUtils.getArtifactVersion( new String[] { javaee-api, j2ee,
geronimo-spec-j2ee }, artifacts, 3 );
// For new Geronimo APIs, the version of the artifact isn't the one of
the spec
if ( version == null )
@@ -267,9 +268,9 @@
private static String findServletVersionInDependencies( IdeDependency[]
artifacts )
{
-String[] artifactIds = new String[] { servlet-api, servletapi,
geronimo-spec-servlet }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-
-String version = IdeUtils.getArtifactVersion( artifactIds, artifacts,
3 );
+String version =
+IdeUtils.getArtifactVersion( new String[] { servlet-api,
servletapi, geronimo-spec-servlet },
+ artifacts, 3 );
// For new Geronimo APIs, the version of the artifact isn't the one of
the spec
if ( version == null )
svn commit: r597219 - in /maven/sandbox/trunk/archetypeng: archetypeng-common/src/main/java/org/apache/maven/archetype/ archetypeng-common/src/main/java/org/apache/maven/archetype/common/ archetypeng-
Author: rafale
Date: Wed Nov 21 13:48:23 2007
New Revision: 597219
URL: http://svn.apache.org/viewvc?rev=597219view=rev
Log:
Commented some unused code for future removing
Modified:
maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/Archetype.java
maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/DefaultArchetype.java
maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/common/ArchetypeArtifactManager.java
maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/common/ArchetypeFilesResolver.java
maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/common/ArchetypeRegistryManager.java
maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/common/DefaultArchetypeArtifactManager.java
maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/common/DefaultArchetypeFilesResolver.java
maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/common/DefaultArchetypeRegistryManager.java
maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/common/GavCalculator.java
maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/creator/FilesetArchetypeCreator.java
maven/sandbox/trunk/archetypeng/archetypeng-plugin/src/main/java/org/apache/maven/archetype/ui/DefaultArchetypeCreationConfigurator.java
Modified:
maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/Archetype.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/Archetype.java?rev=597219r1=597218r2=597219view=diff
==
---
maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/Archetype.java
(original)
+++
maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/Archetype.java
Wed Nov 21 13:48:23 2007
@@ -49,14 +49,14 @@
*/
ArchetypeGenerationResult generateProjectFromArchetype(
ArchetypeGenerationRequest request );
-/**
- * Get all available archetypes using the standard
~/.m2/archetype-catalog.properties as the
- * definition for the sources to be used and the configuration for each
- * [EMAIL PROTECTED] listed.
- *
- * @return A Map of available archetypes collected from all available
source.
- */
-List getAvailableArchetypes();
+///**
+// * Get all available archetypes using the standard
~/.m2/archetype-catalog.properties as the
+// * definition for the sources to be used and the configuration for each
+// * [EMAIL PROTECTED] listed.
+// *
+// * @return A Map of available archetypes collected from all available
source.
+// */
+//List getAvailableArchetypes();
/**
* Get all available archetypes using a specified catalog properties as the
Modified:
maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/DefaultArchetype.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/DefaultArchetype.java?rev=597219r1=597218r2=597219view=diff
==
---
maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/DefaultArchetype.java
(original)
+++
maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/DefaultArchetype.java
Wed Nov 21 13:48:23 2007
@@ -76,36 +76,36 @@
return result;
}
-public Collection getArchetypes( ArchetypeDataSource source,
- Properties sourceConfiguration )
-throws ArchetypeDataSourceException
-{
-return source.getArchetypes( sourceConfiguration );
-}
+//public Collection getArchetypes( ArchetypeDataSource source,
+// Properties sourceConfiguration )
+//throws ArchetypeDataSourceException
+//{
+//return source.getArchetypes( sourceConfiguration );
+//}
-public Collection getArchetypeDataSources()
-{
-return archetypeSources.values();
-}
+//public Collection getArchetypeDataSources()
+//{
+//return archetypeSources.values();
+//}
-public List getAvailableArchetypes()
-{
-File archetypeCatalogPropertiesFile = new File( System.getProperty(
user.home ),
-.m2/archetype-catalog.properties );
-
-Properties archetypeCatalogProperties;
-
-if ( archetypeCatalogPropertiesFile.exists() )
-
svn commit: r597230 - in /maven/shared/trunk/maven-invoker/src: main/java/org/apache/maven/shared/invoker/MavenCommandLineBuilder.java test/java/org/apache/maven/shared/invoker/MavenCommandLineBuilder
Author: olamy
Date: Wed Nov 21 14:10:59 2007
New Revision: 597230
URL: http://svn.apache.org/viewvc?rev=597230view=rev
Log:
[MNG-3298] checkRequiredState not throw Exception if M2_HOME exists
replace the use of System.getenv which throw an Error in jdk1.4
Modified:
maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/MavenCommandLineBuilder.java
maven/shared/trunk/maven-invoker/src/test/java/org/apache/maven/shared/invoker/MavenCommandLineBuilderTest.java
Modified:
maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/MavenCommandLineBuilder.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/MavenCommandLineBuilder.java?rev=597230r1=597229r2=597230view=diff
==
---
maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/MavenCommandLineBuilder.java
(original)
+++
maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/MavenCommandLineBuilder.java
Wed Nov 21 14:10:59 2007
@@ -28,8 +28,12 @@
import org.codehaus.plexus.util.Os;
import org.codehaus.plexus.util.StringUtils;
+import org.codehaus.plexus.util.cli.CommandLineUtils;
import org.codehaus.plexus.util.cli.Commandline;
+/**
+ * @version $Id$
+ */
public class MavenCommandLineBuilder
{
private static final InvokerLogger DEFAULT_LOGGER = new SystemOutLogger();
@@ -43,14 +47,29 @@
private File mavenHome;
private File mvnCommand;
+
+private Properties systemEnvVars;
public Commandline build( InvocationRequest request )
throws CommandLineConfigurationException
{
-checkRequiredState();
-
-File mvn = findMavenExecutable();
-
+try
+{
+checkRequiredState();
+}
+catch ( IOException e )
+{
+throw new CommandLineConfigurationException( e.getMessage(), e );
+}
+File mvn = null;
+try
+{
+mvn = findMavenExecutable();
+}
+catch ( IOException e )
+{
+throw new CommandLineConfigurationException( e.getMessage(), e );
+}
Commandline cli = new Commandline();
cli.setExecutable( mvn.getAbsolutePath() );
@@ -84,6 +103,7 @@
}
protected void checkRequiredState()
+ throws IOException
{
if ( logger == null )
{
@@ -91,10 +111,15 @@
}
if ( ( mavenHome == null ) ( System.getProperty( maven.home ) ==
null ) )
+// can be restored with 1.5
+// ( System.getenv( M2_HOME ) != null ) )
{
-throw new IllegalStateException( Maven application directory was
not
-+ specified, and ${maven.home} is not provided in the system
-+ properties. Please specify at least on of these. );
+if ( !getSystemEnvVars().containsKey( M2_HOME ) )
+{
+throw new IllegalStateException( Maven application directory
was not
++ specified, and ${maven.home} is not provided in the
system
++ properties. Please specify at least on of these. );
+}
}
}
@@ -387,7 +412,7 @@
}
protected File findMavenExecutable()
-throws CommandLineConfigurationException
+throws CommandLineConfigurationException, IOException
{
if ( mavenHome == null )
{
@@ -412,9 +437,9 @@
}
}
-if ( ( mavenHome == null ) ( System.getenv( M2_HOME ) != null
) )
+if ( ( mavenHome == null ) ( getSystemEnvVars().getProperty(
M2_HOME ) != null ) )
{
-mavenHome = new File( System.getenv( M2_HOME ) );
+mavenHome = new File( getSystemEnvVars().getProperty(
M2_HOME ) );
}
}
@@ -467,6 +492,17 @@
{
return path;
}
+}
+
+private Properties getSystemEnvVars()
+throws IOException
+{
+if ( this.systemEnvVars == null )
+{
+// with 1.5 replace with System.getenv()
+this.systemEnvVars = CommandLineUtils.getSystemEnvVars();
+}
+return this.systemEnvVars;
}
public File getLocalRepositoryDirectory()
Modified:
maven/shared/trunk/maven-invoker/src/test/java/org/apache/maven/shared/invoker/MavenCommandLineBuilderTest.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-invoker/src/test/java/org/apache/maven/shared/invoker/MavenCommandLineBuilderTest.java?rev=597230r1=597229r2=597230view=diff
==
---
maven/shared/trunk/maven-invoker/src/test/java/org/apache/maven/shared/invoker/MavenCommandLineBuilderTest.java
(original)
+++
svn commit: r597233 - /maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/downloader/DefaultDownloader.java
Author: rafale
Date: Wed Nov 21 14:31:13 2007
New Revision: 597233
URL: http://svn.apache.org/viewvc?rev=597233view=rev
Log:
removed debugging output
Modified:
maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/downloader/DefaultDownloader.java
Modified:
maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/downloader/DefaultDownloader.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/downloader/DefaultDownloader.java?rev=597233r1=597232r2=597233view=diff
==
---
maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/downloader/DefaultDownloader.java
(original)
+++
maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/downloader/DefaultDownloader.java
Wed Nov 21 14:31:13 2007
@@ -48,28 +48,7 @@
throws DownloadException, DownloadNotFoundException
{
Artifact artifact = artifactFactory.createArtifact( groupId,
artifactId, version, Artifact.SCOPE_RUNTIME, jar );
-System.err.println(ARTIFACT+artifact);
-System.err.println(ARTIFACT+artifact.getArtifactId());
-System.err.println(ARTIFACT+artifact.getBaseVersion());
-System.err.println(ARTIFACT+artifact.getDependencyConflictId());
-System.err.println(ARTIFACT+artifact.getDownloadUrl());
-System.err.println(ARTIFACT+artifact.getGroupId());
-System.err.println(ARTIFACT+artifact.getId());
-System.err.println(ARTIFACT+artifact.getScope());
-System.err.println(ARTIFACT+artifact.getType());
-System.err.println(ARTIFACT+artifact.getVersion());
-System.err.println(ARTIFACT+artifact.getArtifactHandler());
-System.err.println(ARTIFACT+artifact.getAvailableVersions());
-System.err.println(ARTIFACT+artifact.getDependencyFilter());
-System.err.println(ARTIFACT+artifact.getDependencyTrail());
-System.err.println(ARTIFACT+artifact.getMetadataList());
-System.err.println(ARTIFACT+artifact.getRepository());
-System.err.println(ARTIFACT+artifact.getVersionRange());
-System.err.println(remoteRepositories +remoteRepositories);
-System.err.println(localRepository +localRepository);
-System.err.println(archetypeRepository +archetypeRepository);
-
-artifact.setRepository(archetypeRepository);
+artifact.setRepository(archetypeRepository);
try
{
artifactResolver.resolveAlways( artifact, remoteRepositories,
localRepository );
svn commit: r597236 - in /maven/plugins/trunk/maven-eclipse-plugin/src: main/java/org/apache/maven/plugin/eclipse/ test/java/org/apache/maven/plugin/eclipse/ test/resources/projects/project-37/ test/r
Author: aheritier
Date: Wed Nov 21 14:44:29 2007
New Revision: 597236
URL: http://svn.apache.org/viewvc?rev=597236view=rev
Log:
[MECLIPSE-172] Don't add Default ClasspathContainer if a alternate JRE or a
Execution Environment is configured as ClasspathContainer.
Submitted by: Markus Grieder, Nathan Beyer (Cerner)
Added:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-37/
(with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-37/expected/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-37/expected/.classpath
(with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-37/expected/.project
(with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-37/pom.xml
(with props)
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/EclipsePluginTest.java
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java?rev=597236r1=597235r2=597236view=diff
==
---
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java
Wed Nov 21 14:44:29 2007
@@ -709,8 +709,19 @@
protected void verifyClasspathContainerListIsComplete()
{
-// this is an extension point.
-if ( !classpathContainers.contains(
COMMON_PATH_JDT_LAUNCHING_JRE_CONTAINER ) ) //$NON-NLS-1$
+boolean containsJREContainer = false;
+// Check if classpathContainer contains a JRE (default, alternate or
Execution Environment)
+for ( Iterator iter = classpathContainers.iterator(); iter.hasNext(); )
+{
+Object classPathContainer = iter.next();
+if ( classPathContainer != null
+classPathContainer.toString().startsWith(
COMMON_PATH_JDT_LAUNCHING_JRE_CONTAINER ) )
+{
+containsJREContainer = true;
+break;
+}
+}
+if ( !containsJREContainer )
{
getLog().warn( Messages.getString(
EclipsePlugin.missingjrecontainer ) ); //$NON-NLS-1$
classpathContainers.add( 0,
COMMON_PATH_JDT_LAUNCHING_JRE_CONTAINER );
@@ -1099,7 +1110,7 @@
if ( wtpVersionFloat == 0.7f )
{
// WTP 0.7 builder
-buildcommands.add( new BuildCommand(
BUILDER_WST_COMPONENT_STRUCTURAL_DEPENDENCY_RESOLVER ) );
+buildcommands.add( new BuildCommand(
BUILDER_WST_COMPONENT_STRUCTURAL_DEPENDENCY_RESOLVER ) );
}
if ( pde )
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/EclipsePluginTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/EclipsePluginTest.java?rev=597236r1=597235r2=597236view=diff
==
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/EclipsePluginTest.java
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/EclipsePluginTest.java
Wed Nov 21 14:44:29 2007
@@ -419,7 +419,13 @@
// Test
testProject( project-36 );
}
-
+
+public void testProject37()
+throws Exception
+{
+testProject( project-37 );
+}
+
public void testJeeSimple()
throws Exception
{
Propchange:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-37/
--
--- svn:ignore (added)
+++ svn:ignore Wed Nov 21 14:44:29 2007
@@ -0,0 +1,3 @@
+.classpath
+.project
+target
Added:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-37/expected/.classpath
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-37/expected/.classpath?rev=597236view=auto
==
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-37/expected/.classpath
(added)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-37/expected/.classpath
Wed Nov 21 14:44:29 2007
@@ -0,0 +1,4 @@
+classpath
+ classpathentry kind=output path=target/classes/
svn commit: r597241 - in /maven/plugins/trunk/maven-invoker-plugin: ./ src/main/java/org/apache/maven/plugin/invoker/ src/test/ src/test/java/ src/test/java/org/ src/test/java/org/apache/ src/test/jav
Author: olamy Date: Wed Nov 21 14:56:16 2007 New Revision: 597241 URL: http://svn.apache.org/viewvc?rev=597241view=rev Log: add unit test Added: maven/plugins/trunk/maven-invoker-plugin/src/test/ maven/plugins/trunk/maven-invoker-plugin/src/test/java/ maven/plugins/trunk/maven-invoker-plugin/src/test/java/org/ maven/plugins/trunk/maven-invoker-plugin/src/test/java/org/apache/ maven/plugins/trunk/maven-invoker-plugin/src/test/java/org/apache/maven/ maven/plugins/trunk/maven-invoker-plugin/src/test/java/org/apache/maven/plugin/ maven/plugins/trunk/maven-invoker-plugin/src/test/java/org/apache/maven/plugin/invoker/ maven/plugins/trunk/maven-invoker-plugin/src/test/java/org/apache/maven/plugin/invoker/InvokerMojoTest.java maven/plugins/trunk/maven-invoker-plugin/src/test/resources/ maven/plugins/trunk/maven-invoker-plugin/src/test/resources/unit/ maven/plugins/trunk/maven-invoker-plugin/src/test/resources/unit/goals-from-file/ maven/plugins/trunk/maven-invoker-plugin/src/test/resources/unit/goals-from-file/goals.txt maven/plugins/trunk/maven-invoker-plugin/src/test/resources/unit/goals-from-file/pom.xml maven/plugins/trunk/maven-invoker-plugin/src/test/resources/unit/goals-from-file/validate-goal.txt maven/plugins/trunk/maven-invoker-plugin/src/test/resources/unit/goals-from-file/verify.bsh Modified: maven/plugins/trunk/maven-invoker-plugin/pom.xml maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InvokerMojo.java Modified: maven/plugins/trunk/maven-invoker-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/pom.xml?rev=597241r1=597240r2=597241view=diff == --- maven/plugins/trunk/maven-invoker-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-invoker-plugin/pom.xml Wed Nov 21 14:56:16 2007 @@ -1,9 +1,28 @@ +?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/maven-v4_0_0.xsd; modelVersion4.0.0/modelVersion parent artifactIdmaven-plugins/artifactId groupIdorg.apache.maven.plugins/groupId -version8/version +version10/version /parent artifactIdmaven-invoker-plugin/artifactId version1.1-SNAPSHOT/version @@ -12,6 +31,20 @@ /prerequisites packagingmaven-plugin/packaging nameMaven Invoker Plugin/name + + 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 + /scm + build +plugins + plugin +artifactIdmaven-surefire-plugin/artifactId +version2.3/version + /plugin +/plugins + /build dependencies dependency groupIdorg.apache.maven.shared/groupId @@ -48,5 +81,16 @@ artifactIdbsh/artifactId version2.0b4/version /dependency +dependency + groupIdorg.codehaus.plexus/groupId + artifactIdplexus-utils/artifactId + version1.4.7/version +/dependency +dependency + groupIdorg.apache.maven.shared/groupId + artifactIdmaven-plugin-testing-harness/artifactId + version1.1/version + scopetest/scope +/dependency /dependencies /project Modified: maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InvokerMojo.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InvokerMojo.java?rev=597241r1=597240r2=597241view=diff == --- maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InvokerMojo.java (original) +++
svn commit: r597242 - /maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InvokerMojo.java
Author: olamy
Date: Wed Nov 21 14:57:39 2007
New Revision: 597242
URL: http://svn.apache.org/viewvc?rev=597242view=rev
Log:
remove System.out.println
Modified:
maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InvokerMojo.java
Modified:
maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InvokerMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InvokerMojo.java?rev=597242r1=597241r2=597242view=diff
==
---
maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InvokerMojo.java
(original)
+++
maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InvokerMojo.java
Wed Nov 21 14:57:39 2007
@@ -527,7 +527,6 @@
try
{
-System.out.println( invoker == null + (invoker == null) );
result = invoker.execute( request );
}
catch ( final MavenInvocationException e )
svn commit: r597251 - /maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/pom.xml
Author: aheritier Date: Wed Nov 21 15:16:29 2007 New Revision: 597251 URL: http://svn.apache.org/viewvc?rev=597251view=rev Log: Add junit dependency to not have a NPE from surefire Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/pom.xml Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/pom.xml?rev=597251r1=597250r2=597251view=diff == --- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/pom.xml (original) +++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/pom.xml Wed Nov 21 15:16:29 2007 @@ -26,6 +26,13 @@ /plugin /plugins /build + dependencies +dependency + groupIdjunit/groupId + artifactIdjunit/artifactId + version3.8.2/version +/dependency + /dependencies modules modulemy-ejb/module modulemy-ear/module
svn commit: r597254 - /maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/pom.xml
Author: aheritier Date: Wed Nov 21 15:23:22 2007 New Revision: 597254 URL: http://svn.apache.org/viewvc?rev=597254view=rev Log: Forgot the scope Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/pom.xml Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/pom.xml?rev=597254r1=597253r2=597254view=diff == --- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/pom.xml (original) +++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/pom.xml Wed Nov 21 15:23:22 2007 @@ -31,6 +31,7 @@ groupIdjunit/groupId artifactIdjunit/artifactId version3.8.2/version + scopetest/scope /dependency /dependencies modules
svn commit: r597260 - /maven/plugins/trunk/maven-eclipse-plugin/pom.xml
Author: aheritier Date: Wed Nov 21 15:27:34 2007 New Revision: 597260 URL: http://svn.apache.org/viewvc?rev=597260view=rev Log: Add version of plugins and some others settings to improve the build stability Modified: maven/plugins/trunk/maven-eclipse-plugin/pom.xml Modified: maven/plugins/trunk/maven-eclipse-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/pom.xml?rev=597260r1=597259r2=597260view=diff == --- maven/plugins/trunk/maven-eclipse-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-eclipse-plugin/pom.xml Wed Nov 21 15:27:34 2007 @@ -42,6 +42,7 @@ plugins plugin artifactIdmaven-compiler-plugin/artifactId +version2.0.2/version configuration source1.4/source target1.4/target @@ -49,10 +50,12 @@ /plugin plugin artifactIdmaven-surefire-plugin/artifactId +version2.3/version configuration excludes exclude**/Abstract*TestCase.java/exclude exclude**/InstallPluginsMojoTest.java/exclude +exclude**/projects/**/exclude /excludes systemProperties property @@ -168,6 +171,12 @@ groupIdbiz.aQute/groupId artifactIdbndlib/artifactId version0.0.145/version +/dependency +dependency + groupIdjunit/groupId + artifactIdjunit/artifactId + version3.8.2/version + scopetest/scope /dependency /dependencies
svn commit: r597290 - in /maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36: ./ my-ear/expected/.settings/ my-ejb/expected/.settings/
Author: aheritier Date: Wed Nov 21 20:01:57 2007 New Revision: 597290 URL: http://svn.apache.org/viewvc?rev=597290view=rev Log: We can't use Java 1.5 in the integration server. We are using Java 1.4 to be sure to keep the backward compatibility Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ear/expected/.settings/org.eclipse.wst.common.project.facet.core.xml maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ejb/expected/.settings/org.eclipse.wst.common.project.facet.core.xml maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/pom.xml Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ear/expected/.settings/org.eclipse.wst.common.project.facet.core.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ear/expected/.settings/org.eclipse.wst.common.project.facet.core.xml?rev=597290r1=597289r2=597290view=diff == --- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ear/expected/.settings/org.eclipse.wst.common.project.facet.core.xml (original) +++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ear/expected/.settings/org.eclipse.wst.common.project.facet.core.xml Wed Nov 21 20:01:57 2007 @@ -2,5 +2,5 @@ fixed facet=jst.java/ fixed facet=jst.ear/ installed facet=jst.ear version=5.0/ - installed facet=jst.java version=5.0/ + installed facet=jst.java version=1.4/ /faceted-project Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ejb/expected/.settings/org.eclipse.wst.common.project.facet.core.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ejb/expected/.settings/org.eclipse.wst.common.project.facet.core.xml?rev=597290r1=597289r2=597290view=diff == --- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ejb/expected/.settings/org.eclipse.wst.common.project.facet.core.xml (original) +++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ejb/expected/.settings/org.eclipse.wst.common.project.facet.core.xml Wed Nov 21 20:01:57 2007 @@ -2,5 +2,5 @@ fixed facet=jst.java/ fixed facet=jst.ejb/ installed facet=jst.ejb version=3.0/ - installed facet=jst.java version=5.0/ + installed facet=jst.java version=1.4/ /faceted-project Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/pom.xml?rev=597290r1=597289r2=597290view=diff == --- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/pom.xml (original) +++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/pom.xml Wed Nov 21 20:01:57 2007 @@ -20,8 +20,8 @@ groupIdorg.apache.maven.plugins/groupId artifactIdmaven-compiler-plugin/artifactId configuration - source1.5/source - target1.5/target + source1.4/source + target1.4/target /configuration /plugin /plugins
svn commit: r597292 - /maven/plugin-tools/trunk/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/stubs/MavenProjectStub.java
Author: carlos
Date: Wed Nov 21 20:07:00 2007
New Revision: 597292
URL: http://svn.apache.org/viewvc?rev=597292view=rev
Log:
Remove old comments
Modified:
maven/plugin-tools/trunk/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/stubs/MavenProjectStub.java
Modified:
maven/plugin-tools/trunk/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/stubs/MavenProjectStub.java
URL:
http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/stubs/MavenProjectStub.java?rev=597292r1=597291r2=597292view=diff
==
---
maven/plugin-tools/trunk/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/stubs/MavenProjectStub.java
(original)
+++
maven/plugin-tools/trunk/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/stubs/MavenProjectStub.java
Wed Nov 21 20:07:00 2007
@@ -1012,21 +1012,11 @@
// nop
}
-/**
- * By default, do nothing.
- *
- * @see
org.apache.maven.project.MavenProject#setBuild(org.apache.maven.model.Build)
- */
public void setBuild( Build build )
{
this.build = build;
}
-/**
- * By default, return codenull/code.
- *
- * @see org.apache.maven.project.MavenProject#getBuild()
- */
public Build getBuild()
{
return build;
svn commit: r597317 - /maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ejb/src/main/java/example/HelloBean.java
Author: aheritier
Date: Wed Nov 21 23:31:12 2007
New Revision: 597317
URL: http://svn.apache.org/viewvc?rev=597317view=rev
Log:
Remove annotations to keep the compatibility with java 1.4
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ejb/src/main/java/example/HelloBean.java
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ejb/src/main/java/example/HelloBean.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ejb/src/main/java/example/HelloBean.java?rev=597317r1=597316r2=597317view=diff
==
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ejb/src/main/java/example/HelloBean.java
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ejb/src/main/java/example/HelloBean.java
Wed Nov 21 23:31:12 2007
@@ -1,20 +1,20 @@
package example;
-import javax.ejb.Stateless;
-import javax.ejb.TransactionAttribute;
-import static javax.ejb.TransactionAttributeType.SUPPORTS;
+//import javax.ejb.Stateless;
+//import javax.ejb.TransactionAttribute;
+//import static javax.ejb.TransactionAttributeType.SUPPORTS;
/**
* Implementation of the Hello bean.
*/
[EMAIL PROTECTED]
+//@Stateless
public class HelloBean implements Hello {
private String _greeting = Default Hello;
/**
* Returns a hello, world string.
*/
- @TransactionAttribute(SUPPORTS)
+ //@TransactionAttribute(SUPPORTS)
public String hello()
{
return _greeting;
