Jenkins build fix (#691)

Ant version change to 1.10.7.
Eclipse SDK version change to 4.5.2.
Docker image change into tkraus/el-build:1.1.8 (same as master, 2.7 branches).
Javadoc generation fix.

Signed-off-by: Radek Felcman <[email protected]>

etc/jenkins/build.groovy

@@ -66,7 +66,7 @@ spec:
       requests:
         memory: "6Gi"
         cpu: "4"
-    image: tkraus/el-build:2.6.0
+    image: tkraus/el-build:1.1.8
     volumeMounts:
     - name: tools
       mountPath: /opt/tools

etc/jenkins/init.sh

@@ -25,15 +25,15 @@ wget -nc https://repo1.maven.org/maven2/org/jboss/logging/jboss-logging/3.3.0.Fi
 wget -nc https://repo1.maven.org/maven2/org/glassfish/javax.el/3.0.1-b08/javax.el-3.0.1-b08.jar -O $HOME/extension.lib.external/javax.el-3.0.1-b08.jar
 wget -nc https://repo1.maven.org/maven2/com/fasterxml/classmate/1.3.1/classmate-1.3.1.jar -O $HOME/extension.lib.external/classmate-1.3.1.jar
 wget -nc https://repo1.maven.org/maven2/mysql/mysql-connector-java/5.1.48/mysql-connector-java-5.1.48.jar -O $HOME/extension.lib.external/mysql-connector-java-5.1.48.jar
-wget -nc https://archive.apache.org/dist/ant/binaries/apache-ant-1.9.14-bin.tar.gz -O $HOME/extension.lib.external/apache-ant-1.9.14-bin.tar.gz
+wget -nc https://archive.apache.org/dist/ant/binaries/apache-ant-1.10.7-bin.tar.gz -O $HOME/extension.lib.external/apache-ant-1.10.7-bin.tar.gz
 wget -nc https://archive.apache.org/dist/maven/ant-tasks/2.1.3/binaries/maven-ant-tasks-2.1.3.jar -O $HOME/extension.lib.external/mavenant/maven-ant-tasks-2.1.3.jar
 wget -nc https://download.jboss.org/wildfly/15.0.1.Final/wildfly-15.0.1.Final.tar.gz -O $HOME/extension.lib.external/wildfly-15.0.1.Final.tar.gz
-wget -nc https://download.eclipse.org/eclipse/downloads/drops4/R-4.3.2-201402211700/eclipse-SDK-4.3.2-linux-gtk-x86_64.tar.gz -O $HOME/extension.lib.external/eclipse-SDK-4.3.2-linux-gtk-x86_64.tar.gz
+wget -nc https://download.eclipse.org/eclipse/downloads/drops4/R-4.5.2-201602121500/eclipse-SDK-4.5.2-linux-gtk-x86_64.tar.gz -O $HOME/extension.lib.external/eclipse-SDK-4.5.2-linux-gtk-x86_64.tar.gz
 wget -nc https://archive.apache.org/dist/maven/maven-3/3.6.0/binaries/apache-maven-3.6.0-bin.tar.gz -O $HOME/extension.lib.external/apache-maven-3.6.0-bin.tar.gz
 
 #UNPACK SOME  DEPENDENCIES
 tar -x -z -C $HOME/extension.lib.external -f $HOME/extension.lib.external/wildfly-15.0.1.Final.tar.gz
-tar -x -z -C $HOME/extension.lib.external -f $HOME/extension.lib.external/eclipse-SDK-4.3.2-linux-gtk-x86_64.tar.gz
+tar -x -z -C $HOME/extension.lib.external -f $HOME/extension.lib.external/eclipse-SDK-4.5.2-linux-gtk-x86_64.tar.gz
 tar -x -z -C $HOME/extension.lib.external -f $HOME/extension.lib.external/apache-maven-3.6.0-bin.tar.gz
 
 #PREPARE build.properties FILE

etc/jenkins/promote.groovy

@@ -65,7 +65,7 @@ spec:
       requests:
         memory: "2Gi"
         cpu: "1"
-    image: tkraus/el-build:2.6.0
+    image: tkraus/el-build:1.1.8
     volumeMounts:
     - name: tools
       mountPath: /opt/tools

etc/jenkins/promote_init.sh

@@ -39,12 +39,12 @@ wget -nc https://repo1.maven.org/maven2/org/jboss/logging/jboss-logging/3.3.0.Fi
 wget -nc https://repo1.maven.org/maven2/org/glassfish/javax.el/3.0.1-b08/javax.el-3.0.1-b08.jar -O $HOME/extension.lib.external/javax.el-3.0.1-b08.jar
 wget -nc https://repo1.maven.org/maven2/com/fasterxml/classmate/1.3.1/classmate-1.3.1.jar -O $HOME/extension.lib.external/classmate-1.3.1.jar
 wget -nc https://repo1.maven.org/maven2/mysql/mysql-connector-java/5.1.48/mysql-connector-java-5.1.48.jar -O $HOME/extension.lib.external/mysql-connector-java-5.1.48.jar
-wget -nc https://archive.apache.org/dist/ant/binaries/apache-ant-1.9.14-bin.tar.gz -O $HOME/extension.lib.external/apache-ant-1.9.14-bin.tar.gz
+wget -nc https://archive.apache.org/dist/ant/binaries/apache-ant-1.10.7-bin.tar.gz -O $HOME/extension.lib.external/apache-ant-1.10.7-bin.tar.gz
 wget -nc https://archive.apache.org/dist/maven/ant-tasks/2.1.3/binaries/maven-ant-tasks-2.1.3.jar -O $HOME/extension.lib.external/mavenant/maven-ant-tasks-2.1.3.jar
-wget -nc https://download.eclipse.org/eclipse/downloads/drops4/R-4.3.2-201402211700/eclipse-SDK-4.3.2-linux-gtk-x86_64.tar.gz -O $HOME/extension.lib.external/eclipse-SDK-4.3.2-linux-gtk-x86_64.tar.gz
+wget -nc https://download.eclipse.org/eclipse/downloads/drops4/R-4.5.2-201602121500/eclipse-SDK-4.5.2-linux-gtk-x86_64.tar.gz -O $HOME/extension.lib.external/eclipse-SDK-4.5.2-linux-gtk-x86_64.tar.gz
 
 #UNPACK SOME  DEPENDENCIES
-tar -x -z -C $HOME/extension.lib.external -f $HOME/extension.lib.external/eclipse-SDK-4.3.2-linux-gtk-x86_64.tar.gz
+tar -x -z -C $HOME/extension.lib.external -f $HOME/extension.lib.external/eclipse-SDK-4.5.2-linux-gtk-x86_64.tar.gz
 
 #PREPARE build.properties FILE
 echo "extensions.depend.dir=$HOME/extension.lib.external" >> $HOME/build.properties

foundation/org.eclipse.persistence.core/src/org/eclipse/persistence/config/PersistenceUnitProperties.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 1998, 2015 Oracle and/or its affiliates, IBM Corporation. All rights reserved.
+ * Copyright (c) 1998, 2020 Oracle and/or its affiliates, IBM Corporation. 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.
@@ -1030,7 +1030,7 @@ public class PersistenceUnitProperties {
      * <li>"<code>true</code>" - bindings will use platform default
      * </ul>
      * 
-     * @see org.eclipse.persistence.config.PersistenceUnitProperties.JDBC_BIND_PARAMETERS
+     * @see #JDBC_BIND_PARAMETERS
     */
    public static final String JDBC_FORCE_BIND_PARAMETERS = "eclipselink.jdbc.force-bind-parameters";
 
@@ -3053,7 +3053,7 @@ public class PersistenceUnitProperties {
      * <ul>
      * <li>a string containing a zero or greater integer value
      * </ul>
-     * @see PersistenceUnitProperties.QUERY_TIMEOUT_UNIT
+     * @see #QUERY_TIMEOUT_UNIT
      */
     public static final String QUERY_TIMEOUT = "javax.persistence.query.timeout";
 
@@ -3068,7 +3068,7 @@ public class PersistenceUnitProperties {
      * <li>"<code>java.util.concurrent.TimeUnit.SECONDS</code>" (DEFAULT),
      * <li>"<code>java.util.concurrent.TimeUnit.MINUTES</code>".
      * </ul>
-     * @see PersistenceUnitProperties.QUERY_TIMEOUT
+     * @see #QUERY_TIMEOUT
      */
     public static final String QUERY_TIMEOUT_UNIT = "eclipselink.query.timeout.unit";
 

moxy/org.eclipse.persistence.moxy/src/org/eclipse/persistence/jaxb/ConstraintViolationWrapper.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2020 Oracle 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.
@@ -34,70 +34,70 @@ public ConstraintViolationWrapper(ConstraintViolation<T> constraintViolation) {
     }
 
     /**
-     * {@see ConstraintViolation#getMessage}
+     * @see ConstraintViolation#getMessage
      */
     public String getMessage() {
         return constraintViolation.getMessage();
     }
 
     /**
-     * {@see ConstraintViolation#getMessageTemplate}
+     * @see ConstraintViolation#getMessageTemplate
      */
     public String getMessageTemplate() {
         return constraintViolation.getMessageTemplate();
     }
 
     /**
-     * {@see ConstraintViolation#getRootBean}
+     * @see ConstraintViolation#getRootBean
      */
     public T getRootBean() {
         return constraintViolation.getRootBean();
     }
 
     /**
-     * {@see ConstraintViolation#getRootBeanClass}
+     * @see ConstraintViolation#getRootBeanClass
      */
     public Class<T> getRootBeanClass() {
         return constraintViolation.getRootBeanClass();
     }
 
     /**
-     * {@see ConstraintViolation#getLeafBean}
+     * @see ConstraintViolation#getLeafBean
      */
     public Object getLeafBean() {
         return constraintViolation.getLeafBean();
     }
 
     /**
-     * {@see ConstraintViolation#getExecutableParameters}
+     * @see ConstraintViolation#getExecutableParameters
      */
     public Object[] getExecutableParameters() {
         return constraintViolation.getExecutableParameters();
     }
 
     /**
-     * {@see ConstraintViolation#getExecutableReturnValue}
+     * @see ConstraintViolation#getExecutableReturnValue
      */
     public Object getExecutableReturnValue() {
         return constraintViolation.getExecutableReturnValue();
     }
 
     /**
-     * {@see ConstraintViolation#getPropertyPath}
+     * @see ConstraintViolation#getPropertyPath
      */
     public Path getPropertyPath() {
         return constraintViolation.getPropertyPath();
     }
 
     /**
-     * {@see ConstraintViolation#getInvalidValue}
+     * @see ConstraintViolation#getInvalidValue
      */
     public Object getInvalidValue() {
         return constraintViolation.getInvalidValue();
     }
 
     /**
-     * {@see ConstraintViolation#getConstraintDescriptor}
+     * @see ConstraintViolation#getConstraintDescriptor
      */
     public ConstraintDescriptor<?> getConstraintDescriptor() {
         return constraintViolation.getConstraintDescriptor();