-
Notifications
You must be signed in to change notification settings - Fork 2.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
) If property `java.version` is in unexpected format, the activator throws `NumberFormatEx`, that in turn, is caught and reported by `DefaultProfileSelector` w/o any cause. These should be cleanly reported instead: report that `java.version` property is in "unexpected format", and also report why was there are failure to evaluate a property activation. Note 1: Maven allows `-Djava.version` override (!!!), this is exactly what IT MNG-3746 does, but the `NumberFormatEx` went unnoticed, was swallowed, no cause reported. Note 2: This bug was revealed by #1555 as it reported the issue, and later "asserted error free log" which was not error-free. Hence, this bug was simply revealed by improved logging on unrelated issue. --- https://issues.apache.org/jira/browse/MNG-8142
- Loading branch information
Showing
6 changed files
with
120 additions
and
4 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
72 changes: 72 additions & 0 deletions
72
...odel-builder/src/test/java/org/apache/maven/model/profile/DefaultProfileSelectorTest.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,72 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
| package org.apache.maven.model.profile; | ||
|
|
||
| import java.util.Collections; | ||
| import java.util.List; | ||
|
|
||
| import org.apache.maven.model.Activation; | ||
| import org.apache.maven.model.Profile; | ||
| import org.apache.maven.model.building.ModelProblemCollector; | ||
| import org.apache.maven.model.building.SimpleProblemCollector; | ||
| import org.apache.maven.model.profile.activation.ProfileActivator; | ||
| import org.junit.jupiter.api.Test; | ||
|
|
||
| import static org.junit.jupiter.api.Assertions.assertEquals; | ||
| import static org.junit.jupiter.api.Assertions.assertTrue; | ||
|
|
||
| /** | ||
| * Tests {@link DefaultProfileSelector}. | ||
| */ | ||
| public class DefaultProfileSelectorTest { | ||
| private Profile newProfile(String id) { | ||
| Activation activation = new Activation(); | ||
| Profile profile = new Profile(); | ||
| profile.setId(id); | ||
| profile.setActivation(activation); | ||
| return profile; | ||
| } | ||
|
|
||
| @Test | ||
| void testThrowingActivator() { | ||
| DefaultProfileSelector selector = new DefaultProfileSelector(); | ||
| selector.addProfileActivator(new ProfileActivator() { | ||
| @Override | ||
| public boolean isActive(Profile profile, ProfileActivationContext context, ModelProblemCollector problems) { | ||
| throw new RuntimeException("BOOM"); | ||
| } | ||
|
|
||
| @Override | ||
| public boolean presentInConfig( | ||
| Profile profile, ProfileActivationContext context, ModelProblemCollector problems) { | ||
| return true; | ||
| } | ||
| }); | ||
|
|
||
| List<Profile> profiles = Collections.singletonList(newProfile("one")); | ||
| DefaultProfileActivationContext context = new DefaultProfileActivationContext(); | ||
| SimpleProblemCollector problems = new SimpleProblemCollector(); | ||
| List<Profile> active = selector.getActiveProfiles(profiles, context, problems); | ||
| assertTrue(active.isEmpty()); | ||
| assertEquals(1, problems.getErrors().size()); | ||
| assertEquals( | ||
| "Failed to determine activation for profile one: BOOM", | ||
| problems.getErrors().get(0)); | ||
| } | ||
| } |
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