From 8acb2dcb986fefc71c4a7dc0b9fedaaba0a2e3d4 Mon Sep 17 00:00:00 2001
From: Alwin Joseph <44426046+alwin-joseph@users.noreply.github.com>
Date: Mon, 2 Oct 2023 19:42:55 +0530
Subject: [PATCH] version changes for TCK service release 3.1.4 (#1184)

* version changes for TCK service release 3.1.4

also adding LICENCE file to tck jar

* copyright correction and fix bundle generation script

* remove duplicated directory from bundle
---
 jaxrs-tck-docs/tckbundle.sh      | 14 +++++++++++---
 jaxrs-tck-docs/userguide/pom.xml |  4 ++--
 jaxrs-tck/pom.xml                |  4 ++--
 jersey-tck/pom.xml               |  4 ++--
 4 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/jaxrs-tck-docs/tckbundle.sh b/jaxrs-tck-docs/tckbundle.sh
index e1f513262..613691655 100644
--- a/jaxrs-tck-docs/tckbundle.sh
+++ b/jaxrs-tck-docs/tckbundle.sh
@@ -1,6 +1,6 @@
 #!/bin/bash -xe
 
-# Copyright (c) 2022 Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 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 v. 2.0, which is available at
@@ -23,7 +23,7 @@ cd $WORKSPACE
 export VERSION="$2"
 
 if [ -z "$VERSION" ]; then
-  export VERSION="3.1.3"
+  export VERSION="3.1.4"
 fi
 
 if [[ "$1" == "epl" || "$1" == "EPL" ]]; then
@@ -40,6 +40,7 @@ mvn
 
 rm -rf $WORKSPACE/bundle
 
+mkdir -p $WORKSPACE/bundle
 mkdir -p $WORKSPACE/bundle/docs
 mkdir -p $WORKSPACE/bundle/docs/html-usersguide
 mkdir -p $WORKSPACE/bundle/docs/pdf-usersguide
@@ -51,17 +52,24 @@ cp $WORKSPACE/jaxrs-tck-docs/*.html $WORKSPACE/bundle/docs/
 cp $WORKSPACE/jaxrs-tck-docs/*.txt $WORKSPACE/bundle/docs/
 cp -r $WORKSPACE/jaxrs-tck-docs/assertions $WORKSPACE/bundle/docs/
 
-mkdir -p $WORKSPACE/bundle
 cp $WORKSPACE/jaxrs-tck/target/*.jar $WORKSPACE/bundle/
 
 cd $WORKSPACE/bundle
+mkdir -p $WORKSPACE/bundle/META-INF
+
 
 if [[ "$1" == "epl" || "$1" == "EPL" ]]; then
     cp $WORKSPACE/LICENSE.md $WORKSPACE/bundle/LICENSE.md
+    cp $WORKSPACE/LICENSE.md $WORKSPACE/bundle/META-INF/LICENSE.md
     cp $WORKSPACE/jaxrs-tck/pom.epl.xml $WORKSPACE/bundle/restful-ws-tck-"$VERSION".pom
+    jar -uvf restful-ws-tck-"$VERSION".jar META-INF/LICENSE.md
+    rm -rf $WORKSPACE/bundle/META-INF
     zip -r restful-ws-tck-"$VERSION".zip *
 else
     cp $WORKSPACE/jaxrs-tck-docs/LICENSE_EFTL.md $WORKSPACE/bundle/LICENSE.md
+    cp $WORKSPACE/jaxrs-tck-docs/LICENSE_EFTL.md $WORKSPACE/bundle/META-INF/LICENSE.md
     cp $WORKSPACE/jaxrs-tck/pom.xml $WORKSPACE/bundle/jakarta-restful-ws-tck-"$VERSION".pom
+    jar -uvf jakarta-restful-ws-tck-"$VERSION".jar META-INF/LICENSE.md
+    rm -rf $WORKSPACE/bundle/META-INF
     zip -r jakarta-restful-ws-tck-"$VERSION".zip * 
 fi
diff --git a/jaxrs-tck-docs/userguide/pom.xml b/jaxrs-tck-docs/userguide/pom.xml
index 1462ef749..65c288202 100644
--- a/jaxrs-tck-docs/userguide/pom.xml
+++ b/jaxrs-tck-docs/userguide/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2017, 2021 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2017, 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 v. 2.0, which is available at
@@ -27,7 +27,7 @@
     <groupId>org.glassfish</groupId>
     <artifactId>tck_jaxrs</artifactId>
     <packaging>pom</packaging>
-    <version>3.1.3</version>
+    <version>3.1.4</version>
     <name>Eclipse Foundation Technology Compatibility Kit User's Guide for Jakarta RESTful Web Services for Jakarta EE, Release 3.1</name>
 
     <properties>
diff --git a/jaxrs-tck/pom.xml b/jaxrs-tck/pom.xml
index 8a75fab98..4a77c295a 100644
--- a/jaxrs-tck/pom.xml
+++ b/jaxrs-tck/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!--
 
-    Copyright (c) 2020 Markus Karg. All rights reserved.
+    Copyright (c) 2023 Markus Karg. 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
@@ -26,7 +26,7 @@
     <name>Jakarta RESTful WS TCK</name>
     <description>Technology Compatibility Kit for Jakarta RESTful Web Services</description>
     <url>https://github.com/jakartaee/rest</url>
-    <version>3.1.3</version>
+    <version>3.1.4</version>
 
     <parent>
         <groupId>jakarta.ws.rs</groupId>
diff --git a/jersey-tck/pom.xml b/jersey-tck/pom.xml
index 471483fb4..77f838f36 100644
--- a/jersey-tck/pom.xml
+++ b/jersey-tck/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!--
 
-    Copyright (c) 2021, 2022 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2021, 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 v. 2.0, which is available at
@@ -22,7 +22,7 @@
 
     <groupId>org.glassfish.jersey.core</groupId>
     <artifactId>jersey-tck</artifactId>
-    <version>3.1.3</version>
+    <version>3.1.4</version>
     <packaging>jar</packaging>
 
     <parent>