Skip to content

Commit

Permalink
Upgrade jib (#74)
Browse files Browse the repository at this point in the history
  • Loading branch information
mmoayyed authored Jan 21, 2022
1 parent 3724c56 commit d6d02ed
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .mergify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@ pull_request_rules:
actions:
merge:
method: merge
strict: false
update:
delete_head_branch:
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -17,18 +18,14 @@
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;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.context.annotation.Bean;

import java.nio.file.Path;

@ProjectGenerationConfiguration
public class CasInitializrConfiguration {
@Autowired
Expand Down Expand Up @@ -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;
}

Expand Down
Original file line number Diff line number Diff line change
@@ -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);
}

}
}
6 changes: 3 additions & 3 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit d6d02ed

Please sign in to comment.