[cxf] branch 3.2.x-fixes updated (a4208fc -> 8e0587a)

classic Classic list List threaded Threaded
7 messages Options
Reply | Threaded
Open this post in threaded view
|

[cxf] branch 3.2.x-fixes updated (a4208fc -> 8e0587a)

coheigea
Administrator
This is an automated email from the ASF dual-hosted git repository.

coheigea pushed a change to branch 3.2.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git.


    from a4208fc  Recording .gitmergeinfo Changes
     new 401550c  Updating Tika to 1.24
     new 104aed7  Adding a test for the service listing + private endpoints
     new fa351f9  Picking up WSS4J release
     new 9e2de6b  Updating Tika to 1.24 in the samples
     new 0d4f7e7  Updating Jettison to 1.4.1
     new 8e0587a  Recording .gitmergeinfo Changes

The 6 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:
 .gitmergeinfo                                             | 14 ++++++++++++++
 .../src/main/release/samples/jax_rs/search/pom.xml        |  2 +-
 .../src/main/release/samples/jax_rs/spark/pom.xml         |  2 +-
 distribution/src/main/release/samples/pom.xml             |  1 +
 parent/pom.xml                                            |  8 ++++----
 .../cxf/systest/jaxrs/JAXRSServicesListingTest.java       | 15 +++++++++++++++
 .../src/test/resources/service_listing/WEB-INF/beans.xml  |  8 ++++++++
 7 files changed, 44 insertions(+), 6 deletions(-)

Reply | Threaded
Open this post in threaded view
|

[cxf] 01/06: Updating Tika to 1.24

coheigea
Administrator
This is an automated email from the ASF dual-hosted git repository.

coheigea pushed a commit to branch 3.2.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git

commit 401550c47d3469abd7f3db78024bf4a05e6339cd
Author: Colm O hEigeartaigh <[hidden email]>
AuthorDate: Wed Mar 18 09:28:31 2020 +0000

    Updating Tika to 1.24
   
    (cherry picked from commit 16d285838dc2209ca84af21723478f199403c2b7)
   
    # Conflicts:
    # parent/pom.xml
    (cherry picked from commit 46259489c1abd3f374203cd48f50a67640ba81a6)
   
    # Conflicts:
    # parent/pom.xml
---
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/parent/pom.xml b/parent/pom.xml
index f0cc1d9..8be96f4 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -223,7 +223,7 @@
         <cxf.dom4j.bundle.version>1.6.1_5</cxf.dom4j.bundle.version>
         <cxf.jdom.bundle.version>1.1_4</cxf.jdom.bundle.version>
         <cxf.olingo.version>2.0.11</cxf.olingo.version>
-        <cxf.tika.version>1.22</cxf.tika.version>
+        <cxf.tika.version>1.24</cxf.tika.version>
         <cxf.jexl.version>2.1.1</cxf.jexl.version>
         <cxf.htrace.version>4.2.0-incubating</cxf.htrace.version>
         <cxf.zest.version>2.1</cxf.zest.version>

Reply | Threaded
Open this post in threaded view
|

[cxf] 02/06: Adding a test for the service listing + private endpoints

coheigea
Administrator
In reply to this post by coheigea
This is an automated email from the ASF dual-hosted git repository.

coheigea pushed a commit to branch 3.2.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git

commit 104aed7840e30f46f5c6e60c6aceee2222f1aff9
Author: Colm O hEigeartaigh <[hidden email]>
AuthorDate: Wed Mar 18 12:12:10 2020 +0000

    Adding a test for the service listing + private endpoints
   
    (cherry picked from commit 6a984d1184f2288bf190269b11537b7b1a687dad)
    (cherry picked from commit f3932a9ab64689e354e9c36da95f001049fde13d)
---
 .../cxf/systest/jaxrs/JAXRSServicesListingTest.java       | 15 +++++++++++++++
 .../src/test/resources/service_listing/WEB-INF/beans.xml  |  8 ++++++++
 2 files changed, 23 insertions(+)

diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSServicesListingTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSServicesListingTest.java
index 88af617..43f167f 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSServicesListingTest.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSServicesListingTest.java
@@ -98,4 +98,19 @@ public class JAXRSServicesListingTest extends AbstractBusClientServerTestBase {
             assertFalse(result.contains("<script>"));
         }
     }
