You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2020/06/08 10:14:56 UTC
[cxf] branch master updated (e1b1493 -> 9713d86)
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git.
from e1b1493 Updating Spring Security to 5.3.3
new 6eb8876 Updating to Commons IO 2.7
new 9713d86 CXF-8298 - An invalid package name is generated
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:
core/src/main/java/org/apache/cxf/common/util/PackageUtils.java | 4 +++-
core/src/test/java/org/apache/cxf/common/util/PackageUtilsTest.java | 4 ++++
parent/pom.xml | 2 +-
3 files changed, 8 insertions(+), 2 deletions(-)
[cxf] 02/02: CXF-8298 - An invalid package name is generated
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 9713d86acedbfa6be6375e7d494c2771cd438f05
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Mon Jun 8 11:14:27 2020 +0100
CXF-8298 - An invalid package name is generated
---
core/src/main/java/org/apache/cxf/common/util/PackageUtils.java | 4 +++-
core/src/test/java/org/apache/cxf/common/util/PackageUtilsTest.java | 4 ++++
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/core/src/main/java/org/apache/cxf/common/util/PackageUtils.java b/core/src/main/java/org/apache/cxf/common/util/PackageUtils.java
index 2c422e9..49e19ff 100644
--- a/core/src/main/java/org/apache/cxf/common/util/PackageUtils.java
+++ b/core/src/main/java/org/apache/cxf/common/util/PackageUtils.java
@@ -132,12 +132,14 @@ public final class PackageUtils {
String token = tokens.get(i);
token = removeIllegalIdentifierChars(token);
+ token = token.toLowerCase();
+
// this will check for reserved keywords
if (JavaUtils.isJavaKeyword(token)) {
token = '_' + token;
}
- tokens.set(i, token.toLowerCase());
+ tokens.set(i, token);
}
// concat all the pieces and return it
diff --git a/core/src/test/java/org/apache/cxf/common/util/PackageUtilsTest.java b/core/src/test/java/org/apache/cxf/common/util/PackageUtilsTest.java
index 24ff807..6dad735 100644
--- a/core/src/test/java/org/apache/cxf/common/util/PackageUtilsTest.java
+++ b/core/src/test/java/org/apache/cxf/common/util/PackageUtilsTest.java
@@ -134,6 +134,10 @@ public class PackageUtilsTest {
PackageUtils.getPackageNameByNameSpaceURI("com.esendex.ems.soapinterface"));
assertEquals("ddd.cc.bb.aa.eee.fff_v01_00",
PackageUtils.getPackageNameByNameSpaceURI("http://aa.bb.cc.ddd/eee/fff_v01.00"));
+ assertEquals("org.apache.cxf._case",
+ PackageUtils.getPackageNameByNameSpaceURI("http://www.case.cxf.apache.org"));
+ assertEquals("org.apache.cxf._case",
+ PackageUtils.getPackageNameByNameSpaceURI("http://www.Case.cxf.apache.org"));
}
@Test
[cxf] 01/02: Updating to Commons IO 2.7
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 6eb88763b1ca04b3a9451f994c435e5f821ca449
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Mon Jun 8 11:13:01 2020 +0100
Updating to Commons IO 2.7
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 3c1538a..44a19db 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -96,7 +96,7 @@
<cxf.classmate.version>1.5.1</cxf.classmate.version>
<cxf.commons-codec.version>1.14</cxf.commons-codec.version>
<cxf.commons-collections.version>3.2.2</cxf.commons-collections.version>
- <cxf.commons-io.version>2.6</cxf.commons-io.version>
+ <cxf.commons-io.version>2.7</cxf.commons-io.version>
<cxf.commons-jcs-jcache.version>2.1</cxf.commons-jcs-jcache.version>
<cxf.commons-lang3.version>3.10</cxf.commons-lang3.version>
<cxf.commons-logging.version>1.2</cxf.commons-logging.version>