From 45d08fee1d82fa871c12285a3d55d6cc37fbaf21 Mon Sep 17 00:00:00 2001
From: Dhawal Kapil <dhawalkapil@gmail.com>
Date: Tue, 22 Jun 2021 04:06:13 +0530
Subject: [PATCH] JAVA-5975 Removed dl.bintray repositories and related upgrade
 (#10941)

* JAVA-5975 Removed dl.bintray repositories and related upgrade

* JAVA-5975 Commented Ethereum Module from the parent pom

Co-authored-by: a13400152 <a13400152@192.168.29.65>
---
 apache-spark/pom.xml            | 22 +++++++++++-----------
 core-groovy-2/pom.xml           | 17 +----------------
 jee-7/pom.xml                   | 22 ++++------------------
 libraries/pom.xml               |  8 --------
 pom.xml                         | 18 +++++++++---------
 spf4j/spf4j-aspects-app/pom.xml | 19 ++++++++++++++++++-
 spf4j/spf4j-core-app/pom.xml    | 25 ++++++++++++++++++++++++-
 7 files changed, 67 insertions(+), 64 deletions(-)

diff --git a/apache-spark/pom.xml b/apache-spark/pom.xml
index c942795532..58b3a90b61 100644
--- a/apache-spark/pom.xml
+++ b/apache-spark/pom.xml
@@ -91,23 +91,23 @@
         </plugins>
     </build>
 
-    <repositories>
+	<repositories>
         <repository>
             <id>SparkPackagesRepo</id>
-            <url>http://dl.bintray.com/spark-packages/maven</url>
+            <url>https://repos.spark-packages.org</url>
         </repository>
     </repositories>
 
     <properties>
-        <org.apache.spark.spark-core.version>2.3.0</org.apache.spark.spark-core.version>
-        <org.apache.spark.spark-sql.version>2.3.0</org.apache.spark.spark-sql.version>
-        <org.apache.spark.spark-streaming.version>2.3.0</org.apache.spark.spark-streaming.version>
-        <org.apache.spark.spark-mllib.version>2.3.0</org.apache.spark.spark-mllib.version>
-        <org.apache.spark.spark-graphx.version>2.3.0</org.apache.spark.spark-graphx.version>
-        <graphframes.version>0.7.0-spark2.4-s_2.11</graphframes.version>
-        <org.apache.spark.spark-streaming-kafka.version>2.3.0</org.apache.spark.spark-streaming-kafka.version>
-        <com.datastax.spark.spark-cassandra-connector.version>2.3.0</com.datastax.spark.spark-cassandra-connector.version>
-        <com.datastax.spark.spark-cassandra-connector-java.version>1.5.2</com.datastax.spark.spark-cassandra-connector-java.version>
+        <org.apache.spark.spark-core.version>2.4.8</org.apache.spark.spark-core.version>
+        <org.apache.spark.spark-sql.version>2.4.8</org.apache.spark.spark-sql.version>
+        <org.apache.spark.spark-streaming.version>2.4.8</org.apache.spark.spark-streaming.version>
+        <org.apache.spark.spark-mllib.version>2.4.8</org.apache.spark.spark-mllib.version>
+        <org.apache.spark.spark-graphx.version>2.4.8</org.apache.spark.spark-graphx.version>
+        <graphframes.version>0.8.1-spark3.0-s_2.12</graphframes.version>
+        <org.apache.spark.spark-streaming-kafka.version>2.4.8</org.apache.spark.spark-streaming-kafka.version>
+        <com.datastax.spark.spark-cassandra-connector.version>2.5.2</com.datastax.spark.spark-cassandra-connector.version>
+        <com.datastax.spark.spark-cassandra-connector-java.version>1.6.0-M1</com.datastax.spark.spark-cassandra-connector-java.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/core-groovy-2/pom.xml b/core-groovy-2/pom.xml
index 37f8629ae8..859f9a2667 100644
--- a/core-groovy-2/pom.xml
+++ b/core-groovy-2/pom.xml
@@ -161,21 +161,6 @@
         </repository>
     </repositories>
 
-    <pluginRepositories>
-        <pluginRepository>
-            <id>bintray</id>
-            <name>Groovy Bintray</name>
-            <url>https://dl.bintray.com/groovy/maven</url>
-            <releases>
-                <!-- avoid automatic updates -->
-                <updatePolicy>never</updatePolicy>
-            </releases>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </pluginRepository>
-    </pluginRepositories>
-
     <properties>
         <junit.platform.version>1.0.0</junit.platform.version>
         <hsqldb.version>2.4.0</hsqldb.version>
@@ -188,4 +173,4 @@
         <groovy.compiler.version>3.3.0-01</groovy.compiler.version>
     </properties>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/jee-7/pom.xml b/jee-7/pom.xml
index b68c8b9801..925d79728e 100644
--- a/jee-7/pom.xml
+++ b/jee-7/pom.xml
@@ -203,7 +203,7 @@
         </plugins>
         <pluginManagement>
             <plugins>
-                <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no 
+                <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no
                     influence on the Maven build itself. -->
                 <plugin>
                     <groupId>org.eclipse.m2e</groupId>
@@ -485,23 +485,9 @@
         </profile>
     </profiles>
 
-    <repositories>
-        <repository>
-            <id>bintray-mvc-spec-maven</id>
-            <name>bintray</name>
-            <url>http://dl.bintray.com/mvc-spec/maven</url>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </repository>
-    </repositories>
-
     <properties>
         <lifecycle.mapping.version>1.0.0</lifecycle.mapping.version>
-        <mvc.api.version>20160715</mvc.api.version>
+        <mvc.api.version>1.0.0</mvc.api.version>
         <java.min.version>1.8</java.min.version>
         <maven.min.version>3.0.0</maven.min.version>
         <javaee_api.version>7.0</javaee_api.version>
@@ -523,7 +509,7 @@
         <graphene-webdriver.version>2.1.0.Final</graphene-webdriver.version>
         <maven-dependency-plugin.version>2.8</maven-dependency-plugin.version>
         <jsp-api.version>2.2</jsp-api.version>
-        <ozark.version>20160715</ozark.version>
+        <ozark.version>1.0.0-m02</ozark.version>
         <jboss-batch-api.version>1.0.0.Final</jboss-batch-api.version>
         <jberet.version>1.0.2.Final</jberet.version>
         <jboss-transaction-api.version>1.0.0.Final</jboss-transaction-api.version>
@@ -532,4 +518,4 @@
         <jersey-container-jetty-servlet.version>2.22.1</jersey-container-jetty-servlet.version>
     </properties>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/libraries/pom.xml b/libraries/pom.xml
index 40cc1b4671..ffb2b09699 100644
--- a/libraries/pom.xml
+++ b/libraries/pom.xml
@@ -243,14 +243,6 @@
     </dependencies>
 
     <repositories>
-        <repository>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-            <id>bintray-cuba-platform-main</id>
-            <name>bintray</name>
-            <url>http://dl.bintray.com/cuba-platform/main</url>
-        </repository>
         <repository>
             <id>nm-repo</id>
             <name>Numerical Method's Maven Repository</name>
diff --git a/pom.xml b/pom.xml
index ccf9f86a55..eac534697a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -402,7 +402,7 @@
                 <module>dropwizard</module>
                 <module>dubbo</module>
 
-                <module>ethereum</module>
+                <!-- <module>ethereum</module> --> <!-- JAVA-6001 -->
 
                 <module>feign</module>
                 <module>flyway-cdi-extension</module>
@@ -416,7 +416,7 @@
                 <!-- <module>grails</module> --> <!-- Not a maven project -->
                 <module>graphql/graphql-java</module>
                 <module>grpc</module>
-                <module>gson</module>                
+                <module>gson</module>
                 <module>guava-modules</module>
                 <!-- <module>guest</module> --> <!-- not to be built as its for guest articles  -->
                 <module>guice</module>
@@ -616,7 +616,7 @@
                 <module>spring-apache-camel</module>
 
                 <module>spring-batch</module>
-                <module>spring-batch-2</module>	
+                <module>spring-batch-2</module>
                 <module>spring-bom</module>
                 <module>spring-boot-modules</module>
                 <module>spring-boot-rest</module>
@@ -646,7 +646,7 @@
                 <module>spring-ejb</module>
                 <module>spring-exceptions</module>
 
-                <module>spring-freemarker</module>                
+                <module>spring-freemarker</module>
 
                 <module>spring-integration</module>
 
@@ -671,7 +671,7 @@
                 <module>spring-security-modules</module>
                 <module>spring-shell</module>
                 <module>spring-sleuth</module>
-                <module>spring-soap</module>               
+                <module>spring-soap</module>
                 <module>spring-spel</module>
                 <module>spring-state-machine</module>
                 <module>spring-static-resources</module>
@@ -868,7 +868,7 @@
                 <module>dropwizard</module>
                 <module>dubbo</module>
 
-                <module>ethereum</module>
+                <!-- <module>ethereum</module> --> <!-- JAVA-6001 -->
 
                 <module>feign</module>
                 <module>flyway-cdi-extension</module>
@@ -882,7 +882,7 @@
                 <!-- <module>grails</module> --> <!-- Not a maven project -->
                 <module>graphql/graphql-java</module>
                 <module>grpc</module>
-                <module>gson</module>                
+                <module>gson</module>
                 <module>guava-modules</module>
                 <!-- <module>guest</module> --> <!-- not to be built as its for guest articles  -->
                 <module>guice</module>
@@ -1103,7 +1103,7 @@
                 <module>spring-ejb</module>
                 <module>spring-exceptions</module>
 
-                <module>spring-freemarker</module>                
+                <module>spring-freemarker</module>
 
                 <module>spring-integration</module>
 
@@ -1364,7 +1364,7 @@
         <gib.skipTestsForUpstreamModules>true</gib.skipTestsForUpstreamModules>
         <gib.buildUpstream>false</gib.buildUpstream>
         <gib.failOnMissingGitDir>false</gib.failOnMissingGitDir>
-        <gib.failOnError>false</gib.failOnError>        
+        <gib.failOnError>false</gib.failOnError>
         <gib.disable>true</gib.disable>
 
         <junit.version>4.12</junit.version>
diff --git a/spf4j/spf4j-aspects-app/pom.xml b/spf4j/spf4j-aspects-app/pom.xml
index 4a4c7cb804..54bbdddddc 100644
--- a/spf4j/spf4j-aspects-app/pom.xml
+++ b/spf4j/spf4j-aspects-app/pom.xml
@@ -20,17 +20,34 @@
             <groupId>org.spf4j</groupId>
             <artifactId>spf4j-aspects</artifactId>
             <version>${spf4j.version}</version>
+            <exclusions>
+                <exclusion>
+            	    <groupId>org.apache.avro</groupId>
+            	    <artifactId>avro</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.spf4j</groupId>
             <artifactId>spf4j-ui</artifactId>
             <version>${spf4j.version}</version>
+            <exclusions>
+                <exclusion>
+            	    <groupId>org.apache.avro</groupId>
+            	    <artifactId>avro</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
             <version>${org.slf4j.version}</version>
         </dependency>
+		<dependency>
+		    <groupId>org.apache.avro</groupId>
+		    <artifactId>avro</artifactId>
+		    <version>1.10.2</version>
+		</dependency>
     </dependencies>
 
     <build>
@@ -81,7 +98,7 @@
     </build>
 
     <properties>
-        <spf4j.version>8.6.10</spf4j.version>
+        <spf4j.version>8.9.0</spf4j.version>
         <org.slf4j.version>1.7.21</org.slf4j.version>
         <compiler.plugin.version>3.8.0</compiler.plugin.version>
         <dependency.plugin.version>3.1.1</dependency.plugin.version>
diff --git a/spf4j/spf4j-core-app/pom.xml b/spf4j/spf4j-core-app/pom.xml
index 2961174a35..92333ea2ec 100644
--- a/spf4j/spf4j-core-app/pom.xml
+++ b/spf4j/spf4j-core-app/pom.xml
@@ -20,17 +20,40 @@
             <groupId>org.spf4j</groupId>
             <artifactId>spf4j-core</artifactId>
             <version>${spf4j.version}</version>
+            <exclusions>
+                <exclusion>
+            	    <groupId>org.apache.avro</groupId>
+            	    <artifactId>avro</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.spf4j</groupId>
             <artifactId>spf4j-ui</artifactId>
             <version>${spf4j.version}</version>
+            <exclusions>
+                <exclusion>
+            	    <groupId>org.apache.avro</groupId>
+            	    <artifactId>avro</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
             <version>${org.slf4j.version}</version>
+            <exclusions>
+            	<exclusion>
+            		<groupId>org.apache.avro</groupId>
+            		<artifactId>avro</artifactId>
+            	</exclusion>
+            </exclusions>
         </dependency>
+		<dependency>
+		    <groupId>org.apache.avro</groupId>
+		    <artifactId>avro</artifactId>
+		    <version>1.10.2</version>
+		</dependency>        
     </dependencies>
 
     <build>
@@ -81,7 +104,7 @@
     </build>
 
     <properties>
-        <spf4j.version>8.6.10</spf4j.version>
+        <spf4j.version>8.9.0</spf4j.version>
         <org.slf4j.version>1.7.21</org.slf4j.version>
         <compiler.plugin.version>3.8.0</compiler.plugin.version>
         <dependency.plugin.version>3.1.1</dependency.plugin.version>