From 08a775a60c80a4e034cfd252346f094c0045b88d Mon Sep 17 00:00:00 2001 From: Jan Supol Date: Tue, 15 Jan 2019 23:40:29 +0100 Subject: [PATCH 1/3] Add legal info NOTICE.md and LICENSE.md Change-Id: Ia08dd42737db75771bff41aaaad14db4c0a54d18 Signed-off-by: Jan Supol --- .../jersey-example-java8-webapp/pom.xml | 5 +- archetypes/jersey-heroku-webapp/pom.xml | 5 +- archetypes/jersey-quickstart-grizzly2/pom.xml | 5 +- archetypes/jersey-quickstart-webapp/pom.xml | 5 +- bundles/jaxrs-ri/pom.xml | 5 +- containers/glassfish/jersey-gf-ejb/pom.xml | 14 +--- containers/grizzly2-servlet/pom.xml | 5 +- containers/jetty-servlet/pom.xml | 5 +- .../pom.xml | 14 +--- ext/cdi/jersey-cdi1x-servlet/pom.xml | 14 +--- ext/cdi/jersey-cdi1x-transaction/pom.xml | 14 +--- ext/cdi/jersey-cdi1x-validation/pom.xml | 12 +-- ext/cdi/jersey-cdi1x/pom.xml | 14 +--- ext/cdi/jersey-weld2-se/pom.xml | 5 +- ext/mvc-bean-validation/pom.xml | 7 +- ext/mvc-freemarker/pom.xml | 7 +- ext/mvc-mustache/pom.xml | 7 +- ext/proxy-client/pom.xml | 7 +- ext/rx/pom.xml | 10 ++- ext/wadl-doclet/pom.xml | 7 ++ incubator/declarative-linking/pom.xml | 5 +- incubator/gae-integration/pom.xml | 9 ++- incubator/html-json/pom.xml | 10 ++- incubator/kryo/pom.xml | 10 ++- pom.xml | 76 ++++++++++++++++++- security/oauth1-server/pom.xml | 9 ++- test-framework/pom.xml | 10 ++- 27 files changed, 204 insertions(+), 92 deletions(-) diff --git a/archetypes/jersey-example-java8-webapp/pom.xml b/archetypes/jersey-example-java8-webapp/pom.xml index eb42c231bc2..e600ec469e0 100644 --- a/archetypes/jersey-example-java8-webapp/pom.xml +++ b/archetypes/jersey-example-java8-webapp/pom.xml @@ -1,7 +1,7 @@ META-INF/NOTICE.md + META-INF/NOTICE.markdown diff --git a/containers/glassfish/jersey-gf-ejb/pom.xml b/containers/glassfish/jersey-gf-ejb/pom.xml index 596463cd076..b3eed5e6b58 100644 --- a/containers/glassfish/jersey-gf-ejb/pom.xml +++ b/containers/glassfish/jersey-gf-ejb/pom.xml @@ -1,7 +1,7 @@ + + + + copy-legaldocs + + copy-resources + + process-sources + + ${project.build.outputDirectory} + + + ${legal.source.folder} + META-INF/ + + NOTICE.md + LICENSE.md + + + + + + + + copy-legaldocs-to-sources + + copy-resources + + process-sources + + ${project.build.directory}/generated-sources/rsrc-gen + + + ${legal.source.folder} + META-INF/ + + NOTICE.md + LICENSE.md + + + + + + + + copy-legaldocs-to-osgi-bundles + + copy-resources + + process-sources + + ${project.build.directory}/legal + + + ${legal.source.folder} + META-INF/ + + NOTICE.md + LICENSE.md + + + + + + org.apache.maven.plugins @@ -398,7 +464,7 @@ org.apache.maven.plugins maven-source-plugin - 2.2.1 + 3.0.1 attach-sources @@ -609,6 +675,7 @@ <_versionpolicy>[$(version;==;$(@)),$(version;+;$(@))) <_nodefaultversion>false + {maven-resources},${project.build.directory}/legal @@ -751,6 +818,10 @@ org.apache.maven.plugins maven-source-plugin + + org.apache.maven.plugins + maven-resources-plugin + @@ -1919,6 +1990,7 @@ 1.8 jersey.repackaged + ${maven.multiModuleProjectDirectory} gf-cddl-gpl UTF-8 UTF-8 diff --git a/security/oauth1-server/pom.xml b/security/oauth1-server/pom.xml index f1d7d38a7cd..7c1d9a5a870 100644 --- a/security/oauth1-server/pom.xml +++ b/security/oauth1-server/pom.xml @@ -1,7 +1,7 @@ + + + + copy-legaldocs + + copy-resources + + process-sources + + ${project.build.outputDirectory} + + + ${legal.source.folder} + META-INF/ + + NOTICE.md + LICENSE.md + + + + + + + + copy-legaldocs-to-sources + + copy-resources + + process-sources + + ${project.build.directory}/generated-sources/rsrc-gen + + + ${legal.source.folder} + META-INF/ + + NOTICE.md + LICENSE.md + + + + + + + + copy-legaldocs-to-wars + + copy-resources + + process-sources + + ${project.build.directory}/${project.artifactId} + + + ${legal.source.folder} + META-INF/ + + NOTICE.md + LICENSE.md + + + + + + + + + + ${project.basedir}/src/main/resources + + + ${project.build.directory}/legal + + + + ${maven.multiModuleProjectDirectory}/examples + +