edit release process to generate new bundle with Eclipse license

Signed-off-by: alwin.joseph <alwin.joseph@oracle.com>

Jenkinsfile

@@ -175,6 +175,8 @@ spec:
            description: 'Name of bundle file to be appended to the base url' )
     choice(name: 'PROFILE', choices: 'FULL\nWEB', 
            description: 'Profile to be used for running CTS either web/full' )
+    choice(name: 'LICENSE', choices: 'PUBLIC\nECLIPSE',
+           description: 'License version to be used to build the TCK bundle(s) either Eclipse or Public(default)' )
     choice(name: 'DATABASE', choices: 'JavaDB\nOracle\nMySQL', 
            description: 'Database to be used for running CTS. Currently only JavaDB is supported.' )
     choice(name: 'BUILD_TYPE', choices: 'CTS\nSTANDALONE-TCK', 

LICENSE_EFTL.md

@@ -0,0 +1,83 @@
+# Eclipse Foundation Technology Compatibility Kit License - v 1.0
+
+Copyright (c) 2018, Eclipse Foundation, Inc. and its licensors.
+
+Redistribution and use in binary form is permitted provided that the
+following conditions are met:
+
+1.  Use of the Technology Compatibility Kit accompanying this license
+    (the "TCK") and its documentation is permitted solely for the
+    purpose of testing compatibility of an implementation (the
+    "Product") of a specification (the "Specification") made available
+    by the Eclipse Foundation, Inc. ("Eclipse").
+
+2.  Only those modifications expressly permitted by the TCK and its
+    documentation are permitted. Except in these limited circumstances,
+    no modifications to the TCK are permitted under this license.
+
+3.  A Product will be deemed to be "compatible" with the Specification
+    if it fully and completely meets and satisfies all requirements of
+    the TCK.
+
+4.  Before any claim of compatibility (or any similar claim suggesting
+    compatibility) is made based on the TCK, the testing party must:
+
+    a.  use the TCK to demonstrate that the Product fully and
+	completely meets and satisfies all requirements of the TCK;
+
+    b.  make TCK test results showing full and complete satisfaction of
+	all requirements of the TCK publicly available on the testing
+	party's website and send a link to such test results to Eclipse
+	at [tck@eclipse.org](mailto:tck@eclipse.org); and
+
+    c.  comply with any requirements stated in the Specification with
+	regard to subsetting, supersetting, modifying or extending the
+	Specification in any Product claimed to be compatible with the
+	Specification.
+
+5.  The test results must be continuously available and the link must
+    be live for at least as long as the Product is available in the
+    marketplace.
+
+6.  The TCK may not be used as a basis for any statements of partial
+    compatibility. The TCK may only be used as a basis for true,
+    factual statements of full compatibility of Products that fully
+    meet and satisfy all requirements of the TCK.
+
+7.  A determination that a Product is compatible with the TCK does not,
+    in itself, give rise to the right to use any name, mark, logo
+    associated with the TCK, Eclipse, or Eclipse's contributors or
+    licensors.
+
+8.  Upon the request of Eclipse, a tester will retract any statements
+    of compatibility (or any similar claim suggesting compatibility)
+    which Eclipse reasonably determines to be false or misleading or in
+    violation of the terms of this license.
+
+9.  Redistribution of the TCK must be under this Eclipse Foundation
+    Technology Compatibility Kit License and must reproduce the above
+    copyright notice, this list of conditions and the following
+    disclaimer in the documentation and/or other materials provided
+    with the distribution.
+
+10. Neither the name, trademarks or logos of Eclipse, nor the names,
+    trademarks or logos of its contributors or licensors may be used to
+    endorse or promote products tested with this software without
+    specific prior written permission.
+
+11. The source code for the TCK accompanying this license is available
+    from Eclipse.
+
+TO THE EXTENT PERMITTED BY APPLICABLE LAW, THIS SOFTWARE IS PROVIDED ON
+AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER
+EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR
+CONDITIONS OF TITLE, NON- INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR
+A PARTICULAR PURPOSE. TO THE EXTENT PERMITTED BY APPLICABLE LAW,
+NEITHER THE COPYRIGHT OWNER OR ANY CONTRIBUTORS SHALL HAVE ANY
+LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS),
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE
+EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.

docker/build_jakartaeetck.sh

@@ -1,6 +1,6 @@
 #!/bin/bash -xe
 
-# Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2018, 2019 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 v. 2.0, which is available at
@@ -123,13 +123,23 @@ ant -f $BASEDIR/release/tools/build-utils.xml -Ddeliverabledir=jakartaee -Dbased
 echo "########## Trunk.CTS ##########"
 mkdir -p $BASEDIR/internal/docs/jakartaee/
 cp $BASEDIR/internal/docs/dtd/*.dtd $BASEDIR/internal/docs/jakartaee/
-ant -f $BASEDIR/release/tools/build.xml -Ddeliverabledir=jakartaee -Ddeliverable.version=8.0 -Dskip.createbom="true" -Dskip.build="true" -Dbasedir=$BASEDIR/release/tools jakartaee
+if [[ "$LICENSE" == "ECLIPSE" || "$LICENSE" == "eclipse" ]]; then
+  ant -f $BASEDIR/release/tools/build.xml -Ddeliverabledir=jakartaee -Ddeliverable.version=8.0 -Dskip.createbom="true" -Dskip.build="true" -Dbasedir=$BASEDIR/release/tools -DuseEclipselicensefile="true" jakartaee
+else
+  ant -f $BASEDIR/release/tools/build.xml -Ddeliverabledir=jakartaee -Ddeliverable.version=8.0 -Dskip.createbom="true" -Dskip.build="true" -Dbasedir=$BASEDIR/release/tools jakartaee
+fi
 
 ant -f $BASEDIR/release/tools/build.xml -Ddeliverabledir=jakartaee -Ddeliverable.version=8.0 -Dskip.createbom="true" -Dskip.build="true" -Dbasedir=$BASEDIR/release/tools smoke
 
 mkdir -p ${WORKSPACE}/jakartaeetck-bundles
 cd ${WORKSPACE}/jakartaeetck-bundles
-cp ${WORKSPACE}/release/JAKARTAEE_BUILD/latest/jakartaeetck*.zip ${WORKSPACE}/jakartaeetck-bundles/jakartaeetck.zip
+
+if [[ "$LICENSE" == "ECLIPSE" || "$LICENSE" == "eclipse" ]]; then
+  cp ${WORKSPACE}/release/JAKARTAEE_BUILD/latest/jakartaeetck*.zip ${WORKSPACE}/jakartaeetck-bundles/eclipse-jakartaeetck.zip
+else
+  cp ${WORKSPACE}/release/JAKARTAEE_BUILD/latest/jakartaeetck*.zip ${WORKSPACE}/jakartaeetck-bundles/jakartaeetck.zip
+fi
+
 cp ${WORKSPACE}/release/JAKARTAEE-SMOKE_BUILD/latest/jakartaee-smoke*.zip ${WORKSPACE}/jakartaeetck-bundles/jakartaee-smoke.zip
 
 

docker/build_standalone-tcks.sh

@@ -1,6 +1,6 @@
 #!/bin/bash -xe
 
-# Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2018, 2019 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 v. 2.0, which is available at
@@ -245,7 +245,11 @@ for tck in ${TCK_LIST[@]}; do
 
   mkdir -p $BASEDIR/internal/docs/$tck
   cp $BASEDIR/internal/docs/dtd/*.dtd $BASEDIR/internal/docs/$tck/
-  ant -f $BASEDIR/release/tools/build.xml -Ddeliverabledir=$tck -Dbasedir=$BASEDIR/release/tools $DOC_SPECIFIC_PROPS -Dskip.createbom="true" -Dskip.build="true" $TCK_SPECIFIC_PROPS $tck 
+  if [[ "$LICENSE" == "ECLIPSE" || "$LICENSE" == "eclipse" ]]; then
+    ant -f $BASEDIR/release/tools/build.xml -Ddeliverabledir=$tck -Dbasedir=$BASEDIR/release/tools $DOC_SPECIFIC_PROPS -Dskip.createbom="true" -Dskip.build="true" $TCK_SPECIFIC_PROPS -DuseEclipselicensefile="true" $tck
+  else
+    ant -f $BASEDIR/release/tools/build.xml -Ddeliverabledir=$tck -Dbasedir=$BASEDIR/release/tools $DOC_SPECIFIC_PROPS -Dskip.createbom="true" -Dskip.build="true" $TCK_SPECIFIC_PROPS $tck
+  fi 
   echo "########## Trunk.$tck Completed ##########"
 
   # Copy build to archive path
@@ -259,7 +263,11 @@ for tck in ${TCK_LIST[@]}; do
         strippedEntry=${strippedEntry}_`echo "$entry" | cut -d_ -f2`
     fi
     echo "copying ${WORKSPACE}/release/${UPPER_TCK}_BUILD/latest/$entry to ${WORKSPACE}/standalone-bundles/${strippedEntry}_latest.zip"
-    cp ${WORKSPACE}/release/${UPPER_TCK}_BUILD/latest/$entry ${WORKSPACE}/standalone-bundles/${strippedEntry}_latest.zip
+    if [[ "$LICENSE" == "ECLIPSE" || "$LICENSE" == "eclipse" ]]; then
+      cp ${WORKSPACE}/release/${UPPER_TCK}_BUILD/latest/$entry ${WORKSPACE}/standalone-bundles/eclipse-${strippedEntry}_latest.zip
+    else
+      cp ${WORKSPACE}/release/${UPPER_TCK}_BUILD/latest/$entry ${WORKSPACE}/standalone-bundles/${strippedEntry}_latest.zip
+    fi
     cp ${WORKSPACE}/version.info ${WORKSPACE}/${strippedEntry}.version
   done
 done

release/tools/build.xml

@@ -1,6 +1,6 @@
 <!--
 
-    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2018, 2019 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 v. 2.0, which is available at
@@ -173,7 +173,18 @@
 
         <property name="deliverable.bundle.dir" value="${bundle.dir}/${deliverable.name.token}${deliverable.type}"/>
         <property name="zip.name" value="${deliverable.name.token}${deliverable.type}"/>
-
+         <if>
+            <isset property="useEclipselicensefile"/>
+         <then>
+            <property name="licensefile" value="LICENSE_EFTL.md"/>
+         </then>
+         <else>
+            <property name="licensefile" value="LICENSE.md"/>
+         </else>
+        </if>
+        <echo message="licensefile=[${licensefile}]"/>
+
+
         <condition property ="isUnixPlatform">
             <os family="unix"/>
         </condition>

release/tools/caj.xml

@@ -1,6 +1,6 @@
 <!--
 
-    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2018, 2019 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 v. 2.0, which is available at
@@ -71,7 +71,7 @@
                 <fileset dir="${ts.home}" includes="NOTICE" />
           </copy>
 
-	  <copy todir="${deliverable.bundle.dir}" file="${ts.home}/install/${deliverable.name.lower}/LICENSE.md">
+	  <copy tofile="${deliverable.bundle.dir}/LICENSE.md" file="${ts.home}/${licensefile}">
 	  </copy>
 
 	</target>

release/tools/concurrency.xml

@@ -1,6 +1,6 @@
 <!--
 
-    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2018, 2019 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 v. 2.0, which is available at
@@ -83,7 +83,7 @@
                 <fileset dir="${ts.home}" includes="NOTICE" />
           </copy>
 
-          <copy todir="${deliverable.bundle.dir}" file="${ts.home}/install/${deliverable.name.lower}/LICENSE.md">
+          <copy tofile="${deliverable.bundle.dir}/LICENSE.md" file="${ts.home}/${licensefile}">
 	  </copy>
 	</target>
 

release/tools/connector.xml

@@ -71,7 +71,7 @@
             <fileset dir="${ts.home}" includes="NOTICE" />
         </copy>
 
-        <copy todir="${deliverable.bundle.dir}" file="${ts.home}/install/${deliverable.name.lower}/LICENSE.md">
+        <copy tofile="${deliverable.bundle.dir}/LICENSE.md" file="${ts.home}/${licensefile}">
 	  </copy>
     </target>
 

release/tools/el.xml

@@ -1,6 +1,6 @@
 <!--
 
-    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2018, 2019 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 v. 2.0, which is available at
@@ -46,7 +46,7 @@
         <copy todir="${deliverable.bundle.dir}" includeEmptyDirs="no">
             <fileset dir="${ts.home}" includes="NOTICE" />
         </copy>
-	<copy todir="${deliverable.bundle.dir}" file="${ts.home}/install/${deliverable.name.lower}/LICENSE.md">
+	<copy tofile="${deliverable.bundle.dir}/LICENSE.md" file="${ts.home}/${licensefile}">
 	</copy>
     </target>
 

release/tools/jacc.xml

@@ -1,6 +1,6 @@
 <!--
 
-    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2018, 2019 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 v. 2.0, which is available at
@@ -64,7 +64,7 @@
        <copy todir="${deliverable.bundle.dir}" includeEmptyDirs="no">
            <fileset dir="${ts.home}" includes="NOTICE" />
        </copy>
-       <copy todir="${deliverable.bundle.dir}" file="${ts.home}/install/${deliverable.name.lower}/LICENSE.md">
+       <copy tofile="${deliverable.bundle.dir}/LICENSE.md" file="${ts.home}/${licensefile}">
 	  </copy>
 
     </target>

release/tools/jakartaee.xml

@@ -1,6 +1,6 @@
 <!--
 
-    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2018, 2019 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 v. 2.0, which is available at
@@ -103,7 +103,7 @@
         <copy todir="${deliverable.bundle.dir}" includeEmptyDirs="no">
             <fileset dir="${ts.home}" includes="NOTICE" />
         </copy>
-	<copy todir="${deliverable.bundle.dir}" file="${ts.home}/install/${deliverable.name.lower}/LICENSE.md">
+	<copy tofile="${deliverable.bundle.dir}/LICENSE.md" file="${ts.home}/${licensefile}">
         </copy>
 	</target>
 

release/tools/jaspic.xml

@@ -1,6 +1,6 @@
 <!--
 
-    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2018, 2019 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 v. 2.0, which is available at
@@ -70,7 +70,7 @@
         <copy todir="${deliverable.bundle.dir}" includeEmptyDirs="no">
               <fileset dir="${ts.home}" includes="NOTICE" />
         </copy>
-	<copy todir="${deliverable.bundle.dir}" file="${ts.home}/install/${deliverable.name.lower}/LICENSE.md">
+	<copy tofile="${deliverable.bundle.dir}/LICENSE.md" file="${ts.home}/${licensefile}">
 	</copy>
     </target>
 

release/tools/jaxr.xml

@@ -1,6 +1,6 @@
 <!--
 
-    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2018, 2019 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 v. 2.0, which is available at
@@ -63,7 +63,7 @@
             <fileset dir="${ts.home}" includes="NOTICE" />
          </copy>
 
-	 <copy todir="${deliverable.bundle.dir}" file="${ts.home}/install/${deliverable.name.lower}/LICENSE.md">
+	 <copy tofile="${deliverable.bundle.dir}/LICENSE.md" file="${ts.home}/${licensefile}">
 	 </copy>
     </target>
 

release/tools/jaxrpc.xml

@@ -1,6 +1,6 @@
 <!--
 
-    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2018, 2019 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 v. 2.0, which is available at
@@ -50,7 +50,7 @@
           <copy todir="${deliverable.bundle.dir}" includeEmptyDirs="no">
                 <fileset dir="${ts.home}" includes="NOTICE" />
           </copy>
-      <copy todir="${deliverable.bundle.dir}" file="${ts.home}/install/${deliverable.name.lower}/LICENSE.md">
+      <copy tofile="${deliverable.bundle.dir}/LICENSE.md" file="${ts.home}/${licensefile}">
 	  </copy>
 	  <!-- Copy over jaxrpcdocs -->
           <!--copy todir="${deliverable.bundle.dir}/docs" includeEmptyDirs="no">

release/tools/jaxrs.xml

@@ -1,6 +1,6 @@
 <!--
 
-    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2018, 2019 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 v. 2.0, which is available at
@@ -90,7 +90,7 @@
         <copy todir="${deliverable.bundle.dir}" includeEmptyDirs="no">
             <fileset dir="${ts.home}" includes="NOTICE" />
         </copy>
-	<copy todir="${deliverable.bundle.dir}" file="${ts.home}/install/${deliverable.name.lower}/LICENSE.md">
+	<copy tofile="${deliverable.bundle.dir}/LICENSE.md" file="${ts.home}/${licensefile}">
 	  </copy>
     </target>
 

release/tools/jaxws.xml

@@ -1,6 +1,6 @@
 <!--
 
-    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2018, 2019 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 v. 2.0, which is available at
@@ -88,7 +88,7 @@
               <fileset dir="${ts.home}" includes="NOTICE" />
           </copy>
 
-      <copy todir="${deliverable.bundle.dir}" file="${ts.home}/install/${deliverable.name.lower}/LICENSE.md">
+      <copy tofile="${deliverable.bundle.dir}/LICENSE.md" file="${ts.home}/${licensefile}">
 	  </copy>
 	</target>
 

release/tools/jms.xml

@@ -1,6 +1,6 @@
 <!--
 
-    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2018, 2019 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 v. 2.0, which is available at
@@ -68,7 +68,7 @@
               <fileset dir="${ts.home}" includes="NOTICE" />
           </copy>
 
-      <copy todir="${deliverable.bundle.dir}" file="${ts.home}/install/${deliverable.name.lower}/LICENSE.md">
+      <copy tofile="${deliverable.bundle.dir}/LICENSE.md" file="${ts.home}/${licensefile}">
 	  </copy>
 	</target>