PAYARA-2616-Align-javaee-api-dependency-versions-to-8.0

payara · Mar 26, 2018 · 251cbb9 · 251cbb9
1 parent 8b770f3
commit 251cbb9
Show file tree

Hide file tree

Showing 30 changed files with 228 additions and 91 deletions.
diff --git a/api/pom.xml b/api/pom.xml
@@ -1,7 +1,7 @@
 <!--
   DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  
-  Copyright (c) [2016-2017] Payara Foundation and/or its affiliates. All rights reserved.
+  Copyright (c) [2016-2018] 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
@@ -83,7 +83,7 @@
             <dependency>
                 <groupId>javax</groupId>
                 <artifactId>javaee-api</artifactId>
-                <version>7.0</version>
+                <version>${javaee.api.version}</version>
                 <scope>provided</scope>
                 <optional>true</optional>
             </dependency>

diff --git a/appserver/extras/arquillian-containers/payara-common/dependency-reduced-pom.xml b/appserver/extras/arquillian-containers/payara-common/dependency-reduced-pom.xml
@@ -24,7 +24,7 @@
     <dependency>
       <groupId>javax</groupId>
       <artifactId>javaee-api</artifactId>
-      <version>7.0</version>
+      <version>8.0</version>
       <scope>test</scope>
       <exclusions>
         <exclusion>

diff --git a/appserver/extras/arquillian-containers/payara-common/pom.xml b/appserver/extras/arquillian-containers/payara-common/pom.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
+  DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+
   Copyright (c) 2017-2018 Payara Foundation and/or its affiliates. All rights reserved.
  
   The contents of this file are subject to the terms of either the GNU
@@ -129,6 +131,7 @@
         <dependency>
             <groupId>javax</groupId>
             <artifactId>javaee-api</artifactId>
+            <version>${version.javaee.api}</version>
         </dependency>
 
         <dependency>

diff --git a/appserver/extras/arquillian-containers/payara-managed/pom.xml b/appserver/extras/arquillian-containers/payara-managed/pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
+  DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
   Copyright (c) 2017-2018 Payara Foundation and/or its affiliates. All rights reserved.
  
@@ -119,6 +120,7 @@
          <dependency>
             <groupId>javax</groupId>
             <artifactId>javaee-api</artifactId>
+           <version>${version.javaee.api}</version>
         </dependency>
 
 

diff --git a/appserver/extras/arquillian-containers/payara-micro/pom.xml b/appserver/extras/arquillian-containers/payara-micro/pom.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
+  DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-  Copyright (c) 2017 Payara Foundation and/or its affiliates. All rights reserved.
+  Copyright (c) 2017-2018 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
@@ -119,6 +120,7 @@
         <dependency>
             <groupId>javax</groupId>
             <artifactId>javaee-api</artifactId>
+            <version>${version.javaee.api}</version>
             <scope>provided</scope>
         </dependency>
 

diff --git a/appserver/extras/arquillian-containers/payara-remote/pom.xml b/appserver/extras/arquillian-containers/payara-remote/pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
+  DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
   Copyright (c) 2017-2018 Payara Foundation and/or its affiliates. All rights reserved.
  
@@ -120,8 +121,9 @@
          <dependency>
             <groupId>javax</groupId>
             <artifactId>javaee-api</artifactId>
+            <version>${version.javaee.api}</version>
         </dependency>
-        
+
 
         <!-- Test -->
 

diff --git a/appserver/extras/arquillian-containers/pom.xml b/appserver/extras/arquillian-containers/pom.xml
@@ -78,6 +78,7 @@
     <properties>
         <version.arquillian_core>1.1.13.Final</version.arquillian_core>
         <version.jersey>2.26</version.jersey>
+        <version.javaee.api>8.0</version.javaee.api>
 
         <maven.compiler.target>1.8</maven.compiler.target>
         <maven.compiler.source>1.8</maven.compiler.source>
@@ -232,7 +233,7 @@
             <dependency>
                 <groupId>javax</groupId>
                 <artifactId>javaee-api</artifactId>
-                <version>7.0</version>
+                <version>${javaee.api.version}</version>
                 <scope>test</scope>
             </dependency>
 

diff --git a/appserver/extras/payara-micro/payara-micro-boot/pom.xml b/appserver/extras/payara-micro/payara-micro-boot/pom.xml
@@ -63,8 +63,7 @@
 	<dependency>
             <groupId>javax</groupId>
             <artifactId>javaee-api</artifactId>
-            <version>8.0</version>
-            <type>jar</type>
+            <version>${javaee.api.version}</version>
             <optional>true</optional>
         </dependency>
     </dependencies>

diff --git a/appserver/payara-appserver-modules/cdi-auth-roles/pom.xml b/appserver/payara-appserver-modules/cdi-auth-roles/pom.xml
@@ -94,7 +94,7 @@
         <dependency>
             <groupId>javax</groupId>
             <artifactId>javaee-api</artifactId>
-            <version>7.0</version>
+            <version>${javaee.api.version}</version>
         </dependency>
         <dependency>
             <groupId>javax.security.enterprise</groupId>

