Skip to content

Commit a0cd7c1

Browse files
committed
Update to Eclipse and EGit 2022-12
1 parent 57dbfa8 commit a0cd7c1

File tree

15 files changed

+55
-52
lines changed

15 files changed

+55
-52
lines changed

README.md

+1
Original file line numberDiff line numberDiff line change
@@ -50,3 +50,4 @@ The runnable product will be available in `com.eclipsesource.megit.product/targe
5050
* 0.0.4 Update to Eclipse EGit 2021-09
5151
* 0.1.0 Update to Eclipse EGit 2021-12
5252
* 0.2.0 Update to Eclipse EGit 2022-06
53+
* 0.3.0 Update to Eclipse EGit 2022-12

com.eclipsesource.megit.parent/.project

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@
1616
</natures>
1717
<filteredResources>
1818
<filter>
19-
<id>1660152157423</id>
19+
<id>1673359652144</id>
2020
<name></name>
2121
<type>30</type>
2222
<matcher>
2323
<id>org.eclipse.core.resources.regexFilterMatcher</id>
24-
<arguments>node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
24+
<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
2525
</matcher>
2626
</filter>
2727
</filteredResources>

com.eclipsesource.megit.parent/pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
<modelVersion>4.0.0</modelVersion>
66
<groupId>com.eclipsesource.megit</groupId>
77
<artifactId>com.eclipsesource.megit.parent</artifactId>
8-
<version>0.2.0-SNAPSHOT</version>
8+
<version>0.3.0-SNAPSHOT</version>
99
<packaging>pom</packaging>
1010

1111
<properties>
12-
<tycho-version>2.2.0</tycho-version>
13-
<tycho-extras-version>2.2.0</tycho-extras-version>
12+
<tycho-version>2.7.5</tycho-version>
13+
<tycho-extras-version>2.7.5</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>

com.eclipsesource.megit.plugin/.project

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,12 @@
3333
</natures>
3434
<filteredResources>
3535
<filter>
36-
<id>1660152157426</id>
36+
<id>1673359652153</id>
3737
<name></name>
3838
<type>30</type>
3939
<matcher>
4040
<id>org.eclipse.core.resources.regexFilterMatcher</id>
41-
<arguments>node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
41+
<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
4242
</matcher>
4343
</filter>
4444
</filteredResources>

com.eclipsesource.megit.plugin/META-INF/MANIFEST.MF

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
22
Bundle-ManifestVersion: 2
33
Bundle-Name: Plugin
44
Bundle-SymbolicName: com.eclipsesource.megit.plugin;singleton:=true
5-
Bundle-Version: 0.2.0.qualifier
5+
Bundle-Version: 0.3.0.qualifier
66
Bundle-Activator: com.eclipsesource.megit.plugin.Activator
77
Bundle-Vendor: ECLIPSESOURCE
88
Require-Bundle: org.eclipse.ui,

com.eclipsesource.megit.plugin/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>com.eclipsesource.megit</groupId>
99
<artifactId>com.eclipsesource.megit.parent</artifactId>
10-
<version>0.2.0-SNAPSHOT</version>
10+
<version>0.3.0-SNAPSHOT</version>
1111
<relativePath>../com.eclipsesource.megit.parent</relativePath>
1212
</parent>
1313
<artifactId>com.eclipsesource.megit.plugin</artifactId>

com.eclipsesource.megit.product.feature/.project

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@
2222
</natures>
2323
<filteredResources>
2424
<filter>
25-
<id>1660152157434</id>
25+
<id>1673359652170</id>
2626
<name></name>
2727
<type>30</type>
2828
<matcher>
2929
<id>org.eclipse.core.resources.regexFilterMatcher</id>
30-
<arguments>node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
30+
<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
3131
</matcher>
3232
</filter>
3333
</filteredResources>

com.eclipsesource.megit.product.feature/feature.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<feature
33
id="com.eclipsesource.megit.product.feature"
44
label="Minimal EGit Product Feature"
5-
version="0.2.0.qualifier"
5+
version="0.3.0.qualifier"
66
provider-name="ECLIPSESOURCE">
77

88
<description url="https://github.com/eclipsesource/megit">

com.eclipsesource.megit.product.feature/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>com.eclipsesource.megit</groupId>
99
<artifactId>com.eclipsesource.megit.parent</artifactId>
10-
<version>0.2.0-SNAPSHOT</version>
10+
<version>0.3.0-SNAPSHOT</version>
1111
<relativePath>../com.eclipsesource.megit.parent</relativePath>
1212
</parent>
1313
<artifactId>com.eclipsesource.megit.product.feature</artifactId>

com.eclipsesource.megit.product/.project

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@
1616
</natures>
1717
<filteredResources>
1818
<filter>
19-
<id>1660152157430</id>
19+
<id>1673359652159</id>
2020
<name></name>
2121
<type>30</type>
2222
<matcher>
2323
<id>org.eclipse.core.resources.regexFilterMatcher</id>
24-
<arguments>node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
24+
<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
2525
</matcher>
2626
</filter>
2727
</filteredResources>

com.eclipsesource.megit.product/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>com.eclipsesource.megit</groupId>
99
<artifactId>com.eclipsesource.megit.parent</artifactId>
10-
<version>0.2.0-SNAPSHOT</version>
10+
<version>0.3.0-SNAPSHOT</version>
1111
<relativePath>../com.eclipsesource.megit.parent</relativePath>
1212
</parent>
1313
<artifactId>com.eclipsesource.megit.product</artifactId>

com.eclipsesource.megit.target/.project

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@
2222
</natures>
2323
<filteredResources>
2424
<filter>
25-
<id>1660152157437</id>
25+
<id>1673359652178</id>
2626
<name></name>
2727
<type>30</type>
2828
<matcher>
2929
<id>org.eclipse.core.resources.regexFilterMatcher</id>
30-
<arguments>node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
30+
<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
3131
</matcher>
3232
</filter>
3333
</filteredResources>
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,48 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
22
<?pde?>
33
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
4-
<target name="MeGit Target" sequenceNumber="1660157178">
4+
<target name="MeGit Target" sequenceNumber="1673360380">
55
<locations>
66
<location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
7-
<unit id="org.eclipse.jgit.feature.group" version="6.2.0.202206071550-r"/>
8-
<unit id="org.eclipse.jgit.gpg.bc.feature.group" version="6.2.0.202206071550-r"/>
9-
<unit id="org.eclipse.jgit.ssh.jsch.feature.group" version="6.2.0.202206071550-r"/>
10-
<unit id="org.eclipse.jgit.http.apache.feature.group" version="6.2.0.202206071550-r"/>
11-
<unit id="org.eclipse.jgit.ssh.apache.feature.group" version="6.2.0.202206071550-r"/>
12-
<unit id="org.eclipse.egit.feature.group" version="6.2.0.202206071550-r"/>
13-
<unit id="org.eclipse.egit.gitflow.feature.feature.group" version="6.2.0.202206071550-r"/>
14-
<unit id="org.eclipse.emf.sdk.feature.group" version="2.30.0.v20220516-1117"/>
15-
<unit id="org.eclipse.emf.transaction.feature.group" version="1.12.0.201805140824"/>
16-
<unit id="org.eclipse.emf.validation.feature.group" version="1.12.2.202008210805"/>
17-
<unit id="org.eclipse.platform.ide" version="4.24.0.I20220607-0700"/>
18-
<unit id="org.eclipse.equinox.p2.rcp.feature.feature.group" version="1.4.1600.v20220518-1326"/>
19-
<unit id="org.eclipse.equinox.sdk.feature.group" version="3.23.400.v20220516-2155"/>
20-
<unit id="org.eclipse.equinox.core.feature.feature.group" version="1.13.600.v20220516-2155"/>
21-
<unit id="org.eclipse.equinox.p2.discovery.feature.feature.group" version="1.2.1100.v20220210-1157"/>
22-
<unit id="org.eclipse.equinox.executable.feature.group" version="3.8.1700.v20220509-0833"/>
7+
<unit id="org.eclipse.jgit.feature.group" version="6.4.0.202211300538-r"/>
8+
<unit id="org.eclipse.jgit.gpg.bc.feature.group" version="6.4.0.202211300538-r"/>
9+
<unit id="org.eclipse.jgit.ssh.jsch.feature.group" version="6.4.0.202211300538-r"/>
10+
<unit id="org.eclipse.jgit.http.apache.feature.group" version="6.4.0.202211300538-r"/>
11+
<unit id="org.eclipse.jgit.ssh.apache.feature.group" version="6.4.0.202211300538-r"/>
12+
<unit id="org.eclipse.egit.feature.group" version="6.4.0.202211300538-r"/>
13+
<unit id="org.eclipse.egit.gitflow.feature.feature.group" version="6.4.0.202211300538-r"/>
14+
<unit id="org.eclipse.emf.sdk.feature.group" version="2.32.0.v20221121-1400"/>
15+
<unit id="org.eclipse.emf.transaction.feature.group" version="1.13.0.202208110935"/>
16+
<unit id="org.eclipse.emf.validation.feature.group" version="1.13.2.202208271102"/>
17+
<unit id="org.eclipse.platform.ide" version="4.26.0.I20221123-1800"/>
18+
<unit id="org.eclipse.equinox.p2.rcp.feature.feature.group" version="1.4.1800.v20221117-1044"/>
19+
<unit id="org.eclipse.equinox.sdk.feature.group" version="3.23.600.v20221116-1440"/>
20+
<unit id="org.eclipse.equinox.core.feature.feature.group" version="1.13.900.v20221116-1440"/>
21+
<unit id="org.eclipse.equinox.p2.discovery.feature.feature.group" version="1.2.1200.v20221111-1340"/>
22+
<unit id="org.eclipse.equinox.executable.feature.group" version="3.8.1900.v20221108-1024"/>
2323
<unit id="org.eclipse.ecf.core.feature.feature.group" version="1.6.1.v20211005-1944"/>
2424
<unit id="org.eclipse.ecf.core.ssl.feature.feature.group" version="1.1.501.v20210409-2301"/>
2525
<unit id="org.eclipse.ecf.filetransfer.feature.feature.group" version="3.14.1800.v20220215-0126"/>
26-
<unit id="org.eclipse.ecf.filetransfer.httpclient5.feature.feature.group" version="1.1.600.v20220215-0126"/>
26+
<unit id="org.eclipse.ecf.filetransfer.httpclient5.feature.feature.group" version="1.1.701.v20221112-0806"/>
2727
<unit id="org.eclipse.ecf.filetransfer.ssl.feature.feature.group" version="1.1.401.v20210409-2301"/>
28+
<unit id="org.eclipse.jdt.core" version="3.32.0.v20221108-1853"/>
2829
<unit id="javaewah" version="1.1.13.v20211029-0839"/>
29-
<unit id="org.bouncycastle.bcpg" version="1.70.0.v20220507-1208"/>
30-
<unit id="org.bouncycastle.bcprov" version="1.70.0.v20220507-1208"/>
3130
<unit id="net.i2p.crypto.eddsa" version="0.3.0.v20220506-1020"/>
3231
<unit id="org.apache.commons.io" version="2.8.0.v20210415-0900"/>
3332
<unit id="org.apache.commons.compress" version="1.21.0.v20211103-2100"/>
3433
<unit id="org.apache.httpcomponents.httpcore" version="4.4.15.v20220209-2345"/>
35-
<unit id="org.apache.httpcomponents.httpclient" version="4.5.13.v20210128-2225"/>
36-
<unit id="org.apache.commons.codec" version="1.14.0.v20200818-1422"/>
37-
<unit id="org.apache.sshd.sftp" version="2.8.0.v20211227-1750"/>
38-
<unit id="javax.servlet.jsp" version="2.2.0.v201112011158"/>
39-
<repository location="https://download.eclipse.org/releases/2022-06/"/>
34+
<unit id="org.apache.httpcomponents.httpclient" version="4.5.13.v20221112-0806"/>
35+
<unit id="org.apache.commons.codec" version="1.14.0.v20221112-0806"/>
36+
<unit id="org.apache.sshd.sftp" version="2.9.2.v20221117-1942"/>
37+
<unit id="org.apache.sshd.osgi" version="2.9.2.v20221117-1942"/>
38+
<unit id="slf4j.api" version="1.7.36"/>
39+
<unit id="slf4j.nop" version="1.7.36"/>
40+
<repository location="https://download.eclipse.org/releases/2022-12/"/>
4041
</location>
4142
<location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
42-
<unit id="com.google.guava" version="30.1.0.v20210127-2300"/>
43-
<unit id="com.google.gson" version="2.8.9.v20220111-1409"/>
44-
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20220531185310/repository"/>
43+
<unit id="com.google.guava" version="30.1.0.v20221112-0806"/>
44+
<unit id="com.google.gson" version="2.9.1.v20220915-1632"/>
45+
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20221123021534/repository"/>
4546
</location>
4647
</locations>
4748
</target>

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

+6-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
target "MeGit Target"
22
with allEnvironments source
3-
location "https://download.eclipse.org/releases/2022-06/" {
3+
location "https://download.eclipse.org/releases/2022-12/" {
44
org.eclipse.jgit.feature.group
55
org.eclipse.jgit.gpg.bc.feature.group
66
org.eclipse.jgit.ssh.jsch.feature.group
@@ -22,19 +22,20 @@ location "https://download.eclipse.org/releases/2022-06/" {
2222
org.eclipse.ecf.filetransfer.feature.feature.group
2323
org.eclipse.ecf.filetransfer.httpclient5.feature.feature.group
2424
org.eclipse.ecf.filetransfer.ssl.feature.feature.group
25+
org.eclipse.jdt.core
2526
javaewah
26-
org.bouncycastle.bcpg
27-
org.bouncycastle.bcprov
2827
net.i2p.crypto.eddsa
2928
org.apache.commons.io
3029
org.apache.commons.compress
3130
org.apache.httpcomponents.httpcore
3231
org.apache.httpcomponents.httpclient
3332
org.apache.commons.codec
3433
org.apache.sshd.sftp
35-
javax.servlet.jsp
34+
org.apache.sshd.osgi
35+
slf4j.api
36+
slf4j.nop
3637
}
37-
location "https://download.eclipse.org/tools/orbit/downloads/drops/R20220531185310/repository" {
38+
location "https://download.eclipse.org/tools/orbit/downloads/drops/R20221123021534/repository" {
3839
com.google.guava
3940
com.google.gson
4041
}

com.eclipsesource.megit.target/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>com.eclipsesource.megit</groupId>
99
<artifactId>com.eclipsesource.megit.parent</artifactId>
10-
<version>0.2.0-SNAPSHOT</version>
10+
<version>0.3.0-SNAPSHOT</version>
1111
<relativePath>../com.eclipsesource.megit.parent</relativePath>
1212
</parent>
1313
<artifactId>com.eclipsesource.megit.target</artifactId>

0 commit comments

Comments
 (0)