Skip to content

Commit 0a7d88a

Browse files
igorbernstein2igorbernstein2
authored
deps: unflatten build-helper module (#4229)
Change-Id: I6beaaaae59b51c3d49e98bac9e61c1ab30c013af
1 parent 9ff8df2 commit 0a7d88a

File tree

4 files changed

+34
-78
lines changed

4 files changed

+34
-78
lines changed

‎bigtable-test/bigtable-build-helper/pom.xml

Lines changed: 24 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121

2222
<properties>
2323
<java.version>8</java.version>
24-
<maven.version>3.6.3</maven.version>
2524
<maven-resolver-api.version>1.9.7</maven-resolver-api.version>
2625

2726
<!-- treat maven-invoker-plugin tests like integration tests, allowing
@@ -35,68 +34,49 @@
3534
<dependency>
3635
<groupId>org.apache.maven</groupId>
3736
<artifactId>maven-core</artifactId>
38-
<version>${maven.version}</version>
37+
<version>3.9.5</version>
3938
<scope>provided</scope>
4039
</dependency>
40+
<!-- for some reason maven-resolver-util is not provided on the classpath but -api is? -->
4141
<dependency>
42-
<groupId>org.apache.maven</groupId>
43-
<artifactId>maven-artifact</artifactId>
44-
<version>${maven.version}</version>
45-
<scope>provided</scope>
46-
</dependency>
47-
<dependency>
48-
<groupId>org.apache.maven</groupId>
49-
<artifactId>maven-model</artifactId>
50-
<version>${maven.version}</version>
51-
<scope>provided</scope>
52-
</dependency>
53-
<dependency>
54-
<groupId>org.apache.maven</groupId>
55-
<artifactId>maven-plugin-api</artifactId>
56-
<version>${maven.version}</version>
57-
<scope>provided</scope>
58-
</dependency>
59-
<dependency>
60-
<groupId>org.codehaus.plexus</groupId>
61-
<artifactId>plexus-utils</artifactId>
62-
<version>3.5.1</version>
63-
<scope>provided</scope>
42+
<groupId>org.apache.maven.resolver</groupId>
43+
<artifactId>maven-resolver-util</artifactId>
44+
<version>1.9.16</version>
6445
</dependency>
46+
6547
<dependency>
6648
<groupId>org.apache.maven.plugin-tools</groupId>
6749
<artifactId>maven-plugin-annotations</artifactId>
68-
<version>3.7.1</version>
69-
<scope>provided</scope>
70-
</dependency>
71-
<dependency>
72-
<groupId>org.slf4j</groupId>
73-
<artifactId>slf4j-api</artifactId>
74-
<!-- match version to maven -->
75-
<version>1.7.30</version>
50+
<version>3.8.1</version>
7651
<scope>provided</scope>
7752
</dependency>
7853

79-
<!-- Aether dependency resolution -->
80-
<dependency>
81-
<groupId>org.apache.maven.resolver</groupId>
82-
<artifactId>maven-resolver-api</artifactId>
83-
<version>${maven-resolver-api.version}</version>
84-
</dependency>
8554
<dependency>
86-
<groupId>org.apache.maven.resolver</groupId>
87-
<artifactId>maven-resolver-util</artifactId>
88-
<version>${maven-resolver-api.version}</version>
55+
<groupId>org.apache.maven.shared</groupId>
56+
<artifactId>maven-dependency-tree</artifactId>
57+
<version>3.2.1</version>
58+
<exclusions>
59+
<!-- aether-api overlaps with the provided maven-resolver-api classes -->
60+
<exclusion>
61+
<groupId>org.eclipse.aether</groupId>
62+
<artifactId>aether-api</artifactId>
63+
</exclusion>
64+
<!-- aether-api overlaps with the provided maven-resolver-util classes -->
65+
<exclusion>
66+
<groupId>org.eclipse.aether</groupId>
67+
<artifactId>aether-util</artifactId>
68+
</exclusion>
69+
</exclusions>
8970
</dependency>
9071
</dependencies>
9172

9273
<build>
9374
<pluginManagement>
9475
<plugins>
95-
<!-- bump version of plugin-plugin, earlier versions had a bug with jdk11 -->
9676
<plugin>
9777
<groupId>org.apache.maven.plugins</groupId>
9878
<artifactId>maven-plugin-plugin</artifactId>
99-
<version>3.8.1</version>
79+
<version>3.10.1</version>
10080
</plugin>
10181

10282
<!-- Start Skip publishing -->
@@ -151,7 +131,7 @@
151131
<!-- Integration tests -->
152132
<plugin>
153133
<artifactId>maven-invoker-plugin</artifactId>
154-
<version>3.4.0</version>
134+
<version>3.6.0</version>
155135
<executions>
156136
<execution>
157137
<id>integration-test</id>

‎bigtable-test/bigtable-emulator-maven-plugin/pom.xml

Lines changed: 4 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -31,43 +31,17 @@ limitations under the License.
3131
Maven integration for the cloud bigtable emulator.
3232
</description>
3333

34-
<properties>
35-
<maven.version>3.8.7</maven.version>
36-
</properties>
37-
38-
<dependencyManagement>
39-
<dependencies>
40-
<!-- fix RequireUpperBoundDeps enforcement for maven-core transitive deps -->
41-
<dependency>
42-
<groupId>org.codehaus.plexus</groupId>
43-
<artifactId>plexus-utils</artifactId>
44-
<version>3.5.1</version>
45-
</dependency>
46-
</dependencies>
47-
</dependencyManagement>
48-
4934
<dependencies>
5035
<dependency>
5136
<groupId>org.apache.maven</groupId>
5237
<artifactId>maven-core</artifactId>
53-
<version>${maven.version}</version>
54-
<scope>provided</scope>
55-
</dependency>
56-
<dependency>
57-
<groupId>org.apache.maven</groupId>
58-
<artifactId>maven-plugin-api</artifactId>
59-
<version>${maven.version}</version>
38+
<version>3.9.5</version>
6039
<scope>provided</scope>
6140
</dependency>
62-
<dependency>
63-
<groupId>com.google.guava</groupId>
64-
<artifactId>guava</artifactId>
65-
<version>${guava.version}</version>
66-
</dependency>
6741
<dependency>
6842
<groupId>org.apache.maven.plugin-tools</groupId>
6943
<artifactId>maven-plugin-annotations</artifactId>
70-
<version>3.7.1</version>
44+
<version>3.10.1</version>
7145
<scope>provided</scope>
7246
</dependency>
7347
</dependencies>
@@ -76,7 +50,7 @@ limitations under the License.
7650
<plugins>
7751
<plugin>
7852
<artifactId>maven-plugin-plugin</artifactId>
79-
<version>3.8.1</version>
53+
<version>3.10.1</version>
8054
<executions>
8155
<execution>
8256
<id>mojo-descriptor</id>
@@ -98,7 +72,7 @@ limitations under the License.
9872
<plugin>
9973
<groupId>org.apache.maven.plugins</groupId>
10074
<artifactId>maven-invoker-plugin</artifactId>
101-
<version>3.4.0</version>
75+
<version>3.6.0</version>
10276
<configuration>
10377
<debug>true</debug>
10478
<cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>

‎bigtable-test/bigtable-emulator-maven-plugin/src/main/java/com/google/cloud/bigtable/test/emulator/EmulatorController.java

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
package com.google.cloud.bigtable.test.emulator;
1818

19-
import com.google.common.base.Preconditions;
2019
import java.io.File;
2120
import java.io.FileNotFoundException;
2221
import java.io.IOException;
@@ -97,8 +96,12 @@ Builder setLogFile(File path) {
9796
}
9897

9998
EmulatorController build() {
100-
Preconditions.checkNotNull(emulatorPath, "emulatorPath can't be null");
101-
Preconditions.checkNotNull(logFile, "logFile can't be null");
99+
if (emulatorPath == null) {
100+
throw new NullPointerException("emulatorPath can't be null");
101+
}
102+
if (logFile == null) {
103+
throw new NullPointerException("logFile can't be null");
104+
}
102105

103106
return new EmulatorController(emulatorPath, logFile);
104107
}

‎bigtable-test/bigtable-internal-test-helper/pom.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@
5757
<plugin>
5858
<groupId>org.apache.maven.plugins</groupId>
5959
<artifactId>maven-deploy-plugin</artifactId>
60-
<version>3.0.0-M2</version>
6160
<configuration>
6261
<skip>true</skip>
6362
</configuration>

0 commit comments

Comments
 (0)