Skip to content

Commit

Permalink
[GAE-Java] Relax version enforce for some mvn dependencies (#2894)
Browse files Browse the repository at this point in the history 
When upgrading `guava` for `GAE Java SDK`, there seems to be some
problem with `maven-enforcer-plugin`. Relax this version control.
  • Loading branch information
@zhanglei1949
zhanglei1949 committed Jun 15, 2023
1 parent b37ab90 commit cf81c7b
Show file tree
Hide file tree
Showing 2 changed files with 53 additions and 20 deletions.
26 changes: 7 additions & 19 deletions analytical_engine/java/grape-rdd-reader/pom.xml
View file
Expand Up @@ -39,57 +39,40 @@
<groupId>org.scala-lang</groupId>
<artifactId>scala-library</artifactId>
</dependency>

<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-bom</artifactId>
<version>${grpc.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>

<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-netty-shaded</artifactId>
<version>${grpc.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-protobuf</artifactId>
<version>${grpc.version}</version>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-stub</artifactId>
<version>${grpc.version}</version>
</dependency>
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java-util</artifactId>
<version>${protobuf.version}</version>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.9.0</version> <!-- prevent downgrade via protobuf-java-util -->
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-testing</artifactId>
<version>${grpc.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>31.0.1-android</version>
</dependency>
<dependency>
<!-- include this package to resolve error javax.annotation.generated not found java 11-->
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
<version>${javax.annotation.version}</version>
</dependency>
</dependencies>

Expand Down Expand Up @@ -168,7 +151,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>1.4.1</version>
<version>3.3.0</version>
<executions>
<execution>
<id>enforce</id>
Expand All @@ -177,7 +160,12 @@
</goals>
<configuration>
<rules>
<requireUpperBoundDeps/>
<requireUpperBoundDeps>
<excludes>
<exclude>com.google.j2objc:j2objc-annotations</exclude>
<exclude>com.google.errorprone:error_prone_annotations</exclude>
</excludes>
</requireUpperBoundDeps>
</rules>
</configuration>
</execution>
Expand Down
47 changes: 46 additions & 1 deletion analytical_engine/java/pom.xml
View file
Expand Up @@ -90,6 +90,7 @@
<dep.netty.version>4.1.44.Final</dep.netty.version>
<dep.fastutil.version>6.5.4</dep.fastutil.version>
<dep.kryo.version>4.0.0</dep.kryo.version>
<guava.version>32.0.0-jre</guava.version>
<spark.version>3.1.3</spark.version>
<maven.javadoc.version>3.4.0</maven.javadoc.version>
<javadoc.output.directory>grape-jdk-javadoc</javadoc.output.directory>
Expand All @@ -99,6 +100,7 @@
<protoc.version>3.19.2</protoc.version>
<javax.annotation.version>1.3.2</javax.annotation.version>
<native-lib-loader.version>2.3.5</native-lib-loader.version>
<gson.version>2.9.0</gson.version>
</properties>
<dependencyManagement>
<dependencies>
Expand Down Expand Up @@ -188,7 +190,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>30.1.1-jre</version>
<version>${guava.version}</version>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
Expand Down Expand Up @@ -233,6 +235,49 @@
<version>1.10.19</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
<version>${javax.annotation.version}</version>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-bom</artifactId>
<version>${grpc.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-netty-shaded</artifactId>
<version>${grpc.version}</version>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-protobuf</artifactId>
<version>${grpc.version}</version>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-stub</artifactId>
<version>${grpc.version}</version>
</dependency>
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java-util</artifactId>
<version>${protobuf.version}</version>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>${gson.version}</version> <!-- prevent downgrade via protobuf-java-util -->
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-testing</artifactId>
<version>${grpc.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
</dependencyManagement>

Expand Down

0 comments on commit cf81c7b

Please sign in to comment.