From 46942fbcc6cb3fc7eafd6ea8978d62668708c310 Mon Sep 17 00:00:00 2001
From: Marco Rizzi <mrizzi@users.noreply.github.com>
Date: Wed, 18 Jan 2023 16:50:16 +0100
Subject: [PATCH] Fixed Windup version to be '6.1.3-SNAPSHOT' (#107)

* Fixed Windup version to be '6.1.3-SNAPSHOT'

* Added the branch to checkout action

* Added windup-maven-plugin build

* Added windup-rulesets build
---
 .github/workflows/pr-build-jdk11.yaml         | 22 +++++++++++++++----
 ejb-beanutils-async/pom.xml                   |  2 +-
 ejb-beanutils-async/rules-java/pom.xml        |  2 +-
 maven-plugin-usage/pom.xml                    |  4 ++--
 pom.xml                                       |  2 +-
 proprietary-javaee-servlet/pom.xml            |  2 +-
 proprietary-javaee-servlet/rules-java/pom.xml |  2 +-
 victi.ms/pom.xml                              |  4 ++--
 8 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/pr-build-jdk11.yaml b/.github/workflows/pr-build-jdk11.yaml
index 12b4bd5..fbf1e48 100644
--- a/.github/workflows/pr-build-jdk11.yaml
+++ b/.github/workflows/pr-build-jdk11.yaml
@@ -20,7 +20,20 @@ jobs:
         with:
           repository: windup/windup
           path: windup
-      - name: Checkout windup repo
+          ref: ${{ github.base_ref }}
+      - name: Checkout windup-maven-plugin repo
+        uses: actions/checkout@v3
+        with:
+          repository: windup/windup-maven-plugin
+          path: windup-maven-plugin
+          ref: ${{ github.base_ref }}
+      - name: Checkout windup-rulesets repo
+        uses: actions/checkout@v3
+        with:
+          repository: windup/windup-rulesets
+          path: windup-rulesets
+          ref: ${{ github.base_ref }}
+      - name: Checkout windup-quickstarts repo
         uses: actions/checkout@v3
         with:
           path: windup-quickstarts
@@ -33,8 +46,9 @@ jobs:
           cache: 'maven'
       - name: Build Windup on JDK 11
         run: mvn -B clean install -DskipTests -f windup
+      - name: Build Windup Rules on JDK 11
+        run: mvn -B clean install -DskipTests -f windup-rulesets
+      - name: Build Windup Maven Plugin on JDK 11
+        run: mvn -B clean install -DskipTests -f windup-maven-plugin
       - name: Build on JDK 11
         run: mvn -B clean install -s ./windup-quickstarts/settings.xml -DskipTests -f windup-quickstarts && mvn -B clean install -s ./windup-quickstarts/settings.xml -f windup-quickstarts
-        
-        
-        
diff --git a/ejb-beanutils-async/pom.xml b/ejb-beanutils-async/pom.xml
index b19e4fe..c3a9662 100644
--- a/ejb-beanutils-async/pom.xml
+++ b/ejb-beanutils-async/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <properties>
-        <version.windup>6.1.1.Final</version.windup>
+        <version.windup>6.1.3-SNAPSHOT</version.windup>
     </properties>
 
     <groupId>org.jboss.windup.quickstarts</groupId>
diff --git a/ejb-beanutils-async/rules-java/pom.xml b/ejb-beanutils-async/rules-java/pom.xml
index d56d09d..d2d8932 100644
--- a/ejb-beanutils-async/rules-java/pom.xml
+++ b/ejb-beanutils-async/rules-java/pom.xml
@@ -12,7 +12,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>1.7</maven.compiler.source>
         <maven.compiler.target>1.7</maven.compiler.target>
-        <version.windup>6.1.1.Final</version.windup>
+        <version.windup>6.1.3-SNAPSHOT</version.windup>
     </properties>
 
     <dependencyManagement>
diff --git a/maven-plugin-usage/pom.xml b/maven-plugin-usage/pom.xml
index fdf5d16..fe807b6 100644
--- a/maven-plugin-usage/pom.xml
+++ b/maven-plugin-usage/pom.xml
@@ -23,8 +23,8 @@
     </scm>
 
     <properties>
-        <version.windup>6.1.1.Final</version.windup>
-        <version.windup-maven-plugin>6.1.1.Final</version.windup-maven-plugin>
+        <version.windup>6.1.3-SNAPSHOT</version.windup>
+        <version.windup-maven-plugin>6.1.3-SNAPSHOT</version.windup-maven-plugin>
         <maven.compiler.source>11</maven.compiler.source>
         <maven.compiler.target>11</maven.compiler.target>
     </properties>
diff --git a/pom.xml b/pom.xml
index 5c240b9..07007fe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <properties>
-        <version.windup>6.1.1.Final</version.windup>
+        <version.windup>6.1.3-SNAPSHOT</version.windup>
     </properties>
 
     <parent>
diff --git a/proprietary-javaee-servlet/pom.xml b/proprietary-javaee-servlet/pom.xml
index daa9ff1..d355fd5 100644
--- a/proprietary-javaee-servlet/pom.xml
+++ b/proprietary-javaee-servlet/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <properties>
-        <version.windup>6.1.1.Final</version.windup>
+        <version.windup>6.1.3-SNAPSHOT</version.windup>
     </properties>
 
     <groupId>org.jboss.windup.quickstarts</groupId>
diff --git a/proprietary-javaee-servlet/rules-java/pom.xml b/proprietary-javaee-servlet/rules-java/pom.xml
index deaeb87..4e13c6f 100644
--- a/proprietary-javaee-servlet/rules-java/pom.xml
+++ b/proprietary-javaee-servlet/rules-java/pom.xml
@@ -13,7 +13,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
-        <version.windup>6.1.1.Final</version.windup>
+        <version.windup>6.1.3-SNAPSHOT</version.windup>
     </properties>
 
     <dependencyManagement>
diff --git a/victi.ms/pom.xml b/victi.ms/pom.xml
index 5ab1719..5e83e91 100644
--- a/victi.ms/pom.xml
+++ b/victi.ms/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>org.jboss.windup.quickstarts</groupId>
     <artifactId>windup-victims</artifactId>
-    <version>6.1.1.Final</version>
+    <version>6.1.3-SNAPSHOT</version>
 
     <name>Windup Quickstart: Victi.ms Ruleset</name>
 
@@ -12,7 +12,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
-        <version.windup>6.1.1.Final</version.windup>
+        <version.windup>6.1.3-SNAPSHOT</version.windup>
     </properties>
 
     <dependencyManagement>