From 9475667d28e935dacb5a621f798b292374fbdd2a Mon Sep 17 00:00:00 2001
From: Haroon Sheikh <haroon.sheikh@sky.uk>
Date: Mon, 8 Apr 2024 14:13:06 +0100
Subject: [PATCH] Updates gauge dependencies in archetypes

---
 .github/workflows/publish.yml                    |  8 ++++----
 .github/workflows/tests.yml                      | 16 +++++++++++-----
 gauge-archetype-java/pom.xml                     |  3 +--
 .../main/resources/archetype-resources/pom.xml   |  6 +++---
 .../resources/projects/test1/reference/pom.xml   |  6 +++---
 gauge-archetype-selenium/pom.xml                 |  3 +--
 .../main/resources/archetype-resources/pom.xml   |  6 +++---
 .../resources/projects/test1/reference/pom.xml   |  6 +++---
 pom.xml                                          |  2 +-
 9 files changed, 30 insertions(+), 26 deletions(-)

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index a653adf..0dc3458 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -13,11 +13,11 @@ jobs:
       password: '${{ secrets.maven_deploy_password }}'
       passphrase: '${{ secrets.gpg_passphrase }}'
     steps:
-      - uses: actions/checkout@v1
-      - name: Set up JDK
-        uses: actions/setup-java@v1
+      - uses: actions/checkout@v4
+      - uses: actions/setup-java@v4
         with:
-          java-version: '12.x.x'
+          distribution: 'temurin'
+          java-version: '11'
 
       - name: setup
         run: |
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 51b20bf..3288bef 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -1,5 +1,11 @@
 name: tests
-on: [push, pull_request]
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
 
 jobs:
   test:
@@ -10,12 +16,12 @@ jobs:
         os: [ubuntu-latest, macos-latest, windows-latest]
     steps:
 
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v4
 
-      - name: Setup java
-        uses: actions/setup-java@v1
+      - uses: actions/setup-java@v4
         with:
-          java-version: 11.x.x
+          distribution: 'temurin'
+          java-version: '11'
 
       - name: Run test
         run: |
diff --git a/gauge-archetype-java/pom.xml b/gauge-archetype-java/pom.xml
index 6ddcb9a..37196f3 100644
--- a/gauge-archetype-java/pom.xml
+++ b/gauge-archetype-java/pom.xml
@@ -5,12 +5,11 @@
     <parent>
         <groupId>com.thoughtworks.gauge.maven</groupId>
         <artifactId>gauge-mvn-archetypes</artifactId>
-        <version>1.5.9</version>
+        <version>1.6.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>gauge-archetype-java</artifactId>
-    <version>1.5.9</version>
     <name>Archetype - gauge-archetype-java</name>
     <description>Archetype for Gauge Java</description>
     <url>http://github.com/getgauge/gauge-mvn-archetypes</url>
diff --git a/gauge-archetype-java/src/main/resources/archetype-resources/pom.xml b/gauge-archetype-java/src/main/resources/archetype-resources/pom.xml
index 2659f0a..523c27a 100644
--- a/gauge-archetype-java/src/main/resources/archetype-resources/pom.xml
+++ b/gauge-archetype-java/src/main/resources/archetype-resources/pom.xml
@@ -10,13 +10,13 @@
         <dependency>
             <groupId>com.thoughtworks.gauge</groupId>
             <artifactId>gauge-java</artifactId>
-            <version>[0.6.8,)</version>
+            <version>[0.10.3,)</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
-            <version>3.10.0</version>
+            <version>3.25.3</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -35,7 +35,7 @@
             <plugin>
                 <groupId>com.thoughtworks.gauge.maven</groupId>
                 <artifactId>gauge-maven-plugin</artifactId>
-                <version>1.4.3</version>
+                <version>1.6.3</version>
                 <executions>
                     <execution>
                         <phase>test</phase>
