Skip to content
Permalink
Browse files
Update dependencies and plugins
  • Loading branch information
amarkevich committed Mar 26, 2021
1 parent 6482619 commit 5d8724057f1298816573ab59f2100356a7d669d0
Showing 17 changed files with 30 additions and 115 deletions.
@@ -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>
@@ -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>
@@ -81,7 +81,7 @@ public boolean run(Outline outline, Options opt, ErrorHandler errorHandler) {
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>")) {
@@ -45,11 +45,6 @@
<artifactId>plexus-build-api</artifactId>
<version>0.0.7</version>
</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>
@@ -70,11 +65,6 @@
<artifactId>maven-compat</artifactId>
<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>
@@ -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>

@@ -496,11 +496,9 @@ private int runForked(XsdOption option, String outputDir) throws Exception {
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();

@@ -201,7 +201,7 @@ private synchronized Class<?> getModelLoaderClass() {
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() + "();");
}
}
@@ -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>
@@ -179,18 +179,17 @@ public boolean run(Outline outline, Options opt, ErrorHandler errorHandler) {
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 @@ public boolean run(Outline outline, Options opt, ErrorHandler errorHandler) {
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);
42 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>
@@ -195,11 +195,6 @@
</plugins>
<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>
@@ -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>
@@ -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>
@@ -93,7 +93,6 @@ public boolean run(Outline outline, Options opt, ErrorHandler errorHandler) {
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 @@ public boolean run(Outline outline, Options opt, ErrorHandler errorHandler) {
}
if (target != null) {
try {
targetName = getName(target);
String targetName = getName(target);

JFieldVar field = co.implClass.fields().get(targetName);

@@ -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>
@@ -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>
@@ -49,10 +49,6 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</dependency>
<dependency>
<groupId>wsdl4j</groupId>
<artifactId>wsdl4j</artifactId>

0 comments on commit 5d87240

Please sign in to comment.