Skip to content

Commit

Permalink
Fix indentation in build qualifier mojo
Browse files Browse the repository at this point in the history
  • Loading branch information
jstroleny authored and laeubi committed Jun 6, 2024
1 parent 58f0862 commit 8574107
Showing 1 changed file with 16 additions and 16 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -188,26 +188,26 @@ private TychoProjectVersion calculateQualifiedVersion(Date timestamp)
return new TychoProjectVersion(pomOSGiVersion, qualifier);
}

protected String getDesiredQualifier(String forceContextQualifier, Date timestamp) throws MojoExecutionException {
String qualifier = forceContextQualifier;
if (TychoConstants.QUALIFIER_NONE.equals(qualifier)) {
qualifier = "";
}
protected String getDesiredQualifier(String forceContextQualifier, Date timestamp) throws MojoExecutionException {
String qualifier = forceContextQualifier;
if (TychoConstants.QUALIFIER_NONE.equals(qualifier)) {
qualifier = "";
}

if (qualifier == null) {
qualifier = getQualifier(timestamp);
}
return qualifier;
}
return qualifier;
}

private String getForceContextQualifier() {
String qualifier = forceContextQualifier;
private String getForceContextQualifier() {
String qualifier = forceContextQualifier;

if (qualifier == null) {
qualifier = buildPropertiesParser.parse(DefaultReactorProject.adapt(project)).getForceContextQualifier();
qualifier = buildPropertiesParser.parse(DefaultReactorProject.adapt(project)).getForceContextQualifier();
}
return qualifier;
}
return qualifier;
}

private Version getParsedOSGiVersion() throws MojoFailureException {
String osgiVersionString = getOSGiVersion();
Expand All @@ -222,10 +222,10 @@ private Version getParsedOSGiVersion() throws MojoFailureException {
}
}

void validateQualifier(String forceContextQualifier, String qualifier) throws MojoFailureException {
if (TychoConstants.QUALIFIER_NONE.equals(forceContextQualifier)) {
return;
}
void validateQualifier(String forceContextQualifier, String qualifier) throws MojoFailureException {
if (TychoConstants.QUALIFIER_NONE.equals(forceContextQualifier)) {
return;
}
// parse a valid version with the given qualifier to check if the qualifier is valid
try {
Version.parseVersion("1.0.0." + qualifier);
Expand Down

0 comments on commit 8574107

Please sign in to comment.