#391 Update pipeline step messaging to be compatible with Java 17 #407
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
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> | ||
|
There was a problem hiding this comment. I: Fixed tabbing issue in downstream project poms where this whole block was not being indented |
||
| <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
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) { | ||
|
There was a problem hiding this comment. A: Probably a candidate for Baton's There was a problem hiding this comment. Yes I copied this from an old branch. Guess it never got added to dev after a patch release. |
||
| 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.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I: Space before
## TODOwas being rendered in downstream template, resulting in the spacing being off in the following line.