From 6f2ed65cacd5153c7d176a5e62721f643122ee0f Mon Sep 17 00:00:00 2001
From: tim_graves <28924492+atimgraves@users.noreply.github.com>
Date: Thu, 13 Jun 2024 15:02:52 +0100
Subject: [PATCH] update to junit version.junit, remove dead test code module

---
 functions-hmac/pom.xml                        |  3 +-
 functions-hmac/tester-hello-java/func.yaml    |  7 --
 functions-hmac/tester-hello-java/pom.xml      | 97 -------------------
 .../java/com/example/fn/HelloFunction.java    | 48 ---------
 4 files changed, 2 insertions(+), 153 deletions(-)
 delete mode 100644 functions-hmac/tester-hello-java/func.yaml
 delete mode 100644 functions-hmac/tester-hello-java/pom.xml
 delete mode 100644 functions-hmac/tester-hello-java/src/main/java/com/example/fn/HelloFunction.java

diff --git a/functions-hmac/pom.xml b/functions-hmac/pom.xml
index 99682b9..cb174ca 100644
--- a/functions-hmac/pom.xml
+++ b/functions-hmac/pom.xml
@@ -50,6 +50,7 @@ SOFTWARE. -->
 		<version.ocisdk>3.17.0</version.ocisdk>
 		<version.slf4j>1.7.33</version.slf4j>
 		<version.apache-commons>1.15</version.apache-commons>
+		<version.junit>4.13.1</version.junit>
 	</properties>
 	<dependencyManagement>
 		<dependencies>
@@ -83,7 +84,7 @@ SOFTWARE. -->
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
-			<version>4.12</version>
+			<version>${version.junit}</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
diff --git a/functions-hmac/tester-hello-java/func.yaml b/functions-hmac/tester-hello-java/func.yaml
deleted file mode 100644
index aa8def9..0000000
--- a/functions-hmac/tester-hello-java/func.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-schema_version: 20180708
-name: hello-java
-version: 0.0.7
-runtime: java
-build_image: fnproject/fn-java-fdk-build:jdk17-1.0.177
-run_image: fnproject/fn-java-fdk:jre17-1.0.177
-cmd: com.example.fn.HelloFunction::handleRequest
diff --git a/functions-hmac/tester-hello-java/pom.xml b/functions-hmac/tester-hello-java/pom.xml
deleted file mode 100644
index 8aa278f..0000000
--- a/functions-hmac/tester-hello-java/pom.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (c) 2023 Oracle and/or its affiliates.
-
-The Universal Permissive License (UPL), Version 1.0
-
-Subject to the condition set forth below, permission is hereby granted to any
-person obtaining a copy of this software, associated documentation and/or data
-(collectively the "Software"), free of charge and under any and all copyright
-rights in the Software, and any and all patent rights owned or freely
-licensable by each licensor hereunder covering either (i) the unmodified
-Software as contributed to or provided by such licensor, or (ii) the Larger
-Works (as defined below), to deal in both
-
-(a) the Software, and
-(b) any piece of software and/or hardware listed in the lrgrwrks.txt file if
-one is included with the Software (each a "Larger Work" to which the Software
-is contributed by such licensors),
-
-without restriction, including without limitation the rights to copy, create
-derivative works of, display, perform, and distribute the Software and make,
-use, sell, offer for sale, import, export, have made, and have sold the
-Software and the Larger Work(s), and to sublicense the foregoing rights on
-either these or other terms.
-
-This license is subject to the following condition:
-The above copyright notice and either this complete permission notice or at
-a minimum a reference to the UPL must be included in all copies or
-substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE. -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <fdk.version>1.0.177</fdk.version>
-		<version.ocisdk>3.17.0</version.ocisdk>
-    </properties>
-    <groupId>com.example.fn</groupId>
-    <artifactId>hello</artifactId>
-    <version>1.0.0</version>
-
-    <dependencies>
-        <dependency>
-            <groupId>com.fnproject.fn</groupId>
-            <artifactId>api</artifactId>
-            <version>${fdk.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.fnproject.fn</groupId>
-            <artifactId>testing-core</artifactId>
-            <version>${fdk.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.fnproject.fn</groupId>
-            <artifactId>testing-junit4</artifactId>
-            <version>${fdk.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.12</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.3</version>
-                <configuration>
-                    <source>17</source>
-                    <target>17</target>
-                </configuration>
-            </plugin>
-            <plugin>
-                 <groupId>org.apache.maven.plugins</groupId>
-                 <artifactId>maven-surefire-plugin</artifactId>
-                 <version>2.22.1</version>
-                 <configuration>
-                     <useSystemClassLoader>false</useSystemClassLoader>
-                 </configuration>
-            </plugin>
-        </plugins>
-    </build>
-</project>
diff --git a/functions-hmac/tester-hello-java/src/main/java/com/example/fn/HelloFunction.java b/functions-hmac/tester-hello-java/src/main/java/com/example/fn/HelloFunction.java
deleted file mode 100644
index 5907d30..0000000
--- a/functions-hmac/tester-hello-java/src/main/java/com/example/fn/HelloFunction.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*Copyright (c) 2023 Oracle and/or its affiliates.
-
-The Universal Permissive License (UPL), Version 1.0
-
-Subject to the condition set forth below, permission is hereby granted to any
-person obtaining a copy of this software, associated documentation and/or data
-(collectively the "Software"), free of charge and under any and all copyright
-rights in the Software, and any and all patent rights owned or freely
-licensable by each licensor hereunder covering either (i) the unmodified
-Software as contributed to or provided by such licensor, or (ii) the Larger
-Works (as defined below), to deal in both
-
-(a) the Software, and
-(b) any piece of software and/or hardware listed in the lrgrwrks.txt file if
-one is included with the Software (each a "Larger Work" to which the Software
-is contributed by such licensors),
-
-without restriction, including without limitation the rights to copy, create
-derivative works of, display, perform, and distribute the Software and make,
-use, sell, offer for sale, import, export, have made, and have sold the
-Software and the Larger Work(s), and to sublicense the foregoing rights on
-either these or other terms.
-
-This license is subject to the following condition:
-The above copyright notice and either this complete permission notice or at
-a minimum a reference to the UPL must be included in all copies or
-substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
- */
-package com.example.fn;
-
-public class HelloFunction {
-
-    public String handleRequest(String input) {
-        String name = (input == null || input.isEmpty()) ? "world"  : input;
-
-        System.out.println("Inside Java Hello World function"); 
-        return "Hello, " + name + "!";
-    }
-
-}
\ No newline at end of file