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/04 16:22:11 UTC
[1/4] tomee git commit: Fixed MP Notice files. Added jose4j notice.
Repository: tomee
Updated Branches:
refs/heads/master 17bbec3aa -> 2d0274802
Fixed MP Notice files.
Added jose4j notice.
(cherry picked from commit 3494814)
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/0fa0703c
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/0fa0703c
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/0fa0703c
Branch: refs/heads/master
Commit: 0fa0703c6ec70a92814e134072616557b61b7147
Parents: 219879c
Author: Roberto Cortez <ra...@yahoo.com>
Authored: Fri Aug 31 22:41:31 2018 +0100
Committer: Roberto Cortez <ra...@yahoo.com>
Committed: Tue Sep 4 11:06:35 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/0fa0703c/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/0fa0703c/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/
[4/4] tomee git commit: Excluding ClassConverterTest from MP Config
TCK. Requires a fix in Geronimo Config.
Posted by jg...@apache.org.
Excluding ClassConverterTest from MP Config TCK. Requires a fix in Geronimo Config.
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/2d027480
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/2d027480
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/2d027480
Branch: refs/heads/master
Commit: 2d02748020eba34ae73c843fd0db316e5395bb79
Parents: 84d8dd1
Author: Roberto Cortez <ra...@yahoo.com>
Authored: Tue Sep 4 16:23:13 2018 +0100
Committer: Roberto Cortez <ra...@yahoo.com>
Committed: Tue Sep 4 16:23:13 2018 +0100
----------------------------------------------------------------------
tck/microprofile-tck/config/pom.xml | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/2d027480/tck/microprofile-tck/config/pom.xml
----------------------------------------------------------------------
diff --git a/tck/microprofile-tck/config/pom.xml b/tck/microprofile-tck/config/pom.xml
index e8bdafc..c96d6fa 100644
--- a/tck/microprofile-tck/config/pom.xml
+++ b/tck/microprofile-tck/config/pom.xml
@@ -38,6 +38,10 @@
<dependenciesToScan>
<dependency>org.eclipse.microprofile.config:microprofile-config-tck</dependency>
</dependenciesToScan>
+ <!-- TODO - This requires a fix in geronimo-config-impl to use the Thread ClassLoader in ClassConverter. -->
+ <excludes>
+ <exclude>org.eclipse.microprofile.config.tck.ClassConverterTest</exclude>
+ </excludes>
</configuration>
</plugin>
</plugins>
[2/4] tomee git commit: Added missing NOTICE file.
Posted by jg...@apache.org.
Added missing NOTICE file.
(cherry picked from commit b57be64)
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/219879ca
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/219879ca
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/219879ca
Branch: refs/heads/master
Commit: 219879ca958a67b7d1be480605a5d2a86e2aa7fc
Parents: 17bbec3
Author: Roberto Cortez <ra...@yahoo.com>
Authored: Fri Aug 31 22:35:29 2018 +0100
Committer: Roberto Cortez <ra...@yahoo.com>
Committed: Tue Sep 4 11:06:35 2018 +0100
----------------------------------------------------------------------
.../main/resources/META-INF/microprofile/NOTICE | 148 +++++++++++++++++++
1 file changed, 148 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/219879ca/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)
+=========================================================================
[3/4] tomee git commit: Removed hardcoded TomEE version from tests.
Posted by jg...@apache.org.
Removed hardcoded TomEE version from tests.
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/84d8dd1b
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/84d8dd1b
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/84d8dd1b
Branch: refs/heads/master
Commit: 84d8dd1bbe272f30deaf117113d2eab302e0efa4
Parents: 0fa0703
Author: Roberto Cortez <ra...@yahoo.com>
Authored: Tue Sep 4 16:22:28 2018 +0100
Committer: Roberto Cortez <ra...@yahoo.com>
Committed: Tue Sep 4 16:22:28 2018 +0100
----------------------------------------------------------------------
.../moviefun/DeployInWebAppsDirectoryTest.java | 2 +-
examples/connector-ear/pom.xml | 15 +++++++++++++++
.../moviefun/DeployInWebAppsDirectoryTest.java | 2 +-
examples/simple-ear/pom.xml | 9 +++++++++
4 files changed, 26 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/84d8dd1b/examples/connector-ear/connector-sample-functional-tests/src/test/java/org/superbiz/moviefun/DeployInWebAppsDirectoryTest.java
----------------------------------------------------------------------
diff --git a/examples/connector-ear/connector-sample-functional-tests/src/test/java/org/superbiz/moviefun/DeployInWebAppsDirectoryTest.java b/examples/connector-ear/connector-sample-functional-tests/src/test/java/org/superbiz/moviefun/DeployInWebAppsDirectoryTest.java
index 072d925..d0f38c8 100644
--- a/examples/connector-ear/connector-sample-functional-tests/src/test/java/org/superbiz/moviefun/DeployInWebAppsDirectoryTest.java
+++ b/examples/connector-ear/connector-sample-functional-tests/src/test/java/org/superbiz/moviefun/DeployInWebAppsDirectoryTest.java
@@ -105,7 +105,7 @@ public class DeployInWebAppsDirectoryTest {
configuration.setGroupId("org.apache.tomee");
configuration.setArtifactId("apache-tomee");
configuration.setClassifier("plus");
- configuration.setVersion("7.0.5-SNAPSHOT");
+ configuration.setVersion(System.getProperty("tomee.version"));
// configuration.setDebug(true);
configuration.setHttpPort(-1);
http://git-wip-us.apache.org/repos/asf/tomee/blob/84d8dd1b/examples/connector-ear/pom.xml
----------------------------------------------------------------------
diff --git a/examples/connector-ear/pom.xml b/examples/connector-ear/pom.xml
index 97067b0..ca2b152 100644
--- a/examples/connector-ear/pom.xml
+++ b/examples/connector-ear/pom.xml
@@ -77,6 +77,21 @@
</plugin>
</plugins>
</pluginManagement>
+
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <systemProperties>
+ <property>
+ <name>tomee.version</name>
+ <value>${tomee.version}</value>
+ </property>
+ </systemProperties>
+ </configuration>
+ </plugin>
+ </plugins>
</build>
<!-- This section allows you to configure where to publish libraries for
http://git-wip-us.apache.org/repos/asf/tomee/blob/84d8dd1b/examples/simple-ear/moviefun-functional-tests/src/test/java/org/superbiz/moviefun/DeployInWebAppsDirectoryTest.java
----------------------------------------------------------------------
diff --git a/examples/simple-ear/moviefun-functional-tests/src/test/java/org/superbiz/moviefun/DeployInWebAppsDirectoryTest.java b/examples/simple-ear/moviefun-functional-tests/src/test/java/org/superbiz/moviefun/DeployInWebAppsDirectoryTest.java
index 1d5658e..7dd38e3 100644
--- a/examples/simple-ear/moviefun-functional-tests/src/test/java/org/superbiz/moviefun/DeployInWebAppsDirectoryTest.java
+++ b/examples/simple-ear/moviefun-functional-tests/src/test/java/org/superbiz/moviefun/DeployInWebAppsDirectoryTest.java
@@ -46,7 +46,7 @@ public class DeployInWebAppsDirectoryTest {
configuration.setGroupId("org.apache.tomee");
configuration.setArtifactId("apache-tomee");
configuration.setClassifier("plus");
- configuration.setVersion("7.0.5-SNAPSHOT");
+ configuration.setVersion(System.getProperty("tomee.version"));
configuration.setHttpPort(-1);
final RemoteTomEEContainer container = new RemoteTomEEContainer();
http://git-wip-us.apache.org/repos/asf/tomee/blob/84d8dd1b/examples/simple-ear/pom.xml
----------------------------------------------------------------------
diff --git a/examples/simple-ear/pom.xml b/examples/simple-ear/pom.xml
index 6aeae89..bcd0596 100644
--- a/examples/simple-ear/pom.xml
+++ b/examples/simple-ear/pom.xml
@@ -37,6 +37,7 @@
</modules>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <tomee.version>8.0.0-SNAPSHOT</tomee.version>
</properties>
<repositories>
<repository>
@@ -62,6 +63,14 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.18.1</version>
+ <configuration>
+ <systemProperties>
+ <property>
+ <name>tomee.version</name>
+ <value>${tomee.version}</value>
+ </property>
+ </systemProperties>
+ </configuration>
</plugin>
</plugins>
</pluginManagement>