cxf git commit: Fixing 3.0.x build failure

2015-10-12 Thread sergeyb 
Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes 27feb0916 -> 9f8ed96ae


Fixing 3.0.x build failure


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

Branch: refs/heads/3.0.x-fixes
Commit: 9f8ed96ae3a393434b2854a0fb0b8396b4c9fd41
Parents: 27feb09
Author: Sergey Beryozkin 
Authored: Mon Oct 12 15:17:56 2015 +0100
Committer: Sergey Beryozkin 
Committed: Mon Oct 12 15:17:56 2015 +0100

--
 .../java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java | 6 +++---
 .../java/org/apache/cxf/jaxrs/swagger/Swagger2Serializers.java | 5 +++--
 2 files changed, 6 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/9f8ed96a/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java
--
diff --git 
a/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java
 
b/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java
index f335eec..0824fa8 100644
--- 
a/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java
+++ 
b/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java
@@ -72,7 +72,7 @@ public class Swagger2Feature extends AbstractSwaggerFeature {
 protected void addSwaggerResource(Server server) {
 List cris = Collections.emptyList();
 if (!runAsFilter) {
-List serviceBeans = new ArrayList<>();
+List serviceBeans = new ArrayList();
 ApiListingResource apiListingResource = new ApiListingResource();
 serviceBeans.add(apiListingResource);
 JAXRSServiceFactoryBean sfb =
@@ -85,7 +85,7 @@ public class Swagger2Feature extends AbstractSwaggerFeature {
 }
 }
 }
-List providers = new ArrayList<>();
+List providers = new ArrayList();
 if (runAsFilter) {
 providers.add(new SwaggerContainerRequestFilter());
 }
@@ -220,7 +220,7 @@ public class Swagger2Feature extends AbstractSwaggerFeature 
{
 DefaultReaderConfig rc = new DefaultReaderConfig();
 rc.setScanAllResources(true);
 if (ignoreRoutesParam != null) {
-Set routes = new LinkedHashSet<>();
+Set routes = new LinkedHashSet();
 for (String route : StringUtils.split(ignoreRoutesParam, ",")) 
{
 routes.add(route.trim());
 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/9f8ed96a/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Serializers.java
--
diff --git 
a/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Serializers.java
 
b/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Serializers.java
index 83ef3dc..c67ce85 100644
--- 
a/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Serializers.java
+++ 
b/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Serializers.java
@@ -88,8 +88,9 @@ public class Swagger2Serializers extends SwaggerSerializers {
 }
 
 if (replaceTags || javadocProvider != null) {
-Map operations = new HashMap<>();
-Map, OperationResourceInfo> methods = new 
HashMap<>();
+Map operations = new HashMap();
+Map, OperationResourceInfo> methods = 
+new HashMap, OperationResourceInfo>();
 for (ClassResourceInfo cri : cris) {
 for (OperationResourceInfo ori : 
cri.getMethodDispatcher().getOperationResourceInfos()) {
 StringBuilder fullPath = new StringBuilder().

cxf git commit: Fixing 3.0.x build failure

2017-02-17 Thread sergeyb 
Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes 5356ca1d7 -> 21f8d00c0


Fixing 3.0.x build failure


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

Branch: refs/heads/3.0.x-fixes
Commit: 21f8d00c0c983aa12cb7356e555283130a17fc74
Parents: 5356ca1
Author: Sergey Beryozkin 
Authored: Fri Feb 17 15:37:28 2017 +
Committer: Sergey Beryozkin 
Committed: Fri Feb 17 15:37:28 2017 +

--
 .../java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java   | 7 ---
 1 file changed, 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/21f8d00c/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
--
diff --git 
a/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
 
b/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
index dc4a7c9..ac1c97e 100644
--- 
a/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
+++ 
b/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
@@ -2219,17 +2219,10 @@ public class WadlGenerator implements 
ContainerRequestFilter {
 this.convertResourcesToDOM = convertResourcesToDOM;
 }
 
-<<< HEAD
-===
-public void setIncrementNamespacePrefix(boolean incrementNamespacePrefix) {
-this.incrementNamespacePrefix = incrementNamespacePrefix;
-}
 public void setJaxbContextProperties(Map 
jaxbContextProperties) {
 this.jaxbContextProperties = jaxbContextProperties;
 }
 
-
->>> 99f6606... Adding WadlGenerator jaxbContextProperties, patch from 
Vjacheslav Borisov applied with minor updates, This closes #238
 private static class SchemaConverter extends DelegatingXMLStreamWriter {
 private static final String SCHEMA_LOCATION = "schemaLocation";
 private final Map locsMap;