You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by jg...@apache.org on 2018/09/02 20:07:44 UTC

[1/3] tomee git commit: Fixed MP Notice files. Added jose4j notice.

Repository: tomee
Updated Branches:
  refs/heads/tomee-7.1.x dd31576f9 -> d68550300


Fixed MP Notice files.
Added jose4j notice.


Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/34948141
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/34948141
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/34948141

Branch: refs/heads/tomee-7.1.x
Commit: 3494814199fef1832e1ec2e73132395af403e01d
Parents: b57be64
Author: Roberto Cortez <ra...@yahoo.com>
Authored: Fri Aug 31 22:41:31 2018 +0100
Committer: Roberto Cortez <ra...@yahoo.com>
Committed: Fri Aug 31 22:42:45 2018 +0100

----------------------------------------------------------------------
 .../main/resources/META-INF/microprofile/NOTICE | 15 ++++
 .../src/main/resources/META-INF/NOTICE          | 79 +++++++++++++-------
 2 files changed, 66 insertions(+), 28 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tomee/blob/34948141/tomee/apache-tomee/src/main/resources/META-INF/microprofile/NOTICE
----------------------------------------------------------------------
diff --git a/tomee/apache-tomee/src/main/resources/META-INF/microprofile/NOTICE b/tomee/apache-tomee/src/main/resources/META-INF/microprofile/NOTICE
index 5806389..09d4a4e 100644
--- a/tomee/apache-tomee/src/main/resources/META-INF/microprofile/NOTICE
+++ b/tomee/apache-tomee/src/main/resources/META-INF/microprofile/NOTICE
@@ -146,3 +146,18 @@ Joda.org (http://www.joda.org/).
 This product includes software developed and copyrighted by the The OWASP
    Foundation (https://www.owasp.org)
 =========================================================================
+jose4j NOTICE
+
+jose4j
+Copyright 2012-2015 Brian Campbell
+
+EcdsaUsingShaAlgorithm contains code for converting the concatenated
+R & S values of the signature to and from DER, which was originally
+derived from the Apache Santuario XML Security library's SignatureECDSA
+implementation. http://santuario.apache.org/
+
+The Base64 implementation in this software was derived from the
+Apache Commons Codec project. http://commons.apache.org/proper/commons-codec/
+
+JSON processing in this software was derived from the JSON.simple toolkit.
+https://code.google.com/p/json-simple/

http://git-wip-us.apache.org/repos/asf/tomee/blob/34948141/tomee/tomee-microprofile-webapp/src/main/resources/META-INF/NOTICE
----------------------------------------------------------------------
diff --git a/tomee/tomee-microprofile-webapp/src/main/resources/META-INF/NOTICE b/tomee/tomee-microprofile-webapp/src/main/resources/META-INF/NOTICE
index 52f83d3..09d4a4e 100644
--- a/tomee/tomee-microprofile-webapp/src/main/resources/META-INF/NOTICE
+++ b/tomee/tomee-microprofile-webapp/src/main/resources/META-INF/NOTICE
@@ -54,6 +54,22 @@ Copyright 2007-2010 Agimatec GmbH. All rights reserved.
 
 
 =====================================
+Apache Tomcat NOTICE
+
+The original XML Schemas for Java EE Deployment Descriptors:
+ - javaee_5.xsd
+ - javaee_web_services_1_2.xsd
+ - javaee_web_services_client_1_2.xsd
+ - javaee_6.xsd
+ - javaee_web_services_1_3.xsd
+ - javaee_web_services_client_1_3.xsd
+ - web-app_3_0.xsd
+ - web-common_3_0.xsd
+ - web-fragment_3_0.xsd
+may be obtained from http://java.sun.com/xml/ns/javaee/
+
+
+=====================================
 Apache MyFaces NOTICE
 
 This software also includes code from Facelets (https://facelets.dev.java.net/)
@@ -76,14 +92,26 @@ javascript core, which is licensed under a modified BSD license or the Academic
 This software also includes code from j4fry (http://www.j4fry.org/),
 which is licensed under ASL 2.0.
 
-=====================================
-Apache ActiveMQ NOTICE
-
-This product includes software developed by the Protocol Buffers
-project (http://code.google.com/apis/protocolbuffers).
-
-
-=====================================
+=========================================================================
+  - JAnsi (http://http://jansi.fusesource.org/) org.fusesource.jansi:jansi:jar:1.8
+    License: Apache License 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
+=========================================================================
+FastInfoset (https://fi.java.net/)
+License: Apache License 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
+=========================================================================
+Istack Commons Runtime (https://istack-commons.java.net/)
+License: CDDL v1.1 and GPL v2 (https://glassfish.java.net/public/CDDL+GPL_1_1.html)
+=========================================================================
+Jaxb Core (https://jaxb.java.net/)
+License: CDDL v1.1 and GPL v2 (https://glassfish.java.net/public/CDDL+GPL_1_1.html)
+=========================================================================
+Quartz (http://quartz-scheduler.org/)
+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 CXF NOTICE
 
 Java classes (source and binary) under org.apache.cxf.jaxws.javaee
@@ -105,26 +133,6 @@ 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).
-
-=========================================================================
-  - JAnsi (http://http://jansi.fusesource.org/) org.fusesource.jansi:jansi:jar:1.8
-    License: Apache License 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
-=========================================================================
-FastInfoset (https://fi.java.net/)
-License: Apache License 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
-=========================================================================
-Istack Commons Runtime (https://istack-commons.java.net/)
-License: CDDL v1.1 and GPL v2 (https://glassfish.java.net/public/CDDL+GPL_1_1.html)
-=========================================================================
-Jaxb Core (https://jaxb.java.net/)
-License: CDDL v1.1 and GPL v2 (https://glassfish.java.net/public/CDDL+GPL_1_1.html)
-=========================================================================
-Quartz (http://quartz-scheduler.org/)
-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
@@ -138,3 +146,18 @@ Joda.org (http://www.joda.org/).
 This product includes software developed and copyrighted by the The OWASP
    Foundation (https://www.owasp.org)
 =========================================================================
+jose4j NOTICE
+
+jose4j
+Copyright 2012-2015 Brian Campbell
+
+EcdsaUsingShaAlgorithm contains code for converting the concatenated
+R & S values of the signature to and from DER, which was originally
+derived from the Apache Santuario XML Security library's SignatureECDSA
+implementation. http://santuario.apache.org/
+
+The Base64 implementation in this software was derived from the
+Apache Commons Codec project. http://commons.apache.org/proper/commons-codec/
+
+JSON processing in this software was derived from the JSON.simple toolkit.
+https://code.google.com/p/json-simple/


[3/3] tomee git commit: Merge branch 'tomee-7.1.x' of github.com:radcortez/tomee into tomee-7.1.x

Posted by jg...@apache.org.
Merge branch 'tomee-7.1.x' of github.com:radcortez/tomee into tomee-7.1.x


Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/d6855030
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/d6855030
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/d6855030

Branch: refs/heads/tomee-7.1.x
Commit: d6855030056c5ad4cd6b6887381ce78041bf150c
Parents: dd31576 3494814
Author: Jonathan Gallimore <jg...@tomitribe.com>
Authored: Sun Sep 2 21:07:10 2018 +0100
Committer: Jonathan Gallimore <jg...@tomitribe.com>
Committed: Sun Sep 2 21:07:10 2018 +0100

----------------------------------------------------------------------
 .../main/resources/META-INF/microprofile/NOTICE | 163 +++++++++++++++++++
 .../src/main/resources/META-INF/NOTICE          |  79 +++++----
 2 files changed, 214 insertions(+), 28 deletions(-)
----------------------------------------------------------------------



[2/3] tomee git commit: Added missing NOTICE file.

Posted by jg...@apache.org.
Added missing NOTICE file.


Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/b57be647
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/b57be647
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/b57be647

Branch: refs/heads/tomee-7.1.x
Commit: b57be647649b526efff4a08ce5edfb001cf9d2be
Parents: 5877b61
Author: Roberto Cortez <ra...@yahoo.com>
Authored: Fri Aug 31 22:35:29 2018 +0100
Committer: Roberto Cortez <ra...@yahoo.com>
Committed: Fri Aug 31 22:42:45 2018 +0100

----------------------------------------------------------------------
 .../main/resources/META-INF/microprofile/NOTICE | 148 +++++++++++++++++++
 1 file changed, 148 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tomee/blob/b57be647/tomee/apache-tomee/src/main/resources/META-INF/microprofile/NOTICE
----------------------------------------------------------------------
diff --git a/tomee/apache-tomee/src/main/resources/META-INF/microprofile/NOTICE b/tomee/apache-tomee/src/main/resources/META-INF/microprofile/NOTICE
new file mode 100644
index 0000000..5806389
--- /dev/null
+++ b/tomee/apache-tomee/src/main/resources/META-INF/microprofile/NOTICE
@@ -0,0 +1,148 @@
+Apache OpenEJB
+Copyright 1999-2014 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+This product includes schema files developed for the Glassfish Java EE
+reference implementation (http://java.sun.com/xml/ns/j2ee/).
+Apache OpenEJB elects to include this software in this distribution
+under the CDDL license.  You can obtain a copy of the License at:
+    https://glassfish.dev.java.net/public/CDDL+GPL.html
+
+
+=====================================
+Apache Xerces Java NOTICE
+
+Portions of this software were originally based on the following:
+ - software copyright (c) 1999, IBM Corporation., http://www.ibm.com.
+ - software copyright (c) 1999, Sun Microsystems., http://www.sun.com.
+ - voluntary contributions made by Paul Eng on behalf of the
+   Apache Software Foundation that were originally developed at iClick, Inc.,
+   software copyright (c) 1999.
+
+
+=====================================
+Apache OpenJPA NOTICE
+
+OpenJPA includes the persistence and orm schemas from the JPA specifications.
+Copyright 2005-2014 Sun Microsystems, Inc. All rights reserved.
+
+OpenJPA elects to include this software in this distribution under the
+CDDL license.  You can obtain a copy of the License at:
+    https://glassfish.dev.java.net/public/CDDL+GPL.html
+The source code is available at:
+    https://glassfish.dev.java.net/source/browse/glassfish/
+
+OpenJPA includes software written by Miroslav Nachev
+
+
+=====================================
+Apache WebServices - XmlSchema NOTICE
+
+Portions Copyright 2006 International Business Machines Corp.
+
+Portions Copyright (C) World Wide Web Consortium 2006, 2007 and licensed under the
+three-part BSD license.
+
+
+=====================================
+Apache Bean Validation NOTICE
+
+This product includes software developed by agimatec GmbH.
+Copyright 2007-2010 Agimatec GmbH. All rights reserved.
+
+
+=====================================
+Apache Tomcat NOTICE
+
+The original XML Schemas for Java EE Deployment Descriptors:
+ - javaee_5.xsd
+ - javaee_web_services_1_2.xsd
+ - javaee_web_services_client_1_2.xsd
+ - javaee_6.xsd
+ - javaee_web_services_1_3.xsd
+ - javaee_web_services_client_1_3.xsd
+ - web-app_3_0.xsd
+ - web-common_3_0.xsd
+ - web-fragment_3_0.xsd
+may be obtained from http://java.sun.com/xml/ns/javaee/
+
+
+=====================================
+Apache MyFaces NOTICE
+
+This software also includes code from Facelets (https://facelets.dev.java.net/)
+for the purpose of implementing Facelets PDL for JSF 2.0 support.
+
+This product includes schema files developed for the Glassfish Java EE
+reference implementation (http://java.sun.com/xml/ns/j2ee/).
+Apache Myfaces elects to include this software in this distribution
+under the CDDL license.  You can obtain a copy of the License at:
+    https://glassfish.dev.java.net/public/CDDL+GPL.html
+The source code is available at:
+    https://glassfish.dev.java.net/source/browse/glassfish/
+
+
+This software also includes code from the Dojo toolkit (http://www.dojotoolkit.org/)
+for the purpose of reusing existing well proven javascript code in the myfaces
+javascript core, which is licensed under a modified BSD license or the Academic Free License version 2.1
+(see http://o.dojotoolkit.org/about/license and http://trac.dojotoolkit.org/browser/dojo/trunk/LICENSE for more information)
+
+This software also includes code from j4fry (http://www.j4fry.org/),
+which is licensed under ASL 2.0.
+
+=========================================================================
+  - JAnsi (http://http://jansi.fusesource.org/) org.fusesource.jansi:jansi:jar:1.8
+    License: Apache License 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
+=========================================================================
+FastInfoset (https://fi.java.net/)
+License: Apache License 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
+=========================================================================
+Istack Commons Runtime (https://istack-commons.java.net/)
+License: CDDL v1.1 and GPL v2 (https://glassfish.java.net/public/CDDL+GPL_1_1.html)
+=========================================================================
+Jaxb Core (https://jaxb.java.net/)
+License: CDDL v1.1 and GPL v2 (https://glassfish.java.net/public/CDDL+GPL_1_1.html)
+=========================================================================
+Quartz (http://quartz-scheduler.org/)
+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 CXF NOTICE
+
+Java classes (source and binary) under org.apache.cxf.jaxws.javaee
+are generated from schema available here:
+(http://java.sun.com/xml/ns/javaee/javaee_5.xsd)
+
+Portions of the file cxf-utils.js derives from code marked:
+This code was written by Tyler Akins and has been placed in the
+public domain.  It would be nice if you left this header intact.
+Base64 code from Tyler Akins -- http://rumkin.com
+
+The product contains code (StaxBuilder.java) that is
+  Copyright (C) 2000-2004 Jason Hunter & Brett McLaughlin.
+  All rights reserved.
+  See the NOTICE.jdom file for additional information
+
+This Product also includes software developed by David Heinemeier Hansson.
+(http://dev.rubyonrails.org/browser/trunk/activesupport/lib/active_support/inflections.rb)
+
+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)
+=========================================================================