From 27b3b339a807fad708e45adbdca2c0f657fe6ef3 Mon Sep 17 00:00:00 2001
From: panos-kakos <102670093+panos-kakos@users.noreply.github.com>
Date: Tue, 21 Feb 2023 17:41:43 +0200
Subject: [PATCH] [JAVA-18124] Moved apache-libraries module to jdk9-and-above
 profile (#13502)

* [JAVA-18124] Moved apache-libraries module to jdk9-and-above profile

* [JAVA-18124] Upgrade beam version
---
 apache-libraries/pom.xml | 9 +--------
 pom.xml                  | 4 ++--
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/apache-libraries/pom.xml b/apache-libraries/pom.xml
index 3d78869865..b6418e6a04 100644
--- a/apache-libraries/pom.xml
+++ b/apache-libraries/pom.xml
@@ -118,11 +118,6 @@
             <artifactId>curator-recipes</artifactId>
             <version>${curator.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.apache.zookeeper</groupId>
-            <artifactId>zookeeper</artifactId>
-            <version>${zookeeper.version}</version>
-        </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-core</artifactId>
@@ -191,10 +186,8 @@
     </build>
 
     <properties>
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
         <avro.version>1.8.2</avro.version>
-        <beam.version>2.19.0</beam.version>
+        <beam.version>2.45.0</beam.version>
         <bval.version>1.1.2</bval.version>
         <javax.validation.validation-api.version>1.1.0.Final</javax.validation.validation-api.version>
         <meecrowave-junit.version>1.2.0</meecrowave-junit.version>
diff --git a/pom.xml b/pom.xml
index 33ea7a7c5f..3994c713c8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -331,7 +331,6 @@
                 <module>parent-java</module>
 
                 <module>apache-cxf-modules</module>
-                <module>apache-libraries</module>
 
                 <module>azure</module>
                 <module>checker-plugin</module>
@@ -599,7 +598,6 @@
                 <module>parent-java</module>
 
                 <module>apache-cxf-modules</module>
-                <module>apache-libraries</module>
 
                 <module>azure</module>
                 <module>checker-plugin</module>
@@ -878,6 +876,7 @@
 
             <modules>
                 <module>algorithms-modules</module>
+                <module>apache-libraries</module>
                 <module>apache-poi</module>
                 <module>apache-velocity</module>
                 <module>di-modules</module>
@@ -1087,6 +1086,7 @@
 
             <modules>
                 <module>algorithms-modules</module>
+                <module>apache-libraries</module>
                 <module>apache-poi</module>
                 <module>apache-velocity</module>
                 <module>di-modules</module>