Skip to content

Commit 61a6fc3

Browse files
chingor13chingor13
authored
feat: introduce bom artifact and make this a multi-module project (googleapis#419)
Prepares the repository for adding gapic clients.
1 parent 2301059 commit 61a6fc3

34 files changed

+340
-177
lines changed

‎java-resourcemanager/clirr-ignored-differences.xml

-74
This file was deleted.

‎java-resourcemanager/google-cloud-resourcemanager-bom/pom.xml

+75
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
<?xml version="1.0"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3+
<modelVersion>4.0.0</modelVersion>
4+
<groupId>com.google.cloud</groupId>
5+
<artifactId>google-cloud-resourcemanager-bom</artifactId>
6+
<version>0.118.13-alpha-SNAPSHOT</version><!-- {x-version-update:google-cloud-resourcemanager:current} -->
7+
<packaging>pom</packaging>
8+
<parent>
9+
<groupId>com.google.cloud</groupId>
10+
<artifactId>google-cloud-shared-config</artifactId>
11+
<version>0.11.0</version>
12+
</parent>
13+
14+
<name>Google Resource Manager API BOM</name>
15+
<url>https://github.com/googleapis/java-resourcemanager</url>
16+
<description>
17+
BOM for Resource Manager API
18+
</description>
19+
20+
<organization>
21+
<name>Google LLC</name>
22+
</organization>
23+
24+
<developers>
25+
<developer>
26+
<id>chingor13</id>
27+
<name>Jeff Ching</name>
28+
<email>[email protected]</email>
29+
<organization>Google LLC</organization>
30+
<roles>
31+
<role>Developer</role>
32+
</roles>
33+
</developer>
34+
</developers>
35+
36+
<scm>
37+
<connection>scm:git:https://github.com/googleapis/java-resourcemanager.git</connection>
38+
<developerConnection>scm:git:[email protected]:googleapis/java-resourcemanager.git</developerConnection>
39+
<url>https://github.com/googleapis/java-resourcemanager</url>
40+
</scm>
41+
42+
<properties>
43+
<maven.antrun.skip>true</maven.antrun.skip>
44+
</properties>
45+
46+
<licenses>
47+
<license>
48+
<name>The Apache Software License, Version 2.0</name>
49+
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
50+
<distribution>repo</distribution>
51+
</license>
52+
</licenses>
53+
54+
<dependencyManagement>
55+
<dependencies>
56+
<dependency>
57+
<groupId>com.google.cloud</groupId>
58+
<artifactId>google-cloud-resourcemanager</artifactId>
59+
<version>0.118.13-alpha-SNAPSHOT</version><!-- {x-version-update:google-cloud-resourcemanager:current} -->
60+
</dependency>
61+
</dependencies>
62+
</dependencyManagement>
63+
64+
<build>
65+
<plugins>
66+
<plugin>
67+
<groupId>org.apache.maven.plugins</groupId>
68+
<artifactId>maven-checkstyle-plugin</artifactId>
69+
<configuration>
70+
<skip>true</skip>
71+
</configuration>
72+
</plugin>
73+
</plugins>
74+
</build>
75+
</project>

‎java-resourcemanager/google-cloud-resourcemanager/pom.xml

+248
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,248 @@
1+
<?xml version='1.0' encoding='UTF-8'?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3+
<modelVersion>4.0.0</modelVersion>
4+
<groupId>com.google.cloud</groupId>
5+
<artifactId>google-cloud-resourcemanager</artifactId>
6+
<packaging>jar</packaging>
7+
<version>0.118.13-alpha-SNAPSHOT</version><!-- {x-version-update:google-cloud-resourcemanager:current} -->
8+
<name>Google Cloud Resource Manager</name>
9+
<url>https://github.com/googleapis/java-resourcemanager</url>
10+
<description>
11+
Java idiomatic client for Google Cloud Resource Manager
12+
</description>
13+
14+
<parent>
15+
<groupId>com.google.cloud</groupId>
16+
<artifactId>google-cloud-resourcemanager-parent</artifactId>
17+
<version>0.118.13-alpha-SNAPSHOT</version><!-- {x-version-update:google-cloud-resourcemanager:current} -->
18+
</parent>
19+
20+
<developers>
21+
<developer>
22+
<id>chingor</id>
23+
<name>Jeff Ching</name>
24+
<email>[email protected]</email>
25+
<organization>Google</organization>
26+
<roles>
27+
<role>Developer</role>
28+
</roles>
29+
</developer>
30+
</developers>
31+
<organization>
32+
<name>Google LLC</name>
33+
</organization>
34+
<scm>
35+
<connection>scm:git:[email protected]:googleapis/java-resourcemanager.git</connection>
36+
<developerConnection>scm:git:[email protected]:googleapis/java-resourcemanager.git</developerConnection>
37+
<url>https://github.com/googleapis/java-resourcemanager</url>
38+
<tag>HEAD</tag>
39+
</scm>
40+
<issueManagement>
41+
<url>https://github.com/googleapis/java-resourcemanager/issues</url>
42+
<system>GitHub Issues</system>
43+
</issueManagement>
44+
<distributionManagement>
45+
<snapshotRepository>
46+
<id>sonatype-nexus-snapshots</id>
47+
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
48+
</snapshotRepository>
49+
<repository>
50+
<id>sonatype-nexus-staging</id>
51+
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
52+
</repository>
53+
</distributionManagement>
54+
<licenses>
55+
<license>
56+
<name>Apache-2.0</name>
57+
<url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
58+
</license>
59+
</licenses>
60+
61+
<properties>
62+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
63+
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
64+
<github.global.server>github</github.global.server>
65+
<site.installationModule>google-cloud-resourcemanager-parent</site.installationModule>
66+
</properties>
67+
68+
<dependencyManagement>
69+
<dependencies>
70+
<dependency>
71+
<groupId>com.google.cloud</groupId>
72+
<artifactId>google-cloud-shared-dependencies</artifactId>
73+
<version>0.20.1</version>
74+
<type>pom</type>
75+
<scope>import</scope>
76+
</dependency>
77+
<dependency>
78+
<groupId>com.google.errorprone</groupId>
79+
<artifactId>error_prone_annotations</artifactId>
80+
<version>2.5.1</version>
81+
</dependency>
82+
</dependencies>
83+
</dependencyManagement>
84+
<dependencies>
85+
<dependency>
86+
<groupId>com.google.api</groupId>
87+
<artifactId>api-common</artifactId>
88+
</dependency>
89+
<dependency>
90+
<groupId>org.threeten</groupId>
91+
<artifactId>threetenbp</artifactId>
92+
</dependency>
93+
<dependency>
94+
<groupId>com.google.apis</groupId>
95+
<artifactId>google-api-services-cloudresourcemanager</artifactId>
96+
<version>v1-rev20210309-1.31.0</version>
97+
</dependency>
98+
<dependency>
99+
<groupId>com.google.http-client</groupId>
100+
<artifactId>google-http-client-jackson2</artifactId>
101+
</dependency>
102+
<dependency>
103+
<groupId>com.google.http-client</groupId>
104+
<artifactId>google-http-client</artifactId>
105+
</dependency>
106+
<dependency>
107+
<groupId>com.google.auth</groupId>
108+
<artifactId>google-auth-library-oauth2-http</artifactId>
109+
</dependency>
110+
<dependency>
111+
<groupId>com.google.cloud</groupId>
112+
<artifactId>google-cloud-core</artifactId>
113+
</dependency>
114+
<dependency>
115+
<groupId>com.google.cloud</groupId>
116+
<artifactId>google-cloud-core-http</artifactId>
117+
</dependency>
118+
<dependency>
119+
<groupId>com.google.guava</groupId>
120+
<artifactId>guava</artifactId>
121+
</dependency>
122+
<dependency>
123+
<groupId>com.google.api</groupId>
124+
<artifactId>gax</artifactId>
125+
</dependency>
126+
127+
<dependency>
128+
<groupId>junit</groupId>
129+
<artifactId>junit</artifactId>
130+
<version>4.13.2</version>
131+
<scope>test</scope>
132+
</dependency>
133+
<dependency>
134+
<groupId>org.easymock</groupId>
135+
<artifactId>easymock</artifactId>
136+
<version>3.6</version>
137+
<scope>test</scope>
138+
<exclusions>
139+
<exclusion>
140+
<groupId>org.objenesis</groupId>
141+
<artifactId>objenesis</artifactId>
142+
</exclusion>
143+
</exclusions>
144+
</dependency>
145+
<dependency>
146+
<groupId>org.mockito</groupId>
147+
<artifactId>mockito-all</artifactId>
148+
<version>1.10.19</version>
149+
<scope>test</scope>
150+
</dependency>
151+
<dependency>
152+
<groupId>org.objenesis</groupId>
153+
<artifactId>objenesis</artifactId>
154+
<version>3.1</version>
155+
<scope>test</scope>
156+
</dependency>
157+
<dependency>
158+
<groupId>com.google.cloud</groupId>
159+
<artifactId>google-cloud-core</artifactId>
160+
<scope>test</scope>
161+
<type>test-jar</type>
162+
</dependency>
163+
</dependencies>
164+
165+
<build>
166+
<pluginManagement>
167+
<plugins>
168+
<plugin>
169+
<groupId>org.apache.maven.plugins</groupId>
170+
<artifactId>maven-dependency-plugin</artifactId>
171+
<configuration>
172+
<ignoredUnusedDeclaredDependencies>org.objenesis:objenesis</ignoredUnusedDeclaredDependencies>
173+
</configuration>
174+
</plugin>
175+
</plugins>
176+
</pluginManagement>
177+
</build>
178+
179+
<reporting>
180+
<plugins>
181+
<plugin>
182+
<groupId>org.apache.maven.plugins</groupId>
183+
<artifactId>maven-project-info-reports-plugin</artifactId>
184+
<version>3.1.1</version>
185+
<reportSets>
186+
<reportSet>
187+
<reports>
188+
<report>index</report>
189+
<report>dependency-info</report>
190+
<report>team</report>
191+
<report>ci-management</report>
192+
<report>issue-management</report>
193+
<report>licenses</report>
194+
<report>scm</report>
195+
<report>dependency-management</report>
196+
<report>distribution-management</report>
197+
<report>summary</report>
198+
<report>modules</report>
199+
</reports>
200+
</reportSet>
201+
</reportSets>
202+
<configuration>
203+
<dependencyDetailsEnabled>true</dependencyDetailsEnabled>
204+
<artifactId>${site.installationModule}</artifactId>
205+
<packaging>jar</packaging>
206+
</configuration>
207+
</plugin>
208+
<plugin>
209+
<groupId>org.apache.maven.plugins</groupId>
210+
<artifactId>maven-javadoc-plugin</artifactId>
211+
<version>3.2.0</version>
212+
<reportSets>
213+
<reportSet>
214+
<id>html</id>
215+
<reports>
216+
<report>aggregate</report>
217+
<report>javadoc</report>
218+
</reports>
219+
</reportSet>
220+
</reportSets>
221+
<configuration>
222+
<doclint>none</doclint>
223+
<show>protected</show>
224+
<nohelp>true</nohelp>
225+
<outputDirectory>${project.build.directory}/javadoc</outputDirectory>
226+
<groups>
227+
<group>
228+
<title>Test helpers packages</title>
229+
<packages>com.google.cloud.testing</packages>
230+
</group>
231+
<group>
232+
<title>SPI packages</title>
233+
<packages>com.google.cloud.spi*</packages>
234+
</group>
235+
</groups>
236+
237+
<links>
238+
<link>https://grpc.io/grpc-java/javadoc/</link>
239+
<link>https://developers.google.com/protocol-buffers/docs/reference/java/</link>
240+
<link>https://googleapis.dev/java/google-auth-library/latest/</link>
241+
<link>https://googleapis.dev/java/gax/latest/</link>
242+
<link>https://googleapis.github.io/api-common-java/</link>
243+
</links>
244+
</configuration>
245+
</plugin>
246+
</plugins>
247+
</reporting>
248+
</project>

‎java-resourcemanager/src/main/java/com/google/cloud/resourcemanager/ConstraintInfo.java renamed to ‎java-resourcemanager/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/ConstraintInfo.java

File renamed without changes.

‎java-resourcemanager/src/main/java/com/google/cloud/resourcemanager/Option.java renamed to ‎java-resourcemanager/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/Option.java

File renamed without changes.

‎java-resourcemanager/src/main/java/com/google/cloud/resourcemanager/OrgPolicyInfo.java renamed to ‎java-resourcemanager/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/OrgPolicyInfo.java

File renamed without changes.

‎java-resourcemanager/src/main/java/com/google/cloud/resourcemanager/PolicyMarshaller.java renamed to ‎java-resourcemanager/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/PolicyMarshaller.java

File renamed without changes.

‎java-resourcemanager/src/main/java/com/google/cloud/resourcemanager/Project.java renamed to ‎java-resourcemanager/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/Project.java

File renamed without changes.

‎java-resourcemanager/src/main/java/com/google/cloud/resourcemanager/ProjectInfo.java renamed to ‎java-resourcemanager/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/ProjectInfo.java

File renamed without changes.

‎java-resourcemanager/src/main/java/com/google/cloud/resourcemanager/ResourceManager.java renamed to ‎java-resourcemanager/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/ResourceManager.java

File renamed without changes.

‎java-resourcemanager/src/main/java/com/google/cloud/resourcemanager/ResourceManagerException.java renamed to ‎java-resourcemanager/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/ResourceManagerException.java

File renamed without changes.

‎java-resourcemanager/src/main/java/com/google/cloud/resourcemanager/ResourceManagerFactory.java renamed to ‎java-resourcemanager/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/ResourceManagerFactory.java

File renamed without changes.

‎java-resourcemanager/src/main/java/com/google/cloud/resourcemanager/ResourceManagerImpl.java renamed to ‎java-resourcemanager/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/ResourceManagerImpl.java

File renamed without changes.

‎java-resourcemanager/src/main/java/com/google/cloud/resourcemanager/ResourceManagerOptions.java renamed to ‎java-resourcemanager/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/ResourceManagerOptions.java

File renamed without changes.

‎java-resourcemanager/src/main/java/com/google/cloud/resourcemanager/package-info.java renamed to ‎java-resourcemanager/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/package-info.java

File renamed without changes.

‎java-resourcemanager/src/main/java/com/google/cloud/resourcemanager/spi/ResourceManagerRpcFactory.java renamed to ‎java-resourcemanager/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/spi/ResourceManagerRpcFactory.java

File renamed without changes.

‎java-resourcemanager/src/main/java/com/google/cloud/resourcemanager/spi/v1beta1/HttpResourceManagerRpc.java renamed to ‎java-resourcemanager/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/spi/v1beta1/HttpResourceManagerRpc.java

File renamed without changes.

‎java-resourcemanager/src/main/java/com/google/cloud/resourcemanager/spi/v1beta1/ResourceManagerRpc.java renamed to ‎java-resourcemanager/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/spi/v1beta1/ResourceManagerRpc.java

File renamed without changes.

‎java-resourcemanager/src/main/java/com/google/cloud/resourcemanager/testing/LocalResourceManagerHelper.java renamed to ‎java-resourcemanager/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/testing/LocalResourceManagerHelper.java

File renamed without changes.

‎java-resourcemanager/src/main/java/com/google/cloud/resourcemanager/testing/package-info.java renamed to ‎java-resourcemanager/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/testing/package-info.java

File renamed without changes.

‎java-resourcemanager/src/test/java/com/google/cloud/resourcemanager/ConstraintInfoTest.java renamed to ‎java-resourcemanager/google-cloud-resourcemanager/src/test/java/com/google/cloud/resourcemanager/ConstraintInfoTest.java

File renamed without changes.

‎java-resourcemanager/src/test/java/com/google/cloud/resourcemanager/OptionTest.java renamed to ‎java-resourcemanager/google-cloud-resourcemanager/src/test/java/com/google/cloud/resourcemanager/OptionTest.java

File renamed without changes.

‎java-resourcemanager/src/test/java/com/google/cloud/resourcemanager/OrgPolicyInfoTest.java renamed to ‎java-resourcemanager/google-cloud-resourcemanager/src/test/java/com/google/cloud/resourcemanager/OrgPolicyInfoTest.java

File renamed without changes.

‎java-resourcemanager/src/test/java/com/google/cloud/resourcemanager/PolicyMarshallerTest.java renamed to ‎java-resourcemanager/google-cloud-resourcemanager/src/test/java/com/google/cloud/resourcemanager/PolicyMarshallerTest.java

File renamed without changes.

‎java-resourcemanager/src/test/java/com/google/cloud/resourcemanager/ProjectInfoTest.java renamed to ‎java-resourcemanager/google-cloud-resourcemanager/src/test/java/com/google/cloud/resourcemanager/ProjectInfoTest.java

File renamed without changes.

‎java-resourcemanager/src/test/java/com/google/cloud/resourcemanager/ProjectTest.java renamed to ‎java-resourcemanager/google-cloud-resourcemanager/src/test/java/com/google/cloud/resourcemanager/ProjectTest.java

File renamed without changes.

‎java-resourcemanager/src/test/java/com/google/cloud/resourcemanager/ResourceManagerExceptionTest.java renamed to ‎java-resourcemanager/google-cloud-resourcemanager/src/test/java/com/google/cloud/resourcemanager/ResourceManagerExceptionTest.java

File renamed without changes.

‎java-resourcemanager/src/test/java/com/google/cloud/resourcemanager/ResourceManagerImplTest.java renamed to ‎java-resourcemanager/google-cloud-resourcemanager/src/test/java/com/google/cloud/resourcemanager/ResourceManagerImplTest.java

File renamed without changes.

‎java-resourcemanager/src/test/java/com/google/cloud/resourcemanager/ResourceManagerOptionsTest.java renamed to ‎java-resourcemanager/google-cloud-resourcemanager/src/test/java/com/google/cloud/resourcemanager/ResourceManagerOptionsTest.java

File renamed without changes.

‎java-resourcemanager/src/test/java/com/google/cloud/resourcemanager/SerializationTest.java renamed to ‎java-resourcemanager/google-cloud-resourcemanager/src/test/java/com/google/cloud/resourcemanager/SerializationTest.java

File renamed without changes.

‎java-resourcemanager/src/test/java/com/google/cloud/resourcemanager/it/ITSystemTest.java renamed to ‎java-resourcemanager/google-cloud-resourcemanager/src/test/java/com/google/cloud/resourcemanager/it/ITSystemTest.java

File renamed without changes.

‎java-resourcemanager/src/test/java/com/google/cloud/resourcemanager/testing/LocalResourceManagerHelperTest.java renamed to ‎java-resourcemanager/google-cloud-resourcemanager/src/test/java/com/google/cloud/resourcemanager/testing/LocalResourceManagerHelperTest.java

File renamed without changes.

0 commit comments

Comments
 (0)