Skip to content

Commit 2aa710e

Browse files
slachiewiczslachiewicz
authored
Migrate codehaus:wstx to com.fasterxml.woodstox:woodstox-core 6.2.4 (#101)
1 parent 2c1d800 commit 2aa710e

File tree

8 files changed

+32
-52
lines changed

8 files changed

+32
-52
lines changed

‎modello-maven-plugin/src/it/features/pom.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,15 @@
2323
<version>3.0.13</version>
2424
</dependency>
2525
<dependency>
26-
<groupId>stax</groupId>
27-
<artifactId>stax-api</artifactId>
28-
<version>1.0.1</version>
26+
<groupId>org.codehaus.woodstox</groupId>
27+
<artifactId>stax2-api</artifactId>
28+
<version>4.2</version>
2929
<scope>compile</scope>
3030
</dependency>
3131
<dependency>
32-
<groupId>org.codehaus.woodstox</groupId>
33-
<artifactId>wstx-asl</artifactId>
34-
<version>3.2.0</version>
32+
<groupId>com.fasterxml.woodstox</groupId>
33+
<artifactId>woodstox-core</artifactId>
34+
<version>6.2.4</version>
3535
<scope>compile</scope>
3636
</dependency>
3737
<dependency>

‎modello-maven-plugin/src/it/stax-no-plexus-utils/pom.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@
1616
<dependencies>
1717
<!-- NOTE: This must compile without plexus-utils -->
1818
<dependency>
19-
<groupId>stax</groupId>
20-
<artifactId>stax-api</artifactId>
21-
<version>1.0.1</version>
19+
<groupId>org.codehaus.woodstox</groupId>
20+
<artifactId>stax2-api</artifactId>
21+
<version>4.2</version>
2222
<scope>compile</scope>
2323
</dependency>
2424
<dependency>
25-
<groupId>org.codehaus.woodstox</groupId>
26-
<artifactId>wstx-asl</artifactId>
27-
<version>3.2.0</version>
25+
<groupId>com.fasterxml.woodstox</groupId>
26+
<artifactId>woodstox-core</artifactId>
27+
<version>6.2.4</version>
2828
<scope>compile</scope>
2929
</dependency>
3030
</dependencies>

‎modello-plugins/modello-plugin-converters/pom.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,15 @@
2828
<artifactId>plexus-utils</artifactId>
2929
</dependency>
3030
<dependency>
31-
<groupId>stax</groupId>
32-
<artifactId>stax-api</artifactId>
33-
<version>1.0.1</version>
31+
<groupId>org.codehaus.woodstox</groupId>
32+
<artifactId>stax2-api</artifactId>
33+
<version>4.2</version>
3434
<scope>test</scope>
3535
</dependency>
3636
<dependency>
37-
<groupId>org.codehaus.woodstox</groupId>
38-
<artifactId>wstx-asl</artifactId>
39-
<version>3.2.0</version>
37+
<groupId>com.fasterxml.woodstox</groupId>
38+
<artifactId>woodstox-core</artifactId>
39+
<version>6.2.4</version>
4040
<scope>test</scope>
4141
</dependency>
4242
</dependencies>

‎modello-plugins/modello-plugin-converters/src/test/java/org/codehaus/modello/plugin/converters/ConverterGeneratorTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ public void testConverterGenerator()
4848

4949
generateConverterClasses( getXmlResourceReader( "/features.mdo" ), "1.0.0", "1.1.0" );
5050

51-
addDependency( "stax", "stax-api" );
52-
addDependency( "org.codehaus.woodstox", "wstx-asl" );
51+
addDependency( "org.codehaus.woodstox", "stax2-api" );
52+
addDependency( "com.fasterxml.woodstox", "woodstox-core" );
5353

5454
compileGeneratedSources();
5555

‎modello-plugins/modello-plugin-stax/pom.xml

Lines changed: 6 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -27,36 +27,16 @@
2727
<groupId>org.codehaus.plexus</groupId>
2828
<artifactId>plexus-utils</artifactId>
2929
</dependency>
30-
<!--
3130
<dependency>
32-
<groupId>stax</groupId>
33-
<artifactId>stax</artifactId>
34-
<version>1.1.1-dev</version>
35-
<exclusions>
36-
<exclusion>
37-
<groupId>xmlbeans</groupId>
38-
<artifactId>xmlbeans-jsr173-api</artifactId>
39-
</exclusion>
40-
</exclusions>
41-
<scope>test</scope>
42-
</dependency>
43-
<dependency>
44-
<groupId>stax</groupId>
45-
<artifactId>stax</artifactId>
46-
<version>1.2.0</version>
47-
<scope>test</scope>
48-
</dependency>
49-
-->
50-
<dependency>
51-
<groupId>stax</groupId>
52-
<artifactId>stax-api</artifactId>
53-
<version>1.0.1</version>
31+
<groupId>org.codehaus.woodstox</groupId>
32+
<artifactId>stax2-api</artifactId>
33+
<version>4.2</version>
5434
<scope>test</scope>
5535
</dependency>
5636
<dependency>
57-
<groupId>org.codehaus.woodstox</groupId>
58-
<artifactId>wstx-asl</artifactId>
59-
<version>3.2.0</version>
37+
<groupId>com.fasterxml.woodstox</groupId>
38+
<artifactId>woodstox-core</artifactId>
39+
<version>6.2.4</version>
6040
<scope>test</scope>
6141
</dependency>
6242

‎modello-plugins/modello-plugin-stax/src/test/java/org/codehaus/modello/generator/xml/stax/AbstractStaxGeneratorTestCase.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,8 @@ protected void verifyModel( Model model, String className, String[] versions )
7878
}
7979
}
8080

81-
addDependency( "stax", "stax-api" );
82-
addDependency( "org.codehaus.woodstox", "wstx-asl" );
81+
addDependency( "org.codehaus.woodstox", "stax2-api" );
82+
addDependency( "com.fasterxml.woodstox", "woodstox-core" );
8383

8484
compileGeneratedSources();
8585

‎modello-plugins/modello-plugin-stax/src/test/java/org/codehaus/modello/generator/xml/stax/FeaturesStaxDomGeneratorTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ public void testJavaGenerator()
5353
modello.generate( model, "stax-writer", parameters );
5454
modello.generate( model, "stax-reader", parameters );
5555

56-
addDependency( "stax", "stax-api" );
57-
addDependency( "org.codehaus.woodstox", "wstx-asl" );
56+
addDependency( "org.codehaus.woodstox", "stax2-api" );
57+
addDependency( "com.fasterxml.woodstox", "woodstox-core" );
5858
addDependency( "org.xmlunit", "xmlunit-core" );
5959

6060
compileGeneratedSources( 5 );

‎modello-plugins/modello-plugin-stax/src/test/java/org/codehaus/modello/generator/xml/stax/FeaturesStaxGeneratorTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ public void testJavaGenerator()
5252
modello.generate( model, "stax-writer", parameters );
5353
modello.generate( model, "stax-reader", parameters );
5454

55-
addDependency( "stax", "stax-api" );
56-
addDependency( "org.codehaus.woodstox", "wstx-asl" );
55+
addDependency( "org.codehaus.woodstox", "stax2-api" );
56+
addDependency( "com.fasterxml.woodstox", "woodstox-core" );
5757
addDependency( "org.xmlunit", "xmlunit-core" );
5858

5959
compileGeneratedSources( 5 );

0 commit comments

Comments
 (0)