You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by ch...@apache.org on 2021/10/19 15:28:21 UTC
[flink-shaded] branch master updated: [FLINK-14954] Add
flink-shaded-swagger
This is an automated email from the ASF dual-hosted git repository.
chesnay pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink-shaded.git
The following commit(s) were added to refs/heads/master by this push:
new db48d62 [FLINK-14954] Add flink-shaded-swagger
db48d62 is described below
commit db48d62f7b52f012b83533f8aa3f39fc0c0ee3db
Author: Chesnay Schepler <ch...@apache.org>
AuthorDate: Tue Oct 19 17:28:15 2021 +0200
[FLINK-14954] Add flink-shaded-swagger
---
flink-shaded-jackson-parent/pom.xml | 1 +
.../pom.xml | 64 +++++++++-------------
.../src/main/resources/META-INF/NOTICE | 21 +++++++
.../META-INF/licenses/LICENSE.jakarta_edl-v10 | 11 ++++
pom.xml | 1 +
5 files changed, 59 insertions(+), 39 deletions(-)
diff --git a/flink-shaded-jackson-parent/pom.xml b/flink-shaded-jackson-parent/pom.xml
index c7c7cf4..8a781e7 100644
--- a/flink-shaded-jackson-parent/pom.xml
+++ b/flink-shaded-jackson-parent/pom.xml
@@ -85,6 +85,7 @@ under the License.
</artifactSet>
<relocations>
<relocation>
+ <!-- This needs to match flink-shaded-swagger -->
<pattern>com.fasterxml.jackson</pattern>
<shadedPattern>${shading.prefix}.jackson2.com.fasterxml.jackson</shadedPattern>
</relocation>
diff --git a/flink-shaded-jackson-parent/pom.xml b/flink-shaded-swagger/pom.xml
similarity index 58%
copy from flink-shaded-jackson-parent/pom.xml
copy to flink-shaded-swagger/pom.xml
index c7c7cf4..81ff5b7 100644
--- a/flink-shaded-jackson-parent/pom.xml
+++ b/flink-shaded-swagger/pom.xml
@@ -17,8 +17,9 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -26,42 +27,24 @@ under the License.
<groupId>org.apache.flink</groupId>
<artifactId>flink-shaded</artifactId>
<version>15.0</version>
- <relativePath>..</relativePath>
</parent>
- <artifactId>flink-shaded-jackson-parent</artifactId>
- <name>flink-shaded-jackson-parent</name>
- <packaging>pom</packaging>
- <version>2.12.4-15.0</version>
+ <artifactId>flink-shaded-swagger</artifactId>
+ <name>flink-shaded-swagger</name>
- <properties>
- <jackson.version>2.12.4</jackson.version>
- </properties>
-
- <modules>
- <module>flink-shaded-jackson-2</module>
- <module>flink-shaded-jackson-module-jsonSchema-2</module>
- </modules>
-
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-core</artifactId>
- <version>${jackson.version}</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-annotations</artifactId>
- <version>${jackson.version}</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
- <version>${jackson.version}</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>io.swagger.core.v3</groupId>
+ <artifactId>swagger-core</artifactId>
+ <version>2.1.11</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ </dependencies>
<build>
<plugins>
@@ -77,14 +60,17 @@ under the License.
</goals>
<configuration>
<createDependencyReducedPom>true</createDependencyReducedPom>
- <dependencyReducedPomLocation>${project.basedir}/target/dependency-reduced-pom.xml</dependencyReducedPomLocation>
+ <dependencyReducedPomLocation>${project.basedir}/target/dependency-reduced-pom.xml
+ </dependencyReducedPomLocation>
<artifactSet>
- <includes>
- <include>com.fasterxml.jackson.*:*</include>
- </includes>
+ <excludes>
+ <!-- We re-use flink-shaded-jackson -->
+ <exclude>com.fasterxml.jackson.core:*</exclude>
+ </excludes>
</artifactSet>
<relocations>
<relocation>
+ <!-- This needs to match the relocation pattern of flink-shaded-jackson -->
<pattern>com.fasterxml.jackson</pattern>
<shadedPattern>${shading.prefix}.jackson2.com.fasterxml.jackson</shadedPattern>
</relocation>
diff --git a/flink-shaded-swagger/src/main/resources/META-INF/NOTICE b/flink-shaded-swagger/src/main/resources/META-INF/NOTICE
new file mode 100644
index 0000000..4e64de0
--- /dev/null
+++ b/flink-shaded-swagger/src/main/resources/META-INF/NOTICE
@@ -0,0 +1,21 @@
+flink-shaded-swagger
+Copyright 2014-2021 The Apache Software Foundation
+
+This project includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+This project bundles the following dependencies under the Apache Software License 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
+
+- com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.12.1
+- com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.12.1
+- io.swagger.core.v3:swagger-annotations:2.1.11
+- io.swagger.core.v3:swagger-core:2.1.11
+- io.swagger.core.v3:swagger-models:2.1.11
+- jakarta.validation:jakarta.validation-api:2.0.2
+- org.apache.commons:commons-lang3:3.7
+- org.yaml:snakeyaml:1.27
+
+This project bundles the following dependencies under the Eclipse Distribution License 1.0 (https://www.eclipse.org/org/documents/edl-v10.php)
+
+- jakarta.activation:jakarta.activation-api:1.2.1
+- jakarta.xml.bind:jakarta.xml.bind-api:2.3.2
\ No newline at end of file
diff --git a/flink-shaded-swagger/src/main/resources/META-INF/licenses/LICENSE.jakarta_edl-v10 b/flink-shaded-swagger/src/main/resources/META-INF/licenses/LICENSE.jakarta_edl-v10
new file mode 100644
index 0000000..468ed94
--- /dev/null
+++ b/flink-shaded-swagger/src/main/resources/META-INF/licenses/LICENSE.jakarta_edl-v10
@@ -0,0 +1,11 @@
+Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+ Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+
+ Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+
+ Neither the name of the Eclipse Foundation, Inc. nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFI [...]
diff --git a/pom.xml b/pom.xml
index 3c33dd8..3088d89 100644
--- a/pom.xml
+++ b/pom.xml
@@ -64,6 +64,7 @@ under the License.
<module>flink-shaded-netty-tcnative-dynamic</module>
<module>flink-shaded-jackson-parent</module>
<module>flink-shaded-zookeeper-parent</module>
+ <module>flink-shaded-swagger</module>
</modules>
<profiles>