Skip to content

Commit

Permalink
#223 Migrate to 2021-06
Browse files Browse the repository at this point in the history 
- Update TP
  - Eclipse 2021-06
  - Sirius 7.0.0 stable
- Java version from 1.8 to 11
- Remove use of pack200
- Add explicitly org.eclipse.team.svn in TP
- Update eclipse-jarsigner-plugin version (see #225)

Change-Id: I592eb30f64b98bcaccc95da331e72993a849a679
  • Loading branch information
@arnauddieumegard @pdulth
arnauddieumegard authored and pdulth committed Aug 23, 2021
1 parent c3a7402 commit 234420f
Show file tree
Hide file tree
Showing 3 changed files with 36 additions and 39 deletions.
30 changes: 2 additions & 28 deletions releng/org.eclipse.emf.diffmerge.configuration/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
<packaging>pom</packaging>

<properties>
<cbi.jarsigner.version>1.1.3</cbi.jarsigner.version>
<cbi.jarsigner.version>1.3.2</cbi.jarsigner.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<rcptt.version>2.4.3</rcptt.version>
<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.dependency.version>2.10</maven.dependency.version>
Expand Down Expand Up @@ -117,19 +117,6 @@
</activation>
<build>
<plugins>
<plugin>
<groupId>org.eclipse.tycho.extras</groupId>
<artifactId>tycho-pack200a-plugin</artifactId>
<version>${tycho.version}</version>
<executions>
<execution>
<id>pack200-normalize</id>
<goals>
<goal>normalize</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.eclipse.cbi.maven.plugins</groupId>
<artifactId>eclipse-jarsigner-plugin</artifactId>
Expand All @@ -144,19 +131,6 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.eclipse.tycho.extras</groupId>
<artifactId>tycho-pack200b-plugin</artifactId>
<version>${tycho.version}</version>
<executions>
<execution>
<id>pack200-pack</id>
<goals>
<goal>pack</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-p2-plugin</artifactId>
Expand Down
26 changes: 18 additions & 8 deletions releng/org.eclipse.emf.diffmerge.target/org.eclipse.emf.diffmerge.target.target
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
<target name="org.eclipse.emf.diffmerge" sequenceNumber="1581953354">
<target name="org.eclipse.emf.diffmerge" sequenceNumber="1628153045">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.license.feature.group" version="2.0.2.v20181016-2210"/>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.license.feature.group" version="0.0.0"/>
<repository location="http://download.eclipse.org/cbi/updates/license/"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.equinox.sdk.feature.group" version="0.0.0"/>
<unit id="org.eclipse.platform.sdk" version="0.0.0"/>
<unit id="org.eclipse.jdt.feature.group" version="0.0.0"/>
Expand All @@ -21,19 +21,29 @@
<unit id="org.eclipse.jgit.feature.group" version="0.0.0"/>
<unit id="org.eclipse.jgit.ssh.apache.feature.group" version="0.0.0"/>
<unit id="org.eclipse.jgit.ssh.jsch.feature.group" version="0.0.0"/>
<unit id="org.eclipse.jgit.http.apache.feature.group" version="0.0.0"/>
<unit id="org.eclipse.jgit.http.apache.feature.group" version="0.0.0"/>
<unit id="org.eclipse.egit.feature.group" version="0.0.0"/>
<unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
<unit id="org.eclipse.emf.transaction.sdk.feature.group" version="0.0.0"/>
<unit id="org.eclipse.emf.validation.sdk.feature.group" version="0.0.0"/>
<unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="0.0.0"/>
<unit id="org.eclipse.gmf.runtime.notation.feature.group" version="0.0.0"/>
<unit id="com.google.guava" version="0.0.0"/>
<repository location="http://download.eclipse.org/releases/2020-06"/>
<repository location="http://download.eclipse.org/releases/2021-06"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.sirius.specifier.feature.group" version="0.0.0"/>
<repository location="https://download.eclipse.org/sirius/updates/releases/6.4.0/2020-06"/>
<unit id="org.eclipse.sirius.runtime.ide.ui.feature.group" version="0.0.0"/>
<repository location="https://download.eclipse.org/sirius/updates/stable/7.0.0-S20210722-123507/2021-06"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.apache.batik.bridge.source" version="0.0.0"/>
<unit id="org.apache.batik.script.source" version="0.0.0"/>
<repository id="Orbit" location="https://download.eclipse.org/tools/orbit/downloads/drops/R20210602031627/repository"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.team.svn.feature.group" version="0.0.0"/>
<repository id="subversive" location="https://download.eclipse.org/technology/subversive/3.0/update-site"/>
</location>
</locations>
</target>
19 changes: 16 additions & 3 deletions releng/org.eclipse.emf.diffmerge.target/org.eclipse.emf.diffmerge.target.tpd
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
target "org.eclipse.emf.diffmerge"

with source, requirements

location "http://download.eclipse.org/cbi/updates/license/" {
org.eclipse.license.feature.group [2.0.2.v20181016-2210,2.0.2.v20181016-2210]
org.eclipse.license.feature.group lazy
}

location "http://download.eclipse.org/releases/2020-06" {
location "http://download.eclipse.org/releases/2021-06" {
org.eclipse.equinox.sdk.feature.group lazy
org.eclipse.platform.sdk lazy
org.eclipse.jdt.feature.group lazy
Expand All @@ -27,6 +29,17 @@ location "http://download.eclipse.org/releases/2020-06" {
org.eclipse.gmf.runtime.notation.feature.group lazy
com.google.guava lazy
}
location "https://download.eclipse.org/sirius/updates/releases/6.4.0/2020-06" {

location "https://download.eclipse.org/sirius/updates/stable/7.0.0-S20210722-123507/2021-06" {
org.eclipse.sirius.specifier.feature.group lazy
org.eclipse.sirius.runtime.ide.ui.feature.group lazy
}

location Orbit "https://download.eclipse.org/tools/orbit/downloads/drops/R20210602031627/repository" {
org.apache.batik.bridge.source lazy
org.apache.batik.script.source lazy
}

location subversive "https://download.eclipse.org/technology/subversive/3.0/update-site" {
org.eclipse.team.svn.feature.group lazy
}

0 comments on commit 234420f

Please sign in to comment.