Merge branch 'issues/76_vaadin-24' into test/76_vaadin-24

mcollovati · Feb 3, 2024 · 1d1070c · 1d1070c
2 parents 9e26f91 + d8bf2e3
commit 1d1070c
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 293 deletions.
diff --git a/.circleci/.circleci.settings.xml b/.circleci/.circleci.settings.xml
diff --git a/.circleci/config.yml.old b/.circleci/config.yml.old
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -10,6 +10,7 @@ on:
         default: 'development'
         options:
         - "development"
+        - "vaadin-23"
       version:
         description: "Version to release (e.g. 1.1.0 or 1.2.0-alpha1)"
         required: true
@@ -65,11 +66,11 @@ jobs:
              | tee -a  $GITHUB_STEP_SUMMARY
             exit 1
           fi
-          #if [[ "${{ inputs.target-branch }}" != "development" && ! "${{ inputs.version }}" = "${{ inputs.target-branch }}."* ]]; then
-          #  echo "🚫 Invalid version specified: '${{ inputs.version }}' does not match the release branch '${{ inputs.target-branch }}'." \
-          #   | tee -a  $GITHUB_STEP_SUMMARY
-          #  exit 1
-          #fi
+          if [[ "${{ inputs.target-branch }}" != "development" && ! "vaadin-${{ inputs.version }}" = "${{ inputs.target-branch }}."* ]]; then
+            echo "🚫 Invalid version specified: '${{ inputs.version }}' does not match the release branch '${{ inputs.target-branch }}'." \
+             | tee -a  $GITHUB_STEP_SUMMARY
+            exit 1
+          fi
           if git rev-parse -q --verify "refs/tags/flow-${{ inputs.version }}" > /dev/null; then
             echo "🚫 Version '${{ inputs.version }}' already exists. Please choose a different version." \
              | tee -a  $GITHUB_STEP_SUMMARY

diff --git a/pom.xml b/pom.xml
@@ -519,7 +519,7 @@
                                         </changelog>
                                         <draft>false</draft>
                                         <tagName>flow-{{projectVersion}}</tagName>
-                                        <releaseName>Release {{tagName}}</releaseName>
+                                        <releaseName>Release {{projectVersion}}</releaseName>
                                         <prerelease>
                                             <pattern>.*-(alpha|beta|rc)\d+</pattern>
                                         </prerelease>

diff --git a/tools/build_flow_widgetsets.sh b/tools/build_flow_widgetsets.sh
@@ -57,7 +57,7 @@ if [[ "$(curl -s -o /dev/null -w '%{http_code}' ${__base_url}/maven-metadata.xml
       | grep "<classifier>vaadin-" | sed -E 's/^.*<classifier>vaadin-(.*)<\/classifier>.*/\1/g' | sort -r -t '.' || echo '')
 else
   # Extract existing versions from directory listing
-  __pattern='href="vaadin-flow-sockjs-23.4.0-alpha1-vaadin-([^"]+)\.jar\"'
+  __pattern='href="vaadin-flow-sockjs-'${_current_version}'-vaadin-([^"]+)\.jar\"'
   __existing_classifiers=$(curl -s ${__base_url}/ | sed -E -e "/${__pattern}/!d" -e "s/.*${__pattern}.*/\1/g" || echo '')
 fi
 

diff --git a/vertx-vaadin-flow-jandex/pom.xml b/vertx-vaadin-flow-jandex/pom.xml
@@ -56,9 +56,9 @@
                 </executions>
             </plugin>
             <plugin>
-                <groupId>org.jboss.jandex</groupId>
+                <groupId>io.smallrye</groupId>
                 <artifactId>jandex-maven-plugin</artifactId>
-                <version>1.1.1</version>
+                <version>3.1.6</version>
                 <executions>
                     <execution>
                         <id>make-index</id>