Merge pull request #18 from shwetaverma14/fix-ci-workflows

Fix ci workflows

Author: shwetaverma14

.github/workflows/ci.yml

@@ -14,28 +14,42 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout Code
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
-
-      - name: Set up JDK 17 and Maven Cache
-        uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165
+      - name: Checkout code
+        uses: actions/checkout@v3
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+      
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
         with:
           java-version: "17"
           distribution: "temurin"
           cache: "maven"
-
+      
       - name: Install Groovy
         run: sudo apt-get update && sudo apt-get install -y groovy
-
-      - name: 1. Clone and Install apis-bom
+      
+      - name: Clone and build apis-bom
         run: |
           git clone https://github.com/hyphae/apis-bom.git ../apis-bom
-          mvn -B -f ../apis-bom/pom.xml clean install -DskipTests=true -Dmaven.test.failure.ignore=true
-
-      - name: 2. Clone and Install apis-common
+          cd ../apis-bom
+          mvn -B clean install
+      
+      - name: Clone and build apis-common
         run: |
           git clone https://github.com/hyphae/apis-common.git ../apis-common
-          mvn -B -f ../apis-common/pom.xml clean install -DskipTests=true -Dmaven.test.failure.ignore=true
-
-      - name: 3. Build and Test apis-main
+          cd ../apis-common
+          # Change version to 3.4.1 if needed (check what version apis-bom uses)
+          BOM_VERSION=$(grep -oP '<version>\K[^<]+' ../apis-bom/pom.xml | head -1)
+          sed -i "s/<version>3.0.0<\\/version>/<version>$BOM_VERSION<\\/version>/" pom.xml
+          mvn -B clean install
+      
+      - name: Build and test apis-log
         run: mvn -B clean verify
+      
+      - name: Test shell scripts
+        run: |
+          echo "Testing start.sh permissions..."
+          cd exe
+          chmod +x start.sh
+          ./start.sh

.github/workflows/codeql-analysis.yml

@@ -25,10 +25,10 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
+        uses: actions/checkout@v3
 
-      - name: Set up JDK 17 and Maven Cache
-        uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
         with:
           java-version: "17"
           distribution: "temurin"
@@ -38,23 +38,12 @@ jobs:
         run: sudo apt-get update && sudo apt-get install -y groovy
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@17783bfb99b07f70fae080b654aed0c514057477
+        uses: github/codeql-action/init@v2
         with:
           languages: ${{ matrix.language }}
 
-      - name: 1. Clone and Install apis-bom
-        run: |
-          git clone https://github.com/hyphae/apis-bom.git ../apis-bom
-          mvn -B -f ../apis-bom/pom.xml clean install -DskipTests=true -Dmaven.test.failure.ignore=true
-
-      - name: 2. Clone and Install apis-common
-        run: |
-          git clone https://github.com/hyphae/apis-common.git ../apis-common
-          mvn -B -f ../apis-common/pom.xml clean install -DskipTests=true -Dmaven.test.failure.ignore=true
-
-      - name: Build apis-main
-        run: mvn -B clean package -DskipTests
+      - name: Autobuild
+        uses: github/codeql-action/autobuild@v2
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@17783bfb99b07f70fae080b654aed0c514057477
-        continue-on-error: true
+        uses: github/codeql-action/analyze@v2

pom.xml

@@ -7,7 +7,7 @@
 
   <groupId>jp.co.sony.csl.dcoes.apis</groupId>
   <artifactId>apis-log</artifactId>
-  <version>3.0.0</version>
+  <version>3.4.1</version>
 
   <name>APIS LOG</name>
 
@@ -71,7 +71,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-shade-plugin</artifactId>
-        <version>3.0.0</version>
+        <version>3.4.1</version>
         <executions>
           <execution>
             <phase>package</phase>

src/main/java/jp/co/sony/csl/dcoes/apis/tools/log/LogReceiver.java

@@ -3,6 +3,7 @@
 import io.vertx.core.AbstractVerticle;
 import io.vertx.core.AsyncResult;
 import io.vertx.core.Future;
+import io.vertx.core.Promise;
 import io.vertx.core.Handler;
 import io.vertx.core.datagram.DatagramSocket;
 import io.vertx.core.datagram.DatagramSocketOptions;
@@ -40,27 +41,27 @@ public class LogReceiver extends AbstractVerticle {
 	 * Called during startup.
 	 * Calls initialization of MongoDB.
 	 * Calls initialization of network surroundings.
-	 * @param startFuture {@inheritDoc}
+	 * @param startPromise {@inheritDoc}
 	 * @throws Exception {@inheritDoc}
 	 * 起動時に呼び出される.
 	 * MongoDB の初期化を呼び出す.
 	 * ネットワークまわりの初期化を呼び出す.
-	 * @param startFuture {@inheritDoc}
+	 * @param startPromise {@inheritDoc}
 	 * @throws Exception {@inheritDoc}
 	 */
-	@Override public void start(Future<Void> startFuture) throws Exception {
+	@Override public void start(Promise<Void> startPromise) throws Exception {
 		MongoDbWriter.initialize(vertx, resInitializeMongoDbWriter -> {
 			if (resInitializeMongoDbWriter.succeeded()) {
 				startSocketService_(resSocket -> {
 					if (resSocket.succeeded()) {
 						if (log.isTraceEnabled()) log.trace("started : " + deploymentID());
-						startFuture.complete();
+						startPromise.complete();
 					} else {
-						startFuture.fail(resSocket.cause());
+						startPromise.fail(resSocket.cause());
 					}
 				});
 			} else {
-				startFuture.fail(resInitializeMongoDbWriter.cause());
+				startPromise.fail(resInitializeMongoDbWriter.cause());
 			}
 		});
 	}