diff --git a/appserver/payara-appserver-modules/hazelcast-ejb-timer/pom.xml b/appserver/payara-appserver-modules/hazelcast-ejb-timer/pom.xml
@@ -1,4 +1,45 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+  DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+
+  Copyright (c) 2014-2018 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>
@@ -39,8 +80,7 @@
         <dependency>
             <groupId>javax</groupId>
             <artifactId>javaee-api</artifactId>
-            <version>7.0</version>
-            <type>jar</type>
+            <version>${javaee.api.version}</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/appserver/payara-appserver-modules/jaspic-servlet-utils/pom.xml b/appserver/payara-appserver-modules/jaspic-servlet-utils/pom.xml
@@ -1,4 +1,45 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+  DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+
+  Copyright (c) 2014-2018 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>
@@ -27,8 +68,7 @@
         <dependency>
             <groupId>javax</groupId>
             <artifactId>javaee-api</artifactId>
-            <version>7.0</version>
-            <type>jar</type>
+            <version>${javaee.api.version}</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/appserver/payara-appserver-modules/microprofile/fault-tolerance/pom.xml b/appserver/payara-appserver-modules/microprofile/fault-tolerance/pom.xml
@@ -87,7 +87,7 @@
         <dependency>
             <groupId>javax</groupId>
             <artifactId>javaee-api</artifactId>
-            <version>7.0</version>
+            <version>${javaee.api.version}</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/appserver/payara-appserver-modules/microprofile/healthcheck/pom.xml b/appserver/payara-appserver-modules/microprofile/healthcheck/pom.xml
@@ -89,7 +89,7 @@
         <dependency>
             <groupId>javax</groupId>
             <artifactId>javaee-api</artifactId>
-            <version>7.0</version>
+            <version>${javaee.api.version}</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/appserver/payara-appserver-modules/microprofile/jwt-auth/pom.xml b/appserver/payara-appserver-modules/microprofile/jwt-auth/pom.xml
@@ -89,7 +89,7 @@
         <dependency>
             <groupId>javax</groupId>
             <artifactId>javaee-api</artifactId>
-            <version>8.0</version>
+            <version>${javaee.api.version}</version>
         </dependency>
 
         <dependency>

diff --git a/appserver/payara-appserver-modules/microprofile/metrics/pom.xml b/appserver/payara-appserver-modules/microprofile/metrics/pom.xml
@@ -2,7 +2,7 @@
 <!--
   DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2018 Payara Foundation and/or its affiliates. All rights reserved.
+  Copyright (c) [2017-2018] 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
@@ -82,7 +82,7 @@ Copyright (c) 2018 Payara Foundation and/or its affiliates. All rights reserved.
         <dependency>
             <groupId>javax</groupId>
             <artifactId>javaee-api</artifactId>
-            <version>8.0</version>
+            <version>${javaee.api.version}</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/appserver/payara-appserver-modules/notification-datadog-core/pom.xml b/appserver/payara-appserver-modules/notification-datadog-core/pom.xml
@@ -2,7 +2,7 @@
 <!--
   DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-  Copyright (c) 2017 Payara Foundation and/or its affiliates. All rights reserved.
+  Copyright (c) 2017-2018 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
@@ -60,7 +60,7 @@
         <dependency>
             <groupId>javax</groupId>
             <artifactId>javaee-api</artifactId>
-            <version>7.0</version>
+            <version>${javaee.api.version}</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>

diff --git a/appserver/payara-appserver-modules/notification-email-core/pom.xml b/appserver/payara-appserver-modules/notification-email-core/pom.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright (c) 2016 Payara Foundation and/or its affiliates. All rights reserved.
+
+  DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+
+  Copyright (c) 2016-2018 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
@@ -35,6 +38,7 @@
   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>
@@ -59,7 +63,7 @@
         <dependency>
             <groupId>javax</groupId>
             <artifactId>javaee-api</artifactId>
-            <version>7.0</version>
+            <version>${javaee.api.version}</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>

diff --git a/appserver/payara-appserver-modules/notification-hipchat-core/pom.xml b/appserver/payara-appserver-modules/notification-hipchat-core/pom.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright (c) 2016 Payara Foundation and/or its affiliates. All rights reserved.
+
+  DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+
+  Copyright (c) 2016-2018 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
@@ -35,6 +38,7 @@
   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>
@@ -58,7 +62,7 @@
         <dependency>
             <groupId>javax</groupId>
             <artifactId>javaee-api</artifactId>
-            <version>7.0</version>
+            <version>${javaee.api.version}</version>
             <scope>provided</scope>
         </dependency>
 

diff --git a/appserver/payara-appserver-modules/notification-jms-core/pom.xml b/appserver/payara-appserver-modules/notification-jms-core/pom.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright (c) 2016 Payara Foundation and/or its affiliates. All rights reserved.
+
+  DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+
+  Copyright (c) 2016-2018 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
@@ -35,6 +38,7 @@
   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>
@@ -58,7 +62,7 @@
         <dependency>
             <groupId>javax</groupId>
             <artifactId>javaee-api</artifactId>
-            <version>7.0</version>
+            <version>${javaee.api.version}</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>