diff --git a/gauge-archetype-java/src/test/resources/projects/test1/reference/pom.xml b/gauge-archetype-java/src/test/resources/projects/test1/reference/pom.xml
index 323b3c6..ff8b289 100644
--- a/gauge-archetype-java/src/test/resources/projects/test1/reference/pom.xml
+++ b/gauge-archetype-java/src/test/resources/projects/test1/reference/pom.xml
@@ -10,13 +10,13 @@
         <dependency>
             <groupId>com.thoughtworks.gauge</groupId>
             <artifactId>gauge-java</artifactId>
-            <version>[0.6.8,)</version>
+            <version>[0.10.3,)</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
-            <version>3.10.0</version>
+            <version>3.25.3</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -35,7 +35,7 @@
             <plugin>
                 <groupId>com.thoughtworks.gauge.maven</groupId>
                 <artifactId>gauge-maven-plugin</artifactId>
-                <version>1.4.3</version>
+                <version>1.6.3</version>
                 <executions>
                     <execution>
                         <phase>test</phase>
diff --git a/gauge-archetype-selenium/pom.xml b/gauge-archetype-selenium/pom.xml
index 79b4f0e..0c78700 100644
--- a/gauge-archetype-selenium/pom.xml
+++ b/gauge-archetype-selenium/pom.xml
@@ -5,12 +5,11 @@
     <parent>
         <groupId>com.thoughtworks.gauge.maven</groupId>
         <artifactId>gauge-mvn-archetypes</artifactId>
-        <version>1.5.9</version>
+        <version>1.6.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>gauge-archetype-selenium</artifactId>
-    <version>1.5.9</version>
     <name>Archetype - gauge-archetype-selenium</name>
     <description>Archetype for Gauge Java with Selenium</description>
     <url>http://github.com/getgauge/gauge-mvn-archetypes</url>
diff --git a/gauge-archetype-selenium/src/main/resources/archetype-resources/pom.xml b/gauge-archetype-selenium/src/main/resources/archetype-resources/pom.xml
index 843922f..109c365 100644
--- a/gauge-archetype-selenium/src/main/resources/archetype-resources/pom.xml
+++ b/gauge-archetype-selenium/src/main/resources/archetype-resources/pom.xml
@@ -10,13 +10,13 @@
         <dependency>
             <groupId>com.thoughtworks.gauge</groupId>
             <artifactId>gauge-java</artifactId>
-            <version>[0.6.8,)</version>
+            <version>[0.10.3,)</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
-            <version>3.10.0</version>
+            <version>3.25.3</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -51,7 +51,7 @@
             <plugin>
                 <groupId>com.thoughtworks.gauge.maven</groupId>
                 <artifactId>gauge-maven-plugin</artifactId>
-                <version>1.4.3</version>
+                <version>1.6.3</version>
                 <executions>
                     <execution>
                         <phase>test</phase>
diff --git a/gauge-archetype-selenium/src/test/resources/projects/test1/reference/pom.xml b/gauge-archetype-selenium/src/test/resources/projects/test1/reference/pom.xml
index 56eb5af..269e7df 100644
--- a/gauge-archetype-selenium/src/test/resources/projects/test1/reference/pom.xml
+++ b/gauge-archetype-selenium/src/test/resources/projects/test1/reference/pom.xml
@@ -10,13 +10,13 @@
         <dependency>
             <groupId>com.thoughtworks.gauge</groupId>
             <artifactId>gauge-java</artifactId>
-            <version>[0.6.8,)</version>
+            <version>[0.10.3,)</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
-            <version>3.10.0</version>
+            <version>3.25.3</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -51,7 +51,7 @@
             <plugin>
                 <groupId>com.thoughtworks.gauge.maven</groupId>
                 <artifactId>gauge-maven-plugin</artifactId>
-                <version>1.4.3</version>
+                <version>1.6.3</version>
                 <executions>
                     <execution>
                         <phase>test</phase>
diff --git a/pom.xml b/pom.xml
index 7e9d4ec..e8a960a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>com.thoughtworks.gauge.maven</groupId>
     <artifactId>gauge-mvn-archetypes</artifactId>
-    <version>1.5.9</version>
+    <version>1.6.0</version>
     <packaging>pom</packaging>
 
     <name>Gauge Maven Archetypes</name>