+
+    @Test
+    public void testServiceListingPrivate() throws Exception {
+
+        String endpointAddress =
+            "http://localhost:" + PORT + "/service_listing/services";
+        String expectedResult =
+            "http://localhost:" + PORT + "/service_listing/services/resourcesprivate";
+
+        URL url = new URL(endpointAddress);
+        try (InputStream input = url.openStream()) {
+            String result = IOUtils.readStringFromStream(input);
+            assertFalse(result.contains(expectedResult));
+        }
+    }
 }
diff --git a/systests/jaxrs/src/test/resources/service_listing/WEB-INF/beans.xml b/systests/jaxrs/src/test/resources/service_listing/WEB-INF/beans.xml
index 425b8c7..eebe008 100644
--- a/systests/jaxrs/src/test/resources/service_listing/WEB-INF/beans.xml
+++ b/systests/jaxrs/src/test/resources/service_listing/WEB-INF/beans.xml
@@ -27,5 +27,13 @@
             <ref bean="servletconfigstore"/>
         </jaxrs:serviceBeans>
     </jaxrs:server>
+    <jaxrs:server id="bookserviceprivate" address="/resourcesprivate">
+        <jaxrs:serviceBeans>
+            <ref bean="servletconfigstore"/>
+        </jaxrs:serviceBeans>
+        <jaxrs:properties>
+            <entry key="org.apache.cxf.endpoint.private" value="true"/>
+        </jaxrs:properties>
+    </jaxrs:server>
     <bean id="servletconfigstore" class="org.apache.cxf.systest.jaxrs.SpringServletConfigStore"/>
 </beans>
\ No newline at end of file

Reply | Threaded
Open this post in threaded view
|

[cxf] 03/06: Picking up WSS4J release

coheigea
Administrator
In reply to this post by coheigea
This is an automated email from the ASF dual-hosted git repository.

coheigea pushed a commit to branch 3.2.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git

commit fa351f91da9169d7b1be896ae42641a45656d476
Author: Colm O hEigeartaigh <[hidden email]>
AuthorDate: Wed Mar 18 14:00:14 2020 +0000

    Picking up WSS4J release
   
    (cherry picked from commit c4e6edb19899d55e425d52bc2a817af01145c849)
   
    # Conflicts:
    # parent/pom.xml
---
 parent/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/parent/pom.xml b/parent/pom.xml
index 8be96f4..9d96f47 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -172,7 +172,7 @@
         <cxf.woodstox.core.version>5.0.3</cxf.woodstox.core.version>
         <cxf.woodstox.stax2-api.version>3.1.4</cxf.woodstox.stax2-api.version>
         <cxf.wsdl4j.version>1.6.3</cxf.wsdl4j.version>
-        <cxf.wss4j.version>2.2.4</cxf.wss4j.version>
+        <cxf.wss4j.version>2.2.5</cxf.wss4j.version>
         <cxf.xbean.version>3.5</cxf.xbean.version>
         <cxf.xerces.version>2.12.0</cxf.xerces.version>
         <cxf.xmlschema.version>2.2.5</cxf.xmlschema.version>
@@ -212,7 +212,7 @@
         <cxf.saaj-impl.bundle.version>1.3.23_2</cxf.saaj-impl.bundle.version>
         <cxf.stax-ex.version>1.7.6</cxf.stax-ex.version>
         <cxf.wsdl4j.bundle.version>1.6.3_1</cxf.wsdl4j.bundle.version>
-        <cxf.xmlsec.bundle.version>2.1.4</cxf.xmlsec.bundle.version>
+        <cxf.xmlsec.bundle.version>2.1.5</cxf.xmlsec.bundle.version>
         <cxf.rhino.bundle.version>1.7R2_3</cxf.rhino.bundle.version>
         <cxf.xmlresolver.bundle.version>1.2_5</cxf.xmlresolver.bundle.version>
         <cxf.xerces.bundle.version>2.12.0_1</cxf.xerces.bundle.version>

Reply | Threaded
Open this post in threaded view
|

[cxf] 04/06: Updating Tika to 1.24 in the samples

coheigea
Administrator
In reply to this post by coheigea
This is an automated email from the ASF dual-hosted git repository.

coheigea pushed a commit to branch 3.2.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git

commit 9e2de6b4833dc987f131b0104346205655a32571
Author: Colm O hEigeartaigh <[hidden email]>
AuthorDate: Wed Mar 18 17:41:25 2020 +0000

    Updating Tika to 1.24 in the samples
   
    (cherry picked from commit 3026d63ae2e770bc1e18986224a485b34a7968c0)
    (cherry picked from commit d13c65872b9c98ec428d018717d72907d6918b03)
   
    # Conflicts:
    # distribution/src/main/release/samples/pom.xml
