Skip to content
Permalink
Browse files
feat: introduce bom artifact and make this a multi-module project (#419)
Prepares the repository for adding gapic clients.
  • Loading branch information
chingor13 committed Apr 6, 2021
1 parent aa484e0 commit ad4309ec44a1dad107a6977c5e4aedac871f408f
Showing with 340 additions and 177 deletions.
  1. +0 −74 clirr-ignored-differences.xml
  2. +75 −0 google-cloud-resourcemanager-bom/pom.xml
  3. +248 −0 google-cloud-resourcemanager/pom.xml
  4. 0 { → google-cloud-resourcemanager}/src/main/java/com/google/cloud/resourcemanager/ConstraintInfo.java
  5. 0 { → google-cloud-resourcemanager}/src/main/java/com/google/cloud/resourcemanager/Option.java
  6. 0 { → google-cloud-resourcemanager}/src/main/java/com/google/cloud/resourcemanager/OrgPolicyInfo.java
  7. 0 ...oogle-cloud-resourcemanager}/src/main/java/com/google/cloud/resourcemanager/PolicyMarshaller.java
  8. 0 { → google-cloud-resourcemanager}/src/main/java/com/google/cloud/resourcemanager/Project.java
  9. 0 { → google-cloud-resourcemanager}/src/main/java/com/google/cloud/resourcemanager/ProjectInfo.java
  10. 0 ...google-cloud-resourcemanager}/src/main/java/com/google/cloud/resourcemanager/ResourceManager.java
  11. 0 ...oud-resourcemanager}/src/main/java/com/google/cloud/resourcemanager/ResourceManagerException.java
  12. 0 ...cloud-resourcemanager}/src/main/java/com/google/cloud/resourcemanager/ResourceManagerFactory.java
  13. 0 ...le-cloud-resourcemanager}/src/main/java/com/google/cloud/resourcemanager/ResourceManagerImpl.java
  14. 0 ...cloud-resourcemanager}/src/main/java/com/google/cloud/resourcemanager/ResourceManagerOptions.java
  15. 0 { → google-cloud-resourcemanager}/src/main/java/com/google/cloud/resourcemanager/package-info.java
  16. 0 ...esourcemanager}/src/main/java/com/google/cloud/resourcemanager/spi/ResourceManagerRpcFactory.java
  17. 0 ...cemanager}/src/main/java/com/google/cloud/resourcemanager/spi/v1beta1/HttpResourceManagerRpc.java
  18. 0 ...sourcemanager}/src/main/java/com/google/cloud/resourcemanager/spi/v1beta1/ResourceManagerRpc.java
  19. 0 ...cemanager}/src/main/java/com/google/cloud/resourcemanager/testing/LocalResourceManagerHelper.java
  20. 0 ...e-cloud-resourcemanager}/src/main/java/com/google/cloud/resourcemanager/testing/package-info.java
  21. 0 ...gle-cloud-resourcemanager}/src/test/java/com/google/cloud/resourcemanager/ConstraintInfoTest.java
  22. 0 { → google-cloud-resourcemanager}/src/test/java/com/google/cloud/resourcemanager/OptionTest.java
  23. 0 ...ogle-cloud-resourcemanager}/src/test/java/com/google/cloud/resourcemanager/OrgPolicyInfoTest.java
  24. 0 ...e-cloud-resourcemanager}/src/test/java/com/google/cloud/resourcemanager/PolicyMarshallerTest.java
  25. 0 ...google-cloud-resourcemanager}/src/test/java/com/google/cloud/resourcemanager/ProjectInfoTest.java
  26. 0 { → google-cloud-resourcemanager}/src/test/java/com/google/cloud/resourcemanager/ProjectTest.java
  27. 0 ...resourcemanager}/src/test/java/com/google/cloud/resourcemanager/ResourceManagerExceptionTest.java
  28. 0 ...loud-resourcemanager}/src/test/java/com/google/cloud/resourcemanager/ResourceManagerImplTest.java
  29. 0 ...d-resourcemanager}/src/test/java/com/google/cloud/resourcemanager/ResourceManagerOptionsTest.java
  30. 0 ...ogle-cloud-resourcemanager}/src/test/java/com/google/cloud/resourcemanager/SerializationTest.java
  31. 0 ...google-cloud-resourcemanager}/src/test/java/com/google/cloud/resourcemanager/it/ITSystemTest.java
  32. 0 ...nager}/src/test/java/com/google/cloud/resourcemanager/testing/LocalResourceManagerHelperTest.java
  33. +16 −102 pom.xml
  34. +1 −1 versions.txt

