Skip to content

Commit 8183bc3

Browse files
plangerplanger
committed
Update to Eclipse 2019-12
1 parent 75d239a commit 8183bc3

File tree

4 files changed

+39
-79
lines changed

4 files changed

+39
-79
lines changed

‎com.eclipsesource.megit.parent/pom.xml

+2-48
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,14 @@
99
<packaging>pom</packaging>
1010

1111
<properties>
12-
<tycho-version>1.2.0</tycho-version>
13-
<tycho-extras-version>1.2.0</tycho-extras-version>
12+
<tycho-version>1.6.0</tycho-version>
13+
<tycho-extras-version>1.6.0</tycho-extras-version>
1414
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1515
<maven.compiler.source>1.8</maven.compiler.source>
1616
<maven.compiler.target>1.8</maven.compiler.target>
1717

1818
<mav-checkstyle-version>3.0.0</mav-checkstyle-version>
1919
<checkstyle-version>8.8</checkstyle-version>
20-
21-
<ecore.version>2.15.0</ecore.version>
22-
<xtend.version>2.15.0</xtend.version>
2320
</properties>
2421

2522
<pluginRepositories>
@@ -72,32 +69,16 @@
7269
<allowConflictingDependencies>true</allowConflictingDependencies>
7370
<includePackedArtifacts>true</includePackedArtifacts>
7471
<environments>
75-
<environment>
76-
<os>win32</os>
77-
<ws>win32</ws>
78-
<arch>x86</arch>
79-
</environment>
8072
<environment>
8173
<os>win32</os>
8274
<ws>win32</ws>
8375
<arch>x86_64</arch>
8476
</environment>
85-
<environment>
86-
<os>linux</os>
87-
<ws>gtk</ws>
88-
<arch>x86</arch>
89-
</environment>
9077
<environment>
9178
<os>linux</os>
9279
<ws>gtk</ws>
9380
<arch>x86_64</arch>
9481
</environment>
95-
<!-- Beginning with mars this environment is removed -->
96-
<!--environment>
97-
<os>macosx</os>
98-
<ws>cocoa</ws>
99-
<arch>x86</arch>
100-
</environment-->
10182
<environment>
10283
<os>macosx</os>
10384
<ws>cocoa</ws>
@@ -141,33 +122,6 @@
141122
-->
142123
</configuration>
143124
</plugin>
144-
<!-- to disable use -Dcheckstyle.skip -->
145-
<plugin>
146-
<groupId>org.apache.maven.plugins</groupId>
147-
<artifactId>maven-checkstyle-plugin</artifactId>
148-
<version>${mav-checkstyle-version}</version>
149-
<!-- https://maven.apache.org/plugins/maven-checkstyle-plugin/history.html -->
150-
<configuration>
151-
<configLocation>checkstyle/esmCheckstyle.xml</configLocation>
152-
<excludes>**/xtend/**/*</excludes>
153-
<failsOnError>false</failsOnError>
154-
</configuration>
155-
<executions>
156-
<execution>
157-
<goals>
158-
<goal>check</goal>
159-
</goals>
160-
<phase>verify</phase>
161-
</execution>
162-
</executions>
163-
<dependencies>
164-
<dependency>
165-
<groupId>com.puppycrawl.tools</groupId>
166-
<artifactId>checkstyle</artifactId>
167-
<version>${checkstyle-version}</version>
168-
</dependency>
169-
</dependencies>
170-
</plugin>
171125

172126
<!-- enable source bundle generation -->
173127
<plugin>

‎com.eclipsesource.megit.product/megit.product

+1-1
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,7 @@ version(s), and exceptions or additional permissions here}.&quot;
322322
<configurations>
323323
<plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="0" />
324324
<plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" />
325-
<plugin id="org.eclipse.equinox.ds" autoStart="true" startLevel="2" />
325+
<plugin id="org.apache.felix.scr" autoStart="true" startLevel="2" />
326326
<plugin id="org.eclipse.equinox.event" autoStart="true" startLevel="2" />
327327
<plugin id="org.eclipse.equinox.simpleconfigurator" autoStart="true" startLevel="1" />
328328
</configurations>

‎com.eclipsesource.megit.target/com.eclipsesource.megit.target.target

