Update notices and EOL attributes
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/9a32cafc Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/9a32cafc Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/9a32cafc Branch: refs/heads/tomee-7.0.0-M1 Commit: 9a32cafcbedb4bcbc471af44c87adb0dde3b6362 Parents: dfe79c4 Author: AndyGee <andy...@gmx.de> Authored: Tue Dec 1 22:28:37 2015 +0100 Committer: AndyGee <andy...@gmx.de> Committed: Tue Dec 1 22:33:28 2015 +0100 ---------------------------------------------------------------------- .gitattributes | 25 +++++++++++++++++--- .../src/main/resources/META-INF/NOTICE | 12 ++++++++++ .../src/main/resources/NOTICE | 12 ++++++++++ examples/NOTICE | 12 ++++++++++ .../src/main/resources/META-INF/plume/NOTICE | 12 ++++++++++ .../src/main/resources/META-INF/plus/NOTICE | 12 ++++++++++ .../main/resources/META-INF/webprofile/NOTICE | 14 ++++++++++- .../src/main/resources/META-INF/NOTICE | 12 ++++++++++ .../src/main/resources/META-INF/NOTICE | 12 ++++++++++ .../src/main/resources/META-INF/NOTICE | 12 ++++++++++ .../openejb-provisionning/src/main/legal/NOTICE | 12 ++++++++++ 11 files changed, 143 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/9a32cafc/.gitattributes ---------------------------------------------------------------------- diff --git a/.gitattributes b/.gitattributes index b064d42..dfc2e4b 100644 --- a/.gitattributes +++ b/.gitattributes @@ -6,8 +6,13 @@ # The above will handle all files NOT found below # # These files are text and should be normalized (Convert crlf => lf) +*.adoc text +*.conf text +*.config text *.css text *.df text +*.extension text +*.groovy text *.htm text *.html text *.java text @@ -15,16 +20,29 @@ *.json text *.jsp text *.jspf text +*.md text *.properties text +*.sbt text +*.scala text *.sh text +*.sql text *.svg text +*.template text *.tld text *.txt text +*.vm text +*.wadl text +*.wsdl text +*.xhtml text *.xml text *.xsd text -*.groovy text -*.xhtml text -*.sql text +*.yml text + +openejb +ejbd +ejbds +NOTICE text +LICENSE text # These files are binary and should be left untouched # (binary is a macro for -text -diff) @@ -37,6 +55,7 @@ *.jpg binary *.jpeg binary *.png binary +*.ser binary *.so binary *.war binary *.zip binary http://git-wip-us.apache.org/repos/asf/tomee/blob/9a32cafc/assembly/openejb-lite/src/main/resources/META-INF/NOTICE ---------------------------------------------------------------------- diff --git a/assembly/openejb-lite/src/main/resources/META-INF/NOTICE b/assembly/openejb-lite/src/main/resources/META-INF/NOTICE index 468ed5b..ef192da 100644 --- a/assembly/openejb-lite/src/main/resources/META-INF/NOTICE +++ b/assembly/openejb-lite/src/main/resources/META-INF/NOTICE @@ -42,3 +42,15 @@ Apache Bean Validation NOTICE This product includes software developed by agimatec GmbH. Copyright 2007-2010 Agimatec GmbH. All rights reserved. +Apache XBean :: ASM shaded (repackaged) +Copyright 2005-2013 The Apache Software Foundation +========================================================================= +This product includes software developed at +The Apache Software Foundation (http://www.apache.org/). +========================================================================= +This product includes software developed by +Joda.org (http://www.joda.org/). +========================================================================= +This product includes software developed and copyrighted by the The OWASP + Foundation (https://www.owasp.org) +========================================================================= http://git-wip-us.apache.org/repos/asf/tomee/blob/9a32cafc/assembly/openejb-standalone/src/main/resources/NOTICE ---------------------------------------------------------------------- diff --git a/assembly/openejb-standalone/src/main/resources/NOTICE b/assembly/openejb-standalone/src/main/resources/NOTICE index 39a70eb..c2ccd4d 100644 --- a/assembly/openejb-standalone/src/main/resources/NOTICE +++ b/assembly/openejb-standalone/src/main/resources/NOTICE @@ -103,3 +103,15 @@ License: CDDL v1.1 and GPL v2 (https://glassfish.java.net/public/CDDL+GPL_1_1.ht Quartz (http://quartz-scheduler.org/) License: Apache License 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) ========================================================================= +Apache XBean :: ASM shaded (repackaged) +Copyright 2005-2013 The Apache Software Foundation + +This product includes software developed at +The Apache Software Foundation (http://www.apache.org/). +========================================================================= +This product includes software developed by +Joda.org (http://www.joda.org/). +========================================================================= +This product includes software developed and copyrighted by the The OWASP + Foundation (https://www.owasp.org) +========================================================================= \ No newline at end of file http://git-wip-us.apache.org/repos/asf/tomee/blob/9a32cafc/examples/NOTICE ---------------------------------------------------------------------- diff --git a/examples/NOTICE b/examples/NOTICE index 78edc7d..aca5549 100644 --- a/examples/NOTICE +++ b/examples/NOTICE @@ -42,4 +42,16 @@ License: Apache License 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) el-api - Unified Expression Language is dual licensed under 2 OSI approved licenses (https://uel.java.net/license.html) COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL - Version 1.1) GNU General Public License (GPL - Version 2, June 1991) with the Classpath Exception +========================================================================= +Apache XBean :: ASM shaded (repackaged) +Copyright 2005-2013 The Apache Software Foundation + +This product includes software developed at +The Apache Software Foundation (http://www.apache.org/). +========================================================================= +This product includes software developed by +Joda.org (http://www.joda.org/). +========================================================================= +This product includes software developed and copyrighted by the The OWASP + Foundation (https://www.owasp.org) ========================================================================= \ No newline at end of file http://git-wip-us.apache.org/repos/asf/tomee/blob/9a32cafc/tomee/apache-tomee/src/main/resources/META-INF/plume/NOTICE ---------------------------------------------------------------------- diff --git a/tomee/apache-tomee/src/main/resources/META-INF/plume/NOTICE b/tomee/apache-tomee/src/main/resources/META-INF/plume/NOTICE index e9c6beb..a3c5862 100644 --- a/tomee/apache-tomee/src/main/resources/META-INF/plume/NOTICE +++ b/tomee/apache-tomee/src/main/resources/META-INF/plume/NOTICE @@ -155,4 +155,16 @@ License: COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) plus GPL, https://gl ========================================================================= ECJ - Eclipse Compiler for Java Eclipse Public License - v 1.0 - https://www.eclipse.org/org/documents/epl-v10.html +========================================================================= +Apache XBean :: ASM shaded (repackaged) +Copyright 2005-2013 The Apache Software Foundation + +This product includes software developed at +The Apache Software Foundation (http://www.apache.org/). +========================================================================= +This product includes software developed by +Joda.org (http://www.joda.org/). +========================================================================= +This product includes software developed and copyrighted by the The OWASP + Foundation (https://www.owasp.org) ========================================================================= \ No newline at end of file http://git-wip-us.apache.org/repos/asf/tomee/blob/9a32cafc/tomee/apache-tomee/src/main/resources/META-INF/plus/NOTICE ---------------------------------------------------------------------- diff --git a/tomee/apache-tomee/src/main/resources/META-INF/plus/NOTICE b/tomee/apache-tomee/src/main/resources/META-INF/plus/NOTICE index bf7f881..ba6bde2 100644 --- a/tomee/apache-tomee/src/main/resources/META-INF/plus/NOTICE +++ b/tomee/apache-tomee/src/main/resources/META-INF/plus/NOTICE @@ -148,4 +148,16 @@ el-api - Unified Expression Language is dual licensed under 2 OSI approved licen ========================================================================= ECJ - Eclipse Compiler for Java Eclipse Public License - v 1.0 - https://www.eclipse.org/org/documents/epl-v10.html +========================================================================= +Apache XBean :: ASM shaded (repackaged) +Copyright 2005-2013 The Apache Software Foundation + +This product includes software developed at +The Apache Software Foundation (http://www.apache.org/). +========================================================================= +This product includes software developed by +Joda.org (http://www.joda.org/). +========================================================================= +This product includes software developed and copyrighted by the The OWASP + Foundation (https://www.owasp.org) ========================================================================= \ No newline at end of file http://git-wip-us.apache.org/repos/asf/tomee/blob/9a32cafc/tomee/apache-tomee/src/main/resources/META-INF/webprofile/NOTICE ---------------------------------------------------------------------- diff --git a/tomee/apache-tomee/src/main/resources/META-INF/webprofile/NOTICE b/tomee/apache-tomee/src/main/resources/META-INF/webprofile/NOTICE index f96cd4b..5806389 100644 --- a/tomee/apache-tomee/src/main/resources/META-INF/webprofile/NOTICE +++ b/tomee/apache-tomee/src/main/resources/META-INF/webprofile/NOTICE @@ -112,7 +112,6 @@ el-api - Unified Expression Language is dual licensed under 2 OSI approved licen COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL - Version 1.1) GNU General Public License (GPL - Version 2, June 1991) with the Classpath Exception ========================================================================= -===================================== Apache CXF NOTICE Java classes (source and binary) under org.apache.cxf.jaxws.javaee @@ -134,3 +133,16 @@ This Product also includes software developed by David Heinemeier Hansson. This product includes software Copyright University of Southampton IT Innovation Centre, 2009 (http://www.it-innovation.soton.ac.uk). +========================================================================= +Apache XBean :: ASM shaded (repackaged) +Copyright 2005-2013 The Apache Software Foundation + +This product includes software developed at +The Apache Software Foundation (http://www.apache.org/). +========================================================================= +This product includes software developed by +Joda.org (http://www.joda.org/). +========================================================================= +This product includes software developed and copyrighted by the The OWASP + Foundation (https://www.owasp.org) +========================================================================= http://git-wip-us.apache.org/repos/asf/tomee/blob/9a32cafc/tomee/tomee-plume-webapp/src/main/resources/META-INF/NOTICE ---------------------------------------------------------------------- diff --git a/tomee/tomee-plume-webapp/src/main/resources/META-INF/NOTICE b/tomee/tomee-plume-webapp/src/main/resources/META-INF/NOTICE index d16bd82..4d74e4a 100644 --- a/tomee/tomee-plume-webapp/src/main/resources/META-INF/NOTICE +++ b/tomee/tomee-plume-webapp/src/main/resources/META-INF/NOTICE @@ -109,4 +109,16 @@ Eclipse Public License - v 1.0 - https://www.eclipse.org/org/documents/epl-v10.h ========================================================================= Mojarra JavaServer Faces - Oracle's open source implementation of the JSF standard (https://javaserverfaces.java.net/) License: COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) plus GPL, https://glassfish.dev.java.net/public/CDDL+GPL.html +========================================================================= +Apache XBean :: ASM shaded (repackaged) +Copyright 2005-2013 The Apache Software Foundation + +This product includes software developed at +The Apache Software Foundation (http://www.apache.org/). +========================================================================= +This product includes software developed by +Joda.org (http://www.joda.org/). +========================================================================= +This product includes software developed and copyrighted by the The OWASP + Foundation (https://www.owasp.org) ========================================================================= \ No newline at end of file http://git-wip-us.apache.org/repos/asf/tomee/blob/9a32cafc/tomee/tomee-plus-webapp/src/main/resources/META-INF/NOTICE ---------------------------------------------------------------------- diff --git a/tomee/tomee-plus-webapp/src/main/resources/META-INF/NOTICE b/tomee/tomee-plus-webapp/src/main/resources/META-INF/NOTICE index 9137d17..1b5bf26 100644 --- a/tomee/tomee-plus-webapp/src/main/resources/META-INF/NOTICE +++ b/tomee/tomee-plus-webapp/src/main/resources/META-INF/NOTICE @@ -102,4 +102,16 @@ el-api - Unified Expression Language is dual licensed under 2 OSI approved licen ========================================================================= ECJ - Eclipse Compiler for Java Eclipse Public License - v 1.0 - https://www.eclipse.org/org/documents/epl-v10.html +========================================================================= +Apache XBean :: ASM shaded (repackaged) +Copyright 2005-2013 The Apache Software Foundation + +This product includes software developed at +The Apache Software Foundation (http://www.apache.org/). +========================================================================= +This product includes software developed by +Joda.org (http://www.joda.org/). +========================================================================= +This product includes software developed and copyrighted by the The OWASP + Foundation (https://www.owasp.org) ========================================================================= \ No newline at end of file http://git-wip-us.apache.org/repos/asf/tomee/blob/9a32cafc/tomee/tomee-webapp/src/main/resources/META-INF/NOTICE ---------------------------------------------------------------------- diff --git a/tomee/tomee-webapp/src/main/resources/META-INF/NOTICE b/tomee/tomee-webapp/src/main/resources/META-INF/NOTICE index 105f7b0..133e2fd 100644 --- a/tomee/tomee-webapp/src/main/resources/META-INF/NOTICE +++ b/tomee/tomee-webapp/src/main/resources/META-INF/NOTICE @@ -126,3 +126,15 @@ el-api - Unified Expression Language is dual licensed under 2 OSI approved licen COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL - Version 1.1) GNU General Public License (GPL - Version 2, June 1991) with the Classpath Exception ========================================================================= +Apache XBean :: ASM shaded (repackaged) +Copyright 2005-2013 The Apache Software Foundation + +This product includes software developed at +The Apache Software Foundation (http://www.apache.org/). +========================================================================= +This product includes software developed by +Joda.org (http://www.joda.org/). +========================================================================= +This product includes software developed and copyrighted by the The OWASP + Foundation (https://www.owasp.org) +========================================================================= \ No newline at end of file http://git-wip-us.apache.org/repos/asf/tomee/blob/9a32cafc/utils/openejb-provisionning/src/main/legal/NOTICE ---------------------------------------------------------------------- diff --git a/utils/openejb-provisionning/src/main/legal/NOTICE b/utils/openejb-provisionning/src/main/legal/NOTICE index 1d8c249..ac0b3bc 100644 --- a/utils/openejb-provisionning/src/main/legal/NOTICE +++ b/utils/openejb-provisionning/src/main/legal/NOTICE @@ -90,3 +90,15 @@ el-api - Unified Expression Language is dual licensed under 2 OSI approved licen COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL - Version 1.1) GNU General Public License (GPL - Version 2, June 1991) with the Classpath Exception ========================================================================= +Apache XBean :: ASM shaded (repackaged) +Copyright 2005-2013 The Apache Software Foundation + +This product includes software developed at +The Apache Software Foundation (http://www.apache.org/). +========================================================================= +This product includes software developed by +Joda.org (http://www.joda.org/). +========================================================================= +This product includes software developed and copyrighted by the The OWASP + Foundation (https://www.owasp.org) +=========================================================================