You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by bu...@apache.org on 2020/04/20 20:22:19 UTC
[cxf] branch master updated (ce23b66 -> caf6f42)
This is an automated email from the ASF dual-hosted git repository.
buhhunyx pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git.
from ce23b66 Update to maven-antrun-plugin 3.0.0
new 49337a7 Update to stax-ex 1.8.3
new caf6f42 cxf-distribution-javadoc: fix warnings
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../java/org/apache/cxf/common/logging/LogUtils.java | 2 +-
distribution/javadoc/pom.xml | 20 +++++++-------------
.../release/samples/groovy_spring_support/pom.xml | 4 ----
parent/pom.xml | 2 +-
4 files changed, 9 insertions(+), 19 deletions(-)
[cxf] 02/02: cxf-distribution-javadoc: fix warnings
Posted by bu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
buhhunyx pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit caf6f42bc5bc589c0bff0e8042d801bd17e08c91
Author: Alexey Markevich <bu...@gmail.com>
AuthorDate: Mon Apr 20 23:21:39 2020 +0300
cxf-distribution-javadoc: fix warnings
---
.../java/org/apache/cxf/common/logging/LogUtils.java | 2 +-
distribution/javadoc/pom.xml | 20 +++++++-------------
.../release/samples/groovy_spring_support/pom.xml | 4 ----
3 files changed, 8 insertions(+), 18 deletions(-)
diff --git a/core/src/main/java/org/apache/cxf/common/logging/LogUtils.java b/core/src/main/java/org/apache/cxf/common/logging/LogUtils.java
index a6f9131..6afbd26 100644
--- a/core/src/main/java/org/apache/cxf/common/logging/LogUtils.java
+++ b/core/src/main/java/org/apache/cxf/common/logging/LogUtils.java
@@ -48,7 +48,7 @@ import org.apache.cxf.common.util.StringUtils;
* of the class, with no comments, on a single line.</li>
* <li>Call {@link #setLoggerClass(Class)} with a Class<?> reference to the logger class.</li>
* </ul>
- * CXF provides {@link Log4jLogger} to use log4j instead of java.util.logging.
+ * CXF provides {@link Slf4jLogger} to use slf4j instead of java.util.logging.
*/
public final class LogUtils {
private static final String KEY = "org.apache.cxf.Logger";
diff --git a/distribution/javadoc/pom.xml b/distribution/javadoc/pom.xml
index 72e4770..dcf240d 100644
--- a/distribution/javadoc/pom.xml
+++ b/distribution/javadoc/pom.xml
@@ -100,15 +100,8 @@
<artifactId>spring-webmvc</artifactId>
</dependency>
<dependency>
- <groupId>org.springframework.ldap</groupId>
- <artifactId>spring-ldap-core</artifactId>
- <version>${cxf.spring.ldap.version}</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
+ <groupId>org.springframework.osgi</groupId>
+ <artifactId>spring-osgi-core</artifactId>
</dependency>
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
@@ -147,6 +140,11 @@
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jul-to-slf4j</artifactId>
+ <version>${cxf.slf4j.version}</version>
+ </dependency>
+ <dependency>
<groupId>net.java.dev.msv</groupId>
<artifactId>msv-core</artifactId>
</dependency>
@@ -306,10 +304,6 @@
<artifactId>velocity-engine-core</artifactId>
</dependency>
<dependency>
- <groupId>antlr</groupId>
- <artifactId>antlr</artifactId>
- </dependency>
- <dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>${cxf.logback.classic.version}</version>
diff --git a/distribution/src/main/release/samples/groovy_spring_support/pom.xml b/distribution/src/main/release/samples/groovy_spring_support/pom.xml
index 0299bc3..c00fb84 100644
--- a/distribution/src/main/release/samples/groovy_spring_support/pom.xml
+++ b/distribution/src/main/release/samples/groovy_spring_support/pom.xml
@@ -114,10 +114,6 @@
<version>2.4.9</version>
</dependency>
<dependency>
- <groupId>antlr</groupId>
- <artifactId>antlr</artifactId>
- </dependency>
- <dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
</dependency>
[cxf] 01/02: Update to stax-ex 1.8.3
Posted by bu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
buhhunyx pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 49337a77156dafaa0107eee775905308fdd40bf5
Author: Alexey Markevich <bu...@gmail.com>
AuthorDate: Mon Apr 20 23:20:37 2020 +0300
Update to stax-ex 1.8.3
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 4ac7b55..e17b313 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -195,7 +195,7 @@
<cxf.spring.osgi.version>1.2.1</cxf.spring.osgi.version>
<cxf.spring.security.version>5.3.1.RELEASE</cxf.spring.security.version>
<cxf.spring.version>5.2.5.RELEASE</cxf.spring.version>
- <cxf.stax-ex.version>1.7.6</cxf.stax-ex.version>
+ <cxf.stax-ex.version>1.8.3</cxf.stax-ex.version>
<cxf.swagger.ui.version>3.25.0</cxf.swagger.ui.version>
<cxf.swagger.v3.version>2.1.2</cxf.swagger.v3.version>
<cxf.swagger2.version>1.6.1</cxf.swagger2.version>