You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2016/01/29 17:24:24 UTC
[1/6] camel git commit: Upgrade netty4
Repository: camel
Updated Branches:
refs/heads/camel-2.16.x 2a71f4257 -> 48bc32e12
refs/heads/master 1eb6b41c4 -> c90a724eb
Upgrade netty4
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c90a724e
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c90a724e
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c90a724e
Branch: refs/heads/master
Commit: c90a724eb4c38aaddcbaea94e59877f0be2b368f
Parents: c2cd2dd
Author: Claus Ibsen <da...@apache.org>
Authored: Fri Jan 29 17:22:16 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Jan 29 17:22:36 2016 +0100
----------------------------------------------------------------------
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/c90a724e/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 563aa31..0fd43ed 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -404,7 +404,7 @@
<mybatis-version>3.3.0</mybatis-version>
<neethi-bundle-version>3.0.1</neethi-bundle-version>
<netty3-version>3.10.5.Final</netty3-version>
- <netty-version>4.0.33.Final</netty-version>
+ <netty-version>4.0.34.Final</netty-version>
<noggit-bundle-version>0.5_1</noggit-bundle-version>
<!-- should be in-sync with deltaspike -->
<openwebbeans1-version>1.2.7</openwebbeans1-version>
[5/6] camel git commit: do not populate enum when no allowable values
are set
Posted by da...@apache.org.
do not populate enum when no allowable values are set
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/11ff9540
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/11ff9540
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/11ff9540
Branch: refs/heads/camel-2.16.x
Commit: 11ff9540f577c04db3884a12ac93ee8d099d7900
Parents: 58a3b00
Author: Seb Calbaza <se...@hgdata.com>
Authored: Fri Jan 29 18:01:03 2016 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Jan 29 17:24:10 2016 +0100
----------------------------------------------------------------------
.../java/org/apache/camel/swagger/RestSwaggerReaderModelTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/11ff9540/components/camel-swagger-java/src/test/java/org/apache/camel/swagger/RestSwaggerReaderModelTest.java
----------------------------------------------------------------------
diff --git a/components/camel-swagger-java/src/test/java/org/apache/camel/swagger/RestSwaggerReaderModelTest.java b/components/camel-swagger-java/src/test/java/org/apache/camel/swagger/RestSwaggerReaderModelTest.java
index 72f8409..ed6ee6d 100644
--- a/components/camel-swagger-java/src/test/java/org/apache/camel/swagger/RestSwaggerReaderModelTest.java
+++ b/components/camel-swagger-java/src/test/java/org/apache/camel/swagger/RestSwaggerReaderModelTest.java
@@ -89,7 +89,7 @@ public class RestSwaggerReaderModelTest extends CamelTestSupport {
assertTrue(json.contains("\"$ref\" : \"#/definitions/User\""));
assertTrue(json.contains("\"x-className\""));
assertTrue(json.contains("\"format\" : \"org.apache.camel.swagger.User\""));
-
+ assertFalse(json.contains("\"enum\""));
context.stop();
}
[6/6] camel git commit: Upgrade netty4
Posted by da...@apache.org.
Upgrade netty4
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/48bc32e1
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/48bc32e1
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/48bc32e1
Branch: refs/heads/camel-2.16.x
Commit: 48bc32e1291fcef5dafbc32474449eba81913c00
Parents: 11ff954
Author: Claus Ibsen <da...@apache.org>
Authored: Fri Jan 29 17:22:16 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Jan 29 17:24:16 2016 +0100
----------------------------------------------------------------------
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/48bc32e1/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 856b13b..e8502a4 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -383,7 +383,7 @@
<mybatis-version>3.3.0</mybatis-version>
<neethi-bundle-version>3.0.1</neethi-bundle-version>
<netty3-version>3.10.5.Final</netty3-version>
- <netty-version>4.0.33.Final</netty-version>
+ <netty-version>4.0.34.Final</netty-version>
<noggit-bundle-version>0.5_1</noggit-bundle-version>
<!-- should be in-sync with deltaspike -->
<openwebbeans-version>1.2.0</openwebbeans-version>
[3/6] camel git commit: do not populate enum when no allowable values
are set
Posted by da...@apache.org.
do not populate enum when no allowable values are set
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c2cd2dd0
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c2cd2dd0
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c2cd2dd0
Branch: refs/heads/master
Commit: c2cd2dd0c7e200f65501d2ccd704eb4d167cd021
Parents: 5743e25
Author: Seb Calbaza <se...@hgdata.com>
Authored: Fri Jan 29 18:01:03 2016 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Jan 29 17:22:36 2016 +0100
----------------------------------------------------------------------
.../java/org/apache/camel/swagger/RestSwaggerReaderModelTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/c2cd2dd0/components/camel-swagger-java/src/test/java/org/apache/camel/swagger/RestSwaggerReaderModelTest.java
----------------------------------------------------------------------
diff --git a/components/camel-swagger-java/src/test/java/org/apache/camel/swagger/RestSwaggerReaderModelTest.java b/components/camel-swagger-java/src/test/java/org/apache/camel/swagger/RestSwaggerReaderModelTest.java
index c5e811c..2ad727a 100644
--- a/components/camel-swagger-java/src/test/java/org/apache/camel/swagger/RestSwaggerReaderModelTest.java
+++ b/components/camel-swagger-java/src/test/java/org/apache/camel/swagger/RestSwaggerReaderModelTest.java
@@ -88,7 +88,7 @@ public class RestSwaggerReaderModelTest extends CamelTestSupport {
assertTrue(json.contains("\"$ref\" : \"#/definitions/User\""));
assertTrue(json.contains("\"x-className\""));
assertTrue(json.contains("\"format\" : \"org.apache.camel.swagger.User\""));
-
+ assertFalse(json.contains("\"enum\""));
context.stop();
}
[4/6] camel git commit: do not set is empty
Posted by da...@apache.org.
do not set is empty
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/58a3b003
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/58a3b003
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/58a3b003
Branch: refs/heads/camel-2.16.x
Commit: 58a3b00338e4b82a1a121691ccae6a1f3b253bf9
Parents: 2a71f42
Author: Seb Calbaza <se...@hgdata.com>
Authored: Fri Jan 29 16:51:38 2016 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Jan 29 17:24:05 2016 +0100
----------------------------------------------------------------------
.../src/main/java/org/apache/camel/swagger/RestSwaggerReader.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/58a3b003/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerReader.java
----------------------------------------------------------------------
diff --git a/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerReader.java b/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerReader.java
index ba1ba67..f2a69cb 100644
--- a/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerReader.java
+++ b/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerReader.java
@@ -219,7 +219,7 @@ public class RestSwaggerReader {
if (param.getDataType() != null) {
sp.setType(param.getDataType());
}
- if (param.getAllowableValues() != null) {
+ if (param.getAllowableValues() != null && !param.getAllowableValues().isEmpty()) {
sp.setEnum(param.getAllowableValues());
}
}
[2/6] camel git commit: do not set is empty
Posted by da...@apache.org.
do not set is empty
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/5743e250
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/5743e250
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/5743e250
Branch: refs/heads/master
Commit: 5743e250b40b7e3993bad279c6f7b4e8de95394a
Parents: 1eb6b41
Author: Seb Calbaza <se...@hgdata.com>
Authored: Fri Jan 29 16:51:38 2016 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Jan 29 17:22:36 2016 +0100
----------------------------------------------------------------------
.../src/main/java/org/apache/camel/swagger/RestSwaggerReader.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/5743e250/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerReader.java
----------------------------------------------------------------------
diff --git a/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerReader.java b/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerReader.java
index ba1ba67..f2a69cb 100644
--- a/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerReader.java
+++ b/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerReader.java
@@ -219,7 +219,7 @@ public class RestSwaggerReader {
if (param.getDataType() != null) {
sp.setType(param.getDataType());
}
- if (param.getAllowableValues() != null) {
+ if (param.getAllowableValues() != null && !param.getAllowableValues().isEmpty()) {
sp.setEnum(param.getAllowableValues());
}
}