include;
+ }
+
private static final Object LOCK = new Object();
/**
*
@@ -217,6 +226,40 @@ public class AssembleRepositoryMojo extends AbstractRepositoryMojo {
@Parameter()
private boolean addIUTargetRepositoryReferences;
+ /**
+ * A list of patterns to filter the automatically derived repository references by including or
+ * excluding their location to control if they are eventually added to the assembled repository.
+ *
+ * Each pattern is either an inclusion or exclusion and an arbitrary number of
+ * each can be specified. The location of a repository reference must match at least one
+ * inclusion-pattern (if any is specified) and must not be match by any
+ * exclusion-pattern, in order to be eventually added to the assembled repository.
+ * The specified filters are only applied to those repository references derived from the
+ * target-definition or pom file, when {@link #addIUTargetRepositoryReferences} respectively
+ * {@link #addPomRepositoryReferences} is set to {@code true}.
+ *
+ *
+ * Configuration example
+ *
+ *
+ * <repositoryReferenceFilter>
+ * <exclude>
+ * <location>https://foo.bar.org/hidden/**</location>
+ * <location>https://foo.bar.org/secret/**</location>
+ * </exclude>
+ * <include>%regex[http(s)?:\/\/foo\.bar\.org\/.*]</include>
+ * </repositoryReferenceFilter>
+ *
+ *
+ * It contains two exclusion patterns using {@code ANT}-style syntax and one
+ * inclusion using a {@code Java RegEx} {@link Pattern} (enclosed in
+ * {@code %regex[]}). The inclusion pattern uses the shorthand
+ * notation for singleton lists.
+ *
+ */
+ @Parameter
+ private RepositoryReferenceFilter repositoryReferenceFilter = null;
+
/**
* If enabled, an
* OSGi
@@ -265,11 +308,14 @@ public void execute() throws MojoExecutionException, MojoFailureException {
.flatMap(List::stream)//
.map(ref -> new RepositoryReference(ref.getName(), ref.getLocation(), ref.isEnabled()))//
.collect(Collectors.toCollection(ArrayList::new));
+ Predicate autoReferencesFilter = buildRepositoryReferenceLocationFilter();
if (addPomRepositoryReferences) {
for (Repository pomRepo : getProject().getRepositories()) {
if ("p2".equals(pomRepo.getLayout())) {
- repositoryReferences
- .add(new RepositoryReference(pomRepo.getName(), pomRepo.getUrl(), true));
+ String locationURL = pomRepo.getUrl();
+ if (autoReferencesFilter.test(locationURL)) {
+ repositoryReferences.add(new RepositoryReference(pomRepo.getName(), locationURL, true));
+ }
}
}
}
@@ -278,9 +324,11 @@ public void execute() throws MojoExecutionException, MojoFailureException {
.getTargetPlatformConfiguration(getProject()).getTargets()) {
for (Location location : targetDefinitionFile.getLocations()) {
if (location instanceof InstallableUnitLocation iu) {
- for (org.eclipse.tycho.targetplatform.TargetDefinition.Repository iuRepo : iu
- .getRepositories()) {
- repositoryReferences.add(new RepositoryReference(null, iuRepo.getLocation(), true));
+ for (var iuRepo : iu.getRepositories()) {
+ String locationURL = iuRepo.getLocation();
+ if (autoReferencesFilter.test(locationURL)) {
+ repositoryReferences.add(new RepositoryReference(null, locationURL, true));
+ }
}
}
}
@@ -351,4 +399,20 @@ private List getCategories(final File categoriesDirectory) {
return eclipseRepositoryProject.loadCategories(categoriesDirectory);
}
+ private Predicate buildRepositoryReferenceLocationFilter() {
+ Predicate filter = l -> true;
+ if (repositoryReferenceFilter != null) {
+ if (repositoryReferenceFilter.include != null && !repositoryReferenceFilter.include.isEmpty()) {
+ MatchPatterns inclusionPattern = MatchPatterns.from(repositoryReferenceFilter.include);
+ filter = l -> inclusionPattern.matches(l, true);
+ }
+ if (repositoryReferenceFilter.exclude != null && !repositoryReferenceFilter.exclude.isEmpty()) {
+ MatchPatterns exclusionPattern = MatchPatterns.from(repositoryReferenceFilter.exclude);
+ Predicate exclusionFilter = l -> !exclusionPattern.matches(l, true);
+ filter = filter.and(exclusionFilter);
+ }
+ }
+ return filter;
+ }
+
}
diff --git a/tycho-testing-harness/src/main/java/org/eclipse/tycho/test/util/P2RepositoryTool.java b/tycho-testing-harness/src/main/java/org/eclipse/tycho/test/util/P2RepositoryTool.java
index 3d27c89ee2..d4ecba057d 100644
--- a/tycho-testing-harness/src/main/java/org/eclipse/tycho/test/util/P2RepositoryTool.java
+++ b/tycho-testing-harness/src/main/java/org/eclipse/tycho/test/util/P2RepositoryTool.java
@@ -7,11 +7,11 @@
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
-import java.util.Objects;
import java.util.Optional;
import java.util.function.Predicate;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
+import java.util.stream.IntStream;
import java.util.stream.Stream;
import javax.xml.parsers.DocumentBuilderFactory;
@@ -28,7 +28,7 @@
public class P2RepositoryTool {
- private static final ThreadLocal xPathTool = ThreadLocal
+ private static final ThreadLocal XPATH_TOOL = ThreadLocal
.withInitial(() -> XPathFactory.newInstance().newXPath());
private static final Pattern strictVersionRangePattern = Pattern.compile("\\[([^,]*),\\1\\]");
private final File repoLocation;
@@ -213,6 +213,21 @@ public List getAllProvidedPackages() throws Exception {
return getValues(contentXml, "/repository/units/unit/provides/provided[@namespace='java.package']/@name");
}
+ public List getAllRepositoryReferences() throws Exception {
+ loadMetadata();
+ // See MetadataRepositoryIO.Writer#writeRepositoryReferences
+ List references = getNodes(contentXml, "/repository/references/repository");
+ List result = new ArrayList<>();
+ for (Node reference : references) {
+ String uri = getAttribute(reference, "@uri");
+ int type = Integer.parseInt(getAttribute(reference, "@type"));
+ int options = Integer.parseInt(getAttribute(reference, "@options"));
+ result.add(new RepositoryReference(uri, type, options));
+ }
+
+ return result;
+ }
+
private void loadMetadata() throws Exception {
if (contentXml != null)
return;
@@ -223,27 +238,17 @@ private void loadMetadata() throws Exception {
}
private static XPath getXPathTool() {
- return xPathTool.get();
+ return XPATH_TOOL.get();
}
static List getNodes(Object startingPoint, String expression) throws XPathExpressionException {
NodeList nodeList = (NodeList) getXPathTool().evaluate(expression, startingPoint, XPathConstants.NODESET);
- List result = new ArrayList<>(nodeList.getLength());
- for (int ix = 0; ix < nodeList.getLength(); ++ix) {
- result.add(nodeList.item(ix));
- }
- return result;
+ return IntStream.range(0, nodeList.getLength()).mapToObj(nodeList::item).toList();
}
static List getValues(Object startingPoint, String expression) throws XPathExpressionException {
- NodeList nodeList = (NodeList) getXPathTool().evaluate(expression, startingPoint, XPathConstants.NODESET);
-
- List result = new ArrayList<>(nodeList.getLength());
- for (int ix = 0; ix < nodeList.getLength(); ++ix) {
- result.add(nodeList.item(ix).getNodeValue());
- }
- return result;
+ return getNodes(startingPoint, expression).stream().map(Node::getNodeValue).toList();
}
static String getAttribute(Node node, String expression) throws XPathExpressionException {
@@ -300,14 +305,7 @@ public List getProperties() throws Exception {
}
public List getRequiredIds() throws Exception {
- List result = new ArrayList<>();
-
- List requiredIds = getNodes(unitElement, "requires/required/@name");
- for (Node id : requiredIds) {
- result.add(id.getNodeValue());
- }
-
- return result;
+ return getValues(unitElement, "requires/required/@name");
}
/**
@@ -371,33 +369,10 @@ public List getProvidedCapabilities() throws Exception {
}
}
- public static final class IdAndVersion {
- public final String id;
- public final String version;
-
- public IdAndVersion(String id, String version) {
- this.id = id;
- this.version = version;
- }
-
- @Override
- public int hashCode() {
- return Objects.hash(id, version);
- }
-
- @Override
- public boolean equals(Object obj) {
- return this == obj || //
- (obj instanceof IdAndVersion other && //
- Objects.equals(id, other.id) && //
- Objects.equals(version, other.version));
- }
-
- @Override
- public String toString() {
- return "id=" + id + ", version=" + version;
- }
+ public static final record IdAndVersion(String id, String version) {
+ }
+ public static final record RepositoryReference(String uri, int type, int options) {
}
public static IdAndVersion withIdAndVersion(String id, String version) {