This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/master by this push:
new 797df326d9 Fixing samples and enforcer violations
797df326d9 is described below
commit 797df326d9b73cdaa02851a9cdc7d07bc05aad2c
Author: Andriy Redko <drr...@gmail.com>
AuthorDate: Wed Jun 22 21:44:41 2022 -0400
Fixing samples and enforcer violations
---
distribution/javadoc/pom.xml | 11 -----------
.../samples/jms_spring_config/src/main/config/binding.xml | 2 +-
distribution/src/main/release/samples/pom.xml | 2 +-
distribution/src/main/release/samples/ws_eventing/pom.xml | 1 -
.../release/samples/wsdl_first/src/main/resources/binding.xml | 2 +-
5 files changed, 3 insertions(+), 15 deletions(-)
diff --git a/distribution/javadoc/pom.xml b/distribution/javadoc/pom.xml
index b6237b6dea..659930519f 100644
--- a/distribution/javadoc/pom.xml
+++ b/distribution/javadoc/pom.xml
@@ -100,11 +100,6 @@
<artifactId>cxf-rt-rs-service-description</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-rs-service-description-swagger</artifactId>
- <version>${project.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-service-description-openapi-v3</artifactId>
@@ -155,8 +150,6 @@
<artifactId>cxf-rt-ws-transfer</artifactId>
<version>${project.version}</version>
</dependency>
-
-
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-text</artifactId>
@@ -382,10 +375,6 @@
<artifactId>lucene-core</artifactId>
<version>${cxf.lucene.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.olingo</groupId>
- <artifactId>olingo-odata2-core</artifactId>
- </dependency>
<dependency>
<groupId>org.codehaus.jettison</groupId>
<artifactId>jettison</artifactId>
diff --git
a/distribution/src/main/release/samples/jms_spring_config/src/main/config/binding.xml
b/distribution/src/main/release/samples/jms_spring_config/src/main/config/binding.xml
index 334bb1db69..fa05a1db03 100644
---
a/distribution/src/main/release/samples/jms_spring_config/src/main/config/binding.xml
+++
b/distribution/src/main/release/samples/jms_spring_config/src/main/config/binding.xml
@@ -3,7 +3,7 @@
<jaxws:bindings
xmlns:jaxws="https://jakarta.ee/xml/ns/jaxws";
xmlns:xs="http://www.w3.org/2001/XMLSchema";
- xmlns:jxb="http://java.sun.com/xml/ns/jaxb";
+ xmlns:jxb="https://jakarta.ee/xml/ns/jaxb";
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/";
wsdlLocation="CustomerService.wsdl">
<!-- <jaxws:enableAsyncMapping>true</jaxws:enableAsyncMapping> -->
diff --git a/distribution/src/main/release/samples/pom.xml
b/distribution/src/main/release/samples/pom.xml
index 41dd8f5ac8..64426857e2 100644
--- a/distribution/src/main/release/samples/pom.xml
+++ b/distribution/src/main/release/samples/pom.xml
@@ -183,7 +183,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.8.1</version>
+ <version>3.10.1</version>
<configuration>
<source>11</source>
<target>11</target>
diff --git a/distribution/src/main/release/samples/ws_eventing/pom.xml
b/distribution/src/main/release/samples/ws_eventing/pom.xml
index 088b59727b..df1f64708b 100644
--- a/distribution/src/main/release/samples/ws_eventing/pom.xml
+++ b/distribution/src/main/release/samples/ws_eventing/pom.xml
@@ -64,7 +64,6 @@
<dependency>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
- <version>4.0.3</version>
<scope>provided</scope>
</dependency>
<dependency>
diff --git
a/distribution/src/main/release/samples/wsdl_first/src/main/resources/binding.xml
b/distribution/src/main/release/samples/wsdl_first/src/main/resources/binding.xml
index 207416c2a7..7672dfa2b9 100644
---
a/distribution/src/main/release/samples/wsdl_first/src/main/resources/binding.xml
+++
b/distribution/src/main/release/samples/wsdl_first/src/main/resources/binding.xml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<jaxws:bindings xmlns:jaxws="https://jakarta.ee/xml/ns/jaxws";
xmlns:xs="http://www.w3.org/2001/XMLSchema";
xmlns:jxb="http://java.sun.com/xml/ns/jaxb";
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/";
wsdlLocation="CustomerService.wsdl">
+<jaxws:bindings xmlns:jaxws="https://jakarta.ee/xml/ns/jaxws";
xmlns:xs="http://www.w3.org/2001/XMLSchema";
xmlns:jxb="https://jakarta.ee/xml/ns/jaxb";
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/";
wsdlLocation="CustomerService.wsdl">
<!-- <jaxws:enableAsyncMapping>true</jaxws:enableAsyncMapping> -->
<jaxws:bindings node="wsdl:definitions/wsdl:types/xs:schema">
<jxb:globalBindings>
