diff --git a/build.gradle b/build.gradle index ddffe8d..31d3afb 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.1' + PNC_VERSION = '7.2.2' MXBUILD_VERSION = '9.18.0.53394' MODULE_NAME = 'PushNotifications' } @@ -51,7 +51,7 @@ repositories { } dependencies { - implementation group: 'org.slf4j', name: 'slf4j-api', version: '1.7.36' + implementation group: 'org.slf4j', name: 'slf4j-api', version: '2.0.7' implementation group: 'commons-codec', name: 'commons-codec', version: '1.15' implementation('com.google.auth:google-auth-library-oauth2-http:1.7.0') { @@ -74,19 +74,19 @@ dependencies { implementation('io.netty:netty-codec-http2') { version { - strictly '4.1.94.Final' + strictly '4.1.101.Final' } } implementation('io.netty:netty-handler-proxy') { version { - strictly '4.1.94.Final' + strictly '4.1.101.Final' } } implementation('io.netty:netty-resolver-dns') { version { - strictly '4.1.94.Final' + strictly '4.1.101.Final' } } diff --git a/package-lock.json b/package-lock.json index 80a64ed..6813865 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "MxPushNotifications", - "version": "7.2.1", + "version": "7.2.2", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index f626af6..18c0fa8 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "MxPushNotifications", - "version": "7.2.1", + "version": "7.2.2", "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 a19fbb1..345275f 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 b7ff43a..af5d5d6 100644 --- a/test/userlib/PushNotifications.migration +++ b/test/userlib/PushNotifications.migration @@ -1,11 +1,11 @@ -dependency org.slf4j:slf4j-api:1.7.36 +dependency org.slf4j:slf4j-api:2.0.7 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.94.Final -dependency io.netty:netty-handler-proxy:4.1.94.Final -dependency io.netty:netty-resolver-dns:4.1.94.Final +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 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,37 +45,37 @@ 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.94.Final.jar -delete netty-buffer-4.1.94.Final.jar.PushNotifications.RequiredLib -delete netty-codec-4.1.94.Final.jar -delete netty-codec-4.1.94.Final.jar.PushNotifications.RequiredLib -delete netty-codec-dns-4.1.94.Final.jar -delete netty-codec-dns-4.1.94.Final.jar.PushNotifications.RequiredLib -delete netty-codec-http-4.1.94.Final.jar -delete netty-codec-http-4.1.94.Final.jar.PushNotifications.RequiredLib -delete netty-codec-http2-4.1.94.Final.jar -delete netty-codec-http2-4.1.94.Final.jar.PushNotifications.RequiredLib -delete netty-codec-socks-4.1.94.Final.jar -delete netty-codec-socks-4.1.94.Final.jar.PushNotifications.RequiredLib -delete netty-common-4.1.94.Final.jar -delete netty-common-4.1.94.Final.jar.PushNotifications.RequiredLib -delete netty-handler-4.1.94.Final.jar -delete netty-handler-4.1.94.Final.jar.PushNotifications.RequiredLib -delete netty-handler-proxy-4.1.94.Final.jar -delete netty-handler-proxy-4.1.94.Final.jar.PushNotifications.RequiredLib -delete netty-resolver-4.1.94.Final.jar -delete netty-resolver-4.1.94.Final.jar.PushNotifications.RequiredLib -delete netty-resolver-dns-4.1.94.Final.jar -delete netty-resolver-dns-4.1.94.Final.jar.PushNotifications.RequiredLib -delete netty-transport-4.1.94.Final.jar -delete netty-transport-4.1.94.Final.jar.PushNotifications.RequiredLib -delete netty-transport-native-unix-common-4.1.94.Final.jar -delete netty-transport-native-unix-common-4.1.94.Final.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 opencensus-api-0.31.0.jar delete opencensus-api-0.31.0.jar.PushNotifications.RequiredLib delete opencensus-contrib-http-util-0.31.0.jar delete opencensus-contrib-http-util-0.31.0.jar.PushNotifications.RequiredLib delete pushy-0.13.10.jar delete pushy-0.13.10.jar.PushNotifications.RequiredLib -delete slf4j-api-1.7.36.jar -delete slf4j-api-1.7.36.jar.PushNotifications.RequiredLib \ No newline at end of file +delete slf4j-api-2.0.7.jar +delete slf4j-api-2.0.7.jar.PushNotifications.RequiredLib \ No newline at end of file diff --git a/test/userlib/netty-buffer-4.1.94.Final.jar b/test/userlib/netty-buffer-4.1.101.Final.jar similarity index 58% rename from test/userlib/netty-buffer-4.1.94.Final.jar rename to test/userlib/netty-buffer-4.1.101.Final.jar index b7ca7dd..da5071f 100644 Binary files a/test/userlib/netty-buffer-4.1.94.Final.jar and b/test/userlib/netty-buffer-4.1.101.Final.jar differ diff --git a/test/userlib/netty-buffer-4.1.94.Final.jar.PushNotifications.RequiredLib b/test/userlib/netty-buffer-4.1.101.Final.jar.PushNotifications.RequiredLib similarity index 100% rename from test/userlib/netty-buffer-4.1.94.Final.jar.PushNotifications.RequiredLib rename to test/userlib/netty-buffer-4.1.101.Final.jar.PushNotifications.RequiredLib diff --git a/test/userlib/netty-codec-4.1.94.Final.jar b/test/userlib/netty-codec-4.1.101.Final.jar similarity index 83% rename from test/userlib/netty-codec-4.1.94.Final.jar rename to test/userlib/netty-codec-4.1.101.Final.jar index a3f989c..42276cd 100644 Binary files a/test/userlib/netty-codec-4.1.94.Final.jar and b/test/userlib/netty-codec-4.1.101.Final.jar differ diff --git a/test/userlib/netty-codec-4.1.94.Final.jar.PushNotifications.RequiredLib b/test/userlib/netty-codec-4.1.101.Final.jar.PushNotifications.RequiredLib similarity index 100% rename from test/userlib/netty-codec-4.1.94.Final.jar.PushNotifications.RequiredLib rename to test/userlib/netty-codec-4.1.101.Final.jar.PushNotifications.RequiredLib diff --git a/test/userlib/netty-codec-dns-4.1.94.Final.jar b/test/userlib/netty-codec-dns-4.1.101.Final.jar similarity index 83% rename from test/userlib/netty-codec-dns-4.1.94.Final.jar rename to test/userlib/netty-codec-dns-4.1.101.Final.jar index af063c7..86b15ff 100644 Binary files a/test/userlib/netty-codec-dns-4.1.94.Final.jar and b/test/userlib/netty-codec-dns-4.1.101.Final.jar differ diff --git a/test/userlib/netty-codec-dns-4.1.94.Final.jar.PushNotifications.RequiredLib b/test/userlib/netty-codec-dns-4.1.101.Final.jar.PushNotifications.RequiredLib similarity index 100% rename from test/userlib/netty-codec-dns-4.1.94.Final.jar.PushNotifications.RequiredLib rename to test/userlib/netty-codec-dns-4.1.101.Final.jar.PushNotifications.RequiredLib diff --git a/test/userlib/netty-codec-http-4.1.94.Final.jar b/test/userlib/netty-codec-http-4.1.101.Final.jar similarity index 82% rename from test/userlib/netty-codec-http-4.1.94.Final.jar rename to test/userlib/netty-codec-http-4.1.101.Final.jar index 1f0c77c..8bd0577 100644 Binary files a/test/userlib/netty-codec-http-4.1.94.Final.jar and b/test/userlib/netty-codec-http-4.1.101.Final.jar differ diff --git a/test/userlib/netty-codec-http-4.1.94.Final.jar.PushNotifications.RequiredLib b/test/userlib/netty-codec-http-4.1.101.Final.jar.PushNotifications.RequiredLib similarity index 100% rename from test/userlib/netty-codec-http-4.1.94.Final.jar.PushNotifications.RequiredLib rename to test/userlib/netty-codec-http-4.1.101.Final.jar.PushNotifications.RequiredLib diff --git a/test/userlib/netty-codec-http2-4.1.94.Final.jar b/test/userlib/netty-codec-http2-4.1.101.Final.jar similarity index 74% rename from test/userlib/netty-codec-http2-4.1.94.Final.jar rename to test/userlib/netty-codec-http2-4.1.101.Final.jar index 1c15a2a..c79ad70 100644 Binary files a/test/userlib/netty-codec-http2-4.1.94.Final.jar and b/test/userlib/netty-codec-http2-4.1.101.Final.jar differ diff --git a/test/userlib/netty-codec-http2-4.1.94.Final.jar.PushNotifications.RequiredLib b/test/userlib/netty-codec-http2-4.1.101.Final.jar.PushNotifications.RequiredLib similarity index 100% rename from test/userlib/netty-codec-http2-4.1.94.Final.jar.PushNotifications.RequiredLib rename to test/userlib/netty-codec-http2-4.1.101.Final.jar.PushNotifications.RequiredLib diff --git a/test/userlib/netty-codec-socks-4.1.94.Final.jar b/test/userlib/netty-codec-socks-4.1.101.Final.jar similarity index 81% rename from test/userlib/netty-codec-socks-4.1.94.Final.jar rename to test/userlib/netty-codec-socks-4.1.101.Final.jar index 6d506fc..d4b3415 100644 Binary files a/test/userlib/netty-codec-socks-4.1.94.Final.jar and b/test/userlib/netty-codec-socks-4.1.101.Final.jar differ diff --git a/test/userlib/netty-codec-socks-4.1.94.Final.jar.PushNotifications.RequiredLib b/test/userlib/netty-codec-socks-4.1.101.Final.jar.PushNotifications.RequiredLib similarity index 100% rename from test/userlib/netty-codec-socks-4.1.94.Final.jar.PushNotifications.RequiredLib rename to test/userlib/netty-codec-socks-4.1.101.Final.jar.PushNotifications.RequiredLib diff --git a/test/userlib/netty-common-4.1.94.Final.jar b/test/userlib/netty-common-4.1.101.Final.jar similarity index 64% rename from test/userlib/netty-common-4.1.94.Final.jar rename to test/userlib/netty-common-4.1.101.Final.jar index 98d8abd..c689b20 100644 Binary files a/test/userlib/netty-common-4.1.94.Final.jar and b/test/userlib/netty-common-4.1.101.Final.jar differ diff --git a/test/userlib/netty-common-4.1.94.Final.jar.PushNotifications.RequiredLib b/test/userlib/netty-common-4.1.101.Final.jar.PushNotifications.RequiredLib similarity index 100% rename from test/userlib/netty-common-4.1.94.Final.jar.PushNotifications.RequiredLib rename to test/userlib/netty-common-4.1.101.Final.jar.PushNotifications.RequiredLib diff --git a/test/userlib/netty-handler-4.1.94.Final.jar b/test/userlib/netty-handler-4.1.101.Final.jar similarity index 60% rename from test/userlib/netty-handler-4.1.94.Final.jar rename to test/userlib/netty-handler-4.1.101.Final.jar index 716799a..cab9fb4 100644 Binary files a/test/userlib/netty-handler-4.1.94.Final.jar and b/test/userlib/netty-handler-4.1.101.Final.jar differ diff --git a/test/userlib/netty-handler-4.1.94.Final.jar.PushNotifications.RequiredLib b/test/userlib/netty-handler-4.1.101.Final.jar.PushNotifications.RequiredLib similarity index 100% rename from test/userlib/netty-handler-4.1.94.Final.jar.PushNotifications.RequiredLib rename to test/userlib/netty-handler-4.1.101.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.101.Final.jar new file mode 100644 index 0000000..efdf251 Binary files /dev/null and b/test/userlib/netty-handler-proxy-4.1.101.Final.jar differ diff --git a/test/userlib/netty-handler-proxy-4.1.94.Final.jar.PushNotifications.RequiredLib b/test/userlib/netty-handler-proxy-4.1.101.Final.jar.PushNotifications.RequiredLib similarity index 100% rename from test/userlib/netty-handler-proxy-4.1.94.Final.jar.PushNotifications.RequiredLib rename to test/userlib/netty-handler-proxy-4.1.101.Final.jar.PushNotifications.RequiredLib diff --git a/test/userlib/netty-handler-proxy-4.1.94.Final.jar b/test/userlib/netty-handler-proxy-4.1.94.Final.jar deleted file mode 100644 index 4a10586..0000000 Binary files a/test/userlib/netty-handler-proxy-4.1.94.Final.jar and /dev/null differ diff --git a/test/userlib/netty-resolver-4.1.94.Final.jar b/test/userlib/netty-resolver-4.1.101.Final.jar similarity index 79% rename from test/userlib/netty-resolver-4.1.94.Final.jar rename to test/userlib/netty-resolver-4.1.101.Final.jar index e915955..a2c3446 100644 Binary files a/test/userlib/netty-resolver-4.1.94.Final.jar and b/test/userlib/netty-resolver-4.1.101.Final.jar differ diff --git a/test/userlib/netty-resolver-4.1.94.Final.jar.PushNotifications.RequiredLib b/test/userlib/netty-resolver-4.1.101.Final.jar.PushNotifications.RequiredLib similarity index 100% rename from test/userlib/netty-resolver-4.1.94.Final.jar.PushNotifications.RequiredLib rename to test/userlib/netty-resolver-4.1.101.Final.jar.PushNotifications.RequiredLib diff --git a/test/userlib/netty-resolver-dns-4.1.94.Final.jar b/test/userlib/netty-resolver-dns-4.1.101.Final.jar similarity index 60% rename from test/userlib/netty-resolver-dns-4.1.94.Final.jar rename to test/userlib/netty-resolver-dns-4.1.101.Final.jar index 4ce6af8..f77a495 100644 Binary files a/test/userlib/netty-resolver-dns-4.1.94.Final.jar and b/test/userlib/netty-resolver-dns-4.1.101.Final.jar differ diff --git a/test/userlib/netty-resolver-dns-4.1.94.Final.jar.PushNotifications.RequiredLib b/test/userlib/netty-resolver-dns-4.1.101.Final.jar.PushNotifications.RequiredLib similarity index 100% rename from test/userlib/netty-resolver-dns-4.1.94.Final.jar.PushNotifications.RequiredLib rename to test/userlib/netty-resolver-dns-4.1.101.Final.jar.PushNotifications.RequiredLib diff --git a/test/userlib/netty-transport-4.1.94.Final.jar b/test/userlib/netty-transport-4.1.101.Final.jar similarity index 74% rename from test/userlib/netty-transport-4.1.94.Final.jar rename to test/userlib/netty-transport-4.1.101.Final.jar index 6f40952..e1ed8b1 100644 Binary files a/test/userlib/netty-transport-4.1.94.Final.jar and b/test/userlib/netty-transport-4.1.101.Final.jar differ diff --git a/test/userlib/netty-transport-4.1.94.Final.jar.PushNotifications.RequiredLib b/test/userlib/netty-transport-4.1.101.Final.jar.PushNotifications.RequiredLib similarity index 100% rename from test/userlib/netty-transport-4.1.94.Final.jar.PushNotifications.RequiredLib rename to test/userlib/netty-transport-4.1.101.Final.jar.PushNotifications.RequiredLib diff --git a/test/userlib/netty-transport-native-unix-common-4.1.94.Final.jar b/test/userlib/netty-transport-native-unix-common-4.1.101.Final.jar similarity index 70% rename from test/userlib/netty-transport-native-unix-common-4.1.94.Final.jar rename to test/userlib/netty-transport-native-unix-common-4.1.101.Final.jar index a0fa922..8708498 100644 Binary files a/test/userlib/netty-transport-native-unix-common-4.1.94.Final.jar and b/test/userlib/netty-transport-native-unix-common-4.1.101.Final.jar differ diff --git a/test/userlib/netty-transport-native-unix-common-4.1.94.Final.jar.PushNotifications.RequiredLib b/test/userlib/netty-transport-native-unix-common-4.1.101.Final.jar.PushNotifications.RequiredLib similarity index 100% rename from test/userlib/netty-transport-native-unix-common-4.1.94.Final.jar.PushNotifications.RequiredLib rename to test/userlib/netty-transport-native-unix-common-4.1.101.Final.jar.PushNotifications.RequiredLib diff --git a/test/userlib/slf4j-api-1.7.36.jar b/test/userlib/slf4j-api-1.7.36.jar deleted file mode 100644 index 7d3ce68..0000000 Binary files a/test/userlib/slf4j-api-1.7.36.jar and /dev/null differ diff --git a/test/userlib/slf4j-api-2.0.7.jar b/test/userlib/slf4j-api-2.0.7.jar new file mode 100644 index 0000000..be5447c Binary files /dev/null and b/test/userlib/slf4j-api-2.0.7.jar differ diff --git a/test/userlib/slf4j-api-1.7.36.jar.PushNotifications.RequiredLib b/test/userlib/slf4j-api-2.0.7.jar.PushNotifications.RequiredLib similarity index 100% rename from test/userlib/slf4j-api-1.7.36.jar.PushNotifications.RequiredLib rename to test/userlib/slf4j-api-2.0.7.jar.PushNotifications.RequiredLib