This file was deleted.

@@ -0,0 +1,75 @@
<?xml version="1.0"?>
<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">
<modelVersion>4.0.0</modelVersion>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-resourcemanager-bom</artifactId>
<version>0.118.13-alpha-SNAPSHOT</version><!-- {x-version-update:google-cloud-resourcemanager:current} -->
<packaging>pom</packaging>
<parent>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-shared-config</artifactId>
<version>0.11.0</version>
</parent>

<name>Google Resource Manager API BOM</name>
<url>https://github.com/googleapis/java-resourcemanager</url>
<description>
BOM for Resource Manager API
</description>

<organization>
<name>Google LLC</name>
</organization>

<developers>
<developer>
<id>chingor13</id>
<name>Jeff Ching</name>
<email>chingor@google.com</email>
<organization>Google LLC</organization>
<roles>
<role>Developer</role>
</roles>
</developer>
</developers>

<scm>
<connection>scm:git:https://github.com/googleapis/java-resourcemanager.git</connection>
<developerConnection>scm:git:git@github.com:googleapis/java-resourcemanager.git</developerConnection>
<url>https://github.com/googleapis/java-resourcemanager</url>
</scm>

<properties>
<maven.antrun.skip>true</maven.antrun.skip>
</properties>

<licenses>
<license>
<name>The Apache Software License, Version 2.0</name>
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
<distribution>repo</distribution>
</license>
</licenses>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-resourcemanager</artifactId>
<version>0.118.13-alpha-SNAPSHOT</version><!-- {x-version-update:google-cloud-resourcemanager:current} -->
</dependency>
</dependencies>
</dependencyManagement>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
</plugins>
</build>
</project>
@@ -0,0 +1,248 @@
<?xml version='1.0' encoding='UTF-8'?>
<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">
<modelVersion>4.0.0</modelVersion>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-resourcemanager</artifactId>
<packaging>jar</packaging>
<version>0.118.13-alpha-SNAPSHOT</version><!-- {x-version-update:google-cloud-resourcemanager:current} -->
<name>Google Cloud Resource Manager</name>
<url>https://github.com/googleapis/java-resourcemanager</url>
<description>
Java idiomatic client for Google Cloud Resource Manager
</description>

<parent>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-resourcemanager-parent</artifactId>
<version>0.118.13-alpha-SNAPSHOT</version><!-- {x-version-update:google-cloud-resourcemanager:current} -->
</parent>

