Skip to content

Commit bf1ce1b

Browse files
martinlippertmartinlippert
committed
GH-1568: update tycho to version 5.0, incl. some cleanup
1 parent 2fa5b44 commit bf1ce1b

File tree

26 files changed

+19
-244
lines changed
  • eclipse-distribution
  • eclipse-extensions
    • org.springframework.ide.eclipse.beans.ui.live
    • org.springframework.ide.eclipse.boot.dash.xterm
    • org.springframework.ide.eclipse.boot.dash
    • org.springframework.ide.eclipse.boot.launch
    • org.springframework.ide.eclipse.boot.refactoring
    • org.springframework.ide.eclipse.boot.templates
    • org.springframework.ide.eclipse.boot.validation
    • org.springframework.ide.eclipse.boot.wizard
    • org.springframework.ide.eclipse.boot
    • org.springframework.ide.eclipse.buildship30
    • org.springframework.ide.eclipse.imports
    • org.springframework.ide.eclipse.maven.pom
    • org.springframework.ide.eclipse.xml.namespaces
    • org.springframework.ide.eclipse.xterm.linux.x86_64
    • org.springframework.ide.eclipse.xterm.macosx.x86_64
    • org.springframework.ide.eclipse.xterm.win32.x86_64
    • org.springframework.ide.eclipse.xterm
  • eclipse-language-servers
  • headless-services/jdt-ls-extension

26 files changed

+19
-244
lines changed

‎eclipse-distribution/.mvn/wrapper/maven-wrapper.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@
1414
# KIND, either express or implied. See the License for the
1515
# specific language governing permissions and limitations
1616
# under the License.
17-
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.6/apache-maven-3.9.6-bin.zip
18-
wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar
17+
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.11/apache-maven-3.9.11-bin.zip
18+
wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.4/maven-wrapper-3.3.4.jar

‎eclipse-distribution/org.springframework.boot.ide.branding/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
<version>${tycho-version}</version>
5353
<configuration>
5454
<format>yyyyMMddHHmm</format>
55-
<archiveSite>false</archiveSite>
55+
<!-- <archiveSite>false</archiveSite> -->
5656
<archive>
5757
<addMavenDescriptor>false</addMavenDescriptor>
5858
</archive>

‎eclipse-distribution/org.springframework.boot.ide.product.e437/pom.xml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
<artifactId>tycho-p2-publisher-plugin</artifactId>
4848
<version>${tycho-version}</version>
4949
<configuration>
50-
<publishArtifacts>true</publishArtifacts>
50+
<!-- <publishArtifacts>true</publishArtifacts> -->
5151
</configuration>
5252
</plugin>
5353
<!--
@@ -95,12 +95,13 @@
9595
<linux>tar.gz</linux>
9696
<macosx>tar.gz</macosx>
9797
</formats>
98+
<parallel>true</parallel>
9899
</configuration>
99100
</plugin>
100101

101102
<plugin>
102-
<groupId>org.eclipse.tycho.extras</groupId>
103-
<artifactId>tycho-eclipserun-plugin</artifactId>
103+
<groupId>org.eclipse.tycho</groupId>
104+
<artifactId>tycho-eclipse-plugin</artifactId>
104105
<version>${tycho-version}</version>
105106
<configuration>
106107
<repositories>
@@ -284,7 +285,7 @@
284285
</execution>
285286
</executions>
286287
</plugin>
287-
288+
288289
<plugin>
289290
<groupId>org.codehaus.mojo</groupId>
290291
<artifactId>exec-maven-plugin</artifactId>

‎eclipse-distribution/pom.xml‎

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@
8080

8181
<sts4-language-servers-p2-repo>https://cdn.spring.io/spring-tools/${dist.type}/language-server-integrations/${sts-language-servers-version}</sts4-language-servers-p2-repo>
8282

83-
<tycho-version>4.0.13</tycho-version>
83+
<tycho-version>5.0.0</tycho-version>
8484
<encoding>UTF-8</encoding>
8585

8686
<misc.p2.repo.version>3.9.4.202211021051</misc.p2.repo.version>
@@ -351,9 +351,6 @@
351351
<groupId>org.eclipse.tycho</groupId>
352352
<artifactId>target-platform-configuration</artifactId>
353353
<version>${tycho-version}</version>
354-
<configuration>
355-
<resolver>p2</resolver>
356-
</configuration>
357354
</plugin>
358355

359356
<plugin>
@@ -412,17 +409,13 @@
412409
<compilerArgument>-err:-forbidden</compilerArgument>
413410
</configuration>
414411
</plugin>
412+
415413
<plugin>
416414
<groupId>org.eclipse.tycho</groupId>
417415
<artifactId>target-platform-configuration</artifactId>
418416
<version>${tycho-version}</version>
419417
<configuration>
420-
<resolver>p2</resolver>
421418
<pomDependencies>ignore</pomDependencies>
422-
<ignoreTychoRepositories>true</ignoreTychoRepositories>
423-
<!-- <dependency-resolution>
424-
<optionalDependencies>ignore</optionalDependencies>
425-
</dependency-resolution> -->
426419
<environments>
427420
<environment>
428421
<os>macosx</os>
@@ -468,7 +461,7 @@
468461
<version>${tycho-version}</version>
469462
<configuration>
470463
<format>yyyyMMddHHmm</format>
471-
<archiveSite>false</archiveSite>
464+
<!-- <archiveSite>false</archiveSite> -->
472465
<archive>
473466
<addMavenDescriptor>false</addMavenDescriptor>
474467
</archive>

