Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGianMaria Romanato2020-03-30 14:10:59 -0400
committerGianMaria Romanato2020-03-30 14:10:59 -0400
commitfcfed2149d57a8ce183e48b4d2767a5e3ee77cdf (patch)
treec25edc8ecb1fb8aeff93d79a9c8d51c5b1ec4cc9
parent4d798a9f7af2333e750f9631854b8f4cc25968d2 (diff)
parent41dafd4f0cabebfee86625a299c0836fa2f0324e (diff)
downloadorg.eclipse.virgo.ide-fcfed2149d57a8ce183e48b4d2767a5e3ee77cdf.tar.gz
org.eclipse.virgo.ide-fcfed2149d57a8ce183e48b4d2767a5e3ee77cdf.tar.xz
org.eclipse.virgo.ide-fcfed2149d57a8ce183e48b4d2767a5e3ee77cdf.zip
[21~Merge branch 'feature/561574'
-rw-r--r--org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/ui/projects/ProjectBundleRoot.java4
-rw-r--r--pom.xml15
2 files changed, 11 insertions, 8 deletions
diff --git a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/ui/projects/ProjectBundleRoot.java b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/ui/projects/ProjectBundleRoot.java
index b517a82..3dca623 100644
--- a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/ui/projects/ProjectBundleRoot.java
+++ b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/ui/projects/ProjectBundleRoot.java
@@ -11,11 +11,11 @@
package org.eclipse.virgo.ide.runtime.internal.ui.projects;
import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.internal.core.JarPackageFragmentRoot;
+import org.eclipse.jdt.internal.core.ExternalPackageFragmentRoot;
import org.eclipse.jdt.internal.core.JavaProject;
import org.eclipse.virgo.ide.runtime.core.artefacts.ILocalArtefact;
-public class ProjectBundleRoot extends JarPackageFragmentRoot implements IServerProjectArtefact {
+public class ProjectBundleRoot extends ExternalPackageFragmentRoot implements IServerProjectArtefact {
private final ILocalArtefact artefact;
diff --git a/pom.xml b/pom.xml
index 765e7e7..2db518f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<project
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.virgo.ide</groupId>
<artifactId>org.eclipse.virgo.ide.parent</artifactId>
@@ -23,7 +24,7 @@
<pack200>"${java.home}/bin"</pack200>
<test.osvmargs></test.osvmargs>
- <tycho-version>1.2.0</tycho-version>
+ <tycho-version>1.3.0</tycho-version>
<signer-version>1.1.5</signer-version>
<skip-source-check>true</skip-source-check>
</properties>
@@ -237,7 +238,7 @@
<repository>
<id>eclipse</id>
<layout>p2</layout>
- <url>http://download.eclipse.org/releases/oxygen/</url>
+ <url>https://download.eclipse.org/releases/2019-06/</url>
</repository>
<repository>
<id>orbit</id>
@@ -257,7 +258,10 @@
<repository>
<id>libra-milestone</id>
<layout>p2</layout>
- <url>http://download.eclipse.org/libra/milestones/</url>
+ <!-- Interim hack. Download directly from Libra CI until the project manages
+ to publish a build to their P2 repository, see https://bugs.eclipse.org/bugs/show_bug.cgi?id=545157
+ <url>http://download.eclipse.org/libra/milestones/</url> -->
+ <url>jar:https://ci.eclipse.org/libra/job/Libra%20WAR/lastSuccessfulBuild/artifact/development/org.eclipse.libra.repository/target/org.eclipse.libra.repository-0.3.5-SNAPSHOT.zip!/</url>
</repository>
<repository>
<id>bundlor-milestone</id>
@@ -424,8 +428,7 @@
<useUIHarness>true</useUIHarness>
<useUIThread>true</useUIThread>
<forkedProcessTimeoutInSeconds>1800</forkedProcessTimeoutInSeconds>
- <argLine>-Xmx1024m -XX:MaxPermSize=256m
- -Djava.io.tmpdir=${project.build.directory} ${test.osvmargs}</argLine>
+ <argLine>-Xmx1024m -Djava.io.tmpdir=${project.build.directory} ${test.osvmargs}</argLine>
</configuration>
</plugin>
</plugins>

Back to the top