OPENJPA-2911 finish Serp removal

apache · Jul 25, 2023 · 0729141 · 0729141
1 parent bb11f02
commit 0729141
Show file tree

Hide file tree

Showing 16 changed files with 3 additions and 135 deletions.
diff --git a/NOTICE b/NOTICE
@@ -9,10 +9,6 @@ The Apache Software Foundation (http://www.apache.org/).
 The following copyright notice(s) were affixed to portions of this code
 with which this file is now or was at one time distributed.
 
-
-OpenJPA includes software developed by the SERP project
-Copyright (c) 2002-2006, A. Abram White. All rights reserved.
-
 OpenJPA includes the persistence and orm schemas from the JPA specifications.
 Copyright 2005-2009 Sun Microsystems, Inc. All rights reserved.
 OpenJPA elects to include this software in this distribution under the

diff --git a/openjpa-all/src/main/appended-resources/META-INF/LICENSE.vm b/openjpa-all/src/main/appended-resources/META-INF/LICENSE.vm
@@ -232,36 +232,6 @@ and resource files are also released under the ASF license above.
 
 The exceptions are as follows:
 
-=============================
-serp-1.13.1.jar - BSD License
-=============================
-
-Copyright (c) 2002, A. Abram White
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-* Redistributions of source code must retain the above copyright notice, this
-  list of conditions and the following disclaimer.
-* Redistributions in binary form must reproduce the above copyright notice,
-  this list of conditions and the following disclaimer in the documentation
-  and/or other materials provided with the distribution.
-* Neither the name of 'serp' nor the names of its contributors may
-  be used to endorse or promote products derived from this software without
-  specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
 ===========================
 openjpa-persistence -
   orm-xsd.rsrc - CDDL 1.0 - included in the openjpa jar, taken from:

diff --git a/openjpa-all/src/main/appended-resources/META-INF/NOTICE.vm b/openjpa-all/src/main/appended-resources/META-INF/NOTICE.vm
@@ -32,9 +32,6 @@ openjpa-all includes software developed by the:
 The following copyright notice(s) were affixed to portions of this code
 with which this file is now or was at one time distributed.
 
-OpenJPA includes software developed by the SERP project
-Copyright (c) 2002-2006, A. Abram White. All rights reserved.
-
 OpenJPA includes the persistence and orm schemas from the JPA specifications.
 Copyright 2005-2009 Sun Microsystems, Inc. All rights reserved.
 OpenJPA elects to include this software in this distribution under the

diff --git a/openjpa-features/src/main/feature/feature.xml b/openjpa-features/src/main/feature/feature.xml
@@ -24,9 +24,8 @@
         <bundle dependency="true">mvn:org.eclipse.persistence/jakarta.persistence/2.1.0</bundle>
         <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-annotation_1.0_spec/1.1.1</bundle>
         <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-el_1.0_spec/1.0.1</bundle>
-	<bundle dependency="true">mvn:org.apache.commons/commons-pool2/${pool2.version}</bundle>
+        <bundle dependency="true">mvn:org.apache.commons/commons-pool2/${pool2.version}</bundle>
         <bundle dependency="true">mvn:org.apache.commons/commons-dbcp2/2.7.0</bundle>
-        <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.serp/1.14.1_1</bundle>
         <bundle dependency="true">mvn:org.apache.xbean/xbean-asm9-shaded/${xbean.version}</bundle>
         <bundle>mvn:org.apache.openjpa/openjpa/${project.version}</bundle>
         <capability>

diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/conf/JDBCConfigurationImpl.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/conf/JDBCConfigurationImpl.java
@@ -353,19 +353,6 @@ public JDBCConfigurationImpl(boolean derivations, boolean loadGlobals) {
         identifierUtilPlugin.setString(aliases[0]);
         identifierUtilPlugin.setInstantiatingGetter("getIdentifierUtilInstance");
 
-
-        // this static initializer is to get past a weird
-        // ClassCircularityError that happens only under IBM's
-        // JDK 1.3.1 on Linux from within the JRun ClassLoader;
-        // while exact causes are unknown, it is almost certainly
-        // a bug in JRun, and we can get around it by forcing
-        // Instruction.class to be loaded and initialized
-        // before TypedInstruction.class
-        try { serp.bytecode.lowlevel.Entry.class.getName(); }
-        catch (Throwable t) {}
-        try { serp.bytecode.Instruction.class.getName(); }
-        catch (Throwable t) {}
-
         supportedOptions().add(OPTION_QUERY_SQL);
         supportedOptions().add(OPTION_JDBC_CONNECTION);
         supportedOptions().remove(OPTION_VALUE_INCREMENT);

diff --git a/openjpa-kernel/pom.xml b/openjpa-kernel/pom.xml
@@ -66,11 +66,7 @@
             <version>4.2.0</version>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <!-- TODO REMOVE -->
-            <groupId>net.sourceforge.serp</groupId>
-            <artifactId>serp</artifactId>
-        </dependency>
+
         <dependency>
             <groupId>org.apache.xbean</groupId>
             <artifactId>xbean-asm9-shaded</artifactId>

diff --git a/openjpa-lib/src/test/java/org/apache/openjpa/lib/util/testlocalizer/LocalizerTestHelper.java b/openjpa-lib/src/test/java/org/apache/openjpa/lib/util/testlocalizer/LocalizerTestHelper.java
@@ -20,7 +20,7 @@
 
 /**
  * Helper class used so that the localizer.properties file in this package
- * can be accessed. The properties cannot be in the same package(serp.util)
+ * can be accessed. The properties cannot be in the same package
  * as the main tester class because other utilities in the source line might
  * eventually want to use a localizer.properties file for that package.
  *

diff --git a/openjpa-persistence-jdbc/src/test/resources/j2.security.jse.policy b/openjpa-persistence-jdbc/src/test/resources/j2.security.jse.policy
@@ -55,16 +55,6 @@ grant CodeBase "${db2.base}/-" {
 // ================================================================
 // The following permissions are required by OpenJPA implementation.
 
-// ----------------------------------------------------------------
-// Serp:  E.g.
-//  -Dserp.base="file:///C:\.m2\repository\net\sourceforge\serp\serp\1.11.0"
-
-grant CodeBase "${serp.base}/-" {
-
-    permission java.io.FilePermission   "<<ALL FILES>>", "read,write";
-    permission java.lang.RuntimePermission               "createClassLoader";
-};
-
 // ----------------------------------------------------------------
 // OpeJPA:  E.g.
 //  -Dopenjpa.base=file:///C:\openjpa.cur\openjpa-all\target

diff --git a/openjpa-project/LICENSE b/openjpa-project/LICENSE
@@ -557,36 +557,6 @@ NOTICE PURSUANT TO SECTION 9 OF THE COMMON DEVELOPMENT AND DISTRIBUTION LICENSE
 The GlassFish code released under the CDDL shall be governed by the laws of the State of California (excluding conflict-of-law provisions). Any litigation relating to this License shall be subject to the jurisdiction of the Federal Courts of the Northern District of California and the state courts of the State of California, with venue lying in Santa Clara County, California.
 
 
-serp-1.13.1.jar - BSD License
-=============================
-
-Copyright (c) 2002, A. Abram White
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-* Redistributions of source code must retain the above copyright notice, this
-  list of conditions and the following disclaimer.
-* Redistributions in binary form must reproduce the above copyright notice,
-  this list of conditions and the following disclaimer in the documentation
-  and/or other materials provided with the distribution.
-* Neither the name of 'serp' nor the names of its contributors may
-  be used to endorse or promote products derived from this software without
-  specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
 ===========================
 
 Eclipse Public License - v 1.0

diff --git a/openjpa-project/NOTICE b/openjpa-project/NOTICE
@@ -15,15 +15,11 @@ The OpenJPA binary assembly and openjpa-all includes software developed by the:
     Apache Geronimo project
         Java EE Specs - JMS 1.1, JTA 1.1, Bean Validation 1.0 and JPA 2.0
     Apache Incubtor - Bean Validation project
-    SERP project
 
 
 The following copyright notice(s) were affixed to portions of this code
 with which this file is now or was at one time distributed.
 
-OpenJPA includes software developed by the SERP project
-Copyright (c) 2002-2006, A. Abram White. All rights reserved.
-
 OpenJPA includes the persistence and orm schemas from the JPA specifications.
 Copyright 2005-2009 Sun Microsystems, Inc. All rights reserved.
 OpenJPA elects to include this software in this distribution under the

diff --git a/openjpa-project/assembly.xml b/openjpa-project/assembly.xml
@@ -130,7 +130,6 @@
             <unpack>false</unpack>
             <scope>runtime</scope>
             <includes>
-                <include>net.sourceforge.serp:serp</include>
                 <include>org.apache.derby:derby</include>
 
                 <include>org.apache.commons:commons-pool2</include>

diff --git a/openjpa-project/bin-assembly.xml b/openjpa-project/bin-assembly.xml
@@ -69,7 +69,6 @@
             <unpack>false</unpack>
             <scope>runtime</scope>
             <includes>
-                <include>net.sourceforge.serp:serp</include>
                 <include>org.apache.derby:derby</include>
 
                 <include>org.apache.commons:commons-pool2</include>

diff --git a/openjpa-project/src/doc/manual/openjpa_legal.xml b/openjpa-project/src/doc/manual/openjpa_legal.xml
@@ -45,9 +45,6 @@ Apache OpenJPA is released under the <ulink url="http://www.apache.org/licenses/
         <para>
 Apache OpenJPA includes the persistence and orm schemas from the JPA specifications and elects to include this software in this distribution under the <ulink url="https://glassfish.dev.java.net/public/CDDL+GPL.html">CDDL license.</ulink>
         </para>
-        <para>
-Apache OpenJPA includes software developed by the SERP project, which uses the <ulink url="http://www.opensource.org/licenses/bsd-license.php">BSD license</ulink>
-        </para>
     </section>
 
     <section id="openjpa_legal_notice">
@@ -79,9 +76,6 @@ The openjpa-all aggregate JAR includes software developed by the:
                 <listitem><para>
     JCP JSR-317 JPA 2.0 schemas
                 </para></listitem>
-                <listitem><para>
-    SERP project
-                </para></listitem>
             </itemizedlist>
         </para>
     </section>
@@ -99,15 +93,6 @@ Copyright (C) 2006,2011 The Apache Software Foundation.
 Apache, OpenJPA and the Apache feather logo are trademarks of Apache Software Foundation.
             </para>
         </section>
-        <section id="openjpa_legal_copyright_serp">
-            <title>Serp</title>
-            <para>
-OpenJPA includes software developed by the SERP project.
-            </para>
-            <para>
-Copyright (c) 2002-2006, A. Abram White. All rights reserved.
-            </para>
-        </section>
         <section id="openjpa_legal_copyright_sun">
             <title>Sun</title>
             <para>

diff --git a/openjpa/pom.xml b/openjpa/pom.xml
@@ -136,7 +136,6 @@
                             jakarta.transaction.*;version="[1.1,1.3)";resolution:=optional,
                             jakarta.validation.*;version="[1.0.0,1.1)";resolution:=optional,
                             jakarta.xml.bind.*;resolution:=optional,
-                            serp.*;resolution:=optional,
                             org.apache.commons.dbcp2.*;resolution:=optional,
                             org.apache.commons.pool2.*;resolution:=optional,
                             jakarta.persistence.*;version="[1.1.0,2.2)",

diff --git a/openjpa/src/main/appended-resources/META-INF/NOTICE.vm b/openjpa/src/main/appended-resources/META-INF/NOTICE.vm
@@ -18,9 +18,6 @@
 ##
 
 
-OpenJPA includes software developed by the SERP project
-Copyright (c) 2002-2006, A. Abram White. All rights reserved.
-
 OpenJPA includes the persistence and orm schemas from the JPA specifications.
 Copyright 2005-2007 Sun Microsystems, Inc. All rights reserved.
 OpenJPA elects to include this software in this distribution under the

diff --git a/pom.xml b/pom.xml
@@ -1776,18 +1776,6 @@
                 <artifactId>commons-logging</artifactId>
                 <version>1.2</version>
             </dependency>
-            <dependency>
-                <groupId>net.sourceforge.serp</groupId>
-                <artifactId>serp</artifactId>
-                <version>1.15.1</version>
-                <exclusions>
-                  <exclusion>
-                    <groupId>junit</groupId>
-                    <artifactId>junit</artifactId>
-                  </exclusion>
-                </exclusions>
-            </dependency>
-
             <dependency>
                 <groupId>jakarta.persistence</groupId>
                 <artifactId>jakarta.persistence-api</artifactId>