[2/2] cxf git commit: Updating EhCache

2016-10-17 Thread coheigea 
Updating EhCache


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/51a2368c
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/51a2368c
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/51a2368c

Branch: refs/heads/3.0.x-fixes
Commit: 51a2368c14840b5876efbbccf123fb8c8e040a7a
Parents: 4acb402
Author: Colm O hEigeartaigh 
Authored: Mon Oct 17 20:17:17 2016 +0100
Committer: Colm O hEigeartaigh 
Committed: Mon Oct 17 20:17:17 2016 +0100

--
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/51a2368c/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index b721a21..c7b00c2 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -87,7 +87,7 @@
 2.6
 3.4
 10.2.2.0
-2.8.5
+2.8.8
 
1.2.13_1
 1.9.4
 
4.0.2

[1/2] cxf git commit: Recording .gitmergeinfo Changes

2016-10-17 Thread coheigea 
Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes f91bdce0a -> 51a2368c1


Recording .gitmergeinfo Changes


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/4acb4027
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/4acb4027
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/4acb4027

Branch: refs/heads/3.0.x-fixes
Commit: 4acb40274ff87d66e8c165a120cf3075b50099dc
Parents: f91bdce
Author: Colm O hEigeartaigh 
Authored: Mon Oct 17 20:17:10 2016 +0100
Committer: Colm O hEigeartaigh 
Committed: Mon Oct 17 20:17:10 2016 +0100

--
 .gitmergeinfo | 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/4acb4027/.gitmergeinfo
--
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 9fcbb23..60ae9cb 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -867,6 +867,7 @@ B ad577419dd39b1414080e6b34ed75db64254a150
 B ad700a5f6471f55680821f6d04b182f5d3a6054e
 B adb0ce53862e37ccd2f16029c7b13b4fa0cb0ac9
 B ade622bf89a6d72d1aca4ab3a82dc4450cd5a603
+B ae102f9e8064c096fb36d01bf50aeb157461a3e6
 B af100a919178b0938fcc04d9c8d1dd1269e351b9
 B afd70f562f769c1f1ed26a275cbb3763b24cba43
 B afeb2ab056a4a4377db11d597c675108eb780d16
@@ -1596,6 +1597,7 @@ M dfe90b649bee2e7cdd448b16d60b26457385b4e5
 M e2225709c37cb289b99db015b3d8ba5b9b317615
 M e2ad037fbc74f42655ac968415fcb4bded87bb38
 M e3f89d3c07f38f2e01c951d7bad8336e090837ae
+M e4586d3091848cf0fbdb2d43c3e671fe20e9fedd
 M e47e394114d6a3bf06401960618e6bd556a904d7
 M e4c456743a046f37ce9623529635218be7f13e7b
 M e51a7bd7f3dcc120dbeeebb3e5c306941af64554

[1/2] cxf git commit: Recording .gitmergeinfo Changes

2016-10-17 Thread coheigea 
Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes fb669aaa3 -> ae102f9e8


Recording .gitmergeinfo Changes


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/ae102f9e
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/ae102f9e
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/ae102f9e

Branch: refs/heads/3.1.x-fixes
Commit: ae102f9e8064c096fb36d01bf50aeb157461a3e6
Parents: e4586d3
Author: Colm O hEigeartaigh 
Authored: Mon Oct 17 18:54:03 2016 +0100
Committer: Colm O hEigeartaigh 
Committed: Mon Oct 17 18:54:03 2016 +0100

--
 .gitmergeinfo | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/ae102f9e/.gitmergeinfo
--
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 7da6823..9e57625 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -208,6 +208,7 @@ M abcc137cb9b27e0da0b4270a18ac2a32df1e9990
 M b2b6f0137cd9f1bafff5d487e8383453692a2ff0
 M b2e5fb6583d64deeb8a42d2eeb6935c5f33dc0c6
 M c01c68ddda10ec6db492b86d818498bec0bf4228
+M c212240f696e3387df19bbcf22d1851aff320078
 M cf8ac102e728b8745da265ec969f7b5160829fdb
 M dba09f00804cc05d943fd95d34882d6368c28edb
 M df3854cefae5d2da71f8d222a86218e81df7bd05

[2/2] cxf git commit: Updating ehcache

2016-10-17 Thread coheigea 
Updating ehcache


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/e4586d30
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/e4586d30
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/e4586d30

Branch: refs/heads/3.1.x-fixes
Commit: e4586d3091848cf0fbdb2d43c3e671fe20e9fedd
Parents: fb669aa
Author: Colm O hEigeartaigh 
Authored: Mon Oct 17 18:53:35 2016 +0100
Committer: Colm O hEigeartaigh 
Committed: Mon Oct 17 18:54:03 2016 +0100

--
 parent/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/e4586d30/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 4c14dd3..571d875 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -82,8 +82,8 @@
 3.4
 10.2.2.0
 3.1.2
-2.10.2
-3.0.1
+2.10.3
+3.0.3
 
1.2.13_1
 18.0
 1.9.4

cxf git commit: Updating ehcache

2016-10-17 Thread coheigea 
Repository: cxf
Updated Branches:
  refs/heads/master 910f37767 -> c212240f6


Updating ehcache


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/c212240f
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/c212240f
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/c212240f

Branch: refs/heads/master
Commit: c212240f696e3387df19bbcf22d1851aff320078
Parents: 910f377
Author: Colm O hEigeartaigh 
Authored: Mon Oct 17 18:53:35 2016 +0100
Committer: Colm O hEigeartaigh 
Committed: Mon Oct 17 18:53:35 2016 +0100

--
 parent/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/c212240f/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 42709d9..2f1d13f 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -82,8 +82,8 @@
 3.4
 10.12.1.1
 3.1.2
-2.10.2
-3.0.1
+2.10.3
+3.0.3
 
1.2.13_1
 18.0
 1.9.4

cxf-fediz git commit: Refactor IdP servlet config to make it more extensible

2016-10-17 Thread coheigea 
Repository: cxf-fediz
Updated Branches:
  refs/heads/master 5b6839011 -> 55084c85a


Refactor IdP servlet config to make it more extensible


Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/55084c85
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/55084c85
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/55084c85

