Repository: cxf Updated Branches: refs/heads/master 9469be2de -> bb9b5d2e1
Updating to Apache DS M20 and picking up the new transport Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/bb9b5d2e Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/bb9b5d2e Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/bb9b5d2e Branch: refs/heads/master Commit: bb9b5d2e15c0e30d12a6dea3db1a6f720aaf07ad Parents: 9469be2 Author: Colm O hEigeartaigh <[email protected]> Authored: Tue May 5 10:57:10 2015 +0100 Committer: Colm O hEigeartaigh <[email protected]> Committed: Tue May 5 10:57:10 2015 +0100 ---------------------------------------------------------------------- parent/pom.xml | 2 +- .../systest/kerberos/jaxrs/kerberos/JAXRSKerberosBookTest.java | 3 +-- .../cxf/systest/kerberos/wssec/kerberos/KerberosTokenTest.java | 3 +-- .../apache/cxf/systest/kerberos/wssec/spnego/SpnegoTokenTest.java | 3 +-- 4 files changed, 4 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/bb9b5d2e/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 2287c3b..96b0fdf 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -68,7 +68,7 @@ <cxf.abdera.version>1.1.3</cxf.abdera.version> <cxf.activemq.version>5.10.0</cxf.activemq.version> <cxf.ahc.version>1.9.8</cxf.ahc.version> - <cxf.apacheds.version>2.0.0-M19</cxf.apacheds.version> + <cxf.apacheds.version>2.0.0-M20</cxf.apacheds.version> <cxf.atmosphere.version>2.2.6</cxf.atmosphere.version> <cxf.atmosphere.version.range>[2.0,3.0)</cxf.atmosphere.version.range> <cxf.axiom.version>1.2.14</cxf.axiom.version> http://git-wip-us.apache.org/repos/asf/cxf/blob/bb9b5d2e/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 6ffb9fb..4385ca6 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 @@ -84,8 +84,7 @@ import org.junit.runner.RunWith; @CreateKdcServer( transports = { - // @CreateTransport(protocol = "TCP", address = "127.0.0.1", port=1024) - @CreateTransport(protocol = "UDP", address = "127.0.0.1") + @CreateTransport(protocol = "KRB", address = "127.0.0.1") }, primaryRealm = "service.ws.apache.org", kdcPrincipal = "krbtgt/[email protected]" http://git-wip-us.apache.org/repos/asf/cxf/blob/bb9b5d2e/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 1373f43..2a5c70e 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 @@ -87,8 +87,7 @@ import org.junit.runner.RunWith; @CreateKdcServer( transports = { - // @CreateTransport(protocol = "TCP", address = "127.0.0.1", port=1024) - @CreateTransport(protocol = "UDP", address = "127.0.0.1") + @CreateTransport(protocol = "KRB", address = "127.0.0.1") }, primaryRealm = "service.ws.apache.org", kdcPrincipal = "krbtgt/[email protected]" http://git-wip-us.apache.org/repos/asf/cxf/blob/bb9b5d2e/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 90280b2..348e26d 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 @@ -84,8 +84,7 @@ import org.junit.runner.RunWith; @CreateKdcServer( transports = { - // @CreateTransport(protocol = "TCP", address = "127.0.0.1", port=1024) - @CreateTransport(protocol = "UDP", address = "127.0.0.1") + @CreateTransport(protocol = "KRB", address = "127.0.0.1") }, primaryRealm = "service.ws.apache.org", kdcPrincipal = "krbtgt/[email protected]"
