Skip to content

Commit 45d08fe

Browse files
dkapila13400152
dkapil
and
a13400152
authored
JAVA-5975 Removed dl.bintray repositories and related upgrade (eugenp#10941)
* JAVA-5975 Removed dl.bintray repositories and related upgrade * JAVA-5975 Commented Ethereum Module from the parent pom Co-authored-by: a13400152 <[email protected]>
1 parent 82fef87 commit 45d08fe

File tree

7 files changed

+67
-64
lines changed

7 files changed

+67
-64
lines changed

‎apache-spark/pom.xml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -91,23 +91,23 @@
9191
</plugins>
9292
</build>
9393

94-
<repositories>
94+
<repositories>
9595
<repository>
9696
<id>SparkPackagesRepo</id>
97-
<url>http://dl.bintray.com/spark-packages/maven</url>
97+
<url>https://repos.spark-packages.org</url>
9898
</repository>
9999
</repositories>
100100

101101
<properties>
102-
<org.apache.spark.spark-core.version>2.3.0</org.apache.spark.spark-core.version>
103-
<org.apache.spark.spark-sql.version>2.3.0</org.apache.spark.spark-sql.version>
104-
<org.apache.spark.spark-streaming.version>2.3.0</org.apache.spark.spark-streaming.version>
105-
<org.apache.spark.spark-mllib.version>2.3.0</org.apache.spark.spark-mllib.version>
106-
<org.apache.spark.spark-graphx.version>2.3.0</org.apache.spark.spark-graphx.version>
107-
<graphframes.version>0.7.0-spark2.4-s_2.11</graphframes.version>
108-
<org.apache.spark.spark-streaming-kafka.version>2.3.0</org.apache.spark.spark-streaming-kafka.version>
109-
<com.datastax.spark.spark-cassandra-connector.version>2.3.0</com.datastax.spark.spark-cassandra-connector.version>
110-
<com.datastax.spark.spark-cassandra-connector-java.version>1.5.2</com.datastax.spark.spark-cassandra-connector-java.version>
102+
<org.apache.spark.spark-core.version>2.4.8</org.apache.spark.spark-core.version>
103+
<org.apache.spark.spark-sql.version>2.4.8</org.apache.spark.spark-sql.version>
104+
<org.apache.spark.spark-streaming.version>2.4.8</org.apache.spark.spark-streaming.version>
105+
<org.apache.spark.spark-mllib.version>2.4.8</org.apache.spark.spark-mllib.version>
106+
<org.apache.spark.spark-graphx.version>2.4.8</org.apache.spark.spark-graphx.version>
107+
<graphframes.version>0.8.1-spark3.0-s_2.12</graphframes.version>
108+
<org.apache.spark.spark-streaming-kafka.version>2.4.8</org.apache.spark.spark-streaming-kafka.version>
109+
<com.datastax.spark.spark-cassandra-connector.version>2.5.2</com.datastax.spark.spark-cassandra-connector.version>
110+
<com.datastax.spark.spark-cassandra-connector-java.version>1.6.0-M1</com.datastax.spark.spark-cassandra-connector-java.version>
111111
</properties>
112112

113113
</project>

‎core-groovy-2/pom.xml

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -161,21 +161,6 @@
161161
</repository>
162162
</repositories>
163163

164-
<pluginRepositories>
165-
<pluginRepository>
166-
<id>bintray</id>
167-
<name>Groovy Bintray</name>
168-
<url>https://dl.bintray.com/groovy/maven</url>
169-
<releases>
170-
<!-- avoid automatic updates -->
171-
<updatePolicy>never</updatePolicy>
172-
</releases>
173-
<snapshots>
174-
<enabled>false</enabled>
175-
</snapshots>
176-
</pluginRepository>
177-
</pluginRepositories>
178-
179164
<properties>
180165
<junit.platform.version>1.0.0</junit.platform.version>
181166
<hsqldb.version>2.4.0</hsqldb.version>
@@ -188,4 +173,4 @@
188173
<groovy.compiler.version>3.3.0-01</groovy.compiler.version>
189174
</properties>
190175

191-
</project>
176+
</project>

‎jee-7/pom.xml

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@
203203
</plugins>
204204
<pluginManagement>
205205
<plugins>
206-
<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no
206+
<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no
207207
influence on the Maven build itself. -->
208208
<plugin>
209209
<groupId>org.eclipse.m2e</groupId>
@@ -485,23 +485,9 @@
485485
</profile>
486486
</profiles>
487487

488-
<repositories>
489-
<repository>
490-
<id>bintray-mvc-spec-maven</id>
491-
<name>bintray</name>
492-
<url>http://dl.bintray.com/mvc-spec/maven</url>
493-
<releases>
494-
<enabled>true</enabled>
495-
</releases>
496-
<snapshots>
497-
<enabled>false</enabled>
498-
</snapshots>
499-
</repository>
500-
</repositories>
501-
502488
<properties>
503489
<lifecycle.mapping.version>1.0.0</lifecycle.mapping.version>
504-
<mvc.api.version>20160715</mvc.api.version>
490+
<mvc.api.version>1.0.0</mvc.api.version>
505491
<java.min.version>1.8</java.min.version>
506492
<maven.min.version>3.0.0</maven.min.version>
507493
<javaee_api.version>7.0</javaee_api.version>
@@ -523,7 +509,7 @@
523509
<graphene-webdriver.version>2.1.0.Final</graphene-webdriver.version>
524510
<maven-dependency-plugin.version>2.8</maven-dependency-plugin.version>
525511
<jsp-api.version>2.2</jsp-api.version>
526-
<ozark.version>20160715</ozark.version>
512+
<ozark.version>1.0.0-m02</ozark.version>
527513
<jboss-batch-api.version>1.0.0.Final</jboss-batch-api.version>
528514
<jberet.version>1.0.2.Final</jberet.version>
529515
<jboss-transaction-api.version>1.0.0.Final</jboss-transaction-api.version>
@@ -532,4 +518,4 @@
532518
<jersey-container-jetty-servlet.version>2.22.1</jersey-container-jetty-servlet.version>
533519
</properties>
534520

535-
</project>
521+
</project>

‎libraries/pom.xml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -243,14 +243,6 @@
243243
</dependencies>
244244

245245
<repositories>
246-
<repository>
247-
<snapshots>
248-
<enabled>false</enabled>
249-
</snapshots>
250-
<id>bintray-cuba-platform-main</id>
251-
<name>bintray</name>
252-
<url>http://dl.bintray.com/cuba-platform/main</url>
253-
</repository>
254246
<repository>
255247
<id>nm-repo</id>
256248
<name>Numerical Method's Maven Repository</name>

‎pom.xml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -402,7 +402,7 @@
402402
<module>dropwizard</module>
403403
<module>dubbo</module>
404404

405-
<module>ethereum</module>
405+
<!-- <module>ethereum</module> --> <!-- JAVA-6001 -->
406406

407407
<module>feign</module>
408408
<module>flyway-cdi-extension</module>
@@ -416,7 +416,7 @@
416416
<!-- <module>grails</module> --> <!-- Not a maven project -->
417417
<module>graphql/graphql-java</module>
418418
<module>grpc</module>
419-
<module>gson</module>
419+
<module>gson</module>
420420
<module>guava-modules</module>
421421
<!-- <module>guest</module> --> <!-- not to be built as its for guest articles -->
422422
<module>guice</module>
@@ -616,7 +616,7 @@
616616
<module>spring-apache-camel</module>
617617

618618
<module>spring-batch</module>
619-
<module>spring-batch-2</module>
619+
<module>spring-batch-2</module>
620620
<module>spring-bom</module>
621621
<module>spring-boot-modules</module>
622622
<module>spring-boot-rest</module>
@@ -646,7 +646,7 @@
646646
<module>spring-ejb</module>
647647
<module>spring-exceptions</module>
648648

649-
<module>spring-freemarker</module>
649+
<module>spring-freemarker</module>
650650

651651
<module>spring-integration</module>
652652

@@ -671,7 +671,7 @@
671671
<module>spring-security-modules</module>
672672
<module>spring-shell</module>
673673
<module>spring-sleuth</module>
674-
<module>spring-soap</module>
674+
<module>spring-soap</module>
675675
<module>spring-spel</module>
676676
<module>spring-state-machine</module>
677677
<module>spring-static-resources</module>
@@ -868,7 +868,7 @@
868868
<module>dropwizard</module>
869869
<module>dubbo</module>
870870

871-
<module>ethereum</module>
871+
<!-- <module>ethereum</module> --> <!-- JAVA-6001 -->
872872

873873
<module>feign</module>
874874
<module>flyway-cdi-extension</module>
@@ -882,7 +882,7 @@
882882
<!-- <module>grails</module> --> <!-- Not a maven project -->
883883
<module>graphql/graphql-java</module>
884884
<module>grpc</module>
885-
<module>gson</module>
885+
<module>gson</module>
886886
<module>guava-modules</module>
887887
<!-- <module>guest</module> --> <!-- not to be built as its for guest articles -->
888888
<module>guice</module>
@@ -1103,7 +1103,7 @@
11031103
<module>spring-ejb</module>
11041104
<module>spring-exceptions</module>
11051105

1106-
<module>spring-freemarker</module>
1106+
<module>spring-freemarker</module>
11071107

11081108
<module>spring-integration</module>
11091109

@@ -1364,7 +1364,7 @@
13641364
<gib.skipTestsForUpstreamModules>true</gib.skipTestsForUpstreamModules>
13651365
<gib.buildUpstream>false</gib.buildUpstream>
13661366
<gib.failOnMissingGitDir>false</gib.failOnMissingGitDir>
1367-
<gib.failOnError>false</gib.failOnError>
1367+
<gib.failOnError>false</gib.failOnError>
13681368
<gib.disable>true</gib.disable>
13691369

13701370
<junit.version>4.12</junit.version>

‎spf4j/spf4j-aspects-app/pom.xml

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,34 @@
2020
<groupId>org.spf4j</groupId>
2121
<artifactId>spf4j-aspects</artifactId>
2222
<version>${spf4j.version}</version>
23+
<exclusions>
24+
<exclusion>
25+
<groupId>org.apache.avro</groupId>
26+
<artifactId>avro</artifactId>
27+
</exclusion>
28+
</exclusions>
2329
</dependency>
2430
<dependency>
2531
<groupId>org.spf4j</groupId>
2632
<artifactId>spf4j-ui</artifactId>
2733
<version>${spf4j.version}</version>
34+
<exclusions>
35+
<exclusion>
36+
<groupId>org.apache.avro</groupId>
37+
<artifactId>avro</artifactId>
38+
</exclusion>
39+
</exclusions>
2840
</dependency>
2941
<dependency>
3042
<groupId>org.slf4j</groupId>
3143
<artifactId>slf4j-api</artifactId>
3244
<version>${org.slf4j.version}</version>
3345
</dependency>
46+
<dependency>
47+
<groupId>org.apache.avro</groupId>
48+
<artifactId>avro</artifactId>
49+
<version>1.10.2</version>
50+
</dependency>
3451
</dependencies>
3552

3653
<build>
@@ -81,7 +98,7 @@
8198
</build>
8299

83100
<properties>
84-
<spf4j.version>8.6.10</spf4j.version>
101+
<spf4j.version>8.9.0</spf4j.version>
85102
<org.slf4j.version>1.7.21</org.slf4j.version>
86103
<compiler.plugin.version>3.8.0</compiler.plugin.version>
87104
<dependency.plugin.version>3.1.1</dependency.plugin.version>

‎spf4j/spf4j-core-app/pom.xml

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,40 @@
2020
<groupId>org.spf4j</groupId>
2121
<artifactId>spf4j-core</artifactId>
2222
<version>${spf4j.version}</version>
23+
<exclusions>
24+
<exclusion>
25+
<groupId>org.apache.avro</groupId>
26+
<artifactId>avro</artifactId>
27+
</exclusion>
28+
</exclusions>
2329
</dependency>
2430
<dependency>
2531
<groupId>org.spf4j</groupId>
2632
<artifactId>spf4j-ui</artifactId>
2733
<version>${spf4j.version}</version>
34+
<exclusions>
35+
<exclusion>
36+
<groupId>org.apache.avro</groupId>
37+
<artifactId>avro</artifactId>
38+
</exclusion>
39+
</exclusions>
2840
</dependency>
2941
<dependency>
3042
<groupId>org.slf4j</groupId>
3143
<artifactId>slf4j-api</artifactId>
3244
<version>${org.slf4j.version}</version>
45+
<exclusions>
46+
<exclusion>
47+
<groupId>org.apache.avro</groupId>
48+
<artifactId>avro</artifactId>
49+
</exclusion>
50+
</exclusions>
3351
</dependency>
52+
<dependency>
53+
<groupId>org.apache.avro</groupId>
54+
<artifactId>avro</artifactId>
55+
<version>1.10.2</version>
56+
</dependency>
3457
</dependencies>
3558

3659
<build>
@@ -81,7 +104,7 @@
81104
</build>
82105

83106
<properties>
84-
<spf4j.version>8.6.10</spf4j.version>
107+
<spf4j.version>8.9.0</spf4j.version>
85108
<org.slf4j.version>1.7.21</org.slf4j.version>
86109
<compiler.plugin.version>3.8.0</compiler.plugin.version>
87110
<dependency.plugin.version>3.1.1</dependency.plugin.version>

0 commit comments

Comments
 (0)