Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMickael Istria2020-08-18 13:47:04 +0000
committerMickael Istria2020-08-18 20:45:48 +0000
commitc8a4bb474269a9cad4a8f83dae84ca04cbc231e7 (patch)
tree3b0f9fcdd2fb25884aedd82759262b20cf11ac61
parenta8e7219788093468a39139d79055dfdc3c43dae2 (diff)
downloadorg.eclipse.epp.packages-c8a4bb474269a9cad4a8f83dae84ca04cbc231e7.tar.gz
org.eclipse.epp.packages-c8a4bb474269a9cad4a8f83dae84ca04cbc231e7.tar.xz
org.eclipse.epp.packages-c8a4bb474269a9cad4a8f83dae84ca04cbc231e7.zip
Update to newer Tycho and JustJ
Change-Id: Ifb7c97becf600b964e446eecf2e25b859c7a84a1 Signed-off-by: Mickael Istria <mistria@redhat.com>
-rw-r--r--archive-template/category.xml4
-rw-r--r--archive-template/pom.xml8
-rw-r--r--packages/a.jre.noop/.project22
-rw-r--r--packages/a.jre.noop/.settings/org.eclipse.pde.core.prefs3
-rw-r--r--packages/a.jre.noop/META-INF/MANIFEST.MF7
-rw-r--r--packages/a.jre.noop/build.properties1
-rw-r--r--packages/a.jre.noop/pom.xml32
-rw-r--r--packages/org.eclipse.epp.package.cpp.product/pom.xml17
-rw-r--r--packages/org.eclipse.epp.package.javascript.product/pom.xml17
-rw-r--r--packages/org.eclipse.epp.package.rust.product/pom.xml17
-rw-r--r--pom.xml1
-rw-r--r--releng/org.eclipse.epp.config/parent/pom.xml4
-rw-r--r--releng/org.eclipse.epp.config/parent/product/pom.xml9
13 files changed, 20 insertions, 122 deletions
diff --git a/archive-template/category.xml b/archive-template/category.xml
new file mode 100644
index 00000000..3eb5bffb
--- /dev/null
+++ b/archive-template/category.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<site>
+ <feature id="org.eclipse.justj.openjdk.hotspot.jre.full" version="0.0.0"/>
+</site>
diff --git a/archive-template/pom.xml b/archive-template/pom.xml
index 9db43b6c..61893720 100644
--- a/archive-template/pom.xml
+++ b/archive-template/pom.xml
@@ -43,6 +43,14 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>target-platform-configuration</artifactId>
+ <version>${tycho.version}</version>
+ <configuration>
+ <executionEnvironment>none</executionEnvironment>
+ </configuration>
+ </plugin>
</plugins>
</build>
</project>
diff --git a/packages/a.jre.noop/.project b/packages/a.jre.noop/.project
deleted file mode 100644
index 7fd49be0..00000000
--- a/packages/a.jre.noop/.project
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>a.jre.noop</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- </natures>
-</projectDescription>
diff --git a/packages/a.jre.noop/.settings/org.eclipse.pde.core.prefs b/packages/a.jre.noop/.settings/org.eclipse.pde.core.prefs
deleted file mode 100644
index f29e940a..00000000
--- a/packages/a.jre.noop/.settings/org.eclipse.pde.core.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-eclipse.preferences.version=1
-pluginProject.extensions=false
-resolve.requirebundle=false
diff --git a/packages/a.jre.noop/META-INF/MANIFEST.MF b/packages/a.jre.noop/META-INF/MANIFEST.MF
deleted file mode 100644
index b72dde67..00000000
--- a/packages/a.jre.noop/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,7 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Noop Execution environment to make JustJ work
-Bundle-SymbolicName: a.jre.noop
-Bundle-Version: 1.0.0
-Bundle-Vendor: Eclipse Packaging Project
-Automatic-Module-Name: a.jre.noop
diff --git a/packages/a.jre.noop/build.properties b/packages/a.jre.noop/build.properties
deleted file mode 100644
index 5f22cdd4..00000000
--- a/packages/a.jre.noop/build.properties
+++ /dev/null
@@ -1 +0,0 @@
-bin.includes = META-INF/
diff --git a/packages/a.jre.noop/pom.xml b/packages/a.jre.noop/pom.xml
deleted file mode 100644
index 6df507cb..00000000
--- a/packages/a.jre.noop/pom.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2012, 2020 Eclipse Foundation and others.
- All rights reserved. This program and the accompanying materials
- are made available under the terms of the Eclipse Distribution License v1.0
- which accompanies this distribution, and is available at
- http://www.eclipse.org/org/documents/edl-v10.php
-
- Contributors:
- Igor Fedorenko - initial implementation
- Thanh Ha (Eclipse Foundation) - initial implementation
- EclipseSource - ongoing development
- Mikael Barbero (Eclipse Foundation) - clean-up and parent factorization
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.epp</groupId>
- <artifactId>org.eclipse.epp-bundle-parent</artifactId>
- <version>4.17.0-SNAPSHOT</version>
- <relativePath>../../releng/org.eclipse.epp.config/parent/bundle</relativePath>
- </parent>
-
- <artifactId>a.jre.noop</artifactId>
- <packaging>eclipse-plugin</packaging>
- <version>1.0.0</version>
-
-</project>
diff --git a/packages/org.eclipse.epp.package.cpp.product/pom.xml b/packages/org.eclipse.epp.package.cpp.product/pom.xml
index dde9fa6c..b96eb0d7 100644
--- a/packages/org.eclipse.epp.package.cpp.product/pom.xml
+++ b/packages/org.eclipse.epp.package.cpp.product/pom.xml
@@ -34,21 +34,8 @@
<artifactId>target-platform-configuration</artifactId>
<version>${tycho.version}</version>
<configuration>
- <!-- a.jre.javase units are added by Tycho for regular execution environments.
- Those units aren't compatible with JustJ which has a negative requirement
- on a.jre.javase.
- So we raplace those EE units in Tycho by an empty EE/Unit that doesn't interfere
- with JustJ -->
- <executionEnvironment>Noop-1.0</executionEnvironment>
- <dependency-resolution>
- <extraRequirements>
- <requirement>
- <type>eclipse-plugin</type>
- <id>a.jre.noop</id>
- <versionRange>0.0.0</versionRange>
- </requirement>
- </extraRequirements>
- </dependency-resolution>
+ <!-- Do not include execution environment units, so we're sure JustJ is used -->
+ <executionEnvironment>none</executionEnvironment>
</configuration>
</plugin>
</plugins>
diff --git a/packages/org.eclipse.epp.package.javascript.product/pom.xml b/packages/org.eclipse.epp.package.javascript.product/pom.xml
index c60e6592..c9967f8b 100644
--- a/packages/org.eclipse.epp.package.javascript.product/pom.xml
+++ b/packages/org.eclipse.epp.package.javascript.product/pom.xml
@@ -33,21 +33,8 @@
<artifactId>target-platform-configuration</artifactId>
<version>${tycho.version}</version>
<configuration>
- <!-- a.jre.javase units are added by Tycho for regular execution environments.
- Those units aren't compatible with JustJ which has a negative requirement
- on a.jre.javase.
- So we raplace those EE units in Tycho by an empty EE/Unit that doesn't interfere
- with JustJ -->
- <executionEnvironment>Noop-1.0</executionEnvironment>
- <dependency-resolution>
- <extraRequirements>
- <requirement>
- <type>eclipse-plugin</type>
- <id>a.jre.noop</id>
- <versionRange>0.0.0</versionRange>
- </requirement>
- </extraRequirements>
- </dependency-resolution>
+ <!-- Do not include execution environment units, so we're sure JustJ is used -->
+ <executionEnvironment>none</executionEnvironment>
</configuration>
</plugin>
</plugins>
diff --git a/packages/org.eclipse.epp.package.rust.product/pom.xml b/packages/org.eclipse.epp.package.rust.product/pom.xml
index 7d414bba..b97d9e27 100644
--- a/packages/org.eclipse.epp.package.rust.product/pom.xml
+++ b/packages/org.eclipse.epp.package.rust.product/pom.xml
@@ -35,21 +35,8 @@
<artifactId>target-platform-configuration</artifactId>
<version>${tycho.version}</version>
<configuration>
- <!-- a.jre.javase units are added by Tycho for regular execution environments.
- Those units aren't compatible with JustJ which has a negative requirement
- on a.jre.javase.
- So we raplace those EE units in Tycho by an empty EE/Unit that doesn't interfere
- with JustJ -->
- <executionEnvironment>Noop-1.0</executionEnvironment>
- <dependency-resolution>
- <extraRequirements>
- <requirement>
- <type>eclipse-plugin</type>
- <id>a.jre.noop</id>
- <versionRange>0.0.0</versionRange>
- </requirement>
- </extraRequirements>
- </dependency-resolution>
+ <!-- Do not include execution environment units, so we're sure JustJ is used -->
+ <executionEnvironment>none</executionEnvironment>
</configuration>
</plugin>
</plugins>
diff --git a/pom.xml b/pom.xml
index b419599e..f4c8c23b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,6 @@
<packaging>pom</packaging>
<modules>
- <module>packages/a.jre.noop</module>
<module>archive-template</module>
<module>packages/org.eclipse.epp.package.common</module>
<module>packages/org.eclipse.epp.package.common.feature</module>
diff --git a/releng/org.eclipse.epp.config/parent/pom.xml b/releng/org.eclipse.epp.config/parent/pom.xml
index 25515d82..7140ce53 100644
--- a/releng/org.eclipse.epp.config/parent/pom.xml
+++ b/releng/org.eclipse.epp.config/parent/pom.xml
@@ -24,7 +24,7 @@
<properties>
<maven.version>3.1.1</maven.version>
- <tycho.version>1.7.0</tycho.version>
+ <tycho.version>2.0.0</tycho.version>
<tycho.extras.version>${tycho.version}</tycho.extras.version>
<tycho.scmUrl>scm:git:git://git.eclipse.org/gitroot/epp/org.eclipse.epp.packages.git</tycho.scmUrl>
<cbi.version>1.1.8-SNAPSHOT</cbi.version>
@@ -73,7 +73,7 @@
</repository>
<repository>
<id>justj</id>
- <url>https://download.eclipse.org/justj/sandbox/jres/14/updates/nightly/latest/</url>
+ <url>https://download.eclipse.org/justj/jres/14/updates/release/latest/</url>
<layout>p2</layout>
</repository>
</repositories>
diff --git a/releng/org.eclipse.epp.config/parent/product/pom.xml b/releng/org.eclipse.epp.config/parent/product/pom.xml
index 4cb99768..d2348cac 100644
--- a/releng/org.eclipse.epp.config/parent/product/pom.xml
+++ b/releng/org.eclipse.epp.config/parent/product/pom.xml
@@ -32,15 +32,6 @@
<build>
<plugins>
-
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>target-platform-configuration</artifactId>
- <configuration>
- <executionEnvironment>JavaSE-9</executionEnvironment>
- </configuration>
- </plugin>
-
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-p2-repository-plugin</artifactId>

Back to the top