feat: add the new version and the 10.2 base version

pentaho · Jan 13, 2025 · 8b630ec · 8b630ec
1 parent 0a77d13
commit 8b630ec
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml
@@ -17,10 +17,10 @@ jobs:
   reusable-merge-workflow:
     uses: pentaho/actions-common/.github/workflows/merge.yml@stable
     with:
-      version: "10.3.1.0"
-      base_version: "[10.3,10.4)"
+      base_version: "10.2.0.1-255"
       slack_channels: ""
       sonar_project_key: "pentaho-generic-file-system"
       modules_to_build: ${{ inputs.modules_to_build }}
       run_release_candidate: true
+      add_github_run_number: false
     secrets: inherit
diff --git a/api/pom.xml b/api/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>pentaho</groupId>
     <artifactId>pentaho-generic-file-system-parent</artifactId>
-    <version>10.3.0.0-SNAPSHOT</version>
+    <version>1.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>pentaho-generic-file-system-api</artifactId>

diff --git a/impl/pom.xml b/impl/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>pentaho</groupId>
     <artifactId>pentaho-generic-file-system-parent</artifactId>
-    <version>10.3.0.0-SNAPSHOT</version>
+    <version>1.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>pentaho-generic-file-system-impl</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -7,19 +7,19 @@
   <parent>
     <groupId>org.pentaho</groupId>
     <artifactId>pentaho-ce-jar-parent-pom</artifactId>
-    <version>10.3.0.0-SNAPSHOT</version>
+    <version>10.2.0.0-SNAPSHOT</version>
   </parent>
 
   <groupId>pentaho</groupId>
   <artifactId>pentaho-generic-file-system-parent</artifactId>
-  <version>10.3.0.0-SNAPSHOT</version>
+  <version>1.0.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <properties>
+    <platform.version>10.2.0.0-SNAPSHOT</platform.version>
     <mockito-core.version>4.0.0</mockito-core.version>
     <com.github.spotbugs.annotations.version>4.2.3</com.github.spotbugs.annotations.version>
     <artifactory-maven-plugin.version>3.6.1</artifactory-maven-plugin.version>
-    <platform.version>10.3.0.0-SNAPSHOT</platform.version>
   </properties>
 
   <dependencyManagement>