‎eclipse-extensions/org.springframework.ide.eclipse.beans.ui.live/pom.xml‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -17,22 +17,6 @@
1717
<build>
1818
<plugins>
1919

20-
<plugin>
21-
<groupId>org.eclipse.tycho</groupId>
22-
<artifactId>target-platform-configuration</artifactId>
23-
<version>${tycho-version}</version>
24-
<configuration>
25-
<resolver>p2</resolver>
26-
<pomDependencies>ignore</pomDependencies>
27-
</configuration>
28-
</plugin>
29-
30-
<plugin>
31-
<groupId>org.eclipse.tycho</groupId>
32-
<artifactId>tycho-compiler-plugin</artifactId>
33-
<version>${tycho-version}</version>
34-
</plugin>
35-
3620
<plugin>
3721
<groupId>org.eclipse.tycho</groupId>
3822
<artifactId>tycho-p2-plugin</artifactId>

‎eclipse-extensions/org.springframework.ide.eclipse.boot.dash.xterm/pom.xml‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -18,21 +18,6 @@
1818

1919
<build>
2020
<plugins>
21-
<plugin>
22-
<groupId>org.eclipse.tycho</groupId>
23-
<artifactId>target-platform-configuration</artifactId>
24-
<version>${tycho-version}</version>
25-
<configuration>
26-
<resolver>p2</resolver>
27-
<pomDependencies>ignore</pomDependencies>
28-
</configuration>
29-
</plugin>
30-
31-
<plugin>
32-
<groupId>org.eclipse.tycho</groupId>
33-
<artifactId>tycho-compiler-plugin</artifactId>
34-
<version>${tycho-version}</version>
35-
</plugin>
3621

3722
<plugin>
3823
<groupId>org.eclipse.tycho</groupId>

‎eclipse-extensions/org.springframework.ide.eclipse.boot.dash/pom.xml‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -17,22 +17,6 @@
1717
<build>
1818
<plugins>
1919

20-
<plugin>
21-
<groupId>org.eclipse.tycho</groupId>
22-
<artifactId>target-platform-configuration</artifactId>
23-
<version>${tycho-version}</version>
24-
<configuration>
25-
<resolver>p2</resolver>
26-
<pomDependencies>ignore</pomDependencies>
27-
</configuration>
28-
</plugin>
29-
30-
<plugin>
31-
<groupId>org.eclipse.tycho</groupId>
32-
<artifactId>tycho-compiler-plugin</artifactId>
33-
<version>${tycho-version}</version>
34-
</plugin>
35-
3620
<plugin>
3721
<groupId>org.eclipse.tycho</groupId>
3822
<artifactId>tycho-p2-plugin</artifactId>

‎eclipse-extensions/org.springframework.ide.eclipse.boot.launch/pom.xml‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -17,22 +17,6 @@
1717
<build>
1818
<plugins>
1919

20-
<plugin>
21-
<groupId>org.eclipse.tycho</groupId>
22-
<artifactId>target-platform-configuration</artifactId>
23-
<version>${tycho-version}</version>
24-
<configuration>
25-
<resolver>p2</resolver>
26-
<pomDependencies>ignore</pomDependencies>
27-
</configuration>
28-
</plugin>
29-
30-
<plugin>
31-
<groupId>org.eclipse.tycho</groupId>
32-
<artifactId>tycho-compiler-plugin</artifactId>
33-
<version>${tycho-version}</version>
34-
</plugin>
35-
3620
<plugin>
3721
<groupId>org.eclipse.tycho</groupId>
3822
<artifactId>tycho-p2-plugin</artifactId>

‎eclipse-extensions/org.springframework.ide.eclipse.boot.refactoring/pom.xml‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -17,22 +17,6 @@
1717
<build>
1818
<plugins>
1919

20-
<plugin>
21-
<groupId>org.eclipse.tycho</groupId>
22-
<artifactId>target-platform-configuration</artifactId>
23-
<version>${tycho-version}</version>
24-
<configuration>
25-
<resolver>p2</resolver>
26-
<pomDependencies>ignore</pomDependencies>
27-
</configuration>
28-
</plugin>
29-
30-
<plugin>
31-
<groupId>org.eclipse.tycho</groupId>
32-
<artifactId>tycho-compiler-plugin</artifactId>
33-
<version>${tycho-version}</version>
34-
</plugin>
35-
3620
<plugin>
3721
<groupId>org.eclipse.tycho</groupId>
3822
<artifactId>tycho-p2-plugin</artifactId>

‎eclipse-extensions/org.springframework.ide.eclipse.boot.templates/pom.xml‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -17,22 +17,6 @@
1717
<build>
1818
<plugins>
1919

20-
<plugin>
21-
<groupId>org.eclipse.tycho</groupId>
22-
<artifactId>target-platform-configuration</artifactId>
23-
<version>${tycho-version}</version>
24-
<configuration>
25-
<resolver>p2</resolver>
26-
<pomDependencies>ignore</pomDependencies>
27-
</configuration>
28-
</plugin>
29-
30-
<plugin>
31-
<groupId>org.eclipse.tycho</groupId>
32-
<artifactId>tycho-compiler-plugin</artifactId>
33-
<version>${tycho-version}</version>
34-
</plugin>
35-
3620
<plugin>
3721
<groupId>org.eclipse.tycho</groupId>
3822
<artifactId>tycho-p2-plugin</artifactId>

0 commit comments

Comments
 (0)