diff --git a/doc/licenses/angular-1.6.9/maven-coordinates.txt b/doc/licenses/angular-1.6.9/dep-coordinates.txt similarity index 100% rename from doc/licenses/angular-1.6.9/maven-coordinates.txt rename to doc/licenses/angular-1.6.9/dep-coordinates.txt diff --git a/doc/licenses/angular-translate-2.16.0/maven-coordinates.txt b/doc/licenses/angular-translate-2.16.0/dep-coordinates.txt similarity index 100% rename from doc/licenses/angular-translate-2.16.0/maven-coordinates.txt rename to doc/licenses/angular-translate-2.16.0/dep-coordinates.txt diff --git a/doc/licenses/antlr-2.7.7/maven-coordinates.txt b/doc/licenses/antlr-2.7.7/dep-coordinates.txt similarity index 100% rename from doc/licenses/antlr-2.7.7/maven-coordinates.txt rename to doc/licenses/antlr-2.7.7/dep-coordinates.txt diff --git a/doc/licenses/aopalliance-1.0/maven-coordinates.txt b/doc/licenses/aopalliance-1.0/dep-coordinates.txt similarity index 100% rename from doc/licenses/aopalliance-1.0/maven-coordinates.txt rename to doc/licenses/aopalliance-1.0/dep-coordinates.txt diff --git a/doc/licenses/apache-commons-beanutils-1.7.0/maven-coordinates.txt b/doc/licenses/apache-commons-beanutils-1.7.0/dep-coordinates.txt similarity index 100% rename from doc/licenses/apache-commons-beanutils-1.7.0/maven-coordinates.txt rename to doc/licenses/apache-commons-beanutils-1.7.0/dep-coordinates.txt diff --git a/doc/licenses/apache-commons-chain-1.2/maven-coordinates.txt b/doc/licenses/apache-commons-chain-1.2/dep-coordinates.txt similarity index 100% rename from doc/licenses/apache-commons-chain-1.2/maven-coordinates.txt rename to doc/licenses/apache-commons-chain-1.2/dep-coordinates.txt diff --git a/doc/licenses/apache-commons-codec-1.14/maven-coordinates.txt b/doc/licenses/apache-commons-codec-1.14/dep-coordinates.txt similarity index 100% rename from doc/licenses/apache-commons-codec-1.14/maven-coordinates.txt rename to doc/licenses/apache-commons-codec-1.14/dep-coordinates.txt diff --git a/doc/licenses/apache-commons-codec-1.15/maven-coordinates.txt b/doc/licenses/apache-commons-codec-1.15/dep-coordinates.txt similarity index 100% rename from doc/licenses/apache-commons-codec-1.15/maven-coordinates.txt rename to doc/licenses/apache-commons-codec-1.15/dep-coordinates.txt diff --git a/doc/licenses/apache-commons-collections-3.2/maven-coordinates.txt b/doc/licenses/apache-commons-collections-3.2/dep-coordinates.txt similarity index 100% rename from doc/licenses/apache-commons-collections-3.2/maven-coordinates.txt rename to doc/licenses/apache-commons-collections-3.2/dep-coordinates.txt diff --git a/doc/licenses/apache-commons-collections-4.4/maven-coordinates.txt b/doc/licenses/apache-commons-collections-4.4/dep-coordinates.txt similarity index 100% rename from doc/licenses/apache-commons-collections-4.4/maven-coordinates.txt rename to doc/licenses/apache-commons-collections-4.4/dep-coordinates.txt diff --git a/doc/licenses/apache-commons-configuration-1.5/maven-coordinates.txt b/doc/licenses/apache-commons-configuration-1.5/dep-coordinates.txt similarity index 100% rename from doc/licenses/apache-commons-configuration-1.5/maven-coordinates.txt rename to doc/licenses/apache-commons-configuration-1.5/dep-coordinates.txt diff --git a/doc/licenses/apache-commons-digester-1.8/maven-coordinates.txt b/doc/licenses/apache-commons-digester-1.8/dep-coordinates.txt similarity index 100% rename from doc/licenses/apache-commons-digester-1.8/maven-coordinates.txt rename to doc/licenses/apache-commons-digester-1.8/dep-coordinates.txt diff --git a/doc/licenses/apache-commons-lang-2.3/maven-coordinates.txt b/doc/licenses/apache-commons-lang-2.3/dep-coordinates.txt similarity index 100% rename from doc/licenses/apache-commons-lang-2.3/maven-coordinates.txt rename to doc/licenses/apache-commons-lang-2.3/dep-coordinates.txt diff --git a/doc/licenses/apache-commons-lang-3.11/maven-coordinates.txt b/doc/licenses/apache-commons-lang-3.11/dep-coordinates.txt similarity index 100% rename from doc/licenses/apache-commons-lang-3.11/maven-coordinates.txt rename to doc/licenses/apache-commons-lang-3.11/dep-coordinates.txt diff --git a/doc/licenses/apache-commons-lang-3.9/maven-coordinates.txt b/doc/licenses/apache-commons-lang-3.9/dep-coordinates.txt similarity index 100% rename from doc/licenses/apache-commons-lang-3.9/maven-coordinates.txt rename to doc/licenses/apache-commons-lang-3.9/dep-coordinates.txt diff --git a/doc/licenses/apache-commons-logging-1.1.1/maven-coordinates.txt b/doc/licenses/apache-commons-logging-1.1.1/dep-coordinates.txt similarity index 100% rename from doc/licenses/apache-commons-logging-1.1.1/maven-coordinates.txt rename to doc/licenses/apache-commons-logging-1.1.1/dep-coordinates.txt diff --git a/doc/licenses/apache-commons-pool-1.5.4/maven-coordinates.txt b/doc/licenses/apache-commons-pool-1.5.4/dep-coordinates.txt similarity index 100% rename from doc/licenses/apache-commons-pool-1.5.4/maven-coordinates.txt rename to doc/licenses/apache-commons-pool-1.5.4/dep-coordinates.txt diff --git a/doc/licenses/apache-commons-pool-2.8.0/maven-coordinates.txt b/doc/licenses/apache-commons-pool-2.8.0/dep-coordinates.txt similarity index 100% rename from doc/licenses/apache-commons-pool-2.8.0/maven-coordinates.txt rename to doc/licenses/apache-commons-pool-2.8.0/dep-coordinates.txt diff --git a/doc/licenses/apache-mina-2.1.3/maven-coordinates.txt b/doc/licenses/apache-mina-2.1.3/dep-coordinates.txt similarity index 100% rename from doc/licenses/apache-mina-2.1.3/maven-coordinates.txt rename to doc/licenses/apache-mina-2.1.3/dep-coordinates.txt diff --git a/doc/licenses/apache-santuario-2.2.0/maven-coordinates.txt b/doc/licenses/apache-santuario-2.2.0/dep-coordinates.txt similarity index 100% rename from doc/licenses/apache-santuario-2.2.0/maven-coordinates.txt rename to doc/licenses/apache-santuario-2.2.0/dep-coordinates.txt diff --git a/doc/licenses/blob-polyfill-1.0.20150320/maven-coordinates.txt b/doc/licenses/blob-polyfill-1.0.20150320/dep-coordinates.txt similarity index 100% rename from doc/licenses/blob-polyfill-1.0.20150320/maven-coordinates.txt rename to doc/licenses/blob-polyfill-1.0.20150320/dep-coordinates.txt diff --git a/doc/licenses/bouncycastle-1.44/maven-coordinates.txt b/doc/licenses/bouncycastle-1.44/dep-coordinates.txt similarity index 100% rename from doc/licenses/bouncycastle-1.44/maven-coordinates.txt rename to doc/licenses/bouncycastle-1.44/dep-coordinates.txt diff --git a/doc/licenses/bouncycastle-1.66/maven-coordinates.txt b/doc/licenses/bouncycastle-1.66/dep-coordinates.txt similarity index 100% rename from doc/licenses/bouncycastle-1.66/maven-coordinates.txt rename to doc/licenses/bouncycastle-1.66/dep-coordinates.txt diff --git a/doc/licenses/cas-client-3.6.2/maven-coordinates.txt b/doc/licenses/cas-client-3.6.2/dep-coordinates.txt similarity index 100% rename from doc/licenses/cas-client-3.6.2/maven-coordinates.txt rename to doc/licenses/cas-client-3.6.2/dep-coordinates.txt diff --git a/doc/licenses/checker-qual-3.8.0/maven-coordinates.txt b/doc/licenses/checker-qual-3.8.0/dep-coordinates.txt similarity index 100% rename from doc/licenses/checker-qual-3.8.0/maven-coordinates.txt rename to doc/licenses/checker-qual-3.8.0/dep-coordinates.txt diff --git a/doc/licenses/datalist-polyfill-1.14.0/maven-coordinates.txt b/doc/licenses/datalist-polyfill-1.14.0/dep-coordinates.txt similarity index 100% rename from doc/licenses/datalist-polyfill-1.14.0/maven-coordinates.txt rename to doc/licenses/datalist-polyfill-1.14.0/dep-coordinates.txt diff --git a/doc/licenses/directory-api-2.0.1/maven-coordinates.txt b/doc/licenses/directory-api-2.0.1/dep-coordinates.txt similarity index 100% rename from doc/licenses/directory-api-2.0.1/maven-coordinates.txt rename to doc/licenses/directory-api-2.0.1/dep-coordinates.txt diff --git a/doc/licenses/dom4j-2.1.1/maven-coordinates.txt b/doc/licenses/dom4j-2.1.1/dep-coordinates.txt similarity index 100% rename from doc/licenses/dom4j-2.1.1/maven-coordinates.txt rename to doc/licenses/dom4j-2.1.1/dep-coordinates.txt diff --git a/doc/licenses/ehcache-2.4.0/maven-coordinates.txt b/doc/licenses/ehcache-2.4.0/dep-coordinates.txt similarity index 100% rename from doc/licenses/ehcache-2.4.0/maven-coordinates.txt rename to doc/licenses/ehcache-2.4.0/dep-coordinates.txt diff --git a/doc/licenses/error-prone-2.5.1/maven-coordinates.txt b/doc/licenses/error-prone-2.5.1/dep-coordinates.txt similarity index 100% rename from doc/licenses/error-prone-2.5.1/maven-coordinates.txt rename to doc/licenses/error-prone-2.5.1/dep-coordinates.txt diff --git a/doc/licenses/filesaver-1.3.3/maven-coordinates.txt b/doc/licenses/filesaver-1.3.3/dep-coordinates.txt similarity index 100% rename from doc/licenses/filesaver-1.3.3/maven-coordinates.txt rename to doc/licenses/filesaver-1.3.3/dep-coordinates.txt diff --git a/doc/licenses/findbugs-jsr305-3.0.2/maven-coordinates.txt b/doc/licenses/findbugs-jsr305-3.0.2/dep-coordinates.txt similarity index 100% rename from doc/licenses/findbugs-jsr305-3.0.2/maven-coordinates.txt rename to doc/licenses/findbugs-jsr305-3.0.2/dep-coordinates.txt diff --git a/doc/licenses/generate-license-files.sh b/doc/licenses/generate-license-files.sh index 6b575af1f..76f8296b5 100755 --- a/doc/licenses/generate-license-files.sh +++ b/doc/licenses/generate-license-files.sh @@ -28,7 +28,7 @@ # generate-license-files.sh # ------------------------- # -# Automatically iterates through the provided runtime dependencies of the Maven +# Automatically iterates through the provided runtime dependencies of the # project in the current directory, creating new LICENSE and NOTICE files which # contain all the license information of bundled dependencies, as well as any # required notices. @@ -40,10 +40,13 @@ # # path/to/generate-license-files.sh DEPENDENCY_LIST OUTPUT_DIRECTORY # -# where DEPENDENCY_LIST is the list of Maven dependencies to consider when -# generating LICENSE and NOTICE (as produced by "mvn dependency:list") and -# OUTPUT_DIRECTORY is the directory in which the LICENSE and NOTICE files -# should be written. +# where DEPENDENCY_LIST is the list of dependencies to consider when generating +# LICENSE and NOTICE (as produced by "mvn dependency:list" or our +# DependencyListPlugin for Webpack) and OUTPUT_DIRECTORY is the directory in +# which the LICENSE and NOTICE files should be written. +# +# If DEPENDENCY_LIST is a directory, all normal files within the directory will +# be concatenated to produce the list. # # Ignoring license errors # ----------------------- @@ -69,22 +72,22 @@ # License information for the bundled runtime dependencies of all subprojects # is included in the subdirectories of the "doc/licenses/" directory of the # main guacamole-client source tree. Each subdirectory is associated with a -# single, logical dependency, with the Maven coordinatees of that dependency -# listed in the "maven-coordinates.txt" file within that subdirectory. There -# may be multiple coordinates associated with a dependency, in which case each +# single, logical dependency, with the coordinates of that dependency listed in +# the "dep-coordinates.txt" file within that subdirectory. There may be +# multiple coordinates associated with a dependency, in which case each # relevant set of coordinates should be listed on its own line. # -# For dependencies that are not associated with Maven coordinates, the licenses -# of those dependencies should instead be documented within subdirectories of -# the "src/licenses/bundled/" directory of the relevant subproject. +# For dependencies that are not associated with coordinates that can be +# automatically deteremined, the licenses of those dependencies should instead +# be documented within subdirectories of the "src/licenses/bundled/" directory +# of the relevant subproject. # # Regardless of whether a dependency is documented within the top-level -# guacamole-client project (Maven dependencies) or within the relevant -# subproject (non-Maven dependencies), the subdirectory for each dependency -# must contain a "README" file describing the dependency, the version used, the -# copyright holder(s), and the license. Examples of the formatting expected for -# these README files can be found within the existing dependency license -# directories. +# guacamole-client project or within the relevant subproject, the subdirectory +# for each dependency must contain a "README" file describing the dependency, +# the version used, the copyright holder(s), and the license. Examples of the +# formatting expected for these README files can be found within the existing +# dependency license directories. # # Files that contain the word "notice", regardless of case, are considered by # this script to be the notice file mentioned within the Apache License, and @@ -141,16 +144,16 @@ OUTPUT_DIR="$2" ## guacamole-client source tree, a error is printed to STDERR. ## ## The license information directories for dependencies that are not pulled in -## by Maven (subdirectories of the "src/licenses/bundled/" directory within the -## current project) will also be included, if any. +## automatically (subdirectories of the "src/licenses/bundled/" directory +## within the current project) will also be included, if any. ## list_dependency_license_info() { # List the license directories of all runtime dependencies, as dictated by - # the "maven-coordinates.txt" files included within those directores - grep -o '[^: ]*:[^: ]*:[^: ]*:[^: ]*' | while read DEPENDENCY; do + # the "dep-coordinates.txt" files included within those directories + sed 's/^[[:space:]]\+//' | grep -o '^[^: ]\+\(:[^: ]*\)\{1,3\}' | while read DEPENDENCY; do - if ! grep -l "$DEPENDENCY[[:space:]]*$" "$LICENSES_DIR"/*/maven-coordinates.txt; then + if ! grep -l "$DEPENDENCY[[:space:]]*$" "$LICENSES_DIR"/*/dep-coordinates.txt; then error "License information missing for $DEPENDENCY" fi @@ -158,7 +161,7 @@ list_dependency_license_info() { dirname "$LICENSE_INFO_COORDS_FILE" done - # Include license directories for all dependencies not pulled in by Maven + # Include license directories for all dependencies not pulled in automatically if [ -d ./src/licenses/bundled/ ]; then find src/licenses/bundled/ -mindepth 1 -maxdepth 1 -type d fi @@ -232,7 +235,7 @@ license_file() { DIR="$1" find "$DIR" -mindepth 1 \ -a \! -iname "*notice*" \ - -a \! -name "maven-coordinates.txt" \ + -a \! -name "dep-coordinates.txt" \ -a \! -name "README" \ | if ! single_result; then error "Multiple license files found within $DIR" @@ -306,7 +309,8 @@ cp "$BASEDIR/NOTICE" "$OUTPUT_DIR/" # PREAMBLE_ADDED=0 -list_dependency_license_info < "$DEPENDENCY_LIST" | sort_dependency_license_info | \ +find "$DEPENDENCY_LIST" -type f -exec cat '{}' + | \ + list_dependency_license_info | sort_dependency_license_info | \ while read LICENSE_INFO_DIR; do # Add subcomponent license preamble if not already added @@ -363,8 +367,8 @@ EOF done # Do not double-bundle the information contained in the README files (it's -# already in LICENSE), nor internal mappings like maven-coordinates.txt -for EXCLUDED_FILE in README maven-coordinates.txt; do +# already in LICENSE), nor internal mappings like dep-coordinates.txt +for EXCLUDED_FILE in README dep-coordinates.txt; do rm -f "$OUTPUT_DIR/bundled"/*/"$EXCLUDED_FILE" done diff --git a/doc/licenses/glassfish-hk2-2.6.1/maven-coordinates.txt b/doc/licenses/glassfish-hk2-2.6.1/dep-coordinates.txt similarity index 100% rename from doc/licenses/glassfish-hk2-2.6.1/maven-coordinates.txt rename to doc/licenses/glassfish-hk2-2.6.1/dep-coordinates.txt diff --git a/doc/licenses/guava-30.1.1-jre/maven-coordinates.txt b/doc/licenses/guava-30.1.1-jre/dep-coordinates.txt similarity index 100% rename from doc/licenses/guava-30.1.1-jre/maven-coordinates.txt rename to doc/licenses/guava-30.1.1-jre/dep-coordinates.txt diff --git a/doc/licenses/guice-5.0.1/maven-coordinates.txt b/doc/licenses/guice-5.0.1/dep-coordinates.txt similarity index 100% rename from doc/licenses/guice-5.0.1/maven-coordinates.txt rename to doc/licenses/guice-5.0.1/dep-coordinates.txt diff --git a/doc/licenses/j2objc-annotations-1.3/maven-coordinates.txt b/doc/licenses/j2objc-annotations-1.3/dep-coordinates.txt similarity index 100% rename from doc/licenses/j2objc-annotations-1.3/maven-coordinates.txt rename to doc/licenses/j2objc-annotations-1.3/dep-coordinates.txt diff --git a/doc/licenses/jackson-2.12.2/maven-coordinates.txt b/doc/licenses/jackson-2.12.2/dep-coordinates.txt similarity index 100% rename from doc/licenses/jackson-2.12.2/maven-coordinates.txt rename to doc/licenses/jackson-2.12.2/dep-coordinates.txt diff --git a/doc/licenses/jai-imageio-core-1.4.0/maven-coordinates.txt b/doc/licenses/jai-imageio-core-1.4.0/dep-coordinates.txt similarity index 100% rename from doc/licenses/jai-imageio-core-1.4.0/maven-coordinates.txt rename to doc/licenses/jai-imageio-core-1.4.0/dep-coordinates.txt diff --git a/doc/licenses/jakarta-activation-1.2.1/maven-coordinates.txt b/doc/licenses/jakarta-activation-1.2.1/dep-coordinates.txt similarity index 100% rename from doc/licenses/jakarta-activation-1.2.1/maven-coordinates.txt rename to doc/licenses/jakarta-activation-1.2.1/dep-coordinates.txt diff --git a/doc/licenses/jakarta-annotation-api-1.3.5/maven-coordinates.txt b/doc/licenses/jakarta-annotation-api-1.3.5/dep-coordinates.txt similarity index 100% rename from doc/licenses/jakarta-annotation-api-1.3.5/maven-coordinates.txt rename to doc/licenses/jakarta-annotation-api-1.3.5/dep-coordinates.txt diff --git a/doc/licenses/jakarta-jaxb-2.3.2/maven-coordinates.txt b/doc/licenses/jakarta-jaxb-2.3.2/dep-coordinates.txt similarity index 100% rename from doc/licenses/jakarta-jaxb-2.3.2/maven-coordinates.txt rename to doc/licenses/jakarta-jaxb-2.3.2/dep-coordinates.txt diff --git a/doc/licenses/jakarta-validation-api-2.0.2/maven-coordinates.txt b/doc/licenses/jakarta-validation-api-2.0.2/dep-coordinates.txt similarity index 100% rename from doc/licenses/jakarta-validation-api-2.0.2/maven-coordinates.txt rename to doc/licenses/jakarta-validation-api-2.0.2/dep-coordinates.txt diff --git a/doc/licenses/jakarta-ws-rs-api-2.1.6/maven-coordinates.txt b/doc/licenses/jakarta-ws-rs-api-2.1.6/dep-coordinates.txt similarity index 100% rename from doc/licenses/jakarta-ws-rs-api-2.1.6/maven-coordinates.txt rename to doc/licenses/jakarta-ws-rs-api-2.1.6/dep-coordinates.txt diff --git a/doc/licenses/java-saml-2.6.0/maven-coordinates.txt b/doc/licenses/java-saml-2.6.0/dep-coordinates.txt similarity index 100% rename from doc/licenses/java-saml-2.6.0/maven-coordinates.txt rename to doc/licenses/java-saml-2.6.0/dep-coordinates.txt diff --git a/doc/licenses/javassist-3.25.0-ga/maven-coordinates.txt b/doc/licenses/javassist-3.25.0-ga/dep-coordinates.txt similarity index 100% rename from doc/licenses/javassist-3.25.0-ga/maven-coordinates.txt rename to doc/licenses/javassist-3.25.0-ga/dep-coordinates.txt diff --git a/doc/licenses/javax.inject-1/maven-coordinates.txt b/doc/licenses/javax.inject-1/dep-coordinates.txt similarity index 100% rename from doc/licenses/javax.inject-1/maven-coordinates.txt rename to doc/licenses/javax.inject-1/dep-coordinates.txt diff --git a/doc/licenses/jcommander-1.78/maven-coordinates.txt b/doc/licenses/jcommander-1.78/dep-coordinates.txt similarity index 100% rename from doc/licenses/jcommander-1.78/maven-coordinates.txt rename to doc/licenses/jcommander-1.78/dep-coordinates.txt diff --git a/doc/licenses/jersey-2.34/maven-coordinates.txt b/doc/licenses/jersey-2.34/dep-coordinates.txt similarity index 100% rename from doc/licenses/jersey-2.34/maven-coordinates.txt rename to doc/licenses/jersey-2.34/dep-coordinates.txt diff --git a/doc/licenses/joda-time-2.10.6/maven-coordinates.txt b/doc/licenses/joda-time-2.10.6/dep-coordinates.txt similarity index 100% rename from doc/licenses/joda-time-2.10.6/maven-coordinates.txt rename to doc/licenses/joda-time-2.10.6/dep-coordinates.txt diff --git a/doc/licenses/jose4j-0.7.6/maven-coordinates.txt b/doc/licenses/jose4j-0.7.6/dep-coordinates.txt similarity index 100% rename from doc/licenses/jose4j-0.7.6/maven-coordinates.txt rename to doc/licenses/jose4j-0.7.6/dep-coordinates.txt diff --git a/doc/licenses/jquery-3.3.1/maven-coordinates.txt b/doc/licenses/jquery-3.3.1/dep-coordinates.txt similarity index 100% rename from doc/licenses/jquery-3.3.1/maven-coordinates.txt rename to doc/licenses/jquery-3.3.1/dep-coordinates.txt diff --git a/doc/licenses/jradius-1.1.5/maven-coordinates.txt b/doc/licenses/jradius-1.1.5/dep-coordinates.txt similarity index 100% rename from doc/licenses/jradius-1.1.5/maven-coordinates.txt rename to doc/licenses/jradius-1.1.5/dep-coordinates.txt diff --git a/doc/licenses/jsr250-api-1.0/maven-coordinates.txt b/doc/licenses/jsr250-api-1.0/dep-coordinates.txt similarity index 100% rename from doc/licenses/jsr250-api-1.0/maven-coordinates.txt rename to doc/licenses/jsr250-api-1.0/dep-coordinates.txt diff --git a/doc/licenses/jstz-1.0.10/maven-coordinates.txt b/doc/licenses/jstz-1.0.10/dep-coordinates.txt similarity index 100% rename from doc/licenses/jstz-1.0.10/maven-coordinates.txt rename to doc/licenses/jstz-1.0.10/dep-coordinates.txt diff --git a/doc/licenses/lodash-4.17.10/maven-coordinates.txt b/doc/licenses/lodash-4.17.10/dep-coordinates.txt similarity index 100% rename from doc/licenses/lodash-4.17.10/maven-coordinates.txt rename to doc/licenses/lodash-4.17.10/dep-coordinates.txt diff --git a/doc/licenses/logback-1.2.3/maven-coordinates.txt b/doc/licenses/logback-1.2.3/dep-coordinates.txt similarity index 100% rename from doc/licenses/logback-1.2.3/maven-coordinates.txt rename to doc/licenses/logback-1.2.3/dep-coordinates.txt diff --git a/doc/licenses/messageformat-1.0.2/maven-coordinates.txt b/doc/licenses/messageformat-1.0.2/dep-coordinates.txt similarity index 100% rename from doc/licenses/messageformat-1.0.2/maven-coordinates.txt rename to doc/licenses/messageformat-1.0.2/dep-coordinates.txt diff --git a/doc/licenses/mybatis-3.5.6/maven-coordinates.txt b/doc/licenses/mybatis-3.5.6/dep-coordinates.txt similarity index 100% rename from doc/licenses/mybatis-3.5.6/maven-coordinates.txt rename to doc/licenses/mybatis-3.5.6/dep-coordinates.txt diff --git a/doc/licenses/mybatis-guice-3.10/maven-coordinates.txt b/doc/licenses/mybatis-guice-3.10/dep-coordinates.txt similarity index 100% rename from doc/licenses/mybatis-guice-3.10/maven-coordinates.txt rename to doc/licenses/mybatis-guice-3.10/dep-coordinates.txt diff --git a/doc/licenses/osgi-resource-locator-1.0.3/maven-coordinates.txt b/doc/licenses/osgi-resource-locator-1.0.3/dep-coordinates.txt similarity index 100% rename from doc/licenses/osgi-resource-locator-1.0.3/maven-coordinates.txt rename to doc/licenses/osgi-resource-locator-1.0.3/dep-coordinates.txt diff --git a/doc/licenses/pickr-1.2.6/maven-coordinates.txt b/doc/licenses/pickr-1.2.6/dep-coordinates.txt similarity index 100% rename from doc/licenses/pickr-1.2.6/maven-coordinates.txt rename to doc/licenses/pickr-1.2.6/dep-coordinates.txt diff --git a/doc/licenses/slf4j-api-1.7.30/maven-coordinates.txt b/doc/licenses/slf4j-api-1.7.30/dep-coordinates.txt similarity index 100% rename from doc/licenses/slf4j-api-1.7.30/maven-coordinates.txt rename to doc/licenses/slf4j-api-1.7.30/dep-coordinates.txt diff --git a/doc/licenses/spring-framework-3.0.5/maven-coordinates.txt b/doc/licenses/spring-framework-3.0.5/dep-coordinates.txt similarity index 100% rename from doc/licenses/spring-framework-3.0.5/maven-coordinates.txt rename to doc/licenses/spring-framework-3.0.5/dep-coordinates.txt diff --git a/doc/licenses/spring-framework-5.2.13/maven-coordinates.txt b/doc/licenses/spring-framework-5.2.13/dep-coordinates.txt similarity index 100% rename from doc/licenses/spring-framework-5.2.13/maven-coordinates.txt rename to doc/licenses/spring-framework-5.2.13/dep-coordinates.txt diff --git a/doc/licenses/spring-security-5.4.5/maven-coordinates.txt b/doc/licenses/spring-security-5.4.5/dep-coordinates.txt similarity index 100% rename from doc/licenses/spring-security-5.4.5/maven-coordinates.txt rename to doc/licenses/spring-security-5.4.5/dep-coordinates.txt diff --git a/doc/licenses/webjars-servlet-2.x-1.5/maven-coordinates.txt b/doc/licenses/webjars-servlet-2.x-1.5/dep-coordinates.txt similarity index 100% rename from doc/licenses/webjars-servlet-2.x-1.5/maven-coordinates.txt rename to doc/licenses/webjars-servlet-2.x-1.5/dep-coordinates.txt diff --git a/doc/licenses/woodstox-core-5.2.1/maven-coordinates.txt b/doc/licenses/woodstox-core-5.2.1/dep-coordinates.txt similarity index 100% rename from doc/licenses/woodstox-core-5.2.1/maven-coordinates.txt rename to doc/licenses/woodstox-core-5.2.1/dep-coordinates.txt diff --git a/doc/licenses/woodstox-stax2-api-4.2/maven-coordinates.txt b/doc/licenses/woodstox-stax2-api-4.2/dep-coordinates.txt similarity index 100% rename from doc/licenses/woodstox-stax2-api-4.2/maven-coordinates.txt rename to doc/licenses/woodstox-stax2-api-4.2/dep-coordinates.txt diff --git a/doc/licenses/xpp3-1.1.4c/maven-coordinates.txt b/doc/licenses/xpp3-1.1.4c/dep-coordinates.txt similarity index 100% rename from doc/licenses/xpp3-1.1.4c/maven-coordinates.txt rename to doc/licenses/xpp3-1.1.4c/dep-coordinates.txt diff --git a/doc/licenses/zxing-3.4.1/maven-coordinates.txt b/doc/licenses/zxing-3.4.1/dep-coordinates.txt similarity index 100% rename from doc/licenses/zxing-3.4.1/maven-coordinates.txt rename to doc/licenses/zxing-3.4.1/dep-coordinates.txt diff --git a/pom.xml b/pom.xml index f2192722c..105ae5b6f 100644 --- a/pom.xml +++ b/pom.xml @@ -46,6 +46,10 @@ 1.2.3 1.7.30 + + ${project.build.directory}/dependencies + + org.apache.maven.plugins maven-dependency-plugin 3.1.2 - list-runtime-dependencies + list-maven-runtime-dependencies generate-resources runtime false org.apache.guacamole - ${project.build.directory}/runtime-dependencies.txt + ${dependency.list.directory}/maven-runtime-dependencies.txt list @@ -205,7 +209,7 @@ ${rootlocation}/doc/licenses/generate-license-files.sh - ${project.build.directory}/runtime-dependencies.txt + ${dependency.list.directory} ${project.build.directory}/licenses