Branch: refs/heads/master
Commit: 55084c85af6b3f025833f76c089286af5a9a20cb
Parents: 5b68390
Author: Colm O hEigeartaigh 
Authored: Mon Oct 17 15:35:05 2016 +0100
Committer: Colm O hEigeartaigh 
Committed: Mon Oct 17 15:35:05 2016 +0100

--
 .../main/webapp/WEB-INF/applicationContext.xml  |   8 +-
 .../webapp/WEB-INF/config/idp-core-servlet.xml  | 108 +++
 .../idp/src/main/webapp/WEB-INF/idp-servlet.xml |  84 +--
 3 files changed, 113 insertions(+), 87 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/55084c85/services/idp/src/main/webapp/WEB-INF/applicationContext.xml
--
diff --git a/services/idp/src/main/webapp/WEB-INF/applicationContext.xml 
b/services/idp/src/main/webapp/WEB-INF/applicationContext.xml
index 8af7497..ee2b3d6 100644
--- a/services/idp/src/main/webapp/WEB-INF/applicationContext.xml
+++ b/services/idp/src/main/webapp/WEB-INF/applicationContext.xml
@@ -20,19 +20,13 @@
 http://www.springframework.org/schema/beans;
xmlns:cxf="http://cxf.apache.org/core;
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
-   xmlns:http="http://cxf.apache.org/transports/http/configuration;
-   xmlns:sec="http://cxf.apache.org/configuration/security;
xmlns:context="http://www.springframework.org/schema/context;
xsi:schemaLocation="http://cxf.apache.org/core
 http://cxf.apache.org/schemas/core.xsd
 http://www.springframework.org/schema/beans
 http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
-http://cxf.apache.org/transports/http/configuration
-http://cxf.apache.org/schemas/configuration/http-conf.xsd
 http://www.springframework.org/schema/context
-http://www.springframework.org/schema/context/spring-context-3.1.xsd
-http://cxf.apache.org/configuration/security
-http://cxf.apache.org/schemas/configuration/security.xsd;>
+http://www.springframework.org/schema/context/spring-context-3.1.xsd;>
 
 
 

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/55084c85/services/idp/src/main/webapp/WEB-INF/config/idp-core-servlet.xml
--
diff --git a/services/idp/src/main/webapp/WEB-INF/config/idp-core-servlet.xml 
b/services/idp/src/main/webapp/WEB-INF/config/idp-core-servlet.xml
new file mode 100644
index 000..e092828
--- /dev/null
+++ b/services/idp/src/main/webapp/WEB-INF/config/idp-core-servlet.xml
@@ -0,0 +1,108 @@
+
+
+http://www.springframework.org/schema/beans;
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+xmlns:webflow="http://www.springframework.org/schema/webflow-config;
+xmlns:p="http://www.springframework.org/schema/p;
+xmlns:mvc="http://www.springframework.org/schema/mvc;
+xmlns:context="http://www.springframework.org/schema/context;
+xsi:schemaLocation="http://www.springframework.org/schema/beans
+http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
+http://www.springframework.org/schema/context
+http://www.springframework.org/schema/context/spring-context-3.1.xsd
+http://www.springframework.org/schema/mvc
+http://www.springframework.org/schema/mvc/spring-mvc-3.2.xsd
+http://www.springframework.org/schema/webflow-config
+
http://www.springframework.org/schema/webflow-config/spring-webflow-config-2.0.xsd;>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/55084c85/services/idp/src/main/webapp/WEB-INF/idp-servlet.xml
--
diff --git a/services/idp/src/main/webapp/WEB-INF/idp-servlet.xml 
b/services/idp/src/main/webapp/WEB-INF/idp-servlet.xml
index

cxf git commit: Updating cxf versions in 3.1.x spring boot demos

2016-10-17 Thread sergeyb 
Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes 2d4648516 -> fb669aaa3


Updating cxf versions in 3.1.x spring boot demos


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/fb669aaa
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/fb669aaa
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/fb669aaa

Branch: refs/heads/3.1.x-fixes
Commit: fb669aaa365102309a9c975084f775953753fa49
Parents: 2d46485
Author: Sergey Beryozkin 
Authored: Mon Oct 17 13:38:10 2016 +0100
Committer: Sergey Beryozkin 
Committed: Mon Oct 17 13:38:10 2016 +0100

--
 distribution/src/main/release/samples/jax_rs/spring_boot/pom.xml | 4 ++--
 .../release/samples/jax_rs/spring_boot_scan/application/pom.xml  | 4 ++--
 .../main/release/samples/jax_rs/spring_boot_scan/client/pom.xml  | 4 ++--
 .../samples/jax_rs/spring_boot_scan/eureka-registry/pom.xml  | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/fb669aaa/distribution/src/main/release/samples/jax_rs/spring_boot/pom.xml
--
diff --git a/distribution/src/main/release/samples/jax_rs/spring_boot/pom.xml 
b/distribution/src/main/release/samples/jax_rs/spring_boot/pom.xml
index 932e55f..ea442c5 100644
--- a/distribution/src/main/release/samples/jax_rs/spring_boot/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/spring_boot/pom.xml
@@ -8,12 +8,12 @@
  
 spring-boot-sample-rs-cxf
 org.apache.cxf.samples
-3.1.7-SNAPSHOT
+3.1.9-SNAPSHOT
 Spring Boot CXF REST Application
 Spring Boot CXF REST Application
 
 
-3.1.7-SNAPSHOT
+3.1.9-SNAPSHOT
 
 
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/fb669aaa/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/pom.xml
--
diff --git 
a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/pom.xml
 
b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/pom.xml
index 1c3d4a3..7ee732f 100644
--- 
a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/pom.xml
+++ 
b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/pom.xml
@@ -8,12 +8,12 @@
  
 spring-boot-sample-rs-cxf-scan-app
 org.apache.cxf.samples
-3.1.7-SNAPSHOT
+3.1.9-SNAPSHOT
 Spring Boot CXF REST Scan Application
 Spring Boot CXF REST Scan Application
 
 
-3.1.7-SNAPSHOT
+3.1.9-SNAPSHOT
 1.3.6.RELEASE
 
