Skip to content

Migrate from codehaus:wstx to com.fasterxml.woodstox:woodstox-core 6.2.4 #101

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Merged
merged 1 commit into from
Aug 21, 2021
Merged

Migrate from codehaus:wstx to com.fasterxml.woodstox:woodstox-core 6.2.4 #101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions modello-maven-plugin/src/it/features/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,15 @@
<version>3.0.13</version>
</dependency>
<dependency>
<groupId>stax</groupId>
<artifactId>stax-api</artifactId>
<version>1.0.1</version>
<groupId>org.codehaus.woodstox</groupId>
<artifactId>stax2-api</artifactId>
<version>4.2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.codehaus.woodstox</groupId>
<artifactId>wstx-asl</artifactId>
<version>3.2.0</version>
<groupId>com.fasterxml.woodstox</groupId>
<artifactId>woodstox-core</artifactId>
<version>6.2.4</version>
<scope>compile</scope>
</dependency>
<dependency>
Expand Down
12 changes: 6 additions & 6 deletions modello-maven-plugin/src/it/stax-no-plexus-utils/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,15 @@
<dependencies>
<!-- NOTE: This must compile without plexus-utils -->
<dependency>
<groupId>stax</groupId>
<artifactId>stax-api</artifactId>
<version>1.0.1</version>
<groupId>org.codehaus.woodstox</groupId>
<artifactId>stax2-api</artifactId>
<version>4.2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.codehaus.woodstox</groupId>
<artifactId>wstx-asl</artifactId>
<version>3.2.0</version>
<groupId>com.fasterxml.woodstox</groupId>
<artifactId>woodstox-core</artifactId>
<version>6.2.4</version>
<scope>compile</scope>
</dependency>
</dependencies>
Expand Down
12 changes: 6 additions & 6 deletions modello-plugins/modello-plugin-converters/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,15 @@
<artifactId>plexus-utils</artifactId>
</dependency>
<dependency>
<groupId>stax</groupId>
<artifactId>stax-api</artifactId>
<version>1.0.1</version>
<groupId>org.codehaus.woodstox</groupId>
<artifactId>stax2-api</artifactId>
<version>4.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.codehaus.woodstox</groupId>
<artifactId>wstx-asl</artifactId>
<version>3.2.0</version>
<groupId>com.fasterxml.woodstox</groupId>
<artifactId>woodstox-core</artifactId>
<version>6.2.4</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
4 changes: 2 additions & 2 deletions ...nverters/src/test/java/org/codehaus/modello/plugin/converters/ConverterGeneratorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@ public void testConverterGenerator()

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

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

compileGeneratedSources();

Expand Down
32 changes: 6 additions & 26 deletions modello-plugins/modello-plugin-stax/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,36 +27,16 @@
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
</dependency>
<!--
<dependency>
<groupId>stax</groupId>
<artifactId>stax</artifactId>
<version>1.1.1-dev</version>
<exclusions>
<exclusion>
<groupId>xmlbeans</groupId>
<artifactId>xmlbeans-jsr173-api</artifactId>
</exclusion>
</exclusions>
<scope>test</scope>
</dependency>
<dependency>
<groupId>stax</groupId>
<artifactId>stax</artifactId>
<version>1.2.0</version>
<scope>test</scope>
</dependency>
-->
<dependency>
<groupId>stax</groupId>
<artifactId>stax-api</artifactId>
<version>1.0.1</version>
<groupId>org.codehaus.woodstox</groupId>
<artifactId>stax2-api</artifactId>
<version>4.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.codehaus.woodstox</groupId>
<artifactId>wstx-asl</artifactId>
<version>3.2.0</version>
<groupId>com.fasterxml.woodstox</groupId>
<artifactId>woodstox-core</artifactId>
<version>6.2.4</version>
<scope>test</scope>
</dependency>

Expand Down
4 changes: 2 additions & 2 deletions .../src/test/java/org/codehaus/modello/generator/xml/stax/AbstractStaxGeneratorTestCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,8 @@ protected void verifyModel( Model model, String className, String[] versions )
}
}

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

compileGeneratedSources();

Expand Down
4 changes: 2 additions & 2 deletions ...x/src/test/java/org/codehaus/modello/generator/xml/stax/FeaturesStaxDomGeneratorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@ public void testJavaGenerator()
modello.generate( model, "stax-writer", parameters );
modello.generate( model, "stax-reader", parameters );

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

compileGeneratedSources( 5 );
Expand Down
4 changes: 2 additions & 2 deletions ...stax/src/test/java/org/codehaus/modello/generator/xml/stax/FeaturesStaxGeneratorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@ public void testJavaGenerator()
modello.generate( model, "stax-writer", parameters );
modello.generate( model, "stax-reader", parameters );

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

compileGeneratedSources( 5 );
Expand Down