<developers>
<developer>
<id>chingor</id>
<name>Jeff Ching</name>
<email>chingor@google.com</email>
<organization>Google</organization>
<roles>
<role>Developer</role>
</roles>
</developer>
</developers>
<organization>
<name>Google LLC</name>
</organization>
<scm>
<connection>scm:git:git@github.com:googleapis/java-resourcemanager.git</connection>
<developerConnection>scm:git:git@github.com:googleapis/java-resourcemanager.git</developerConnection>
<url>https://github.com/googleapis/java-resourcemanager</url>
<tag>HEAD</tag>
</scm>
<issueManagement>
<url>https://github.com/googleapis/java-resourcemanager/issues</url>
<system>GitHub Issues</system>
</issueManagement>
<distributionManagement>
<snapshotRepository>
<id>sonatype-nexus-snapshots</id>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
</snapshotRepository>
<repository>
<id>sonatype-nexus-staging</id>
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
</repository>
</distributionManagement>
<licenses>
<license>
<name>Apache-2.0</name>
<url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
</license>
</licenses>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<github.global.server>github</github.global.server>
<site.installationModule>google-cloud-resourcemanager-parent</site.installationModule>
</properties>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-shared-dependencies</artifactId>
<version>0.20.1</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>com.google.errorprone</groupId>
<artifactId>error_prone_annotations</artifactId>
<version>2.5.1</version>
</dependency>
</dependencies>
</dependencyManagement>
<dependencies>
<dependency>
<groupId>com.google.api</groupId>
<artifactId>api-common</artifactId>
</dependency>
<dependency>
<groupId>org.threeten</groupId>
<artifactId>threetenbp</artifactId>
</dependency>
<dependency>
<groupId>com.google.apis</groupId>
<artifactId>google-api-services-cloudresourcemanager</artifactId>
<version>v1-rev20210309-1.31.0</version>
</dependency>
<dependency>
<groupId>com.google.http-client</groupId>
<artifactId>google-http-client-jackson2</artifactId>
</dependency>
<dependency>
<groupId>com.google.http-client</groupId>
<artifactId>google-http-client</artifactId>
</dependency>
<dependency>
<groupId>com.google.auth</groupId>
<artifactId>google-auth-library-oauth2-http</artifactId>
</dependency>
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-core</artifactId>
</dependency>
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-core-http</artifactId>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
<dependency>
<groupId>com.google.api</groupId>
<artifactId>gax</artifactId>
</dependency>

<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
<version>3.6</version>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.objenesis</groupId>
<artifactId>objenesis</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
<version>1.10.19</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.objenesis</groupId>
<artifactId>objenesis</artifactId>
<version>3.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-core</artifactId>
<scope>test</scope>
<type>test-jar</type>
</dependency>
</dependencies>

<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<configuration>
<ignoredUnusedDeclaredDependencies>org.objenesis:objenesis</ignoredUnusedDeclaredDependencies>
</configuration>
</plugin>
</plugins>
</pluginManagement>
</build>

<reporting>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
<version>3.1.1</version>
<reportSets>
<reportSet>
<reports>
<report>index</report>
<report>dependency-info</report>
<report>team</report>
<report>ci-management</report>
<report>issue-management</report>
<report>licenses</report>
<report>scm</report>
<report>dependency-management</report>
<report>distribution-management</report>
<report>summary</report>
<report>modules</report>
</reports>
</reportSet>
</reportSets>
<configuration>
<dependencyDetailsEnabled>true</dependencyDetailsEnabled>
<artifactId>${site.installationModule}</artifactId>
<packaging>jar</packaging>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.2.0</version>
<reportSets>
<reportSet>
<id>html</id>
<reports>
<report>aggregate</report>
<report>javadoc</report>
</reports>
</reportSet>
</reportSets>
<configuration>
<doclint>none</doclint>
<show>protected</show>
<nohelp>true</nohelp>
<outputDirectory>${project.build.directory}/javadoc</outputDirectory>
<groups>
<group>
<title>Test helpers packages</title>
<packages>com.google.cloud.testing</packages>
</group>
<group>
<title>SPI packages</title>
<packages>com.google.cloud.spi*</packages>
</group>
</groups>

<links>
<link>https://grpc.io/grpc-java/javadoc/</link>
<link>https://developers.google.com/protocol-buffers/docs/reference/java/</link>
<link>https://googleapis.dev/java/google-auth-library/latest/</link>
<link>https://googleapis.dev/java/gax/latest/</link>
<link>https://googleapis.github.io/api-common-java/</link>
</links>
</configuration>
</plugin>
</plugins>
</reporting>
</project>

0 comments on commit ad4309e

Please sign in to comment.