cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject cxf git commit: Update a bunch of plugin versions, fix a bunch of new PMD errors with the PMD update
Date Thu, 23 Feb 2017 23:25:22 GMT
Repository: cxf
Updated Branches:
  refs/heads/master b0a79aa7b -> 1d2f39990


Update a bunch of plugin versions, fix a bunch of new PMD errors with the PMD update


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

Branch: refs/heads/master
Commit: 1d2f3999073b8d46ebe3e1e9f7a532d4b07434b4
Parents: b0a79aa
Author: Daniel Kulp <dkulp@apache.org>
Authored: Thu Feb 23 18:24:53 2017 -0500
Committer: Daniel Kulp <dkulp@apache.org>
Committed: Thu Feb 23 18:24:53 2017 -0500

----------------------------------------------------------------------
 core/pom.xml                                    |  2 +-
 .../org/apache/cxf/endpoint/ServerImpl.java     |  2 +-
 .../archetypes/cxf-jaxrs-service/pom.xml        |  2 +-
 .../archetypes/cxf-jaxws-javafirst/pom.xml      |  2 +-
 .../archetypes/cxf-jaxws-wsdlfirst/pom.xml      |  2 +-
 maven-plugins/codegen-plugin/pom.xml            |  2 +-
 osgi/repository/pom.xml                         |  2 +-
 parent/pom.xml                                  |  6 ++--
 pom.xml                                         | 38 ++++++++++----------
 .../rs/security/jose/common/JoseHeaders.java    |  4 +--
 .../cxf/rs/security/jose/jwe/JweHeaders.java    |  4 ---
 .../rs/security/jose/jwe/JweJsonConsumer.java   |  2 +-
 .../cxf/rs/security/jose/jwk/JsonWebKeys.java   |  4 +--
 .../cxf/rs/security/jose/jws/JwsHeaders.java    |  2 +-
 .../rs/security/jose/jws/JwsJsonConsumer.java   |  2 +-
 rt/rs/security/oauth-parent/oauth2/pom.xml      |  3 +-
 rt/rs/security/sso/oidc/pom.xml                 |  3 +-
 .../http_jetty/JettyHTTPDestination.java        | 18 +++++++---
 rt/transports/http/pom.xml                      |  2 +-
 .../cxf/transport/jms/uri/JMSEndpoint.java      |  6 ++--
 .../AtmosphereWebSocketJettyDestination.java    | 14 +++++---
 .../jetty9/Jetty9WebSocketDestination.java      | 12 +++++--
 services/xkms/xkms-x509-handlers/pom.xml        |  2 +-
 testutils/pom.xml                               |  1 -
 24 files changed, 76 insertions(+), 61 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/1d2f3999/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 2ad8ee4..445c2e8 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -229,7 +229,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>buildnumber-maven-plugin</artifactId>
-                <version>1.3</version>
+                <version>1.4</version>
                 <executions>
                     <execution>
                         <id>create-noncanonicalrev</id>

http://git-wip-us.apache.org/repos/asf/cxf/blob/1d2f3999/core/src/main/java/org/apache/cxf/endpoint/ServerImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/endpoint/ServerImpl.java b/core/src/main/java/org/apache/cxf/endpoint/ServerImpl.java
index dea9686..6437418 100644
--- a/core/src/main/java/org/apache/cxf/endpoint/ServerImpl.java
+++ b/core/src/main/java/org/apache/cxf/endpoint/ServerImpl.java
@@ -102,7 +102,7 @@ public class ServerImpl implements Server {
         }
     }
 
