[axis-axis2-java-core] branch dependabot/maven/com.squareup.moshi-moshi-1.12.0 created (now aa14e21)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/com.squareup.moshi-moshi-1.12.0 in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git. at aa14e21 Bump moshi from 1.11.0 to 1.12.0 No new revisions were added by this update.
[axis-axis2-java-core] branch dependabot/maven/com.squareup.moshi-moshi-adapters-1.12.0 created (now 66ec45a)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/com.squareup.moshi-moshi-adapters-1.12.0 in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git. at 66ec45a Bump moshi-adapters from 1.11.0 to 1.12.0 No new revisions were added by this update.
[axis-axis2-java-core] branch dependabot/maven/slf4j.version-1.7.31 created (now baf59ca)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/slf4j.version-1.7.31 in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git. at baf59ca Bump slf4j.version from 1.7.30 to 1.7.31 No new revisions were added by this update.
[axis-axis2-java-core] branch master updated: AP-6003 fix Moshi unit tests
This is an automated email from the ASF dual-hosted git repository.
robertlazarski pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git
The following commit(s) were added to refs/heads/master by this push:
new 012ffc1 AP-6003 fix Moshi unit tests
012ffc1 is described below
commit 012ffc1290511b3bc8d6175c6411d7e52a90e490
Author: Robert Lazarski
AuthorDate: Fri Jun 18 04:31:44 2021 -1000
AP-6003 fix Moshi unit tests
---
.../test/org/apache/axis2/json/moshi/rpc/JSONRPCIntegrationTest.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git
a/modules/json/test/org/apache/axis2/json/moshi/rpc/JSONRPCIntegrationTest.java
b/modules/json/test/org/apache/axis2/json/moshi/rpc/JSONRPCIntegrationTest.java
index 8d2a2f3..6ac0824 100644
---
a/modules/json/test/org/apache/axis2/json/moshi/rpc/JSONRPCIntegrationTest.java
+++
b/modules/json/test/org/apache/axis2/json/moshi/rpc/JSONRPCIntegrationTest.java
@@ -33,7 +33,9 @@ public class JSONRPCIntegrationTest {
public void testJsonRpcMessageReceiver() throws Exception {
String jsonRequest =
"{\"echoPerson\":[{\"arg0\":{\"name\":\"Simon\",\"age\":\"35\",\"gender\":\"male\"}}]}";
String echoPersonUrl = server.getEndpoint("JSONPOJOService") +
"echoPerson";
-String expectedResponse =
"{\"response\":{\"name\":\"Simon\",\"age\":\"35\",\"gender\":\"male\"}}";
+ // moshi uses alphabetical order, not field declaration order like gson
+// String expectedResponse =
"{\"response\":{\"name\":\"Simon\",\"age\":\"35\",\"gender\":\"male\"}}";
+String expectedResponse =
"{\"response\":{\"age\":\"35\",\"gender\":\"male\",\"name\":\"Simon\"}}";
String response = UtilTest.post(jsonRequest, echoPersonUrl);
Assert.assertNotNull(response);
Assert.assertEquals(expectedResponse , response);
[axis-axis2-java-core] branch master updated: AP-6003 fix Moshi unit tests
This is an automated email from the ASF dual-hosted git repository. robertlazarski pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git The following commit(s) were added to refs/heads/master by this push: new ad92e7d AP-6003 fix Moshi unit tests ad92e7d is described below commit ad92e7df2b05e423d8231bb6b0875b387aebbac9 Author: Robert Lazarski AuthorDate: Fri Jun 18 04:35:14 2021 -1000 AP-6003 fix Moshi unit tests --- .../JSONPOJOService.aar/META-INF/services.xml | 27 ++ 1 file changed, 27 insertions(+) diff --git a/modules/json/test-repository/moshi/services/JSONPOJOService.aar/META-INF/services.xml b/modules/json/test-repository/moshi/services/JSONPOJOService.aar/META-INF/services.xml new file mode 100644 index 000..03340f2 --- /dev/null +++ b/modules/json/test-repository/moshi/services/JSONPOJOService.aar/META-INF/services.xml @@ -0,0 +1,27 @@ + + + +POJO Service which expose to process under JSON requests + +http://www.w3.org/ns/wsdl/in-only"; class="org.apache.axis2.json.moshi.rpc.JsonInOnlyRPCMessageReceiver"/> +http://www.w3.org/ns/wsdl/in-out"; class="org.apache.axis2.json.moshi.rpc.JsonRpcMessageReceiver"/> + +org.apache.axis2.json.moshi.rpc.JSONPOJOService +
[axis-axis2-java-core] branch master updated: AP-6003 create org.apache.axis2.json.factory and use it for gson and moshi
This is an automated email from the ASF dual-hosted git repository.
robertlazarski pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git
The following commit(s) were added to refs/heads/master by this push:
new 31a0571 AP-6003 create org.apache.axis2.json.factory and use it for
gson and moshi
31a0571 is described below
commit 31a057183d33de7faab4b5ad168d24b9c4fb718b
Author: Robert Lazarski
AuthorDate: Fri Jun 18 05:01:45 2021 -1000
AP-6003 create org.apache.axis2.json.factory and use it for gson and moshi
---
.../axis2/json/{gson => }/factory/JSONType.java| 2 +-
.../json/{moshi => }/factory/JsonConstant.java | 2 +-
.../axis2/json/{gson => }/factory/JsonObject.java | 2 +-
.../axis2/json/{gson => }/factory/XmlNode.java | 2 +-
.../json/{gson => }/factory/XmlNodeGenerator.java | 2 +-
.../axis2/json/gson/GsonXMLStreamReader.java | 10 +-
.../axis2/json/gson/GsonXMLStreamWriter.java | 10 +-
.../apache/axis2/json/gson/JSONMessageHandler.java | 2 +-
.../org/apache/axis2/json/gson/JsonBuilder.java| 2 +-
.../org/apache/axis2/json/gson/JsonFormatter.java | 2 +-
.../axis2/json/gson/factory/JsonConstant.java | 42 -
.../gson/rpc/JsonInOnlyRPCMessageReceiver.java | 2 +-
.../json/gson/rpc/JsonRpcMessageReceiver.java | 2 +-
.../axis2/json/moshi/JSONMessageHandler.java | 2 +-
.../org/apache/axis2/json/moshi/JsonBuilder.java | 2 +-
.../org/apache/axis2/json/moshi/JsonFormatter.java | 2 +-
.../axis2/json/moshi/MoshiXMLStreamReader.java | 10 +-
.../axis2/json/moshi/MoshiXMLStreamWriter.java | 10 +-
.../apache/axis2/json/moshi/factory/JSONType.java | 27 ---
.../axis2/json/moshi/factory/JsonObject.java | 51 -
.../apache/axis2/json/moshi/factory/XmlNode.java | 71 ---
.../axis2/json/moshi/factory/XmlNodeGenerator.java | 206 -
.../moshi/rpc/JsonInOnlyRPCMessageReceiver.java| 2 +-
.../json/moshi/rpc/JsonRpcMessageReceiver.java | 2 +-
.../{gson => }/factory/XmlNodeGeneratorTest.java | 2 +-
.../axis2/json/gson/JSONMessageHandlerTest.java| 2 +-
.../apache/axis2/json/gson/JsonBuilderTest.java| 2 +-
.../apache/axis2/json/gson/JsonFormatterTest.java | 2 +-
.../axis2/json/moshi/JSONMessageHandlerTest.java | 2 +-
.../apache/axis2/json/moshi/JsonBuilderTest.java | 2 +-
.../apache/axis2/json/moshi/JsonFormatterTest.java | 2 +-
.../json/moshi/factory/XmlNodeGeneratorTest.java | 107 ---
32 files changed, 42 insertions(+), 546 deletions(-)
diff --git a/modules/json/src/org/apache/axis2/json/gson/factory/JSONType.java
b/modules/json/src/org/apache/axis2/json/factory/JSONType.java
similarity index 95%
rename from modules/json/src/org/apache/axis2/json/gson/factory/JSONType.java
rename to modules/json/src/org/apache/axis2/json/factory/JSONType.java
index b9ad859..8ecfe3e 100644
--- a/modules/json/src/org/apache/axis2/json/gson/factory/JSONType.java
+++ b/modules/json/src/org/apache/axis2/json/factory/JSONType.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.axis2.json.gson.factory;
+package org.apache.axis2.json.factory;
public enum JSONType {
ARRAY,
diff --git
a/modules/json/src/org/apache/axis2/json/moshi/factory/JsonConstant.java
b/modules/json/src/org/apache/axis2/json/factory/JsonConstant.java
similarity index 96%
rename from
modules/json/src/org/apache/axis2/json/moshi/factory/JsonConstant.java
rename to modules/json/src/org/apache/axis2/json/factory/JsonConstant.java
index 3f887b4..9effd08 100644
--- a/modules/json/src/org/apache/axis2/json/moshi/factory/JsonConstant.java
+++ b/modules/json/src/org/apache/axis2/json/factory/JsonConstant.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.axis2.json.moshi.factory;
+package org.apache.axis2.json.factory;
public class JsonConstant {
diff --git
a/modules/json/src/org/apache/axis2/json/gson/factory/JsonObject.java
b/modules/json/src/org/apache/axis2/json/factory/JsonObject.java
similarity index 97%
rename from modules/json/src/org/apache/axis2/json/gson/factory/JsonObject.java
rename to modules/json/src/org/apache/axis2/json/factory/JsonObject.java
index d3d1c05..d65ea52 100644
--- a/modules/json/src/org/apache/axis2/json/gson/factory/JsonObject.java
+++ b/modules/json/src/org/apache/axis2/json/factory/JsonObject.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.axis2.json.gson.factory;
+package org.apache.axis2.json.factory;
public class JsonObject {
diff --git a/modules/json/src/org/apache/axis2/json/gson/factory/XmlNode.java
b/modules/json/src/org/apache/axis2/json/factory/XmlNode.java
similarity index 97%
rename from modules/json/src/org/apache/axis2/json/gson/factory/XmlNode.java
rename to modules/json/src/org/apache/axis2/json/factory/XmlNode.java
index fc2d3c9..a2e6d1d 100644
--- a/modules/json/src/org/apache/axi
[axis-axis2-java-core] branch master updated (31a0571 -> d269308)
This is an automated email from the ASF dual-hosted git repository. robertlazarski pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git. from 31a0571 AP-6003 create org.apache.axis2.json.factory and use it for gson and moshi add 66ec45a Bump moshi-adapters from 1.11.0 to 1.12.0 add d269308 Merge pull request #177 from apache/dependabot/maven/com.squareup.moshi-moshi-adapters-1.12.0 No new revisions were added by this update. Summary of changes: modules/json/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[axis-axis2-java-core] branch master updated: bump another moshi dep to latest, that dependabot missed
This is an automated email from the ASF dual-hosted git repository. robertlazarski pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git The following commit(s) were added to refs/heads/master by this push: new 3b9bcdf bump another moshi dep to latest, that dependabot missed 3b9bcdf is described below commit 3b9bcdf9ad8183bea9018c79a462ccbaadd3a24c Author: Robert Lazarski AuthorDate: Fri Jun 18 11:43:50 2021 -0400 bump another moshi dep to latest, that dependabot missed --- modules/json/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/json/pom.xml b/modules/json/pom.xml index 367afd7..a662603 100644 --- a/modules/json/pom.xml +++ b/modules/json/pom.xml @@ -70,7 +70,7 @@ com.squareup.moshi moshi -1.11.0 +1.12.0 com.squareup.moshi
[axis-axis2-java-core] 01/01: Merge pull request #176 from apache/dependabot/maven/com.squareup.moshi-moshi-1.12.0
This is an automated email from the ASF dual-hosted git repository. robertlazarski pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git commit 07e77802c51390649d3fdc4a8b17acc3fd28e12f Merge: 3b9bcdf aa14e21 Author: robertlazarski <58150512+robertlazar...@users.noreply.github.com> AuthorDate: Fri Jun 18 05:46:26 2021 -1000 Merge pull request #176 from apache/dependabot/maven/com.squareup.moshi-moshi-1.12.0 Bump moshi from 1.11.0 to 1.12.0
[axis-axis2-java-core] branch master updated (3b9bcdf -> 07e7780)
This is an automated email from the ASF dual-hosted git repository. robertlazarski pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git. from 3b9bcdf bump another moshi dep to latest, that dependabot missed add aa14e21 Bump moshi from 1.11.0 to 1.12.0 new 07e7780 Merge pull request #176 from apache/dependabot/maven/com.squareup.moshi-moshi-1.12.0 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes:
[axis-axis2-java-core] branch master updated (07e7780 -> d292b02)
This is an automated email from the ASF dual-hosted git repository. robertlazarski pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git. from 07e7780 Merge pull request #176 from apache/dependabot/maven/com.squareup.moshi-moshi-1.12.0 add aa4f87a Bump jetty.version from 9.4.41.v20210516 to 9.4.42.v20210604 add d292b02 Merge pull request #167 from apache/dependabot/maven/jetty.version-9.4.42.v20210604 No new revisions were added by this update. Summary of changes: pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
