[knox] branch master updated (a43b1ff -> 3a2eabc)
This is an automated email from the ASF dual-hosted git repository. krisden pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/knox.git. from a43b1ff KNOX-2574 - Missing proper logging when hmac secret is short (misconfigured) (#478) add 3a2eabc KNOX-2640 - Remove hibernate dependency (#479) No new revisions were added by this update. Summary of changes: gateway-provider-security-pac4j/pom.xml | 6 -- pom.xml | 25 - 2 files changed, 4 insertions(+), 27 deletions(-)
[knox] branch master updated (835ddda -> 34e4ae4)
This is an automated email from the ASF dual-hosted git repository. krisden pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/knox.git. from 835ddda KNOX-2516 - Upgrade pac4j to 4.3.0 new 6a8373f KNOX-2283 - Upgrade curator to 5.1.0 and zookeeper to 3.6.2 new ff6295e KNOX-2518 - Upgrade spring-vault to 2.3.0 new 4986d22 KNOX-2519 - Upgrade eclipselink to 2.7.8 new a827102 KNOX-2520 - Upgrade netty to 4.1.56.Final new 4d990ac KNOX-2521 - Upgrade glassfish jaxb to 2.3.3 new 44e3c65 KNOX-2522 - Upgrade hibernate to 5.4.26.Final new 844 KNOX-2523 - Upgrade java-support to 7.5.2 new 1b8afb1 KNOX-2524 - Upgrade lang-tag to 1.5 new 34e4ae4 KNOX-2525 - Upgrade stax2-api to 4.2.1 The 9 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: pom.xml | 20 ++-- 1 file changed, 10 insertions(+), 10 deletions(-)
[knox] 07/09: KNOX-2523 - Upgrade java-support to 7.5.2
This is an automated email from the ASF dual-hosted git repository. krisden pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/knox.git commit 844f11912c529cb3feabb09ca714df6ed52c Author: Kevin Risden AuthorDate: Tue Dec 22 09:57:07 2020 -0600 KNOX-2523 - Upgrade java-support to 7.5.2 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 82d1ddf..3561608 100644 --- a/pom.xml +++ b/pom.xml @@ -220,7 +220,7 @@ 2.3.3 2.3.2 1.2.2 -7.5.1 +7.5.2 3.27.0-GA 3.4.1.Final 5.0.0
[knox] 08/09: KNOX-2524 - Upgrade lang-tag to 1.5
This is an automated email from the ASF dual-hosted git repository. krisden pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/knox.git commit 1b8afb16af907854bfa83b0c95a2f9eda1c75e0a Author: Kevin Risden AuthorDate: Tue Dec 22 09:57:38 2020 -0600 KNOX-2524 - Upgrade lang-tag to 1.5 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3561608..ba0a578 100644 --- a/pom.xml +++ b/pom.xml @@ -233,7 +233,7 @@ 2.5.0 2.3 4.13.1 -1.4.4 +1.5 1.11 1.2.17 2.14.0
[knox] 06/09: KNOX-2522 - Upgrade hibernate to 5.4.26.Final
This is an automated email from the ASF dual-hosted git repository. krisden pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/knox.git commit 44e3c6516aaf7a013101027d88567ec6317ed153 Author: Kevin Risden AuthorDate: Tue Dec 22 09:56:54 2020 -0600 KNOX-2522 - Upgrade hibernate to 5.4.26.Final --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 95ffcf5..82d1ddf 100644 --- a/pom.xml +++ b/pom.xml @@ -203,7 +203,7 @@ 3.2.1 2.2 0.2 -5.4.24.Final +5.4.26.Final 1.0.2.Final 4.5.13 4.4.14
[knox] 04/09: KNOX-2520 - Upgrade netty to 4.1.56.Final
This is an automated email from the ASF dual-hosted git repository. krisden pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/knox.git commit a8271029edfcccb0f8b079d885d3b04db7e86c11 Author: Kevin Risden AuthorDate: Tue Dec 22 09:55:59 2020 -0600 KNOX-2520 - Upgrade netty to 4.1.56.Final --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5939409..fb721ad 100644 --- a/pom.xml +++ b/pom.xml @@ -244,7 +244,7 @@ 3.12.0 4.1.16 2.0.21 -4.1.55.Final +4.1.56.Final 8.14.1 v12.18.2 2.7.5
[knox] 02/09: KNOX-2518 - Upgrade spring-vault to 2.3.0
This is an automated email from the ASF dual-hosted git repository. krisden pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/knox.git commit ff6295e5faad8fcd449cbb2e2963dbdf7266a138 Author: Kevin Risden AuthorDate: Tue Dec 22 09:54:57 2020 -0600 KNOX-2518 - Upgrade spring-vault to 2.3.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a79f78a..c025ebb 100644 --- a/pom.xml +++ b/pom.xml @@ -259,7 +259,7 @@ 4.2.0 4.1.4 5.3.2 -2.2.3.RELEASE +2.3.0 1.8.3 4.2 1.6.2
[knox] 09/09: KNOX-2525 - Upgrade stax2-api to 4.2.1
This is an automated email from the ASF dual-hosted git repository. krisden pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/knox.git commit 34e4ae4d8c7a779bdbdd3a47214c25217be11590 Author: Kevin Risden AuthorDate: Tue Dec 22 09:57:52 2020 -0600 KNOX-2525 - Upgrade stax2-api to 4.2.1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ba0a578..3c55c60 100644 --- a/pom.xml +++ b/pom.xml @@ -261,7 +261,7 @@ 5.3.2 2.3.0 1.8.3 -4.2 +4.2.1 1.6.2 3.1.7 1.2.5
[knox] 03/09: KNOX-2519 - Upgrade eclipselink to 2.7.8
This is an automated email from the ASF dual-hosted git repository. krisden pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/knox.git commit 4986d22446b06d44e91a3ae17520bce96321803a Author: Kevin Risden AuthorDate: Tue Dec 22 09:55:47 2020 -0600 KNOX-2519 - Upgrade eclipselink to 2.7.8 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c025ebb..5939409 100644 --- a/pom.xml +++ b/pom.xml @@ -189,7 +189,7 @@ 1.4.13 2.1.3 4.2 -2.7.6 +2.7.8 2.6.11 3.0.0 1.2.18
[knox] 01/09: KNOX-2283 - Upgrade curator to 5.1.0 and zookeeper to 3.6.2
This is an automated email from the ASF dual-hosted git repository. krisden pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/knox.git commit 6a8373f615258fbbf5b948139e8a12a9b5707702 Author: Kevin Risden AuthorDate: Mon Dec 21 15:17:31 2020 -0600 KNOX-2283 - Upgrade curator to 5.1.0 and zookeeper to 3.6.2 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index d7023b9..a79f78a 100644 --- a/pom.xml +++ b/pom.xml @@ -183,7 +183,7 @@ 1.9 2.9.1 1.2.4 -4.3.0 +5.1.0 6.0.3 10.14.2.0 1.4.13 @@ -273,7 +273,7 @@ 3.3 2.3.0 0.10 -3.5.7 +3.6.2
[knox] 05/09: KNOX-2521 - Upgrade glassfish jaxb to 2.3.3
This is an automated email from the ASF dual-hosted git repository. krisden pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/knox.git commit 4d990ac29e8d92290a28b23775f63d8194c16f1a Author: Kevin Risden AuthorDate: Tue Dec 22 09:56:27 2020 -0600 KNOX-2521 - Upgrade glassfish jaxb to 2.3.3 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index fb721ad..95ffcf5 100644 --- a/pom.xml +++ b/pom.xml @@ -196,7 +196,7 @@ 1.11.0 3.1 1.11.0 -2.3.2 +2.3.3 2.8.6 3.0.7 28.2-jre
[knox] branch master updated (33ad107 -> 835ddda)
This is an automated email from the ASF dual-hosted git repository. krisden pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/knox.git. from 33ad107 KNOX-2509 - Added OpenAPI UI (v3.36.2) for documenting Knox's REST API endpoints and models (#393) new fbdb2ed KNOX-2499 - Upgrade asm to 9.0 new a6e2827 KNOX-2504 - Upgrade bcprov-jdk15on to 1.67 new bb6fef1 KNOX-2500 - Upgrade commons-net to 3.7.2 new 6f464ae KNOX-2503 - Upgrade findsecbugs to 1.11.0 new f83dddb KNOX-2508 - Upgrade frontend-maven-plugin to 1.11.0 new 8e0e3f2 KNOX-2498 - Upgrade jacoco-maven-plugin to 0.8.6 new 32eef07 KNX-2502 - Upgrade joda-time to 2.10.8 new 6f5808d KNOX-2505 - Upgrade log4j to 2.14.0 new ceca465 KNOX-2507 - Upgrade metrics to 4.1.16 new c2013f3 KNOX-2506 - Upgrade protobuf-java to 3.14.0 new bc640a7 KNOX-2501 - Upgrade spotbugs-maven-plugin to 4.1.4 new 116a667 KNOX-2512 - Upgrade cors-filter to 2.9.1 new 68b98c1 KNOX-2513 - Upgrade checkstyle to 8.38 new 447f953 KNOX-2514 - Upgrade spotbugs to 4.2.0 new 835ddda KNOX-2516 - Upgrade pac4j to 4.3.0 The 15 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: .../main/resources/build-tools/spotbugs-filter.xml | 10 pom.xml| 30 +++--- 2 files changed, 25 insertions(+), 15 deletions(-)
[knox] 07/15: KNX-2502 - Upgrade joda-time to 2.10.8
This is an automated email from the ASF dual-hosted git repository. krisden pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/knox.git commit 32eef071077f4ec9ca0b73cc7dbfa2368429141d Author: Kevin Risden AuthorDate: Wed Dec 16 14:03:31 2020 -0500 KNX-2502 - Upgrade joda-time to 2.10.8 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c92e23e..fb617f6 100644 --- a/pom.xml +++ b/pom.xml @@ -229,7 +229,7 @@ 9.4.34.v20201102 2.14.6 5.6.0 -2.10.6 +2.10.8 2.5.0 2.3 4.13.1
[knox] 13/15: KNOX-2513 - Upgrade checkstyle to 8.38
This is an automated email from the ASF dual-hosted git repository.
krisden pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/knox.git
commit 68b98c1ef6a66867340888e8292c609a10c93e64
Author: Kevin Risden
AuthorDate: Wed Dec 16 14:20:26 2020 -0500
KNOX-2513 - Upgrade checkstyle to 8.38
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index c1fc6d4..6c96da2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -164,7 +164,7 @@
2.8.8
1.4
3.3.0
-8.36
+8.38
7.0.3
${cloudera-manager.version}
1.9.4
[knox] 03/15: KNOX-2500 - Upgrade commons-net to 3.7.2
This is an automated email from the ASF dual-hosted git repository. krisden pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/knox.git commit bb6fef1e897f2090b2e571a486892566d6fc4bc3 Author: Kevin Risden AuthorDate: Wed Dec 16 14:01:29 2020 -0500 KNOX-2500 - Upgrade commons-net to 3.7.2 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 10dd1af..eaee703 100644 --- a/pom.xml +++ b/pom.xml @@ -179,7 +179,7 @@ 3.11 1.2 3.6.1 -3.7 +3.7.2 1.9 2.9 1.2.4
[knox] 05/15: KNOX-2508 - Upgrade frontend-maven-plugin to 1.11.0
This is an automated email from the ASF dual-hosted git repository. krisden pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/knox.git commit f83dddbf270bb5153b16253154e583e989865c50 Author: Kevin Risden AuthorDate: Wed Dec 16 14:02:29 2020 -0500 KNOX-2508 - Upgrade frontend-maven-plugin to 1.11.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9b7d0bd..513bdfa 100644 --- a/pom.xml +++ b/pom.xml @@ -195,7 +195,7 @@ 1.2.18 1.11.0 3.1 -1.10.0 +1.11.0 2.3.2 2.8.6 3.0.7
[knox] 10/15: KNOX-2506 - Upgrade protobuf-java to 3.14.0
This is an automated email from the ASF dual-hosted git repository. krisden pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/knox.git commit c2013f3208eb706356ddfefeda5383d8aa916caf Author: Kevin Risden AuthorDate: Wed Dec 16 14:05:03 2020 -0500 KNOX-2506 - Upgrade protobuf-java to 3.14.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b9ac076..7b56d08 100644 --- a/pom.xml +++ b/pom.xml @@ -250,7 +250,7 @@ 2.7.5 3.4.5 4.0.3 -3.13.0 +3.14.0 4.3.3 1.7.0 1.2.6
[knox] 09/15: KNOX-2507 - Upgrade metrics to 4.1.16
This is an automated email from the ASF dual-hosted git repository. krisden pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/knox.git commit ceca4651559a898cda2ffd9538b8aaa1b334d3b2 Author: Kevin Risden AuthorDate: Wed Dec 16 14:04:30 2020 -0500 KNOX-2507 - Upgrade metrics to 4.1.16 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index eb498e8..b9ac076 100644 --- a/pom.xml +++ b/pom.xml @@ -242,7 +242,7 @@ 3.1.2 3.0.0-M3 3.12.0 -4.1.12.1 +4.1.16 2.0.21 4.1.55.Final 8.14.1
[knox] 15/15: KNOX-2516 - Upgrade pac4j to 4.3.0
This is an automated email from the ASF dual-hosted git repository. krisden pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/knox.git commit 835dddac88f921dfb38d66943ff8a3fcd2cc525e Author: Kevin Risden AuthorDate: Wed Dec 16 14:21:57 2020 -0500 KNOX-2516 - Upgrade pac4j to 4.3.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c4e1eb0..d7023b9 100644 --- a/pom.xml +++ b/pom.xml @@ -249,7 +249,7 @@ v12.18.2 2.7.5 3.4.5 -4.0.3 +4.3.0 3.14.0 4.3.3 1.7.0
[knox] 11/15: KNOX-2501 - Upgrade spotbugs-maven-plugin to 4.1.4
This is an automated email from the ASF dual-hosted git repository. krisden pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/knox.git commit bc640a7fed94f1b4ffde40c6cd10dcad2875ca52 Author: Kevin Risden AuthorDate: Wed Dec 16 14:05:41 2020 -0500 KNOX-2501 - Upgrade spotbugs-maven-plugin to 4.1.4 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7b56d08..220b8da 100644 --- a/pom.xml +++ b/pom.xml @@ -257,7 +257,7 @@ 2.0.0 1.7.30 4.1.2 -4.0.4 +4.1.4 5.3.2 2.2.3.RELEASE 1.8.3
[knox] 06/15: KNOX-2498 - Upgrade jacoco-maven-plugin to 0.8.6
This is an automated email from the ASF dual-hosted git repository. krisden pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/knox.git commit 8e0e3f25c4edaf4d31e1629cd5bbd7dec9b04a29 Author: Kevin Risden AuthorDate: Wed Dec 16 14:03:00 2020 -0500 KNOX-2498 - Upgrade jacoco-maven-plugin to 0.8.6 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 513bdfa..c92e23e 100644 --- a/pom.xml +++ b/pom.xml @@ -208,7 +208,7 @@ 4.5.13 4.4.14 2.11.4 -0.8.5 +0.8.6 1.18 1.2.0 1.3.2
[knox] 08/15: KNOX-2505 - Upgrade log4j to 2.14.0
This is an automated email from the ASF dual-hosted git repository. krisden pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/knox.git commit 6f5808d8b871f5390a0b42492b9e83c567ce7fe5 Author: Kevin Risden AuthorDate: Wed Dec 16 14:04:02 2020 -0500 KNOX-2505 - Upgrade log4j to 2.14.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index fb617f6..eb498e8 100644 --- a/pom.xml +++ b/pom.xml @@ -236,7 +236,7 @@ 1.4.4 1.11 1.2.17 -2.13.3 +2.14.0 3.1.1 3.8.1 3.1.2
[knox] 12/15: KNOX-2512 - Upgrade cors-filter to 2.9.1
This is an automated email from the ASF dual-hosted git repository. krisden pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/knox.git commit 116a667e1e3373410435b757b4c6f53379c1cdc0 Author: Kevin Risden AuthorDate: Wed Dec 16 14:19:54 2020 -0500 KNOX-2512 - Upgrade cors-filter to 2.9.1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 220b8da..c1fc6d4 100644 --- a/pom.xml +++ b/pom.xml @@ -181,7 +181,7 @@ 3.6.1 3.7.2 1.9 -2.9 +2.9.1 1.2.4 4.3.0 6.0.3
[knox] 14/15: KNOX-2514 - Upgrade spotbugs to 4.2.0
This is an automated email from the ASF dual-hosted git repository. krisden pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/knox.git commit 447f9539f95782890ac9f2e07b3a6a06ee9d7403 Author: Kevin Risden AuthorDate: Wed Dec 16 14:20:55 2020 -0500 KNOX-2514 - Upgrade spotbugs to 4.2.0 --- build-tools/src/main/resources/build-tools/spotbugs-filter.xml | 10 ++ pom.xml| 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/build-tools/src/main/resources/build-tools/spotbugs-filter.xml b/build-tools/src/main/resources/build-tools/spotbugs-filter.xml index 80057e5..1af4408 100644 --- a/build-tools/src/main/resources/build-tools/spotbugs-filter.xml +++ b/build-tools/src/main/resources/build-tools/spotbugs-filter.xml @@ -80,4 +80,14 @@ limitations under the License. + + + + + + + + + + diff --git a/pom.xml b/pom.xml index 6c96da2..c4e1eb0 100644 --- a/pom.xml +++ b/pom.xml @@ -256,7 +256,7 @@ 1.2.6 2.0.0 1.7.30 -4.1.2 +4.2.0 4.1.4 5.3.2 2.2.3.RELEASE
[knox] 04/15: KNOX-2503 - Upgrade findsecbugs to 1.11.0
This is an automated email from the ASF dual-hosted git repository. krisden pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/knox.git commit 6f464ae96b888744d0e1d490426135302b305aaf Author: Kevin Risden AuthorDate: Wed Dec 16 14:02:02 2020 -0500 KNOX-2503 - Upgrade findsecbugs to 1.11.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index eaee703..9b7d0bd 100644 --- a/pom.xml +++ b/pom.xml @@ -193,7 +193,7 @@ 2.6.11 3.0.0 1.2.18 -1.10.1 +1.11.0 3.1 1.10.0 2.3.2
[knox] 01/15: KNOX-2499 - Upgrade asm to 9.0
This is an automated email from the ASF dual-hosted git repository. krisden pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/knox.git commit fbdb2ed74fd5f35ca540007a5dde387cfdf73e8f Author: Kevin Risden AuthorDate: Wed Dec 16 14:00:05 2020 -0500 KNOX-2499 - Upgrade asm to 9.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9823680..8554096 100644 --- a/pom.xml +++ b/pom.xml @@ -158,7 +158,7 @@ 2.0.0-M5 0.13 1.8.1 -8.0.1 +9.0 1.9.6 1.66 2.8.8
[knox] 02/15: KNOX-2504 - Upgrade bcprov-jdk15on to 1.67
This is an automated email from the ASF dual-hosted git repository. krisden pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/knox.git commit a6e2827d979b8bc3908e56989d1e7f2da125ce66 Author: Kevin Risden AuthorDate: Wed Dec 16 14:00:57 2020 -0500 KNOX-2504 - Upgrade bcprov-jdk15on to 1.67 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8554096..10dd1af 100644 --- a/pom.xml +++ b/pom.xml @@ -160,7 +160,7 @@ 1.8.1 9.0 1.9.6 -1.66 +1.67 2.8.8 1.4 3.3.0
[knox] 09/14: KNOX-2496 - Upgrade junit to 4.13.1
This is an automated email from the ASF dual-hosted git repository. krisden pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/knox.git commit 44178a60c3f6ca5c5b78b351724d4852d88afb13 Author: Kevin Risden AuthorDate: Mon Dec 14 15:32:03 2020 -0500 KNOX-2496 - Upgrade junit to 4.13.1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 92e0b5a..24a833d 100644 --- a/pom.xml +++ b/pom.xml @@ -231,7 +231,7 @@ 2.10.6 2.5.0 2.3 -4.13 +4.13.1 1.4.4 1.11 1.2.17
[knox] 07/14: KNOX-2493 - Upgrade jackson to 2.11.4
This is an automated email from the ASF dual-hosted git repository. krisden pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/knox.git commit 905a9311a68b18778b5a9c5b55e9f4caa55acab1 Author: Kevin Risden AuthorDate: Mon Dec 14 15:31:12 2020 -0500 KNOX-2493 - Upgrade jackson to 2.11.4 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 71e6328..a7aa0eb 100644 --- a/pom.xml +++ b/pom.xml @@ -206,7 +206,7 @@ 1.0.2.Final 4.5.13 4.4.14 -2.11.2 +2.11.4 0.8.5 1.18 1.2.0
[knox] 05/14: KNOX-2495 - Upgrade httpclient to 4.5.13
This is an automated email from the ASF dual-hosted git repository. krisden pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/knox.git commit b9f020b03cb8744cd88053ec34f43d7291e85f67 Author: Kevin Risden AuthorDate: Mon Dec 14 15:30:17 2020 -0500 KNOX-2495 - Upgrade httpclient to 4.5.13 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 74f944f..18d300c 100644 --- a/pom.xml +++ b/pom.xml @@ -204,7 +204,7 @@ 0.2 5.4.24.Final 1.0.2.Final -4.5.12 +4.5.13 4.4.13 2.11.2 0.8.5
[knox] 13/14: KNOX-2488 - Upgrade spring-vault to 2.2.3.RELEASE
This is an automated email from the ASF dual-hosted git repository. krisden pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/knox.git commit 1d1a19ce3860aa7b5b29ffa57beaec8034cf5aa4 Author: Kevin Risden AuthorDate: Mon Dec 14 15:35:09 2020 -0500 KNOX-2488 - Upgrade spring-vault to 2.2.3.RELEASE --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3f4ed78..e504ed4 100644 --- a/pom.xml +++ b/pom.xml @@ -258,7 +258,7 @@ 4.1.2 4.0.4 5.3.2 -2.2.2.RELEASE +2.2.3.RELEASE 1.8.3 4.2 1.2.5
[knox] 08/14: KNOX-2487 - Upgrade json-path to 2.5.0
This is an automated email from the ASF dual-hosted git repository. krisden pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/knox.git commit 84af35a422577ac51bbc842a7b978f2c916e7c35 Author: Kevin Risden AuthorDate: Mon Dec 14 15:31:38 2020 -0500 KNOX-2487 - Upgrade json-path to 2.5.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a7aa0eb..92e0b5a 100644 --- a/pom.xml +++ b/pom.xml @@ -229,7 +229,7 @@ 2.14.6 5.6.0 2.10.6 -2.4.0 +2.5.0 2.3 4.13 1.4.4
[knox] 06/14: KNOX-2494 - Upgrade httpcore to 4.4.14
This is an automated email from the ASF dual-hosted git repository. krisden pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/knox.git commit 76e986233aeb46bced029c8e54309c6a6fd573f2 Author: Kevin Risden AuthorDate: Mon Dec 14 15:30:40 2020 -0500 KNOX-2494 - Upgrade httpcore to 4.4.14 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 18d300c..71e6328 100644 --- a/pom.xml +++ b/pom.xml @@ -205,7 +205,7 @@ 5.4.24.Final 1.0.2.Final 4.5.13 -4.4.13 +4.4.14 2.11.2 0.8.5 1.18
[knox] 03/14: KNOX-2497 - Upgrade dependency-check-maven to 6.0.3
This is an automated email from the ASF dual-hosted git repository. krisden pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/knox.git commit 4650b51c17b51094d057d2f6c4aac8a98f16be9c Author: Kevin Risden AuthorDate: Mon Dec 14 15:29:21 2020 -0500 KNOX-2497 - Upgrade dependency-check-maven to 6.0.3 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 87dcd2f..785aada 100644 --- a/pom.xml +++ b/pom.xml @@ -183,7 +183,7 @@ 2.9 1.2.4 4.3.0 -6.0.0 +6.0.3 10.14.2.0 1.4.13 2.1.3
[knox] 12/14: KNOX-2490 - Upgrade spring to 5.3.2
This is an automated email from the ASF dual-hosted git repository. krisden pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/knox.git commit f5079cd003ede3f5318747b9336283690f3a6e2d Author: Kevin Risden AuthorDate: Mon Dec 14 15:34:36 2020 -0500 KNOX-2490 - Upgrade spring to 5.3.2 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f8427d5..3f4ed78 100644 --- a/pom.xml +++ b/pom.xml @@ -257,7 +257,7 @@ 1.7.30 4.1.2 4.0.4 -5.2.8.RELEASE +5.3.2 2.2.2.RELEASE 1.8.3 4.2
[knox] 02/14: KNOX-2491 - Upgrade caffeine to 2.8.8
This is an automated email from the ASF dual-hosted git repository. krisden pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/knox.git commit 55023ce95903862881176afdb6a7dee680e6f67a Author: Kevin Risden AuthorDate: Mon Dec 14 15:28:51 2020 -0500 KNOX-2491 - Upgrade caffeine to 2.8.8 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4149558..87dcd2f 100644 --- a/pom.xml +++ b/pom.xml @@ -160,7 +160,7 @@ 8.0.1 1.9.6 1.66 -2.8.5 +2.8.8 1.4 3.3.0 8.36
[knox] branch master updated (d361481 -> 32155ce)
This is an automated email from the ASF dual-hosted git repository. krisden pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/knox.git. from d361481 KNOX-2479 - Fix an issue where Knox munges set-cookie header (#391) new 559a89b KNOX-2483 - Upgrade hibernate to 5.4.18.Final+ new 55023ce KNOX-2491 - Upgrade caffeine to 2.8.8 new 4650b51 KNOX-2497 - Upgrade dependency-check-maven to 6.0.3 new 44280b3 KNOX-2492 - Upgrade groovy to 3.0.7 new b9f020b KNOX-2495 - Upgrade httpclient to 4.5.13 new 76e9862 KNOX-2494 - Upgrade httpcore to 4.4.14 new 905a931 KNOX-2493 - Upgrade jackson to 2.11.4 new 84af35a KNOX-2487 - Upgrade json-path to 2.5.0 new 44178a6 KNOX-2496 - Upgrade junit to 4.13.1 new 24fe9ce KNOX-2489 - Upgrade netty to 4.1.55.Final new a6f4831 KNOX-2486 - Upgrade rest-assured to 4.3.3 new f5079cd KNOX-2490 - Upgrade spring to 5.3.2 new 1d1a19c KNOX-2488 - Upgrade spring-vault to 2.2.3.RELEASE new 32155ce KNOX-2485 - Upgrade testcontainers to 1.15.1 The 14 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: gateway-provider-security-pac4j/pom.xml | 6 ++ pom.xml | 138 ++-- 2 files changed, 101 insertions(+), 43 deletions(-)
[knox] 11/14: KNOX-2486 - Upgrade rest-assured to 4.3.3
This is an automated email from the ASF dual-hosted git repository. krisden pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/knox.git commit a6f483153183a3f3c39f6ffe48b19abc1d544be7 Author: Kevin Risden AuthorDate: Mon Dec 14 15:32:58 2020 -0500 KNOX-2486 - Upgrade rest-assured to 4.3.3 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a500d17..f8427d5 100644 --- a/pom.xml +++ b/pom.xml @@ -250,7 +250,7 @@ 3.4.5 4.0.3 3.13.0 -4.3.1 +4.3.3 1.7.0 1.2.6 2.0.0
[knox] 10/14: KNOX-2489 - Upgrade netty to 4.1.55.Final
This is an automated email from the ASF dual-hosted git repository. krisden pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/knox.git commit 24fe9ce9a5abd0fbf76c6f606458d7fa92fd9b43 Author: Kevin Risden AuthorDate: Mon Dec 14 15:32:31 2020 -0500 KNOX-2489 - Upgrade netty to 4.1.55.Final --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 24a833d..a500d17 100644 --- a/pom.xml +++ b/pom.xml @@ -243,7 +243,7 @@ 3.12.0 4.1.12.1 2.0.21 -4.1.52.Final +4.1.55.Final 8.14.1 v12.18.2 2.7.5
[knox] 14/14: KNOX-2485 - Upgrade testcontainers to 1.15.1
This is an automated email from the ASF dual-hosted git repository. krisden pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/knox.git commit 32155ce8ad0e86e924024da0699c6615a3c27655 Author: Kevin Risden AuthorDate: Mon Dec 14 15:35:41 2020 -0500 KNOX-2485 - Upgrade testcontainers to 1.15.1 Signed-off-by: Kevin Risden --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e504ed4..9259860 100644 --- a/pom.xml +++ b/pom.xml @@ -262,7 +262,7 @@ 1.8.3 4.2 1.2.5 -1.14.3 +1.15.1 2.4.0-b180830.0438 1.7 6.1.1
[knox] 04/14: KNOX-2492 - Upgrade groovy to 3.0.7
This is an automated email from the ASF dual-hosted git repository. krisden pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/knox.git commit 44280b331a96c50deae6be83260caa454db86784 Author: Kevin Risden AuthorDate: Mon Dec 14 15:29:51 2020 -0500 KNOX-2492 - Upgrade groovy to 3.0.7 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 785aada..74f944f 100644 --- a/pom.xml +++ b/pom.xml @@ -197,7 +197,7 @@ 1.10.0 2.3.2 2.8.6 -3.0.5 +3.0.7 28.2-jre 3.2.1 2.2
[knox] 01/14: KNOX-2483 - Upgrade hibernate to 5.4.18.Final+
This is an automated email from the ASF dual-hosted git repository.
krisden pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/knox.git
commit 559a89bace181735d981cfec24f964738eb36a1a
Author: Kevin Risden
AuthorDate: Mon Dec 14 13:18:22 2020 -0500
KNOX-2483 - Upgrade hibernate to 5.4.18.Final+
Signed-off-by: Kevin Risden
---
gateway-provider-security-pac4j/pom.xml | 6 ++
pom.xml | 112 +++-
2 files changed, 88 insertions(+), 30 deletions(-)
diff --git a/gateway-provider-security-pac4j/pom.xml
b/gateway-provider-security-pac4j/pom.xml
index a8d41fd..05e56fb 100644
--- a/gateway-provider-security-pac4j/pom.xml
+++ b/gateway-provider-security-pac4j/pom.xml
@@ -136,6 +136,12 @@
spring-core
+
+
+org.hibernate
+hibernate-core
+
+
org.apache.knox
gateway-test-utils
diff --git a/pom.xml b/pom.xml
index a926c69..4149558 100644
--- a/pom.xml
+++ b/pom.xml
@@ -195,12 +195,15 @@
1.10.1
3.1
1.10.0
+2.3.2
2.8.6
3.0.5
28.2-jre
3.2.1
2.2
0.2
+5.4.24.Final
+1.0.2.Final
4.5.12
4.4.13
2.11.2
@@ -213,11 +216,12 @@
3.1.0
2.0
1.1
-2.3.0
2.3.3
2.3.2
1.2.2
7.5.1
+3.27.0-GA
+3.4.1.Final
5.0.0
3.4
2.6
@@ -264,6 +268,7 @@
6.1.1
2.1.5
3.3
+2.3.0
0.10
3.5.7
@@ -1312,21 +1317,26 @@
javax.xml.bind
jaxb-api
-${jaxb.version}
+${xml-jaxb.version}
com.sun.xml.bind
jaxb-core
-${jaxb.version}
+${xml-jaxb.version}
com.sun.xml.bind
jaxb-impl
-${jaxb.version}
+${xml-jaxb.version}
org.glassfish.jaxb
+jaxb-runtime
+${glassfish-jaxb.version}
+
+
+org.glassfish.jaxb
txw2
${txw2.version}
@@ -2111,39 +2121,81 @@
- org.opensaml
- opensaml-core
- ${opensaml.version}
+org.opensaml
+opensaml-core
+${opensaml.version}
-
- org.opensaml
- opensaml-security-api
- ${opensaml.version}
+
+org.opensaml
+opensaml-security-api
+${opensaml.version}
-
- org.opensaml
- opensaml-xmlsec-api
- ${opensaml.version}
+
+
+
+org.opensaml
+opensaml-storage-impl
+${opensaml.version}
+
+
+org.hibernate
+hibernate-entitymanager
+
+
- org.opensaml
- opensaml-xmlsec-impl
- ${opensaml.version}
+org.hibernate
+hibernate-core
+${hibernate.version}
-
- org.apache.santuario
- xmlsec
- ${xmlsec.version}
+
+org.hibernate.javax.persistence
+hibernate-jpa-2.1-api
+${hibernate-jpa.version}
-
- org.cryptacular
- cryptacular
- ${cryptacular.version}
+
+org.javassist
+javassist
+${javassist.version}
-
- net.shibboleth.utilities
- java-support
- ${java-support.version}
+
+org.jboss.logging
+jboss-logging
+${jboss-logging.version}
+
+
+
+org.opensaml
+opensaml-xmlsec-api
+${opensaml.version}
+
+
+org.opensaml
+opensaml-xmlsec-impl
+${opensaml.version}
+
+
+org.apache.santuario
+xmlsec
+${xmlsec.version}
+
+
+org.cryptacular
+cryptacular
+${cryptacular.version}
+
+
+net.shibboleth.utilities
+java-support
+${java
[knox] branch master updated: KNOX-2474 - RemoteConfigurationRegistryJAASConfigTest fails due to invalid auth (#387)
This is an automated email from the ASF dual-hosted git repository.
krisden pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/knox.git
The following commit(s) were added to refs/heads/master by this push:
new 41590e1 KNOX-2474 - RemoteConfigurationRegistryJAASConfigTest fails
due to invalid auth (#387)
41590e1 is described below
commit 41590e185efa2c8d8c4aaf22fbc562c498ba808d
Author: Kevin Risden
AuthorDate: Thu Nov 26 11:58:11 2020 -0500
KNOX-2474 - RemoteConfigurationRegistryJAASConfigTest fails due to invalid
auth (#387)
Signed-off-by: Kevin Risden
---
...nfigurationRegistryClientServiceSecureTest.java | 115 +++
...onfigurationRegistryClientServiceTestBase.java} | 210 +++--
...igurationRegistryClientServiceUnsecureTest.java | 115 +++
3 files changed, 251 insertions(+), 189 deletions(-)
diff --git
a/gateway-service-remoteconfig/src/test/java/org/apache/knox/gateway/service/config/remote/zk/RemoteConfigurationRegistryClientServiceSecureTest.java
b/gateway-service-remoteconfig/src/test/java/org/apache/knox/gateway/service/config/remote/zk/RemoteConfigurationRegistryClientServiceSecureTest.java
new file mode 100644
index 000..64c1877
--- /dev/null
+++
b/gateway-service-remoteconfig/src/test/java/org/apache/knox/gateway/service/config/remote/zk/RemoteConfigurationRegistryClientServiceSecureTest.java
@@ -0,0 +1,115 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with this
+ * work for additional information regarding copyright ownership. The ASF
+ * licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
under
+ * the License.
+ */
+package org.apache.knox.gateway.service.config.remote.zk;
+
+import org.apache.commons.io.FileUtils;
+import org.apache.curator.framework.CuratorFramework;
+import org.apache.curator.test.TestingCluster;
+import org.apache.knox.gateway.config.GatewayConfig;
+import
org.apache.knox.gateway.service.config.remote.util.RemoteRegistryConfigTestUtils;
+
+import org.easymock.EasyMock;
+import org.junit.Test;
+
+import java.io.File;
+import java.nio.charset.StandardCharsets;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
+public class RemoteConfigurationRegistryClientServiceSecureTest extends
RemoteConfigurationRegistryClientServiceTestBase {
+/*
+ * Test a configuration for a secure remote registry, included in the
gateway configuration.
+ */
+@Test
+public void testZooKeeperWithSimpleRegistryConfig() throws Exception {
+final String AUTH_TYPE = "digest";
+final String REGISTRY_CLIENT_NAME = "zk-registry-name";
+final String PRINCIPAL = "knox";
+final String PWD = "knoxtest";
+final String CRED_ALIAS = "zkCredential";
+
+// Configure and start a secure ZK cluster
+try (TestingCluster zkCluster =
setupAndStartSecureTestZooKeeper(PRINCIPAL, PWD)) {
+// Create the setup client for the test cluster, and initialize
the test znodes
+CuratorFramework setupClient =
initializeTestClientAndZNodes(zkCluster, PRINCIPAL);
+
+// Mock configuration
+GatewayConfig config =
EasyMock.createNiceMock(GatewayConfig.class);
+final String registryConfigValue =
+GatewayConfig.REMOTE_CONFIG_REGISTRY_TYPE + "=" +
ZooKeeperClientService.TYPE + ";" +
+GatewayConfig.REMOTE_CONFIG_REGISTRY_ADDRESS + "=" +
zkCluster.getConnectString() + ";" +
+GatewayConfig.REMOTE_CONFIG_REGISTRY_AUTH_TYPE + "=" +
AUTH_TYPE + ";" +
+GatewayConfig.REMOTE_CONFIG_REGISTRY_PRINCIPAL + "=" +
PRINCIPAL + ";" +
+GatewayConfig.REMOTE_CONFIG_REGISTRY_CREDENTIAL_ALIAS +
"=" + CRED_ALIAS;
+
EasyMock.expect(config.getRemoteRegistryConfiguration(REGISTRY_CLIENT_NAME))
+.andReturn(registryConfigValue)
+.anyTimes();
+EasyMock.expect(config.getRemoteRegistryConfigurationNames())
+
.andReturn(Collections.singletonList(REGISTRY_CLIENT_NAME)).anyTimes();
+EasyMock.replay(config);
+
+doTestZooKeeperClient(setupClient, REGISTRY_C
[knox] branch master updated (a619758 -> d861b12)
This is an automated email from the ASF dual-hosted git repository. krisden pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/knox.git. from a619758 KNOX-2468 - Improve ConfigurableDispatch set cookies (#385) new bde25bc KNOX-2471 - Upgrade Shiro to 1.7.0 new e32ab1a KNOX-2472 - Upgrade jetty to 9.4.34.v2020110 new d861b12 KNOX-2439 - Upgrade commons-io to 2.8.0 and forbiddenapis to 3.1 The 3 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: pom.xml | 8 1 file changed, 4 insertions(+), 4 deletions(-)
[knox] 03/03: KNOX-2439 - Upgrade commons-io to 2.8.0 and forbiddenapis to 3.1
This is an automated email from the ASF dual-hosted git repository. krisden pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/knox.git commit d861b126b9b65895eb7356dab4c8018d87bd845d Author: Kevin Risden AuthorDate: Tue Nov 17 14:02:04 2020 -0500 KNOX-2439 - Upgrade commons-io to 2.8.0 and forbiddenapis to 3.1 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 39bfd38..a926c69 100644 --- a/pom.xml +++ b/pom.xml @@ -173,7 +173,7 @@ 1.20 1.10 3.2 -2.7 +2.8.0 2.6 3.11 1.2 @@ -193,7 +193,7 @@ 3.0.0 1.2.18 1.10.1 -3.0.1 +3.1 1.10.0 2.8.6 3.0.5
[knox] 01/03: KNOX-2471 - Upgrade Shiro to 1.7.0
This is an automated email from the ASF dual-hosted git repository. krisden pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/knox.git commit bde25bc416c0ab24689f2b0e1638df9d4ab504da Author: Kevin Risden AuthorDate: Tue Nov 17 13:57:19 2020 -0500 KNOX-2471 - Upgrade Shiro to 1.7.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2699de3..6283e9e 100644 --- a/pom.xml +++ b/pom.xml @@ -247,7 +247,7 @@ 4.0.3 3.13.0 4.3.1 -1.6.0 +1.7.0 1.2.6 2.0.0 1.7.30
[knox] 02/03: KNOX-2472 - Upgrade jetty to 9.4.34.v2020110
This is an automated email from the ASF dual-hosted git repository. krisden pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/knox.git commit e32ab1aad5cbf138d5a46566cc692aacd35cd43f Author: Kevin Risden AuthorDate: Tue Nov 17 13:59:41 2020 -0500 KNOX-2472 - Upgrade jetty to 9.4.34.v2020110 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6283e9e..39bfd38 100644 --- a/pom.xml +++ b/pom.xml @@ -221,7 +221,7 @@ 5.0.0 3.4 2.6 -9.4.31.v20200723 +9.4.34.v20201102 2.14.6 5.6.0 2.10.6
[knox] branch master updated: Fix javadoc errors
This is an automated email from the ASF dual-hosted git repository.
krisden pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/knox.git
The following commit(s) were added to refs/heads/master by this push:
new 2b1d085 Fix javadoc errors
2b1d085 is described below
commit 2b1d0853ae89c17654ca6fec901a48ffc8616db6
Author: Kevin Risden
AuthorDate: Tue Sep 15 16:37:10 2020 -0400
Fix javadoc errors
---
.../services/token/impl/DefaultTokenStateService.java| 4 ++--
.../gateway/services/token/state/TokenStateJournal.java | 16
.../security/impl/DefaultKeystoreServiceTest.java| 2 +-
.../services/security/impl/RemoteAliasServiceTest.java | 2 +-
.../token/impl/AliasBasedTokenStateServiceTest.java | 4 ++--
.../token/impl/JournalBasedTokenStateServiceTest.java| 2 +-
.../services/topology/DefaultTopologyServiceTest.java| 2 +-
.../service/knoxtoken/TokenServiceResourceTest.java | 2 +-
.../org/apache/knox/gateway/config/GatewayConfig.java| 3 +++
.../services/security/token/TokenStateService.java | 1 +
10 files changed, 29 insertions(+), 9 deletions(-)
diff --git
a/gateway-server/src/main/java/org/apache/knox/gateway/services/token/impl/DefaultTokenStateService.java
b/gateway-server/src/main/java/org/apache/knox/gateway/services/token/impl/DefaultTokenStateService.java
index f58a7f1..042e167 100644
---
a/gateway-server/src/main/java/org/apache/knox/gateway/services/token/impl/DefaultTokenStateService.java
+++
b/gateway-server/src/main/java/org/apache/knox/gateway/services/token/impl/DefaultTokenStateService.java
@@ -254,7 +254,7 @@ public class DefaultTokenStateService implements
TokenStateService {
}
/**
- * @param token
+ * @param token Token to check.
* @return false, if the service has previously stored the specified token;
Otherwise, true.
*/
protected boolean isUnknown(final String token) {
@@ -275,7 +275,7 @@ public class DefaultTokenStateService implements
TokenStateService {
*
* @param tokenIds The unique identifiers of the tokens whose state should
be removed.
*
- * @throws UnknownTokenException
+ * @throws UnknownTokenException if the specified token in valid, but not
known to the service.
*/
protected void removeTokens(final Set tokenIds) throws
UnknownTokenException {
removeTokenState(tokenIds);
diff --git
a/gateway-server/src/main/java/org/apache/knox/gateway/services/token/state/TokenStateJournal.java
b/gateway-server/src/main/java/org/apache/knox/gateway/services/token/state/TokenStateJournal.java
index f9aa01b..a51d162 100644
---
a/gateway-server/src/main/java/org/apache/knox/gateway/services/token/state/TokenStateJournal.java
+++
b/gateway-server/src/main/java/org/apache/knox/gateway/services/token/state/TokenStateJournal.java
@@ -34,6 +34,8 @@ public interface TokenStateJournal {
* @param issueTime The issue timestamp
* @param expiration The expiration time
* @param maxLifetime The maximum allowed lifetime
+ *
+ * @throws IOException exception on error
*/
void add(String tokenId, long issueTime, long expiration, long maxLifetime)
throws IOException;
@@ -42,6 +44,8 @@ public interface TokenStateJournal {
* Persist the token state to the journal.
*
* @param entry The entry to persist
+ *
+ * @throws IOException exception on error
*/
void add(JournalEntry entry) throws IOException;
@@ -49,6 +53,8 @@ public interface TokenStateJournal {
* Persist the token state to the journal.
*
* @param entries The entries to persist
+ *
+ * @throws IOException exception on error
*/
void add(List entries) throws IOException;
@@ -57,6 +63,8 @@ public interface TokenStateJournal {
*
* @param tokenId The unique token identifier.
*
+ * @throws IOException exception on error
+ *
* @return A JournalEntry with the specified token's journaled state.
*/
JournalEntry get(String tokenId) throws IOException;
@@ -64,6 +72,8 @@ public interface TokenStateJournal {
/**
* Get all the the journaled tokens' state.
*
+ * @throws IOException exception on error
+ *
* @return A List of JournalEntry objects.
*/
List get() throws IOException;
@@ -72,6 +82,8 @@ public interface TokenStateJournal {
* Remove the token state for the specified token from the journal
*
* @param tokenId The unique token identifier
+ *
+ * @throws IOException exception on error
*/
void remove(String tokenId) throws IOException;
@@ -79,6 +91,8 @@ public interface TokenStateJournal {
* Remove the token state for the specified tokens from the journal
*
* @param tokenIds A set of unique token identifiers
+ *
+ * @throws IOException exception on error
*/
void remove(Collection tokenIds) throws
[knox] branch master updated: KNOX-2454 - Upgrade jetty to 9.4.31.v20200723
This is an automated email from the ASF dual-hosted git repository. krisden pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/knox.git The following commit(s) were added to refs/heads/master by this push: new be97e5d KNOX-2454 - Upgrade jetty to 9.4.31.v20200723 be97e5d is described below commit be97e5d682c3d680c33860b0a1237ff9bbc89fd7 Author: Kevin Risden AuthorDate: Fri Sep 11 10:44:32 2020 -0400 KNOX-2454 - Upgrade jetty to 9.4.31.v20200723 Signed-off-by: Kevin Risden --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7393712..aeaa5a3 100644 --- a/pom.xml +++ b/pom.xml @@ -221,7 +221,7 @@ 5.0.0 3.4 2.6 -9.4.30.v20200611 +9.4.31.v20200723 2.14.6 5.6.0 2.10.6
[knox] 02/06: KNOX-2449 - Upgrade jna to 5.6.0
This is an automated email from the ASF dual-hosted git repository. krisden pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/knox.git commit 0f1c6158688cd66e7f195903898e3ee5805602c6 Author: Kevin Risden AuthorDate: Thu Sep 10 14:41:58 2020 -0400 KNOX-2449 - Upgrade jna to 5.6.0 Signed-off-by: Kevin Risden --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3384e30..bc1c1a6 100644 --- a/pom.xml +++ b/pom.xml @@ -223,7 +223,7 @@ 2.6 9.4.30.v20200611 2.14.6 -5.5.0 +5.6.0 2.10.6 2.4.0 2.3
[knox] 06/06: KNOX-2447 - Upgrade testcontainers to 1.14.3
This is an automated email from the ASF dual-hosted git repository. krisden pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/knox.git commit b8d45cb5f0e37183de43062bd95e92f5863151d5 Author: Kevin Risden AuthorDate: Thu Sep 10 14:44:16 2020 -0400 KNOX-2447 - Upgrade testcontainers to 1.14.3 Signed-off-by: Kevin Risden --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b66a5ba..7393712 100644 --- a/pom.xml +++ b/pom.xml @@ -258,7 +258,7 @@ 1.8.3 4.2 1.2.5 -1.13.0 +1.14.3 2.4.0-b180830.0438 1.7 6.1.1
[knox] 01/06: KNOX-2448 - Upgrade exec-maven-plugin to 3.0.0
This is an automated email from the ASF dual-hosted git repository. krisden pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/knox.git commit 1cb699218258454fd348d18df8f221e33e5d95b7 Author: Kevin Risden AuthorDate: Thu Sep 10 14:41:17 2020 -0400 KNOX-2448 - Upgrade exec-maven-plugin to 3.0.0 Signed-off-by: Kevin Risden --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 343d5b3..3384e30 100644 --- a/pom.xml +++ b/pom.xml @@ -190,7 +190,7 @@ 4.2 2.7.6 2.6.11 -1.6.0 +3.0.0 1.2.18 1.10.1 3.0.1
[knox] 05/06: KNOX-2452 - Upgrade netty to 4.1.52.Final
This is an automated email from the ASF dual-hosted git repository. krisden pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/knox.git commit 49646060aaad243d350196a83409368468f6107b Author: Kevin Risden AuthorDate: Thu Sep 10 14:43:47 2020 -0400 KNOX-2452 - Upgrade netty to 4.1.52.Final Signed-off-by: Kevin Risden --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2945369..b66a5ba 100644 --- a/pom.xml +++ b/pom.xml @@ -239,7 +239,7 @@ 3.12.0 4.1.12.1 2.0.21 -4.1.51.Final +4.1.52.Final 8.14.1 v12.18.2 2.7.5
[knox] 04/06: KNOX-2451 - Upgrade protobuf-java to 3.13.0
This is an automated email from the ASF dual-hosted git repository. krisden pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/knox.git commit 90070c01eaa91df0d9ec24125dd782595b0eca6e Author: Kevin Risden AuthorDate: Thu Sep 10 14:43:15 2020 -0400 KNOX-2451 - Upgrade protobuf-java to 3.13.0 Signed-off-by: Kevin Risden --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index bc1c1a6..2945369 100644 --- a/pom.xml +++ b/pom.xml @@ -245,7 +245,7 @@ 2.7.5 3.4.5 4.0.3 -3.12.4 +3.13.0 4.3.1 1.5.3 1.2.6
[knox] 03/06: KNOX-2450 - Upgrade maven-bundle-plugin to 5.1.1
This is an automated email from the ASF dual-hosted git repository. krisden pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/knox.git commit 6fb741d863c1aa3547d216f3e2f6d50139d75828 Author: Kevin Risden AuthorDate: Thu Sep 10 14:42:46 2020 -0400 KNOX-2450 - Upgrade maven-bundle-plugin to 5.1.1 Signed-off-by: Kevin Risden --- gateway-test-release/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gateway-test-release/pom.xml b/gateway-test-release/pom.xml index de93b12..641e464 100644 --- a/gateway-test-release/pom.xml +++ b/gateway-test-release/pom.xml @@ -284,7 +284,7 @@ org.apache.felix maven-bundle-plugin -4.2.1 +5.1.1 true true
[knox] branch master updated (5f2bea1 -> b8d45cb)
This is an automated email from the ASF dual-hosted git repository. krisden pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/knox.git. from 5f2bea1 KNOX-2446 - Upgrade jackson to 2.11.2 new 1cb6992 KNOX-2448 - Upgrade exec-maven-plugin to 3.0.0 new 0f1c615 KNOX-2449 - Upgrade jna to 5.6.0 new 6fb741d KNOX-2450 - Upgrade maven-bundle-plugin to 5.1.1 new 90070c0 KNOX-2451 - Upgrade protobuf-java to 3.13.0 new 4964606 KNOX-2452 - Upgrade netty to 4.1.52.Final new b8d45cb KNOX-2447 - Upgrade testcontainers to 1.14.3 The 6 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: gateway-test-release/pom.xml | 2 +- pom.xml | 10 +- 2 files changed, 6 insertions(+), 6 deletions(-)
[knox] 05/08: KNOX-2428 - Upgrade metrics to 4.1.12.1
This is an automated email from the ASF dual-hosted git repository. krisden pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/knox.git commit b66e1a47d04df2e0899d82b8ef2a1895983b7947 Author: Kevin Risden AuthorDate: Thu Sep 10 13:58:54 2020 -0400 KNOX-2428 - Upgrade metrics to 4.1.12.1 Signed-off-by: Kevin Risden --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index aa933cc..2139d75 100644 --- a/pom.xml +++ b/pom.xml @@ -237,7 +237,7 @@ 3.1.2 3.0.0-M3 3.12.0 -4.1.6 +4.1.12.1 2.0.21 4.1.51.Final 8.14.1
[knox] 07/08: KNOX-2445 - Upgrade spring to 5.2.8.RELEASE
This is an automated email from the ASF dual-hosted git repository. krisden pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/knox.git commit d61fd2c4362cb29aab96d24108af303e9e8a97cb Author: Kevin Risden AuthorDate: Thu Sep 10 14:06:37 2020 -0400 KNOX-2445 - Upgrade spring to 5.2.8.RELEASE Signed-off-by: Kevin Risden --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9e494f6..2c5a983 100644 --- a/pom.xml +++ b/pom.xml @@ -253,7 +253,7 @@ 1.7.30 4.1.2 4.0.4 -5.2.5.RELEASE +5.2.8.RELEASE 2.2.2.RELEASE 1.8.3 4.2
[knox] 01/08: KNOX-2442 - Upgrade checkstyle to 8.36
This is an automated email from the ASF dual-hosted git repository.
krisden pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/knox.git
commit 2032332b06dec21e02e1b60677c16a7c0c5f8c93
Author: Kevin Risden
AuthorDate: Thu Sep 10 13:55:29 2020 -0400
KNOX-2442 - Upgrade checkstyle to 8.36
Signed-off-by: Kevin Risden
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 743a896..9dd83c9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -163,7 +163,7 @@
2.8.5
1.4
3.3.0
-8.35
+8.36
7.0.3
${cloudera-manager.version}
1.9.4
[knox] 02/08: KNOX-2441 - Upgrade commons-codec to 1.15
This is an automated email from the ASF dual-hosted git repository.
krisden pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/knox.git
commit dcb260a0445cf3a79232b9edc094b3e2b7facfb8
Author: Kevin Risden
AuthorDate: Thu Sep 10 13:56:05 2020 -0400
KNOX-2441 - Upgrade commons-codec to 1.15
Signed-off-by: Kevin Risden
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 9dd83c9..a5e91ee 100644
--- a/pom.xml
+++ b/pom.xml
@@ -168,7 +168,7 @@
${cloudera-manager.version}
1.9.4
1.4
-1.14
+1.15
3.2.2
1.20
1.10
[knox] 06/08: KNOX-2443 - Upgrade spotbugs to 4.1.2
This is an automated email from the ASF dual-hosted git repository. krisden pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/knox.git commit 97620b10a2d6ed1c5ee535a54ffe7aacc52901f9 Author: Kevin Risden AuthorDate: Thu Sep 10 13:59:51 2020 -0400 KNOX-2443 - Upgrade spotbugs to 4.1.2 Signed-off-by: Kevin Risden --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2139d75..9e494f6 100644 --- a/pom.xml +++ b/pom.xml @@ -251,7 +251,7 @@ 1.2.6 2.0.0 1.7.30 -4.0.6 +4.1.2 4.0.4 5.2.5.RELEASE 2.2.2.RELEASE
[knox] 03/08: KNOX-2444 - Upgrade commons-net to 3.7
This is an automated email from the ASF dual-hosted git repository. krisden pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/knox.git commit 03533899b4345f318a915df39f58e9afa38ab2cb Author: Kevin Risden AuthorDate: Thu Sep 10 13:57:42 2020 -0400 KNOX-2444 - Upgrade commons-net to 3.7 Signed-off-by: Kevin Risden --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a5e91ee..f2a12fd 100644 --- a/pom.xml +++ b/pom.xml @@ -178,7 +178,7 @@ 3.11 1.2 3.6.1 -3.6 +3.7 1.9 2.9 1.2.4
[knox] 08/08: KNOX-2446 - Upgrade jackson to 2.11.2
This is an automated email from the ASF dual-hosted git repository. krisden pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/knox.git commit 5f2bea133e0c5e6a311199229cb0685ce6ae7cb9 Author: Kevin Risden AuthorDate: Thu Sep 10 14:07:05 2020 -0400 KNOX-2446 - Upgrade jackson to 2.11.2 Signed-off-by: Kevin Risden --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2c5a983..343d5b3 100644 --- a/pom.xml +++ b/pom.xml @@ -203,7 +203,7 @@ 0.2 4.5.12 4.4.13 -2.11.1 +2.11.2 0.8.5 1.18 1.2.0
[knox] 04/08: KNOX-2440 - Upgrade dependency-check-maven to 6.0.0
This is an automated email from the ASF dual-hosted git repository. krisden pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/knox.git commit 593fefac964fd24e219d54ab86f2e953f21b74bc Author: Kevin Risden AuthorDate: Thu Sep 10 13:58:20 2020 -0400 KNOX-2440 - Upgrade dependency-check-maven to 6.0.0 Signed-off-by: Kevin Risden --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f2a12fd..aa933cc 100644 --- a/pom.xml +++ b/pom.xml @@ -183,7 +183,7 @@ 2.9 1.2.4 4.3.0 -5.3.2 +6.0.0 10.14.2.0 1.4.13 2.1.3
[knox] branch master updated (4334689 -> 5f2bea1)
This is an automated email from the ASF dual-hosted git repository. krisden pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/knox.git. from 4334689 KNOX-2437 The request url does not have to be coded (#370) new 2032332 KNOX-2442 - Upgrade checkstyle to 8.36 new dcb260a KNOX-2441 - Upgrade commons-codec to 1.15 new 0353389 KNOX-2444 - Upgrade commons-net to 3.7 new 593fefa KNOX-2440 - Upgrade dependency-check-maven to 6.0.0 new b66e1a4 KNOX-2428 - Upgrade metrics to 4.1.12.1 new 97620b1 KNOX-2443 - Upgrade spotbugs to 4.1.2 new d61fd2c KNOX-2445 - Upgrade spring to 5.2.8.RELEASE new 5f2bea1 KNOX-2446 - Upgrade jackson to 2.11.2 The 8 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: pom.xml | 16 1 file changed, 8 insertions(+), 8 deletions(-)
[knox] branch master updated: KNOX-2434 - Knox should fallback to JDK default keystore/truststore type instead of hardcoding JKS (#366)
This is an automated email from the ASF dual-hosted git repository.
krisden pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/knox.git
The following commit(s) were added to refs/heads/master by this push:
new 8084100 KNOX-2434 - Knox should fallback to JDK default
keystore/truststore type instead of hardcoding JKS (#366)
8084100 is described below
commit 808410042a960b936a8d85cb658b2cad18ed60db
Author: Kevin Risden
AuthorDate: Fri Jul 31 12:30:15 2020 -0400
KNOX-2434 - Knox should fallback to JDK default keystore/truststore type
instead of hardcoding JKS (#366)
Signed-off-by: Kevin Risden
---
.../org/apache/knox/gateway/config/impl/GatewayConfigImpl.java | 3 ++-
.../java/org/apache/knox/gateway/GatewayGlobalConfigTest.java| 3 ++-
.../apache/knox/gateway/config/impl/GatewayConfigImplTest.java | 5 +++--
.../main/java/org/apache/knox/gateway/config/GatewayConfig.java | 9 +
4 files changed, 12 insertions(+), 8 deletions(-)
diff --git
a/gateway-server/src/main/java/org/apache/knox/gateway/config/impl/GatewayConfigImpl.java
b/gateway-server/src/main/java/org/apache/knox/gateway/config/impl/GatewayConfigImpl.java
index 2968b44..3d62237 100644
---
a/gateway-server/src/main/java/org/apache/knox/gateway/config/impl/GatewayConfigImpl.java
+++
b/gateway-server/src/main/java/org/apache/knox/gateway/config/impl/GatewayConfigImpl.java
@@ -37,6 +37,7 @@ import java.net.MalformedURLException;
import java.net.URL;
import java.net.UnknownHostException;
import java.nio.file.Paths;
+import java.security.KeyStore;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
@@ -591,7 +592,7 @@ public class GatewayConfigImpl extends Configuration
implements GatewayConfig {
@Override
public String getKeystoreType() {
-return get( KEYSTORE_TYPE, "JKS");
+return get( KEYSTORE_TYPE, KeyStore.getDefaultType());
}
@Override
diff --git
a/gateway-server/src/test/java/org/apache/knox/gateway/GatewayGlobalConfigTest.java
b/gateway-server/src/test/java/org/apache/knox/gateway/GatewayGlobalConfigTest.java
index 1953e32..970b087 100644
---
a/gateway-server/src/test/java/org/apache/knox/gateway/GatewayGlobalConfigTest.java
+++
b/gateway-server/src/test/java/org/apache/knox/gateway/GatewayGlobalConfigTest.java
@@ -25,6 +25,7 @@ import org.junit.Test;
import java.io.File;
import java.net.URL;
+import java.security.KeyStore;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
@@ -68,7 +69,7 @@ public class GatewayGlobalConfigTest {
assertThat( config.isClientAuthNeeded(), is( true ) );
assertThat( config.getTruststorePath(), is("./gateway-trust.jks"));
assertThat( config.getTruststoreType(), is( "PKCS12" ) );
-assertThat( config.getKeystoreType(), is( "JKS" ) );
+assertThat( config.getKeystoreType(), is(KeyStore.getDefaultType()) );
}
@Test
diff --git
a/gateway-server/src/test/java/org/apache/knox/gateway/config/impl/GatewayConfigImplTest.java
b/gateway-server/src/test/java/org/apache/knox/gateway/config/impl/GatewayConfigImplTest.java
index f449d05..9195e1f 100644
---
a/gateway-server/src/test/java/org/apache/knox/gateway/config/impl/GatewayConfigImplTest.java
+++
b/gateway-server/src/test/java/org/apache/knox/gateway/config/impl/GatewayConfigImplTest.java
@@ -23,6 +23,7 @@ import org.hamcrest.CoreMatchers;
import org.junit.Test;
import java.nio.file.Paths;
+import java.security.KeyStore;
import java.util.List;
import java.util.Map;
import java.util.concurrent.TimeUnit;
@@ -356,7 +357,7 @@ public class GatewayConfigImplTest {
// Validate default options (backwards compatibility)
assertEquals("gateway-httpclient-truststore-password",
config.getHttpClientTruststorePasswordAlias());
-assertEquals("JKS", config.getHttpClientTruststoreType());
+assertEquals(KeyStore.getDefaultType(),
config.getHttpClientTruststoreType());
assertNull(config.getHttpClientTruststorePath());
// Validate changed options
@@ -375,7 +376,7 @@ public class GatewayConfigImplTest {
// Validate default options (backwards compatibility)
assertEquals("gateway-truststore-password",
config.getTruststorePasswordAlias());
-assertEquals("JKS", config.getTruststoreType());
+assertEquals(KeyStore.getDefaultType(), config.getTruststoreType());
assertNull(config.getTruststorePath());
// Validate changed options
diff --git
a/gateway-spi/src/main/java/org/apache/knox/gateway/config/GatewayConfig.java
b/gateway-spi/src/main/java/org/apache/knox/gateway/config/GatewayConfig.java
index 4e533ad..471170f 100644
---
a/gateway-spi/src/main/java/org/apache/knox/gateway/config/GatewayConfig.java
+++
b/gateway-spi/src/main/java/org/apache/knox/gateway/config/GatewayConfig.java
@@ -19,6 +19,7 @@ packa
[knox] branch master updated: KNOX-2434 - Knox should fallback to JDK default keystore/truststore type instead of hardcoding JKS (#366)
This is an automated email from the ASF dual-hosted git repository.
krisden pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/knox.git
The following commit(s) were added to refs/heads/master by this push:
new 8084100 KNOX-2434 - Knox should fallback to JDK default
keystore/truststore type instead of hardcoding JKS (#366)
8084100 is described below
commit 808410042a960b936a8d85cb658b2cad18ed60db
Author: Kevin Risden
AuthorDate: Fri Jul 31 12:30:15 2020 -0400
KNOX-2434 - Knox should fallback to JDK default keystore/truststore type
instead of hardcoding JKS (#366)
Signed-off-by: Kevin Risden
---
.../org/apache/knox/gateway/config/impl/GatewayConfigImpl.java | 3 ++-
.../java/org/apache/knox/gateway/GatewayGlobalConfigTest.java| 3 ++-
.../apache/knox/gateway/config/impl/GatewayConfigImplTest.java | 5 +++--
.../main/java/org/apache/knox/gateway/config/GatewayConfig.java | 9 +
4 files changed, 12 insertions(+), 8 deletions(-)
diff --git
a/gateway-server/src/main/java/org/apache/knox/gateway/config/impl/GatewayConfigImpl.java
b/gateway-server/src/main/java/org/apache/knox/gateway/config/impl/GatewayConfigImpl.java
index 2968b44..3d62237 100644
---
a/gateway-server/src/main/java/org/apache/knox/gateway/config/impl/GatewayConfigImpl.java
+++
b/gateway-server/src/main/java/org/apache/knox/gateway/config/impl/GatewayConfigImpl.java
@@ -37,6 +37,7 @@ import java.net.MalformedURLException;
import java.net.URL;
import java.net.UnknownHostException;
import java.nio.file.Paths;
+import java.security.KeyStore;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
@@ -591,7 +592,7 @@ public class GatewayConfigImpl extends Configuration
implements GatewayConfig {
@Override
public String getKeystoreType() {
-return get( KEYSTORE_TYPE, "JKS");
+return get( KEYSTORE_TYPE, KeyStore.getDefaultType());
}
@Override
diff --git
a/gateway-server/src/test/java/org/apache/knox/gateway/GatewayGlobalConfigTest.java
b/gateway-server/src/test/java/org/apache/knox/gateway/GatewayGlobalConfigTest.java
index 1953e32..970b087 100644
---
a/gateway-server/src/test/java/org/apache/knox/gateway/GatewayGlobalConfigTest.java
+++
b/gateway-server/src/test/java/org/apache/knox/gateway/GatewayGlobalConfigTest.java
@@ -25,6 +25,7 @@ import org.junit.Test;
import java.io.File;
import java.net.URL;
+import java.security.KeyStore;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
@@ -68,7 +69,7 @@ public class GatewayGlobalConfigTest {
assertThat( config.isClientAuthNeeded(), is( true ) );
assertThat( config.getTruststorePath(), is("./gateway-trust.jks"));
assertThat( config.getTruststoreType(), is( "PKCS12" ) );
-assertThat( config.getKeystoreType(), is( "JKS" ) );
+assertThat( config.getKeystoreType(), is(KeyStore.getDefaultType()) );
}
@Test
diff --git
a/gateway-server/src/test/java/org/apache/knox/gateway/config/impl/GatewayConfigImplTest.java
b/gateway-server/src/test/java/org/apache/knox/gateway/config/impl/GatewayConfigImplTest.java
index f449d05..9195e1f 100644
---
a/gateway-server/src/test/java/org/apache/knox/gateway/config/impl/GatewayConfigImplTest.java
+++
b/gateway-server/src/test/java/org/apache/knox/gateway/config/impl/GatewayConfigImplTest.java
@@ -23,6 +23,7 @@ import org.hamcrest.CoreMatchers;
import org.junit.Test;
import java.nio.file.Paths;
+import java.security.KeyStore;
import java.util.List;
import java.util.Map;
import java.util.concurrent.TimeUnit;
@@ -356,7 +357,7 @@ public class GatewayConfigImplTest {
// Validate default options (backwards compatibility)
assertEquals("gateway-httpclient-truststore-password",
config.getHttpClientTruststorePasswordAlias());
-assertEquals("JKS", config.getHttpClientTruststoreType());
+assertEquals(KeyStore.getDefaultType(),
config.getHttpClientTruststoreType());
assertNull(config.getHttpClientTruststorePath());
// Validate changed options
@@ -375,7 +376,7 @@ public class GatewayConfigImplTest {
// Validate default options (backwards compatibility)
assertEquals("gateway-truststore-password",
config.getTruststorePasswordAlias());
-assertEquals("JKS", config.getTruststoreType());
+assertEquals(KeyStore.getDefaultType(), config.getTruststoreType());
assertNull(config.getTruststorePath());
// Validate changed options
diff --git
a/gateway-spi/src/main/java/org/apache/knox/gateway/config/GatewayConfig.java
b/gateway-spi/src/main/java/org/apache/knox/gateway/config/GatewayConfig.java
index 4e533ad..471170f 100644
---
a/gateway-spi/src/main/java/org/apache/knox/gateway/config/GatewayConfig.java
+++
b/gateway-spi/src/main/java/org/apache/knox/gateway/config/GatewayConfig.java
@@ -19,6 +19,7 @@ packa
[knox] 01/09: KNOX-2423 - Upgrade commons-io to 2.7
This is an automated email from the ASF dual-hosted git repository. krisden pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/knox.git commit 1028645baf5b1c7c45eb29616a0f59485866206c Author: Kevin Risden AuthorDate: Wed Jul 29 15:52:56 2020 -0400 KNOX-2423 - Upgrade commons-io to 2.7 Requires upgrading forbiddenapis as well Signed-off-by: Kevin Risden --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 404bb35..db2a262 100644 --- a/pom.xml +++ b/pom.xml @@ -171,7 +171,7 @@ 1.20 1.10 3.2 -2.6 +2.7 2.6 3.11 1.2 @@ -191,7 +191,7 @@ 1.6.0 1.2.18 1.10.1 -2.7 +3.0.1 1.10.0 2.8.6 3.0.3
[knox] 04/09: KNOX-2430 - Upgrade caffeine to 2.8.5
This is an automated email from the ASF dual-hosted git repository. krisden pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/knox.git commit 4f3fafb0d2fe00507e322b62db9078cc7536146f Author: Kevin Risden AuthorDate: Thu Jul 30 10:45:02 2020 -0400 KNOX-2430 - Upgrade caffeine to 2.8.5 Signed-off-by: Kevin Risden --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1ca7dcc..606fac8 100644 --- a/pom.xml +++ b/pom.xml @@ -158,7 +158,7 @@ 8.0.1 1.9.6 1.66 -2.8.1 +2.8.5 1.4 3.3.0 8.31
[knox] 07/09: KNOX-2424 - Upgrade protobuf-java to 3.12.4
This is an automated email from the ASF dual-hosted git repository. krisden pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/knox.git commit 7ccd35823bfd0f59a8dabb1eb9ed4fb553d4454c Author: Kevin Risden AuthorDate: Thu Jul 30 10:46:56 2020 -0400 KNOX-2424 - Upgrade protobuf-java to 3.12.4 Signed-off-by: Kevin Risden --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6593060..e039ff6 100644 --- a/pom.xml +++ b/pom.xml @@ -243,7 +243,7 @@ 2.7.5 3.4.3 3.8.3 -3.11.4 +3.12.4 4.3.0 1.5.3 1.2.6
[knox] 05/09: KNOX-2425 - Upgrade checkstyle to 8.35
This is an automated email from the ASF dual-hosted git repository.
krisden pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/knox.git
commit d38272c0c21d685884fd8c460f10140fd4c42ca4
Author: Kevin Risden
AuthorDate: Thu Jul 30 10:45:42 2020 -0400
KNOX-2425 - Upgrade checkstyle to 8.35
Signed-off-by: Kevin Risden
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 606fac8..202cbd1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -161,7 +161,7 @@
2.8.5
1.4
3.3.0
-8.31
+8.35
7.0.3
${cloudera-manager.version}
1.9.4
[knox] branch master updated (2bfa094 -> 6bef739)
This is an automated email from the ASF dual-hosted git repository. krisden pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/knox.git. from 2bfa094 KNOX-2417 - Upgrade log4j to 2.13.3 new 1028645 KNOX-2423 - Upgrade commons-io to 2.7 new 3f3a919 KNOX-2427 - Upgrade aspectj to 1.9.6 new 2781937 KNOX-2429 - Upgrade bcprov-jdk15on to 1.66 new 4f3fafb KNOX-2430 - Upgrade caffeine to 2.8.5 new d38272c KNOX-2425 - Upgrade checkstyle to 8.35 new 2613313 KNOX-2426 - Upgrade groovy to 3.0.5 new 7ccd358 KNOX-2424 - Upgrade protobuf-java to 3.12.4 new 486836c KNOX-2431 - Upgrade rest-assured to 4.3.1 new 6bef739 KNOX-2432 / KNOX-2433 - Upgrade spotbugs to 4.0.6 and spotbugs-maven-plugin to 4.0.4 The 9 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: pom.xml | 22 +++--- 1 file changed, 11 insertions(+), 11 deletions(-)
[knox] 08/09: KNOX-2431 - Upgrade rest-assured to 4.3.1
This is an automated email from the ASF dual-hosted git repository. krisden pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/knox.git commit 486836c031c5a786dd0055c18147c0c88bb26846 Author: Kevin Risden AuthorDate: Thu Jul 30 10:47:32 2020 -0400 KNOX-2431 - Upgrade rest-assured to 4.3.1 Signed-off-by: Kevin Risden --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e039ff6..a7a12ed 100644 --- a/pom.xml +++ b/pom.xml @@ -244,7 +244,7 @@ 3.4.3 3.8.3 3.12.4 -4.3.0 +4.3.1 1.5.3 1.2.6 2.0.0
[knox] 06/09: KNOX-2426 - Upgrade groovy to 3.0.5
This is an automated email from the ASF dual-hosted git repository. krisden pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/knox.git commit 2613313c5fe3a7de6ecbba871187281e22213f95 Author: Kevin Risden AuthorDate: Thu Jul 30 10:46:17 2020 -0400 KNOX-2426 - Upgrade groovy to 3.0.5 Signed-off-by: Kevin Risden --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 202cbd1..6593060 100644 --- a/pom.xml +++ b/pom.xml @@ -194,7 +194,7 @@ 3.0.1 1.10.0 2.8.6 -3.0.3 +3.0.5 28.2-jre 3.2.1 2.2
[knox] 03/09: KNOX-2429 - Upgrade bcprov-jdk15on to 1.66
This is an automated email from the ASF dual-hosted git repository. krisden pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/knox.git commit 27819370afaeb3482121b337f60988d67b281e6e Author: Kevin Risden AuthorDate: Thu Jul 30 10:44:24 2020 -0400 KNOX-2429 - Upgrade bcprov-jdk15on to 1.66 Signed-off-by: Kevin Risden --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 231be78..1ca7dcc 100644 --- a/pom.xml +++ b/pom.xml @@ -157,7 +157,7 @@ 1.8.1 8.0.1 1.9.6 -1.65 +1.66 2.8.1 1.4 3.3.0
[knox] 09/09: KNOX-2432 / KNOX-2433 - Upgrade spotbugs to 4.0.6 and spotbugs-maven-plugin to 4.0.4
This is an automated email from the ASF dual-hosted git repository. krisden pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/knox.git commit 6bef73989a1e4aea68a19096ca3e7f9b97c05e07 Author: Kevin Risden AuthorDate: Thu Jul 30 10:48:42 2020 -0400 KNOX-2432 / KNOX-2433 - Upgrade spotbugs to 4.0.6 and spotbugs-maven-plugin to 4.0.4 Signed-off-by: Kevin Risden --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index a7a12ed..1ecf88a 100644 --- a/pom.xml +++ b/pom.xml @@ -249,8 +249,8 @@ 1.2.6 2.0.0 1.7.30 -4.0.1 -4.0.0 +4.0.6 +4.0.4 5.2.5.RELEASE 2.2.2.RELEASE 1.8.3
[knox] 02/09: KNOX-2427 - Upgrade aspectj to 1.9.6
This is an automated email from the ASF dual-hosted git repository. krisden pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/knox.git commit 3f3a9195044d770ee2a59595f3ff063ac3f2336a Author: Kevin Risden AuthorDate: Thu Jul 30 10:43:32 2020 -0400 KNOX-2427 - Upgrade aspectj to 1.9.6 Signed-off-by: Kevin Risden --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index db2a262..231be78 100644 --- a/pom.xml +++ b/pom.xml @@ -156,7 +156,7 @@ 0.13 1.8.1 8.0.1 -1.9.5 +1.9.6 1.65 2.8.1 1.4
[knox] 01/08: KNOX-2421 - Upgrade commons-lang3 to 3.11
This is an automated email from the ASF dual-hosted git repository. krisden pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/knox.git commit cd38d9dd72a20fb67971583a3aa8d3f6303c0d0d Author: Kevin Risden AuthorDate: Wed Jul 29 10:55:59 2020 -0400 KNOX-2421 - Upgrade commons-lang3 to 3.11 Signed-off-by: Kevin Risden --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e1cf327..a14edba 100644 --- a/pom.xml +++ b/pom.xml @@ -173,7 +173,7 @@ 3.2 2.6 2.6 -3.10 +3.11 1.2 3.6.1 3.6
[knox] 06/08: KNOX-2418 - Upgrade jetty to 9.4.30.v20200611
This is an automated email from the ASF dual-hosted git repository. krisden pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/knox.git commit bc04ae9db02c3c4313c8b03fcbfac8f323931f3f Author: Kevin Risden AuthorDate: Wed Jul 29 11:01:44 2020 -0400 KNOX-2418 - Upgrade jetty to 9.4.30.v20200611 Signed-off-by: Kevin Risden --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 45dd56f..972ac18 100644 --- a/pom.xml +++ b/pom.xml @@ -219,7 +219,7 @@ 7.5.1 3.4 2.6 -9.4.27.v20200227 +9.4.30.v20200611 2.14.6 5.5.0 2.10.5
[knox] 02/08: KNOX-2422 - Upgrade commons-text to 1.9
This is an automated email from the ASF dual-hosted git repository. krisden pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/knox.git commit 9884d30ca6f0385ea824f233a10c9210e615aaf6 Author: Kevin Risden AuthorDate: Wed Jul 29 10:57:58 2020 -0400 KNOX-2422 - Upgrade commons-text to 1.9 Signed-off-by: Kevin Risden --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a14edba..502be7c 100644 --- a/pom.xml +++ b/pom.xml @@ -177,7 +177,7 @@ 1.2 3.6.1 3.6 -1.8 +1.9 2.9 1.2.4 4.3.0
[knox] branch master updated (7879cef -> 2bfa094)
This is an automated email from the ASF dual-hosted git repository. krisden pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/knox.git. from 7879cef KNOX-2397 knox failed to start with error "java.lang.NoSuchMethodError: org.eclipse.persistence.internal.oxm.mappings.Field.setNestedArray(Z)V" (#357) new cd38d9d KNOX-2421 - Upgrade commons-lang3 to 3.11 new 9884d30 KNOX-2422 - Upgrade commons-text to 1.9 new 61b23df KNOX-2414 - Upgrade dom4j to 2.1.3 new b7ab10a KNOX-2416 - Upgrade frontend-maven-plugin to 1.10.0 new eb20ab4 KNOX-2419 - Upgrade jackson to 2.11.1 new bc04ae9 KNOX-2418 - Upgrade jetty to 9.4.30.v20200611 new 791dad1 KNOX-2415 - Upgrade joda-time to 2.01.6 new 2bfa094 KNOX-2417 - Upgrade log4j to 2.13.3 The 8 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: pom.xml | 16 1 file changed, 8 insertions(+), 8 deletions(-)
[knox] 07/08: KNOX-2415 - Upgrade joda-time to 2.01.6
This is an automated email from the ASF dual-hosted git repository. krisden pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/knox.git commit 791dad1fe6e1d20a32371961bc041764cdd3e50b Author: Kevin Risden AuthorDate: Wed Jul 29 11:02:30 2020 -0400 KNOX-2415 - Upgrade joda-time to 2.01.6 Signed-off-by: Kevin Risden --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 972ac18..ca248bb 100644 --- a/pom.xml +++ b/pom.xml @@ -222,7 +222,7 @@ 9.4.30.v20200611 2.14.6 5.5.0 -2.10.5 +2.10.6 2.4.0 2.3 4.13
[knox] 05/08: KNOX-2419 - Upgrade jackson to 2.11.1
This is an automated email from the ASF dual-hosted git repository. krisden pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/knox.git commit eb20ab4f5a52d77fcec175725d1a4f2b1c69d19b Author: Kevin Risden AuthorDate: Wed Jul 29 11:00:53 2020 -0400 KNOX-2419 - Upgrade jackson to 2.11.1 Signed-off-by: Kevin Risden --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 49fd7d4..45dd56f 100644 --- a/pom.xml +++ b/pom.xml @@ -202,7 +202,7 @@ 4.5.12 4.4.13 4.1.0 -2.10.3 +2.11.1 0.8.5 1.18 1.2.0
[knox] 03/08: KNOX-2414 - Upgrade dom4j to 2.1.3
This is an automated email from the ASF dual-hosted git repository. krisden pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/knox.git commit 61b23dffbf07b06aa13d1c7fddbb183202fe49b2 Author: Kevin Risden AuthorDate: Wed Jul 29 10:58:41 2020 -0400 KNOX-2414 - Upgrade dom4j to 2.1.3 Signed-off-by: Kevin Risden --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 502be7c..45cdb18 100644 --- a/pom.xml +++ b/pom.xml @@ -184,7 +184,7 @@ 5.3.2 10.14.2.0 1.4.13 -2.1.1 +2.1.3 4.2 2.7.6 2.6.11
[knox] 04/08: KNOX-2416 - Upgrade frontend-maven-plugin to 1.10.0
This is an automated email from the ASF dual-hosted git repository. krisden pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/knox.git commit b7ab10a95ad0641d333fa41acf10355b7002e511 Author: Kevin Risden AuthorDate: Wed Jul 29 10:59:19 2020 -0400 KNOX-2416 - Upgrade frontend-maven-plugin to 1.10.0 Signed-off-by: Kevin Risden --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 45cdb18..49fd7d4 100644 --- a/pom.xml +++ b/pom.xml @@ -192,7 +192,7 @@ 1.2.18 1.10.1 2.7 -1.9.1 +1.10.0 2.8.6 3.0.3 28.2-jre
[knox] 08/08: KNOX-2417 - Upgrade log4j to 2.13.3
This is an automated email from the ASF dual-hosted git repository. krisden pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/knox.git commit 2bfa09432576368a29b78baac2d87684ed2bdfe6 Author: Kevin Risden AuthorDate: Wed Jul 29 11:03:18 2020 -0400 KNOX-2417 - Upgrade log4j to 2.13.3 Signed-off-by: Kevin Risden --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ca248bb..404bb35 100644 --- a/pom.xml +++ b/pom.xml @@ -229,7 +229,7 @@ 1.4.4 1.11 1.2.17 -2.13.1 +2.13.3 3.1.1 3.8.1 3.1.2
[knox] branch master updated: KNOX-2397 knox failed to start with error "java.lang.NoSuchMethodError: org.eclipse.persistence.internal.oxm.mappings.Field.setNestedArray(Z)V" (#357)
This is an automated email from the ASF dual-hosted git repository.
krisden pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/knox.git
The following commit(s) were added to refs/heads/master by this push:
new 7879cef KNOX-2397 knox failed to start with error
"java.lang.NoSuchMethodError:
org.eclipse.persistence.internal.oxm.mappings.Field.setNestedArray(Z)V" (#357)
7879cef is described below
commit 7879cef08e8c0806e53017e98de801d17d4ba44a
Author: zhangbutao <9760681+butaozh...@users.noreply.github.com>
AuthorDate: Wed Jul 29 22:45:15 2020 +0800
KNOX-2397 knox failed to start with error "java.lang.NoSuchMethodError:
org.eclipse.persistence.internal.oxm.mappings.Field.setNestedArray(Z)V" (#357)
Co-authored-by: zhangbutao
---
pom.xml | 23 ++-
1 file changed, 22 insertions(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index d695d90..e1cf327 100644
--- a/pom.xml
+++ b/pom.xml
@@ -189,6 +189,7 @@
2.7.6
2.6.11
1.6.0
+1.2.18
1.10.1
2.7
1.9.1
@@ -212,8 +213,9 @@
2.0
1.1
2.3.0
-2.3.2
+2.3.3
2.3.2
+1.2.2
7.5.1
3.4
2.6
@@ -251,6 +253,7 @@
4.0.0
5.2.5.RELEASE
2.2.2.RELEASE
+1.8.3
4.2
1.2.5
1.13.0
@@ -1330,6 +1333,24 @@
+com.sun.activation
+jakarta.activation
+${jakarta.activation.version}
+
+
+
+org.jvnet.staxex
+stax-ex
+${stax-ex.version}
+
+
+
+com.sun.xml.fastinfoset
+FastInfoset
+${fastinfoset.version}
+
+
+
org.eclipse.persistence
eclipselink
${eclipselink.version}
[knox] branch master updated: KNOX-2406 - Use dependency bom for dependency management (#363)
This is an automated email from the ASF dual-hosted git repository.
krisden pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/knox.git
The following commit(s) were added to refs/heads/master by this push:
new d2aecb7 KNOX-2406 - Use dependency bom for dependency management
(#363)
d2aecb7 is described below
commit d2aecb7af22768086d6d1668c7e794f69267650e
Author: Kevin Risden
AuthorDate: Fri Jul 17 12:17:44 2020 -0400
KNOX-2406 - Use dependency bom for dependency management (#363)
Signed-off-by: Kevin Risden
---
pom.xml | 195 ++--
1 file changed, 43 insertions(+), 152 deletions(-)
diff --git a/pom.xml b/pom.xml
index 5365306..d695d90 100644
--- a/pom.xml
+++ b/pom.xml
@@ -249,7 +249,7 @@
1.7.30
4.0.1
4.0.0
-5.2.5.RELEASE
+5.2.5.RELEASE
2.2.2.RELEASE
4.2
1.2.5
@@ -1206,63 +1206,65 @@
-com.nimbusds
-nimbus-jose-jwt
-${nimbus-jose-jwt.version}
-
-
-com.nimbusds
-lang-tag
-${lang-tag.version}
+com.fasterxml.jackson
+jackson-bom
+${jackson.version}
+pom
+import
-net.minidev
-json-smart
-${json-smart.version}
-
-
org.eclipse.jetty
-jetty-http
+jetty-bom
${jetty.version}
+pom
+import
+
org.eclipse.jetty
-jetty-server
+jetty-servlet
${jetty.version}
+tests
org.eclipse.jetty
-jetty-util
+jetty-http
${jetty.version}
+tests
+
-org.eclipse.jetty
-jetty-util-ajax
-${jetty.version}
+io.netty
+netty-bom
+${netty.version}
+pom
+import
+
-org.eclipse.jetty
-jetty-servlet
-${jetty.version}
+org.springframework
+spring-framework-bom
+${spring.version}
+pom
+import
+
-org.eclipse.jetty
-jetty-webapp
-${jetty.version}
+com.nimbusds
+nimbus-jose-jwt
+${nimbus-jose-jwt.version}
-
-org.eclipse.jetty
-jetty-servlet
-${jetty.version}
-tests
+com.nimbusds
+lang-tag
+${lang-tag.version}
+
-org.eclipse.jetty
-jetty-http
-${jetty.version}
-tests
+net.minidev
+json-smart
+${json-smart.version}
@@ -1596,33 +1598,6 @@
-io.netty
-netty-all
-${netty.version}
-
-
-
-com.fasterxml.jackson.core
-jackson-annotations
-${jackson.version}
-
-
-com.fasterxml.jackson.core
-jackson-core
-${jackson.version}
-
-
-com.fasterxml.jackson.core
-jackson-databind
-${jackson.version}
-
-
-com.fasterxml.jackson.dataformat
-jackson-dataformat-yaml
-${jackson.version}
-
-
-
org.codehaus.woodstox
stax2-api
${stax2-api.version}
@@ -1949,27 +1924,6 @@
-org.eclipse.jetty
-jetty-io
-${jetty.version}
-
-
-org.eclipse.jetty
-jetty-annotations
-${jetty.version}
-
-
-org.eclipse.jetty
-apache-jsp
-${jetty.version}
-
-
-org.eclipse.jetty
-apache-jstl
-${jetty.version}
-
-
-
org.apache.taglibs
taglibs-standard-spec
${taglibs-standard.version}
@@ -1982,16 +1936,6
[knox] branch master updated: KNOX-2221 - Upgrade shiro to 1.5.3 (#360)
This is an automated email from the ASF dual-hosted git repository. krisden pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/knox.git The following commit(s) were added to refs/heads/master by this push: new 5c1992e KNOX-2221 - Upgrade shiro to 1.5.3 (#360) 5c1992e is described below commit 5c1992ed9e077fa0d03379b0de7ce2be156cfc8a Author: Kevin Risden AuthorDate: Mon Jul 13 10:33:01 2020 -0400 KNOX-2221 - Upgrade shiro to 1.5.3 (#360) Signed-off-by: Kevin Risden --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0fb005a..7e7225f 100644 --- a/pom.xml +++ b/pom.xml @@ -242,7 +242,7 @@ 3.8.3 3.11.4 4.3.0 -1.4.2 +1.5.3 1.2.6 2.0.0 1.7.30
[knox] branch master updated: KNOX-2404 - Update AdminUI and Homepage NodeJS dependencies (#359)
This is an automated email from the ASF dual-hosted git repository.
krisden pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/knox.git
The following commit(s) were added to refs/heads/master by this push:
new f1183bf KNOX-2404 - Update AdminUI and Homepage NodeJS dependencies
(#359)
f1183bf is described below
commit f1183bfa23a49b4da8a675aa72eefb5588e6c4b0
Author: Kevin Risden
AuthorDate: Sun Jul 12 20:44:17 2020 -0400
KNOX-2404 - Update AdminUI and Homepage NodeJS dependencies (#359)
Signed-off-by: Kevin Risden
---
gateway-admin-ui/package-lock.json | 816 ++--
gateway-admin-ui/package.json | 2 +-
knox-homepage-ui/package-lock.json | 822 +++--
knox-homepage-ui/package.json | 2 +-
pom.xml| 2 +-
5 files changed, 1197 insertions(+), 447 deletions(-)
diff --git a/gateway-admin-ui/package-lock.json
b/gateway-admin-ui/package-lock.json
index 3baa0ee..9b7d1e5 100644
--- a/gateway-admin-ui/package-lock.json
+++ b/gateway-admin-ui/package-lock.json
@@ -302,9 +302,9 @@
"integrity":
"sha512-M1JtZctO2Zg+1qeGUFZXtYKsyaRptqQtqpVzlj80I0NzGW9MF3um0DBuizIvQlrPYUlTdm+wcOPZpZoerkxQdA=="
},
"acorn": {
- "version": "5.7.3",
- "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.3.tgz;,
- "integrity":
"sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw==",
+ "version": "5.7.4",
+ "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.4.tgz;,
+ "integrity":
"sha512-1D++VG7BhrtvQpNbBzovKNc1FLGGEE/oGe7b9xJm/RFHMBeUaUGpluV9RLjZa47YFdPcDAenEYuq9pQPcMdLJg==",
"dev": true
},
"acorn-dynamic-import": {
@@ -377,7 +377,8 @@
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz;,
"integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=",
- "dev": true
+ "dev": true,
+ "optional": true
},
"angular2-datatable": {
"version": "0.6.0",
@@ -1365,9 +1366,9 @@
}
},
"kind-of": {
- "version": "6.0.2",
- "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz;,
- "integrity":
"sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
+ "version": "6.0.3",
+ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz;,
+ "integrity":
"sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
"dev": true
}
}
@@ -1746,11 +1747,25 @@
"randomfill": "^1.0.3"
}
},
-"css-parse": {
- "version": "1.7.0",
- "resolved": "https://registry.npmjs.org/css-parse/-/css-parse-1.7.0.tgz;,
- "integrity": "sha1-Mh9s9zeCpv91ERE5D8BeLGV9jJs=",
- "dev": true
+"css": {
+ "version": "2.2.4",
+ "resolved": "https://registry.npmjs.org/css/-/css-2.2.4.tgz;,
+ "integrity":
"sha512-oUnjmWpy0niI3x/mPL8dVEI1l7MnG3+HHyRPHf+YFSbK+svOhXpmSOcDURUh2aOCgl2grzrOPt1nHLuCVFULLw==",
+ "dev": true,
+ "requires": {
+"inherits": "^2.0.3",
+"source-map": "^0.6.1",
+"source-map-resolve": "^0.5.2",
+"urix": "^0.1.0"
+ },
+ "dependencies": {
+"source-map": {
+ "version": "0.6.1",
+ "resolved":
"https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz;,
+ "integrity":
"sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+ "dev": true
+}
+ }
},
"css-select": {
"version": "1.2.0",
@@ -1931,9 +1946,9 @@
"dev": true
},
"kind-of": {
- "version": "6.0.2",
- "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz;,
- "integrity":
"sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
+ "version&
[knox] branch master updated: Add ASF license to .asf.yaml
This is an automated email from the ASF dual-hosted git repository. krisden pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/knox.git The following commit(s) were added to refs/heads/master by this push: new 77ed53f Add ASF license to .asf.yaml 77ed53f is described below commit 77ed53fe365c8cdedcd7516f8539024113a5d56a Author: Kevin Risden AuthorDate: Tue Apr 28 11:45:28 2020 -0400 Add ASF license to .asf.yaml --- .asf.yaml | 16 1 file changed, 16 insertions(+) diff --git a/.asf.yaml b/.asf.yaml index 0c2311a..3822c3d 100644 --- a/.asf.yaml +++ b/.asf.yaml @@ -1,3 +1,19 @@ +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to you under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# notifications: commits: commits@knox.apache.org issues: d...@knox.apache.org
[knox] branch master updated: KNOX-2360 - Add .asf.yaml to link Jira and Github
This is an automated email from the ASF dual-hosted git repository. krisden pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/knox.git The following commit(s) were added to refs/heads/master by this push: new 0e0f94e KNOX-2360 - Add .asf.yaml to link Jira and Github 0e0f94e is described below commit 0e0f94e545bc4ab405ad872eae4d97ef05006acc Author: Kevin Risden AuthorDate: Tue Apr 28 10:34:43 2020 -0400 KNOX-2360 - Add .asf.yaml to link Jira and Github Signed-off-by: Kevin Risden --- .asf.yaml | 6 ++ 1 file changed, 6 insertions(+) diff --git a/.asf.yaml b/.asf.yaml new file mode 100644 index 000..0c2311a --- /dev/null +++ b/.asf.yaml @@ -0,0 +1,6 @@ +notifications: +commits: commits@knox.apache.org +issues: d...@knox.apache.org +pullrequests: d...@knox.apache.org +jira_options: link label worklog +
[knox] branch master updated: KNOX-2359 - Knox src zip should not include node_modules folder (#328)
This is an automated email from the ASF dual-hosted git repository. krisden pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/knox.git The following commit(s) were added to refs/heads/master by this push: new da1e739 KNOX-2359 - Knox src zip should not include node_modules folder (#328) da1e739 is described below commit da1e739a93d31cdd71d358df79e4a388cc4a24ab Author: Kevin Risden AuthorDate: Mon Apr 27 14:25:48 2020 -0400 KNOX-2359 - Knox src zip should not include node_modules folder (#328) Signed-off-by: Kevin Risden --- src/assembly.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/assembly.xml b/src/assembly.xml index 58ffa86..60565fa 100644 --- a/src/assembly.xml +++ b/src/assembly.xml @@ -32,7 +32,8 @@ **/.settings/** **/.idea/** **/*.iml +**/node_modules/** - \ No newline at end of file +
[knox] branch master updated: KNOX-2354 An HBASEJARS service which can proxy HBase jars hosted by t… (#325)
This is an automated email from the ASF dual-hosted git repository. krisden pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/knox.git The following commit(s) were added to refs/heads/master by this push: new bbcaaff KNOX-2354 An HBASEJARS service which can proxy HBase jars hosted by t… (#325) bbcaaff is described below commit bbcaaff1d3483d706f7d76c344920b4f755809b7 Author: Josh Elser AuthorDate: Mon Apr 27 13:32:26 2020 -0400 KNOX-2354 An HBASEJARS service which can proxy HBase jars hosted by t… (#325) * KNOX-2354 An HBASEJARS service which can proxy HBase jars hosted by the HBASEUI In HBase, we can host a "mini" maven repo in hbase itself which a maven application can point to. We want this to be in its own service because it has different semantics than the normal hbaseUI service has (e.g. one would be hooked up to SSO login, but SSO won't work against that), and Maven cannot function with the query-string based backend-routing that we do to make the HBaseUI look like a normal website (instead of a collection of independent webservers). * Add some context as to why this custom dispatch is here. --- .../resources/services/hbasejars/2.2.0/rewrite.xml | 49 ++ .../resources/services/hbasejars/2.2.0/service.xml | 48 + 2 files changed, 97 insertions(+) diff --git a/gateway-service-definitions/src/main/resources/services/hbasejars/2.2.0/rewrite.xml b/gateway-service-definitions/src/main/resources/services/hbasejars/2.2.0/rewrite.xml new file mode 100644 index 000..d291305 --- /dev/null +++ b/gateway-service-definitions/src/main/resources/services/hbasejars/2.2.0/rewrite.xml @@ -0,0 +1,49 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/gateway-service-definitions/src/main/resources/services/hbasejars/2.2.0/service.xml b/gateway-service-definitions/src/main/resources/services/hbasejars/2.2.0/service.xml new file mode 100644 index 000..4a75572 --- /dev/null +++ b/gateway-service-definitions/src/main/resources/services/hbasejars/2.2.0/service.xml @@ -0,0 +1,48 @@ + + + +API +/hbase/maven +Jar hosting for HBase +Static hosting of HBase client jars from the backend HBase UI. + + + + + + + + + + + + + + + + + + + + + +
[knox] branch v1.4.0 updated: KNOX-2347 - Disable shellcheck for github actions (#317)
This is an automated email from the ASF dual-hosted git repository.
krisden pushed a commit to branch v1.4.0
in repository https://gitbox.apache.org/repos/asf/knox.git
The following commit(s) were added to refs/heads/v1.4.0 by this push:
new 9634a3e KNOX-2347 - Disable shellcheck for github actions (#317)
9634a3e is described below
commit 9634a3ed4ab06f2aaf7bb2acbc2ea721717efbc4
Author: Kevin Risden
AuthorDate: Mon Apr 20 12:29:04 2020 -0400
KNOX-2347 - Disable shellcheck for github actions (#317)
Signed-off-by: Kevin Risden
---
.github/workflows/main.yml | 9 +
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 9521bd5..93074dc 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -41,8 +41,9 @@ jobs:
java-version: ${{ matrix.java }}
- name: 'Build and Test'
run: mvn -T.75C clean verify -U -Dsurefire.useFile=false
-Djavax.net.ssl.trustStorePassword=changeit -B -V
- - name: shellcheck
-uses: reviewdog/action-shellcheck@v1
-with:
- pattern: "*release*/home/bin/*.sh"
+# This is failing due to not finding files? - See KNOX-2347
+# - name: shellcheck
+#uses: reviewdog/action-shellcheck@v1
+#with:
+# pattern: "*release*/home/bin/*.sh"
[knox] branch master updated: KNOX-2346 - Remove unused maxRetryAttempts and retrySleep (#316)
This is an automated email from the ASF dual-hosted git repository.
krisden pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/knox.git
The following commit(s) were added to refs/heads/master by this push:
new 4c00380 KNOX-2346 - Remove unused maxRetryAttempts and retrySleep
(#316)
4c00380 is described below
commit 4c003804c4c3821cb42df6c2f78505556be16b2f
Author: Kevin Risden
AuthorDate: Tue Apr 21 10:06:23 2020 -0400
KNOX-2346 - Remove unused maxRetryAttempts and retrySleep (#316)
Signed-off-by: Kevin Risden
---
.../provider-config-wizard/ha-provider-config.ts | 2 -
.../ha/deploy/HaProviderDeploymentContributor.java | 10
.../knox/gateway/ha/provider/HaServiceConfig.java | 8
.../ha/provider/impl/DefaultHaServiceConfig.java | 25 --
.../ha/provider/impl/HaDescriptorConstants.java| 4 --
.../ha/provider/impl/HaDescriptorFactory.java | 17 +--
.../ha/provider/impl/HaDescriptorManager.java | 4 --
.../ha/provider/impl/HaServiceConfigConstants.java | 8
.../HaProviderDeploymentContributorTest.java | 54 +-
.../gateway/ha/dispatch/DefaultHaDispatchTest.java | 4 +-
.../ha/provider/impl/HaDescriptorFactoryTest.java | 8 +---
.../ha/provider/impl/HaDescriptorManagerTest.java | 18 +++-
.../simple/ProviderConfigurationParserTest.java| 6 +--
.../simple/SimpleDescriptorHandlerTest.java| 8 ++--
.../knox/gateway/rm/dispatch/RMHaDispatchTest.java | 6 +--
.../knox/gateway/hdfs/i18n/WebHdfsMessages.java| 10
.../hdfs/dispatch/WebHdfsHaDispatchTest.java | 4 +-
.../org/apache/knox/gateway/PortMappingHelper.java | 2 +-
.../org/apache/knox/gateway/WebHdfsHaFuncTest.java | 2 +-
19 files changed, 39 insertions(+), 161 deletions(-)
diff --git
a/gateway-admin-ui/admin-ui/app/provider-config-wizard/ha-provider-config.ts
b/gateway-admin-ui/admin-ui/app/provider-config-wizard/ha-provider-config.ts
index b39b227..30b1e05 100644
--- a/gateway-admin-ui/admin-ui/app/provider-config-wizard/ha-provider-config.ts
+++ b/gateway-admin-ui/admin-ui/app/provider-config-wizard/ha-provider-config.ts
@@ -45,8 +45,6 @@ export class HaProviderConfig extends
DisplayBindingProviderConfig {
[HaProviderConfig.SERVICE_NAME, 'serviceName'],
[HaProviderConfig.MAX_FAILOVER_ATTEMPTS, 'maxFailoverAttempts'],
[HaProviderConfig.FAILOVER_SLEEP, 'failoverSleep'],
-[HaProviderConfig.MAX_RETRY_ATTEMPTS, 'maxRetryAttempts'],
-[HaProviderConfig.RETRY_SLEEP, 'retrySleep'],
[HaProviderConfig.ZK_ENSEMBLE, 'zookeeperEnsemble'],
[HaProviderConfig.ZK_NAMESPACE, 'zookeeperNamespace']
] as [string, string][]);
diff --git
a/gateway-provider-ha/src/main/java/org/apache/knox/gateway/ha/deploy/HaProviderDeploymentContributor.java
b/gateway-provider-ha/src/main/java/org/apache/knox/gateway/ha/deploy/HaProviderDeploymentContributor.java
index c906e10..ede0a17 100644
---
a/gateway-provider-ha/src/main/java/org/apache/knox/gateway/ha/deploy/HaProviderDeploymentContributor.java
+++
b/gateway-provider-ha/src/main/java/org/apache/knox/gateway/ha/deploy/HaProviderDeploymentContributor.java
@@ -123,16 +123,6 @@ public class HaProviderDeploymentContributor extends
ProviderDeploymentContribut
config.setMaxFailoverAttempts(Integer.parseInt(failOverAttempts));
}
- String retrySleep =
serviceLevelParams.get(HaServiceConfigConstants.CONFIG_PARAM_RETRY_SLEEP);
- if (retrySleep != null) {
-config.setRetrySleep(Integer.parseInt(retrySleep));
- }
-
- String retryAttempts =
serviceLevelParams.get(HaServiceConfigConstants.CONFIG_PARAM_MAX_RETRY_ATTEMPTS);
- if (retryAttempts != null) {
-config.setMaxRetryAttempts(Integer.parseInt(retryAttempts));
- }
-
String zkEnsemble =
serviceLevelParams.get(HaServiceConfigConstants.CONFIG_PARAM_ZOOKEEPER_ENSEMBLE);
if (zkEnsemble != null) {
config.setZookeeperEnsemble(zkEnsemble);
diff --git
a/gateway-provider-ha/src/main/java/org/apache/knox/gateway/ha/provider/HaServiceConfig.java
b/gateway-provider-ha/src/main/java/org/apache/knox/gateway/ha/provider/HaServiceConfig.java
index 8daa2d6..dacb8c6 100644
---
a/gateway-provider-ha/src/main/java/org/apache/knox/gateway/ha/provider/HaServiceConfig.java
+++
b/gateway-provider-ha/src/main/java/org/apache/knox/gateway/ha/provider/HaServiceConfig.java
@@ -34,14 +34,6 @@ public interface HaServiceConfig {
int getFailoverSleep();
- void setMaxRetryAttempts(int limit);
-
- int getMaxRetryAttempts();
-
- void setRetrySleep(int sleep);
-
- int getRetrySleep();
-
String getZookeeperEnsemble();
void setZookeeperEnsemble(String zookeeperEnsemble);
diff --git
a/gateway-provider-ha/src/main/java/org/apache/knox/gateway/ha/provider/impl/DefaultHaServiceConfig.java
b/gateway-provider
[knox] branch master updated: KNOX-2347 - Disable shellcheck for github actions (#317)
This is an automated email from the ASF dual-hosted git repository.
krisden pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/knox.git
The following commit(s) were added to refs/heads/master by this push:
new 0535ab9 KNOX-2347 - Disable shellcheck for github actions (#317)
0535ab9 is described below
commit 0535ab9162228505f1247b51288f42476a31b306
Author: Kevin Risden
AuthorDate: Mon Apr 20 12:29:04 2020 -0400
KNOX-2347 - Disable shellcheck for github actions (#317)
Signed-off-by: Kevin Risden
---
.github/workflows/main.yml | 9 +
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 9521bd5..93074dc 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -41,8 +41,9 @@ jobs:
java-version: ${{ matrix.java }}
- name: 'Build and Test'
run: mvn -T.75C clean verify -U -Dsurefire.useFile=false
-Djavax.net.ssl.trustStorePassword=changeit -B -V
- - name: shellcheck
-uses: reviewdog/action-shellcheck@v1
-with:
- pattern: "*release*/home/bin/*.sh"
+# This is failing due to not finding files? - See KNOX-2347
+# - name: shellcheck
+#uses: reviewdog/action-shellcheck@v1
+#with:
+# pattern: "*release*/home/bin/*.sh"
[knox] branch master updated: KNOX-2339 - Add Github Actions for CI (#311)
This is an automated email from the ASF dual-hosted git repository.
krisden pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/knox.git
The following commit(s) were added to refs/heads/master by this push:
new 3189fe7 KNOX-2339 - Add Github Actions for CI (#311)
3189fe7 is described below
commit 3189fe7b9f02a0318f62662fa1eaf6369a0ee6e6
Author: Kevin Risden
AuthorDate: Tue Apr 14 11:03:17 2020 -0400
KNOX-2339 - Add Github Actions for CI (#311)
Signed-off-by: Kevin Risden
---
.github/workflows/main.yml | 48 ++
1 file changed, 48 insertions(+)
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
new file mode 100644
index 000..9521bd5
--- /dev/null
+++ b/.github/workflows/main.yml
@@ -0,0 +1,48 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to you under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+on:
+ push:
+paths-ignore:
+ - 'site/**'
+branches:
+ - '*'
+ pull_request:
+paths-ignore:
+ - 'site/**'
+branches:
+ - '*'
+
+jobs:
+ build:
+runs-on: ubuntu-latest
+strategy:
+ matrix:
+java: [ 8, 11 ]
+ fail-fast: false
+name: CI - Java ${{ matrix.java }}
+steps:
+ - uses: actions/checkout@v2
+ - name: 'Setup Java'
+uses: actions/setup-java@v1
+with:
+ java-version: ${{ matrix.java }}
+ - name: 'Build and Test'
+run: mvn -T.75C clean verify -U -Dsurefire.useFile=false
-Djavax.net.ssl.trustStorePassword=changeit -B -V
+ - name: shellcheck
+uses: reviewdog/action-shellcheck@v1
+with:
+ pattern: "*release*/home/bin/*.sh"
+
[knox] branch master updated: KNOX-2340 - Fix DefaultTokenStateServiceTest timeouts (#312)
This is an automated email from the ASF dual-hosted git repository.
krisden pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/knox.git
The following commit(s) were added to refs/heads/master by this push:
new 0e04e5c KNOX-2340 - Fix DefaultTokenStateServiceTest timeouts (#312)
0e04e5c is described below
commit 0e04e5c005e9cc7d3f0f811633477a5067deb0aa
Author: Kevin Risden
AuthorDate: Fri Apr 10 23:43:23 2020 -0400
KNOX-2340 - Fix DefaultTokenStateServiceTest timeouts (#312)
Fix DefaultTokenStateServiceTest timeouts to be more
reasonable. I used TimeUnit every where to ensure we
are doing things with the correct unit of time.
Previously there were issues where milliseconds and
seconds were being mixed. This caused race conditions
in AliasBasedTokenStateServiceTest which extends
DefaultTokenStateServiceTest.
Signed-off-by: Kevin Risden
---
.../token/impl/DefaultTokenStateService.java | 2 +-
.../token/impl/DefaultTokenStateServiceTest.java | 44 +++---
2 files changed, 23 insertions(+), 23 deletions(-)
diff --git
a/gateway-server/src/main/java/org/apache/knox/gateway/services/token/impl/DefaultTokenStateService.java
b/gateway-server/src/main/java/org/apache/knox/gateway/services/token/impl/DefaultTokenStateService.java
index 575213c..7397a68 100644
---
a/gateway-server/src/main/java/org/apache/knox/gateway/services/token/impl/DefaultTokenStateService.java
+++
b/gateway-server/src/main/java/org/apache/knox/gateway/services/token/impl/DefaultTokenStateService.java
@@ -252,7 +252,7 @@ public class DefaultTokenStateService implements
TokenStateService {
protected boolean hasRemainingRenewals(final String tokenId, long
renewInterval) {
// Is the current time + 30-second buffer + the renewal interval is less
than the max lifetime for the token?
-return ((System.currentTimeMillis() + 3 + renewInterval) <
getMaxLifetime(tokenId));
+return ((System.currentTimeMillis() + TimeUnit.SECONDS.toMillis(30) +
renewInterval) < getMaxLifetime(tokenId));
}
protected long getMaxLifetime(final String tokenId) {
diff --git
a/gateway-server/src/test/java/org/apache/knox/gateway/services/token/impl/DefaultTokenStateServiceTest.java
b/gateway-server/src/test/java/org/apache/knox/gateway/services/token/impl/DefaultTokenStateServiceTest.java
index e6ad1fc..d7306f2 100644
---
a/gateway-server/src/test/java/org/apache/knox/gateway/services/token/impl/DefaultTokenStateServiceTest.java
+++
b/gateway-server/src/test/java/org/apache/knox/gateway/services/token/impl/DefaultTokenStateServiceTest.java
@@ -45,7 +45,6 @@ import static org.junit.Assert.fail;
public class DefaultTokenStateServiceTest {
- private static long EVICTION_INTERVAL = 2L;
private static RSAPrivateKey privateKey;
@BeforeClass
@@ -59,7 +58,7 @@ public class DefaultTokenStateServiceTest {
@Test
public void testGetExpiration() throws Exception {
-final JWTToken token = createMockToken(System.currentTimeMillis() + 6);
+final JWTToken token = createMockToken(System.currentTimeMillis() +
TimeUnit.SECONDS.toMillis(60));
final TokenStateService tss = createTokenStateService();
tss.addToken(token, System.currentTimeMillis());
@@ -81,7 +80,7 @@ public class DefaultTokenStateServiceTest {
@Test(expected = UnknownTokenException.class)
public void testGetExpiration_InvalidToken() throws Exception {
-final JWTToken token = createMockToken(System.currentTimeMillis() + 6);
+final JWTToken token = createMockToken(System.currentTimeMillis() +
TimeUnit.SECONDS.toMillis(60));
// Expecting an UnknownTokenException because the token is not known to
the TokenStateService
createTokenStateService().getTokenExpiration(TokenUtils.getTokenId(token));
@@ -89,7 +88,7 @@ public class DefaultTokenStateServiceTest {
@Test
public void testGetExpiration_AfterRenewal() throws Exception {
-final JWTToken token = createMockToken(System.currentTimeMillis() + 6);
+final JWTToken token = createMockToken(System.currentTimeMillis() +
TimeUnit.SECONDS.toMillis(60));
final TokenStateService tss = createTokenStateService();
tss.addToken(token, System.currentTimeMillis());
@@ -103,7 +102,7 @@ public class DefaultTokenStateServiceTest {
@Test
public void testIsExpired_Negative() throws Exception {
-final JWTToken token = createMockToken(System.currentTimeMillis() + 6);
+final JWTToken token = createMockToken(System.currentTimeMillis() +
TimeUnit.SECONDS.toMillis(60));
final TokenStateService tss = createTokenStateService();
tss.addToken(token, System.currentTimeMillis());
@@ -112,7 +111,7 @@ public class DefaultTokenStateServiceTest {
@Test
public void testIsExpired_Positive() throws Exception {
-final JWTToken token = createMockToken(System.currentTimeMillis() - 6);
+final JWTToken
[knox] branch master updated: KNOX-2338 - Upgrade apacheds.directory.server.version to 2.0.0.AM26 (#309)
This is an automated email from the ASF dual-hosted git repository. krisden pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/knox.git The following commit(s) were added to refs/heads/master by this push: new b5d97a1 KNOX-2338 - Upgrade apacheds.directory.server.version to 2.0.0.AM26 (#309) b5d97a1 is described below commit b5d97a197d22da5900715b5a84a7e3b22c03cea9 Author: Kevin Risden AuthorDate: Fri Apr 10 21:41:01 2020 -0400 KNOX-2338 - Upgrade apacheds.directory.server.version to 2.0.0.AM26 (#309) Signed-off-by: Kevin Risden --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 99413f0..5d72690 100644 --- a/pom.xml +++ b/pom.xml @@ -150,8 +150,8 @@ 8 - 2.0.0.AM1 - 2.0.0.AM25 +2.0.0 + 2.0.0.AM26 2.0.0-M5 0.13 1.8.1
