From a4a993f6d8768877ce1245e060a756fba30ae9a3 Mon Sep 17 00:00:00 2001 From: Richard Zowalla Date: Fri, 21 Aug 2026 14:22:01 +0200 Subject: [PATCH] [OPENJPA-2999] Correct the schema copyright and license statements in the manual --- .../src/doc/manual/openjpa_legal.xml | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/openjpa-project/src/doc/manual/openjpa_legal.xml b/openjpa-project/src/doc/manual/openjpa_legal.xml index 9c9f22bb3b..718b7bc497 100644 --- a/openjpa-project/src/doc/manual/openjpa_legal.xml +++ b/openjpa-project/src/doc/manual/openjpa_legal.xml @@ -43,7 +43,7 @@ The Apache OpenJPA website can be found at: Apache OpenJPA is released under the Apache Software License Version 2.0 -Apache OpenJPA includes the persistence and orm schemas from the JPA specifications and elects to include this software in this distribution under the EFSL 1.1 license. +Apache OpenJPA includes the persistence and orm schemas from the JPA specifications. OpenJPA elects to include the JPA 1.0 and JPA 2.0 schemas in this distribution under the CDDL 1.0 license and the JPA 2.1 and later schemas under the Eclipse Distribution License v. 1.0. @@ -99,19 +99,21 @@ Apache, OpenJPA and the Apache feather logo are trademarks of Apache Software Fo OpenJPA includes the persistence and orm schemas from the JPA specifications. -Copyright (c) [2024] Eclipse Foundation AISBL EFSL 1.1 +The JPA 1.0 and JPA 2.0 schemas are Copyright 2005-2009 Sun Microsystems, Inc. All rights reserved. +OpenJPA elects to include them in this distribution under the CDDL 1.0 license, a copy of which is +available at https://oss.oracle.com/licenses/CDDL. -OpenJPA elects to include this software in this distribution under the CDDL license. +The JPA 2.1 and later schemas are Copyright (c) 2008, 2024 Oracle and/or its affiliates. All rights reserved. +They are made available under the Eclipse Public License v. 2.0 +(https://www.eclipse.org/legal/epl-2.0) or the +Eclipse Distribution License v. 1.0 +(https://www.eclipse.org/org/documents/edl-v10.php); +OpenJPA elects to include them in this distribution under the Eclipse Distribution License v. 1.0. -You can obtain a copy of the License at: -https://glassfish.dev.java.net/public/CDDL+GPL.html - - -The source code is available at: -http://java.net/projects/glassfish/sources/svn/show -or http://jcp.org/en/jsr/detail?id=317 +The schemas are published as part of the Jakarta Persistence specifications, which are available at: +https://jakarta.ee/specifications/persistence/