-
Notifications
You must be signed in to change notification settings - Fork 187
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Implement the new agent properties to be backed by maven
IProvisioningAgent now supports new methods to gather so called "agent properties", this implements the new methods in terms of maven so they can be supplied by user or system properties as well as profiles.
- Loading branch information
Showing
3 changed files
with
114 additions
and
37 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
96 changes: 96 additions & 0 deletions
96
tycho-spi/src/main/java/org/eclipse/tycho/helper/MavenPropertyHelper.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,96 @@ | ||
| /******************************************************************************* | ||
| * Copyright (c) 2024 Christoph Läubrich and others. | ||
| * This program and the accompanying materials | ||
| * are made available under the terms of the Eclipse Public License 2.0 | ||
| * which accompanies this distribution, and is available at | ||
| * https://www.eclipse.org/legal/epl-2.0/ | ||
| * | ||
| * SPDX-License-Identifier: EPL-2.0 | ||
| * | ||
| * Contributors: | ||
| * Christoph Läubrich - initial API and implementation | ||
| *******************************************************************************/ | ||
| package org.eclipse.tycho.helper; | ||
|
|
||
| import java.util.List; | ||
| import java.util.Properties; | ||
|
|
||
| import org.apache.maven.execution.MavenSession; | ||
| import org.apache.maven.plugin.LegacySupport; | ||
| import org.apache.maven.settings.Profile; | ||
| import org.apache.maven.settings.Settings; | ||
| import org.codehaus.plexus.component.annotations.Component; | ||
| import org.codehaus.plexus.component.annotations.Requirement; | ||
|
|
||
| @Component(role = MavenPropertyHelper.class) | ||
| public class MavenPropertyHelper { | ||
|
|
||
| @Requirement | ||
| LegacySupport legacySupport; | ||
|
|
||
| /** | ||
| * Returns a global (user) property of the given key, the search order is | ||
| * <ol> | ||
| * <li>Maven session user properties</li> | ||
| * <li>Active profile(s) property</li> | ||
| * <li>Maven session system properties</li> | ||
| * <li>Java System Properties</li> | ||
| * </ol> | ||
| * | ||
| * @param key | ||
| * the key to search | ||
| * @return the value according to the described search order or <code>null</code> if nothing can | ||
| * be found. | ||
| */ | ||
| public String getGlobalProperty(String key) { | ||
| return getGlobalProperty(key, null); | ||
| } | ||
|
|
||
| /** | ||
| * Returns a global (user) property of the given key, the search order is | ||
| * <ol> | ||
| * <li>Maven session user properties</li> | ||
| * <li>Active profile(s) property</li> | ||
| * <li>Maven session system properties</li> | ||
| * <li>Java System Properties</li> | ||
| * <li>default value</li> | ||
| * </ol> | ||
| * | ||
| * @param key | ||
| * the key to search | ||
| * @param defaultValue | ||
| * the default value to use as a last resort | ||
| * @return the value according to the described search order | ||
| */ | ||
| public String getGlobalProperty(String key, String defaultValue) { | ||
| MavenSession mavenSession = legacySupport.getSession(); | ||
| if (mavenSession != null) { | ||
| // Check user properties first ... | ||
| Properties userProperties = mavenSession.getUserProperties(); | ||
| String userProperty = userProperties.getProperty(key); | ||
| if (userProperty != null) { | ||
| return userProperty; | ||
| } | ||
| // check if there are any active profile properties ... | ||
| Settings settings = mavenSession.getSettings(); | ||
| List<Profile> profiles = settings.getProfiles(); | ||
| List<String> activeProfiles = settings.getActiveProfiles(); | ||
| for (Profile profile : profiles) { | ||
| if (activeProfiles.contains(profile.getId())) { | ||
| String profileProperty = profile.getProperties().getProperty(key); | ||
| if (profileProperty != null) { | ||
| return profileProperty; | ||
| } | ||
| } | ||
| } | ||
| // now maven system properties | ||
| Properties systemProperties = mavenSession.getSystemProperties(); | ||
| String systemProperty = systemProperties.getProperty(key); | ||
| if (systemProperty != null) { | ||
| return systemProperty; | ||
| } | ||
| } | ||
| // java sysem properties last | ||
| return System.getProperty(key, defaultValue); | ||
| } | ||
| } |