Update dependencies and plugins
diff --git a/bug671/pom.xml b/bug671/pom.xml
index bbbba9b..0be202a 100644
--- a/bug671/pom.xml
+++ b/bug671/pom.xml
@@ -30,11 +30,6 @@
<version>3.3.2-SNAPSHOT</version>
</parent>
-
- <properties>
- <maven.test.skip>true</maven.test.skip>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
@@ -46,10 +41,6 @@
<artifactId>jaxb-runtime</artifactId>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- </dependency>
</dependencies>
</project>
diff --git a/bug986/pom.xml b/bug986/pom.xml
index 8879d7c..1dba701 100644
--- a/bug986/pom.xml
+++ b/bug986/pom.xml
@@ -30,11 +30,6 @@
<version>3.3.2-SNAPSHOT</version>
</parent>
-
- <properties>
- <maven.test.skip>true</maven.test.skip>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
@@ -46,10 +41,6 @@
<artifactId>jaxb-runtime</artifactId>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- </dependency>
</dependencies>
</project>
diff --git a/bug986/src/main/java/org/apache/cxf/xjc/bug986/Bug986Plugin.java b/bug986/src/main/java/org/apache/cxf/xjc/bug986/Bug986Plugin.java
index fcc2018..fd46cdf 100644
--- a/bug986/src/main/java/org/apache/cxf/xjc/bug986/Bug986Plugin.java
+++ b/bug986/src/main/java/org/apache/cxf/xjc/bug986/Bug986Plugin.java
@@ -81,7 +81,7 @@
JAnnotationValue st = getAnnotationMember(j, "name");
StringWriter sw = new StringWriter();
st.generate(new JFormatter(sw));
- if (sw.toString().equals("\"anySimpleType\"")) {
+ if ("\"anySimpleType\"".equals(sw.toString())) {
if (field.type().fullName().startsWith("java.util.List")) {
//if it's a list of non-string types, we have to remove
if (!field.type().fullName().contains("<java.lang.String>")) {
diff --git a/cxf-xjc-plugin/pom.xml b/cxf-xjc-plugin/pom.xml
index 9f19931..cb8d2bd 100644
--- a/cxf-xjc-plugin/pom.xml
+++ b/cxf-xjc-plugin/pom.xml
@@ -47,11 +47,6 @@
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-utils</artifactId>
- <version>3.0.24</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-archiver</artifactId>
<version>4.2.0</version>
</dependency>
@@ -71,11 +66,6 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.maven.shared</groupId>
- <artifactId>maven-artifact-resolver</artifactId>
- <version>1.0</version>
- </dependency>
- <dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-annotations</artifactId>
<version>3.2</version>
@@ -101,7 +91,7 @@
<dependency>
<groupId>org.javassist</groupId>
<artifactId>javassist</artifactId>
- <version>3.18.2-GA</version>
+ <version>3.27.0-GA</version>
</dependency>
</dependencies>
diff --git a/cxf-xjc-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractXSDToJavaMojo.java b/cxf-xjc-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractXSDToJavaMojo.java
index cb69a3e..350fc6f 100644
--- a/cxf-xjc-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractXSDToJavaMojo.java
+++ b/cxf-xjc-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractXSDToJavaMojo.java
@@ -496,11 +496,9 @@
throw new MojoExecutionException(e.getMessage(), e);
}
cmd.createArg().setLine(additionalJvmArgs);
-
-
- File file = null;
+
+ final File file;
try {
- //file = new File("Y:\\Users\\dkulp\\tmp\\test.jar");
file = Files.createTempFile("cxf-xjc-plugin", ".jar").toFile();
file.deleteOnExit();
diff --git a/cxf-xjc-plugin/src/main/java/org/apache/cxf/maven_plugin/XSDToJavaRunner.java b/cxf-xjc-plugin/src/main/java/org/apache/cxf/maven_plugin/XSDToJavaRunner.java
index 7d1b44b..776d018 100644
--- a/cxf-xjc-plugin/src/main/java/org/apache/cxf/maven_plugin/XSDToJavaRunner.java
+++ b/cxf-xjc-plugin/src/main/java/org/apache/cxf/maven_plugin/XSDToJavaRunner.java
@@ -201,7 +201,7 @@
CtClass cc = pool.get("com.sun.tools.xjc.ModelLoader");
cc.setName("com.sun.tools.xjc.ModelLoader");
for (CtMethod m : cc.getMethods()) {
- if (m.getName().equals("buildDOMForest")) {
+ if ("buildDOMForest".equals(m.getName())) {
m.insertBefore("$1 = new " + CustomizedLogic.class.getName() + "();");
}
}
diff --git a/dv/pom.xml b/dv/pom.xml
index 384bc5b..a7f46f1 100644
--- a/dv/pom.xml
+++ b/dv/pom.xml
@@ -30,11 +30,6 @@
<version>3.3.2-SNAPSHOT</version>
</parent>
-
- <properties>
- <maven.test.skip>true</maven.test.skip>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
diff --git a/dv/src/main/java/org/apache/cxf/xjc/dv/DefaultValuePlugin.java b/dv/src/main/java/org/apache/cxf/xjc/dv/DefaultValuePlugin.java
index 564ef6c..fcc59df 100644
--- a/dv/src/main/java/org/apache/cxf/xjc/dv/DefaultValuePlugin.java
+++ b/dv/src/main/java/org/apache/cxf/xjc/dv/DefaultValuePlugin.java
@@ -179,18 +179,17 @@
if (f.getPropertyInfo().getSchemaComponent() instanceof XSParticle) {
particle = (XSParticle)f.getPropertyInfo().getSchemaComponent();
XSTerm term = particle.getTerm();
- XSElementDecl element = null;
if (term.isElementDecl()) {
- element = particle.getTerm().asElementDecl();
- xmlDefaultValue = element.getDefaultValue();
+ XSElementDecl element = particle.getTerm().asElementDecl();
+ xmlDefaultValue = element.getDefaultValue();
xsType = element.getType();
isElement = true;
}
} else if (f.getPropertyInfo().getSchemaComponent() instanceof XSAttributeUse) {
XSAttributeUse attributeUse = (XSAttributeUse)f.getPropertyInfo().getSchemaComponent();
XSAttributeDecl decl = attributeUse.getDecl();
- xmlDefaultValue = decl.getDefaultValue();
+ xmlDefaultValue = decl.getDefaultValue();
xsType = decl.getType();
isRequiredAttr = attributeUse.isRequired();
}
@@ -268,7 +267,7 @@
List<JExpression> args = (List<JExpression>)f.get(ji);
JExpression cast = args.get(args.size() - 1);
- if (cast.getClass().getSimpleName().equals("JCast")) {
+ if ("JCast".equals(cast.getClass().getSimpleName())) {
f = cast.getClass().getDeclaredField("object");
f.setAccessible(true);
JExpression exp = (JExpression)f.get(cast);
diff --git a/pom.xml b/pom.xml
index f6f5f19..d1b00cf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>21</version>
+ <version>23</version>
</parent>
<scm>
<connection>scm:git:https://gitbox.apache.org/repos/asf/cxf-xjc-utils.git</connection>
@@ -46,7 +46,7 @@
<properties>
<cxf-buildtools-version>3.4.5-SNAPSHOT</cxf-buildtools-version>
<jdk.version>1.8</jdk.version>
- <jaxb-version>2.3.2</jaxb-version>
+ <jaxb-version>2.3.3</jaxb-version>
<eclipse.outputDirectory>${basedir}/target/classes</eclipse.outputDirectory>
<downloadSources>true</downloadSources>
@@ -110,22 +110,22 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
- <version>3.3.3</version>
+ <version>3.6.3</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
- <version>3.3.3</version>
+ <version>3.6.3</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-compat</artifactId>
- <version>3.3.3</version>
+ <version>3.6.3</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
- <version>3.9</version>
+ <version>3.12.0</version>
</dependency>
<dependency>
<groupId>wsdl4j</groupId>
@@ -196,11 +196,6 @@
<pluginManagement>
<plugins>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <version>3.0.0</version>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
<version>3.1.0</version>
@@ -225,7 +220,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>3.1.0</version>
+ <version>3.2.0</version>
<configuration>
<attach>true</attach>
<source>${jdk.version}</source>
@@ -239,7 +234,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.22.1</version>
+ <version>2.22.2</version>
<configuration>
<reportFormat>brief</reportFormat>
<useFile>false</useFile>
@@ -276,7 +271,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
- <version>3.1.0</version>
+ <version>3.2.0</version>
<configuration>
<encoding>UTF-8</encoding>
</configuration>
@@ -285,12 +280,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
- <version>3.1.1</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-shade-plugin</artifactId>
- <version>3.2.1</version>
+ <version>3.1.2</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -305,7 +295,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-report-plugin</artifactId>
- <version>2.22.1</version>
+ <version>2.22.2</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -360,7 +350,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
- <version>3.1.1</version>
+ <version>3.1.2</version>
<dependencies>
<dependency>
<groupId>org.apache.cxf.build-utils</groupId>
@@ -370,7 +360,7 @@
<dependency>
<groupId>com.puppycrawl.tools</groupId>
<artifactId>checkstyle</artifactId>
- <version>8.30</version>
+ <version>8.41</version>
</dependency>
</dependencies>
<configuration>
@@ -398,7 +388,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
- <version>3.12.0</version>
+ <version>3.14.0</version>
<dependencies>
<dependency>
<groupId>org.apache.cxf.build-utils</groupId>
@@ -572,12 +562,12 @@
<dependency>
<groupId>jakarta.xml.ws</groupId>
<artifactId>jakarta.xml.ws-api</artifactId>
- <version>2.3.2</version>
+ <version>2.3.3</version>
</dependency>
<dependency>
<groupId>jakarta.activation</groupId>
<artifactId>jakarta.activation-api</artifactId>
- <version>1.2.1</version>
+ <version>1.2.2</version>
</dependency>
</dependencies>
</profile>
diff --git a/property-listener/pom.xml b/property-listener/pom.xml
index 1937307..44a381d 100644
--- a/property-listener/pom.xml
+++ b/property-listener/pom.xml
@@ -30,11 +30,6 @@
<version>3.3.2-SNAPSHOT</version>
</parent>
-
- <properties>
- <maven.test.skip>true</maven.test.skip>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
diff --git a/property-listener/src/main/java/org/apache/cxf/xjc/property_listener/PropertyListenerPlugin.java b/property-listener/src/main/java/org/apache/cxf/xjc/property_listener/PropertyListenerPlugin.java
index d3d5de8..e496287 100644
--- a/property-listener/src/main/java/org/apache/cxf/xjc/property_listener/PropertyListenerPlugin.java
+++ b/property-listener/src/main/java/org/apache/cxf/xjc/property_listener/PropertyListenerPlugin.java
@@ -93,7 +93,6 @@
m.body().pos(0);
List<Object> contents = m.body().getContents();
JFieldRef target = null;
- String targetName = null;
JExpression value = null;
for (Object o : contents) {
if (o instanceof JAssignment) {
@@ -115,7 +114,7 @@
}
if (target != null) {
try {
- targetName = getName(target);
+ String targetName = getName(target);
JFieldVar field = co.implClass.fields().get(targetName);
diff --git a/runtime/pom.xml b/runtime/pom.xml
index a2282a1..82cf0eb 100644
--- a/runtime/pom.xml
+++ b/runtime/pom.xml
@@ -23,7 +23,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>4.2.1</version>
+ <version>5.1.1</version>
<extensions>true</extensions>
<configuration>
<instructions>
diff --git a/ts/pom.xml b/ts/pom.xml
index 38c2e82..faff7ae 100644
--- a/ts/pom.xml
+++ b/ts/pom.xml
@@ -30,11 +30,6 @@
<version>3.3.2-SNAPSHOT</version>
</parent>
-
- <properties>
- <maven.test.skip>true</maven.test.skip>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
@@ -46,10 +41,6 @@
<artifactId>jaxb-runtime</artifactId>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- </dependency>
</dependencies>
</project>
diff --git a/wsdlextension-test/pom.xml b/wsdlextension-test/pom.xml
index a423d03..ea21e93 100644
--- a/wsdlextension-test/pom.xml
+++ b/wsdlextension-test/pom.xml
@@ -50,10 +50,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- </dependency>
- <dependency>
<groupId>wsdl4j</groupId>
<artifactId>wsdl4j</artifactId>
</dependency>
diff --git a/wsdlextension-test/src/test/java/org/apache/cxf/xjc/wsdlextension/WSDLExtensionTest.java b/wsdlextension-test/src/test/java/org/apache/cxf/xjc/wsdlextension/WSDLExtensionTest.java
index 23504a3..fe0e267 100644
--- a/wsdlextension-test/src/test/java/org/apache/cxf/xjc/wsdlextension/WSDLExtensionTest.java
+++ b/wsdlextension-test/src/test/java/org/apache/cxf/xjc/wsdlextension/WSDLExtensionTest.java
@@ -19,8 +19,6 @@
package org.apache.cxf.xjc.wsdlextension;
-import java.lang.reflect.Type;
-
import org.apache.cxf.configuration.foo.Foo;
import org.junit.Assert;
@@ -33,16 +31,7 @@
Foo foo = new org.apache.cxf.configuration.foo.ObjectFactory().createFoo();
- Type[] interfaces = foo.getClass().getGenericInterfaces();
- boolean extensibilityElementExist = false;
- for (int i = 0; i < interfaces.length; i++) {
- Type inter = interfaces[i];
- if (inter.toString().equals("interface javax.wsdl.extensions.ExtensibilityElement")) {
- extensibilityElementExist = true;
- break;
- }
- }
-
- assertTrue("The interface ExtensibilityElement should be used.", extensibilityElementExist);
+ assertTrue("The interface ExtensibilityElement should be used.",
+ foo instanceof javax.wsdl.extensions.ExtensibilityElement);
}
}
diff --git a/wsdlextension/pom.xml b/wsdlextension/pom.xml
index e65b234..3fbae1e 100644
--- a/wsdlextension/pom.xml
+++ b/wsdlextension/pom.xml
@@ -30,11 +30,6 @@
<version>3.3.2-SNAPSHOT</version>
</parent>
-
- <properties>
- <maven.test.skip>true</maven.test.skip>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
@@ -47,10 +42,6 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- </dependency>
- <dependency>
<groupId>wsdl4j</groupId>
<artifactId>wsdl4j</artifactId>
</dependency>
diff --git a/wsdlextension/src/main/java/org/apache/cxf/xjc/wsdlextension/WSDLExtension.java b/wsdlextension/src/main/java/org/apache/cxf/xjc/wsdlextension/WSDLExtension.java
index e5fd374..cd2f8a1 100644
--- a/wsdlextension/src/main/java/org/apache/cxf/xjc/wsdlextension/WSDLExtension.java
+++ b/wsdlextension/src/main/java/org/apache/cxf/xjc/wsdlextension/WSDLExtension.java
@@ -57,7 +57,7 @@
public int parseArgument(Options opt, String[] args, int index) throws BadCommandLineException,
IOException {
int ret = 0;
- if (args[index].equals("-Xwsdlextension")) {
+ if ("-Xwsdlextension".equals(args[index])) {
ret = 1;
}
return ret;
