PAYARA-1876 jcache api is packaged twice (#1799)

* PAYARA-1876 jcache api is packaged twice * PAYARA-1876 move jsr107=repackaged into nucleus
payara · Jul 28, 2017 · aa6449f · aa6449f
1 parent e48977a
commit aa6449f
Show file tree

Hide file tree

Showing 4 changed files with 79 additions and 18 deletions.
diff --git a/appserver/payara-appserver-modules/pom.xml b/appserver/payara-appserver-modules/pom.xml
@@ -51,7 +51,6 @@
     <packaging>pom</packaging>
     <modules>
         <module>payara-jsr107</module>
-        <module>jsr107-repackaged</module>
         <module>hazelcast-ejb-timer</module>
         <module>requesttracing-api</module>
         <module>jmx-monitoring-service</module>

diff --git a/nucleus/packager/hazelcast-package/pom.xml b/nucleus/packager/hazelcast-package/pom.xml
@@ -63,9 +63,9 @@ DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>javax.cache</groupId>
-            <artifactId>cache-api</artifactId>
-            <version>1.0.0</version>
+            <groupId>fish.payara.payara-modules</groupId>
+            <artifactId>jsr107-repackaged</artifactId>
+            <version>${project.version}</version>
         </dependency>
     </dependencies>
 </project>

diff --git a/...pserver-modules/jsr107-repackaged/pom.xml → .../payara-modules/jsr107-repackaged/pom.xml b/...pserver-modules/jsr107-repackaged/pom.xml → .../payara-modules/jsr107-repackaged/pom.xml
@@ -1,12 +1,51 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Copyright (c) 2017 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.
+-->
+
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.glassfish.main</groupId>
-        <artifactId>payara-appserver-modules</artifactId>
+        <groupId>fish.payara.payara-modules</groupId>
+        <artifactId>payara-nucleus-modules</artifactId>
         <version>4.1.2.173-SNAPSHOT</version>
     </parent>
-    <groupId>fish.payara.appserver</groupId>
+    <groupId>fish.payara.payara-modules</groupId>
     <artifactId>jsr107-repackaged</artifactId>
     <packaging>jar</packaging>
     <name>Repackaged JSR 107</name>

diff --git a/nucleus/payara-modules/pom.xml b/nucleus/payara-modules/pom.xml
@@ -1,20 +1,42 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
+  DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
- DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+  Copyright (c) 2014-2017 Payara Foundation and/or its affiliates. All rights reserved.
 
- Copyright (c) 2014-2016 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.
 
- The contents of this file are subject to the terms of 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://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
- or packager/legal/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.
 
- When distributing the software, include this License Header Notice in each
- file and include the License file at packager/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.
  -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
@@ -38,5 +60,6 @@
         <module>asadmin-recorder</module>
         <module>service-exemplar</module>
         <module>notification-eventbus-core</module>
+        <module>jsr107-repackaged</module>
     </modules>
 </project>