From c52469ed2d283978924f4ac904607669be20a46c Mon Sep 17 00:00:00 2001
From: Enrico Olivelli <enrico.olivelli@diennea.com>
Date: Tue, 1 Sep 2020 18:32:31 +0200
Subject: [PATCH 1/3] Allow to build Pulsar on JDK14 - update Apache Parent
 Maven Pom to latest (upgrade plugins) - use explicit import for Record class
 (prevent clash with java.lang.Record)

---
 pom.xml                                                     | 2 +-
 .../pulsar/functions/windowing/WindowFunctionExecutor.java  | 6 +++++-
 .../api/examples/window/PublishWindowFunction.java          | 6 +++---
 .../api/examples/window/UserExceptionWindowFunction.java    | 4 +++-
 .../api/examples/window/WordCountWindowFunction.java        | 4 +++-
 5 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index c80704f3ef730..48b088ef18904 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <groupId>org.apache</groupId>
     <artifactId>apache</artifactId>
-    <version>18</version>
+    <version>23</version>
   </parent>
 
   <groupId>org.apache.pulsar</groupId>
diff --git a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/WindowFunctionExecutor.java b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/WindowFunctionExecutor.java
index 83d5102042549..9d56a32cdf6ca 100644
--- a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/WindowFunctionExecutor.java
+++ b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/WindowFunctionExecutor.java
@@ -30,7 +30,11 @@
 
 import lombok.extern.slf4j.Slf4j;
 
-import org.apache.pulsar.functions.api.*;
+import org.apache.pulsar.functions.api.Context;
+import org.apache.pulsar.functions.api.Function;
+import org.apache.pulsar.functions.api.Record;
+import org.apache.pulsar.functions.api.WindowContext;
+import org.apache.pulsar.functions.api.WindowFunction;
 import org.apache.pulsar.common.util.Reflections;
 import org.apache.pulsar.common.functions.WindowConfig;
 import org.apache.pulsar.functions.windowing.evictors.CountEvictionPolicy;
diff --git a/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/window/PublishWindowFunction.java b/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/window/PublishWindowFunction.java
index e623a6b34d319..bf44b1aee28d6 100644
--- a/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/window/PublishWindowFunction.java
+++ b/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/window/PublishWindowFunction.java
@@ -19,9 +19,9 @@
 package org.apache.pulsar.functions.api.examples.window;
 
 import java.util.Collection;
-import org.apache.pulsar.client.api.PulsarClientException;
-import org.apache.pulsar.client.api.Schema;
-import org.apache.pulsar.functions.api.*;
+import org.apache.pulsar.functions.api.Record;
+import org.apache.pulsar.functions.api.WindowContext;
+import org.apache.pulsar.functions.api.WindowFunction;
 
 /**
  * Example function that uses the built in publish function in the context
diff --git a/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/window/UserExceptionWindowFunction.java b/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/window/UserExceptionWindowFunction.java
index 6f56209ed3f6e..d83320031d03d 100644
--- a/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/window/UserExceptionWindowFunction.java
+++ b/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/window/UserExceptionWindowFunction.java
@@ -19,7 +19,9 @@
 package org.apache.pulsar.functions.api.examples.window;
 
 import java.util.Collection;
-import org.apache.pulsar.functions.api.*;
+import org.apache.pulsar.functions.api.Record;
+import org.apache.pulsar.functions.api.WindowContext;
+import org.apache.pulsar.functions.api.WindowFunction;
 
 
 /**
diff --git a/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/window/WordCountWindowFunction.java b/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/window/WordCountWindowFunction.java
index 39f838dca7c15..3e79c2457a61a 100644
--- a/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/window/WordCountWindowFunction.java
+++ b/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/window/WordCountWindowFunction.java
@@ -20,7 +20,9 @@
 
 import java.util.Arrays;
 import java.util.Collection;
-import org.apache.pulsar.functions.api.*;
+import org.apache.pulsar.functions.api.Record;
+import org.apache.pulsar.functions.api.WindowContext;
+import org.apache.pulsar.functions.api.WindowFunction;
 
 /**
  * The classic word count example done using pulsar functions

From 9a6958440c9a2575db38bcee4b28b7ef924a9f99 Mon Sep 17 00:00:00 2001
From: Enrico Olivelli <enrico.olivelli@diennea.com>
Date: Wed, 21 Oct 2020 17:03:29 +0200
Subject: [PATCH 2/3] xx

---
 pom.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pom.xml b/pom.xml
index 48b088ef18904..755f29308c1e2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -203,6 +203,7 @@ flexible messaging model and an intuitive client API.</description>
     <license-maven-plugin.version>3.0</license-maven-plugin.version>
     <maven-enforcer-plugin.version>3.0.0-M2</maven-enforcer-plugin.version>
     <maven-surefire-plugin.version>3.0.0-M3</maven-surefire-plugin.version>
+    <maven-assembly-plugin.version>3.3.0</maven-assembly-plugin.version>
     <maven-dependency-plugin.version>2.10</maven-dependency-plugin.version>
     <maven-clean-plugin.version>2.4.1</maven-clean-plugin.version>
     <maven-compiler-plugin.version>3.8.0</maven-compiler-plugin.version>
@@ -1394,6 +1395,11 @@ flexible messaging model and an intuitive client API.</description>
             </execution>
           </executions>
         </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-assembly-plugin</artifactId>
+          <version>${maven-assembly-plugin.version}</version>            
+        </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-checkstyle-plugin</artifactId>

From 97eab8b4f931553d04b5b55a4116d8b2de47cda3 Mon Sep 17 00:00:00 2001
From: Enrico Olivelli <enrico.olivelli@diennea.com>
Date: Mon, 26 Oct 2020 08:19:12 +0100
Subject: [PATCH 3/3] revert pom changes

---
 pom.xml | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index 755f29308c1e2..c80704f3ef730 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <groupId>org.apache</groupId>
     <artifactId>apache</artifactId>
-    <version>23</version>
+    <version>18</version>
   </parent>
 
   <groupId>org.apache.pulsar</groupId>
@@ -203,7 +203,6 @@ flexible messaging model and an intuitive client API.</description>
     <license-maven-plugin.version>3.0</license-maven-plugin.version>
     <maven-enforcer-plugin.version>3.0.0-M2</maven-enforcer-plugin.version>
     <maven-surefire-plugin.version>3.0.0-M3</maven-surefire-plugin.version>
-    <maven-assembly-plugin.version>3.3.0</maven-assembly-plugin.version>
     <maven-dependency-plugin.version>2.10</maven-dependency-plugin.version>
     <maven-clean-plugin.version>2.4.1</maven-clean-plugin.version>
     <maven-compiler-plugin.version>3.8.0</maven-compiler-plugin.version>
@@ -1395,11 +1394,6 @@ flexible messaging model and an intuitive client API.</description>
             </execution>
           </executions>
         </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-assembly-plugin</artifactId>
-          <version>${maven-assembly-plugin.version}</version>            
-        </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-checkstyle-plugin</artifactId>