diff --git a/clirr-ignored-differences.xml b/clirr-ignored-differences.xml deleted file mode 100644 index 24266840..00000000 --- a/clirr-ignored-differences.xml +++ /dev/null @@ -1,74 +0,0 @@ - - - - - com/google/cloud/resourcemanager/ResourceManager - java.util.Map testOrgPermissions(java.lang.String, java.util.List) - 7012 - - - com/google/cloud/resourcemanager/ResourceManager - void clearOrgPolicy(java.lang.String, com.google.cloud.resourcemanager.OrgPolicyInfo) - 7012 - - - com/google/cloud/resourcemanager/ResourceManager - com.google.cloud.resourcemanager.OrgPolicyInfo getEffectiveOrgPolicy(java.lang.String, java.lang.String) - 7012 - - - com/google/cloud/resourcemanager/ResourceManager - com.google.cloud.resourcemanager.OrgPolicyInfo getOrgPolicy(java.lang.String, java.lang.String) - 7012 - - - com/google/cloud/resourcemanager/ResourceManager - com.google.api.gax.paging.Page listAvailableOrgPolicyConstraints(java.lang.String, com.google.cloud.resourcemanager.ResourceManager$ListOption[]) - 7012 - - - com/google/cloud/resourcemanager/ResourceManager - com.google.api.gax.paging.Page listOrgPolicies(java.lang.String, com.google.cloud.resourcemanager.ResourceManager$ListOption[]) - 7012 - - - com/google/cloud/resourcemanager/ResourceManager - com.google.cloud.resourcemanager.OrgPolicyInfo replaceOrgPolicy(java.lang.String, com.google.cloud.resourcemanager.OrgPolicyInfo) - 7012 - - - com/google/cloud/resourcemanager/spi/v1beta1/ResourceManagerRpc - java.util.Map testOrgPermissions(java.lang.String, java.util.List) - 7012 - - - com/google/cloud/resourcemanager/spi/v1beta1/ResourceManagerRpc - void clearOrgPolicy(java.lang.String, com.google.api.services.cloudresourcemanager.model.OrgPolicy) - 7012 - - - com/google/cloud/resourcemanager/spi/v1beta1/ResourceManagerRpc - com.google.api.services.cloudresourcemanager.model.OrgPolicy getEffectiveOrgPolicy(java.lang.String, java.lang.String) - 7012 - - - com/google/cloud/resourcemanager/spi/v1beta1/ResourceManagerRpc - com.google.api.services.cloudresourcemanager.model.OrgPolicy getOrgPolicy(java.lang.String, java.lang.String) - 7012 - - - com/google/cloud/resourcemanager/spi/v1beta1/ResourceManagerRpc - com.google.cloud.resourcemanager.spi.v1beta1.ResourceManagerRpc$ListResult listAvailableOrgPolicyConstraints(java.lang.String, java.util.Map) - 7012 - - - com/google/cloud/resourcemanager/spi/v1beta1/ResourceManagerRpc - com.google.cloud.resourcemanager.spi.v1beta1.ResourceManagerRpc$ListResult listOrgPolicies(java.lang.String, java.util.Map) - 7012 - - - com/google/cloud/resourcemanager/spi/v1beta1/ResourceManagerRpc - com.google.api.services.cloudresourcemanager.model.OrgPolicy replaceOrgPolicy(java.lang.String, com.google.api.services.cloudresourcemanager.model.OrgPolicy) - 7012 - - diff --git a/google-cloud-resourcemanager-bom/pom.xml b/google-cloud-resourcemanager-bom/pom.xml new file mode 100644 index 00000000..23a78793 --- /dev/null +++ b/google-cloud-resourcemanager-bom/pom.xml @@ -0,0 +1,75 @@ + + + 4.0.0 + com.google.cloud + google-cloud-resourcemanager-bom + 0.118.13-alpha-SNAPSHOT + pom + + com.google.cloud + google-cloud-shared-config + 0.11.0 + + + Google Resource Manager API BOM + https://github.com/googleapis/java-resourcemanager + + BOM for Resource Manager API + + + + Google LLC + + + + + chingor13 + Jeff Ching + chingor@google.com + Google LLC + + Developer + + + + + + scm:git:https://github.com/googleapis/java-resourcemanager.git + scm:git:git@github.com:googleapis/java-resourcemanager.git + https://github.com/googleapis/java-resourcemanager + + + + true + + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + + + com.google.cloud + google-cloud-resourcemanager + 0.118.13-alpha-SNAPSHOT + + + + + + + + org.apache.maven.plugins + maven-checkstyle-plugin + + true + + + + + diff --git a/google-cloud-resourcemanager/pom.xml b/google-cloud-resourcemanager/pom.xml new file mode 100644 index 00000000..7e4ec8e4 --- /dev/null +++ b/google-cloud-resourcemanager/pom.xml @@ -0,0 +1,248 @@ + + + 4.0.0 + com.google.cloud + google-cloud-resourcemanager + jar + 0.118.13-alpha-SNAPSHOT + Google Cloud Resource Manager + https://github.com/googleapis/java-resourcemanager + + Java idiomatic client for Google Cloud Resource Manager + + + + com.google.cloud + google-cloud-resourcemanager-parent + 0.118.13-alpha-SNAPSHOT + + + + + chingor + Jeff Ching + chingor@google.com + Google + + Developer + + + + + Google LLC + + + scm:git:git@github.com:googleapis/java-resourcemanager.git + scm:git:git@github.com:googleapis/java-resourcemanager.git + https://github.com/googleapis/java-resourcemanager + HEAD + + + https://github.com/googleapis/java-resourcemanager/issues + GitHub Issues + + + + sonatype-nexus-snapshots + https://oss.sonatype.org/content/repositories/snapshots + + + sonatype-nexus-staging + https://oss.sonatype.org/service/local/staging/deploy/maven2/ + + + + + Apache-2.0 + https://www.apache.org/licenses/LICENSE-2.0.txt + + + + + UTF-8 + UTF-8 + github + google-cloud-resourcemanager-parent + + + + + + com.google.cloud + google-cloud-shared-dependencies + 0.20.1 + pom + import + + + com.google.errorprone + error_prone_annotations + 2.5.1 + + + + + + com.google.api + api-common + + + org.threeten + threetenbp + + + com.google.apis + google-api-services-cloudresourcemanager + v1-rev20210309-1.31.0 + + + com.google.http-client + google-http-client-jackson2 + + + com.google.http-client + google-http-client + + + com.google.auth + google-auth-library-oauth2-http + + + com.google.cloud + google-cloud-core + + + com.google.cloud + google-cloud-core-http + + + com.google.guava + guava + + + com.google.api + gax + + + + junit + junit + 4.13.2 + test + + + org.easymock + easymock + 3.6 + test + + + org.objenesis + objenesis + + + + + org.mockito + mockito-all + 1.10.19 + test + + + org.objenesis + objenesis + 3.1 + test + + + com.google.cloud + google-cloud-core + test + test-jar + + + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + org.objenesis:objenesis + + + + + + + + + + org.apache.maven.plugins + maven-project-info-reports-plugin + 3.1.1 + + + + index + dependency-info + team + ci-management + issue-management + licenses + scm + dependency-management + distribution-management + summary + modules + + + + + true + ${site.installationModule} + jar + + + + org.apache.maven.plugins + maven-javadoc-plugin + 3.2.0 + + + html + + aggregate + javadoc + + + + + none + protected + true + ${project.build.directory}/javadoc + + + Test helpers packages + com.google.cloud.testing + + + SPI packages + com.google.cloud.spi* + + + + + https://grpc.io/grpc-java/javadoc/ + https://developers.google.com/protocol-buffers/docs/reference/java/ + https://googleapis.dev/java/google-auth-library/latest/ + https://googleapis.dev/java/gax/latest/ + https://googleapis.github.io/api-common-java/ + + + + + + diff --git a/src/main/java/com/google/cloud/resourcemanager/ConstraintInfo.java b/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/ConstraintInfo.java similarity index 100% rename from src/main/java/com/google/cloud/resourcemanager/ConstraintInfo.java rename to google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/ConstraintInfo.java diff --git a/src/main/java/com/google/cloud/resourcemanager/Option.java b/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/Option.java similarity index 100% rename from src/main/java/com/google/cloud/resourcemanager/Option.java rename to google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/Option.java diff --git a/src/main/java/com/google/cloud/resourcemanager/OrgPolicyInfo.java b/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/OrgPolicyInfo.java similarity index 100% rename from src/main/java/com/google/cloud/resourcemanager/OrgPolicyInfo.java rename to google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/OrgPolicyInfo.java diff --git a/src/main/java/com/google/cloud/resourcemanager/PolicyMarshaller.java b/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/PolicyMarshaller.java similarity index 100% rename from src/main/java/com/google/cloud/resourcemanager/PolicyMarshaller.java rename to google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/PolicyMarshaller.java diff --git a/src/main/java/com/google/cloud/resourcemanager/Project.java b/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/Project.java similarity index 100% rename from src/main/java/com/google/cloud/resourcemanager/Project.java rename to google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/Project.java diff --git a/src/main/java/com/google/cloud/resourcemanager/ProjectInfo.java b/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/ProjectInfo.java similarity index 100% rename from src/main/java/com/google/cloud/resourcemanager/ProjectInfo.java rename to google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/ProjectInfo.java diff --git a/src/main/java/com/google/cloud/resourcemanager/ResourceManager.java b/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/ResourceManager.java similarity index 100% rename from src/main/java/com/google/cloud/resourcemanager/ResourceManager.java rename to google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/ResourceManager.java diff --git a/src/main/java/com/google/cloud/resourcemanager/ResourceManagerException.java b/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/ResourceManagerException.java similarity index 100% rename from src/main/java/com/google/cloud/resourcemanager/ResourceManagerException.java rename to google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/ResourceManagerException.java diff --git a/src/main/java/com/google/cloud/resourcemanager/ResourceManagerFactory.java b/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/ResourceManagerFactory.java similarity index 100% rename from src/main/java/com/google/cloud/resourcemanager/ResourceManagerFactory.java rename to google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/ResourceManagerFactory.java diff --git a/src/main/java/com/google/cloud/resourcemanager/ResourceManagerImpl.java b/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/ResourceManagerImpl.java similarity index 100% rename from src/main/java/com/google/cloud/resourcemanager/ResourceManagerImpl.java rename to google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/ResourceManagerImpl.java diff --git a/src/main/java/com/google/cloud/resourcemanager/ResourceManagerOptions.java b/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/ResourceManagerOptions.java similarity index 100% rename from src/main/java/com/google/cloud/resourcemanager/ResourceManagerOptions.java rename to google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/ResourceManagerOptions.java diff --git a/src/main/java/com/google/cloud/resourcemanager/package-info.java b/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/package-info.java similarity index 100% rename from src/main/java/com/google/cloud/resourcemanager/package-info.java rename to google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/package-info.java diff --git a/src/main/java/com/google/cloud/resourcemanager/spi/ResourceManagerRpcFactory.java b/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/spi/ResourceManagerRpcFactory.java similarity index 100% rename from src/main/java/com/google/cloud/resourcemanager/spi/ResourceManagerRpcFactory.java rename to google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/spi/ResourceManagerRpcFactory.java diff --git a/src/main/java/com/google/cloud/resourcemanager/spi/v1beta1/HttpResourceManagerRpc.java b/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/spi/v1beta1/HttpResourceManagerRpc.java similarity index 100% rename from src/main/java/com/google/cloud/resourcemanager/spi/v1beta1/HttpResourceManagerRpc.java rename to google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/spi/v1beta1/HttpResourceManagerRpc.java diff --git a/src/main/java/com/google/cloud/resourcemanager/spi/v1beta1/ResourceManagerRpc.java b/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/spi/v1beta1/ResourceManagerRpc.java similarity index 100% rename from src/main/java/com/google/cloud/resourcemanager/spi/v1beta1/ResourceManagerRpc.java rename to google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/spi/v1beta1/ResourceManagerRpc.java diff --git a/src/main/java/com/google/cloud/resourcemanager/testing/LocalResourceManagerHelper.java b/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/testing/LocalResourceManagerHelper.java similarity index 100% rename from src/main/java/com/google/cloud/resourcemanager/testing/LocalResourceManagerHelper.java rename to google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/testing/LocalResourceManagerHelper.java diff --git a/src/main/java/com/google/cloud/resourcemanager/testing/package-info.java b/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/testing/package-info.java similarity index 100% rename from src/main/java/com/google/cloud/resourcemanager/testing/package-info.java rename to google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/testing/package-info.java diff --git a/src/test/java/com/google/cloud/resourcemanager/ConstraintInfoTest.java b/google-cloud-resourcemanager/src/test/java/com/google/cloud/resourcemanager/ConstraintInfoTest.java similarity index 100% rename from src/test/java/com/google/cloud/resourcemanager/ConstraintInfoTest.java rename to google-cloud-resourcemanager/src/test/java/com/google/cloud/resourcemanager/ConstraintInfoTest.java diff --git a/src/test/java/com/google/cloud/resourcemanager/OptionTest.java b/google-cloud-resourcemanager/src/test/java/com/google/cloud/resourcemanager/OptionTest.java similarity index 100% rename from src/test/java/com/google/cloud/resourcemanager/OptionTest.java rename to google-cloud-resourcemanager/src/test/java/com/google/cloud/resourcemanager/OptionTest.java diff --git a/src/test/java/com/google/cloud/resourcemanager/OrgPolicyInfoTest.java b/google-cloud-resourcemanager/src/test/java/com/google/cloud/resourcemanager/OrgPolicyInfoTest.java similarity index 100% rename from src/test/java/com/google/cloud/resourcemanager/OrgPolicyInfoTest.java rename to google-cloud-resourcemanager/src/test/java/com/google/cloud/resourcemanager/OrgPolicyInfoTest.java diff --git a/src/test/java/com/google/cloud/resourcemanager/PolicyMarshallerTest.java b/google-cloud-resourcemanager/src/test/java/com/google/cloud/resourcemanager/PolicyMarshallerTest.java similarity index 100% rename from src/test/java/com/google/cloud/resourcemanager/PolicyMarshallerTest.java rename to google-cloud-resourcemanager/src/test/java/com/google/cloud/resourcemanager/PolicyMarshallerTest.java diff --git a/src/test/java/com/google/cloud/resourcemanager/ProjectInfoTest.java b/google-cloud-resourcemanager/src/test/java/com/google/cloud/resourcemanager/ProjectInfoTest.java similarity index 100% rename from src/test/java/com/google/cloud/resourcemanager/ProjectInfoTest.java rename to google-cloud-resourcemanager/src/test/java/com/google/cloud/resourcemanager/ProjectInfoTest.java diff --git a/src/test/java/com/google/cloud/resourcemanager/ProjectTest.java b/google-cloud-resourcemanager/src/test/java/com/google/cloud/resourcemanager/ProjectTest.java similarity index 100% rename from src/test/java/com/google/cloud/resourcemanager/ProjectTest.java rename to google-cloud-resourcemanager/src/test/java/com/google/cloud/resourcemanager/ProjectTest.java diff --git a/src/test/java/com/google/cloud/resourcemanager/ResourceManagerExceptionTest.java b/google-cloud-resourcemanager/src/test/java/com/google/cloud/resourcemanager/ResourceManagerExceptionTest.java similarity index 100% rename from src/test/java/com/google/cloud/resourcemanager/ResourceManagerExceptionTest.java rename to google-cloud-resourcemanager/src/test/java/com/google/cloud/resourcemanager/ResourceManagerExceptionTest.java diff --git a/src/test/java/com/google/cloud/resourcemanager/ResourceManagerImplTest.java b/google-cloud-resourcemanager/src/test/java/com/google/cloud/resourcemanager/ResourceManagerImplTest.java similarity index 100% rename from src/test/java/com/google/cloud/resourcemanager/ResourceManagerImplTest.java rename to google-cloud-resourcemanager/src/test/java/com/google/cloud/resourcemanager/ResourceManagerImplTest.java diff --git a/src/test/java/com/google/cloud/resourcemanager/ResourceManagerOptionsTest.java b/google-cloud-resourcemanager/src/test/java/com/google/cloud/resourcemanager/ResourceManagerOptionsTest.java similarity index 100% rename from src/test/java/com/google/cloud/resourcemanager/ResourceManagerOptionsTest.java rename to google-cloud-resourcemanager/src/test/java/com/google/cloud/resourcemanager/ResourceManagerOptionsTest.java diff --git a/src/test/java/com/google/cloud/resourcemanager/SerializationTest.java b/google-cloud-resourcemanager/src/test/java/com/google/cloud/resourcemanager/SerializationTest.java similarity index 100% rename from src/test/java/com/google/cloud/resourcemanager/SerializationTest.java rename to google-cloud-resourcemanager/src/test/java/com/google/cloud/resourcemanager/SerializationTest.java diff --git a/src/test/java/com/google/cloud/resourcemanager/it/ITSystemTest.java b/google-cloud-resourcemanager/src/test/java/com/google/cloud/resourcemanager/it/ITSystemTest.java similarity index 100% rename from src/test/java/com/google/cloud/resourcemanager/it/ITSystemTest.java rename to google-cloud-resourcemanager/src/test/java/com/google/cloud/resourcemanager/it/ITSystemTest.java diff --git a/src/test/java/com/google/cloud/resourcemanager/testing/LocalResourceManagerHelperTest.java b/google-cloud-resourcemanager/src/test/java/com/google/cloud/resourcemanager/testing/LocalResourceManagerHelperTest.java similarity index 100% rename from src/test/java/com/google/cloud/resourcemanager/testing/LocalResourceManagerHelperTest.java rename to google-cloud-resourcemanager/src/test/java/com/google/cloud/resourcemanager/testing/LocalResourceManagerHelperTest.java diff --git a/pom.xml b/pom.xml index 6a921a2b..dbf9c916 100644 --- a/pom.xml +++ b/pom.xml @@ -2,13 +2,13 @@ 4.0.0 com.google.cloud - google-cloud-resourcemanager - jar + google-cloud-resourcemanager-parent + pom 0.118.13-alpha-SNAPSHOT - Google Cloud Resource Manager + Google Resource Manager API Parent https://github.com/googleapis/java-resourcemanager - Java idiomatic client for Google Cloud Resource Manager + Java idiomatic client for Google Cloud Platform services. @@ -41,16 +41,6 @@ https://github.com/googleapis/java-resourcemanager/issues GitHub Issues - - - sonatype-nexus-snapshots - https://oss.sonatype.org/content/repositories/snapshots - - - sonatype-nexus-staging - https://oss.sonatype.org/service/local/staging/deploy/maven2/ - - Apache-2.0 @@ -72,6 +62,7 @@ google-cloud-resourcemanager 0.118.13-alpha-SNAPSHOT + com.google.cloud google-cloud-shared-dependencies @@ -79,93 +70,8 @@ pom import - - com.google.errorprone - error_prone_annotations - 2.5.1 - - - - com.google.api - api-common - - - org.threeten - threetenbp - - - com.google.apis - google-api-services-cloudresourcemanager - v1-rev20210328-1.31.0 - - - com.google.http-client - google-http-client-jackson2 - - - com.google.http-client - google-http-client - - - com.google.auth - google-auth-library-oauth2-http - - - com.google.cloud - google-cloud-core - - - com.google.cloud - google-cloud-core-http - - - com.google.guava - guava - - - com.google.api - gax - - - - junit - junit - 4.13.2 - test - - - org.easymock - easymock - 3.6 - test - - - org.objenesis - objenesis - - - - - org.mockito - mockito-all - 1.10.19 - test - - - org.objenesis - objenesis - 3.1 - test - - - com.google.cloud - google-cloud-core - test - test-jar - - @@ -174,13 +80,21 @@ org.apache.maven.plugins maven-dependency-plugin - org.objenesis:objenesis + + org.objenesis:objenesis + javax.annotation:javax.annotation-api + + + google-cloud-resourcemanager + google-cloud-resourcemanager-bom + + @@ -244,10 +158,10 @@ https://developers.google.com/protocol-buffers/docs/reference/java/ https://googleapis.dev/java/google-auth-library/latest/ https://googleapis.dev/java/gax/latest/ - https://googleapis.github.io/api-common-java/ + https://googleapis.github.io/api-common-java/${google.api-common.version}/apidocs/ - + \ No newline at end of file diff --git a/versions.txt b/versions.txt index 34ce36a5..2c3351c9 100644 --- a/versions.txt +++ b/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-resourcemanager:0.118.12-alpha:0.118.13-alpha-SNAPSHOT \ No newline at end of file +google-cloud-resourcemanager:0.118.12-alpha:0.118.13-alpha-SNAPSHOT