Merge pull request #298 from sparsick/297-updateTycho

#297: Update Tycho to 2.7.5
reficio · Nov 4, 2022 · 5d5ce59 · 5d5ce59
2 parents 8b6933c + 97073d5
commit 5d5ce59
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 5 deletions.
diff --git a/pom.xml b/pom.xml
@@ -22,7 +22,7 @@
         <maven.plugin.plugin.version>3.6.0</maven.plugin.plugin.version>
         <!-- actually a dependency here. -->
         <dependency.maven.bundle.plugin.version>5.1.6</dependency.maven.bundle.plugin.version>
-        <tycho.version>2.5.0</tycho.version>
+        <tycho.version>2.7.5</tycho.version>
 
         <sonatype.aether.version>1.13.1</sonatype.aether.version>
         <eclipse.aether.version>1.1.0</eclipse.aether.version>
@@ -153,6 +153,13 @@
     </dependencyManagement>
 
     <dependencies>
+        <dependency>
+            <groupId>org.apache.maven</groupId>
+            <artifactId>maven-core</artifactId>
+            <version>${maven.version}</version>
+            <scope>provided</scope>
+        </dependency>
+
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-plugin-api</artifactId>

diff --git a/src/main/java/org/reficio/p2/TychoFeatureBuilder.java b/src/main/java/org/reficio/p2/TychoFeatureBuilder.java
@@ -35,7 +35,7 @@
 import org.apache.maven.plugin.BuildPluginManager;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.project.MavenProject;
-import org.eclipse.tycho.core.TychoConstants;
+import org.eclipse.tycho.TychoConstants;
 import org.eclipse.tycho.core.osgitools.targetplatform.DefaultDependencyArtifacts;
 import org.reficio.p2.utils.Utils;
 

diff --git a/src/main/java/org/reficio/p2/utils/Utils.java b/src/main/java/org/reficio/p2/utils/Utils.java
@@ -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 = "2.5.0";
+    public static final String TYCHO_VERSION = "2.7.5";
 
     public static String getTimeStamp() {
         SimpleDateFormat format = new SimpleDateFormat("yyyyMMddHHmmss");

diff --git a/src/test/integration/bug-17-it/pom.xml b/src/test/integration/bug-17-it/pom.xml
@@ -82,7 +82,7 @@
     <repositories>
         <repository>
             <id>hibernate-snapshots</id>
-            <url>https://snapshots.jboss.org/maven2</url>
+            <url>https://snapshots.jboss.org</url>
         </repository>
     </repositories>
 

diff --git a/src/test/integration/feature-14-it/pom.xml b/src/test/integration/feature-14-it/pom.xml
@@ -133,7 +133,7 @@
     <repositories>
         <repository>
             <id>hibernate-snapshots</id>
-            <url>https://snapshots.jboss.org/maven2</url>
+            <url>https://snapshots.jboss.org</url>
         </repository>
     </repositories>