From 664691a11a5ecac0fec7471af92ca456a4b97422 Mon Sep 17 00:00:00 2001 From: Martin Lippert Date: Fri, 1 Mar 2019 15:25:18 +0100 Subject: [PATCH] polish for third-party license file generation --- .../bosh-language-server/LICENSE | 2 +- .../license-format-stylesheet.xsl | 23 +++ .../open-source-licenses.txt | 1 - .../bosh-language-server/pom.xml | 115 ++++++++++- .../concourse-language-server/LICENSE | 2 +- .../license-format-stylesheet.xsl | 23 +++ .../open-source-licenses.txt | 1 - .../concourse-language-server/pom.xml | 118 +++++++++++- .../manifest-yaml-language-server/LICENSE | 2 +- .../license-format-stylesheet.xsl | 23 +++ .../open-source-licenses.txt | 1 - .../manifest-yaml-language-server/pom.xml | 112 ++++++++++- .../spring-boot-language-server/LICENSE | 2 +- .../open-source-licenses.txt | 1 - .../spring-boot-language-server/pom.xml | 179 ++++++++++-------- 15 files changed, 503 insertions(+), 102 deletions(-) create mode 100644 headless-services/bosh-language-server/license-format-stylesheet.xsl delete mode 100644 headless-services/bosh-language-server/open-source-licenses.txt create mode 100644 headless-services/concourse-language-server/license-format-stylesheet.xsl delete mode 100644 headless-services/concourse-language-server/open-source-licenses.txt create mode 100644 headless-services/manifest-yaml-language-server/license-format-stylesheet.xsl delete mode 100644 headless-services/manifest-yaml-language-server/open-source-licenses.txt delete mode 100644 headless-services/spring-boot-language-server/open-source-licenses.txt diff --git a/headless-services/bosh-language-server/LICENSE b/headless-services/bosh-language-server/LICENSE index 49ba8ba6c..9ea969b9f 100644 --- a/headless-services/bosh-language-server/LICENSE +++ b/headless-services/bosh-language-server/LICENSE @@ -1,6 +1,6 @@ The content of this package is provided under the EPL v1.0 license (see below). -For a detailed overview of embedded third-party components and their OSS licenses, please take a look at: https://github.com/spring-projects/sts4/blob/master/headless-services/bosh-language-server/open-source-licenses.txt +For a detailed overview of embedded third-party components and their OSS licenses, please take a look at META-INF/third-party-open-source-licenses.txt for a list of libraries and META-INF/third-party-open-source-licenses/ for the licenses themselves. === diff --git a/headless-services/bosh-language-server/license-format-stylesheet.xsl b/headless-services/bosh-language-server/license-format-stylesheet.xsl new file mode 100644 index 000000000..940c33e5b --- /dev/null +++ b/headless-services/bosh-language-server/license-format-stylesheet.xsl @@ -0,0 +1,23 @@ + + + + + + + Welcome to the formatted license file + + + + + groupId: + + + + artifactId: + + + + version: + + + \ No newline at end of file diff --git a/headless-services/bosh-language-server/open-source-licenses.txt b/headless-services/bosh-language-server/open-source-licenses.txt deleted file mode 100644 index 36c42f155..000000000 --- a/headless-services/bosh-language-server/open-source-licenses.txt +++ /dev/null @@ -1 +0,0 @@ -work-in-progress \ No newline at end of file diff --git a/headless-services/bosh-language-server/pom.xml b/headless-services/bosh-language-server/pom.xml index 1867944db..2b4330faf 100644 --- a/headless-services/bosh-language-server/pom.xml +++ b/headless-services/bosh-language-server/pom.xml @@ -1,21 +1,22 @@ - 4.0.0 bosh-language-server jar - + org.springframework.ide.vscode commons-parent 1.5.0-SNAPSHOT ../commons/pom.xml - + ${project.version} - + @@ -48,13 +49,13 @@ test + org.springframework.boot spring-boot-maven-plugin - 1.4.1.RELEASE @@ -63,6 +64,110 @@ + + + + org.codehaus.mojo + license-maven-plugin + 1.17 + + + download-licenses + process-classes + + download-licenses + + + + + + + org.codehaus.mojo + xml-maven-plugin + + + process-classes + + transform + + + + + + + ${basedir}/target/generated-resources/ + *.xml + ${basedir}/license-format-stylesheet.xsl + ${project.build.directory}/generated-license-information + + + + + + + maven-resources-plugin + + + copy-own-license + process-classes + + copy-resources + + + ${project.build.outputDirectory} + + + ${basedir} + true + LICENSE + + + + + + + + + com.coderplus.maven.plugins + copy-rename-maven-plugin + 1.0 + + + copy-and-rename-license-summary + process-classes + + copy + + + ${project.build.directory}/generated-license-information/licenses.xml + ${project.build.outputDirectory}/META-INF/third-party-open-source-licenses.txt + + + + + + + maven-resources-plugin + + + copy-license-files + process-classes + + copy-resources + + + ${project.build.outputDirectory}/META-INF/third-party-open-source-licenses/ + + + ${project.build.directory}/generated-resources/licenses + false + + + + + + + diff --git a/headless-services/concourse-language-server/LICENSE b/headless-services/concourse-language-server/LICENSE index 83bd212e2..9ea969b9f 100644 --- a/headless-services/concourse-language-server/LICENSE +++ b/headless-services/concourse-language-server/LICENSE @@ -1,6 +1,6 @@ The content of this package is provided under the EPL v1.0 license (see below). -For a detailed overview of embedded third-party components and their OSS licenses, please take a look at: https://github.com/spring-projects/sts4/blob/master/headless-services/concourse-language-server/open-source-licenses.txt +For a detailed overview of embedded third-party components and their OSS licenses, please take a look at META-INF/third-party-open-source-licenses.txt for a list of libraries and META-INF/third-party-open-source-licenses/ for the licenses themselves. === diff --git a/headless-services/concourse-language-server/license-format-stylesheet.xsl b/headless-services/concourse-language-server/license-format-stylesheet.xsl new file mode 100644 index 000000000..940c33e5b --- /dev/null +++ b/headless-services/concourse-language-server/license-format-stylesheet.xsl @@ -0,0 +1,23 @@ + + + + + + + Welcome to the formatted license file + + + + + groupId: + + + + artifactId: + + + + version: + + + \ No newline at end of file diff --git a/headless-services/concourse-language-server/open-source-licenses.txt b/headless-services/concourse-language-server/open-source-licenses.txt deleted file mode 100644 index 36c42f155..000000000 --- a/headless-services/concourse-language-server/open-source-licenses.txt +++ /dev/null @@ -1 +0,0 @@ -work-in-progress \ No newline at end of file diff --git a/headless-services/concourse-language-server/pom.xml b/headless-services/concourse-language-server/pom.xml index b50c543a6..7d1bd9d86 100644 --- a/headless-services/concourse-language-server/pom.xml +++ b/headless-services/concourse-language-server/pom.xml @@ -1,21 +1,22 @@ - 4.0.0 concourse-language-server jar - + org.springframework.ide.vscode commons-parent 1.5.0-SNAPSHOT ../commons/pom.xml - + ${project.version} - + distribution-repository @@ -30,7 +31,7 @@ org.springframework.boot spring-boot-starter-actuator - + org.springframework.ide.vscode @@ -62,13 +63,13 @@ test + org.apache.maven.plugins maven-compiler-plugin - 3.3 1.8 1.8 @@ -78,7 +79,6 @@ org.springframework.boot spring-boot-maven-plugin - 1.4.1.RELEASE @@ -87,6 +87,110 @@ + + + + org.codehaus.mojo + license-maven-plugin + 1.17 + + + download-licenses + process-classes + + download-licenses + + + + + + + org.codehaus.mojo + xml-maven-plugin + + + process-classes + + transform + + + + + + + ${basedir}/target/generated-resources/ + *.xml + ${basedir}/license-format-stylesheet.xsl + ${project.build.directory}/generated-license-information + + + + + + + maven-resources-plugin + + + copy-own-license + process-classes + + copy-resources + + + ${project.build.outputDirectory} + + + ${basedir} + true + LICENSE + + + + + + + + + com.coderplus.maven.plugins + copy-rename-maven-plugin + 1.0 + + + copy-and-rename-license-summary + process-classes + + copy + + + ${project.build.directory}/generated-license-information/licenses.xml + ${project.build.outputDirectory}/META-INF/third-party-open-source-licenses.txt + + + + + + + maven-resources-plugin + + + copy-license-files + process-classes + + copy-resources + + + ${project.build.outputDirectory}/META-INF/third-party-open-source-licenses/ + + + ${project.build.directory}/generated-resources/licenses + false + + + + + + + diff --git a/headless-services/manifest-yaml-language-server/LICENSE b/headless-services/manifest-yaml-language-server/LICENSE index 493cc54ec..9ea969b9f 100644 --- a/headless-services/manifest-yaml-language-server/LICENSE +++ b/headless-services/manifest-yaml-language-server/LICENSE @@ -1,6 +1,6 @@ The content of this package is provided under the EPL v1.0 license (see below). -For a detailed overview of embedded third-party components and their OSS licenses, please take a look at: https://github.com/spring-projects/sts4/blob/master/headless-services/manifest-yaml-language-server/open-source-licenses.txt +For a detailed overview of embedded third-party components and their OSS licenses, please take a look at META-INF/third-party-open-source-licenses.txt for a list of libraries and META-INF/third-party-open-source-licenses/ for the licenses themselves. === diff --git a/headless-services/manifest-yaml-language-server/license-format-stylesheet.xsl b/headless-services/manifest-yaml-language-server/license-format-stylesheet.xsl new file mode 100644 index 000000000..940c33e5b --- /dev/null +++ b/headless-services/manifest-yaml-language-server/license-format-stylesheet.xsl @@ -0,0 +1,23 @@ + + + + + + + Welcome to the formatted license file + + + + + groupId: + + + + artifactId: + + + + version: + + + \ No newline at end of file diff --git a/headless-services/manifest-yaml-language-server/open-source-licenses.txt b/headless-services/manifest-yaml-language-server/open-source-licenses.txt deleted file mode 100644 index 36c42f155..000000000 --- a/headless-services/manifest-yaml-language-server/open-source-licenses.txt +++ /dev/null @@ -1 +0,0 @@ -work-in-progress \ No newline at end of file diff --git a/headless-services/manifest-yaml-language-server/pom.xml b/headless-services/manifest-yaml-language-server/pom.xml index ba677c0ff..bc6350005 100644 --- a/headless-services/manifest-yaml-language-server/pom.xml +++ b/headless-services/manifest-yaml-language-server/pom.xml @@ -1,4 +1,5 @@ - 4.0.0 @@ -63,7 +64,7 @@ reactor-netty ${reactor-netty} - + org.springframework.ide.vscode commons-cf @@ -82,13 +83,13 @@ test + org.apache.maven.plugins maven-compiler-plugin - 3.3 1.8 1.8 @@ -98,7 +99,6 @@ org.springframework.boot spring-boot-maven-plugin - 1.4.1.RELEASE @@ -107,6 +107,110 @@ + + + + org.codehaus.mojo + license-maven-plugin + 1.17 + + + download-licenses + process-classes + + download-licenses + + + + + + + org.codehaus.mojo + xml-maven-plugin + + + process-classes + + transform + + + + + + + ${basedir}/target/generated-resources/ + *.xml + ${basedir}/license-format-stylesheet.xsl + ${project.build.directory}/generated-license-information + + + + + + + maven-resources-plugin + + + copy-own-license + process-classes + + copy-resources + + + ${project.build.outputDirectory} + + + ${basedir} + true + LICENSE + + + + + + + + + com.coderplus.maven.plugins + copy-rename-maven-plugin + 1.0 + + + copy-and-rename-license-summary + process-classes + + copy + + + ${project.build.directory}/generated-license-information/licenses.xml + ${project.build.outputDirectory}/META-INF/third-party-open-source-licenses.txt + + + + + + + maven-resources-plugin + + + copy-license-files + process-classes + + copy-resources + + + ${project.build.outputDirectory}/META-INF/third-party-open-source-licenses/ + + + ${project.build.directory}/generated-resources/licenses + false + + + + + + + diff --git a/headless-services/spring-boot-language-server/LICENSE b/headless-services/spring-boot-language-server/LICENSE index b0f660d86..9ea969b9f 100644 --- a/headless-services/spring-boot-language-server/LICENSE +++ b/headless-services/spring-boot-language-server/LICENSE @@ -1,6 +1,6 @@ The content of this package is provided under the EPL v1.0 license (see below). -For a detailed overview of embedded third-party components and their OSS licenses, please take a look at: https://github.com/spring-projects/sts4/blob/master/headless-services/spring-boot-language-server/open-source-licenses.txt +For a detailed overview of embedded third-party components and their OSS licenses, please take a look at META-INF/third-party-open-source-licenses.txt for a list of libraries and META-INF/third-party-open-source-licenses/ for the licenses themselves. === diff --git a/headless-services/spring-boot-language-server/open-source-licenses.txt b/headless-services/spring-boot-language-server/open-source-licenses.txt deleted file mode 100644 index 36c42f155..000000000 --- a/headless-services/spring-boot-language-server/open-source-licenses.txt +++ /dev/null @@ -1 +0,0 @@ -work-in-progress \ No newline at end of file diff --git a/headless-services/spring-boot-language-server/pom.xml b/headless-services/spring-boot-language-server/pom.xml index 44d77c4d6..cf142721c 100644 --- a/headless-services/spring-boot-language-server/pom.xml +++ b/headless-services/spring-boot-language-server/pom.xml @@ -22,13 +22,11 @@ ${project.name}-repo file://${project.basedir}/repo - + oss-jfrog-snapshots https://oss.jfrog.org/artifactory/libs-snapshot - + true @@ -172,82 +170,107 @@ - - org.codehaus.mojo - license-maven-plugin - 1.17 - - - download-licenses - process-classes - - download-licenses - - - - - - - org.codehaus.mojo - xml-maven-plugin - - - process-classes - - transform - - - - - - - ${basedir}/target/generated-resources/ - *.xml - ${basedir}/license-format-stylesheet.xsl - ${project.build.directory}/generated-license-information - - - - + + org.codehaus.mojo + license-maven-plugin + 1.17 + + + download-licenses + process-classes + + download-licenses + + + + - - maven-resources-plugin - - - copy-license-summary - process-classes - - copy-resources - - - ${project.build.outputDirectory}/META-INF/ - - - ${basedir}/target/generated-license-information/ - false - - - - + + org.codehaus.mojo + xml-maven-plugin + + + process-classes + + transform + + + + + + + ${basedir}/target/generated-resources/ + *.xml + ${basedir}/license-format-stylesheet.xsl + ${project.build.directory}/generated-license-information + + + + - - copy-license-files - process-classes - - copy-resources - - - ${project.build.outputDirectory}/META-INF/licenses/ - - - ${basedir}/target/generated-resources/licenses - false - - - - - - + + maven-resources-plugin + + + copy-own-license + process-classes + + copy-resources + + + ${project.build.outputDirectory} + + + ${basedir} + true + LICENSE + + + + + + + + + com.coderplus.maven.plugins + copy-rename-maven-plugin + 1.0 + + + copy-and-rename-license-summary + process-classes + + copy + + + ${project.build.directory}/generated-license-information/licenses.xml + ${project.build.outputDirectory}/META-INF/third-party-open-source-licenses.txt + + + + + + + maven-resources-plugin + + + copy-license-files + process-classes + + copy-resources + + + ${project.build.outputDirectory}/META-INF/third-party-open-source-licenses/ + + + ${project.build.directory}/generated-resources/licenses + false + + + + + +