Skip to content

Commit 0d49166

Browse files
committed
👻 update p2 repos, upgrade to JavaSE-21 as a target platform
Signed-off-by: Pranav Gaikwad <pgaikwad@redhat.com>
1 parent bf6b1a4 commit 0d49166

5 files changed

Lines changed: 26 additions & 19 deletions

File tree

java-analyzer-bundle.core/META-INF/MANIFEST.MF

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ Require-Bundle: org.eclipse.core.runtime,
1111
org.eclipse.lsp4j,
1212
org.eclipse.m2e.jdt
1313
Bundle-ActivationPolicy: lazy
14-
Bundle-RequiredExecutionEnvironment: JavaSE-17
14+
Bundle-RequiredExecutionEnvironment: JavaSE-21
Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<site>
3-
<bundle id="java-rule-addon.core" version="0.0.0">
3+
<bundle id="java-analyzer-bundle.core" version="0.0.0">
44
<category name="core"/>
55
</bundle>
6-
<bundle id="java-rule-addon.test" version="0.0.0">
6+
<bundle id="java-analyzer-bundle.test" version="0.0.0">
77
<category name="sdk" />
88
</bundle>
9-
<bundle id="java-rule-addon.core.source" version="0.0.0">
9+
<bundle id="java-analyzer-bundle.core.source" version="0.0.0">
1010
<category name="sdk" />
1111
</bundle>
12-
<bundle id="java-rule-addon.test.source" version="0.0.0">
12+
<bundle id="java-analyzer-bundle.test.source" version="0.0.0">
1313
<category name="sdk" />
1414
</bundle>
15-
<category-def name="core" label="java-rule-addon extension"/>
16-
<category-def name="sdk" label="java-rule-addon extension (Developer Resources)"/>
15+
<category-def name="core" label="java-analyzer-bundle extension"/>
16+
<category-def name="sdk" label="java-analyzer-bundle extension (Developer Resources)"/>
1717
</site>

java-analyzer-bundle.test/META-INF/MANIFEST.MF

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Bundle-Name: java-analyzer-bundle Test Fragment
44
Bundle-SymbolicName: java-analyzer-bundle.test
55
Bundle-Version: 1.0.0.qualifier
66
Fragment-Host: java-analyzer-bundle.core;bundle-version="1.0.0"
7-
Bundle-RequiredExecutionEnvironment: JavaSE-17
7+
Bundle-RequiredExecutionEnvironment: JavaSE-21
88
Require-Bundle: org.eclipse.jdt.junit4.runtime;bundle-version="1.1.0",
99
org.apache.commons.io,
1010
org.apache.commons.lang3,

java-analyzer-bundle.tp/java-analyzer-bundle.target

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
<?pde version="3.8"?>
33
<target name="Java Analyzer Target Platform">
44
<locations>
5-
<!-- 1st: pick up JDT.LS bits (1.35.0)
5+
<!-- 1st: pick up JDT.LS bits (1.51.0)
66
-->
77
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner"
88
includeSource="true" type="InstallableUnit">
99
<unit id="org.eclipse.jdt.ls.core" version="0.0.0" />
10-
<repository location="https://download.eclipse.org/jdtls/milestones/1.35.0/repository"/>
10+
<repository location="https://download.eclipse.org/jdtls/milestones/1.51.0/repository"/>
1111
</location>
1212

1313

@@ -56,21 +56,21 @@
5656
<unit id="org.eclipse.jdt.source.feature.group" version="0.0.0"/>
5757
<unit id="org.eclipse.sdk.feature.group" version="0.0.0"/>
5858
<unit id="org.mockito.mockito-core" version="0.0.0"/>
59-
<repository location="https://download.eclipse.org/eclipse/updates/4.30"/>
59+
<repository location="https://download.eclipse.org/eclipse/updates/4.34"/>
6060
</location>
6161
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
6262
<unit id="org.eclipse.xtend.sdk.feature.group" version="0.0.0"/>
6363
<unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
6464
<repository location="https://download.eclipse.org/releases/2021-09/202109151000/"/>
6565
</location>
6666
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
67-
<repository location="https://download.eclipse.org/lsp4j/updates/releases/0.22.0/"/>
67+
<repository location="https://download.eclipse.org/lsp4j/updates/releases/0.23.0/"/>
6868
<unit id="org.eclipse.lsp4j.sdk.feature.group" version="0.0.0"/>
6969
</location>
7070
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
7171
<repository location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.34.0/"/>
7272
<unit id="org.eclipse.xtext.xbase.lib" version="0.0.0"/>
7373
</location>
7474
</locations>
75-
<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
75+
<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
7676
</target>

pom.xml

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
<properties>
1616
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1717
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
18-
<tycho.version>3.0.1</tycho.version>
19-
<tycho.extras.version>3.0.1</tycho.extras.version>
18+
<tycho.version>4.0.7</tycho.version>
19+
<tycho.extras.version>4.0.7</tycho.extras.version>
2020
<tycho.scmUrl>scm:git:https://github.com/konveyor/java-analyzer-bundle.git</tycho.scmUrl>
2121
<tycho.generateSourceReferences>true</tycho.generateSourceReferences>
2222
<tycho.test.platformArgs />
@@ -41,10 +41,17 @@
4141
<artifactId>target-platform-configuration</artifactId>
4242
<version>${tycho.version}</version>
4343
<configuration>
44-
<executionEnvironment>JavaSE-17</executionEnvironment>
45-
<resolver>p2</resolver>
46-
<pomDependencies>consider</pomDependencies>
47-
<ignoreTychoRepositories>true</ignoreTychoRepositories>
44+
<executionEnvironment>JavaSE-21</executionEnvironment>
45+
<environments>
46+
<environment>
47+
<os>linux</os>
48+
<ws>gtk</ws>
49+
<arch>x86_64</arch>
50+
</environment>
51+
</environments>
52+
<!-- <resolver>p2</resolver> -->
53+
<!-- <pomDependencies>consider</pomDependencies> -->
54+
<!-- <ignoreTychoRepositories>true</ignoreTychoRepositories> -->
4855
<target>
4956
<artifact>
5057
<groupId>io.konveyor.tackle</groupId>

0 commit comments

Comments
 (0)