You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by jl...@apache.org on 2019/07/22 13:07:09 UTC
[tomee] 10/31: Revert "TOMEE-2354 - Added MicroProfile Support to
TomEE Plus."
This is an automated email from the ASF dual-hosted git repository.
jlmonteiro pushed a commit to branch tomee8-java11
in repository https://gitbox.apache.org/repos/asf/tomee.git
commit b0d253ab53c15b966717ece551125d85156c5122
Author: Jonathan Gallimore <jo...@jrg.me.uk>
AuthorDate: Wed Dec 19 01:22:56 2018 +0000
Revert "TOMEE-2354 - Added MicroProfile Support to TomEE Plus."
This reverts commit f3a49ae206dde246e3f89cd664fe07f794d5208a.
---
.../src/main/resources/META-INF/plus/NOTICE | 46 -----------
.../src/main/resources/META-INF/NOTICE | 92 ----------------------
2 files changed, 138 deletions(-)
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 7eb273a..58217b4 100644
--- a/tomee/apache-tomee/src/main/resources/META-INF/plus/NOTICE
+++ b/tomee/apache-tomee/src/main/resources/META-INF/plus/NOTICE
@@ -146,28 +146,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
-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).
-=========================================================================
ECJ - Eclipse Compiler for Java
Eclipse Public License - v 1.0 - https://www.eclipse.org/org/documents/epl-v10.html
=========================================================================
@@ -183,27 +161,3 @@ 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/
-=========================================================================
-Jackson JSON processor
-Jackson is a high-performance, Free/Open Source JSON processing library.
-It was originally written by Tatu Saloranta (tatu.saloranta@iki.fi), and has
-been in development since 2007.
-It is currently developed by a community of developers, as well as supported
-commercially by FasterXML.com.
-=========================================================================
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 7eb273a..9dde4bb 100644
--- a/tomee/tomee-plus-webapp/src/main/resources/META-INF/NOTICE
+++ b/tomee/tomee-plus-webapp/src/main/resources/META-INF/NOTICE
@@ -54,22 +54,6 @@ 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/)
@@ -92,36 +76,6 @@ 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).
-
-
-=====================================
-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).
-
=========================================================================
- 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)
@@ -146,28 +100,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
-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).
-=========================================================================
ECJ - Eclipse Compiler for Java
Eclipse Public License - v 1.0 - https://www.eclipse.org/org/documents/epl-v10.html
=========================================================================
@@ -183,27 +115,3 @@ 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/
-=========================================================================
-Jackson JSON processor
-Jackson is a high-performance, Free/Open Source JSON processing library.
-It was originally written by Tatu Saloranta (tatu.saloranta@iki.fi), and has
-been in development since 2007.
-It is currently developed by a community of developers, as well as supported
-commercially by FasterXML.com.
-=========================================================================