Merge pull request apache#281 from ffang/ENTESB-13503

Entesb 13503
rnetuka · Jul 15, 2020 · dbcb461 · dbcb461
2 parents ed117ce + 14aedce
commit dbcb461
Show file tree

Hide file tree

Showing 8 changed files with 76 additions and 5 deletions.
diff --git a/core/pom.xml b/core/pom.xml
@@ -328,6 +328,28 @@
                         </configuration>
                     </execution>
                 </executions>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.apache.cxf.xjcplugins</groupId>
+                        <artifactId>cxf-xjc-javadoc</artifactId>
+                        <version>${cxf.xjc-utils.version}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.apache.cxf.xjcplugins</groupId>
+                        <artifactId>cxf-xjc-dv</artifactId>
+                        <version>${cxf.xjc-utils.version}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.apache.cxf.xjcplugins</groupId>
+                        <artifactId>cxf-xjc-ts</artifactId>
+                        <version>${cxf.xjc-utils.version}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>com.sun.xml.bind</groupId>
+                        <artifactId>jaxb-xjc</artifactId>
+                        <version>${cxf.jaxb.xjc.version}</version>
+                    </dependency>
+                </dependencies>
             </plugin>
         </plugins>
         <pluginManagement>

diff --git a/distribution/pom.xml b/distribution/pom.xml
@@ -493,7 +493,7 @@
                                 <descriptor>src/main/assembly/bin.xml</descriptor>
                             </descriptors>
                             <appendAssemblyId>false</appendAssemblyId>
-                            <tarLongFileMode>${tar.long.file.mode}</tarLongFileMode>
+                            <tarLongFileMode>posix</tarLongFileMode>
                         </configuration>
                     </execution>
                     <execution>
@@ -506,7 +506,7 @@
                             <descriptors>
                                 <descriptor>src/main/assembly/src.xml</descriptor>
                             </descriptors>
-                            <tarLongFileMode>${tar.long.file.mode}</tarLongFileMode>
+                            <tarLongFileMode>posix</tarLongFileMode>
                         </configuration>
                     </execution>
                 </executions>

diff --git a/maven-plugins/java2swagger-plugin/pom.xml b/maven-plugins/java2swagger-plugin/pom.xml
@@ -132,6 +132,10 @@
                     <groupId>org.apache.maven</groupId>
                     <artifactId>maven-toolchain</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>org.apache.struts</groupId>
+                    <artifactId>struts-core</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
 

diff --git a/maven-plugins/java2wadl-plugin/pom.xml b/maven-plugins/java2wadl-plugin/pom.xml
@@ -122,6 +122,10 @@
                     <groupId>org.apache.maven</groupId>
                     <artifactId>maven-toolchain</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>org.apache.struts</groupId>
+                    <artifactId>struts-core</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
 

diff --git a/rt/rs/extensions/search/pom.xml b/rt/rs/extensions/search/pom.xml
@@ -36,6 +36,7 @@
             javax.persistence*;resolution:=optional,
             org.apache.tika.*;resolution:=optional
         </cxf.osgi.import>
+        <jackson.version>1.9.13.jdk17-redhat-00001</jackson.version>
     </properties>
     <dependencies>
         <dependency>
@@ -94,8 +95,28 @@
                     <groupId>jdk.tools</groupId>
                     <artifactId>jdk.tools</artifactId>
                </exclusion>
+               <exclusion>
+                    <groupId>org.codehaus.jackson</groupId>
+                    <artifactId>jackson-core-asl</artifactId>
+               </exclusion>
+               <exclusion>
+                    <groupId>org.codehaus.jackson</groupId>
+                    <artifactId>jackson-mapper-asl</artifactId>
+               </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>org.codehaus.jackson</groupId>
+            <artifactId>jackson-core-asl</artifactId>
+            <version>${jackson.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.codehaus.jackson</groupId>
+            <artifactId>jackson-mapper-asl</artifactId>
+            <version>${jackson.version}</version>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>org.apache.tika</groupId>
             <artifactId>tika-parsers</artifactId>

diff --git a/rt/transports/http-undertow/pom.xml b/rt/transports/http-undertow/pom.xml
@@ -160,14 +160,12 @@
                             <additionalJvmArgs>${cxf.xjc.jvmArgs}</additionalJvmArgs>
                             <extensions>
                                 <extension>org.apache.cxf.xjcplugins:cxf-xjc-bug986:${cxf.xjc-utils.version}</extension>
-                                <extension>org.apache.cxf.xjcplugins:cxf-xjc-dv:${cxf.xjc-utils.version}</extension>
                             </extensions>
                             <sourceRoot>${basedir}/target/generated/src/main/java</sourceRoot>
                             <xsdOptions>
                                 <xsdOption>
                                     <extensionArgs>
                                         <arg>-Xbug986</arg>
-                                        <arg>-Xdv</arg>
                                     </extensionArgs>
                                     <xsd>${basedir}/src/main/resources/schemas/configuration/http-undertow.xsd</xsd>
                                     <catalog>${basedir}/src/main/build-resources/catalog.cat</catalog>

diff --git a/rt/transports/http/pom.xml b/rt/transports/http/pom.xml
@@ -54,7 +54,7 @@
             org.apache.aries.blueprint.NamespaceHandler;osgi.service.blueprint.namespace="http://cxf.apache.org/transports/http/configuration"
         </cxf.export.service>
         <cxf.public.suffix.list.url>
-            https://publicsuffix.org/list/effective_tld_names.dat
+            https://raw.githubusercontent.com/publicsuffix/list/master/public_suffix_list.dat
         </cxf.public.suffix.list.url>
     </properties>
     <dependencies>

diff --git a/systests/wsdl_maven/codegen/pom.xml b/systests/wsdl_maven/codegen/pom.xml
@@ -107,6 +107,28 @@
                         </configuration>
                     </execution>
                 </executions>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.apache.cxf.xjcplugins</groupId>
+                        <artifactId>cxf-xjc-javadoc</artifactId>
+                        <version>${cxf.xjc-utils.version}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.apache.cxf.xjcplugins</groupId>
+                        <artifactId>cxf-xjc-dv</artifactId>
+                        <version>${cxf.xjc-utils.version}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.apache.cxf.xjcplugins</groupId>
+                        <artifactId>cxf-xjc-ts</artifactId>
+                        <version>${cxf.xjc-utils.version}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>com.sun.xml.bind</groupId>
+                        <artifactId>jaxb-xjc</artifactId>
+                        <version>${cxf.jaxb.xjc.version}</version>
+                    </dependency>
+                </dependencies>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>