Skip to content

Commit 8bf874b

Browse files
committed
remove xml package for plexus-utils 4
1 parent c99355e commit 8bf874b

File tree

137 files changed

+6
-20388
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

137 files changed

+6
-20388
lines changed

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,4 @@ For publishing [the site](https://codehaus-plexus.github.io/plexus-utils/) do th
1414
mvn -Preporting verify site site:stage scm-publish:publish-scm
1515
```
1616

17+
Starting with version 4, XML classes (in `org.codehaus.plexus.util.xml` and `org.codehaus.plexus.util.xml.pull`) have been extracted to a separate `plexus-xml` 4: if you need them, just use this new artifact.

pom.xml

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -26,18 +26,18 @@ limitations under the License.
2626
</parent>
2727

2828
<artifactId>plexus-utils</artifactId>
29-
<version>3.5.2-SNAPSHOT</version>
29+
<version>4.0.0-SNAPSHOT</version>
3030

3131
<name>Plexus Common Utilities</name>
32-
<description>A collection of various utility classes to ease working with strings, files, command lines, XML and
32+
<description>A collection of various utility classes to ease working with strings, files, command lines and
3333
more.
3434
</description>
3535

3636
<scm>
3737
<connection>scm:git:git@github.com:codehaus-plexus/plexus-utils.git</connection>
3838
<developerConnection>scm:git:git@github.com:codehaus-plexus/plexus-utils.git</developerConnection>
3939
<url>http://github.com/codehaus-plexus/plexus-utils</url>
40-
<tag>plexus-utils-3.5.0</tag>
40+
<tag>master</tag>
4141
</scm>
4242
<issueManagement>
4343
<system>github</system>
@@ -55,18 +55,6 @@ limitations under the License.
5555
</properties>
5656

5757
<dependencies>
58-
<dependency>
59-
<groupId>org.openjdk.jmh</groupId>
60-
<artifactId>jmh-core</artifactId>
61-
<version>1.36</version>
62-
<scope>test</scope>
63-
</dependency>
64-
<dependency>
65-
<groupId>org.openjdk.jmh</groupId>
66-
<artifactId>jmh-generator-annprocess</artifactId>
67-
<version>1.36</version>
68-
<scope>test</scope>
69-
</dependency>
7058
<dependency>
7159
<groupId>junit</groupId>
7260
<artifactId>junit</artifactId>

src/main/java/org/codehaus/plexus/util/ReaderFactory.java

Lines changed: 1 addition & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
*/
1818

1919
import java.io.File;
20-
import java.io.FileNotFoundException;
2120
import java.io.IOException;
2221
import java.io.InputStream;
2322
import java.io.InputStreamReader;
@@ -27,8 +26,6 @@
2726
import java.nio.charset.Charset;
2827
import java.nio.file.Files;
2928

30-
import org.codehaus.plexus.util.xml.XmlStreamReader;
31-
3229
/**
3330
* Utility to create Readers from streams, with explicit encoding choice: platform default, XML, or specified.
3431
*
@@ -37,6 +34,7 @@
3734
* @see <a href="http://java.sun.com/j2se/1.4.2/docs/guide/intl/encoding.doc.html">Supported encodings</a>
3835
*
3936
* @since 1.4.3
37+
* @deprecated use org.codehaus.plexus.util.xml.ReaderFactory from plexus-xml 4
4038
*/
4139
public class ReaderFactory
4240
{
@@ -94,48 +92,6 @@ public class ReaderFactory
9492
*/
9593
public static final String FILE_ENCODING = System.getProperty( "file.encoding" );
9694

97-
/**
98-
* Create a new Reader with XML encoding detection rules.
99-
*
100-
* @param in not null input stream.
101-
* @return an XML reader instance for the input stream.
102-
* @throws IOException if any.
103-
* @see XmlStreamReader
104-
*/
105-
public static XmlStreamReader newXmlReader( InputStream in )
106-
throws IOException
107-
{
108-
return new XmlStreamReader( in );
109-
}
110-
111-
/**
112-
* Create a new Reader with XML encoding detection rules.
113-
*
114-
* @param file not null file.
115-
* @return an XML reader instance for the input file.
116-
* @throws IOException if any.
117-
* @see XmlStreamReader
118-
*/
119-
public static XmlStreamReader newXmlReader( File file )
120-
throws IOException
121-
{
122-
return new XmlStreamReader( file );
123-
}
124-
125-
/**
126-
* Create a new Reader with XML encoding detection rules.
127-
*
128-
* @param url not null url.
129-
* @return an XML reader instance for the input url.
130-
* @throws IOException if any.
131-
* @see XmlStreamReader
132-
*/
133-
public static XmlStreamReader newXmlReader( URL url )
134-
throws IOException
135-
{
136-
return new XmlStreamReader( url );
137-
}
138-
13995
/**
14096
* Create a new Reader with default platform encoding.
14197
*

src/main/java/org/codehaus/plexus/util/WriterFactory.java

Lines changed: 1 addition & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@
2525
import java.nio.charset.Charset;
2626
import java.nio.file.Files;
2727

28-
import org.codehaus.plexus.util.xml.XmlStreamWriter;
29-
3028
/**
3129
* Utility to create Writers, with explicit encoding choice: platform default, XML, or specified.
3230
*
@@ -35,6 +33,7 @@
3533
* @see <a href="http://java.sun.com/j2se/1.4.2/docs/guide/intl/encoding.doc.html">Supported encodings</a>
3634
*
3735
* @since 1.4.4
36+
* @deprecated use org.codehaus.plexus.util.xml.WriterFactory from plexus-xml 4
3837
*/
3938
public class WriterFactory
4039
{
@@ -92,34 +91,6 @@ public class WriterFactory
9291
*/
9392
public static final String FILE_ENCODING = System.getProperty( "file.encoding" );
9493

95-
/**
96-
* Create a new Writer with XML encoding detection rules.
97-
*
98-
* @param out not null output stream.
99-
* @return an XML writer instance for the output stream.
100-
* @throws IOException if any.
101-
* @see XmlStreamWriter
102-
*/
103-
public static XmlStreamWriter newXmlWriter( OutputStream out )
104-
throws IOException
105-
{
106-
return new XmlStreamWriter( out );
107-
}
108-
109-
/**
110-
* Create a new Writer with XML encoding detection rules.
111-
*
112-
* @param file not null file.
113-
* @return an XML writer instance for the output file.
114-
* @throws IOException if any.
115-
* @see XmlStreamWriter
116-
*/
117-
public static XmlStreamWriter newXmlWriter( File file )
118-
throws IOException
119-
{
120-
return new XmlStreamWriter( file );
121-
}
122-
12394
/**
12495
* Create a new Writer with default platform encoding.
12596
*

src/main/java/org/codehaus/plexus/util/xml/CompactXMLWriter.java

Lines changed: 0 additions & 44 deletions
This file was deleted.

0 commit comments

Comments
 (0)