diff --git a/build.gradle b/build.gradle index 31d3afb..0c83070 100644 --- a/build.gradle +++ b/build.gradle @@ -22,7 +22,7 @@ apply plugin: 'org.owasp.dependencycheck' apply plugin: 'com.github.ben-manes.versions' project.ext { - PNC_VERSION = '7.2.2' + PNC_VERSION = '7.2.4' MXBUILD_VERSION = '9.18.0.53394' MODULE_NAME = 'PushNotifications' } @@ -74,19 +74,19 @@ dependencies { implementation('io.netty:netty-codec-http2') { version { - strictly '4.1.101.Final' + strictly '4.1.109.Final' } } implementation('io.netty:netty-handler-proxy') { version { - strictly '4.1.101.Final' + strictly '4.1.109.Final' } } implementation('io.netty:netty-resolver-dns') { version { - strictly '4.1.101.Final' + strictly '4.1.109.Final' } } diff --git a/package-lock.json b/package-lock.json index 6813865..6a10ef4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "MxPushNotifications", - "version": "7.2.2", + "version": "7.2.4", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 18c0fa8..5a47fe0 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "MxPushNotifications", - "version": "7.2.2", + "version": "7.2.4", "description": "Phonegap widget for notifications", "license": "Apache 2.0", "author": "Mendix Technology B.V.", diff --git a/test/PushNotfications.mpr b/test/PushNotfications.mpr index b88bee5..d6dd0ab 100755 Binary files a/test/PushNotfications.mpr and b/test/PushNotfications.mpr differ diff --git a/test/userlib/PushNotifications.migration b/test/userlib/PushNotifications.migration index af5d5d6..12dc3b0 100644 --- a/test/userlib/PushNotifications.migration +++ b/test/userlib/PushNotifications.migration @@ -3,9 +3,9 @@ dependency commons-codec:commons-codec:1.15 dependency com.google.auth:google-auth-library-oauth2-http:1.7.0 dependency com.google.guava:guava:32.0.1-android dependency com.turo:pushy:0.13.10 -dependency io.netty:netty-codec-http2:4.1.101.Final -dependency io.netty:netty-handler-proxy:4.1.101.Final -dependency io.netty:netty-resolver-dns:4.1.101.Final +dependency io.netty:netty-codec-http2:4.1.109.Final +dependency io.netty:netty-handler-proxy:4.1.109.Final +dependency io.netty:netty-resolver-dns:4.1.109.Final dependency com.google.code.gson:gson:2.9.0 delete auto-value-annotations-1.9.jar delete auto-value-annotations-1.9.jar.PushNotifications.RequiredLib @@ -45,32 +45,32 @@ delete jsr305-3.0.2.jar delete jsr305-3.0.2.jar.PushNotifications.RequiredLib delete listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar delete listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar.PushNotifications.RequiredLib -delete netty-buffer-4.1.101.Final.jar -delete netty-buffer-4.1.101.Final.jar.PushNotifications.RequiredLib -delete netty-codec-4.1.101.Final.jar -delete netty-codec-4.1.101.Final.jar.PushNotifications.RequiredLib -delete netty-codec-dns-4.1.101.Final.jar -delete netty-codec-dns-4.1.101.Final.jar.PushNotifications.RequiredLib -delete netty-codec-http-4.1.101.Final.jar -delete netty-codec-http-4.1.101.Final.jar.PushNotifications.RequiredLib -delete netty-codec-http2-4.1.101.Final.jar -delete netty-codec-http2-4.1.101.Final.jar.PushNotifications.RequiredLib -delete netty-codec-socks-4.1.101.Final.jar -delete netty-codec-socks-4.1.101.Final.jar.PushNotifications.RequiredLib -delete netty-common-4.1.101.Final.jar -delete netty-common-4.1.101.Final.jar.PushNotifications.RequiredLib -delete netty-handler-4.1.101.Final.jar -delete netty-handler-4.1.101.Final.jar.PushNotifications.RequiredLib -delete netty-handler-proxy-4.1.101.Final.jar -delete netty-handler-proxy-4.1.101.Final.jar.PushNotifications.RequiredLib -delete netty-resolver-4.1.101.Final.jar -delete netty-resolver-4.1.101.Final.jar.PushNotifications.RequiredLib -delete netty-resolver-dns-4.1.101.Final.jar -delete netty-resolver-dns-4.1.101.Final.jar.PushNotifications.RequiredLib -delete netty-transport-4.1.101.Final.jar -delete netty-transport-4.1.101.Final.jar.PushNotifications.RequiredLib -delete netty-transport-native-unix-common-4.1.101.Final.jar -delete netty-transport-native-unix-common-4.1.101.Final.jar.PushNotifications.RequiredLib +delete netty-buffer-4.1.109.Final.jar +delete netty-buffer-4.1.109.Final.jar.PushNotifications.RequiredLib +delete netty-codec-4.1.109.Final.jar +delete netty-codec-4.1.109.Final.jar.PushNotifications.RequiredLib +delete netty-codec-dns-4.1.109.Final.jar +delete netty-codec-dns-4.1.109.Final.jar.PushNotifications.RequiredLib +delete netty-codec-http-4.1.109.Final.jar +delete netty-codec-http-4.1.109.Final.jar.PushNotifications.RequiredLib +delete netty-codec-http2-4.1.109.Final.jar +delete netty-codec-http2-4.1.109.Final.jar.PushNotifications.RequiredLib +delete netty-codec-socks-4.1.109.Final.jar +delete netty-codec-socks-4.1.109.Final.jar.PushNotifications.RequiredLib +delete netty-common-4.1.109.Final.jar +delete netty-common-4.1.109.Final.jar.PushNotifications.RequiredLib +delete netty-handler-4.1.109.Final.jar +delete netty-handler-4.1.109.Final.jar.PushNotifications.RequiredLib +delete netty-handler-proxy-4.1.109.Final.jar +delete netty-handler-proxy-4.1.109.Final.jar.PushNotifications.RequiredLib +delete netty-resolver-4.1.109.Final.jar +delete netty-resolver-4.1.109.Final.jar.PushNotifications.RequiredLib +delete netty-resolver-dns-4.1.109.Final.jar +delete netty-resolver-dns-4.1.109.Final.jar.PushNotifications.RequiredLib +delete netty-transport-4.1.109.Final.jar +delete netty-transport-4.1.109.Final.jar.PushNotifications.RequiredLib +delete netty-transport-native-unix-common-4.1.109.Final.jar +delete netty-transport-native-unix-common-4.1.109.Final.jar.PushNotifications.RequiredLib delete opencensus-api-0.31.0.jar delete opencensus-api-0.31.0.jar.PushNotifications.RequiredLib delete opencensus-contrib-http-util-0.31.0.jar diff --git a/test/userlib/netty-buffer-4.1.101.Final.jar b/test/userlib/netty-buffer-4.1.109.Final.jar similarity index 66% rename from test/userlib/netty-buffer-4.1.101.Final.jar rename to test/userlib/netty-buffer-4.1.109.Final.jar index da5071f..3ebb59d 100644 Binary files a/test/userlib/netty-buffer-4.1.101.Final.jar and b/test/userlib/netty-buffer-4.1.109.Final.jar differ diff --git a/test/userlib/netty-buffer-4.1.101.Final.jar.PushNotifications.RequiredLib b/test/userlib/netty-buffer-4.1.109.Final.jar.PushNotifications.RequiredLib similarity index 100% rename from test/userlib/netty-buffer-4.1.101.Final.jar.PushNotifications.RequiredLib rename to test/userlib/netty-buffer-4.1.109.Final.jar.PushNotifications.RequiredLib diff --git a/test/userlib/netty-codec-4.1.101.Final.jar b/test/userlib/netty-codec-4.1.109.Final.jar similarity index 79% rename from test/userlib/netty-codec-4.1.101.Final.jar rename to test/userlib/netty-codec-4.1.109.Final.jar index 42276cd..fd4e713 100644 Binary files a/test/userlib/netty-codec-4.1.101.Final.jar and b/test/userlib/netty-codec-4.1.109.Final.jar differ diff --git a/test/userlib/netty-codec-4.1.101.Final.jar.PushNotifications.RequiredLib b/test/userlib/netty-codec-4.1.109.Final.jar.PushNotifications.RequiredLib similarity index 100% rename from test/userlib/netty-codec-4.1.101.Final.jar.PushNotifications.RequiredLib rename to test/userlib/netty-codec-4.1.109.Final.jar.PushNotifications.RequiredLib diff --git a/test/userlib/netty-codec-dns-4.1.101.Final.jar b/test/userlib/netty-codec-dns-4.1.109.Final.jar similarity index 74% rename from test/userlib/netty-codec-dns-4.1.101.Final.jar rename to test/userlib/netty-codec-dns-4.1.109.Final.jar index 86b15ff..b5e97bb 100644 Binary files a/test/userlib/netty-codec-dns-4.1.101.Final.jar and b/test/userlib/netty-codec-dns-4.1.109.Final.jar differ diff --git a/test/userlib/netty-codec-dns-4.1.101.Final.jar.PushNotifications.RequiredLib b/test/userlib/netty-codec-dns-4.1.109.Final.jar.PushNotifications.RequiredLib similarity index 100% rename from test/userlib/netty-codec-dns-4.1.101.Final.jar.PushNotifications.RequiredLib rename to test/userlib/netty-codec-dns-4.1.109.Final.jar.PushNotifications.RequiredLib diff --git a/test/userlib/netty-codec-http-4.1.101.Final.jar b/test/userlib/netty-codec-http-4.1.109.Final.jar similarity index 66% rename from test/userlib/netty-codec-http-4.1.101.Final.jar rename to test/userlib/netty-codec-http-4.1.109.Final.jar index 8bd0577..df0e78d 100644 Binary files a/test/userlib/netty-codec-http-4.1.101.Final.jar and b/test/userlib/netty-codec-http-4.1.109.Final.jar differ diff --git a/test/userlib/netty-codec-http-4.1.101.Final.jar.PushNotifications.RequiredLib b/test/userlib/netty-codec-http-4.1.109.Final.jar.PushNotifications.RequiredLib similarity index 100% rename from test/userlib/netty-codec-http-4.1.101.Final.jar.PushNotifications.RequiredLib rename to test/userlib/netty-codec-http-4.1.109.Final.jar.PushNotifications.RequiredLib diff --git a/test/userlib/netty-codec-http2-4.1.101.Final.jar b/test/userlib/netty-codec-http2-4.1.109.Final.jar similarity index 64% rename from test/userlib/netty-codec-http2-4.1.101.Final.jar rename to test/userlib/netty-codec-http2-4.1.109.Final.jar index c79ad70..cc9ae9b 100644 Binary files a/test/userlib/netty-codec-http2-4.1.101.Final.jar and b/test/userlib/netty-codec-http2-4.1.109.Final.jar differ diff --git a/test/userlib/netty-codec-http2-4.1.101.Final.jar.PushNotifications.RequiredLib b/test/userlib/netty-codec-http2-4.1.109.Final.jar.PushNotifications.RequiredLib similarity index 100% rename from test/userlib/netty-codec-http2-4.1.101.Final.jar.PushNotifications.RequiredLib rename to test/userlib/netty-codec-http2-4.1.109.Final.jar.PushNotifications.RequiredLib diff --git a/test/userlib/netty-codec-socks-4.1.101.Final.jar b/test/userlib/netty-codec-socks-4.1.109.Final.jar similarity index 62% rename from test/userlib/netty-codec-socks-4.1.101.Final.jar rename to test/userlib/netty-codec-socks-4.1.109.Final.jar index d4b3415..5371b83 100644 Binary files a/test/userlib/netty-codec-socks-4.1.101.Final.jar and b/test/userlib/netty-codec-socks-4.1.109.Final.jar differ diff --git a/test/userlib/netty-codec-socks-4.1.101.Final.jar.PushNotifications.RequiredLib b/test/userlib/netty-codec-socks-4.1.109.Final.jar.PushNotifications.RequiredLib similarity index 100% rename from test/userlib/netty-codec-socks-4.1.101.Final.jar.PushNotifications.RequiredLib rename to test/userlib/netty-codec-socks-4.1.109.Final.jar.PushNotifications.RequiredLib diff --git a/test/userlib/netty-common-4.1.101.Final.jar b/test/userlib/netty-common-4.1.109.Final.jar similarity index 66% rename from test/userlib/netty-common-4.1.101.Final.jar rename to test/userlib/netty-common-4.1.109.Final.jar index c689b20..4076eaf 100644 Binary files a/test/userlib/netty-common-4.1.101.Final.jar and b/test/userlib/netty-common-4.1.109.Final.jar differ diff --git a/test/userlib/netty-common-4.1.101.Final.jar.PushNotifications.RequiredLib b/test/userlib/netty-common-4.1.109.Final.jar.PushNotifications.RequiredLib similarity index 100% rename from test/userlib/netty-common-4.1.101.Final.jar.PushNotifications.RequiredLib rename to test/userlib/netty-common-4.1.109.Final.jar.PushNotifications.RequiredLib diff --git a/test/userlib/netty-handler-4.1.101.Final.jar b/test/userlib/netty-handler-4.1.109.Final.jar similarity index 67% rename from test/userlib/netty-handler-4.1.101.Final.jar rename to test/userlib/netty-handler-4.1.109.Final.jar index cab9fb4..4108e47 100644 Binary files a/test/userlib/netty-handler-4.1.101.Final.jar and b/test/userlib/netty-handler-4.1.109.Final.jar differ diff --git a/test/userlib/netty-handler-4.1.101.Final.jar.PushNotifications.RequiredLib b/test/userlib/netty-handler-4.1.109.Final.jar.PushNotifications.RequiredLib similarity index 100% rename from test/userlib/netty-handler-4.1.101.Final.jar.PushNotifications.RequiredLib rename to test/userlib/netty-handler-4.1.109.Final.jar.PushNotifications.RequiredLib diff --git a/test/userlib/netty-handler-proxy-4.1.101.Final.jar b/test/userlib/netty-handler-proxy-4.1.109.Final.jar similarity index 55% rename from test/userlib/netty-handler-proxy-4.1.101.Final.jar rename to test/userlib/netty-handler-proxy-4.1.109.Final.jar index efdf251..7bd2693 100644 Binary files a/test/userlib/netty-handler-proxy-4.1.101.Final.jar and b/test/userlib/netty-handler-proxy-4.1.109.Final.jar differ diff --git a/test/userlib/netty-handler-proxy-4.1.101.Final.jar.PushNotifications.RequiredLib b/test/userlib/netty-handler-proxy-4.1.109.Final.jar.PushNotifications.RequiredLib similarity index 100% rename from test/userlib/netty-handler-proxy-4.1.101.Final.jar.PushNotifications.RequiredLib rename to test/userlib/netty-handler-proxy-4.1.109.Final.jar.PushNotifications.RequiredLib diff --git a/test/userlib/netty-resolver-4.1.101.Final.jar b/test/userlib/netty-resolver-4.1.109.Final.jar similarity index 79% rename from test/userlib/netty-resolver-4.1.101.Final.jar rename to test/userlib/netty-resolver-4.1.109.Final.jar index a2c3446..270cc12 100644 Binary files a/test/userlib/netty-resolver-4.1.101.Final.jar and b/test/userlib/netty-resolver-4.1.109.Final.jar differ diff --git a/test/userlib/netty-resolver-4.1.101.Final.jar.PushNotifications.RequiredLib b/test/userlib/netty-resolver-4.1.109.Final.jar.PushNotifications.RequiredLib similarity index 100% rename from test/userlib/netty-resolver-4.1.101.Final.jar.PushNotifications.RequiredLib rename to test/userlib/netty-resolver-4.1.109.Final.jar.PushNotifications.RequiredLib diff --git a/test/userlib/netty-resolver-dns-4.1.101.Final.jar b/test/userlib/netty-resolver-dns-4.1.101.Final.jar deleted file mode 100644 index f77a495..0000000 Binary files a/test/userlib/netty-resolver-dns-4.1.101.Final.jar and /dev/null differ diff --git a/test/userlib/netty-resolver-dns-4.1.109.Final.jar b/test/userlib/netty-resolver-dns-4.1.109.Final.jar new file mode 100644 index 0000000..b0ecdd0 Binary files /dev/null and b/test/userlib/netty-resolver-dns-4.1.109.Final.jar differ diff --git a/test/userlib/netty-resolver-dns-4.1.101.Final.jar.PushNotifications.RequiredLib b/test/userlib/netty-resolver-dns-4.1.109.Final.jar.PushNotifications.RequiredLib similarity index 100% rename from test/userlib/netty-resolver-dns-4.1.101.Final.jar.PushNotifications.RequiredLib rename to test/userlib/netty-resolver-dns-4.1.109.Final.jar.PushNotifications.RequiredLib diff --git a/test/userlib/netty-transport-4.1.101.Final.jar b/test/userlib/netty-transport-4.1.109.Final.jar similarity index 74% rename from test/userlib/netty-transport-4.1.101.Final.jar rename to test/userlib/netty-transport-4.1.109.Final.jar index e1ed8b1..9d246a0 100644 Binary files a/test/userlib/netty-transport-4.1.101.Final.jar and b/test/userlib/netty-transport-4.1.109.Final.jar differ diff --git a/test/userlib/netty-transport-4.1.101.Final.jar.PushNotifications.RequiredLib b/test/userlib/netty-transport-4.1.109.Final.jar.PushNotifications.RequiredLib similarity index 100% rename from test/userlib/netty-transport-4.1.101.Final.jar.PushNotifications.RequiredLib rename to test/userlib/netty-transport-4.1.109.Final.jar.PushNotifications.RequiredLib diff --git a/test/userlib/netty-transport-native-unix-common-4.1.101.Final.jar b/test/userlib/netty-transport-native-unix-common-4.1.109.Final.jar similarity index 75% rename from test/userlib/netty-transport-native-unix-common-4.1.101.Final.jar rename to test/userlib/netty-transport-native-unix-common-4.1.109.Final.jar index 8708498..550e02d 100644 Binary files a/test/userlib/netty-transport-native-unix-common-4.1.101.Final.jar and b/test/userlib/netty-transport-native-unix-common-4.1.109.Final.jar differ diff --git a/test/userlib/netty-transport-native-unix-common-4.1.101.Final.jar.PushNotifications.RequiredLib b/test/userlib/netty-transport-native-unix-common-4.1.109.Final.jar.PushNotifications.RequiredLib similarity index 100% rename from test/userlib/netty-transport-native-unix-common-4.1.101.Final.jar.PushNotifications.RequiredLib rename to test/userlib/netty-transport-native-unix-common-4.1.109.Final.jar.PushNotifications.RequiredLib