Skip to content

Commit 39e6f4a

Browse files
plangerplanger
committed
Update to Eclipse and EGit 2023-09
1 parent 53c911b commit 39e6f4a

11 files changed

Lines changed: 71 additions & 46 deletions

File tree

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,5 +52,5 @@ The runnable product will be available in `com.eclipsesource.megit.product/targe
5252
- 0.2.0 Update to Eclipse EGit 2022-06
5353
- 0.3.0 Update to Eclipse EGit 2022-12
5454
- 0.4.0 Update to Eclipse EGit 2023-06
55-
- 0.5.0 Update to Eclipse EGit 2023-06
55+
- 0.5.0 Update to Eclipse EGit 2023-09
5656
- Add Git LFS support

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

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,20 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<project
33
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
4-
xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
4+
xmlns="http://maven.apache.org/POM/4.0.0"
5+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
56
<modelVersion>4.0.0</modelVersion>
67
<groupId>com.eclipsesource.megit</groupId>
78
<artifactId>com.eclipsesource.megit.parent</artifactId>
8-
<version>0.4.0-SNAPSHOT</version>
9+
<version>0.5.0-SNAPSHOT</version>
910
<packaging>pom</packaging>
1011

1112
<properties>
1213
<tycho-version>2.7.5</tycho-version>
1314
<tycho-extras-version>2.7.5</tycho-extras-version>
1415
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1516
<maven.compiler.release>17</maven.compiler.release>
16-
17+
1718
<mav-checkstyle-version>3.0.0</mav-checkstyle-version>
1819
<checkstyle-version>8.8</checkstyle-version>
1920
</properties>
@@ -26,9 +27,9 @@
2627
<enabled>false</enabled>
2728
</snapshots>
2829
</pluginRepository>
29-
<pluginRepository>
30+
<pluginRepository>
3031
<id>apache-maven-releases</id>
31-
<url>http://repo.maven.apache.org/maven2</url>
32+
<url>https://repo.maven.apache.org/maven2</url>
3233
<snapshots>
3334
<enabled>false</enabled>
3435
</snapshots>
@@ -46,10 +47,10 @@
4647
<sourceDirectory>src</sourceDirectory>
4748
<outputDirectory>bin</outputDirectory>
4849
<plugins>
49-
<plugin>
50-
<groupId>org.eclipse.tycho</groupId>
51-
<artifactId>tycho-versions-plugin</artifactId>
52-
<version>${tycho-version}</version>
50+
<plugin>
51+
<groupId>org.eclipse.tycho</groupId>
52+
<artifactId>tycho-versions-plugin</artifactId>
53+
<version>${tycho-version}</version>
5354
</plugin>
5455

5556
<plugin>
@@ -121,15 +122,17 @@
121122
</dependency>
122123
</dependencies>
123124
<configuration>
124-
<!-- <timestampProvider>jgit</timestampProvider> -->
125-
<!-- generate new qualifier even if it is only the pom.xml that changed
126-
<jgit.ignore> pom.xml </jgit.ignore> -->
127125
<format>yyyyMMdd-HHmm</format>
128126
<!--
129127
<sourceReferences>
130128
<generate>true</generate>
131129
</sourceReferences>
132130
-->
131+
<timestampProvider>jgit</timestampProvider>
132+
<jgit.ignore>
133+
pom.xml
134+
</jgit.ignore>
135+
<jgit.dirtyWorkingTree>ignore</jgit.dirtyWorkingTree>
133136
</configuration>
134137
</plugin>
135138

‎com.eclipsesource.megit.plugin/.classpath‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<classpath>
3-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
3+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
44
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
5-
<classpathentry kind="src" path="src"/>
5+
<classpathentry kind="src" path="src/"/>
66
<classpathentry kind="output" path="bin"/>
77
</classpath>

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

Lines changed: 1 addition & 1 deletion
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.4.0.qualifier
5+
Bundle-Version: 0.5.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‎

Lines changed: 1 addition & 1 deletion
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.4.0-SNAPSHOT</version>
10+
<version>0.5.0-SNAPSHOT</version>
1111
<relativePath>../com.eclipsesource.megit.parent</relativePath>
1212
</parent>
1313
<artifactId>com.eclipsesource.megit.plugin</artifactId>

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

Lines changed: 1 addition & 1 deletion
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.4.0.qualifier"
5+
version="0.5.0.qualifier"
66
provider-name="ECLIPSESOURCE">
77

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

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

Lines changed: 1 addition & 1 deletion
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.4.0-SNAPSHOT</version>
10+
<version>0.5.0-SNAPSHOT</version>
1111
<relativePath>../com.eclipsesource.megit.parent</relativePath>
1212
</parent>
1313
<artifactId>com.eclipsesource.megit.product.feature</artifactId>

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

Lines changed: 1 addition & 1 deletion
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.4.0-SNAPSHOT</version>
10+
<version>0.5.0-SNAPSHOT</version>
1111
<relativePath>../com.eclipsesource.megit.parent</relativePath>
1212
</parent>
1313
<artifactId>com.eclipsesource.megit.product</artifactId>

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

Lines changed: 35 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,52 @@
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="1698856336">
4+
<target name="MeGit Target" sequenceNumber="1698865063">
55
<locations>
66
<location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
7-
<unit id="org.eclipse.jgit.feature.group" version="6.6.0.202305301015-r"/>
8-
<unit id="org.eclipse.jgit.gpg.bc.feature.group" version="6.6.0.202305301015-r"/>
9-
<unit id="org.eclipse.jgit.ssh.jsch.feature.group" version="6.6.0.202305301015-r"/>
10-
<unit id="org.eclipse.jgit.http.apache.feature.group" version="6.6.0.202305301015-r"/>
11-
<unit id="org.eclipse.jgit.ssh.apache.feature.group" version="6.6.0.202305301015-r"/>
12-
<unit id="org.eclipse.jgit.lfs.feature.group" version="6.6.0.202305301015-r"/>
13-
<unit id="org.eclipse.egit.feature.group" version="6.6.0.202305301015-r"/>
14-
<unit id="org.eclipse.egit.gitflow.feature.feature.group" version="6.6.0.202305301015-r"/>
15-
<unit id="org.eclipse.emf.sdk.feature.group" version="2.34.0.v20230406-1334"/>
7+
<unit id="org.eclipse.jgit.feature.group" version="6.7.0.202309050840-r"/>
8+
<unit id="org.eclipse.jgit.gpg.bc.feature.group" version="6.7.0.202309050840-r"/>
9+
<unit id="org.eclipse.jgit.ssh.jsch.feature.group" version="6.7.0.202309050840-r"/>
10+
<unit id="org.eclipse.jgit.http.apache.feature.group" version="6.7.0.202309050840-r"/>
11+
<unit id="org.eclipse.jgit.ssh.apache.feature.group" version="6.7.0.202309050840-r"/>
12+
<unit id="org.eclipse.jgit.lfs.feature.group" version="6.7.0.202309050840-r"/>
13+
<unit id="org.eclipse.egit.feature.group" version="6.7.0.202309050840-r"/>
14+
<unit id="org.eclipse.egit.gitflow.feature.feature.group" version="6.7.0.202309050840-r"/>
15+
<unit id="org.eclipse.emf.sdk.feature.group" version="2.35.0.v20230829-0934"/>
1616
<unit id="org.eclipse.emf.transaction.feature.group" version="1.13.0.202208110935"/>
1717
<unit id="org.eclipse.emf.validation.feature.group" version="1.13.3.202305230712"/>
18-
<unit id="org.eclipse.platform.ide" version="4.28.0.I20230605-0440"/>
19-
<unit id="org.eclipse.equinox.p2.rcp.feature.feature.group" version="1.4.2000.v20230510-1208"/>
20-
<unit id="org.eclipse.equinox.sdk.feature.group" version="3.23.800.v20230523-2142"/>
21-
<unit id="org.eclipse.equinox.core.feature.feature.group" version="1.14.0.v20230523-2142"/>
22-
<unit id="org.eclipse.equinox.p2.discovery.feature.feature.group" version="1.3.0.v20230322-1009"/>
23-
<unit id="org.eclipse.equinox.executable.feature.group" version="3.8.2100.v20230415-0944"/>
18+
<unit id="org.eclipse.platform.ide" version="4.29.0.I20230903-1000"/>
19+
<unit id="org.eclipse.equinox.p2.rcp.feature.feature.group" version="1.4.2100.v20230814-2013"/>
20+
<unit id="org.eclipse.equinox.sdk.feature.group" version="3.23.900.v20230808-1403"/>
21+
<unit id="org.eclipse.equinox.core.feature.feature.group" version="1.14.100.v20230801-1826"/>
22+
<unit id="org.eclipse.equinox.p2.discovery.feature.feature.group" version="1.3.100.v20230728-2010"/>
23+
<unit id="org.eclipse.equinox.executable.feature.group" version="3.8.2200.v20230717-2134"/>
2424
<unit id="org.eclipse.ecf.core.feature.feature.group" version="1.6.1.v20230507-1923"/>
2525
<unit id="org.eclipse.ecf.core.ssl.feature.feature.group" version="1.1.501.v20230507-1921"/>
2626
<unit id="org.eclipse.ecf.filetransfer.feature.feature.group" version="3.14.1800.v20230422-0242"/>
2727
<unit id="org.eclipse.ecf.filetransfer.httpclient5.feature.feature.group" version="1.1.701.v20230423-0417"/>
2828
<unit id="org.eclipse.ecf.filetransfer.ssl.feature.feature.group" version="1.1.401.v20230422-0242"/>
29-
<unit id="org.eclipse.jdt.core.compiler.batch" version="3.34.0.v20230523-1233"/>
30-
<unit id="org.eclipse.jdt.core" version="3.34.0.v20230512-1803"/>
29+
<unit id="org.eclipse.jdt.core.compiler.batch" version="3.35.0.v20230814-2020"/>
30+
<unit id="org.eclipse.jdt.core" version="3.35.0.v20230814-1356"/>
3131
<unit id="net.i2p.crypto.eddsa" version="0.3.0.v20220506-1020"/>
3232
<unit id="org.apache.commons.io" version="2.8.0.v20210415-0900"/>
3333
<unit id="org.apache.commons.compress" version="1.22.0.v20221207-1049"/>
3434
<unit id="org.apache.httpcomponents.httpcore" version="4.4.16.v20221207-1049"/>
35-
<unit id="org.apache.httpcomponents.httpclient" version="4.5.13.v20221112-0806"/>
36-
<unit id="org.apache.commons.codec" version="1.14.0.v20221112-0806"/>
35+
<unit id="org.apache.httpcomponents.httpclient" version="4.5.14.v20230516-1249"/>
3736
<unit id="org.apache.sshd.sftp" version="2.10.0"/>
3837
<unit id="org.apache.sshd.osgi" version="2.10.0"/>
38+
<unit id="org.apache.lucene.core" version="9.7.0.v20230703-0758"/>
39+
<unit id="org.apache.lucene.analysis-common" version="9.7.0.v20230703-0758"/>
40+
<unit id="org.apache.lucene.analysis-smartcn" version="9.7.0.v20230703-0758"/>
3941
<unit id="slf4j.api" version="2.0.7"/>
4042
<unit id="slf4j.nop" version="2.0.7"/>
4143
<unit id="org.apache.aries.spifly.dynamic.bundle" version="1.3.6"/>
42-
<unit id="javax.annotation" version="1.3.5.v20230504-0748"/>
44+
<unit id="javax.annotation" version="1.3.5.v20200909-1856"/>
4345
<unit id="javax.inject" version="1.0.0.v20220405-0441"/>
4446
<unit id="org.apache.commons.jxpath" version="1.3.0.v200911051830"/>
45-
<unit id="com.sun.jna" version="5.13.0"/>
47+
<unit id="com.sun.jna" version="5.13.0.v20230812-1000"/>
4648
<unit id="com.sun.jna.platform" version="5.13.0"/>
47-
<repository location="https://download.eclipse.org/releases/2023-06/"/>
49+
<repository location="https://download.eclipse.org/releases/2023-09/"/>
4850
</location>
4951
<location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
5052
<unit id="com.google.guava" version="30.1.0.v20221112-0806"/>
@@ -61,5 +63,15 @@
6163
<unit id="org.objectweb.asm.analysis" version="9.4.0.v20221107-1714"/>
6264
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20230531010532/repository"/>
6365
</location>
66+
<location includeDependencyDepth="infinite" includeDependencyScopes="compile,test" includeSource="true" missingManifest="generate" type="Maven" label="MavenDependencies">
67+
<dependencies>
68+
<dependency>
69+
<groupId>commons-codec</groupId>
70+
<artifactId>commons-codec</artifactId>
71+
<version>1.15</version>
72+
<type>jar</type>
73+
</dependency>
74+
</dependencies>
75+
</location>
6476
</locations>
6577
</target>

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

Lines changed: 12 additions & 2 deletions
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/2023-06/" {
3+
location "https://download.eclipse.org/releases/2023-09/" {
44
org.eclipse.jgit.feature.group
55
org.eclipse.jgit.gpg.bc.feature.group
66
org.eclipse.jgit.ssh.jsch.feature.group
@@ -30,9 +30,11 @@ location "https://download.eclipse.org/releases/2023-06/" {
3030
org.apache.commons.compress
3131
org.apache.httpcomponents.httpcore
3232
org.apache.httpcomponents.httpclient
33-
org.apache.commons.codec
3433
org.apache.sshd.sftp
3534
org.apache.sshd.osgi
35+
org.apache.lucene.core
36+
org.apache.lucene.analysis-common
37+
org.apache.lucene.analysis-smartcn
3638
slf4j.api
3739
slf4j.nop
3840
org.apache.aries.spifly.dynamic.bundle
@@ -56,3 +58,11 @@ location "https://download.eclipse.org/tools/orbit/downloads/drops/R202305310105
5658
org.objectweb.asm.tree
5759
org.objectweb.asm.analysis
5860
}
61+
62+
maven MavenDependencies scope=compile,test dependencyDepth=infinite missingManifest=generate includeSources {
63+
dependency {
64+
groupId="commons-codec"
65+
artifactId="commons-codec"
66+
version="1.15"
67+
}
68+
}

0 commit comments

Comments
 (0)