1.1.3.RELEASE
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/fb669aaa/distribution/src/main/release/samples/jax_rs/spring_boot_scan/client/pom.xml
--
diff --git 
a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/client/pom.xml 
b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/client/pom.xml
index 660755d..84e5381 100644
--- 
a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/client/pom.xml
+++ 
b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/client/pom.xml
@@ -8,12 +8,12 @@
  
 spring-boot-sample-rs-cxf-scan-client
 org.apache.cxf.samples
-3.2.0-SNAPSHOT
+3.1.9-SNAPSHOT
 Spring Boot CXF REST Scan Application Client
 Spring Boot CXF REST Scan Application Client
 
 
-3.2.0-SNAPSHOT
+3.1.9-SNAPSHOT
 2.1 
 1.3.6.RELEASE
 
1.1.3.RELEASE

http://git-wip-us.apache.org/repos/asf/cxf/blob/fb669aaa/distribution/src/main/release/samples/jax_rs/spring_boot_scan/eureka-registry/pom.xml
--
diff --git 
a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/eureka-registry/pom.xml
 
b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/eureka-registry/pom.xml
index a6bd42e..d43a0c6 100644
--- 
a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/eureka-registry/pom.xml
+++ 
b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/eureka-registry/pom.xml
@@ -11,7 +11,7 @@
 
 eureka-registry-for-cxf
 org.apache.cxf.samples
-3.1.7-SNAPSHOT
+3.1.9-SNAPSHOT
 Eureka Registry for CXF SpringBoot demos
 Eureka Registry for CXF SpringBoot demos

cxf git commit: Disabling checkstyle for the spring_boot_scan RegistryApplication

2016-10-17 Thread sergeyb 
Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes b0673b54a -> 2d4648516


Disabling checkstyle for the spring_boot_scan RegistryApplication


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/2d464851
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/2d464851
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/2d464851

Branch: refs/heads/3.1.x-fixes
Commit: 2d4648516a5b4043c4250b039ac441878d6a734c
Parents: b0673b5
Author: Sergey Beryozkin 
Authored: Mon Oct 17 13:33:19 2016 +0100
Committer: Sergey Beryozkin 
Committed: Mon Oct 17 13:35:25 2016 +0100

--
 .../src/main/java/registry/eureka/RegistryApplication.java| 7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/2d464851/distribution/src/main/release/samples/jax_rs/spring_boot_scan/eureka-registry/src/main/java/registry/eureka/RegistryApplication.java
--
diff --git 
a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/eureka-registry/src/main/java/registry/eureka/RegistryApplication.java
 
b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/eureka-registry/src/main/java/registry/eureka/RegistryApplication.java
index e5fc30e..0cbdc6e 100644
--- 
a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/eureka-registry/src/main/java/registry/eureka/RegistryApplication.java
+++ 
b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/eureka-registry/src/main/java/registry/eureka/RegistryApplication.java
@@ -24,10 +24,9 @@ import 
org.springframework.cloud.netflix.eureka.server.EnableEurekaServer;
 
 @SpringBootApplication
 @EnableEurekaServer
