Jenkins build (promotion) - ANT build javadoc fix for JDK 11 and reflect security changes at ci.eclipse.org (#1809)

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

Author: rfelcman

antbuild.xml

@@ -210,6 +210,7 @@
         <pathelement path="${eclipselink.plugins}/${wsdl.jar}"/>
         <pathelement path="${eclipselink.plugins}/${wsrs-api.jar}"/>
         <pathelement path="${eclipselink.plugins}/${slf4j-api.jar}"/>
+        <pathelement path="${eclipselink.plugins}/org.eclipse.persistence.jpa.jpql_${version.string}.jar"/>
         <pathelement path="${eclipselink.plugins}/org.eclipse.persistence.nosql_${version.string}.jar"/>
         <pathelement path="${eclipselink.plugins}/org.eclipse.persistence.extension_${version.string}.jar"/>
         <pathelement path="${eclipselink.util.plugins}/org.eclipse.persistence.oracleddlparser_1.0.0.v201807030954.jar"/>

autobuild.xml

@@ -72,7 +72,8 @@
     <target name="build-continuous" description="Trigger an automated build and run the tests if source changes exist"
             depends="clean, build-no-javadoc, build-utils, test-srg"
     />
-    <target name="build-milestone" depends="promote-init, sign-and-wait, regen-archives, publish-milestone, create-tag" description="Promote a build: nightly to milestone or milestone to release ('release' is a special milestone in this case)"
+    <target name="build-milestone" description="Promote a build: nightly to milestone or milestone to release ('release' is a special milestone in this case)"
+            depends="clean, build, promote-init, sign-and-wait, regen-archives, publish-milestone, create-tag"
     />
     <target name="build-snapshot" depends="snapshot-init, promote-init, extract-signed-artifacts, regen-installer-archive, regen-plugin-archive, regen-nosql-archive, gen-build-for-maven, publish-milestone-artifacts, publish-milestone-nexus" description="Promote build to snapshot repository"
     />
@@ -228,6 +229,8 @@
     </target>
 
     <target name="common-init">
+        <echo message="Loading user properties from: '${user.home}/build.properties'"/>
+        <property file="${user.home}/build.properties"/>
         <property file="${basedir}/autobuild.properties"/>
 
         <!-- Set version.string appropriately. variable should only be used for   -->

etc/jenkins/init.sh

@@ -13,7 +13,7 @@
 #  N/A
 
 echo '-[ EclipseLink Init ]-----------------------------------------------------------'
-
+. ${WORKSPACE}/etc/jenkins/setEnvironment.sh
 mkdir -p $HOME/extension.lib.external/mavenant
 
 #DOWNLOAD SOME DEPENDENCIES

etc/jenkins/promote.groovy

@@ -138,7 +138,7 @@ spec:
                 container('el-build') {
                     // Prepare EclipseLink environment
                     sh """
-                            etc/jenkins/promote_el_init.sh
+                            etc/jenkins/init.sh
                             """
                 }
             }
@@ -180,9 +180,9 @@ spec:
                             echo ${RELEASE}
                             if [ ${RELEASE} == 'false' ]
                             then
-                                ${HOME}/etc/jenkins/publish_milestone.sh
+                                etc/jenkins/publish_milestone.sh
                             else
-                                ${HOME}/etc/jenkins/publish_release.sh                            
+                                etc/jenkins/publish_release.sh                            
                             fi
                             """
                 }

etc/jenkins/promote.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #****************************************************************************************
-# Copyright (c) 2012, 2022 Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2023 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.
@@ -369,7 +369,7 @@ callAnt() {
         fi
 
         #Invoke Antscript for Branch specific promotion
-        arguments="-Dbuild.deps.dir=${BldDepsDir} -Dreleng.repo.dir=${RELENG_REPO} -Dgit.exec=${GIT_EXEC} -Declipselink.root.download.dir=${DNLD_DIR} -Dsigning.dir=${SIGN_DIR} -DM2_HOME=${M2_HOME}"
+        arguments="-Dbuild.deps.dir=${BldDepsDir} -Dreleng.repo.dir=${RELENG_REPO} -Dgit.exec=${GIT_EXEC} -Declipselink.root.download.dir=${DNLD_DIR} -Dsigning.dir=${SIGN_DIR} -DM2_HOME=${M2_HOME} -Dhudson.workspace=${WORKSPACE}"
         arguments="${arguments} -Dbranch.name=${branch_nm} -Drelease.version=${version} -Dbuild.type=${milestone} -Dbranch=${branch}"
         arguments="${arguments} -Dversion.qualifier=${qualifier} -Dbuild.date=${blddate} -Dgit.hash=${githash}"
         echo "   sign   = '${SIGN}'"

etc/jenkins/promote_el_init.sh

@@ -1,6 +1,6 @@
 #!/bin/bash -e
 #
-# Copyright (c) 2019 Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2019, 2023 Oracle and/or its affiliates. All rights reserved.
 #
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -14,7 +14,7 @@
 #==========================
 #   Basic Env Setup
 #
-. ${HOME}/etc/jenkins/setEnvironment.sh
+. ${WORKSPACE}/etc/jenkins/setEnvironment.sh
 
 
 echo '-[ EclipseLink Publish to Milestones ]-----------------------------------------------------------'

etc/jenkins/publish_milestone.sh

@@ -1,6 +1,6 @@
 #!/bin/bash -e
 #
-# Copyright (c) 2019 Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2019, 2023 Oracle and/or its affiliates. All rights reserved.
 #
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -14,7 +14,7 @@
 #==========================
 #   Basic Env Setup
 #
-. ${HOME}/etc/jenkins/setEnvironment.sh
+. ${WORKSPACE}/etc/jenkins/setEnvironment.sh
 
 
 echo '-[ EclipseLink Publish to Releases ]-----------------------------------------------------------'