dev@glassfish.java.net

[gf-dev] Switch appserver build to source=1.8 and target=1.8

From: Arindam Bandyopadhyay <arindam.bandyopadhyay_at_oracle.com>
Date: Mon, 6 Feb 2017 22:26:35 +0530

Please review the appserver pom change to use source=1.8 and target=1.8


Index:
appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/interceptors/InterceptorManager.java
===================================================================
---
appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/interceptors/InterceptorManager.java
(revision 64502)
+++
appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/interceptors/InterceptorManager.java
(working copy)
@@ -1,7 +1,7 @@
  /*
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
   *
- * Copyright (c) 1997-2013 Oracle and/or its affiliates. All rights
reserved.
+ * Copyright (c) 1997-2017 Oracle 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
@@ -239,7 +239,7 @@
          }


- List<InterceptorDescriptor> list = (ejbDesc != null) ?
+ List<? extends InterceptorDescriptor> list = (ejbDesc != null) ?
                  ejbDesc.getAroundInvokeInterceptors(mDesc) :
interceptorInfo.getAroundInvokeInterceptors(beanMethod);

Index: appserver/javaee-api/pom.xml
===================================================================
--- appserver/javaee-api/pom.xml (revision 64502)
+++ appserver/javaee-api/pom.xml (working copy)
@@ -3,7 +3,7 @@

      DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.

- Copyright (c) 1997-2015 Oracle and/or its affiliates. All rights
reserved.
+ Copyright (c) 1997-2017 Oracle 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
@@ -68,14 +68,6 @@
          <plugins>
              <plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.8</source>
- <target>1.8</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
                  <configuration>
<useDefaultManifestFile>true</useDefaultManifestFile>
Index: appserver/pom.xml
===================================================================
--- appserver/pom.xml (revision 64502)
+++ appserver/pom.xml (working copy)
@@ -180,8 +180,8 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
                  <configuration>
- <source>1.7</source>
- <target>1.7</target>
+ <source>1.8</source>
+ <target>1.8</target>
                  </configuration>
              </plugin>
              <plugin>


-- 
Thanks,
Arindam