Change license of NullSerializer/Deserializer to EPL

Were created with GPL/CDDL by mistake Signed-off-by: Patrik Dudits <patrik.dudits@payara.fish>
eclipse-ee4j · Oct 15, 2019 · 2ff436e · 2ff436e
1 parent 5b2cad4
commit 2ff436e
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 76 deletions.
diff --git a/src/main/java/org/eclipse/yasson/internal/serializer/NullDeserializer.java b/src/main/java/org/eclipse/yasson/internal/serializer/NullDeserializer.java
@@ -1,42 +1,15 @@
-/*
- *    DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+/*******************************************************************************
+ * Copyright (c) 2019 Payara Services and/or its affiliates. All rights reserved.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
+ * which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ * http://www.eclipse.org/org/documents/edl-v10.php.
  *
- *    Copyright (c) [2019] Payara Foundation and/or its affiliates. All rights reserved.
- *
- *    The contents of this file are subject to the terms of either the GNU
- *    General Public License Version 2 only ("GPL") or the Common Development
- *    and Distribution License("CDDL") (collectively, the "License").  You
- *    may not use this file except in compliance with the License.  You can
- *    obtain a copy of the License at
- *    https://github.com/payara/Payara/blob/master/LICENSE.txt
- *    See the License for the specific
- *    language governing permissions and limitations under the License.
- *
- *    When distributing the software, include this License Header Notice in each
- *    file and include the License file at glassfish/legal/LICENSE.txt.
- *
- *    GPL Classpath Exception:
- *    The Payara Foundation designates this particular file as subject to the "Classpath"
- *    exception as provided by the Payara Foundation in the GPL Version 2 section of the License
- *    file that accompanied this code.
- *
- *    Modifications:
- *    If applicable, add the following below the License Header, with the fields
- *    enclosed by brackets [] replaced by your own identifying information:
- *    "Portions Copyright [year] [name of copyright owner]"
- *
- *    Contributor(s):
- *    If you wish your version of this file to be governed by only the CDDL or
- *    only the GPL Version 2, indicate your decision by adding "[Contributor]
- *    elects to include this software in this distribution under the [CDDL or GPL
- *    Version 2] license."  If you don't indicate a single choice of license, a
- *    recipient has the option to distribute your version of this file under
- *    either the CDDL, the GPL Version 2 or to extend the choice of license to
- *    its licensees as provided above.  However, if you add GPL Version 2 code
- *    and therefore, elected the GPL Version 2 license, then the option applies
- *    only if the new code is made subject to such option by the copyright
- *    holder.
- */
+ * Contributors:
+ * Patrik Duditš
+ ******************************************************************************/
 
 package org.eclipse.yasson.internal.serializer;
 

diff --git a/src/main/java/org/eclipse/yasson/internal/serializer/NullSerializer.java b/src/main/java/org/eclipse/yasson/internal/serializer/NullSerializer.java
@@ -1,42 +1,15 @@
-/*
- *    DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+/*******************************************************************************
+ * Copyright (c) 2019 Payara Services and/or its affiliates. All rights reserved.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
+ * which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ * http://www.eclipse.org/org/documents/edl-v10.php.
  *
- *    Copyright (c) [2019] Payara Foundation and/or its affiliates. All rights reserved.
- *
- *    The contents of this file are subject to the terms of either the GNU
- *    General Public License Version 2 only ("GPL") or the Common Development
- *    and Distribution License("CDDL") (collectively, the "License").  You
- *    may not use this file except in compliance with the License.  You can
- *    obtain a copy of the License at
- *    https://github.com/payara/Payara/blob/master/LICENSE.txt
- *    See the License for the specific
- *    language governing permissions and limitations under the License.
- *
- *    When distributing the software, include this License Header Notice in each
- *    file and include the License file at glassfish/legal/LICENSE.txt.
- *
- *    GPL Classpath Exception:
- *    The Payara Foundation designates this particular file as subject to the "Classpath"
- *    exception as provided by the Payara Foundation in the GPL Version 2 section of the License
- *    file that accompanied this code.
- *
- *    Modifications:
- *    If applicable, add the following below the License Header, with the fields
- *    enclosed by brackets [] replaced by your own identifying information:
- *    "Portions Copyright [year] [name of copyright owner]"
- *
- *    Contributor(s):
- *    If you wish your version of this file to be governed by only the CDDL or
- *    only the GPL Version 2, indicate your decision by adding "[Contributor]
- *    elects to include this software in this distribution under the [CDDL or GPL
- *    Version 2] license."  If you don't indicate a single choice of license, a
- *    recipient has the option to distribute your version of this file under
- *    either the CDDL, the GPL Version 2 or to extend the choice of license to
- *    its licensees as provided above.  However, if you add GPL Version 2 code
- *    and therefore, elected the GPL Version 2 license, then the option applies
- *    only if the new code is made subject to such option by the copyright
- *    holder.
- */
+ * Contributors:
+ * Patrik Duditš
+ ******************************************************************************/
 
 package org.eclipse.yasson.internal.serializer;