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 d0807f73bf0903ea337da2e057e73dcfb13d3f6f Author: zentol <[email protected]> AuthorDate: Wed Dec 12 13:41:36 2018 +0100 [FLINK-11022] Sync license packaging with Flink --- .../main/resources/META-INF/licenses/LICENSE.asm | 0 .../main/resources/META-INF/licenses/LICENSE.asm | 0 pom.xml | 29 +--------------------- 3 files changed, 1 insertion(+), 28 deletions(-) diff --git a/flink-shaded-asm-6/packaged_licenses/LICENSE.asm.txt b/flink-shaded-asm-5/src/main/resources/META-INF/licenses/LICENSE.asm similarity index 100% rename from flink-shaded-asm-6/packaged_licenses/LICENSE.asm.txt rename to flink-shaded-asm-5/src/main/resources/META-INF/licenses/LICENSE.asm diff --git a/flink-shaded-asm-5/packaged_licenses/LICENSE.asm.txt b/flink-shaded-asm-6/src/main/resources/META-INF/licenses/LICENSE.asm similarity index 100% rename from flink-shaded-asm-5/packaged_licenses/LICENSE.asm.txt rename to flink-shaded-asm-6/src/main/resources/META-INF/licenses/LICENSE.asm diff --git a/pom.xml b/pom.xml index 1dfe053..e37eb31 100644 --- a/pom.xml +++ b/pom.xml @@ -218,39 +218,12 @@ under the License. <!-- Generated content --> <exclude>**/target/**</exclude> <!-- the licenses that are re-bundled --> - <exclude>**/packaged_licenses/LICENSE.*.txt</exclude> + <exclude>**/licenses/LICENSE.*</exclude> <!-- release files --> <exclude>**/release/**</exclude> </excludes> </configuration> </plugin> - <!-- make sure all licenses that need to be repackaged are in the target folder --> - <plugin> - <artifactId>maven-resources-plugin</artifactId> - <configuration> - <encoding>UTF-8</encoding> - </configuration> - <executions> - <execution> - <id>copy-packaged-licenses</id> - <phase>prepare-package</phase> - <goals> - <goal>copy-resources</goal> - </goals> - <configuration> - <outputDirectory>${basedir}/target/classes/META-INF/licenses/</outputDirectory> - <resources> - <resource> - <directory>${basedir}/packaged_licenses</directory> - <includes> - <include>LICENSE.*.txt</include> - </includes> - </resource> - </resources> - </configuration> - </execution> - </executions> - </plugin> </plugins> </build>