---
 distribution/src/main/release/samples/jax_rs/search/pom.xml | 2 +-
 distribution/src/main/release/samples/jax_rs/spark/pom.xml  | 2 +-
 distribution/src/main/release/samples/pom.xml               | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/distribution/src/main/release/samples/jax_rs/search/pom.xml b/distribution/src/main/release/samples/jax_rs/search/pom.xml
index c38dd7e..6fd69d2 100644
--- a/distribution/src/main/release/samples/jax_rs/search/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/search/pom.xml
@@ -133,7 +133,7 @@
         <dependency>
             <groupId>org.apache.tika</groupId>
             <artifactId>tika-parsers</artifactId>
-            <version>1.22</version>
+            <version>${cxf.tika.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
diff --git a/distribution/src/main/release/samples/jax_rs/spark/pom.xml b/distribution/src/main/release/samples/jax_rs/spark/pom.xml
index 024c5f8..9d57d2f 100644
--- a/distribution/src/main/release/samples/jax_rs/spark/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/spark/pom.xml
@@ -70,7 +70,7 @@
         <dependency>
             <groupId>org.apache.tika</groupId>
             <artifactId>tika-parsers</artifactId>
-            <version>1.22</version>
+            <version>${cxf.tika.version}</version>
         </dependency>
     </dependencies>
 
diff --git a/distribution/src/main/release/samples/pom.xml b/distribution/src/main/release/samples/pom.xml
index 6041994..9d97ea7 100644
--- a/distribution/src/main/release/samples/pom.xml
+++ b/distribution/src/main/release/samples/pom.xml
@@ -33,6 +33,7 @@
         <spring.boot.version>1.5.17.RELEASE</spring.boot.version>
         <spring.cloud.eureka.version>1.3.4.RELEASE</spring.cloud.eureka.version>
         <cxf.jetty9.version>9.4.26.v20200117</cxf.jetty9.version>
+        <cxf.tika.version>1.24</cxf.tika.version>
     </properties>
     <dependencies>
         <dependency>

Reply | Threaded
Open this post in threaded view
|

[cxf] 05/06: Updating Jettison to 1.4.1

coheigea
Administrator
In reply to this post by coheigea
This is an automated email from the ASF dual-hosted git repository.

coheigea pushed a commit to branch 3.2.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git

commit 0d4f7e7e98b2e4884002bd8af9768e03ac100a64
Author: Colm O hEigeartaigh <[hidden email]>
AuthorDate: Thu Mar 19 06:36:54 2020 +0000

    Updating Jettison to 1.4.1
   
    (cherry picked from commit 1e3817e3f7d51d093bff81d2520fb7cef82f0df8)
    (cherry picked from commit 78d29a1ab8817109b644b9679202b4ca0a00b954)
   
    # Conflicts:
    # parent/pom.xml
---
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/parent/pom.xml b/parent/pom.xml
index 9d96f47..074ce8a 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -125,7 +125,7 @@
         <cxf.jaxb.xjc.version>${cxf.jaxb.version}</cxf.jaxb.xjc.version>
         <cxf.joda.time.version>2.9.4</cxf.joda.time.version>
         <cxf.jdom.version>1.0</cxf.jdom.version>
-        <cxf.jettison.version>1.4.0</cxf.jettison.version>
+        <cxf.jettison.version>1.4.1</cxf.jettison.version>
         <cxf.jetty9.version>9.4.27.v20200227</cxf.jetty9.version>
         <cxf.jetty.version>${cxf.jetty9.version}</cxf.jetty.version>
         <cxf.jetty.osgi.version>[9.2,10)</cxf.jetty.osgi.version>

Reply | Threaded
Open this post in threaded view
|

[cxf] 06/06: Recording .gitmergeinfo Changes

coheigea
Administrator
In reply to this post by coheigea
This is an automated email from the ASF dual-hosted git repository.

coheigea pushed a commit to branch 3.2.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git

commit 8e0587af36a21ca7a76457da58e7850516dcb36e
Author: Colm O hEigeartaigh <[hidden email]>
AuthorDate: Thu Mar 19 09:29:11 2020 +0000

    Recording .gitmergeinfo Changes
---
 .gitmergeinfo | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/.gitmergeinfo b/.gitmergeinfo
index e87e391..bdbe157 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -59,6 +59,7 @@ B 1101c8a68efc43999a9516e257b71da99c1ed707
 B 1159eff075501259554b811a44ffa87200a67aa9
 B 116e4ce03c5b23b901832aa665efa6bf8a353063
 B 11f78d0382a7123a428cefe5f5598ee51cbf47cb
+B 12bad926061d4e6c2d7655e34b0d7634da60db3e
 B 13915430cb5abc554b777a3894884670f89d184e
 B 13e1dae57f5609259f935bfe5e280862e266dcb2
 B 1411add1829a172d2c5add7fecc2502450986673
@@ -380,6 +381,7 @@ B 6a5ecb6d063037c7f8786b67294d32e5b28895bc
 B 6acd80b9cd4aff1a866d84ad8a86afb33bfefde3
 B 6ae17b03967f7b397c7217d52f3d7cf9e28cd999
 B 6b3d7681bd43a56e09b2931ac106f90e854b1b83
+B 6bbc74524661e9bfe89088a26111395f1eab54dd
 B 6bd1b921ef1742c69e487a313a4980fabcede5c3
 B 6ce0a3e43483b28b8d299fb1af58ff9d6f0a7241
 B 6ce1a1b4114f138b0f5ce7a377af46c816be6c69
@@ -427,6 +429,7 @@ B 7d70dd6a1f3fbb8ab53a40569e5b606984e16c3c
 B 7d93913dd6d1b4ce5179a7f6330072602eafafde
 B 7ddc3cca73c010989f24c8ac58f2aebea9861cd0
 B 7e11da7a566a95adc64143c0575b7ef86e0fbe5a
+B 7e36a7158121573f9b42bd95212b70998db91474
 B 7e461b6a9cd713617090c989cc64eba267efcb49
 B 7e512fb562400fd98171b15d3f9e24e3cab9f42a
 B 7f17e03737171237c0b91f0af4d5adf5333fd68b
@@ -530,6 +533,7 @@ B a079c5ee91dcfa167243658f110e99c9d61178f3
 B a0863e63b2c874307b2a8401a2dccbd95b724a3e
 B a0f75306424f54d325ad3e83ccab34aecbd85ab9
 B a1559f898885138592ad7104d2c32e7f61b06211
+B a239cfce6fbd78c84043cba53216cdc8f0c019d7
 B a2c3ac7231ef1c71b105f43922016b7167f9ca5b
 B a31fcda77805f124af64043871d5b8b08e8a4735
 B a3295e61bcf8c00c13a79707841a58131fd9c97d
@@ -567,6 +571,7 @@ B aca3a18b2fb5cae542d8a34f3c804fb0dc02ce73
 B acc697f1c88f392bd952e07d50a9ae2ce0b76411
 B ad27755270c649ab64f2cec0d3768772ef68fc1f
 B ad557fb51f2391b449c692ee47cc7856ff9e201a
+B adcc3a1a5658648de4066d0844e6854ff0bd0dc9
 B add43c545b831f3b763c66c4f17b8dea5e195e9e
 B ae5625e5ad94fa8da69ee9d69cb6ee89c7d59410
 B ae7c3dcfc7e70b8921f1c1c49734dc11ce0fde40
@@ -585,6 +590,7 @@ B b304f8c99f989319a29fa80953c6c80172779ab0
 B b3268466338750b742ee900bbec13e568527be2c
 B b38280a8c758abc184f65457713f07213e7ed409
 B b3a73b3cfddb17293342f77929acd43fbe796112
+B b3addb1f2db2efe74d7ecdcfc583e06d0b5aaebc
 B b3dd8605cb0c39c5fb927799dd560a016ca1c2a5
 B b4dfabf84e2cee0d6735e6a13fa5b933de0a44c3
 B b51a5c1df15e7b0ac15e510930cd1e2275351751
@@ -733,6 +739,7 @@ B dea9d48056e950955dc3583556a99d3c5cbd7a79
 B df43be53908f920b29c0d146bda1cdaef1df6cf2
 B df52c92962cd582cefc74d215471fb892453dd89
 B df89b6d479a9a0d68a104a89b3b5fe8c1cd33217
+B dfa0e627c977044dd24cf37269caff52a8a08513
 B e000e8c0b8ed82533cbeb4e3a39dd9fbf128383c
 B e0692b412843695b2c3d8a1f2c4633a2cd3aed78
 B e07b421686cf5a799fde218b2770d7538b19aae7
@@ -747,6 +754,7 @@ B e39ee0a99e53f3778e08cb9f3d86daf32030cb51
 B e3aa32f540d47685165f191ca02fc203452bd5b2
 B e3aee2313300215ca11b2611ebe9baa15375baeb
 B e438cd4745c2e08997af62c2958e2d079608a0da
+B e45ce9776e8cd43ffc3fa7a04174c7fe65b414a8
 B e463aa01e224ca09a99a4fc1d4db376d05f1918b
 B e512ce803e388e93a9fd601d11c455b2e535ca7d
 B e513ba8cc4c597b8c6248d470f03b2d05c738680
@@ -820,6 +828,7 @@ B f702cfb14a18396418fd1c5ab623a2f619213a90
 B f70768f7b7fa95305949a5b7df9bbc14bb48add3
 B f781f775143c4cae90ed76787f569cc96220dd19
 B f7ff6a44a3daaca60a0700fb80ba216e2d9b676e
+B f820e8e4459613f35e6695c0439b38ee481b1c90
 B f85a097e78b2aa15568c9ee2bbe7d5200c5e572d
 B f86b91d4c4240ee0fe11eec6db6b692debdb97c8
 B f8791ca3a34711444c7e1d6b1613c5bd311abbec
@@ -837,6 +846,7 @@ B fc89f35c1f80863d8500eef359ba6259fac49e44
 B fca6f87259a365b1999751460280bc7f02c69439
 B fd6478bcbde370ce969e3def03a57f194568ef6a
 B fe211b32272fb853b1a1e72ce5fcd4ce716d2925
+B fe37ad2e31d4b7dfab34e31da596c1ab88f8f24d
 B fe5603d060881cf801db69ade3f9790423d48094
 B fe8c6187ade3699e085623c92ddd3abcfe75a2a0
 B fed919b26e56fd777aebf20f13ae948d952a830e
@@ -887,6 +897,7 @@ M 40ecbe0ca38cd14576e967cf70bddfecdc059c28
 M 4233f9138de22fe5de555d2f176e494e62905de5
 M 427c7d40f35427a0866b6b9989d50a34fd10482b
 M 431bf666e8810c87ab5f47b0c137d329d381b1c6
+M 46259489c1abd3f374203cd48f50a67640ba81a6
 M 48869dd57d54650615ed1347d9aa44ae76e88265
 M 48c48f1c3edcca07365145df38a71ee6586070b8
 M 4a07401299848a1d9b54346b6827132cdf5ec80b
@@ -919,6 +930,7 @@ M 73a8be32b5e143dcf1908bd4e73249c116b14f7c
 M 74e7684b76dfa03310f30a0dc520f61b4a6fa1b3
 M 77b0819893e6c18806c8c6b7c07313d29e75e7eb
 M 7808ae48865df413346f523ca6e8df7bcedb2091
+M 78d29a1ab8817109b644b9679202b4ca0a00b954
 M 79db1058267302fe7febc5aaa4e0b42bf724ba90
 M 7ca5e8c433432a9ba73382bc26eec6d22026ccf1
 M 7cb48e03d9a2875bb590dc74330e3817d530d9bf
@@ -969,6 +981,7 @@ M c37838ef6d599e0a0d86673c0e251e097998f9b7
 M c3adee999d4464d740f0740e2d5bd497b2b24af2
 M c3fb43cd1b6f86f9bbf62f7262349f2905b985a8
 M c453a20f958b49119029b229a908f94848fb7f2d
+M c4e6edb19899d55e425d52bc2a817af01145c849
 M c529cfa239f3005779cff22f7859257b70af4faf
 M c65191eb601316c5f9693df193c4c27808f46ac5
 M c79d8ac83379b9f80e124823fbb569141cc5e608
@@ -976,6 +989,7 @@ M cb2a360153c6670925f91fdfa9980594715d62e2
 M cb88fc51f5002551726054af6cd0b5046a4da152
 M cc4e90a978fb625cb0a3c407a525bf74f85b9f8c
 M d1315732be55b89c25f66213d1f0a0e0567d8abc
+M d13c65872b9c98ec428d018717d72907d6918b03
 M d1470dd0e14aa001dde1227bfb456a8b4cf0061e
 M d419ae389ab4b42bf57106db99758dd8d3b11bca
 M d520059ce1d04448fb2354966a7e16b39c3fcbda