You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by el...@apache.org on 2020/04/16 14:07:05 UTC
[maven-archetype] branch i598 created (now 05e3023)
This is an automated email from the ASF dual-hosted git repository.
elharo pushed a change to branch i598
in repository https://gitbox.apache.org/repos/asf/maven-archetype.git.
at 05e3023 update JUnit
This branch includes the following new commits:
new 05e3023 update JUnit
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[maven-archetype] 01/01: update JUnit
Posted by el...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
elharo pushed a commit to branch i598
in repository https://gitbox.apache.org/repos/asf/maven-archetype.git
commit 05e3023fd0d8f899c472427aa13197928d669a68
Author: Elliotte Rusty Harold <el...@ibiblio.org>
AuthorDate: Thu Apr 16 10:06:45 2020 -0400
update JUnit
---
.../maven/archetype/common/MavenJDOMWriter.java | 105 ++++++++++-----------
.../maven/archetype/old/DefaultOldArchetype.java | 2 +-
.../maven/archetype/mojos/IntegrationTestMojo.java | 3 +-
pom.xml | 2 +-
4 files changed, 54 insertions(+), 58 deletions(-)
diff --git a/archetype-common/src/main/java/org/apache/maven/archetype/common/MavenJDOMWriter.java b/archetype-common/src/main/java/org/apache/maven/archetype/common/MavenJDOMWriter.java
index e541c89..eac9149 100644
--- a/archetype-common/src/main/java/org/apache/maven/archetype/common/MavenJDOMWriter.java
+++ b/archetype-common/src/main/java/org/apache/maven/archetype/common/MavenJDOMWriter.java
@@ -252,7 +252,7 @@ public class MavenJDOMWriter
* @param list
* @param parent
*/
- protected Element findAndReplaceSimpleLists( Counter counter, Element parent, java.util.Collection list,
+ protected Element findAndReplaceSimpleLists( Counter counter, Element parent, Collection list,
String parentName, String childName )
{
boolean shouldExist = ( list != null ) && ( list.size() > 0 );
@@ -297,8 +297,7 @@ public class MavenJDOMWriter
}
}
return element;
- } // -- Element findAndReplaceSimpleLists(Counter, Element, java.util.Collection, String,
- // String)
+ } // -- Element findAndReplaceSimpleLists(Counter, Element, Collection, String, String)
/**
* Method findAndReplaceXpp3DOM.
@@ -380,8 +379,8 @@ public class MavenJDOMWriter
* @param list
* @param parent
*/
- protected void iterateContributor( Counter counter, Element parent, java.util.Collection list,
- java.lang.String parentTag, java.lang.String childTag )
+ protected void iterateContributor( Counter counter, Element parent, Collection list,
+ String parentTag, String childTag )
{
boolean shouldExist = ( list != null ) && ( list.size() > 0 );
Element element = updateElement( counter, parent, parentTag, shouldExist );
@@ -424,8 +423,8 @@ public class MavenJDOMWriter
}
}
}
- } // -- void iterateContributor(Counter, Element, java.util.Collection, java.lang.String,
- // java.lang.String)
+ } // -- void iterateContributor(Counter, Element, Collection, String,
+ // String)
/**
* Method iterateDependency.
@@ -436,8 +435,8 @@ public class MavenJDOMWriter
* @param list
* @param parent
*/
- protected void iterateDependency( Counter counter, Element parent, java.util.Collection list,
- java.lang.String parentTag, java.lang.String childTag )
+ protected void iterateDependency( Counter counter, Element parent, Collection list,
+ String parentTag, String childTag )
{
boolean shouldExist = ( list != null ) && ( list.size() > 0 );
Element element = updateElement( counter, parent, parentTag, shouldExist );
@@ -480,8 +479,8 @@ public class MavenJDOMWriter
}
}
}
- } // -- void iterateDependency(Counter, Element, java.util.Collection, java.lang.String,
- // java.lang.String)
+ } // -- void iterateDependency(Counter, Element, java.util.Collection, String,
+ // String)
/**
* Method iterateDeveloper.
@@ -492,8 +491,8 @@ public class MavenJDOMWriter
* @param list
* @param parent
*/
- protected void iterateDeveloper( Counter counter, Element parent, java.util.Collection list,
- java.lang.String parentTag, java.lang.String childTag )
+ protected void iterateDeveloper( Counter counter, Element parent, Collection list,
+ String parentTag, String childTag )
{
boolean shouldExist = ( list != null ) && ( list.size() > 0 );
Element element = updateElement( counter, parent, parentTag, shouldExist );
@@ -536,8 +535,8 @@ public class MavenJDOMWriter
}
}
}
- } // -- void iterateDeveloper(Counter, Element, java.util.Collection, java.lang.String,
- // java.lang.String)
+ } // -- void iterateDeveloper(Counter, Element, java.util.Collection, String,
+ // String)
/**
* Method iterateExclusion.
@@ -548,8 +547,8 @@ public class MavenJDOMWriter
* @param list
* @param parent
*/
- protected void iterateExclusion( Counter counter, Element parent, java.util.Collection list,
- java.lang.String parentTag, java.lang.String childTag )
+ protected void iterateExclusion( Counter counter, Element parent, Collection list,
+ String parentTag, String childTag )
{
boolean shouldExist = ( list != null ) && ( list.size() > 0 );
Element element = updateElement( counter, parent, parentTag, shouldExist );
@@ -592,8 +591,7 @@ public class MavenJDOMWriter
}
}
}
- } // -- void iterateExclusion(Counter, Element, java.util.Collection, java.lang.String,
- // java.lang.String)
+ } // -- void iterateExclusion(Counter, Element, Collection, String, String)
/**
* Method iterateExtension.
@@ -604,8 +602,8 @@ public class MavenJDOMWriter
* @param list
* @param parent
*/
- protected void iterateExtension( Counter counter, Element parent, java.util.Collection list,
- java.lang.String parentTag, java.lang.String childTag )
+ protected void iterateExtension( Counter counter, Element parent, Collection list,
+ String parentTag, String childTag )
{
boolean shouldExist = ( list != null ) && ( list.size() > 0 );
Element element = updateElement( counter, parent, parentTag, shouldExist );
@@ -648,8 +646,7 @@ public class MavenJDOMWriter
}
}
}
- } // -- void iterateExtension(Counter, Element, java.util.Collection, java.lang.String,
- // java.lang.String)
+ } // -- void iterateExtension(Counter, Element, Collection, String, String)
/**
* Method iterateLicense.
@@ -660,8 +657,8 @@ public class MavenJDOMWriter
* @param list
* @param parent
*/
- protected void iterateLicense( Counter counter, Element parent, java.util.Collection list,
- java.lang.String parentTag, java.lang.String childTag )
+ protected void iterateLicense( Counter counter, Element parent, Collection list,
+ String parentTag, String childTag )
{
boolean shouldExist = ( list != null ) && ( list.size() > 0 );
Element element = updateElement( counter, parent, parentTag, shouldExist );
@@ -704,8 +701,8 @@ public class MavenJDOMWriter
}
}
}
- } // -- void iterateLicense(Counter, Element, java.util.Collection, java.lang.String,
- // java.lang.String)
+ } // -- void iterateLicense(Counter, Element, java.util.Collection, String,
+ // String)
/**
* Method iterateMailingList.
@@ -717,7 +714,7 @@ public class MavenJDOMWriter
* @param parent
*/
protected void iterateMailingList( Counter counter, Element parent, java.util.Collection list,
- java.lang.String parentTag, java.lang.String childTag )
+ String parentTag, String childTag )
{
boolean shouldExist = ( list != null ) && ( list.size() > 0 );
Element element = updateElement( counter, parent, parentTag, shouldExist );
@@ -760,8 +757,8 @@ public class MavenJDOMWriter
}
}
}
- } // -- void iterateMailingList(Counter, Element, java.util.Collection, java.lang.String,
- // java.lang.String)
+ } // -- void iterateMailingList(Counter, Element, java.util.Collection, String,
+ // String)
/**
* Method iterateNotifier.
@@ -773,7 +770,7 @@ public class MavenJDOMWriter
* @param parent
*/
protected void iterateNotifier( Counter counter, Element parent, java.util.Collection list,
- java.lang.String parentTag, java.lang.String childTag )
+ String parentTag, String childTag )
{
boolean shouldExist = ( list != null ) && ( list.size() > 0 );
Element element = updateElement( counter, parent, parentTag, shouldExist );
@@ -816,8 +813,8 @@ public class MavenJDOMWriter
}
}
}
- } // -- void iterateNotifier(Counter, Element, java.util.Collection, java.lang.String,
- // java.lang.String)
+ } // -- void iterateNotifier(Counter, Element, java.util.Collection, String,
+ // String)
/**
* Method iteratePlugin.
@@ -829,7 +826,7 @@ public class MavenJDOMWriter
* @param parent
*/
protected void iteratePlugin( Counter counter, Element parent, java.util.Collection list,
- java.lang.String parentTag, java.lang.String childTag )
+ String parentTag, String childTag )
{
boolean shouldExist = ( list != null ) && ( list.size() > 0 );
Element element = updateElement( counter, parent, parentTag, shouldExist );
@@ -872,8 +869,8 @@ public class MavenJDOMWriter
}
}
}
- } // -- void iteratePlugin(Counter, Element, java.util.Collection, java.lang.String,
- // java.lang.String)
+ } // -- void iteratePlugin(Counter, Element, java.util.Collection, String,
+ // String)
/**
* Method iteratePluginExecution.
@@ -885,7 +882,7 @@ public class MavenJDOMWriter
* @param parent
*/
protected void iteratePluginExecution( Counter counter, Element parent, java.util.Collection list,
- java.lang.String parentTag, java.lang.String childTag )
+ String parentTag, String childTag )
{
boolean shouldExist = ( list != null ) && ( list.size() > 0 );
Element element = updateElement( counter, parent, parentTag, shouldExist );
@@ -928,8 +925,8 @@ public class MavenJDOMWriter
}
}
}
- } // -- void iteratePluginExecution(Counter, Element, java.util.Collection, java.lang.String,
- // java.lang.String)
+ } // -- void iteratePluginExecution(Counter, Element, java.util.Collection, String,
+ // String)
/**
* Method iterateProfile.
@@ -941,7 +938,7 @@ public class MavenJDOMWriter
* @param parent
*/
protected void iterateProfile( Counter counter, Element parent, java.util.Collection list,
- java.lang.String parentTag, java.lang.String childTag )
+ String parentTag, String childTag )
{
boolean shouldExist = ( list != null ) && ( list.size() > 0 );
Element element = updateElement( counter, parent, parentTag, shouldExist );
@@ -984,8 +981,8 @@ public class MavenJDOMWriter
}
}
}
- } // -- void iterateProfile(Counter, Element, java.util.Collection, java.lang.String,
- // java.lang.String)
+ } // -- void iterateProfile(Counter, Element, java.util.Collection, String,
+ // String)
/**
* Method iterateReportPlugin.
@@ -997,7 +994,7 @@ public class MavenJDOMWriter
* @param parent
*/
protected void iterateReportPlugin( Counter counter, Element parent, java.util.Collection list,
- java.lang.String parentTag, java.lang.String childTag )
+ String parentTag, String childTag )
{
boolean shouldExist = ( list != null ) && ( list.size() > 0 );
Element element = updateElement( counter, parent, parentTag, shouldExist );
@@ -1040,8 +1037,8 @@ public class MavenJDOMWriter
}
}
}
- } // -- void iterateReportPlugin(Counter, Element, java.util.Collection, java.lang.String,
- // java.lang.String)
+ } // -- void iterateReportPlugin(Counter, Element, java.util.Collection, String,
+ // String)
/**
* Method iterateReportSet.
@@ -1053,7 +1050,7 @@ public class MavenJDOMWriter
* @param parent
*/
protected void iterateReportSet( Counter counter, Element parent, java.util.Collection list,
- java.lang.String parentTag, java.lang.String childTag )
+ String parentTag, String childTag )
{
boolean shouldExist = ( list != null ) && ( list.size() > 0 );
Element element = updateElement( counter, parent, parentTag, shouldExist );
@@ -1096,8 +1093,8 @@ public class MavenJDOMWriter
}
}
}
- } // -- void iterateReportSet(Counter, Element, java.util.Collection, java.lang.String,
- // java.lang.String)
+ } // -- void iterateReportSet(Counter, Element, java.util.Collection, String,
+ // String)
/**
* Method iterateRepository.
@@ -1109,7 +1106,7 @@ public class MavenJDOMWriter
* @param parent
*/
protected void iterateRepository( Counter counter, Element parent, java.util.Collection list,
- java.lang.String parentTag, java.lang.String childTag )
+ String parentTag, String childTag )
{
boolean shouldExist = ( list != null ) && ( list.size() > 0 );
Element element = updateElement( counter, parent, parentTag, shouldExist );
@@ -1152,8 +1149,8 @@ public class MavenJDOMWriter
}
}
}
- } // -- void iterateRepository(Counter, Element, java.util.Collection, java.lang.String,
- // java.lang.String)
+ } // -- void iterateRepository(Counter, Element, java.util.Collection, String,
+ // String)
/**
* Method iterateResource.
@@ -1165,7 +1162,7 @@ public class MavenJDOMWriter
* @param parent
*/
protected void iterateResource( Counter counter, Element parent, java.util.Collection list,
- java.lang.String parentTag, java.lang.String childTag )
+ String parentTag, String childTag )
{
boolean shouldExist = ( list != null ) && ( list.size() > 0 );
Element element = updateElement( counter, parent, parentTag, shouldExist );
@@ -1208,8 +1205,7 @@ public class MavenJDOMWriter
}
}
}
- } // -- void iterateResource(Counter, Element, java.util.Collection, java.lang.String,
- // java.lang.String)
+ } // -- void iterateResource(Counter, Element, Collection, String, String)
/**
* Method replaceXpp3DOM.
@@ -1229,7 +1225,6 @@ public class MavenJDOMWriter
domChilds.add( childs[i] );
}
- int domIndex = 0;
ListIterator it = parent.getChildren().listIterator();
while ( it.hasNext() )
{
diff --git a/archetype-common/src/main/java/org/apache/maven/archetype/old/DefaultOldArchetype.java b/archetype-common/src/main/java/org/apache/maven/archetype/old/DefaultOldArchetype.java
index d235cf4..68d6317 100644
--- a/archetype-common/src/main/java/org/apache/maven/archetype/old/DefaultOldArchetype.java
+++ b/archetype-common/src/main/java/org/apache/maven/archetype/old/DefaultOldArchetype.java
@@ -175,7 +175,7 @@ public class DefaultOldArchetype
URL[] urls;
try
{
- urls = new URL[] {archetypeFile.toURL() };
+ urls = new URL[] {archetypeFile.toURI().toURL() };
}
catch ( MalformedURLException e )
{
diff --git a/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/IntegrationTestMojo.java b/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/IntegrationTestMojo.java
index 1889d7c..feb21ef 100644
--- a/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/IntegrationTestMojo.java
+++ b/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/IntegrationTestMojo.java
@@ -34,6 +34,7 @@ import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
import java.util.Properties;
import java.util.Set;
@@ -440,7 +441,7 @@ public class IntegrationTestMojo
{
refLine = referenceFileReader.readLine();
actualLine = actualFileReader.readLine();
- if ( !StringUtils.equals( refLine, actualLine ) )
+ if ( !Objects.equals( refLine, actualLine ) )
{
return false;
}
diff --git a/pom.xml b/pom.xml
index cbd9c22..7db28e2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -213,7 +213,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.11</version>
+ <version>4.13</version>
</dependency>
<dependency>
<groupId>org.apache.maven.plugin-testing</groupId>