-public static final class RegistryApplication {
-private RegistryApplication() {
-}
-
+//CHECKSTYLE:OFF
+public class RegistryApplication {
+//CHECKSTYLE:ON
 public static void main(String[] args) {
 SpringApplication.run(RegistryApplication.class, args);
 }

cxf git commit: Disabling checkstyle for the spring_boot_scan RegistryApplication

2016-10-17 Thread sergeyb 
Repository: cxf
Updated Branches:
  refs/heads/master ee9002fe8 -> 910f37767


Disabling checkstyle for the spring_boot_scan RegistryApplication


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/910f3776
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/910f3776
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/910f3776

Branch: refs/heads/master
Commit: 910f37767518832cce843c2a093ee833b7c48916
Parents: ee9002f
Author: Sergey Beryozkin 
Authored: Mon Oct 17 13:33:19 2016 +0100
Committer: Sergey Beryozkin 
Committed: Mon Oct 17 13:33:19 2016 +0100

--
 .../src/main/java/registry/eureka/RegistryApplication.java| 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/910f3776/distribution/src/main/release/samples/jax_rs/spring_boot_scan/eureka-registry/src/main/java/registry/eureka/RegistryApplication.java
--
diff --git 
a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/eureka-registry/src/main/java/registry/eureka/RegistryApplication.java
 
b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/eureka-registry/src/main/java/registry/eureka/RegistryApplication.java
index 2a3cdd4..0cbdc6e 100644
--- 
a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/eureka-registry/src/main/java/registry/eureka/RegistryApplication.java
+++ 
b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/eureka-registry/src/main/java/registry/eureka/RegistryApplication.java
@@ -24,8 +24,9 @@ import 
org.springframework.cloud.netflix.eureka.server.EnableEurekaServer;
 
 @SpringBootApplication
 @EnableEurekaServer
+//CHECKSTYLE:OFF
 public class RegistryApplication {
-
+//CHECKSTYLE:ON
 public static void main(String[] args) {
 SpringApplication.run(RegistryApplication.class, args);
 }

cxf git commit: Removing a Provider annotation on the private Swagger2 ServletConfigProvider class as it may interfere with the auto-scan process

2016-10-17 Thread sergeyb 
Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes 418bfd0df -> b0673b54a


Removing a Provider annotation on the private Swagger2 ServletConfigProvider 
class as it may interfere with the auto-scan process


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/b0673b54
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/b0673b54
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/b0673b54

Branch: refs/heads/3.1.x-fixes
Commit: b0673b54a2af930cb7730064e2c324debefe3882
Parents: 418bfd0
Author: Sergey Beryozkin 
Authored: Mon Oct 17 13:04:42 2016 +0100
Committer: Sergey Beryozkin 
Committed: Mon Oct 17 13:04:42 2016 +0100

--
 .../src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java | 1 -
 1 file changed, 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/b0673b54/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java
--
diff --git 
a/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java
 
b/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java
index 5b04b88..e15cea0 100644
--- 
a/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java
+++ 
b/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java
@@ -272,7 +272,6 @@ public class Swagger2Feature extends AbstractSwaggerFeature 
{
 this.swaggerUiMediaTypes = swaggerUiMediaTypes;
 }
 
-@javax.ws.rs.ext.Provider
 private class ServletConfigProvider implements 
ContextProvider {
 
 @Override

buildbot success in on cxf-site-production

2016-10-17 Thread buildbot 
The Buildbot has detected a restored build on builder cxf-site-production while 
building . Full details are available at:
https://ci.apache.org/builders/cxf-site-production/builds/11405

Buildbot URL: https://ci.apache.org/

Buildslave for this Build: bb-cms-slave

Build Reason: The Nightly scheduler named 'cxf-site-production' triggered this 
build
Build Source Stamp: [branch cxf/web] HEAD
Blamelist: 

Build succeeded!

Sincerely,
 -The Buildbot

buildbot failure in on cxf-site-production

2016-10-17 Thread buildbot 
The Buildbot has detected a new failure on builder cxf-site-production while 
building . Full details are available at:
https://ci.apache.org/builders/cxf-site-production/builds/11404

Buildbot URL: https://ci.apache.org/

Buildslave for this Build: bb-cms-slave

Build Reason: The Nightly scheduler named 'cxf-site-production' triggered this 
build
Build Source Stamp: [branch cxf/web] HEAD
Blamelist: 

BUILD FAILED: failed compile

Sincerely,
 -The Buildbot

[2/2] cxf git commit: Fixing merge

2016-10-17 Thread coheigea 
Fixing merge


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/f91bdce0
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/f91bdce0
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/f91bdce0

Branch: refs/heads/3.0.x-fixes
Commit: f91bdce0a219e273c4f6b0e990074cb16ae0ab07
Parents: a493b7f
Author: Colm O hEigeartaigh 
Authored: Mon Oct 17 11:39:58 2016 +0100
Committer: Colm O hEigeartaigh 
Committed: Mon Oct 17 11:39:58 2016 +0100

--
 .../cxf/systest/ws/tokens/tls-stax-server.xml   | 20 ++--
 1 file changed, 10 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/f91bdce0/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/tls-stax-server.xml
--
diff --git 
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/tls-stax-server.xml
 
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/tls-stax-server.xml
index 240e83c..4a42010 100644
--- 
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/tls-stax-server.xml
+++ 
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/tls-stax-server.xml
@@ -29,10 +29,10 @@
 
 
 
-
+
 
 
-
+
 
 
 
@@ -40,10 +40,10 @@
 
 http://www.example.org/contract/DoubleIt; 
id="EncryptedSupportingTokens4" 
address="https://localhost:${testutil.ports.tokens.TLSStaxServer}/DoubleItEncryptedSupporting4;
 serviceName="s:DoubleItService" 
endpointName="s:DoubleItEncryptedSupportingPort4" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/tokens/DoubleItTokens.wsdl" 
depends-on="tls-settings">
 
-
-
-
-
+
+
+
+
 
 
 
@@ -54,10 +54,10 @@
 
 http://www.example.org/contract/DoubleIt; 
id="EncryptedSupportingTokens5" 
address="https://localhost:${testutil.ports.tokens.TLSStaxServer}/DoubleItEncryptedSupporting5;
 serviceName="s:DoubleItService" 
endpointName="s:DoubleItEncryptedSupportingPort5" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/tokens/DoubleItTokens.wsdl" 
depends-on="tls-settings">
 
-
-
-
-
+
+
+
+

[1/2] cxf git commit: CXF-7088 - Adding streaming test

2016-10-17 Thread coheigea 
Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes 08462ef5b -> f91bdce0a


CXF-7088 - Adding streaming test


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/a493b7ff
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/a493b7ff
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/a493b7ff

Branch: refs/heads/3.0.x-fixes
Commit: a493b7ff0f5dc56fb0cafacdf2cbc5cf47751a7f
Parents: 08462ef
Author: Colm O hEigeartaigh 
Authored: Mon Oct 17 11:27:21 2016 +0100
Committer: Colm O hEigeartaigh 
Committed: Mon Oct 17 11:31:15 2016 +0100

--
 .../systest/ws/tokens/SupportingTokenTest.java  | 16 +++--
 .../cxf/systest/ws/tokens/TLSStaxServer.java| 47 +
 .../cxf/systest/ws/tokens/tls-stax-server.xml   | 69 
 3 files changed, 128 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/a493b7ff/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/tokens/SupportingTokenTest.java
--
diff --git 
a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/tokens/SupportingTokenTest.java
 
b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/tokens/SupportingTokenTest.java
index 7e9ecd0..350ba03 100644
--- 
a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/tokens/SupportingTokenTest.java
+++ 
b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/tokens/SupportingTokenTest.java
@@ -45,6 +45,7 @@ public class SupportingTokenTest extends 
AbstractBusClientServerTestBase {
 static final String PORT = allocatePort(Server.class);
 static final String TLS_PORT = allocatePort(TLSServer.class);
 static final String STAX_PORT = allocatePort(StaxServer.class);
+static final String TLS_STAX_PORT = allocatePort(TLSStaxServer.class);
 
 private static final String NAMESPACE = 
"http://www.example.org/contract/DoubleIt;;
 private static final QName SERVICE_QNAME = new QName(NAMESPACE, 
"DoubleItService");
@@ -75,6 +76,12 @@ public class SupportingTokenTest extends 
AbstractBusClientServerTestBase {
// set this to false to fork
launchServer(StaxServer.class, true)
 );
+assertTrue(
+   "Server failed to launch",
+   // run the server in the same process
+   // set this to false to fork
+   launchServer(TLSStaxServer.class, true)
+);
 }
 
 @Parameters(name = "{0}")
@@ -224,9 +231,6 @@ public class SupportingTokenTest extends 
AbstractBusClientServerTestBase {
 @org.junit.Test
 public void testEncryptedSupportingOverTLS() throws Exception {
 
-if (STAX_PORT.equals(test.getPort())) {
-return;
-}
 SpringBusFactory bf = new SpringBusFactory();
 URL busFile = SupportingTokenTest.class.getResource("tls-client.xml");
 
@@ -243,7 +247,9 @@ public class SupportingTokenTest extends 
AbstractBusClientServerTestBase {
 
 if (PORT.equals(test.getPort())) {
 updateAddressPort(port, TLS_PORT);
-}
+} else if (STAX_PORT.equals(test.getPort())) {
+updateAddressPort(port, TLS_STAX_PORT);
+} 
 
 if (test.isStreaming()) {
 SecurityTestUtil.enableStreaming(port);
@@ -257,6 +263,8 @@ public class SupportingTokenTest extends 
AbstractBusClientServerTestBase {
 
 if (PORT.equals(test.getPort())) {
 updateAddressPort(port, TLS_PORT);
+} else if (STAX_PORT.equals(test.getPort())) {
+updateAddressPort(port, TLS_STAX_PORT);
 }
 
 if (test.isStreaming()) {

http://git-wip-us.apache.org/repos/asf/cxf/blob/a493b7ff/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/tokens/TLSStaxServer.java
--
diff --git 
a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/tokens/TLSStaxServer.java
 
b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/tokens/TLSStaxServer.java
new file mode 100644
index 000..2cd3018
--- /dev/null
+++ 
b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/tokens/TLSStaxServer.java
@@ -0,0 +1,47 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ *

cxf git commit: CXF-7088 - Adding streaming test

2016-10-17 Thread coheigea 
Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes b72e2b560 -> 418bfd0df


CXF-7088 - Adding streaming test


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/418bfd0d
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/418bfd0d
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/418bfd0d

Branch: refs/heads/3.1.x-fixes
Commit: 418bfd0dffa1702fd44031ecf217000f41b86d88
Parents: b72e2b5
Author: Colm O hEigeartaigh 
Authored: Mon Oct 17 11:27:21 2016 +0100
Committer: Colm O hEigeartaigh 
Committed: Mon Oct 17 11:28:01 2016 +0100

--
 .../systest/ws/tokens/SupportingTokenTest.java  | 16 +++--
 .../cxf/systest/ws/tokens/TLSStaxServer.java| 47 +
 .../cxf/systest/ws/tokens/tls-stax-server.xml   | 69 
 3 files changed, 128 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/418bfd0d/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/tokens/SupportingTokenTest.java
--
diff --git 
a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/tokens/SupportingTokenTest.java
 
b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/tokens/SupportingTokenTest.java
index 7e9ecd0..350ba03 100644
--- 
a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/tokens/SupportingTokenTest.java
+++ 
b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/tokens/SupportingTokenTest.java
@@ -45,6 +45,7 @@ public class SupportingTokenTest extends 
AbstractBusClientServerTestBase {
 static final String PORT = allocatePort(Server.class);
 static final String TLS_PORT = allocatePort(TLSServer.class);
 static final String STAX_PORT = allocatePort(StaxServer.class);
+static final String TLS_STAX_PORT = allocatePort(TLSStaxServer.class);
 
 private static final String NAMESPACE = 
"http://www.example.org/contract/DoubleIt;;
 private static final QName SERVICE_QNAME = new QName(NAMESPACE, 
"DoubleItService");
@@ -75,6 +76,12 @@ public class SupportingTokenTest extends 
AbstractBusClientServerTestBase {
// set this to false to fork
launchServer(StaxServer.class, true)
 );
+assertTrue(
+   "Server failed to launch",
+   // run the server in the same process
+   // set this to false to fork
+   launchServer(TLSStaxServer.class, true)
+);
 }
 
 @Parameters(name = "{0}")
@@ -224,9 +231,6 @@ public class SupportingTokenTest extends 
AbstractBusClientServerTestBase {
 @org.junit.Test
 public void testEncryptedSupportingOverTLS() throws Exception {
 
-if (STAX_PORT.equals(test.getPort())) {
-return;
-}
 SpringBusFactory bf = new SpringBusFactory();
 URL busFile = SupportingTokenTest.class.getResource("tls-client.xml");
 
@@ -243,7 +247,9 @@ public class SupportingTokenTest extends 
AbstractBusClientServerTestBase {
 
 if (PORT.equals(test.getPort())) {
 updateAddressPort(port, TLS_PORT);
-}
+} else if (STAX_PORT.equals(test.getPort())) {
+updateAddressPort(port, TLS_STAX_PORT);
+} 
 
 if (test.isStreaming()) {
 SecurityTestUtil.enableStreaming(port);
@@ -257,6 +263,8 @@ public class SupportingTokenTest extends 
AbstractBusClientServerTestBase {
 
 if (PORT.equals(test.getPort())) {
 updateAddressPort(port, TLS_PORT);
+} else if (STAX_PORT.equals(test.getPort())) {
+updateAddressPort(port, TLS_STAX_PORT);
 }
 
 if (test.isStreaming()) {

http://git-wip-us.apache.org/repos/asf/cxf/blob/418bfd0d/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/tokens/TLSStaxServer.java
--
diff --git 
a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/tokens/TLSStaxServer.java
 
b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/tokens/TLSStaxServer.java
new file mode 100644
index 000..2cd3018
--- /dev/null
+++ 
b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/tokens/TLSStaxServer.java
@@ -0,0 +1,47 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ *

cxf-fediz git commit: Updating some dependencies

2016-10-17 Thread coheigea 
Repository: cxf-fediz
Updated Branches:
  refs/heads/master f260b413c -> 5b6839011


Updating some dependencies


Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/5b683901
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/5b683901
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/5b683901

Branch: refs/heads/master
Commit: 5b68390111bb8cc803ef60cdcaaa6d149a100ef8
Parents: f260b41
Author: Colm O hEigeartaigh 
Authored: Mon Oct 17 11:05:40 2016 +0100
Committer: Colm O hEigeartaigh 
Committed: Mon Oct 17 11:05:40 2016 +0100

--
 pom.xml | 18 +-
 1 file changed, 9 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/5b683901/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 2a07571..b0320c2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -40,34 +40,34 @@
 2.0.0-M23
 1.54
 1.1.1
-3.4
+3.5
 1.2
 2.5
 1.5.1
 3.1.8-SNAPSHOT
 3.2.0
 3.4
-4.5.1
+4.6.1
 2.9.0
 4.3.5
 2.3.4
-2.22
+2.23
 3.16.1-GA
 2.2
 1.1.0.Final
 3.3
-8.1.19.v20160209
-9.3.8.v20160314
+8.1.22.v20160922
+9.3.9.v20160517
 4.12
 1.2.17
-3.1.5
+3.1.11
 2.4.1
 2.5
 1.7.21
-4.1.9.RELEASE
+4.3.3.RELEASE
 3.2.9.RELEASE
-7.0.70
-8.0.36
+7.0.72
+8.0.38
 2.1.7
 
 http://localhost:8080/manager/text

[1/3] cxf git commit: Recording .gitmergeinfo Changes

2016-10-17 Thread coheigea 
Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes 26178395a -> 08462ef5b


Recording .gitmergeinfo Changes


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/fd4787f3
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/fd4787f3
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/fd4787f3

Branch: refs/heads/3.0.x-fixes
Commit: fd4787f318b3906cdc327d1c7acf872384813670
Parents: a384601
Author: Colm O hEigeartaigh 
Authored: Mon Oct 17 10:04:17 2016 +0100
Committer: Colm O hEigeartaigh 
Committed: Mon Oct 17 10:04:17 2016 +0100

--
 .gitmergeinfo | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/fd4787f3/.gitmergeinfo
--
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 57a8cfe..9fcbb23 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -1535,6 +1535,7 @@ M b3bf20abb23f186dbdb0e16519d5c02bbaf5a3ce
 M b3c1804ba33e0c2c7d991b585ba8147eb13ee07b
 M b4aa01a0de28462f7338d232e2e88be8512882af
 M b5320827561467de7e04afdba15a6063d26493a3
+M b72e2b560bcfd565946b185a9f123de0cbc2d995
 M b7d33366f3311dc33c7da389f98fced6fd470c93
 M b86ac6d0d12c25ca8a50e8e4fcc494db258387f1
 M b9c24f41cb1cc7e4d572fa222ae5aa4f5f804ccb

[3/3] cxf git commit: Fixing merge

2016-10-17 Thread coheigea 
Fixing merge


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/08462ef5
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/08462ef5
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/08462ef5

Branch: refs/heads/3.0.x-fixes
Commit: 08462ef5bd1b19d8aa5d1e18c54124d08435f5c3
Parents: fd4787f
Author: Colm O hEigeartaigh 
Authored: Mon Oct 17 10:33:12 2016 +0100
Committer: Colm O hEigeartaigh 
Committed: Mon Oct 17 10:33:12 2016 +0100

--
 .../systest/kerberos/jaxrs/kerberos/JAXRSKerberosBookTest.java | 6 +-
 .../cxf/systest/kerberos/wssec/kerberos/KerberosTokenTest.java | 6 +-
 .../cxf/systest/kerberos/wssec/spnego/SpnegoTokenTest.java | 6 +-
 3 files changed, 3 insertions(+), 15 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/08462ef5/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/jaxrs/kerberos/JAXRSKerberosBookTest.java
--
diff --git 
a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/jaxrs/kerberos/JAXRSKerberosBookTest.java
 
b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/jaxrs/kerberos/JAXRSKerberosBookTest.java
index 3c12166..17df9f8 100644
--- 
a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/jaxrs/kerberos/JAXRSKerberosBookTest.java
+++ 
b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/jaxrs/kerberos/JAXRSKerberosBookTest.java
@@ -77,12 +77,8 @@ import org.junit.runner.RunWith;
 
 @CreateKdcServer(
 transports = {
-<<< HEAD
 // @CreateTransport(protocol = "TCP", address = "127.0.0.1", port=1024)
-@CreateTransport(protocol = "UDP", address = "127.0.0.1")
-===
-@CreateTransport(protocol = "KRB", address = "localhost")
->>> b72e2b5... Use localhost instead of 127.0.0.1 for the Kerberos tests
+@CreateTransport(protocol = "UDP", address = "localhost")
 },
 primaryRealm = "service.ws.apache.org",
 kdcPrincipal = "krbtgt/service.ws.apache@service.ws.apache.org"

http://git-wip-us.apache.org/repos/asf/cxf/blob/08462ef5/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/kerberos/KerberosTokenTest.java
--
diff --git 
a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/kerberos/KerberosTokenTest.java
 
b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/kerberos/KerberosTokenTest.java
index d5d1b20..385eb2a 100644
--- 
a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/kerberos/KerberosTokenTest.java
+++ 
b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/kerberos/KerberosTokenTest.java
@@ -80,12 +80,8 @@ import org.junit.runner.RunWith;
 
 @CreateKdcServer(
 transports = {
-<<< HEAD
 // @CreateTransport(protocol = "TCP", address = "127.0.0.1", port=1024)
-@CreateTransport(protocol = "UDP", address = "127.0.0.1")
-===
-@CreateTransport(protocol = "KRB", address = "localhost")
->>> b72e2b5... Use localhost instead of 127.0.0.1 for the Kerberos tests
+@CreateTransport(protocol = "UDP", address = "localhost")
 },
 primaryRealm = "service.ws.apache.org",
 kdcPrincipal = "krbtgt/service.ws.apache@service.ws.apache.org"

http://git-wip-us.apache.org/repos/asf/cxf/blob/08462ef5/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/spnego/SpnegoTokenTest.java
--
diff --git 
a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/spnego/SpnegoTokenTest.java
 
b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/spnego/SpnegoTokenTest.java
index 8d93fdf..571c76c 100644
--- 
a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/spnego/SpnegoTokenTest.java
+++ 
b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/spnego/SpnegoTokenTest.java
@@ -77,12 +77,8 @@ import org.junit.runner.RunWith;
 
 @CreateKdcServer(
 transports = {
-<<< HEAD
 // @CreateTransport(protocol = "TCP", address = "127.0.0.1", port=1024)
-@CreateTransport(protocol = "UDP", address = "127.0.0.1")
-===
-@CreateTransport(protocol = "KRB", address = "localhost")
->>> b72e2b5... Use localhost instead of 127.0.0.1 for the Kerberos tests
+@CreateTransport(protocol = "UDP", address = "localhost")
 },
 primaryRealm = "service.ws.apache.org",
 kdcPrincipal = "krbtgt/service.ws.apache@service.ws.apache.org"

[2/3] cxf git commit: Use localhost instead of 127.0.0.1 for the Kerberos tests

2016-10-17 Thread coheigea 
Use localhost instead of 127.0.0.1 for the Kerberos tests

# Conflicts:
#   
systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/jaxrs/kerberos/JAXRSKerberosBookTest.java
#   
systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/kerberos/KerberosTokenTest.java
#   
systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/spnego/SpnegoTokenTest.java


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/a384601e
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/a384601e
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/a384601e

Branch: refs/heads/3.0.x-fixes
Commit: a384601e90700736873caee89380ccb09af3856e
Parents: 2617839
Author: Colm O hEigeartaigh 
Authored: Mon Oct 17 09:55:15 2016 +0100
Committer: Colm O hEigeartaigh 
Committed: Mon Oct 17 10:04:17 2016 +0100

--
 .../systest/kerberos/jaxrs/kerberos/JAXRSKerberosBookTest.java   | 4 
 .../org/apache/cxf/systest/kerberos/ldap/LDAPClaimsTest.java | 2 +-
 .../cxf/systest/kerberos/wssec/kerberos/KerberosTokenTest.java   | 4 
 .../cxf/systest/kerberos/wssec/spnego/SpnegoTokenTest.java   | 4 
 4 files changed, 13 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/a384601e/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/jaxrs/kerberos/JAXRSKerberosBookTest.java
--
diff --git 
a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/jaxrs/kerberos/JAXRSKerberosBookTest.java
 
b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/jaxrs/kerberos/JAXRSKerberosBookTest.java
index cda826c..3c12166 100644
--- 
a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/jaxrs/kerberos/JAXRSKerberosBookTest.java
+++ 
b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/jaxrs/kerberos/JAXRSKerberosBookTest.java
@@ -77,8 +77,12 @@ import org.junit.runner.RunWith;
 
 @CreateKdcServer(
 transports = {
+<<< HEAD
 // @CreateTransport(protocol = "TCP", address = "127.0.0.1", port=1024)
 @CreateTransport(protocol = "UDP", address = "127.0.0.1")
+===
+@CreateTransport(protocol = "KRB", address = "localhost")
+>>> b72e2b5... Use localhost instead of 127.0.0.1 for the Kerberos tests
 },
 primaryRealm = "service.ws.apache.org",
 kdcPrincipal = "krbtgt/service.ws.apache@service.ws.apache.org"

http://git-wip-us.apache.org/repos/asf/cxf/blob/a384601e/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/ldap/LDAPClaimsTest.java
--
diff --git 
a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/ldap/LDAPClaimsTest.java
 
b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/ldap/LDAPClaimsTest.java
index b365ae3..08fc7f9 100644
--- 
a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/ldap/LDAPClaimsTest.java
+++ 
b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/ldap/LDAPClaimsTest.java
@@ -78,7 +78,7 @@ import org.springframework.util.Assert;
 
 @CreateLdapServer(
 transports = {
-@CreateTransport(protocol = "LDAP", address = "127.0.0.1")
+@CreateTransport(protocol = "LDAP", address = "localhost")
 }
 )
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/a384601e/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/kerberos/KerberosTokenTest.java
--
diff --git 
a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/kerberos/KerberosTokenTest.java
 
b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/kerberos/KerberosTokenTest.java
index 2545b1f..d5d1b20 100644
--- 
a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/kerberos/KerberosTokenTest.java
+++ 
b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/kerberos/KerberosTokenTest.java
@@ -80,8 +80,12 @@ import org.junit.runner.RunWith;
 
 @CreateKdcServer(
 transports = {
+<<< HEAD
 // @CreateTransport(protocol = "TCP", address = "127.0.0.1", port=1024)
 @CreateTransport(protocol = "UDP", address = "127.0.0.1")
+===
+@CreateTransport(protocol = "KRB", address = "localhost")
+>>> b72e2b5... Use localhost instead of 127.0.0.1 for the Kerberos tests
 },
 primaryRealm = "service.ws.apache.org",
 kdcPrincipal = "krbtgt/service.ws.apache@service.ws.apache.org"

http://git-wip-us.apache.org/repos/asf/cxf/blob/a384601e/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/spnego/SpnegoTokenTest.java

cxf git commit: Use localhost instead of 127.0.0.1 for the Kerberos tests

2016-10-17 Thread coheigea 
Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes 333b9c48a -> b72e2b560


Use localhost instead of 127.0.0.1 for the Kerberos tests


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/b72e2b56
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/b72e2b56
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/b72e2b56

Branch: refs/heads/3.1.x-fixes
Commit: b72e2b560bcfd565946b185a9f123de0cbc2d995
Parents: 333b9c4
Author: Colm O hEigeartaigh 
Authored: Mon Oct 17 09:55:15 2016 +0100
Committer: Colm O hEigeartaigh 
Committed: Mon Oct 17 09:56:19 2016 +0100

--
 .../cxf/systest/kerberos/jaxrs/kerberos/JAXRSKerberosBookTest.java | 2 +-
 .../java/org/apache/cxf/systest/kerberos/ldap/LDAPClaimsTest.java  | 2 +-
 .../cxf/systest/kerberos/wssec/kerberos/KerberosTokenTest.java | 2 +-
 .../apache/cxf/systest/kerberos/wssec/spnego/SpnegoTokenTest.java  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/b72e2b56/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/jaxrs/kerberos/JAXRSKerberosBookTest.java
--
diff --git 
a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/jaxrs/kerberos/JAXRSKerberosBookTest.java
 
b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/jaxrs/kerberos/JAXRSKerberosBookTest.java
index 3f0c79f..da1adf0 100644
--- 
a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/jaxrs/kerberos/JAXRSKerberosBookTest.java
+++ 
b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/jaxrs/kerberos/JAXRSKerberosBookTest.java
@@ -78,7 +78,7 @@ import org.junit.runner.RunWith;
 
 @CreateKdcServer(
 transports = {
-@CreateTransport(protocol = "KRB", address = "127.0.0.1")
+@CreateTransport(protocol = "KRB", address = "localhost")
 },
 primaryRealm = "service.ws.apache.org",
 kdcPrincipal = "krbtgt/service.ws.apache@service.ws.apache.org"

http://git-wip-us.apache.org/repos/asf/cxf/blob/b72e2b56/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/ldap/LDAPClaimsTest.java
--
diff --git 
a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/ldap/LDAPClaimsTest.java
 
b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/ldap/LDAPClaimsTest.java
index 47fc3b6..b01b627 100644
--- 
a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/ldap/LDAPClaimsTest.java
+++ 
b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/ldap/LDAPClaimsTest.java
@@ -80,7 +80,7 @@ import org.springframework.util.Assert;
 
 @CreateLdapServer(
 transports = {
-@CreateTransport(protocol = "LDAP", address = "127.0.0.1")
+@CreateTransport(protocol = "LDAP", address = "localhost")
 }
 )
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/b72e2b56/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/kerberos/KerberosTokenTest.java
--
diff --git 
a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/kerberos/KerberosTokenTest.java
 
b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/kerberos/KerberosTokenTest.java
index be57236..1c65435 100644
--- 
a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/kerberos/KerberosTokenTest.java
+++ 
b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/kerberos/KerberosTokenTest.java
@@ -81,7 +81,7 @@ import org.junit.runner.RunWith;
 
 @CreateKdcServer(
 transports = {
-@CreateTransport(protocol = "KRB", address = "127.0.0.1")
+@CreateTransport(protocol = "KRB", address = "localhost")
 },
 primaryRealm = "service.ws.apache.org",
 kdcPrincipal = "krbtgt/service.ws.apache@service.ws.apache.org"

http://git-wip-us.apache.org/repos/asf/cxf/blob/b72e2b56/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/spnego/SpnegoTokenTest.java
--
diff --git 
a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/spnego/SpnegoTokenTest.java
 
b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/spnego/SpnegoTokenTest.java
index 619e16a..b513924 100644
--- 
a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/spnego/SpnegoTokenTest.java
+++ 
b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/spnego/SpnegoTokenTest.java
@@ -78,7 +78,7 @@ import org.junit.runner.RunWith;
 
 @CreateKdcServer(
 transports = {
-

cxf git commit: Use localhost instead of 127.0.0.1 for the Kerberos tests

2016-10-17 Thread coheigea 
Repository: cxf
Updated Branches:
  refs/heads/master 629768a9d -> d156064f7


Use localhost instead of 127.0.0.1 for the Kerberos tests


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/d156064f
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/d156064f
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/d156064f

Branch: refs/heads/master
Commit: d156064f7d46dc73b4c602d7721e21cb1a2be5eb
Parents: 629768a
Author: Colm O hEigeartaigh 
Authored: Mon Oct 17 09:55:15 2016 +0100
Committer: Colm O hEigeartaigh 
Committed: Mon Oct 17 09:55:15 2016 +0100

--
 .../cxf/systest/kerberos/jaxrs/kerberos/JAXRSKerberosBookTest.java | 2 +-
 .../java/org/apache/cxf/systest/kerberos/ldap/LDAPClaimsTest.java  | 2 +-
 .../cxf/systest/kerberos/wssec/kerberos/KerberosTokenTest.java | 2 +-
 .../apache/cxf/systest/kerberos/wssec/spnego/SpnegoTokenTest.java  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/d156064f/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/jaxrs/kerberos/JAXRSKerberosBookTest.java
--
diff --git 
a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/jaxrs/kerberos/JAXRSKerberosBookTest.java
 
b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/jaxrs/kerberos/JAXRSKerberosBookTest.java
index 3f0c79f..da1adf0 100644
--- 
a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/jaxrs/kerberos/JAXRSKerberosBookTest.java
+++ 
b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/jaxrs/kerberos/JAXRSKerberosBookTest.java
@@ -78,7 +78,7 @@ import org.junit.runner.RunWith;
 
 @CreateKdcServer(
 transports = {
-@CreateTransport(protocol = "KRB", address = "127.0.0.1")
+@CreateTransport(protocol = "KRB", address = "localhost")
 },
 primaryRealm = "service.ws.apache.org",
 kdcPrincipal = "krbtgt/service.ws.apache@service.ws.apache.org"

http://git-wip-us.apache.org/repos/asf/cxf/blob/d156064f/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/ldap/LDAPClaimsTest.java
--
diff --git 
a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/ldap/LDAPClaimsTest.java
 
b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/ldap/LDAPClaimsTest.java
index 47fc3b6..b01b627 100644
--- 
a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/ldap/LDAPClaimsTest.java
+++ 
b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/ldap/LDAPClaimsTest.java
@@ -80,7 +80,7 @@ import org.springframework.util.Assert;
 
 @CreateLdapServer(
 transports = {
-@CreateTransport(protocol = "LDAP", address = "127.0.0.1")
+@CreateTransport(protocol = "LDAP", address = "localhost")
 }
 )
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/d156064f/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/kerberos/KerberosTokenTest.java
--
diff --git 
a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/kerberos/KerberosTokenTest.java
 
b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/kerberos/KerberosTokenTest.java
index be57236..1c65435 100644
--- 
a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/kerberos/KerberosTokenTest.java
+++ 
b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/kerberos/KerberosTokenTest.java
@@ -81,7 +81,7 @@ import org.junit.runner.RunWith;
 
 @CreateKdcServer(
 transports = {
-@CreateTransport(protocol = "KRB", address = "127.0.0.1")
+@CreateTransport(protocol = "KRB", address = "localhost")
 },
 primaryRealm = "service.ws.apache.org",
 kdcPrincipal = "krbtgt/service.ws.apache@service.ws.apache.org"

http://git-wip-us.apache.org/repos/asf/cxf/blob/d156064f/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/spnego/SpnegoTokenTest.java
--
diff --git 
a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/spnego/SpnegoTokenTest.java
 
b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/spnego/SpnegoTokenTest.java
index 619e16a..b513924 100644
--- 
a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/spnego/SpnegoTokenTest.java
+++ 
b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/spnego/SpnegoTokenTest.java
@@ -78,7 +78,7 @@ import org.junit.runner.RunWith;
 
 @CreateKdcServer(
 transports = {
-@CreateTransport(protocol =