This is an automated email from the ASF dual-hosted git repository. gaoxihui pushed a commit to branch release-2.2.5-incubating-rc2-dev in repository https://gitbox.apache.org/repos/asf/ozhera.git
commit c27d520c4042572e7b457b22a851cac28e4bc123 Author: gaoxihui <[email protected]> AuthorDate: Mon Feb 17 11:35:42 2025 +0800 feat: Add script to handle merging license lists --- merge-dependency.sh | 34 ++++++++++++++++++++++++++++++++++ pom.xml | 13 ++++++++++++- 2 files changed, 46 insertions(+), 1 deletion(-) diff --git a/merge-dependency.sh b/merge-dependency.sh new file mode 100644 index 00000000..70fee175 --- /dev/null +++ b/merge-dependency.sh @@ -0,0 +1,34 @@ +#!/bin/bash +# +# 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. +# + + +# Set the output file path to be merged +output_file="target/merged_THIRD-PARTY.txt" +sort_unique_file="target/sort-merged_THIRD-PARTY.txt" + +# Clear the output file if it already exists +> "$output_file" + +# Find the THIRD-PARTY.txt file in the target/classes directory of all submodules and merge them +find . -type f -path "*/target/classes/THIRD-PARTY.txt" -exec cat {} >> "$output_file" \; + +echo "merged completed，result store into $output_file" + +sort -u $output_file -o $sort_unique_file + +echo "sort and uniq into $sort_unique_file" \ No newline at end of file diff --git a/pom.xml b/pom.xml index 9b3fa91c..d21c88d3 100644 --- a/pom.xml +++ b/pom.xml @@ -953,7 +953,6 @@ <phase>generate-sources</phase> <goals> <goal>add-third-party</goal> -<!-- <goal>download-licenses</goal>--> </goals> <configuration> <includeOptional>false</includeOptional> @@ -974,6 +973,18 @@ </execution> </executions> </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <version>3.2.0</version> + <configuration> + <excludes> + <exclude>**/DEPENDENCIES</exclude> + <exclude>**/THIRD-PARTY.txt</exclude> + </excludes> + </configuration> + </plugin> <!-- <plugin>--> <!-- <groupId>com.mycila</groupId>--> <!-- <artifactId>license-maven-plugin</artifactId>--> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