+28-24
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,34 @@
1-
<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde?><!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl --><target name="MeGit Target" sequenceNumber="1541425529">
1+
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2+
<?pde?>
3+
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
4+
<target name="MeGit Target" sequenceNumber="1580923114">
25
<locations>
3-
<location includeAllPlatforms="true" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
4-
<unit id="org.eclipse.jgit.feature.group" version="5.1.0.201809111528-r"/>
5-
<unit id="org.eclipse.egit.feature.group" version="5.1.0.201809111528-r"/>
6-
<unit id="org.eclipse.egit.gitflow.feature.feature.group" version="5.1.0.201809111528-r"/>
7-
<unit id="org.eclipse.emf.sdk.feature.group" version="2.15.0.v20180905-1732"/>
6+
<location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
7+
<unit id="org.eclipse.jgit.feature.group" version="5.6.0.201912101111-r"/>
8+
<unit id="org.eclipse.jgit.http.apache.feature.group" version="5.6.0.201912101111-r"/>
9+
<unit id="org.eclipse.jgit.ssh.apache.feature.group" version="5.6.0.201912101111-r"/>
10+
<unit id="org.eclipse.egit.feature.group" version="5.6.0.201912101111-r"/>
11+
<unit id="org.eclipse.egit.gitflow.feature.feature.group" version="5.6.0.201912101111-r"/>
12+
<unit id="org.eclipse.emf.sdk.feature.group" version="2.20.0.v20191028-0905"/>
813
<unit id="org.eclipse.emf.transaction.feature.group" version="1.12.0.201805140824"/>
9-
<unit id="org.eclipse.emf.validation.feature.group" version="1.12.0.201805030717"/>
10-
<repository location="http://download.eclipse.org/releases/latest/"/>
14+
<unit id="org.eclipse.emf.validation.feature.group" version="1.12.1.201812070911"/>
15+
<unit id="org.eclipse.platform.ide" version="4.14.0.I20191210-0610"/>
16+
<unit id="org.eclipse.equinox.p2.rcp.feature.feature.group" version="1.4.600.v20191120-0247"/>
17+
<unit id="org.eclipse.equinox.sdk.feature.group" version="3.20.0.v20191122-2104"/>
18+
<unit id="org.eclipse.equinox.core.feature.feature.group" version="1.11.0.v20191114-1701"/>
19+
<unit id="org.eclipse.equinox.p2.discovery.feature.feature.group" version="1.2.400.v20191014-1907"/>
20+
<unit id="org.eclipse.equinox.executable.feature.group" version="3.8.600.v20191014-2025"/>
21+
<unit id="org.eclipse.ecf.core.feature.feature.group" version="1.5.400.v20191023-2007"/>
22+
<unit id="org.eclipse.ecf.core.ssl.feature.feature.group" version="1.1.300.v20191023-2007"/>
23+
<unit id="org.eclipse.ecf.filetransfer.feature.feature.group" version="3.14.600.v20191023-2007"/>
24+
<unit id="org.eclipse.ecf.filetransfer.httpclient45.feature.feature.group" version="1.0.100.v20191024-1546"/>
25+
<unit id="org.eclipse.ecf.filetransfer.ssl.feature.feature.group" version="1.1.200.v20191024-1546"/>
26+
<repository location="http://download.eclipse.org/releases/2019-12/"/>
1127
</location>
12-
<location includeAllPlatforms="true" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
13-
<unit id="org.eclipse.platform.ide" version="4.9.0.I20180906-0745"/>
14-
<unit id="org.eclipse.equinox.sdk.feature.group" version="3.15.0.v20180904-1442"/>
15-
<unit id="org.eclipse.equinox.p2.discovery.feature.feature.group" version="1.2.100.v20180822-1357"/>
16-
<unit id="org.eclipse.ecf.core.feature.feature.group" version="1.5.1.v20180810-0833"/>
17-
<unit id="org.eclipse.ecf.core.ssl.feature.feature.group" version="1.1.100.v20180301-0201"/>
18-
<unit id="org.eclipse.ecf.filetransfer.feature.feature.group" version="3.14.2.v20180801-2237"/>
19-
<unit id="org.eclipse.ecf.filetransfer.httpclient4.feature.feature.group" version="3.14.2.v20180801-2237"/>
20-
<unit id="org.eclipse.ecf.filetransfer.httpclient4.ssl.feature.feature.group" version="1.1.100.v20180301-0132"/>
21-
<unit id="org.eclipse.ecf.filetransfer.ssl.feature.feature.group" version="1.1.100.v20180301-0132"/>
22-
<repository location="http://download.eclipse.org/eclipse/updates/4.9/"/>
23-
</location>
24-
<location includeAllPlatforms="true" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
25-
<unit id="com.google.guava" version="21.0.0.v20170206-1425"/>
28+
<location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
29+
<unit id="com.google.guava" version="27.1.0.v20190517-1946"/>
2630
<unit id="com.google.gson" version="2.8.2.v20180104-1110"/>
27-
<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20180905201904/repository"/>
31+
<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20191126223242/repository"/>
2832
</location>
2933
</locations>
30-
</target>
34+
</target>

‎com.eclipsesource.megit.target/com.eclipsesource.megit.target.tpd

+8-6
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,27 @@
11
target "MeGit Target"
22
with allEnvironments source
3-
location "http://download.eclipse.org/releases/latest/" {
3+
location "http://download.eclipse.org/releases/2019-12/" {
44
org.eclipse.jgit.feature.group
5+
org.eclipse.jgit.http.apache.feature.group
6+
org.eclipse.jgit.ssh.apache.feature.group
57
org.eclipse.egit.feature.group
68
org.eclipse.egit.gitflow.feature.feature.group
79
org.eclipse.emf.sdk.feature.group
810
org.eclipse.emf.transaction.feature.group
911
org.eclipse.emf.validation.feature.group
10-
}
11-
location "http://download.eclipse.org/eclipse/updates/4.9/" {
1212
org.eclipse.platform.ide
13+
org.eclipse.equinox.p2.rcp.feature.feature.group
1314
org.eclipse.equinox.sdk.feature.group
15+
org.eclipse.equinox.core.feature.feature.group
1416
org.eclipse.equinox.p2.discovery.feature.feature.group
17+
org.eclipse.equinox.executable.feature.group
1518
org.eclipse.ecf.core.feature.feature.group
1619
org.eclipse.ecf.core.ssl.feature.feature.group
1720
org.eclipse.ecf.filetransfer.feature.feature.group
18-
org.eclipse.ecf.filetransfer.httpclient4.feature.feature.group
19-
org.eclipse.ecf.filetransfer.httpclient4.ssl.feature.feature.group
21+
org.eclipse.ecf.filetransfer.httpclient45.feature.feature.group
2022
org.eclipse.ecf.filetransfer.ssl.feature.feature.group
2123
}
22-
location "http://download.eclipse.org/tools/orbit/downloads/drops/R20180905201904/repository" {
24+
location "http://download.eclipse.org/tools/orbit/downloads/drops/R20191126223242/repository" {
2325
com.google.guava
2426
com.google.gson
2527
}

0 commit comments

Comments
 (0)