Skip to content

Commit

Permalink
BUILD-934 use allow list instead of exclude list for buildinfo env va…
Browse files Browse the repository at this point in the history 
…rs record (#89)
  • Loading branch information
@tomverin
tomverin authored Jul 1, 2022
1 parent f8022f0 commit 31a4e0d
Showing 1 changed file with 14 additions and 4 deletions.
18 changes: 14 additions & 4 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.min.version>3.3.9</maven.min.version>
<jdk.min.version>1.8</jdk.min.version>
<jdk.min.version>8</jdk.min.version>

This comment has been minimized.

Sign in to view

Copy link
@TobiX

TobiX Jan 9, 2023

Contributor

Just FYI: This broke the maven-enforcer-plugin when running with Java 8 (Since that was still normalized to 1.8.0 and 8 > 1.8.0):

[INFO] --- maven-enforcer-plugin:3.1.0:enforce (enforce) @ groovy ---
[ERROR] Rule 7: org.apache.maven.plugins.enforcer.RequireJavaVersion failed with message:
To build this project JDK 8 (or upper) is required. Please install it.

This comment has been minimized.

Sign in to view

Copy link
@TobiX

TobiX Jan 9, 2023

Contributor

And not doing this breaks the javac release flag, so never mind... I'll try to come up with a better solution...
<timestamp>${maven.build.timestamp}</timestamp>
<maven.build.timestamp.format>yyyy-MM-dd'T'HH:mm:ssZ</maven.build.timestamp.format>
<sonar.snapshotRepository.id>snapshot</sonar.snapshotRepository.id>
Expand Down Expand Up @@ -702,9 +702,19 @@
</goals>
<configuration>
<artifactory>
<envVarsExcludePatterns>
*pass*,*psw*,*secret*,*MAVEN_CMD_LINE_ARGS*,sun.java.command,*token*,*login*,*key*,*signing*,*auth*,*pwd*
</envVarsExcludePatterns>
<envVarsIncludePatterns>
GIT_SHA1,
GITHUB_BRANCH,
ARTIFACTS_TO_PUBLISH,
*_VERSION,
JAVA,
CIRRUS_CHANGE_MESSAGE,
PROJECT,
ARTIFACTORY_DEPLOY_REPO,
ARTIFACTORY_DEPLOY_USERNAME,
ARTIFACTORY_PRIVATE_USERNAME,
BUILD_NUMBER
</envVarsIncludePatterns>
<includeEnvVars>true</includeEnvVars>
<timeoutSec>60</timeoutSec>
</artifactory>
Expand Down

0 comments on commit 31a4e0d

Please sign in to comment.