From d6d02ede4b9ddf571a30fac65ee78180ef95c745 Mon Sep 17 00:00:00 2001
From: Misagh Moayyed <mm1844@gmail.com>
Date: Fri, 21 Jan 2022 12:39:16 +0400
Subject: [PATCH] Upgrade jib (#74)

---
 .mergify.yml                                  |  2 +-
 .../config/CasInitializrConfiguration.java    |  6 ++----
 .../LocalEtcCasDirectoryContributor.java      | 19 +++++++++++++++++++
 gradle.properties                             |  6 +++---
 4 files changed, 25 insertions(+), 8 deletions(-)
 create mode 100644 app/src/main/java/org/apereo/cas/initializr/contrib/LocalEtcCasDirectoryContributor.java

diff --git a/.mergify.yml b/.mergify.yml
index 82a6f6ea..e3025486 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -14,5 +14,5 @@ pull_request_rules:
   actions:
     merge:
       method: merge
-      strict: false
+    update:
     delete_head_branch:
\ No newline at end of file
diff --git a/app/src/main/java/org/apereo/cas/initializr/config/CasInitializrConfiguration.java b/app/src/main/java/org/apereo/cas/initializr/config/CasInitializrConfiguration.java
index f794192a..4d999b84 100644
--- a/app/src/main/java/org/apereo/cas/initializr/config/CasInitializrConfiguration.java
+++ b/app/src/main/java/org/apereo/cas/initializr/config/CasInitializrConfiguration.java
@@ -4,6 +4,7 @@
 import org.apereo.cas.initializr.contrib.ChainingMultipleResourcesProjectContributor;
 import org.apereo.cas.initializr.contrib.ChainingSingleResourceProjectContributor;
 import org.apereo.cas.initializr.contrib.IgnoreRulesContributor;
+import org.apereo.cas.initializr.contrib.LocalEtcCasDirectoryContributor;
 import org.apereo.cas.initializr.contrib.OverlayLombokConfigContributor;
 import org.apereo.cas.initializr.contrib.OverlayOverrideConfigurationContributor;
 import org.apereo.cas.initializr.contrib.OverlaySpringFactoriesContributor;
@@ -17,9 +18,7 @@
 import org.apereo.cas.initializr.contrib.heroku.HerokuProcFileContributor;
 import org.apereo.cas.initializr.contrib.heroku.HerokuSystemPropertiesFileContributor;
 import org.apereo.cas.initializr.metadata.CasOverlayInitializrMetadataUpdateStrategy;
-import org.apereo.cas.initializr.web.generator.CasInitializrProjectAssetGenerator;
 
-import io.spring.initializr.generator.project.ProjectAssetGenerator;
 import io.spring.initializr.generator.project.ProjectGenerationConfiguration;
 import io.spring.initializr.generator.project.contributor.ProjectContributor;
 import io.spring.initializr.web.support.InitializrMetadataUpdateStrategy;
@@ -27,8 +26,6 @@
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.annotation.Bean;
 
-import java.nio.file.Path;
-
 @ProjectGenerationConfiguration
 public class CasInitializrConfiguration {
     @Autowired
@@ -91,6 +88,7 @@ public ChainingSingleResourceProjectContributor overlayJibConfigurationContribut
         var chain = new ChainingSingleResourceProjectContributor();
         chain.addContributor(new OverlayGradleJibContributor());
         chain.addContributor(new OverlayGradleJibEntrypointContributor(applicationContext));
+        chain.addContributor(new LocalEtcCasDirectoryContributor());
         return chain;
     }
 
diff --git a/app/src/main/java/org/apereo/cas/initializr/contrib/LocalEtcCasDirectoryContributor.java b/app/src/main/java/org/apereo/cas/initializr/contrib/LocalEtcCasDirectoryContributor.java
new file mode 100644
index 00000000..1e3f9479
--- /dev/null
+++ b/app/src/main/java/org/apereo/cas/initializr/contrib/LocalEtcCasDirectoryContributor.java
@@ -0,0 +1,19 @@
+package org.apereo.cas.initializr.contrib;
+
+import io.spring.initializr.generator.project.contributor.ProjectContributor;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+
+public class LocalEtcCasDirectoryContributor implements ProjectContributor {
+    @Override
+    public void contribute(final Path projectRoot) throws IOException {
+        var output = projectRoot.resolve("etc/cas/.ignore");
+        if (!Files.exists(output)) {
+            Files.createDirectories(output.getParent());
+            Files.createFile(output);
+        }
+
+    }
+}
diff --git a/gradle.properties b/gradle.properties
index 9eba8e38..ea09b799 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -7,14 +7,14 @@ group=org.apereo.cas
 version=0.0.16
 sourceCompatibility=11
 
-tomcatVersion=9.0.56
+tomcatVersion=9.0.58
 springInitializrVersion=0.11.1
-jibVersion=3.1.4
+jibVersion=3.2.0
 
 springBootVersion=2.5.7
 casVersion=6.4.5
 
-casMgmtVersion=6.3.6
+casMgmtVersion=6.3.7
 casMgmtCasVersion=6.3.7.4
 casMgmtSpringBootVersion=2.3.7.RELEASE