Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix #149 Support using reactor projects as source for assemble-p2-maven-site #150

Merged
merged 4 commits into from
Jun 12, 2021
Merged

Fix #149 Support using reactor projects as source for assemble-p2-maven-site #150

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
38f9e78
Fix #149 Support using reactor projects as source for
laeubi Jun 12, 2021
a32d54c
make the inclusion of transitive dependencies more clear
laeubi Jun 12, 2021
ef313d4
Update jetty version in test
laeubi Jun 12, 2021
99043d5
Also include transitive dependencies in test repo
laeubi Jun 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion tycho-its/projects/p2mavensite/producer/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
<categoryName>Jetty Bundles</categoryName>
<includeManaged>true</includeManaged>
<includeDependencies>true</includeDependencies>
<includeTransitiveDependencies>true</includeTransitiveDependencies>
</configuration>
<id>maven-p2-site</id>
<phase>package</phase>
Expand All @@ -38,7 +39,7 @@
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-bom</artifactId>
<version>11.0.2</version>
<version>10.0.5</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down
99 changes: 68 additions & 31 deletions ...ository-plugin/src/main/java/org/eclipse/tycho/plugins/p2/repository/MavenP2SiteMojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,20 +99,33 @@ public class MavenP2SiteMojo extends AbstractMojo {
private MavenSession session;

/**
* Flag whether dependencies of the projects declared &lt;dependencies&gt; (and
* &lt;dependencyManagement&gt; if desired) should be included. If enabled this creates the
* maven equivalent of a self-contained P2 site
* Flag whether declared &lt;dependencies&gt; of the projects should be included.
*/
@Parameter(defaultValue = "false")
private boolean includeDependencies;
@Parameter(defaultValue = "true")
private boolean includeDependencies = true;

/**
* Flag that controls if &lt;dependencyManagement&gt; managed dependencies should be included,
* this is useful if your are using a BOM and like to include all materials in the update-site
* regardless of if they are explicitly included in the &lt;dependencies&gt; section
*/
@Parameter(defaultValue = "false")
private boolean includeManaged;
private boolean includeManaged = false;

/**
* Flag that controls if reactor projects should be considered, this is useful if your are
* simply like to make an update side of all your current reactor projects
*/
@Parameter(defaultValue = "false")
private boolean includeReactor = false;

/**
* Flag whether dependencies of the projects declared &lt;dependencies&gt; (and
* &lt;dependencyManagement&gt; if desired) should be included. If enabled this creates the
* maven equivalent of a self-contained P2 site
*/
@Parameter(defaultValue = "false")
private boolean includeTransitiveDependencies;

@Parameter(defaultValue = "300")
private int timeoutInSeconds = 300;
Expand Down Expand Up @@ -157,16 +170,40 @@ public class MavenP2SiteMojo extends AbstractMojo {
@Override
public void execute() throws MojoExecutionException, MojoFailureException {
logger.debug("categoryName = " + categoryName);
logger.debug("includeManaged = " + includeManaged);
logger.debug("includeDependencies = " + includeDependencies);
logger.debug("includeManaged = " + includeManaged);
logger.debug("includeReactor = " + includeReactor);
logger.debug("includeTransitive = " + includeTransitiveDependencies);

Set<String> filesAdded = new HashSet<>();
List<Dependency> dependencies = project.getDependencies();
List<File> bundles = new ArrayList<>();
List<File> advices = new ArrayList<>();
resolve(dependencies, bundles, advices, filesAdded);
if (includeDependencies) {
resolve(dependencies, bundles, advices, filesAdded);
}
if (includeManaged) {
resolve(project.getDependencyManagement().getDependencies(), bundles, advices, filesAdded);
}
if (includeReactor) {
List<MavenProject> allProjects = session.getAllProjects();
for (MavenProject mavenProject : allProjects) {
String packaging = mavenProject.getPackaging();
if (packaging.equalsIgnoreCase("pom")) {
continue;
}
Artifact artifact = mavenProject.getArtifact();
if (artifact == null) {
continue;
}
File file = artifact.getFile();
if (file == null || !file.isFile()) {
continue;
}
bundles.add(file);
advices.add(createMavenAdvice(artifact));
}
}
String categoryURI;
if (categoryFile.exists()) {
categoryURI = categoryFile.toURI().toASCIIString();
Expand Down Expand Up @@ -254,40 +291,40 @@ protected void resolve(List<Dependency> dependencies, List<File> bundles, List<F
Artifact artifact = repositorySystem.createArtifactWithClassifier(dependency.getGroupId(),
dependency.getArtifactId(), dependency.getVersion(), dependency.getType(),
dependency.getClassifier());
Set<Artifact> artifacts = resolveArtifact(artifact, includeDependencies);
Set<Artifact> artifacts = resolveArtifact(artifact, includeTransitiveDependencies);
for (Artifact resolvedArtifact : artifacts) {
logger.debug(" resolved " + resolvedArtifact.getGroupId() + "::" + resolvedArtifact.getArtifactId()
+ "::" + resolvedArtifact.getVersion() + "::" + resolvedArtifact.getClassifier());
File file = resolvedArtifact.getFile();
if (filesAdded.add(file.getAbsolutePath())) {
bundles.add(file);
try {
int cnt = 0;
File p2 = File.createTempFile("p2properties", ".inf");
p2.deleteOnExit();
Properties properties = new Properties();
addProvidesAndProperty(properties, RepositoryLayoutHelper.PROP_GROUP_ID,
resolvedArtifact.getGroupId(), cnt++);
addProvidesAndProperty(properties, RepositoryLayoutHelper.PROP_ARTIFACT_ID,
resolvedArtifact.getArtifactId(), cnt++);
addProvidesAndProperty(properties, RepositoryLayoutHelper.PROP_VERSION,
resolvedArtifact.getVersion(), cnt++);
addProvidesAndProperty(properties, RepositoryLayoutHelper.PROP_EXTENSION,
resolvedArtifact.getType(), cnt++);
addProvidesAndProperty(properties, RepositoryLayoutHelper.PROP_CLASSIFIER,
resolvedArtifact.getClassifier(), cnt++);
addProvidesAndProperty(properties, "maven-scope", resolvedArtifact.getScope(), cnt++);
//TODO pgp.signatures --> getSignatureFile(resolvedArtifact)
properties.store(new FileOutputStream(p2), null);
advices.add(p2);
} catch (IOException e) {
throw new MojoExecutionException("failed to generate p2.inf", e);
}
advices.add(createMavenAdvice(resolvedArtifact));
//TODO pgp.signatures --> getSignatureFile(resolvedArtifact)
}
}
}
}

protected File createMavenAdvice(Artifact artifact) throws MojoExecutionException {
try {
int cnt = 0;
File p2 = File.createTempFile("p2properties", ".inf");
p2.deleteOnExit();
Properties properties = new Properties();
addProvidesAndProperty(properties, RepositoryLayoutHelper.PROP_GROUP_ID, artifact.getGroupId(), cnt++);
addProvidesAndProperty(properties, RepositoryLayoutHelper.PROP_ARTIFACT_ID, artifact.getArtifactId(),
cnt++);
addProvidesAndProperty(properties, RepositoryLayoutHelper.PROP_VERSION, artifact.getVersion(), cnt++);
addProvidesAndProperty(properties, RepositoryLayoutHelper.PROP_EXTENSION, artifact.getType(), cnt++);
addProvidesAndProperty(properties, RepositoryLayoutHelper.PROP_CLASSIFIER, artifact.getClassifier(), cnt++);
addProvidesAndProperty(properties, "maven-scope", artifact.getScope(), cnt++);
properties.store(new FileOutputStream(p2), null);
return p2;
} catch (IOException e) {
throw new MojoExecutionException("failed to generate p2.inf", e);
}
}

private void addProvidesAndProperty(Properties properties, String key, String value, int i) {
//see https://help.eclipse.org/2021-03/index.jsp?topic=%2Forg.eclipse.platform.doc.isv%2Fguide%2Fp2_customizing_metadata.html
addProvides(properties, key.replace('-', '.'), value, null, i);
Expand Down