This is an automated email from the ASF dual-hosted git repository.
benjobs pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-streampark.git
The following commit(s) were added to refs/heads/dev by this push:
new 77ddb3683 slim the pac4j package (#3017)
77ddb3683 is described below
commit 77ddb3683991e52f142ff9a61cf1f04931b28c61
Author: Leomax_Sun <[email protected]>
AuthorDate: Mon Sep 4 20:13:19 2023 +0800
slim the pac4j package (#3017)
---
dist-material/release-docs/LICENSE | 15 ++++++++---
.../streampark-console-service/pom.xml | 29 ++++++++--------------
2 files changed, 21 insertions(+), 23 deletions(-)
diff --git a/dist-material/release-docs/LICENSE
b/dist-material/release-docs/LICENSE
index de8a35c67..6a24b6d2a 100644
--- a/dist-material/release-docs/LICENSE
+++ b/dist-material/release-docs/LICENSE
@@ -238,7 +238,10 @@ The text of each license is the standard Apache 2.0
license. https://www.apache.
https://mvnrepository.com/artifact/com.google.j2objc/j2objc-annotations/1.3
Apache-2.0
https://mvnrepository.com/artifact/com.googlecode.javaewah/JavaEWAH/1.1.13
Apache-2.0
https://mvnrepository.com/artifact/com.jamesmurty.utils/java-xmlbuilder/0.4
Apache-2.0
- https://mvnrepository.com/artifact/com.nimbusds/nimbus-jose-jwt/7.9
Apache-2.0
+ https://mvnrepository.com/artifact/com.nimbusds/nimbus-jose-jwt/8.22.1
Apache-2.0
+ https://mvnrepository.com/artifact/com.nimbusds/oauth2-oidc-sdk/8.22
Apache-2.0
+ https://mvnrepository.com/artifact/com.nimbusds/content-type/2.1 Apache-2.0
+ https://mvnrepository.com/artifact/com.nimbusds/lang-tag/1.4.4 Apache-2.0
https://mvnrepository.com/artifact/com.squareup.moshi/moshi/1.8.0
Apache-2.0
https://mvnrepository.com/artifact/com.squareup.okhttp3/logging-interceptor/3.14.4
Apache-2.0
https://mvnrepository.com/artifact/com.squareup.okhttp3/okhttp/3.14.4
Apache-2.0
@@ -325,7 +328,7 @@ The text of each license is the standard Apache 2.0
license. https://www.apache.
https://mvnrepository.com/artifact/net.bytebuddy/byte-buddy/1.12.13
Apache-2.0
https://mvnrepository.com/artifact/net.java.dev.jets3t/jets3t/0.9.0
Apache-2.0
https://mvnrepository.com/artifact/net.minidev/accessors-smart/2.4.8
Apache-2.0
- https://mvnrepository.com/artifact/net.minidev/json-smart/2.4.8 Apache-2.0
+ https://mvnrepository.com/artifact/net.minidev/json-smart/2.4.10 Apache-2.0
https://mvnrepository.com/artifact/org.apache.avro/avro/1.7.7 Apache-2.0
https://mvnrepository.com/artifact/org.apache.calcite.avatica/avatica-core/1.17.0
Apache-2.0
https://mvnrepository.com/artifact/org.apache.commons/commons-compress/1.21
Apache-2.0
@@ -401,6 +404,7 @@ The text of each license is the standard Apache 2.0
license. https://www.apache.
https://mvnrepository.com/artifact/org.apache.httpcomponents/httpmime/4.5.13
Apache-2.0
https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-api/2.17.1
Apache-2.0
https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-core/2.17.1
Apache-2.0
+
https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-to-slf4j/2.17.2
Apache-2.0
https://mvnrepository.com/artifact/org.apache.maven.plugins/maven-shade-plugin/3.2.4
Apache-2.0
https://mvnrepository.com/artifact/org.apache.maven.shared/maven-artifact-transfer/0.12.0
Apache-2.0
https://mvnrepository.com/artifact/org.apache.maven.shared/maven-common-artifact-filters/3.0.1
Apache-2.0
@@ -504,6 +508,7 @@ The text of each license is the standard Apache 2.0
license. https://www.apache.
https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-starter-validation/2.7.11
Apache-2.0
https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-starter-web/2.7.11
Apache-2.0
https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-starter-websocket/2.7.11
Apache-2.0
+
https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-configuration-processor/2.7.11
Apache-2.0
https://mvnrepository.com/artifact/org.springframework.ldap/spring-ldap-core/2.4.1
Apache-2.0
https://mvnrepository.com/artifact/org.springframework.plugin/spring-plugin-core/2.0.0.RELEASE
Apache-2.0
https://mvnrepository.com/artifact/org.springframework.plugin/spring-plugin-metadata/2.0.0.RELEASE
Apache-2.0
@@ -565,8 +570,9 @@ The text of each license is the standard Apache 2.0
license. https://www.apache.
https://mvnrepository.com/artifact/org.wildfly.common/wildfly-common/1.5.4.Final
Apache-2.0
https://mvnrepository.com/artifact/org.javassist/javassist/3.24.0-GA
Apache-2.0
https://mvnrepository.com/artifact/io.buji/buji-pac4j/5.0.1 Apache-2.0
- https://mvnrepository.com/artifact/org.pac4j/pac4j-core/4.5.7 Apache-2.0
https://mvnrepository.com/artifact/org.pac4j/pac4j-springboot/4.5.7
Apache-2.0
+ https://mvnrepository.com/artifact/org.pac4j/pac4j-config/4.5.7 Apache-2.0
+ https://mvnrepository.com/artifact/org.pac4j/pac4j-core/4.5.7 Apache-2.0
https://mvnrepository.com/artifact/org.pac4j/pac4j-oauth/4.5.7 Apache-2.0
https://mvnrepository.com/artifact/org.pac4j/pac4j-oidc/4.5.7 Apache-2.0
https://mvnrepository.com/artifact/io.fabric8/kubernetes-client/6.8.0
Apache-2.0
@@ -724,7 +730,8 @@ The text of each license is also included in
licenses/LICENSE-[project].txt.
https://mvnrepository.com/artifact/com.lihaoyi/pprint_2.12/0.8.1 MIT
https://mvnrepository.com/artifact/com.lihaoyi/os-lib_2.12/0.8.1 MIT
https://mvnrepository.com/artifact/com.lihaoyi/upickle_2.12/0.8.1 MIT
-
+
https://mvnrepository.com/artifact/com.github.scribejava/scribejava-apis/7.1.1
MIT
+
https://mvnrepository.com/artifact/com.github.scribejava/scribejava-core/7.1.1
MIT
========================================================================
diff --git a/streampark-console/streampark-console-service/pom.xml
b/streampark-console/streampark-console-service/pom.xml
index 28d0c11ae..2e6156603 100644
--- a/streampark-console/streampark-console-service/pom.xml
+++ b/streampark-console/streampark-console-service/pom.xml
@@ -202,30 +202,12 @@
</dependency>
<!-- pac4j for SSO-->
- <dependency>
- <groupId>org.pac4j</groupId>
- <artifactId>pac4j-core</artifactId>
- <version>${pac4jVersion}</version>
- </dependency>
-
- <dependency>
- <groupId>org.pac4j</groupId>
- <artifactId>pac4j-oauth</artifactId>
- <version>${pac4jVersion}</version>
- </dependency>
-
- <dependency>
- <groupId>org.pac4j</groupId>
- <artifactId>pac4j-oidc</artifactId>
- <version>${pac4jVersion}</version>
- </dependency>
-
<dependency>
<groupId>io.buji</groupId>
<artifactId>buji-pac4j</artifactId>
<version>${bujiVersion}</version>
</dependency>
-
+ <!-- Include pac4j-config/core/oauth/oidc-->
<dependency>
<groupId>org.pac4j</groupId>
<artifactId>pac4j-springboot</artifactId>
@@ -235,6 +217,15 @@
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
</exclusion>
+ <!-- cas & opensaml is not supported-->
+ <exclusion>
+ <groupId>org.pac4j</groupId>
+ <artifactId>pac4j-cas</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.pac4j</groupId>
+ <artifactId>pac4j-saml-opensamlv3</artifactId>
+ </exclusion>
</exclusions>
</dependency>