-
Notifications
You must be signed in to change notification settings - Fork 8
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #407 from boozallen/391-messaging-java-17
#391 Update pipeline step messaging to be compatible with Java 17
- Loading branch information
Showing
27 changed files
with
1,337 additions
and
84 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
140 changes: 70 additions & 70 deletions
140
...mda/src/main/resources/templates/data-delivery-common/pipeline.chart.pom.configuration.vm
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,70 +1,70 @@ | ||
| <plugin> | ||
| <groupId>org.codehaus.mojo</groupId> | ||
| <artifactId>exec-maven-plugin</artifactId> | ||
| <version>3.1.0</version> | ||
| <executions> | ||
| <execution> | ||
| <id>main-chart</id> | ||
| <phase>compile</phase> | ||
| <goals> | ||
| <goal>exec</goal> | ||
| </goals> | ||
| <configuration> | ||
| <executable>helm</executable> | ||
| <arguments> | ||
| <argument>template</argument> | ||
| <argument>${aissemble.helm.repo.protocol}://${aissemble.helm.repo}/aissemble-spark-application-chart</argument> | ||
| <argument>--version</argument> | ||
| <argument>${version.aissemble}</argument> | ||
| <argument>--values</argument> | ||
| <argument>${mainValuesPath}/${moduleArtifactId}-base-values.yaml,${mainValuesPath}/${moduleArtifactId}-dev-values.yaml</argument> | ||
| <argument>-s</argument> | ||
| <argument>templates/deployment.yaml</argument> | ||
| </arguments> | ||
| <outputFile>target/apps/${moduleArtifactId}-dev-chart.yaml</outputFile> | ||
| </configuration> | ||
| </execution> | ||
| <execution> | ||
| <id>test-chart</id> | ||
| <phase>compile</phase> | ||
| <goals> | ||
| <goal>exec</goal> | ||
| </goals> | ||
| <configuration> | ||
| <executable>helm</executable> | ||
| <arguments> | ||
| <argument>template</argument> | ||
| <argument>${aissemble.helm.repo.protocol}://${aissemble.helm.repo}/aissemble-spark-application-chart</argument> | ||
| <argument>--version</argument> | ||
| <argument>${version.aissemble}</argument> | ||
| <argument>--values</argument> | ||
| <argument>${mainValuesPath}/${moduleArtifactId}-base-values.yaml,${testValuesPath}/${moduleArtifactId}-test-values.yaml</argument> | ||
| <argument>-s</argument> | ||
| <argument>templates/deployment.yaml</argument> | ||
| </arguments> | ||
| <outputFile>target/apps/${moduleArtifactId}-test-chart.yaml</outputFile> | ||
| </configuration> | ||
| </execution> | ||
| <execution> | ||
| <id>ci-chart</id> | ||
| <phase>compile</phase> | ||
| <goals> | ||
| <goal>exec</goal> | ||
| </goals> | ||
| <configuration> | ||
| <executable>helm</executable> | ||
| <arguments> | ||
| <argument>template</argument> | ||
| <argument>${aissemble.helm.repo.protocol}://${aissemble.helm.repo}/aissemble-spark-application-chart</argument> | ||
| <argument>--version</argument> | ||
| <argument>${version.aissemble}</argument> | ||
| <argument>--values</argument> | ||
| <argument>${mainValuesPath}/${moduleArtifactId}-base-values.yaml,${mainValuesPath}/${moduleArtifactId}-ci-values.yaml</argument> | ||
| <argument>-s</argument> | ||
| <argument>templates/deployment.yaml</argument> | ||
| </arguments> | ||
| <outputFile>target/apps/${moduleArtifactId}-ci-chart.yaml</outputFile> | ||
| </configuration> | ||
| </execution> | ||
| </executions> | ||
| </plugin> | ||
| <plugin> | ||
| <groupId>org.codehaus.mojo</groupId> | ||
| <artifactId>exec-maven-plugin</artifactId> | ||
| <version>3.1.0</version> | ||
| <executions> | ||
| <execution> | ||
| <id>main-chart</id> | ||
| <phase>compile</phase> | ||
| <goals> | ||
| <goal>exec</goal> | ||
| </goals> | ||
| <configuration> | ||
| <executable>helm</executable> | ||
| <arguments> | ||
| <argument>template</argument> | ||
| <argument>${aissemble.helm.repo.protocol}://${aissemble.helm.repo}/aissemble-spark-application-chart</argument> | ||
| <argument>--version</argument> | ||
| <argument>${version.aissemble}</argument> | ||
| <argument>--values</argument> | ||
| <argument>${mainValuesPath}/${moduleArtifactId}-base-values.yaml,${mainValuesPath}/${moduleArtifactId}-dev-values.yaml</argument> | ||
| <argument>-s</argument> | ||
| <argument>templates/deployment.yaml</argument> | ||
| </arguments> | ||
| <outputFile>target/apps/${moduleArtifactId}-dev-chart.yaml</outputFile> | ||
| </configuration> | ||
| </execution> | ||
| <execution> | ||
| <id>test-chart</id> | ||
| <phase>compile</phase> | ||
| <goals> | ||
| <goal>exec</goal> | ||
| </goals> | ||
| <configuration> | ||
| <executable>helm</executable> | ||
| <arguments> | ||
| <argument>template</argument> | ||
| <argument>${aissemble.helm.repo.protocol}://${aissemble.helm.repo}/aissemble-spark-application-chart</argument> | ||
| <argument>--version</argument> | ||
| <argument>${version.aissemble}</argument> | ||
| <argument>--values</argument> | ||
| <argument>${mainValuesPath}/${moduleArtifactId}-base-values.yaml,${testValuesPath}/${moduleArtifactId}-test-values.yaml</argument> | ||
| <argument>-s</argument> | ||
| <argument>templates/deployment.yaml</argument> | ||
| </arguments> | ||
| <outputFile>target/apps/${moduleArtifactId}-test-chart.yaml</outputFile> | ||
| </configuration> | ||
| </execution> | ||
| <execution> | ||
| <id>ci-chart</id> | ||
| <phase>compile</phase> | ||
| <goals> | ||
| <goal>exec</goal> | ||
| </goals> | ||
| <configuration> | ||
| <executable>helm</executable> | ||
| <arguments> | ||
| <argument>template</argument> | ||
| <argument>${aissemble.helm.repo.protocol}://${aissemble.helm.repo}/aissemble-spark-application-chart</argument> | ||
| <argument>--version</argument> | ||
| <argument>${version.aissemble}</argument> | ||
| <argument>--values</argument> | ||
| <argument>${mainValuesPath}/${moduleArtifactId}-base-values.yaml,${mainValuesPath}/${moduleArtifactId}-ci-values.yaml</argument> | ||
| <argument>-s</argument> | ||
| <argument>templates/deployment.yaml</argument> | ||
| </arguments> | ||
| <outputFile>target/apps/${moduleArtifactId}-ci-chart.yaml</outputFile> | ||
| </configuration> | ||
| </execution> | ||
| </executions> | ||
| </plugin> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
43 changes: 43 additions & 0 deletions
43
...upgrade/src/main/java/com/boozallen/aissemble/upgrade/migration/AbstractPomMigration.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,43 @@ | ||
| package com.boozallen.aissemble.upgrade.migration; | ||
| /*- | ||
| * #%L | ||
| * aiSSEMBLE::Foundation::Upgrade | ||
| * %% | ||
| * Copyright (C) 2021 Booz Allen | ||
| * %% | ||
| * This software package is licensed under the Booz Allen Public License. All Rights Reserved. | ||
| * #L% | ||
| */ | ||
| import org.apache.commons.lang3.StringUtils; | ||
| import org.slf4j.Logger; | ||
| import org.slf4j.LoggerFactory; | ||
| import org.technologybrewery.baton.BatonException; | ||
|
|
||
| import java.io.File; | ||
| import java.io.IOException; | ||
| import java.nio.file.Files; | ||
| import java.util.stream.Stream; | ||
|
|
||
| public abstract class AbstractPomMigration extends AbstractAissembleMigration { | ||
| protected static final Logger logger = LoggerFactory.getLogger(AbstractPomMigration.class); | ||
|
|
||
| public static final String POM = "pom"; | ||
| public static final String GUARANTEED_TAG = "<modelVersion>"; | ||
|
|
||
| protected String indent; | ||
|
|
||
| protected void detectAndSetIndent(File file) { | ||
| try (Stream<String> lines = Files.lines(file.toPath())) { | ||
| indent = lines.filter(line -> line.contains(GUARANTEED_TAG)) | ||
| .findFirst() | ||
| .map(artifact -> artifact.substring(0, artifact.indexOf(GUARANTEED_TAG))) | ||
| .orElse(null); | ||
| if (StringUtils.isEmpty(indent)) { | ||
| logger.info("Failed to detect indent for POM. Using default. {}", file); | ||
| indent = " "; | ||
| } | ||
| } catch (IOException e) { | ||
| throw new BatonException("Failed to get indent from POM:" + file, e); | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.