Skip to content

Commit

Permalink
Merge branch 'master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
Spaction authored Apr 23, 2024
2 parents 664ca29 + 4f709b6 commit cb37618
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 2 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,5 @@ local.properties
/*/bin/test/org/jfrog/build
/*/bin/test/*/snapshots/*.xml
/*/bin/test/*/settings/build-info*.json
/*/bin/test/*/pipLog.txt
/*/bin/test/*/pipLog.txt
target
12 changes: 12 additions & 0 deletions .jfrog/jfrog-apps-config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
version: "1.0"
modules:
- exclude_patterns:
- "**/.git/**"
- "**/build/**"
- "**/target/**"
- "**/.vscode/**"
- "**/.idea/**"
exclude_scanners:
- "iac"
# Temporarily disabling secrets scanner - the scanner removes essential Gradle files
- "secrets"
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ public static int getMajorVersion(String version, Log log) {
public static int getMajorProjectVersion(String project, Log log) {
if (!StringUtils.isEmpty(project)) {
project = project.toLowerCase();
if (project.matches("^.*/v\\d")) {
if (project.matches("^.*/v\\d+")) {
String major = project.substring(project.lastIndexOf("/v") + 2);
try {
return Integer.parseInt(major);
Expand Down

0 comments on commit cb37618

Please sign in to comment.