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
commit f7f3eca859b417a1dcb2aa4c53b1bd9076fce43e Author: zentol <[email protected]> AuthorDate: Wed Dec 13 16:45:08 2017 +0100 (#31) Add extended flink-shadaed-jackson-module-jsonSchema module --- .../flink-shaded-jackson-2/pom.xml | 35 ++++++++++++++++++ .../pom.xml | 43 ++++++++++++++++++++++ .../pom.xml | 13 +++++-- pom.xml | 2 +- 4 files changed, 88 insertions(+), 5 deletions(-) diff --git a/flink-shaded-jackson-parent/flink-shaded-jackson-2/pom.xml b/flink-shaded-jackson-parent/flink-shaded-jackson-2/pom.xml new file mode 100644 index 0000000..d82fb72 --- /dev/null +++ b/flink-shaded-jackson-parent/flink-shaded-jackson-2/pom.xml @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +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. +--> +<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";> + + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.apache.flink</groupId> + <artifactId>flink-shaded-jackson-parent</artifactId> + <version>2.7.9-3.0</version> + <relativePath>..</relativePath> + </parent> + + <artifactId>flink-shaded-jackson</artifactId> + <name>flink-shaded-jackson-2</name> + +</project> \ No newline at end of file diff --git a/flink-shaded-jackson-parent/flink-shaded-jackson-module-jsonSchema-2/pom.xml b/flink-shaded-jackson-parent/flink-shaded-jackson-module-jsonSchema-2/pom.xml new file mode 100644 index 0000000..6535640 --- /dev/null +++ b/flink-shaded-jackson-parent/flink-shaded-jackson-module-jsonSchema-2/pom.xml @@ -0,0 +1,43 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +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. +--> +<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";> + + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.apache.flink</groupId> + <artifactId>flink-shaded-jackson-parent</artifactId> + <version>2.7.9-3.0</version> + <relativePath>..</relativePath> + </parent> + + <artifactId>flink-shaded-jackson-module-jsonSchema</artifactId> + <name>flink-shaded-jackson-module-jsonSchema-2</name> + + <dependencies> + <dependency> + <groupId>com.fasterxml.jackson.module</groupId> + <artifactId>jackson-module-jsonSchema</artifactId> + <version>${jackson.version}</version> + </dependency> + </dependencies> + +</project> \ No newline at end of file diff --git a/flink-shaded-jackson-2/pom.xml b/flink-shaded-jackson-parent/pom.xml similarity index 93% rename from flink-shaded-jackson-2/pom.xml rename to flink-shaded-jackson-parent/pom.xml index 22d307c..46b4e00 100644 --- a/flink-shaded-jackson-2/pom.xml +++ b/flink-shaded-jackson-parent/pom.xml @@ -29,14 +29,20 @@ under the License. <relativePath>..</relativePath> </parent> - <artifactId>flink-shaded-jackson</artifactId> - <name>flink-shaded-jackson-2</name> + <artifactId>flink-shaded-jackson-parent</artifactId> + <name>flink-shaded-jackson-parent</name> + <packaging>pom</packaging> <version>${jackson.version}-3.0</version> <properties> <jackson.version>2.7.9</jackson.version> </properties> + <modules> + <module>flink-shaded-jackson-2</module> + <module>flink-shaded-jackson-module-jsonSchema-2</module> + </modules> + <dependencies> <dependency> <groupId>com.fasterxml.jackson.core</groupId> @@ -72,7 +78,7 @@ under the License. <dependencyReducedPomLocation>${project.basedir}/target/dependency-reduced-pom.xml</dependencyReducedPomLocation> <artifactSet> <includes> - <include>com.fasterxml.jackson.core:*</include> + <include>com.fasterxml.jackson.*:*</include> </includes> </artifactSet> <relocations> @@ -99,5 +105,4 @@ under the License. </plugins> </build> - </project> \ No newline at end of file diff --git a/pom.xml b/pom.xml index 81e2c39..6b40f9e 100644 --- a/pom.xml +++ b/pom.xml @@ -56,7 +56,7 @@ under the License. <module>flink-shaded-asm-5</module> <module>flink-shaded-guava-18</module> <module>flink-shaded-netty-4</module> - <module>flink-shaded-jackson-2</module> + <module>flink-shaded-jackson-parent</module> </modules> <profiles>
