fix: fixed non-GA logic for gapic-bom (#8631)

Fixes https://togithub.com/googleapis/google-cloud-java/issues/8629
googleapis · Oct 18, 2022 · a959a35 · a959a35
1 parent 832c898
commit a959a35
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 7 deletions.
diff --git a/gapic-libraries-bom/pom.xml b/gapic-libraries-bom/pom.xml
@@ -190,6 +190,13 @@
         <type>pom</type>
         <scope>import</scope>
       </dependency>
+      <dependency>
+        <groupId>com.google.cloud</groupId>
+        <artifactId>google-cloud-datalabeling-bom</artifactId>
+        <version>0.124.0</version><!-- {x-version-update:google-cloud-datalabeling:current} -->
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
       <dependency>
         <groupId>com.google.cloud</groupId>
         <artifactId>google-cloud-dataplex-bom</artifactId>
@@ -267,6 +274,13 @@
         <type>pom</type>
         <scope>import</scope>
       </dependency>
+      <dependency>
+        <groupId>com.google.cloud</groupId>
+        <artifactId>google-cloud-errorreporting-bom</artifactId>
+        <version>0.125.0-beta</version><!-- {x-version-update:google-cloud-errorreporting:current} -->
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
       <dependency>
         <groupId>com.google.cloud</groupId>
         <artifactId>google-cloud-essential-contacts-bom</artifactId>
@@ -365,6 +379,13 @@
         <type>pom</type>
         <scope>import</scope>
       </dependency>
+      <dependency>
+        <groupId>com.google.cloud</groupId>
+        <artifactId>google-cloud-mediatranslation-bom</artifactId>
+        <version>0.10.0</version><!-- {x-version-update:google-cloud-mediatranslation:current} -->
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
       <dependency>
         <groupId>com.google.cloud</groupId>
         <artifactId>google-cloud-memcache-bom</artifactId>
@@ -442,6 +463,13 @@
         <type>pom</type>
         <scope>import</scope>
       </dependency>
+      <dependency>
+        <groupId>com.google.cloud</groupId>
+        <artifactId>google-cloud-phishingprotection-bom</artifactId>
+        <version>0.35.0</version><!-- {x-version-update:google-cloud-phishingprotection:current} -->
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
       <dependency>
         <groupId>com.google.cloud</groupId>
         <artifactId>google-cloud-policy-troubleshooter-bom</artifactId>

diff --git a/generation/generate_gapic_bom.sh b/generation/generate_gapic_bom.sh
@@ -12,24 +12,22 @@ for bom_directory in $(find . -maxdepth 3 -name 'google-*-bom' | sort --dictiona
   fi
   repo_metadata="${bom_directory}/../.repo-metadata.json"
 
+  pom_file="${bom_directory}/pom.xml"
+  groupId_line=$(grep --max-count=1 'groupId' "${pom_file}")
+  artifactId_line=$(grep --max-count=1 'artifactId' "${pom_file}")
+  version_line=$(grep --max-count=1 'x-version-update' "${pom_file}")
+
   if ! grep --quiet '"release_level": "stable"' "${repo_metadata}"; then
     # Not including non-GA libraries, except those that happened to be included
     # already in google-cloud-bom.
     if [[ $artifactId_line != *"google-cloud-datalabeling"* ]] \
         && [[ $artifactId_line != *"google-cloud-errorreporting"* ]] \
-        && [[ $artifactId_line != *"google-cloud-logging-logback"* ]] \
         && [[ $artifactId_line != *"google-cloud-mediatranslation"* ]] \
-        && [[ $artifactId_line != *"google-cloud-nio"* ]] \
-        && [[ $artifactId_line != *"google-cloud-notification"* ]] \
         && [[ $artifactId_line != *"google-cloud-phishingprotection"* ]]; then
       echo "Not adding ${pom_file} to the BOM because it's not stable."
       continue
     fi
   fi
-  pom_file="${bom_directory}/pom.xml"
-  groupId_line=$(grep --max-count=1 'groupId' "${pom_file}")
-  artifactId_line=$(grep --max-count=1 'artifactId' "${pom_file}")
-  version_line=$(grep --max-count=1 'x-version-update' "${pom_file}")
 
   bom_lines+="      <dependency>\n\
       ${groupId_line}\n\