extraArtifactRepositoryProperties;
/**
- * if enabled all P2 repositories referenced in the pom are added as referenced sites
+ * If enabled all P2-repositories referenced in the pom are added as referenced repositories.
*/
- @Parameter()
+ @Parameter
private boolean addPomRepositoryReferences;
/**
- * if enabled all P2 repositories referenced in the IU location type of target-files are added
- * as referenced sites
+ * If enabled all P2 repositories referenced in {@code InstallableUnit}-type locations of the
+ * active target-file are added as referenced repositories.
*/
- @Parameter()
+ @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.
+ * A list of patterns to exclude automatically derived repository references from being 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 location of a reference must not be matched by any pattern, in order to be eventually
+ * added to the assembled repository. An arbitrary number of patterns can be specified.
* 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
+ * Configuration example 1
+ *
+ *
+ * <repositoryReferenceFilter>
+ * <exclude>https://foo.bar.org/hidden/**</exclude>
+ * </repositoryReferenceFilter>
+ *
+ *
+ * Configuration example 2
*
*
* <repositoryReferenceFilter>
* <exclude>
* <location>https://foo.bar.org/hidden/**</location>
- * <location>https://foo.bar.org/secret/**</location>
+ * <location>%regex[http(s)?:\/\/foo\.bar\.org\/secret\/.*]</location>
+ * <location>![https://foo.bar.org/**]</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.
+ * In the second example the first of the three patterns uses {@code ANT}-style syntax, the
+ * second one uses a {@code Java RegEx} {@link Pattern} (enclosed in
+ * {@code %regex[]}).
+ * The third pattern is a negated (enclosed in {@code ![]}), which
+ * effectively makes it an inclusion pattern that all references must match in order to
+ * be added.
*
*/
@Parameter
- private RepositoryReferenceFilter repositoryReferenceFilter = null;
+ private RepositoryReferenceFilter repositoryReferenceFilter = new RepositoryReferenceFilter();
/**
* If enabled, an
* OSGi
* Repository is generated out of the content of the P2 repository.
*/
- @Parameter()
+ @Parameter
private boolean generateOSGiRepository;
/**
@@ -310,29 +315,20 @@ public void execute() throws MojoExecutionException, MojoFailureException {
.collect(Collectors.toCollection(ArrayList::new));
Predicate autoReferencesFilter = buildRepositoryReferenceLocationFilter();
if (addPomRepositoryReferences) {
- for (Repository pomRepo : getProject().getRepositories()) {
- if ("p2".equals(pomRepo.getLayout())) {
- String locationURL = pomRepo.getUrl();
- if (autoReferencesFilter.test(locationURL)) {
- repositoryReferences.add(new RepositoryReference(pomRepo.getName(), locationURL, true));
- }
- }
- }
+ getProject().getRepositories().stream() //
+ .filter(pomRepo -> "p2".equals(pomRepo.getLayout()))
+ .filter(pomRepo -> autoReferencesFilter.test(pomRepo.getUrl()))
+ .map(pomRepo -> new RepositoryReference(pomRepo.getName(), pomRepo.getUrl(), true))
+ .forEach(repositoryReferences::add);
}
if (addIUTargetRepositoryReferences) {
- for (TargetDefinitionFile targetDefinitionFile : projectManager
- .getTargetPlatformConfiguration(getProject()).getTargets()) {
- for (Location location : targetDefinitionFile.getLocations()) {
- if (location instanceof InstallableUnitLocation iu) {
- for (var iuRepo : iu.getRepositories()) {
- String locationURL = iuRepo.getLocation();
- if (autoReferencesFilter.test(locationURL)) {
- repositoryReferences.add(new RepositoryReference(null, locationURL, true));
- }
- }
- }
- }
- }
+ projectManager.getTargetPlatformConfiguration(getProject()).getTargets().stream()
+ .flatMap(tpFile -> tpFile.getLocations().stream())
+ .filter(InstallableUnitLocation.class::isInstance).map(InstallableUnitLocation.class::cast)
+ .flatMap(iu -> iu.getRepositories().stream())
+ .filter(iuRepo -> autoReferencesFilter.test(iuRepo.getLocation()))
+ .map(iuRepo -> new RepositoryReference(null, iuRepo.getLocation(), true))
+ .forEach(repositoryReferences::add);
}
DestinationRepositoryDescriptor destinationRepoDescriptor = new DestinationRepositoryDescriptor(
destination, repositoryName, compress, xzCompress, keepNonXzIndexFiles,
@@ -344,20 +340,18 @@ public void execute() throws MojoExecutionException, MojoFailureException {
XMLResourceGenerator resourceGenerator = new XMLResourceGenerator();
resourceGenerator.name(repositoryName);
resourceGenerator.base(destination.toURI());
- File pluginsResult = new File(destination, "plugins");
- if (pluginsResult.isDirectory()) {
- File[] files = pluginsResult
- .listFiles(pathname -> pathname.isFile() && pathname.getName().endsWith(".jar"));
+ File plugins = new File(destination, "plugins");
+ if (plugins.isDirectory()) {
+ File[] files = plugins.listFiles(path -> path.getName().endsWith(".jar") && path.isFile());
try {
resourceGenerator.repository(new FileSetRepository("plugins", Arrays.asList(files)));
} catch (Exception e) {
throw new MojoExecutionException("Could not read p2 repository plugins", e);
}
}
- File featureResult = new File(destination, "features");
- if (featureResult.isDirectory()) {
- File[] files = featureResult
- .listFiles(pathname -> pathname.isFile() && pathname.getName().endsWith(".jar"));
+ File features = new File(destination, "features");
+ if (features.isDirectory()) {
+ File[] files = features.listFiles(path -> path.getName().endsWith(".jar") && path.isFile());
for (File featureFile : files) {
try {
Feature feature = Feature.readJar(featureFile);
@@ -368,11 +362,8 @@ public void execute() throws MojoExecutionException, MojoFailureException {
}
}
try {
- if (compress) {
- resourceGenerator.save(new File(destination, repositoryFileName + ".gz"));
- } else {
- resourceGenerator.save(new File(destination, repositoryFileName));
- }
+ String filename = compress ? repositoryFileName + ".gz" : repositoryFileName;
+ resourceGenerator.save(new File(destination, filename));
} catch (IOException e) {
throw new MojoExecutionException("Could not write OSGi Repository!", e);
}
@@ -400,19 +391,17 @@ private List getCategories(final File 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;
+ List> filters = repositoryReferenceFilter.exclude.stream()
+ .> map(exclusionPattern -> {
+ boolean isNegated = false;
+ if (exclusionPattern.startsWith("![") && exclusionPattern.endsWith("]")) {
+ exclusionPattern = exclusionPattern.substring(2, exclusionPattern.length() - 1);
+ isNegated = true;
+ }
+ MatchPattern pattern = MatchPattern.fromString(exclusionPattern);
+ return isNegated ? ref -> !pattern.matchPath(ref, true) : ref -> pattern.matchPath(ref, true);
+ }).toList();
+ return ref -> filters.stream().noneMatch(f -> f.test(ref));
}
}
diff --git a/tycho-p2-repository-plugin/src/main/java/org/eclipse/tycho/plugins/p2/repository/FixArtifactsMetadataMetadataMojo.java b/tycho-p2-repository-plugin/src/main/java/org/eclipse/tycho/plugins/p2/repository/FixArtifactsMetadataMetadataMojo.java
index f803f7e1c3..b63d97b0df 100644
--- a/tycho-p2-repository-plugin/src/main/java/org/eclipse/tycho/plugins/p2/repository/FixArtifactsMetadataMetadataMojo.java
+++ b/tycho-p2-repository-plugin/src/main/java/org/eclipse/tycho/plugins/p2/repository/FixArtifactsMetadataMetadataMojo.java
@@ -13,7 +13,6 @@
package org.eclipse.tycho.plugins.p2.repository;
import java.io.File;
-import java.util.Collections;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
@@ -73,8 +72,7 @@ public void execute() throws MojoExecutionException, MojoFailureException {
"Could not update p2 repository, directory does not exist: " + destination);
}
DestinationRepositoryDescriptor destinationRepoDescriptor = new DestinationRepositoryDescriptor(
- destination, repositoryName, true, xzCompress, keepNonXzIndexFiles, false, true,
- Collections.emptyMap(), Collections.emptyList());
+ destination, repositoryName, true, xzCompress, keepNonXzIndexFiles, false, true);
mirrorApp.recreateArtifactRepository(destinationRepoDescriptor);
} catch (FacadeException e) {
throw new MojoExecutionException("Could not update p2 repository", e);