This is an automated email from the ASF dual-hosted git repository.
cstamas pushed a commit to branch update-rc-3
in repository https://gitbox.apache.org/repos/asf/maven-xinclude-extension.git
commit 10413de32263658f71b0eb2075d5f04573e353d8
Author: Tamas Cservenak <ta...@cservenak.net>
AuthorDate: Sun Mar 16 15:51:13 2025 +0100
Update Maven 4 rc3
---
pom.xml | 6 +++---
src/main/mdo/reader-stax.vm | 44 ++++++++++++++++++++++----------------------
2 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/pom.xml b/pom.xml
index a4f2e01..1f31a7a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,9 +33,9 @@ under the License.
<properties>
<javaVersion>17</javaVersion>
- <maven.version>4.0.0-rc-1</maven.version>
+ <maven.version>4.0.0-rc-3</maven.version>
- <versions.junit5>5.11.3</versions.junit5>
+ <versions.junit5>5.12.1</versions.junit5>
<version.maven-dependency-plugin>3.8.1</version.maven-dependency-plugin>
<version.maven-surefire-plugin>3.5.2</version.maven-surefire-plugin>
<version.maven-invoker-plugin>3.9.0</version.maven-invoker-plugin>
@@ -68,7 +68,7 @@ under the License.
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-api-meta</artifactId>
+ <artifactId>maven-api-annotations</artifactId>
<version>${maven.version}</version>
<scope>provided</scope>
</dependency>
diff --git a/src/main/mdo/reader-stax.vm b/src/main/mdo/reader-stax.vm
index c0c7cec..591fcc1 100644
--- a/src/main/mdo/reader-stax.vm
+++ b/src/main/mdo/reader-stax.vm
@@ -446,19 +446,19 @@ public class ${className} {
* @return ${root.name}
*/
#if ( $locationTracking )
- public ${root.name} read(Reader reader, boolean strict, InputSource
source) throws XMLStreamException {
+ public ${root.name} read(Reader reader, boolean strict, InputSource
inputSrc) throws XMLStreamException {
#else
public ${root.name} read(Reader reader, boolean strict) throws
XMLStreamException {
#end
#if ( $locationTracking )
- StreamSource streamSource = new StreamSource(reader, source != null ?
source.getLocation() : null);
+ StreamSource streamSource = new StreamSource(reader, inputSrc != null
? inputSrc.getLocation() : null);
#else
StreamSource streamSource = new StreamSource(reader);
#end
XMLInputFactory factory = getXMLInputFactory(strict);
XMLStreamReader parser = factory.createXMLStreamReader(streamSource);
#if ( $locationTracking )
- return read(parser, strict, source);
+ return read(parser, strict, inputSrc);
#else
return read(parser, strict);
#end
@@ -482,19 +482,19 @@ public class ${className} {
* @return ${root.name}
*/
#if ( $locationTracking )
- public ${root.name} read(InputStream in, boolean strict, InputSource
source) throws XMLStreamException {
+ public ${root.name} read(InputStream in, boolean strict, InputSource
inputSrc) throws XMLStreamException {
#else
public ${root.name} read(InputStream in, boolean strict) throws
XMLStreamException {
#end
#if ( $locationTracking )
- StreamSource streamSource = new StreamSource(in, source != null ?
source.getLocation() : null);
+ StreamSource streamSource = new StreamSource(in, inputSrc != null ?
inputSrc.getLocation() : null);
#else
StreamSource streamSource = new StreamSource(in);
#end
XMLInputFactory factory = getXMLInputFactory(strict);
XMLStreamReader parser = factory.createXMLStreamReader(streamSource);
#if ( $locationTracking )
- return read(parser, strict, source);
+ return read(parser, strict, inputSrc);
#else
return read(parser, strict);
#end
@@ -510,7 +510,7 @@ public class ${className} {
* @return ${root.name}
*/
#if ( $locationTracking )
- public ${root.name} read(XMLStreamReader parser, boolean strict,
InputSource source) throws XMLStreamException {
+ public ${root.name} read(XMLStreamReader parser, boolean strict,
InputSource inputSrc) throws XMLStreamException {
#else
public ${root.name} read(XMLStreamReader parser, boolean strict) throws
XMLStreamException {
#end
@@ -529,7 +529,7 @@ public class ${className} {
throw new XMLStreamException("Duplicated tag:
'${rootTag}'", parser.getLocation(), null);
}
#if ( $locationTracking )
- $rootLcapName = parse${rootUcapName}(parser, strict, source);
+ $rootLcapName = parse${rootUcapName}(parser, strict, inputSrc);
#elseif ( $needXmlContext )
$rootLcapName = parse${rootUcapName}(parser, strict, context);
#else
@@ -552,7 +552,7 @@ public class ${className} {
#set ( $ancestors = $Helper.ancestors( $class ) )
#set ( $allFields = $Helper.xmlFields( $class ) )
#if ( $locationTracking )
- private ${classUcapName} parse${classUcapName}(XMLStreamReader parser,
boolean strict, InputSource source) throws XMLStreamException {
+ private ${classUcapName} parse${classUcapName}(XMLStreamReader parser,
boolean strict, InputSource inputSrc) throws XMLStreamException {
#elseif ( $needXmlContext )
private ${classUcapName} parse${classUcapName}(XMLStreamReader parser,
boolean strict, Deque<Object> context) throws XMLStreamException {
#else
@@ -562,7 +562,7 @@ public class ${className} {
${classUcapName}.Builder ${classLcapName} =
${classUcapName}.newBuilder(true);
#if ( $locationTracking )
if (addLocationInformation) {
- ${classLcapName}.location("", new
InputLocation(parser.getLocation().getLineNumber(),
parser.getLocation().getColumnNumber(), source));
+ ${classLcapName}.location("", new
InputLocation(parser.getLocation().getLineNumber(),
parser.getLocation().getColumnNumber(), inputSrc));
}
#end
for (int i = parser.getAttributeCount() - 1; i >= 0; i--) {
@@ -585,7 +585,7 @@ public class ${className} {
} else if ("$fieldTagName".equals(name)) {
#if ( $locationTracking )
if (addLocationInformation) {
- ${classLcapName}.location(name, new
InputLocation(parser.getLocation().getLineNumber(),
parser.getLocation().getColumnNumber(), source));
+ ${classLcapName}.location(name, new
InputLocation(parser.getLocation().getLineNumber(),
parser.getLocation().getColumnNumber(), inputSrc));
}
#end
#if ( $field.type == "String" )
@@ -643,7 +643,7 @@ public class ${className} {
break;
#elseif ( $field.type == "DOM" )
#if ( $locationTracking )
- ${classLcapName}.${field.name}(buildXmlNode(parser,
source));
+ ${classLcapName}.${field.name}(buildXmlNode(parser,
inputSrc));
#else
${classLcapName}.${field.name}(buildXmlNode(parser));
#end
@@ -657,7 +657,7 @@ public class ${className} {
if
("${Helper.singular($fieldTagName)}".equals(parser.getLocalName())) {
#if ( $locationTracking )
if (addLocationInformation) {
-
locations.put(Integer.valueOf(locations.size()), new
InputLocation(parser.getLocation().getLineNumber(),
parser.getLocation().getColumnNumber(), source));
+
locations.put(Integer.valueOf(locations.size()), new
InputLocation(parser.getLocation().getLineNumber(),
parser.getLocation().getColumnNumber(), inputSrc));
}
#end
${field.name}.add(interpolatedTrimmed(nextText(parser, strict),
"${fieldTagName}"));
@@ -677,7 +677,7 @@ public class ${className} {
String value = nextText(parser, strict).trim();
#if ( $locationTracking )
if (addLocationInformation) {
- locations.put(key, new
InputLocation(parser.getLocation().getLineNumber(),
parser.getLocation().getColumnNumber(), source));
+ locations.put(key, new
InputLocation(parser.getLocation().getLineNumber(),
parser.getLocation().getColumnNumber(), inputSrc));
}
#end
${field.name}.put(key, value);
@@ -686,7 +686,7 @@ public class ${className} {
break;
#elseif ( $field.to && $field.multiplicity == "1" )
#if ( $locationTracking )
-
${classLcapName}.${field.name}(parse${field.toClass.name}(parser, strict,
source));
+
${classLcapName}.${field.name}(parse${field.toClass.name}(parser, strict,
inputSrc));
#elseif ( $needXmlContext )
${classLcapName}.${field.name}(parse${field.toClass.name}(parser, strict,
context));
#else
@@ -695,7 +695,7 @@ public class ${className} {
break;
#elseif ( $field.to && $field.multiplicity == "*" &&
$Helper.isFlatItems( $field ) )
#if ( $locationTracking )
- ${field.name}.add(parse${field.toClass.name}(parser,
strict, source));
+ ${field.name}.add(parse${field.toClass.name}(parser,
strict, inputSrc));
#elseif ( $needXmlContext )
${field.name}.add(parse${field.toClass.name}(parser,
strict, context));
#else
@@ -707,7 +707,7 @@ public class ${className} {
while (parser.nextTag() == XMLStreamReader.START_ELEMENT) {
if
("${Helper.singular($fieldTagName)}".equals(parser.getLocalName())) {
#if ( $locationTracking )
-
${field.name}.add(parse${field.toClass.name}(parser, strict, source));
+
${field.name}.add(parse${field.toClass.name}(parser, strict, inputSrc));
#elseif ( $needXmlContext )
${field.name}.add(parse${field.toClass.name}(parser, strict, context));
#else
@@ -734,7 +734,7 @@ public class ${className} {
}
#if ( $locationTracking )
if (addLocationInformation) {
- ${classLcapName}.location(childName, new InputLocation(line,
column, source, locations));
+ ${classLcapName}.location(childName, new InputLocation(line,
column, inputSrc, locations));
}
#end
}
@@ -931,10 +931,10 @@ public class ${className} {
}
#if ( $locationTracking )
- private XmlNode buildXmlNode(XMLStreamReader parser, InputSource source)
throws XMLStreamException {
+ private XmlNode buildXmlNode(XMLStreamReader parser, InputSource inputSrc)
throws XMLStreamException {
return XmlNodeStaxBuilder.build(parser,
addLocationInformation
- ? p -> new
InputLocation(parser.getLocation().getLineNumber(),
parser.getLocation().getColumnNumber(), source)
+ ? p -> new
InputLocation(parser.getLocation().getLineNumber(),
parser.getLocation().getColumnNumber(), inputSrc)
: null);
}
#else
@@ -1001,12 +1001,12 @@ public class ${className} {
public static interface ContentTransformer {
/**
* Interpolate the value read from the xpp3 document
- * @param source The source value
+ * @param inputSrc The input source value
* @param fieldName A description of the field being interpolated. The
implementation may use this to
* log stuff.
* @return The interpolated value.
*/
- String transform(String source, String fieldName);
+ String transform(String inputSrc, String fieldName);
}
}
