Switched caching support to use Eclipse Public License to be consiste…

…nt with https://github.com/jakartaee/expression-language use of EPLv2 Signed-off-by: Scott Marlow <[email protected]>
jboss · Jan 30, 2024 · 2f9307e · 2f9307e
1 parent c44c93d
commit 2f9307e
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 281 deletions.
diff --git a/LICENSE.md b/LICENSE.md
diff --git a/api/pom.xml b/api/pom.xml
@@ -54,29 +54,6 @@
        </contributor>
     </contributors>
 
-    <licenses>
-        <license>
-            <name>EPL 2.0</name>
-            <url>http://www.eclipse.org/legal/epl-2.0</url>
-            <distribution>repo</distribution>
-        </license>
-        <license>
-            <name>GPL2 w/ CPE</name>
-            <url>https://www.gnu.org/software/classpath/license.html</url>
-            <distribution>repo</distribution>
-        </license>
-      <license>
-            <name>Apache 2.0</name>
-            <url>http://www.apache.org/licenses/LICENSE-2.0</url>
-            <distribution>repo</distribution>
-        </license>
-       <license>
-            <name>LGPL 2.1 or later</name>
-            <url>http://www.gnu.org/licenses/old-licenses/lgpl-2.1-standalone.html</url>
-            <distribution>repo</distribution>
-        </license>
-    </licenses>
-
     <scm>
         <connection>scm:git:[email protected]:jboss/jboss-jakarta-el-api_spec.git</connection>
         <developerConnection>scm:git:[email protected]:jboss/jboss-jakarta-el-api_spec.git</developerConnection>

diff --git a/api/src/main/java/org/jboss/el/cache/BeanPropertiesCache.java b/api/src/main/java/org/jboss/el/cache/BeanPropertiesCache.java
@@ -1,23 +1,7 @@
 /*
- * JBoss, Home of Professional Open Source.
- * Copyright 2019, Red Hat, Inc., and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
+ * Copyright The WildFly Authors
+ * SPDX-License-Identifier: EPL-2.0
  *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
 
 package org.jboss.el.cache;

diff --git a/api/src/main/java/org/jboss/el/cache/FactoryFinderCache.java b/api/src/main/java/org/jboss/el/cache/FactoryFinderCache.java
@@ -1,23 +1,7 @@
 /*
- * JBoss, Home of Professional Open Source.
- * Copyright 2012, Red Hat, Inc., and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
+ * Copyright The WildFly Authors
+ * SPDX-License-Identifier: EPL-2.0
  *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
 
 package org.jboss.el.cache;

diff --git a/api/src/test/java/jakarta/el/BeanELResolverTestCase.java b/api/src/test/java/jakarta/el/BeanELResolverTestCase.java
@@ -1,23 +1,7 @@
 /*
- * JBoss, Home of Professional Open Source.
- * Copyright (c) 2015, Red Hat, Inc., and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
+ * Copyright The WildFly Authors
+ * SPDX-License-Identifier: EPL-2.0
  *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
 package jakarta.el;
 

diff --git a/pom.xml b/pom.xml
@@ -38,29 +38,6 @@
     <modules>
         <module>api</module>
     </modules>
-
-    <licenses>
-        <license>
-            <name>EPL 2.0</name>
-            <url>http://www.eclipse.org/legal/epl-2.0</url>
-            <distribution>repo</distribution>
-        </license>
-        <license>
-            <name>GPL2 w/ CPE</name>
-            <url>https://www.gnu.org/software/classpath/license.html</url>
-            <distribution>repo</distribution>
-        </license>
-        <license>
-            <name>Apache 2.0</name>
-            <url>http://www.apache.org/licenses/LICENSE-2.0</url>
-            <distribution>repo</distribution>
-        </license>
-        <license>
-            <name>LGPL 2.1 or later</name>
-            <url>http://www.gnu.org/licenses/old-licenses/lgpl-2.1-standalone.html</url>
-            <distribution>repo</distribution>
-        </license>
-    </licenses>
 
     <build>
         <plugins>