Bump rewrite-polyglot versions before and after release (#1069)

* Bump rewrite-polyglot versions before and after release

* Adjust expectations now that we export multiline values

Author: timtebeek

.github/workflows/bump-snapshots.yml

@@ -28,5 +28,5 @@ jobs:
 
       - name: bump-rewrite-properties-to-snapshots
         run: |
-          ./mvnw versions:update-properties -DincludeProperties=rewrite.version -DallowSnapshots=true
+          ./mvnw versions:update-properties -DincludeProperties=rewrite.version,rewrite-polyglot.version -DallowSnapshots=true
           git diff-index --quiet HEAD pom.xml || (git commit -m "Bump rewrite.version property" pom.xml && git push origin main)

.github/workflows/publish.yml

@@ -30,7 +30,7 @@ jobs:
 
       - name: bump-rewrite-properties-to-releases
         run: |
-          ./mvnw versions:update-properties -DincludeProperties=rewrite.version -DallowDowngrade=true
+          ./mvnw versions:update-properties -DincludeProperties=rewrite.version,rewrite-polyglot.version -DallowDowngrade=true
           git diff-index --quiet HEAD pom.xml || git commit -m "Bump rewrite.version property" pom.xml && rm -f pom.xml.versionsBackup
 
       - name: publish-release
@@ -60,5 +60,5 @@ jobs:
 
       - name: bump-rewrite-properties-to-snapshots
         run: |
-          ./mvnw versions:update-properties -DincludeProperties=rewrite.version -DallowSnapshots=true
+          ./mvnw versions:update-properties -DincludeProperties=rewrite.version,rewrite-polyglot.version -DallowSnapshots=true
           git diff-index --quiet HEAD pom.xml || (git commit -m "Bump rewrite.version property" pom.xml && git push origin main && rm -f pom.xml.versionsBackup)

pom.xml

@@ -63,6 +63,7 @@
     <properties>
         <!-- Pinned versions, as RELEASE would make it into the published pom.xml  -->
         <rewrite.version>8.66.0-SNAPSHOT</rewrite.version>
+        <rewrite-polyglot.version>2.8.0-SNAPSHOT</rewrite-polyglot.version>
 
         <!-- using 'ssh' url scheme by default, which assumes a human is performing git operations leveraging an ssh key -->
         <developerConnectionUrl>scm:git:ssh://[email protected]/openrewrite/rewrite-maven-plugin.git
@@ -162,48 +163,20 @@
         </dependency>
         <dependency>
             <groupId>org.openrewrite</groupId>
-            <artifactId>rewrite-xml</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.openrewrite</groupId>
-            <artifactId>rewrite-maven</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.openrewrite</groupId>
-            <artifactId>rewrite-hcl</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.openrewrite</groupId>
-            <artifactId>rewrite-json</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.openrewrite</groupId>
-            <artifactId>rewrite-properties</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.openrewrite</groupId>
-            <artifactId>rewrite-protobuf</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.openrewrite</groupId>
-            <artifactId>rewrite-toml</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.openrewrite</groupId>
-            <artifactId>rewrite-yaml</artifactId>
+            <artifactId>rewrite-kotlin</artifactId>
         </dependency>
         <dependency>
             <groupId>org.openrewrite</groupId>
-            <artifactId>rewrite-groovy</artifactId>
+            <artifactId>rewrite-xml</artifactId>
         </dependency>
         <dependency>
             <groupId>org.openrewrite</groupId>
-            <artifactId>rewrite-kotlin</artifactId>
+            <artifactId>rewrite-maven</artifactId>
         </dependency>
         <dependency>
             <groupId>org.openrewrite</groupId>
             <artifactId>rewrite-polyglot</artifactId>
-            <version>2.7.4</version>
+            <version>${rewrite-polyglot.version}</version>
         </dependency>
         <dependency>
             <groupId>org.codehaus.plexus</groupId>

src/test/java/org/openrewrite/maven/RewriteRunIT.java

@@ -219,7 +219,7 @@ void datatable_export(MavenExecutionResult result) throws Exception {
 
         // Get only the data rows (skip header and description rows)
         assertThat(lines.subList(2, lines.size()))
-          .hasSize(2)
+          .hasSizeGreaterThanOrEqualTo(2)
           .anySatisfy(line -> assertThat(line).contains("com.google.guava", "guava"))
           .anySatisfy(line -> assertThat(line).contains("org.projectlombok", "lombok"));
     }