Skip to content

Commit

Permalink
Merge branch 'master' into 206-java17
Browse files Browse the repository at this point in the history
  • Loading branch information
@sparsick
sparsick authored Dec 16, 2021
2 parents 14841f0 + 09c556e commit 168f9d4
Show file tree
Hide file tree
Showing 4 changed files with 33 additions and 26 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/maven.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
strategy:
matrix:
os: [ ubuntu-latest, windows-latest, macOS-latest ]
java: [ 8, 11, 17 ]
java: [ 11, 17 ]
fail-fast: false

runs-on: ${{ matrix.os }}
Expand Down
28 changes: 14 additions & 14 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,16 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>1.8</java.version>
<java.version>11</java.version>
<maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target>

<maven.version>3.3.9</maven.version>
<maven.annotations.version>3.3</maven.annotations.version>
<maven.plugin.plugin.version>3.3</maven.plugin.plugin.version>
<maven.version>3.6.3</maven.version>
<maven.annotations.version>3.6.0</maven.annotations.version>
<maven.plugin.plugin.version>3.6.0</maven.plugin.plugin.version>
<!-- actually a dependency here. -->
<dependency.maven.bundle.plugin.version>5.1.2</dependency.maven.bundle.plugin.version>
<tycho.version>1.7.0</tycho.version>
<tycho.version>2.5.0</tycho.version>

<sonatype.aether.version>1.13.1</sonatype.aether.version>
<eclipse.aether.version>1.1.0</eclipse.aether.version>
Expand Down Expand Up @@ -96,11 +96,11 @@
<artifactId>biz.aQute.bndlib</artifactId>
<version>5.3.0</version>
</dependency>
<!-- needed due to dependency conflict tycho-1.7.0 and its transitive dependencies -->
<!-- needed due to dependency conflict tycho-2.5.0 and its transitive dependencies -->
<dependency>
<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.osgi</artifactId>
<version>3.15.200</version>
<version>3.17.100</version>
</dependency>

<!-- 3.0 used by tycho. Force the target maven version here. -->
Expand Down Expand Up @@ -275,7 +275,7 @@
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<version>3.18.1</version>
<version>3.21.0</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down Expand Up @@ -496,7 +496,7 @@
<source>${java.version}</source>
<quiet>true</quiet>
<links>
<link>http://docs.oracle.com/javase/7/docs/api/</link>
<link>http://docs.oracle.com/javase/11/docs/api/</link>
</links>
</configuration>
</plugin>
Expand All @@ -517,7 +517,7 @@
</plugin>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.7</version>
<version>3.0.0</version>
<executions>
<execution>
<id>modify-markdown</id>
Expand Down Expand Up @@ -547,12 +547,12 @@
<extension>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-ftp</artifactId>
<version>2.2</version>
<version>3.4.3</version>
</extension>
<extension>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-ssh</artifactId>
<version>2.2</version>
<version>3.4.3</version>
</extension>
</extensions>
</build>
Expand All @@ -564,7 +564,7 @@
<plugins>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.7</version>
<version>3.0.0</version>
<executions>
<execution>
<id>default-cli</id>
Expand Down Expand Up @@ -787,7 +787,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jxr-plugin</artifactId>
<version>3.0.0</version>
<version>3.1.1</version>
<configuration>
<linkJavadoc>true</linkJavadoc>
<aggregate>true</aggregate>
Expand Down
27 changes: 17 additions & 10 deletions src/main/java/org/reficio/p2/P2Mojo.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@
*/
package org.reficio.p2;

import com.google.common.collect.ArrayListMultimap;
import com.google.common.collect.Multimap;
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.IOUtils;
Expand All @@ -29,7 +27,11 @@
import org.apache.maven.plugin.BuildPluginManager;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.logging.Log;
import org.apache.maven.plugins.annotations.*;
import org.apache.maven.plugins.annotations.Component;
import org.apache.maven.plugins.annotations.LifecyclePhase;
import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.plugins.annotations.ResolutionScope;
import org.apache.maven.project.MavenProject;
import org.codehaus.plexus.PlexusConstants;
import org.codehaus.plexus.PlexusContainer;
Expand All @@ -49,25 +51,30 @@
import org.reficio.p2.publisher.CategoryPublisher;
import org.reficio.p2.resolver.eclipse.EclipseResolutionRequest;
import org.reficio.p2.resolver.eclipse.impl.DefaultEclipseResolver;
import org.reficio.p2.resolver.maven.*;
import org.reficio.p2.resolver.maven.Artifact;
import org.reficio.p2.resolver.maven.ArtifactResolutionRequest;
import org.reficio.p2.resolver.maven.ArtifactResolutionResult;
import org.reficio.p2.resolver.maven.ArtifactResolver;
import org.reficio.p2.resolver.maven.ResolvedArtifact;
import org.reficio.p2.resolver.maven.impl.AetherResolver;
import org.reficio.p2.utils.BundleUtils;
import org.reficio.p2.utils.JarUtils;
import org.reficio.p2.utils.Utils;

import java.io.File;
import java.io.FileOutputStream;
import java.io.FileWriter;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStreamWriter;
import java.io.Writer;
import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.Set;

import static java.util.Objects.requireNonNull;
Expand Down Expand Up @@ -366,7 +373,7 @@ private void processTransitiveArtifacts(P2ArtifactMap<ResolvedArtifact> resolved

private void processFeatures() {
// artifacts should already have been resolved by processArtifacts()
Multimap<P2Artifact, ResolvedArtifact> resolvedFeatures = resolveFeatures();
P2ArtifactMap<ResolvedArtifact> resolvedFeatures = resolveFeatures();
// then bundle the artifacts including the transitive dependencies (if specified so)
log.info("Resolved " + resolvedFeatures.size() + " features");
for (P2Artifact p2Artifact : features) {
Expand Down Expand Up @@ -407,12 +414,12 @@ private P2ArtifactMap<ResolvedArtifact> resolveArtifacts(List<P2Artifact> artifa
return resolvedArtifacts;
}

private Multimap<P2Artifact, ResolvedArtifact> resolveFeatures() {
Multimap<P2Artifact, ResolvedArtifact> resolvedArtifacts = ArrayListMultimap.create();
private P2ArtifactMap<ResolvedArtifact> resolveFeatures() {
P2ArtifactMap<ResolvedArtifact> resolvedArtifacts = new P2ArtifactMap<>();
for (P2Artifact p2Artifact : features) {
logResolving(p2Artifact);
ArtifactResolutionResult resolutionResult = resolveArtifact(p2Artifact);
resolvedArtifacts.putAll(p2Artifact, resolutionResult.getResolvedArtifacts());
resolvedArtifacts.put(p2Artifact, resolutionResult.getResolvedArtifacts());
}
return resolvedArtifacts;
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/reficio/p2/utils/Utils.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ public class Utils {
private static final String JAR_SNAPSHOT_POSTFIX = "-SNAPSHOT";
private static final String OSGI_SNAPSHOT_POSTFIX = ".SNAPSHOT";
private static final String ECLIPSE_QUALIFIER_POSTFIX = ".qualifier";
public static final String TYCHO_VERSION = "1.7.0";
public static final String TYCHO_VERSION = "2.5.0";

public static String getTimeStamp() {
SimpleDateFormat format = new SimpleDateFormat("yyyyMMddHHmmss");
Expand Down

0 comments on commit 168f9d4

Please sign in to comment.