Merge pull request #201 from bmarwell/tycho-update

[#194] update tycho to v1.7.0
reficio · Feb 23, 2021 · d22724b · d22724b
2 parents 7d0bb8e + 254cb9a
commit d22724b
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 6 deletions.
diff --git a/pom.xml b/pom.xml
@@ -22,7 +22,7 @@
         <maven.plugin.plugin.version>3.3</maven.plugin.plugin.version>
         <!-- actually a dependency here. -->
         <dependency.maven.bundle.plugin.version>4.2.1</dependency.maven.bundle.plugin.version>
-        <tycho.version>1.0.0</tycho.version>
+        <tycho.version>1.7.0</tycho.version>
 
         <sonatype.aether.version>1.13.1</sonatype.aether.version>
         <eclipse.aether.version>1.1.0</eclipse.aether.version>
@@ -84,6 +84,12 @@
                 <artifactId>biz.aQute.bndlib</artifactId>
                 <version>5.2.0</version>
             </dependency>
+            <!-- needed due to dependency conflict tycho-1.7.0 and its transitive dependencies -->
+            <dependency>
+                <groupId>org.eclipse.platform</groupId>
+                <artifactId>org.eclipse.osgi</artifactId>
+                <version>3.15.200</version>
+            </dependency>
 
             <!-- 3.0 used by tycho. Force the target maven version here. -->
             <dependency>
@@ -212,6 +218,13 @@
             </exclusions>
         </dependency>
 
+        <!-- osgi log to avoid Security Exceptions at runtime (due to different hash of org.eclipse.osgi's Logger) -->
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.service.log</artifactId>
+            <version>1.4.0</version>
+        </dependency>
+
         <dependency>
             <groupId>org.eclipse.tycho</groupId>
             <artifactId>tycho-core</artifactId>
@@ -249,9 +262,6 @@
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-plugin-plugin</artifactId>
                     <version>${maven.plugin.plugin.version}</version>
-                    <configuration>
-                        <skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
-                    </configuration>
                     <executions>
                         <execution>
                             <id>default-descriptor</id>

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 = "1.0.0";
+    public static final String TYCHO_VERSION = "1.7.0";
 
     public static String getTimeStamp() {
         SimpleDateFormat format = new SimpleDateFormat("yyyyMMddHHmmss");

diff --git a/src/test/integration/integration.xml b/src/test/integration/integration.xml
@@ -37,12 +37,14 @@
                 <groupId>junit</groupId>
                 <artifactId>junit</artifactId>
                 <version>3.8.2</version>
+                <scope>test</scope>
             </dependency>
 
             <dependency>
                 <groupId>org.codehaus.groovy</groupId>
                 <artifactId>groovy-all-minimal</artifactId>
                 <version>1.5.8</version>
+                <scope>test</scope>
             </dependency>
         </dependencies>
     </dependencyManagement>
@@ -66,7 +68,7 @@
                 <artifactId>maven-javadoc-plugin</artifactId>
                 <version>3.2.0</version>
                 <configuration>
-                    <source>1.7</source>
+                    <source>1.8</source>
                 </configuration>
             </plugin>
         </plugins>