Merge branch 'master' of github.com:SaptarshiSarkar12/Drifty

SaptarshiSarkar12 · Jun 11, 2024 · b37e0ce · b37e0ce
2 parents 7a82283 + ede3812
commit b37e0ce
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 19 deletions.
diff --git a/.github/workflows/dev-docker-build.yml b/.github/workflows/dev-docker-build.yml
@@ -34,7 +34,7 @@ jobs:
           docker compose build runner
           docker compose build ${{ matrix.image_name_suffix }}
       - name: Run Trivy security scan
-        uses: aquasecurity/trivy-action@0.21.0
+        uses: aquasecurity/trivy-action@0.22.0
         continue-on-error: true
         with:
           image-ref: drifty-${{ matrix.image_name_suffix }}

diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
@@ -121,7 +121,7 @@ jobs:
       # Login to GitHub Container Registry
       # https://github.com/docker/login-action
       - name: Log into registry
-        uses: docker/login-action@v3.1.0
+        uses: docker/login-action@v3.2.0
         if: github.event_name != 'pull_request_target'
         with:
           registry: ${{ env.REGISTRY }}
@@ -163,7 +163,7 @@ jobs:
       # https://github.com/docker/build-push-action
       - name: Build and push Docker image
         id: build-and-push
-        uses: docker/build-push-action@v5.3.0
+        uses: docker/build-push-action@v5.4.0
         with:
           context: build/${{ matrix.docker_context }}
           push: ${{ github.event_name != 'pull_request_target' && github.repository == 'SaptarshiSarkar12/Drifty' && !contains(github.ref_name, 'dependabot') }}
@@ -182,7 +182,7 @@ jobs:
         run: docker build -t ${{ matrix.image_name }} -f Docker/prod/${{ matrix.docker_context }}/Dockerfile build/${{ matrix.docker_context }}
 
       - name: Run Trivy security scan
-        uses: aquasecurity/trivy-action@0.21.0
+        uses: aquasecurity/trivy-action@0.22.0
         continue-on-error: true
         with:
           image-ref: ${{ matrix.image_name }}

diff --git a/Website/package-lock.json b/Website/package-lock.json
diff --git a/Website/package.json b/Website/package.json
@@ -19,6 +19,6 @@
     "react-dom": "18.3.1",
     "remark": "^15.0.1",
     "remark-html": "^16.0.1",
-    "tailwindcss": "3.4.3"
+    "tailwindcss": "3.4.4"
   }
 }
diff --git a/pom.xml b/pom.xml
@@ -40,7 +40,7 @@
             <plugin>
                 <groupId>org.openrewrite.maven</groupId>
                 <artifactId>rewrite-maven-plugin</artifactId>
-                <version>5.32.1</version>
+                <version>5.33.0</version>
                 <configuration>
                     <activeRecipes>
                         <recipe>org.openrewrite.staticanalysis.CommonStaticAnalysis</recipe>
@@ -57,12 +57,12 @@
                     <dependency>
                         <groupId>org.openrewrite.recipe</groupId>
                         <artifactId>rewrite-static-analysis</artifactId>
-                        <version>1.8.1</version>
+                        <version>1.9.0</version>
                     </dependency>
                     <dependency>
                         <groupId>org.openrewrite.recipe</groupId>
                         <artifactId>rewrite-recommendations</artifactId>
-                        <version>1.4.3</version>
+                        <version>1.5.0</version>
                     </dependency>
                 </dependencies>
             </plugin>