Merge branch 'main' into 872_matchingset_opensearch

Author: naknomum

.github/workflows/codecov-report.yml

@@ -54,7 +54,7 @@ jobs:
 
       # Upload test results and coverage
       - name: Upload coverage results
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: test-results
           path: |
@@ -72,7 +72,7 @@ jobs:
 
       # Upload to Codecov
       - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v3
+        uses: codecov/codecov-action@v5
         with:
           token: ${{ secrets.CODECOV_TOKEN }} # Add Codecov token as a secret in GitHub
           files: |

.github/workflows/release-maven-publish.yml

@@ -4,11 +4,11 @@ on:
   release:
     types: [published]
 
-
 jobs:
   build:
     name: Maven build , deploy and release
     runs-on: ubuntu-latest
+    if: "!contains(github.event.head_commit.message, '[ci skip]')"
 
     steps:
     - uses: actions/checkout@v4
@@ -19,6 +19,15 @@ jobs:
         distribution: 'zulu'
         java-version: 8
 
+    - name: Release
+      uses: qcastel/[email protected]
+      env:
+        JAVA_HOME: /usr/lib/jvm/zulu-8/
+      with:
+        ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }}
+        maven-args: "-Dmaven.javadoc.skip=true -DskipTests -DskipITs -Ddockerfile.skip -DdockerCompose.skip"
+        release-branch-name: "main"
+
     - name: Build with Maven
       run: |
         mvn dependency:resolve -B -U

pom.xml

@@ -10,6 +10,7 @@
   <properties>
     <maven.compiler.source>1.8</maven.compiler.source>
     <maven.compiler.target>1.8</maven.compiler.target>
+    <maven-release-plugin.version>3.1.1</maven-release-plugin.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <datanucleus.version>4.2.0-release</datanucleus.version>
     <datanucleus.lib.scope>compile</datanucleus.lib.scope>
@@ -46,7 +47,6 @@
     </repository>
   </repositories>
 
-
   <dependencies>
     <dependency>
       <groupId>com.rabbitmq</groupId>
@@ -124,7 +124,6 @@
       <version>1.13.0</version>
     </dependency>
 
-
     <dependency>
       <groupId>org.scribe</groupId>
       <artifactId>scribe</artifactId>
@@ -248,9 +247,7 @@
     <dependency>
       <groupId>org.opensearch.client</groupId>
       <artifactId>opensearch-java</artifactId>
-      <!--
-      <version>2.9.1</version>
--->
+      <!-- <version>2.9.1</version> -->
       <version>2.10.3</version>
     </dependency>
 
@@ -412,7 +409,6 @@
       <version>1.4.01</version>
     </dependency>
 
-
     <dependency>
       <groupId>jstl</groupId>
       <artifactId>jstl</artifactId>
@@ -548,6 +544,13 @@
 
   </dependencies>
 
+  <scm>
+    <connection>scm:git:${project.scm.url}</connection>
+    <developerConnection>scm:git:${project.scm.url}</developerConnection>
+    <url>[email protected]:WildMeOrg/Wildbook.git</url>
+    <tag>HEAD</tag>
+  </scm>
+
   <build>
     <resources>
       <resource>
@@ -557,13 +560,21 @@
     </resources>
 
     <plugins>
+      <plugin>
+        <artifactId>maven-release-plugin</artifactId>
+        <version>${maven-release-plugin.version}</version>
+        <configuration>
+          <scmCommentPrefix>[ci skip]</scmCommentPrefix>
+        </configuration>
+      </plugin>
+
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
         <version>3.6.1</version>
       </plugin>
 
-<plugin>
+      <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
         <version>2.19</version>
         <dependencies>
@@ -573,7 +584,7 @@
                 <version>1.0.0</version>
             </dependency>
         </dependencies>
-    </plugin>
+      </plugin>
 
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
@@ -634,26 +645,26 @@
         </executions>
       </plugin>
 
-    <plugin>
-      <groupId>org.jacoco</groupId>
-      <artifactId>jacoco-maven-plugin</artifactId>
-      <version>0.8.8</version>
-      <executions>
-        <execution>
-          <goals>
-            <goal>prepare-agent</goal>
-          </goals>
-        </execution>
-        <execution>
-          <id>report</id>
-          <phase>test</phase>
-          <goals>
-            <goal>report</goal>
-          </goals>
-        </execution>
-      </executions>
-    </plugin>
-      
+      <plugin>
+        <groupId>org.jacoco</groupId>
+        <artifactId>jacoco-maven-plugin</artifactId>
+        <version>0.8.8</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>prepare-agent</goal>
+            </goals>
+          </execution>
+          <execution>
+            <id>report</id>
+            <phase>test</phase>
+            <goals>
+              <goal>report</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+
       <plugin>
         <groupId>org.apache.tomcat.maven</groupId>
         <artifactId>tomcat7-maven-plugin</artifactId>