[1/6] o Fixed testcase on windows. o Fixed 2.2.1 tests by splitting report parser to separate module
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4dfdb08c/surefire-report-parser/src/test/resources/test-reports/TEST-com.shape.PointTest.xml -- diff --git a/surefire-report-parser/src/test/resources/test-reports/TEST-com.shape.PointTest.xml b/surefire-report-parser/src/test/resources/test-reports/TEST-com.shape.PointTest.xml new file mode 100644 index 000..7dda584 --- /dev/null +++ b/surefire-report-parser/src/test/resources/test-reports/TEST-com.shape.PointTest.xml @@ -0,0 +1,142 @@ +?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. + -- + +testsuite errors=0 tests=3 time=0.01 failures=1 name=com.shape.PointTest + properties +property value=Java(TM) 2 Runtime Environment, Standard Edition name=java.runtime.name/ +property value=c:\japps\jdk1.5.0_04\jre\bin name=sun.boot.library.path/ +property value=1.5.0_04-b05 name=java.vm.version/ +property value=Sun Microsystems Inc. name=java.vm.vendor/ +property value=http://java.sun.com/; name=java.vendor.url/ +property value=; name=path.separator/ +property value=Java HotSpot(TM) Client VM name=java.vm.name/ +property value=sun.io name=file.encoding.pkg/ +property value=US name=user.country/ +property value=Service Pack 2 name=sun.os.patch.level/ +property value=Java Virtual Machine Specification name=java.vm.specification.name/ +property value=C:\JAppsCode\mergere-maven\plugins\sample-projects\junit-report-tester name=user.dir/ +property value=1.5.0_04-b05 name=java.runtime.version/ +property value=sun.awt.Win32GraphicsEnvironment name=java.awt.graphicsenv/ +property value=C:\JAppsCode\mergere-maven\plugins\sample-projects\junit-report-tester name=basedir/ +property value=c:\japps\jdk1.5.0_04\jre\lib\endorsed name=java.endorsed.dirs/ +property value=x86 name=os.arch/ +property value=C:\DOCUME~1\Jontri\LOCALS~1\Temp\ name=java.io.tmpdir/ +property value= + name=line.separator/ +property value=Sun Microsystems Inc. name=java.vm.specification.vendor/ +property value= name=user.variant/ +property value=Windows XP name=os.name/ +property value=C:\JApps\maven-2.0-beta-1\bin\m2.conf name=classworlds.conf/ +property value=Cp1252 name=sun.jnu.encoding/ +property + value=c:\japps\jdk1.5.0_04\bin;.;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\System32\Wbem;C:\Program Files\ATI Technologies\ATI Control Panel;C:\JApps\maven-2.0-beta-1\bin;C:\JApps\maven-1.0.2\bin;c:\BatchFile;C:\Program Files\cvsnt;C:\JApps\svn-1.1.4\bin;C:\JApps\ant-1.6.2\bin; +name=java.library.path/ +property value=Java Platform API Specification name=java.specification.name/ +property value=49.0 name=java.class.version/ +property value=HotSpot Client Compiler name=sun.management.compiler/ +property value=5.1 name=os.version/ +property value=C:\Documents and Settings\Jontri name=user.home/ +property value=Asia/Shanghai name=user.timezone/ +property value=sun.awt.windows.WPrinterJob name=java.awt.printerjob/ +property value=Cp1252 name=file.encoding/ +property value=1.5 name=java.specification.version/ +property value=Jontri name=user.name/ +property value=C:\JApps\maven-2.0-beta-1\core\boot\classworlds-1.1-alpha-2.jar name=java.class.path/ +property value=1.0 name=java.vm.specification.version/ +property value=32 name=sun.arch.data.model/ +property value=c:\japps\jdk1.5.0_04\jre name=java.home/ +property value=Sun Microsystems Inc. name=java.specification.vendor/ +property value=en name=user.language/ +property value=sun.awt.windows.WToolkit name=awt.toolkit/ +property value=mixed mode, sharing name=java.vm.info/ +property value=1.5.0_04 name=java.version/ +property value=c:\japps\jdk1.5.0_04\jre\lib\ext name=java.ext.dirs/ +property +
svn commit: r1430485 - in /maven/release/trunk: maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ maven-release-plugin/src/it/projects/perform/MRELEASE-818/ maven-release-plug
Author: rfscholte
Date: Tue Jan 8 20:20:17 2013
New Revision: 1430485
URL: http://svn.apache.org/viewvc?rev=1430485view=rev
Log:
[MRELEASE-818] release:perform ignores localCheckout=true
Added:
maven/release/trunk/maven-release-plugin/src/it/projects/perform/MRELEASE-818/
maven/release/trunk/maven-release-plugin/src/it/projects/perform/MRELEASE-818/pom.xml
maven/release/trunk/maven-release-plugin/src/it/projects/perform/MRELEASE-818/verify.groovy
Modified:
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckoutProjectFromScm.java
maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/AbstractScmReleaseMojo.java
maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PerformReleaseMojo.java
Modified:
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckoutProjectFromScm.java
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckoutProjectFromScm.java?rev=1430485r1=1430484r2=1430485view=diff
==
---
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckoutProjectFromScm.java
(original)
+++
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckoutProjectFromScm.java
Tue Jan 8 20:20:17 2013
@@ -274,7 +274,14 @@ public class CheckoutProjectFromScm
{
ReleaseResult result = new ReleaseResult();
-logInfo( result, The project would be checked out to perform the
release ... );
+if ( releaseDescriptor.isLocalCheckout() )
+{
+logInfo( result, This would be a LOCAL check out to perform the
release ... );
+}
+else
+{
+logInfo( result, The project would be checked out to perform the
release ... );
+}
result.setResultCode( ReleaseResult.SUCCESS );
return result;
Added:
maven/release/trunk/maven-release-plugin/src/it/projects/perform/MRELEASE-818/pom.xml
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-plugin/src/it/projects/perform/MRELEASE-818/pom.xml?rev=1430485view=auto
==
---
maven/release/trunk/maven-release-plugin/src/it/projects/perform/MRELEASE-818/pom.xml
(added)
+++
maven/release/trunk/maven-release-plugin/src/it/projects/perform/MRELEASE-818/pom.xml
Tue Jan 8 20:20:17 2013
@@ -0,0 +1,65 @@
+?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.plugin.release.its/groupId
+ artifactIdmrelease-818/artifactId
+ version1.0-SNAPSHOT/version
+
+ scm
+connectionscm:dummy|nul/connection
+developerConnectionscm:dummy|nul/developerConnection
+ /scm
+
+ distributionManagement
+snapshotRepository
+ iddummy/id
+ urldummy:nul/url
+/snapshotRepository
+ /distributionManagement
+
+ build
+extensions
+ extension
+groupIdorg.apache.maven.its.release/groupId
+artifactIdwagon-provider-dummy/artifactId
+version1.0/version
+ /extension
+/extensions
+plugins
+ plugin
+groupIdorg.apache.maven.plugins/groupId
+artifactIdmaven-release-plugin/artifactId
+version@project.version@/version
+dependencies
+ dependency
+groupIdorg.apache.maven.its.release/groupId
+artifactIdmaven-scm-provider-dummy/artifactId
+version1.0/version
+ /dependency
+/dependencies
+configuration
+ localCheckouttrue/localCheckout
+/configuration
+ /plugin
+/plugins
+ /build
+/project
\ No newline at end of file
Added:
svn commit: r1430624 - /maven/plugins/trunk/maven-doap-plugin/src/main/java/org/apache/maven/plugin/doap/DoapMojo.java
Author: olamy
Date: Tue Jan 8 23:16:09 2013
New Revision: 1430624
URL: http://svn.apache.org/viewvc?rev=1430624view=rev
Log:
[MDOAP-38] shortdesc too long value provide better error message
Modified:
maven/plugins/trunk/maven-doap-plugin/src/main/java/org/apache/maven/plugin/doap/DoapMojo.java
Modified:
maven/plugins/trunk/maven-doap-plugin/src/main/java/org/apache/maven/plugin/doap/DoapMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-doap-plugin/src/main/java/org/apache/maven/plugin/doap/DoapMojo.java?rev=1430624r1=1430623r2=1430624view=diff
==
---
maven/plugins/trunk/maven-doap-plugin/src/main/java/org/apache/maven/plugin/doap/DoapMojo.java
(original)
+++
maven/plugins/trunk/maven-doap-plugin/src/main/java/org/apache/maven/plugin/doap/DoapMojo.java
Tue Jan 8 23:16:09 2013
@@ -396,7 +396,9 @@ public class DoapMojo
// Public methods
// --
-/** {@inheritDoc} */
+/**
+ * {@inheritDoc}
+ */
public void execute()
throws MojoExecutionException
{
@@ -464,8 +466,8 @@ public class DoapMojo
return null;
}
-getLog().info( Using artifact + artifact.getGroupId() + : +
artifact.getArtifactId() + :
- + artifact.getVersion() );
+getLog().info(
+Using artifact + artifact.getGroupId() + : +
artifact.getArtifactId() + : + artifact.getVersion() );
try
{
@@ -502,7 +504,7 @@ public class DoapMojo
/**
* Write a doap file for the given project.
*
- * @param project not null
+ * @param projectnot null
* @param outputFile not null
* @since 1.1
*/
@@ -559,34 +561,34 @@ public class DoapMojo
DoapUtil.writeStartElement( writer, rdf, RDF );
if ( Arrays.binarySearch( Locale.getISOLanguages(), lang ) 0 )
{
-messages.addMessage( new String[] { doapOptions, lang }, lang,
UserMessages.INVALID_ISO_DATE );
+messages.addMessage( new String[]{ doapOptions, lang }, lang,
UserMessages.INVALID_ISO_DATE );
throw new MojoExecutionException( messages.getErrorMessages().get(
0 ) );
}
writer.addAttribute( xml:lang, lang );
if ( StringUtils.isEmpty( doapOptions.getXmlnsNamespaceURI() ) )
{
-messages.addMessage( new String[] { doapOptions,
xmlnsNamespaceURI }, null, UserMessages.REQUIRED );
+messages.addMessage( new String[]{ doapOptions,
xmlnsNamespaceURI }, null, UserMessages.REQUIRED );
throw new MojoExecutionException( messages.getErrorMessages().get(
0 ) );
}
-writer.addAttribute( xmlns
- + ( StringUtils.isEmpty(
doapOptions.getXmlnsPrefix() ) ? : :
- + doapOptions.getXmlnsPrefix() ),
doapOptions.getXmlnsNamespaceURI() );
+writer.addAttribute(
+xmlns + ( StringUtils.isEmpty( doapOptions.getXmlnsPrefix() ) ?
: : + doapOptions.getXmlnsPrefix() ),
+doapOptions.getXmlnsNamespaceURI() );
writer.addAttribute( xmlns:rdf,
http://www.w3.org/1999/02/22-rdf-syntax-ns#; );
writer.addAttribute( xmlns:foaf, http://xmlns.com/foaf/0.1/; );
if ( asfExtOptions.isIncluded() )
{
if ( StringUtils.isEmpty( asfExtOptions.getXmlnsPrefix() ) )
{
-messages.addMessage( new String[] { doapOptions,
xmlnsPrefix }, null, UserMessages.REQUIRED );
+messages.addMessage( new String[]{ doapOptions,
xmlnsPrefix }, null, UserMessages.REQUIRED );
throw new MojoExecutionException(
messages.getErrorMessages().get( 0 ) );
}
if ( StringUtils.isEmpty( asfExtOptions.getXmlnsNamespaceURI() ) )
{
-messages.addMessage( new String[] { doapOptions,
xmlnsNamespaceURI }, null, UserMessages.REQUIRED );
+messages.addMessage( new String[]{ doapOptions,
xmlnsNamespaceURI }, null, UserMessages.REQUIRED );
}
-writer.addAttribute( xmlns
- + ( StringUtils.isEmpty(
asfExtOptions.getXmlnsPrefix() ) ? : :
- + asfExtOptions.getXmlnsPrefix() ),
asfExtOptions.getXmlnsNamespaceURI() );
+writer.addAttribute( xmlns + ( StringUtils.isEmpty(
asfExtOptions.getXmlnsPrefix() )
+?
+: : + asfExtOptions.getXmlnsPrefix() ),
asfExtOptions.getXmlnsNamespaceURI() );
}
if ( extOptions != null extOptions.length 0
!extOptions[0].getExtensions().isEmpty() )
{
@@ -594,20 +596,19 @@ public class DoapMojo
{
if ( StringUtils.isEmpty( extOption.getXmlnsPrefix() ) )
{
-
svn commit: r1430625 - in /maven/plugins/trunk/maven-doap-plugin/src: it/MDOAP-38/ it/MDOAP-38/invoker.properties it/MDOAP-38/pom.xml it/MDOAP-38/verify.groovy main/java/org/apache/maven/plugin/doap/D
Author: olamy Date: Tue Jan 8 23:16:28 2013 New Revision: 1430625 URL: http://svn.apache.org/viewvc?rev=1430625view=rev Log: [MDOAP-38] add it test. Added: maven/plugins/trunk/maven-doap-plugin/src/it/MDOAP-38/ maven/plugins/trunk/maven-doap-plugin/src/it/MDOAP-38/invoker.properties (with props) maven/plugins/trunk/maven-doap-plugin/src/it/MDOAP-38/pom.xml (with props) maven/plugins/trunk/maven-doap-plugin/src/it/MDOAP-38/verify.groovy (with props) Modified: maven/plugins/trunk/maven-doap-plugin/src/main/java/org/apache/maven/plugin/doap/DoapMojo.java Added: maven/plugins/trunk/maven-doap-plugin/src/it/MDOAP-38/invoker.properties URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-doap-plugin/src/it/MDOAP-38/invoker.properties?rev=1430625view=auto == --- maven/plugins/trunk/maven-doap-plugin/src/it/MDOAP-38/invoker.properties (added) +++ maven/plugins/trunk/maven-doap-plugin/src/it/MDOAP-38/invoker.properties Tue Jan 8 23:16:28 2013 @@ -0,0 +1 @@ +invoker.buildResult = failure \ No newline at end of file Propchange: maven/plugins/trunk/maven-doap-plugin/src/it/MDOAP-38/invoker.properties -- svn:eol-style = native Propchange: maven/plugins/trunk/maven-doap-plugin/src/it/MDOAP-38/invoker.properties -- svn:keywords = Author Date Id Revision Added: maven/plugins/trunk/maven-doap-plugin/src/it/MDOAP-38/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-doap-plugin/src/it/MDOAP-38/pom.xml?rev=1430625view=auto == --- maven/plugins/trunk/maven-doap-plugin/src/it/MDOAP-38/pom.xml (added) +++ maven/plugins/trunk/maven-doap-plugin/src/it/MDOAP-38/pom.xml Tue Jan 8 23:16:28 2013 @@ -0,0 +1,116 @@ +?xml version=1.0 encoding=UTF-8? + +!-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +License); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +-- + +project xmlns=http://maven.apache.org/POM/4.0.0; xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation=http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd; + modelVersion4.0.0/modelVersion + + groupIdorg.apache.maven.its.doap/groupId + artifactIdmaven-it-plugin/artifactId + version1.0-SNAPSHOT/version + packagingmaven-plugin/packaging + + nameTest Plugin/name + description +Tests the check of a simple plugin Tests the check of a simple plugin Tests the check of a simple plugin Tests the check of a simple plugin. + /description + urlhttp://maven.apache.org/plugins/maven-doap-plugin/url + inceptionYear2009/inceptionYear + + prerequisites +maven2.0.6/maven + /prerequisites + + scm + connectionscm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-doap-plugin//connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-doap-plugin//developerConnection + urlhttp://svn.apache.org/viewvc/maven/plugins/trunk/maven-doap-plugin//url + /scm + issueManagement +systemjira/system +urlhttp://jira.codehaus.org/browse/MDOAP/url + /issueManagement + licenses +license + nameThe Apache Software License, Version 2.0/name + urlhttp://www.apache.org/licenses/LICENSE-2.0.txt/url + distributionrepo/distribution +/license + /licenses + organization +nameThe Apache Software Foundation/name +urlhttp://www.apache.org//url + /organization + mailingLists +mailingList + nameMaven Announcements List/name + postannou...@maven.apache.org/post + subscribeannounce-subscr...@maven.apache.org/subscribe + unsubscribeannounce-unsubscr...@maven.apache.org/unsubscribe + archivehttp://mail-archives.apache.org/mod_mbox/maven-announce//archive + otherArchives + otherArchivehttp://www.mail-archive.com/announce@maven.apache.org/otherArchive + otherArchivehttp://www.nabble.com/Maven-Announcements-f15617.html/otherArchive + otherArchivehttp://markmail.org/list/org.apache.maven.announce/otherArchive + /otherArchives +/mailingList + /mailingLists + +
