Merge branch 'release-2.12.x' into TASK-5482

opencb · Jan 26, 2024 · 874b0df · 874b0df
2 parents 9eaef09 + 86026da
commit 874b0df
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 6 deletions.
diff --git a/.github/workflows/scripts/get_same_branch.sh b/.github/workflows/scripts/get_same_branch.sh
@@ -7,10 +7,6 @@ if [[ -z $BRANCH_NAME  ]]; then
   exit 1
 fi
 
-if [[ $BRANCH_NAME != "TASK-"*   ]]; then
-  echo "No need to check dependencies."
-  exit 0
-fi
 
 function install(){
   local REPO=$1

diff --git a/.github/workflows/test-analysis.yml b/.github/workflows/test-analysis.yml
@@ -27,7 +27,7 @@ jobs:
         uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
-          java-version: '11'
+          java-version: '17'
           cache: 'maven'
       - name: Install dependencies branches
         run: |

diff --git a/opencga-server/pom.xml b/opencga-server/pom.xml
@@ -252,7 +252,6 @@
         <plugins>
             <plugin>
                 <artifactId>maven-war-plugin</artifactId>
-                <version>2.6</version>
                 <configuration>
                     <warName>${opencga.war.name}</warName>
                     <!--

diff --git a/pom.xml b/pom.xml
@@ -146,6 +146,8 @@
         <servlet-api.version>2.5-20081211</servlet-api.version>
 
         <kryo.version>2.23.0</kryo.version>
+        <lombok.version>1.18.30</lombok.version>
+        <maven-war-plugin.version>3.4.0</maven-war-plugin.version>
     </properties>
 
     <scm>
@@ -987,6 +989,12 @@
                 <artifactId>grep4j</artifactId>
                 <version>${grep4j.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.projectlombok</groupId>
+                <artifactId>lombok</artifactId>
+                <version>${lombok.version}</version>
+                <scope>provided</scope>
+            </dependency>
             <dependency>
                 <groupId>org.redisson</groupId>
                 <artifactId>redisson</artifactId>
@@ -1087,6 +1095,7 @@
                 <artifactId>kryo</artifactId>
                 <version>${kryo.version}</version>
             </dependency>
+
         </dependencies>
     </dependencyManagement>
 
@@ -1111,6 +1120,11 @@
                     <artifactId>maven-surefire-report-plugin</artifactId>
                     <version>${maven-surefire-plugin.version}</version>
                 </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-war-plugin</artifactId>
+                    <version>${maven-war-plugin.version}</version>
+                </plugin>
             </plugins>
         </pluginManagement>