-    protected ManagedEndpoint createManagedEndpoint() {
+    private ManagedEndpoint createManagedEndpoint() {
         return new ManagedEndpoint(bus, endpoint, this);
     }
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/1d2f3999/maven-plugins/archetypes/cxf-jaxrs-service/pom.xml
----------------------------------------------------------------------
diff --git a/maven-plugins/archetypes/cxf-jaxrs-service/pom.xml b/maven-plugins/archetypes/cxf-jaxrs-service/pom.xml
index dda8da0..ba67a79 100644
--- a/maven-plugins/archetypes/cxf-jaxrs-service/pom.xml
+++ b/maven-plugins/archetypes/cxf-jaxrs-service/pom.xml
@@ -48,7 +48,7 @@
             <plugins>
                 <plugin>
                     <artifactId>maven-archetype-plugin</artifactId>
-                    <version>2.1</version>
+                    <version>2.4</version>
                 </plugin>
             </plugins>
         </pluginManagement>

http://git-wip-us.apache.org/repos/asf/cxf/blob/1d2f3999/maven-plugins/archetypes/cxf-jaxws-javafirst/pom.xml
----------------------------------------------------------------------
diff --git a/maven-plugins/archetypes/cxf-jaxws-javafirst/pom.xml b/maven-plugins/archetypes/cxf-jaxws-javafirst/pom.xml
index e9fc5a4..e620d10 100644
--- a/maven-plugins/archetypes/cxf-jaxws-javafirst/pom.xml
+++ b/maven-plugins/archetypes/cxf-jaxws-javafirst/pom.xml
@@ -49,7 +49,7 @@
             <plugins>
                 <plugin>
                     <artifactId>maven-archetype-plugin</artifactId>
-                    <version>2.1</version>
+                    <version>2.4</version>
                 </plugin>
             </plugins>
         </pluginManagement>

http://git-wip-us.apache.org/repos/asf/cxf/blob/1d2f3999/maven-plugins/archetypes/cxf-jaxws-wsdlfirst/pom.xml
----------------------------------------------------------------------
diff --git a/maven-plugins/archetypes/cxf-jaxws-wsdlfirst/pom.xml b/maven-plugins/archetypes/cxf-jaxws-wsdlfirst/pom.xml
index 3ade0ab..4d1421d 100644
--- a/maven-plugins/archetypes/cxf-jaxws-wsdlfirst/pom.xml
+++ b/maven-plugins/archetypes/cxf-jaxws-wsdlfirst/pom.xml
@@ -48,7 +48,7 @@
             <plugins>
                 <plugin>
                     <artifactId>maven-archetype-plugin</artifactId>
-                    <version>2.1</version>
+                    <version>2.4</version>
                 </plugin>
             </plugins>
         </pluginManagement>

http://git-wip-us.apache.org/repos/asf/cxf/blob/1d2f3999/maven-plugins/codegen-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/maven-plugins/codegen-plugin/pom.xml b/maven-plugins/codegen-plugin/pom.xml
index 9500f73..cba2f65 100644
--- a/maven-plugins/codegen-plugin/pom.xml
+++ b/maven-plugins/codegen-plugin/pom.xml
@@ -172,7 +172,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-invoker-plugin</artifactId>
-                <version>1.9</version>
+                <version>2.0.0</version>
                 <executions>
                     <execution>
                         <id>test-toolchains-integration</id>

http://git-wip-us.apache.org/repos/asf/cxf/blob/1d2f3999/osgi/repository/pom.xml
----------------------------------------------------------------------
diff --git a/osgi/repository/pom.xml b/osgi/repository/pom.xml
index 53bf9ed..6a45582 100644
--- a/osgi/repository/pom.xml
+++ b/osgi/repository/pom.xml
@@ -29,7 +29,7 @@
 	<artifactId>cxf-repository</artifactId>
 	<packaging>pom</packaging>
 	<properties>
-		<bnd.version>3.1.0</bnd.version>
+		<bnd.version>3.3.0</bnd.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<local.index.policy>REQUIRED</local.index.policy>
 	</properties>

http://git-wip-us.apache.org/repos/asf/cxf/blob/1d2f3999/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 91ce727..e7bd376 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -277,7 +277,7 @@
                 <plugin>
                     <groupId>org.apache.servicemix.tooling</groupId>
                     <artifactId>depends-maven-plugin</artifactId>
-                    <version>1.2</version>
+                    <version>1.3.1</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
@@ -360,7 +360,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-pmd-plugin</artifactId>
-                    <version>3.5</version>
+                    <version>3.7</version>
                     <dependencies>
                         <dependency>
                             <groupId>org.apache.cxf.build-utils</groupId>
@@ -2197,7 +2197,7 @@
                     <plugin>
                         <groupId>org.ekstazi</groupId>
                         <artifactId>ekstazi-maven-plugin</artifactId>
-                        <version>4.3.0</version>
+                        <version>4.6.2</version>
                         <configuration>
                             <!-- always run tests that failed in prevoius run -->
                             <forcefailing>true</forcefailing>

http://git-wip-us.apache.org/repos/asf/cxf/blob/1d2f3999/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 1c5a79d..63218c9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -39,11 +39,11 @@
         <url>https://issues.apache.org/jira/browse/CXF</url>
     </issueManagement>
     <prerequisites>
-        <maven>3.0</maven>
+        <maven>3.1</maven>
     </prerequisites>
     <properties>
         <cxf.compiler.fork>false</cxf.compiler.fork>
-        <cxf.build-utils.version>3.2.1</cxf.build-utils.version>
+        <cxf.build-utils.version>3.2.2-SNAPSHOT</cxf.build-utils.version>
         <cxf.xjc-utils.version>3.1.0</cxf.xjc-utils.version>
         <cxf.jdk.version>1.8</cxf.jdk.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -217,7 +217,7 @@
                         <plugin>
                             <groupId>org.apache.maven.plugins</groupId>
                             <artifactId>maven-compiler-plugin</artifactId>
-                            <version>3.3</version>
+                            <version>3.6.0</version>
                             <configuration>
                                 <source>${cxf.jdk.version}</source>
                                 <target>${cxf.jdk.version}</target>
@@ -413,12 +413,12 @@
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
                     <artifactId>properties-maven-plugin </artifactId>
-                    <version>1.0-alpha-2</version>
+                    <version>1.0.0</version>
                 </plugin>
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
                     <artifactId>build-helper-maven-plugin</artifactId>
-                    <version>1.9.1</version>
+                    <version>1.12</version>
                 </plugin>
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
@@ -428,17 +428,17 @@
                 <plugin>
                     <groupId>org.apache.felix</groupId>
                     <artifactId>maven-bundle-plugin</artifactId>
-                    <version>2.4.0</version>
+                    <version>2.5.4</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-clean-plugin</artifactId>
-                    <version>2.6.1</version>
+                    <version>3.0.0</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-war-plugin</artifactId>
-                    <version>2.4</version>
+                    <version>3.0.0</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
@@ -448,7 +448,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-release-plugin</artifactId>
-                    <version>2.5.2</version>
+                    <version>2.5.3</version>
                     <configuration>
                         <useReleaseProfile>false</useReleaseProfile>
                         <preparationGoals>clean install</preparationGoals>
@@ -477,7 +477,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-surefire-plugin</artifactId>
-                    <version>2.18</version>
+                    <version>2.19.1</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
@@ -487,7 +487,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-compiler-plugin</artifactId>
-                    <version>3.3</version>
+                    <version>3.6.0</version>
                     <configuration>
                         <source>${cxf.jdk.version}</source>
                         <target>${cxf.jdk.version}</target>
@@ -532,7 +532,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-resources-plugin</artifactId>
-                    <version>2.7</version>
+                    <version>3.0.1</version>
                     <configuration>
                         <encoding>UTF-8</encoding>
                     </configuration>
@@ -540,7 +540,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-assembly-plugin</artifactId>
-                    <version>2.5.4</version>
+                    <version>3.0.0</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
@@ -555,22 +555,22 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-surefire-report-plugin</artifactId>
-                    <version>2.17</version>
+                    <version>2.19.1</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-project-info-reports-plugin</artifactId>
-                    <version>2.8</version>
+                    <version>2.9</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-plugin-plugin</artifactId>
-                    <version>3.4</version>
+                    <version>3.5</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-eclipse-plugin</artifactId>
-                    <version>2.9</version>
+                    <version>2.10</version>
                     <dependencies>
                         <dependency>
                             <groupId>org.apache.cxf.build-utils</groupId>
@@ -582,7 +582,7 @@
                 <plugin>
                     <groupId>org.apache.rat</groupId>
                     <artifactId>apache-rat-plugin</artifactId>
-                    <version>0.11</version>
+                    <version>0.12</version>
                     <configuration>
                         <numUnapprovedLicenses>350</numUnapprovedLicenses>
                         <excludeSubProjects>false</excludeSubProjects>
@@ -604,7 +604,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-site-plugin</artifactId>
-                    <version>3.4</version>
+                    <version>3.6</version>
                     <configuration>
                         <chmod>true</chmod>
                         <dependencyDetailsEnabled>false</dependencyDetailsEnabled>

http://git-wip-us.apache.org/repos/asf/cxf/blob/1d2f3999/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/common/JoseHeaders.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/common/JoseHeaders.java
b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/common/JoseHeaders.java
index c0662f3..776e2ab 100644
--- a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/common/JoseHeaders.java
+++ b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/common/JoseHeaders.java
@@ -46,7 +46,7 @@ public abstract class JoseHeaders extends JsonMapObject {
     private void init(JoseType type) {
         setType(type);
     }
-    public void setType(JoseType type) {
+    public final void setType(JoseType type) {
         setHeader(JoseConstants.HEADER_TYPE, type.toString());
     }
 
@@ -148,7 +148,7 @@ public abstract class JoseHeaders extends JsonMapObject {
         return new JsonWebKey(map);
     }
 
-    public JoseHeaders setHeader(String name, Object value) {
+    public final JoseHeaders setHeader(String name, Object value) {
         setProperty(name, value);
         return this;
     }

http://git-wip-us.apache.org/repos/asf/cxf/blob/1d2f3999/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweHeaders.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweHeaders.java
b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweHeaders.java
index fe8e84f..f673cac 100644
--- a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweHeaders.java
+++ b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweHeaders.java
@@ -100,10 +100,6 @@ public class JweHeaders extends JoseHeaders {
         return (String)getHeader(JoseConstants.JWE_HEADER_ZIP_ALGORITHM);
     }
 
-    @Override
-    public JoseHeaders setHeader(String name, Object value) {
-        return (JoseHeaders)super.setHeader(name, value);
-    }
     public byte[] toCipherAdditionalAuthData() {
         return toCipherAdditionalAuthData(new JsonMapObjectReaderWriter().toJson(this));
     }

http://git-wip-us.apache.org/repos/asf/cxf/blob/1d2f3999/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweJsonConsumer.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweJsonConsumer.java
b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweJsonConsumer.java
index e21ccec..5178a19 100644
--- a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweJsonConsumer.java
+++ b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweJsonConsumer.java
@@ -132,7 +132,7 @@ public class JweJsonConsumer {
         iv = getDecodedBytes(jsonObjectMap, "iv");
         authTag = getDecodedBytes(jsonObjectMap, "tag");
     }
-    protected JweJsonEncryptionEntry getEncryptionObject(Map<String, Object> encryptionEntry)
{
+    protected final JweJsonEncryptionEntry getEncryptionObject(Map<String, Object>
encryptionEntry) {
         Map<String, Object> header = CastUtils.cast((Map<?, ?>)encryptionEntry.get("header"));
         JweHeaders recipientUnprotected = header == null ? null : new JweHeaders(header);
         String encodedKey = (String)encryptionEntry.get("encrypted_key");

http://git-wip-us.apache.org/repos/asf/cxf/blob/1d2f3999/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwk/JsonWebKeys.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwk/JsonWebKeys.java
b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwk/JsonWebKeys.java
index 138ade2..92f2aaf 100644
--- a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwk/JsonWebKeys.java
+++ b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwk/JsonWebKeys.java
@@ -59,10 +59,10 @@ public class JsonWebKeys extends JsonMapObject {
             return null;
         }
     }
-    public void setKey(JsonWebKey key) {
+    public final void setKey(JsonWebKey key) {
         setKeys(Collections.singletonList(key));
     }
-    public void setKeys(List<JsonWebKey> keys) {
+    public final void setKeys(List<JsonWebKey> keys) {
         super.setProperty(KEYS_PROPERTY, keys);
     }
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/1d2f3999/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jws/JwsHeaders.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jws/JwsHeaders.java
b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jws/JwsHeaders.java
index 901c409..d390b96 100644
--- a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jws/JwsHeaders.java
+++ b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jws/JwsHeaders.java
@@ -60,7 +60,7 @@ public class JwsHeaders extends JoseHeaders {
         setSignatureAlgorithm(sigAlgo);
     }
 
-    public void setSignatureAlgorithm(SignatureAlgorithm algo) {
+    public final void setSignatureAlgorithm(SignatureAlgorithm algo) {
         super.setAlgorithm(algo.getJwaName());
     }
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/1d2f3999/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jws/JwsJsonConsumer.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jws/JwsJsonConsumer.java
b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jws/JwsJsonConsumer.java
index 807a734..83e4a62 100644
--- a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jws/JwsJsonConsumer.java
+++ b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jws/JwsJsonConsumer.java
@@ -90,7 +90,7 @@ public class JwsJsonConsumer {
     private Boolean validateB64Status() {
         return JwsJsonProducer.validateB64Status(signatures);
     }
-    protected JwsJsonSignatureEntry getSignatureObject(Map<String, Object> signatureEntry)
{
+    protected final JwsJsonSignatureEntry getSignatureObject(Map<String, Object> signatureEntry)
{
         String protectedHeader = (String)signatureEntry.get("protected");
         Map<String, Object> header = CastUtils.cast((Map<?, ?>)signatureEntry.get("header"));
         String signature = (String)signatureEntry.get("signature");

http://git-wip-us.apache.org/repos/asf/cxf/blob/1d2f3999/rt/rs/security/oauth-parent/oauth2/pom.xml
----------------------------------------------------------------------
diff --git a/rt/rs/security/oauth-parent/oauth2/pom.xml b/rt/rs/security/oauth-parent/oauth2/pom.xml
index 600195d..1881b9e 100644
--- a/rt/rs/security/oauth-parent/oauth2/pom.xml
+++ b/rt/rs/security/oauth-parent/oauth2/pom.xml
@@ -192,7 +192,7 @@
       <plugin>
         <groupId>org.bsc.maven</groupId>
         <artifactId>maven-processor-plugin</artifactId>
-        <version>3.1.0</version>
+        <version>3.2.0</version>
         <executions>
           <execution>
             <id>process</id>
@@ -220,7 +220,6 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>build-helper-maven-plugin</artifactId>
-        <version>1.10</version>
         <executions>
           <execution>
             <id>add-source</id>

http://git-wip-us.apache.org/repos/asf/cxf/blob/1d2f3999/rt/rs/security/sso/oidc/pom.xml
----------------------------------------------------------------------
diff --git a/rt/rs/security/sso/oidc/pom.xml b/rt/rs/security/sso/oidc/pom.xml
index 05ac86c..d54c959 100644
--- a/rt/rs/security/sso/oidc/pom.xml
+++ b/rt/rs/security/sso/oidc/pom.xml
@@ -145,7 +145,7 @@
       <plugin>
         <groupId>org.bsc.maven</groupId>
         <artifactId>maven-processor-plugin</artifactId>
-        <version>3.1.0</version>
+        <version>3.2.0</version>
         <executions>
           <execution>
             <id>process</id>
@@ -173,7 +173,6 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>build-helper-maven-plugin</artifactId>
-        <version>1.10</version>
         <executions>
           <execution>
             <id>add-source</id>

http://git-wip-us.apache.org/repos/asf/cxf/blob/1d2f3999/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestination.java
----------------------------------------------------------------------
diff --git a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestination.java
b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestination.java
index d323707..b413aba 100644
--- a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestination.java
+++ b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestination.java
@@ -90,15 +90,25 @@ public class JettyHTTPDestination extends ServletDestination {
             EndpointInfo ei,
             JettyHTTPServerEngineFactory serverEngineFactory
     ) throws IOException {
+        this(bus, registry, ei, 
+             serverEngineFactory == null ? null : new URL(getAddressValue(ei, true).getAddress()),
+             serverEngineFactory);
+    }
+
+    
+    protected JettyHTTPDestination(Bus bus,
+                                   DestinationRegistry registry,
+                                   EndpointInfo ei,
+                                   URL nurl,
+                                   JettyHTTPServerEngineFactory serverEngineFactory)
+        throws IOException {
         //Add the default port if the address is missing it
         super(bus, registry, ei, getAddressValue(ei, true).getAddress(), true);
         this.serverEngineFactory = serverEngineFactory;
-        if (serverEngineFactory != null) {
-            nurl = new URL(getAddress(endpointInfo));
-        }
+        this.nurl = nurl;
         loader = bus.getExtension(ClassLoader.class);
     }
-
+    
     protected Logger getLogger() {
         return LOG;
     }

http://git-wip-us.apache.org/repos/asf/cxf/blob/1d2f3999/rt/transports/http/pom.xml
----------------------------------------------------------------------
diff --git a/rt/transports/http/pom.xml b/rt/transports/http/pom.xml
index 1180b97..2d02393 100644
--- a/rt/transports/http/pom.xml
+++ b/rt/transports/http/pom.xml
@@ -208,7 +208,7 @@
             <plugin>
                 <groupId>com.googlecode.maven-download-plugin</groupId>
                 <artifactId>download-maven-plugin</artifactId>
-                <version>1.2.0</version>
+                <version>1.3.0</version>
                 <executions>
                     <execution>
                         <id>download-public-suffix-list</id>

http://git-wip-us.apache.org/repos/asf/cxf/blob/1d2f3999/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/uri/JMSEndpoint.java
----------------------------------------------------------------------
diff --git a/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/uri/JMSEndpoint.java
b/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/uri/JMSEndpoint.java
index 6680c71..d2edf73 100644
--- a/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/uri/JMSEndpoint.java
+++ b/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/uri/JMSEndpoint.java
@@ -227,11 +227,11 @@ public class JMSEndpoint {
      * @param key
      * @param value
      */
-    public void putJndiParameter(String key, String value) {
+    public final void putJndiParameter(String key, String value) {
         jndiParameters.put(key, value);
     }
 
-    public void putParameter(String key, String value) {
+    public final void putParameter(String key, String value) {
         parameters.put(key, value);
     }
 
@@ -270,7 +270,7 @@ public class JMSEndpoint {
     public String getJmsVariant() {
         return jmsVariant;
     }
-    public void setJmsVariant(String jmsVariant) {
+    public final void setJmsVariant(String jmsVariant) {
         if (jmsVariant == null) {
             this.jmsVariant = QUEUE;
         }

http://git-wip-us.apache.org/repos/asf/cxf/blob/1d2f3999/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/atmosphere/AtmosphereWebSocketJettyDestination.java
----------------------------------------------------------------------
diff --git a/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/atmosphere/AtmosphereWebSocketJettyDestination.java
b/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/atmosphere/AtmosphereWebSocketJettyDestination.java
index 90341ef..32a591f 100644
--- a/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/atmosphere/AtmosphereWebSocketJettyDestination.java
+++ b/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/atmosphere/AtmosphereWebSocketJettyDestination.java
@@ -58,7 +58,9 @@ public class AtmosphereWebSocketJettyDestination extends JettyHTTPDestination
im
 
     public AtmosphereWebSocketJettyDestination(Bus bus, DestinationRegistry registry, EndpointInfo
ei,
                                      JettyHTTPServerEngineFactory serverEngineFactory) throws
IOException {
-        super(bus, registry, ei, serverEngineFactory);
+        super(bus, registry, ei, 
+              serverEngineFactory == null ? null : new URL(getNonWSAddress(ei)),
+              serverEngineFactory);
         framework = new AtmosphereFramework(false, true);
         framework.setUseNativeImplementation(false);
         framework.addInitParameter(ApplicationConfig.PROPERTY_NATIVE_COMETSUPPORT, "true");
@@ -77,9 +79,8 @@ public class AtmosphereWebSocketJettyDestination extends JettyHTTPDestination
im
                                HttpServletResponse resp) throws IOException {
         super.invoke(config, context, req, resp);
     }
-
-    @Override
-    protected String getAddress(EndpointInfo endpointInfo) {
+    
+    private static String getNonWSAddress(EndpointInfo endpointInfo) {
         String address = endpointInfo.getAddress();
         if (address.startsWith("ws")) {
             address = "http" + address.substring(2);
@@ -87,6 +88,11 @@ public class AtmosphereWebSocketJettyDestination extends JettyHTTPDestination
im
         return address;
     }
 
+    @Override
+    protected String getAddress(EndpointInfo endpointInfo) {
+        return getNonWSAddress(endpointInfo);
+    }
+
 
     @Override
     protected String getBasePath(String contextPath) throws IOException {

http://git-wip-us.apache.org/repos/asf/cxf/blob/1d2f3999/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/jetty9/Jetty9WebSocketDestination.java
----------------------------------------------------------------------
diff --git a/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/jetty9/Jetty9WebSocketDestination.java
b/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/jetty9/Jetty9WebSocketDestination.java
index ae8d011..106525c 100644
--- a/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/jetty9/Jetty9WebSocketDestination.java
+++ b/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/jetty9/Jetty9WebSocketDestination.java
@@ -23,6 +23,7 @@ import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.lang.reflect.Field;
+import java.net.URL;
 import java.nio.ByteBuffer;
 import java.security.Principal;
 import java.util.Enumeration;
@@ -78,7 +79,9 @@ public class Jetty9WebSocketDestination extends JettyHTTPDestination implements
 
     public Jetty9WebSocketDestination(Bus bus, DestinationRegistry registry, EndpointInfo
ei,
                                      JettyHTTPServerEngineFactory serverEngineFactory) throws
IOException {
-        super(bus, registry, ei, serverEngineFactory);
+        super(bus, registry, ei,
+              serverEngineFactory == null ? null : new URL(getNonWSAddress(ei)),
+              serverEngineFactory);
         try {
             webSocketFactory = (WebSocketServletFactory)ClassLoaderUtils
                 .loadClass("org.eclipse.jetty.websocket.server.WebSocketServerFactory",
@@ -115,14 +118,17 @@ public class Jetty9WebSocketDestination extends JettyHTTPDestination
implements
         }
         super.invoke(config, context, request, response);
     }
-    @Override
-    protected String getAddress(EndpointInfo endpointInfo) {
+    private static String getNonWSAddress(EndpointInfo endpointInfo) {
         String address = endpointInfo.getAddress();
         if (address.startsWith("ws")) {
             address = "http" + address.substring(2);
         }
         return address;
     }
+    @Override
+    protected String getAddress(EndpointInfo endpointInfo) {
+        return getNonWSAddress(endpointInfo);
+    }
 
     @Override
     protected JettyHTTPHandler createJettyHTTPHandler(JettyHTTPDestination jhd, boolean cmExact)
{

http://git-wip-us.apache.org/repos/asf/cxf/blob/1d2f3999/services/xkms/xkms-x509-handlers/pom.xml
----------------------------------------------------------------------
diff --git a/services/xkms/xkms-x509-handlers/pom.xml b/services/xkms/xkms-x509-handlers/pom.xml
index 90fbbff..6c87471 100644
--- a/services/xkms/xkms-x509-handlers/pom.xml
+++ b/services/xkms/xkms-x509-handlers/pom.xml
@@ -72,7 +72,7 @@
             <plugin>
                 <groupId>org.eclipse.tycho</groupId>
                 <artifactId>tycho-packaging-plugin</artifactId>
-                <version>0.22.0</version>
+                <version>0.26.0</version>
                 <executions>
                     <execution>
                         <id>timestamp</id>

http://git-wip-us.apache.org/repos/asf/cxf/blob/1d2f3999/testutils/pom.xml
----------------------------------------------------------------------
diff --git a/testutils/pom.xml b/testutils/pom.xml
index 1073e34..bd481ad 100644
--- a/testutils/pom.xml
+++ b/testutils/pom.xml
@@ -284,7 +284,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
-                <version>2.4</version>
                 <executions>
                     <execution>
                         <id>key-jar</id>


Mime
View raw message