From 155f57eba1ce26bc9024c0a6711030a944520d94 Mon Sep 17 00:00:00 2001 From: Jorge Bescos Gascon Date: Thu, 3 Dec 2020 08:16:52 +0100 Subject: [PATCH] Include error stacktrace in copyright plugin Signed-off-by: Jorge Bescos Gascon --- .../main/resources/META-INF/NOTICE.markdown | 18 +---------------- .../main/resources/META-INF/NOTICE.markdown | 18 +---------------- etc/config/copyright-exclude | 3 ++- etc/travis/travis.sh | 2 +- .../main/resources/META-INF/NOTICE.markdown | 20 ++----------------- .../main/resources/META-INF/NOTICE.markdown | 20 ++----------------- pom.xml | 4 ++-- 7 files changed, 11 insertions(+), 74 deletions(-) diff --git a/core-common/src/main/resources/META-INF/NOTICE.markdown b/core-common/src/main/resources/META-INF/NOTICE.markdown index 9953aefb96b..9b0a754cc36 100644 --- a/core-common/src/main/resources/META-INF/NOTICE.markdown +++ b/core-common/src/main/resources/META-INF/NOTICE.markdown @@ -1,20 +1,4 @@ -# -# Copyright (c) 2020 Oracle and/or its affiliates. All rights reserved. -# -# This program and the accompanying materials are made available under the -# terms of the Eclipse Public License v. 2.0, which is available at -# http://www.eclipse.org/legal/epl-2.0. -# -# This Source Code may also be made available under the following Secondary -# Licenses when the conditions for such availability set forth in the -# Eclipse Public License v. 2.0 are satisfied: GNU General Public License, -# version 2 with the GNU Classpath Exception, which is available at -# https://www.gnu.org/software/classpath/license.html. -# -# SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 -# - -# Notice for Jersey Core Common module +# Notice for Jersey Core Common module This content is produced and maintained by the Eclipse Jersey project. diff --git a/core-server/src/main/resources/META-INF/NOTICE.markdown b/core-server/src/main/resources/META-INF/NOTICE.markdown index 173adcd4b85..4dfbd7f80fc 100644 --- a/core-server/src/main/resources/META-INF/NOTICE.markdown +++ b/core-server/src/main/resources/META-INF/NOTICE.markdown @@ -1,20 +1,4 @@ -# -# Copyright (c) 2020 Oracle and/or its affiliates. All rights reserved. -# -# This program and the accompanying materials are made available under the -# terms of the Eclipse Public License v. 2.0, which is available at -# http://www.eclipse.org/legal/epl-2.0. -# -# This Source Code may also be made available under the following Secondary -# Licenses when the conditions for such availability set forth in the -# Eclipse Public License v. 2.0 are satisfied: GNU General Public License, -# version 2 with the GNU Classpath Exception, which is available at -# https://www.gnu.org/software/classpath/license.html. -# -# SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 -# - -# Notice for Jersey Core Server module +# Notice for Jersey Core Server module This content is produced and maintained by the Eclipse Jersey project. * https://projects.eclipse.org/projects/ee4j.jersey diff --git a/etc/config/copyright-exclude b/etc/config/copyright-exclude index e99f55fd83d..1b8fba7d5c5 100644 --- a/etc/config/copyright-exclude +++ b/etc/config/copyright-exclude @@ -24,6 +24,8 @@ .zip .dat .lua +.md +.markdown travis.sh .travis.yml /docs/src/main/docbook/inc/modules_table_footer.src @@ -85,6 +87,5 @@ build.readme NOTICE.md /ext/cdi/jersey-cdi1x/src/main/java/org/glassfish/jersey/ext/cdi1x/internal/ProcessAllAnnotatedTypes.java /ext/cdi/jersey-cdi1x/src/main/java/org/glassfish/jersey/ext/cdi1x/internal/ProcessJAXRSAnnotatedTypes.java -/core-server/src/main/resources/META-INF/NOTICE.markdown /media/json-binding/src/test/java/org/glassfish/jersey/jsonb/internal/JsonBindingProviderTest.java /connectors/jdk-connector/src/test/resources diff --git a/etc/travis/travis.sh b/etc/travis/travis.sh index d4c9c08c82d..11364949aec 100644 --- a/etc/travis/travis.sh +++ b/etc/travis/travis.sh @@ -28,7 +28,7 @@ PING_LOOP_PID=$! mvn -version if [ "$1" = "glassfish-copyright:check" ]; then - mvn $1 + mvn -e $1 else mvn -e -U -B clean install $1 >> $BUILD_OUTPUT 2>&1 fi diff --git a/ext/bean-validation/src/main/resources/META-INF/NOTICE.markdown b/ext/bean-validation/src/main/resources/META-INF/NOTICE.markdown index 13b21ea365d..501db20b72e 100644 --- a/ext/bean-validation/src/main/resources/META-INF/NOTICE.markdown +++ b/ext/bean-validation/src/main/resources/META-INF/NOTICE.markdown @@ -1,20 +1,4 @@ -# -# Copyright (c) 2020 Oracle and/or its affiliates. All rights reserved. -# -# This program and the accompanying materials are made available under the -# terms of the Eclipse Public License v. 2.0, which is available at -# http://www.eclipse.org/legal/epl-2.0. -# -# This Source Code may also be made available under the following Secondary -# Licenses when the conditions for such availability set forth in the -# Eclipse Public License v. 2.0 are satisfied: GNU General Public License, -# version 2 with the GNU Classpath Exception, which is available at -# https://www.gnu.org/software/classpath/license.html. -# -# SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 -# - -# Notice for Jersey Bean Validation module +# Notice for Jersey Bean Validation module This content is produced and maintained by the Eclipse Jersey project. * https://projects.eclipse.org/projects/ee4j.jersey @@ -50,4 +34,4 @@ The project maintains the following source code repositories: Hibernate Validator CDI, 6.1.2.Final * License: Apache License, 2.0 * Project: https://beanvalidation.org/ -* Repackaged in org.glassfish.jersey.server.validation.internal.hibernate +* Repackaged in org.glassfish.jersey.server.validation.internal.hibernate \ No newline at end of file diff --git a/media/json-jackson/src/main/resources/META-INF/NOTICE.markdown b/media/json-jackson/src/main/resources/META-INF/NOTICE.markdown index 2d44e7b9719..1db99624f72 100644 --- a/media/json-jackson/src/main/resources/META-INF/NOTICE.markdown +++ b/media/json-jackson/src/main/resources/META-INF/NOTICE.markdown @@ -1,20 +1,4 @@ -# -# Copyright (c) 2020 Oracle and/or its affiliates. All rights reserved. -# -# This program and the accompanying materials are made available under the -# terms of the Eclipse Public License v. 2.0, which is available at -# http://www.eclipse.org/legal/epl-2.0. -# -# This Source Code may also be made available under the following Secondary -# Licenses when the conditions for such availability set forth in the -# Eclipse Public License v. 2.0 are satisfied: GNU General Public License, -# version 2 with the GNU Classpath Exception, which is available at -# https://www.gnu.org/software/classpath/license.html. -# -# SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 -# - -# Notice for Jersey Json Jackson module +# Notice for Jersey Json Jackson module This content is produced and maintained by the Eclipse Jersey project. * https://projects.eclipse.org/projects/ee4j.jersey @@ -50,4 +34,4 @@ The project maintains the following source code repositories: Jackson JAX-RS Providers version 2.10.1 * License: Apache License, 2.0 * Project: https://github.com/FasterXML/jackson-jaxrs-providers -* Copyright: (c) 2009-2011 FasterXML, LLC. All rights reserved unless otherwise indicated. +* Copyright: (c) 2009-2011 FasterXML, LLC. All rights reserved unless otherwise indicated. \ No newline at end of file diff --git a/pom.xml b/pom.xml index 8cd789c2cfe..ed0355b8744 100644 --- a/pom.xml +++ b/pom.xml @@ -647,11 +647,11 @@ git - false + true true - true + false false