You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sj...@apache.org on 2023/10/12 06:10:09 UTC
[maven] branch MNG-7901 updated (5296f874a2 -> 6be37e40bb)
This is an automated email from the ASF dual-hosted git repository.
sjaranowski pushed a change to branch MNG-7901
in repository https://gitbox.apache.org/repos/asf/maven.git
omit 5296f874a2 [MNG-7901] Use MetadataStaxReader/Writer in MetadataXpp3Reader/Writer
new 6be37e40bb [MNG-7901] Use MetadataStaxReader/Writer in MetadataXpp3Reader/Writer
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (5296f874a2)
\
N -- N -- N refs/heads/MNG-7901 (6be37e40bb)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
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.
Summary of changes:
.../maven/artifact/repository/metadata/io/xpp3/MetadataXpp3Writer.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
[maven] 01/01: [MNG-7901] Use MetadataStaxReader/Writer in MetadataXpp3Reader/Writer
Posted by sj...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sjaranowski pushed a commit to branch MNG-7901
in repository https://gitbox.apache.org/repos/asf/maven.git
commit 6be37e40bb69b62c559650e21df8ee5a04dc0fad
Author: Slawomir Jaranowski <s....@gmail.com>
AuthorDate: Fri Oct 6 23:15:21 2023 +0200
[MNG-7901] Use MetadataStaxReader/Writer in MetadataXpp3Reader/Writer
---
maven-repository-metadata/pom.xml | 2 -
.../metadata/io/xpp3/MetadataXpp3Reader.java | 65 ++++++++++++++--------
.../metadata/io/xpp3/MetadataXpp3Writer.java | 24 ++++++--
3 files changed, 61 insertions(+), 30 deletions(-)
diff --git a/maven-repository-metadata/pom.xml b/maven-repository-metadata/pom.xml
index 2baeebbc5f..7fe3083823 100644
--- a/maven-repository-metadata/pom.xml
+++ b/maven-repository-metadata/pom.xml
@@ -99,8 +99,6 @@ under the License.
</models>
<templates>
<template>model-v3.vm</template>
- <template>reader.vm</template>
- <template>writer.vm</template>
</templates>
</configuration>
</execution>
diff --git a/maven-repository-metadata/src/main/java/org/apache/maven/artifact/repository/metadata/io/xpp3/MetadataXpp3Reader.java b/maven-repository-metadata/src/main/java/org/apache/maven/artifact/repository/metadata/io/xpp3/MetadataXpp3Reader.java
index e4e061d1e1..359ea41543 100644
--- a/maven-repository-metadata/src/main/java/org/apache/maven/artifact/repository/metadata/io/xpp3/MetadataXpp3Reader.java
+++ b/maven-repository-metadata/src/main/java/org/apache/maven/artifact/repository/metadata/io/xpp3/MetadataXpp3Reader.java
@@ -26,22 +26,24 @@ import java.io.InputStream;
import java.io.Reader;
import org.apache.maven.artifact.repository.metadata.Metadata;
+import org.apache.maven.artifact.repository.metadata.io.MetadataStaxReader;
+import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
/**
- * Provide public methods from {@link org.apache.maven.artifact.repository.metadata.io.MetadataXpp3Reader}
+ * Provide public methods from {@link MetadataStaxReader}
*
- * @deprecated Maven 3 compatability
+ * @deprecated Maven 3 compatability - please use {@link MetadataStaxReader}
*/
@Deprecated
public class MetadataXpp3Reader {
- private final org.apache.maven.artifact.repository.metadata.io.MetadataXpp3Reader delegate;
+ private final MetadataStaxReader delegate;
/**
* Default constructor
*/
public MetadataXpp3Reader() {
- delegate = new org.apache.maven.artifact.repository.metadata.io.MetadataXpp3Reader();
+ delegate = new MetadataStaxReader();
}
/**
@@ -50,8 +52,7 @@ public class MetadataXpp3Reader {
* @param contentTransformer a transformer
*/
public MetadataXpp3Reader(ContentTransformer contentTransformer) {
- delegate =
- new org.apache.maven.artifact.repository.metadata.io.MetadataXpp3Reader(contentTransformer::transform);
+ delegate = new MetadataStaxReader(contentTransformer::transform);
}
/**
@@ -79,11 +80,15 @@ public class MetadataXpp3Reader {
* @param strict a strict object.
* @return Metadata
* @throws IOException IOException if any.
- * @throws XMLStreamException XmlPullParserException if
+ * @throws XmlPullParserException XmlPullParserException if
* any.
*/
- public Metadata read(Reader reader, boolean strict) throws IOException, XMLStreamException {
- return new Metadata(delegate.read(reader, strict));
+ public Metadata read(Reader reader, boolean strict) throws IOException, XmlPullParserException {
+ try {
+ return new Metadata(delegate.read(reader, strict));
+ } catch (XMLStreamException e) {
+ throw new XmlPullParserException(e.getMessage(), null, e);
+ }
}
/**
@@ -92,11 +97,15 @@ public class MetadataXpp3Reader {
* @param reader a reader object.
* @return Metadata
* @throws IOException IOException if any.
- * @throws XMLStreamException XmlPullParserException if
+ * @throws XmlPullParserException XmlPullParserException if
* any.
*/
- public Metadata read(Reader reader) throws IOException, XMLStreamException {
- return new Metadata(delegate.read(reader));
+ public Metadata read(Reader reader) throws IOException, XmlPullParserException {
+ try {
+ return new Metadata(delegate.read(reader));
+ } catch (XMLStreamException e) {
+ throw new XmlPullParserException(e.getMessage(), null, e);
+ }
}
/**
@@ -106,11 +115,15 @@ public class MetadataXpp3Reader {
* @param strict a strict object.
* @return Metadata
* @throws IOException IOException if any.
- * @throws XMLStreamException XmlPullParserException if
+ * @throws XmlPullParserException XmlPullParserException if
* any.
*/
- public Metadata read(InputStream in, boolean strict) throws IOException, XMLStreamException {
- return new Metadata(delegate.read(in, strict));
+ public Metadata read(InputStream in, boolean strict) throws IOException, XmlPullParserException {
+ try {
+ return new Metadata(delegate.read(in, strict));
+ } catch (XMLStreamException e) {
+ throw new XmlPullParserException(e.getMessage(), null, e);
+ }
}
/**
@@ -119,11 +132,15 @@ public class MetadataXpp3Reader {
* @param in a in object.
* @return Metadata
* @throws IOException IOException if any.
- * @throws XMLStreamException XmlPullParserException if
+ * @throws XmlPullParserException XmlPullParserException if
* any.
*/
- public Metadata read(InputStream in) throws IOException, XMLStreamException {
- return new Metadata(delegate.read(in));
+ public Metadata read(InputStream in) throws IOException, XmlPullParserException {
+ try {
+ return new Metadata(delegate.read(in));
+ } catch (XMLStreamException e) {
+ throw new XmlPullParserException(e.getMessage(), null, e);
+ }
}
/**
@@ -133,15 +150,19 @@ public class MetadataXpp3Reader {
* @param strict a strict object.
* @return Metadata
* @throws IOException IOException if any.
- * @throws XMLStreamException XmlPullParserException if
+ * @throws XmlPullParserException XmlPullParserException if
* any.
*/
- public Metadata read(XMLStreamReader parser, boolean strict) throws IOException, XMLStreamException {
- return new Metadata(delegate.read(parser, strict));
+ public Metadata read(XMLStreamReader parser, boolean strict) throws IOException, XmlPullParserException {
+ try {
+ return new Metadata(delegate.read(parser, strict));
+ } catch (XMLStreamException e) {
+ throw new XmlPullParserException(e.getMessage(), null, e);
+ }
}
/**
- * {@link org.apache.maven.artifact.repository.metadata.io.MetadataXpp3Reader.ContentTransformer}
+ * {@link MetadataStaxReader.ContentTransformer}
*/
public interface ContentTransformer {
/**
diff --git a/maven-repository-metadata/src/main/java/org/apache/maven/artifact/repository/metadata/io/xpp3/MetadataXpp3Writer.java b/maven-repository-metadata/src/main/java/org/apache/maven/artifact/repository/metadata/io/xpp3/MetadataXpp3Writer.java
index a1658a046c..0929c10f71 100644
--- a/maven-repository-metadata/src/main/java/org/apache/maven/artifact/repository/metadata/io/xpp3/MetadataXpp3Writer.java
+++ b/maven-repository-metadata/src/main/java/org/apache/maven/artifact/repository/metadata/io/xpp3/MetadataXpp3Writer.java
@@ -18,26 +18,30 @@
*/
package org.apache.maven.artifact.repository.metadata.io.xpp3;
+import javax.xml.stream.XMLStreamException;
+
+import java.io.IOException;
import java.io.OutputStream;
import java.io.Writer;
import org.apache.maven.artifact.repository.metadata.Metadata;
+import org.apache.maven.artifact.repository.metadata.io.MetadataStaxWriter;
/**
- * Provide public methods from {@link org.apache.maven.artifact.repository.metadata.io.MetadataXpp3Writer}
+ * Provide public methods from {@link MetadataStaxWriter}
*
- * @deprecated Maven 3 compatability
+ * @deprecated Maven 3 compatability - please use {@link MetadataStaxWriter}
*/
@Deprecated
public class MetadataXpp3Writer {
- private final org.apache.maven.artifact.repository.metadata.io.MetadataXpp3Writer delegate;
+ private final MetadataStaxWriter delegate;
/**
* Default constructor
*/
public MetadataXpp3Writer() {
- delegate = new org.apache.maven.artifact.repository.metadata.io.MetadataXpp3Writer();
+ delegate = new MetadataStaxWriter();
}
/**
@@ -57,7 +61,11 @@ public class MetadataXpp3Writer {
* @throws java.io.IOException java.io.IOException if any
*/
public void write(Writer writer, Metadata metadata) throws java.io.IOException {
- delegate.write(writer, metadata.getDelegate());
+ try {
+ delegate.write(writer, metadata.getDelegate());
+ } catch (XMLStreamException e) {
+ throw new IOException(e);
+ }
}
/**
@@ -68,6 +76,10 @@ public class MetadataXpp3Writer {
* @throws java.io.IOException java.io.IOException if any
*/
public void write(OutputStream stream, Metadata metadata) throws java.io.IOException {
- delegate.write(stream, metadata.getDelegate());
+ try {
+ delegate.write(stream, metadata.getDelegate());
+ } catch (XMLStreamException e) {
+ throw new IOException(e);
+ }
}
}