Skip to content

Commit 26c2ca1

Browse files
jdneojdneo
authored
chore: Bump version (#719)
1 parent ecc66d8 commit 26c2ca1

File tree

8 files changed

+5627
-547
lines changed

8 files changed

+5627
-547
lines changed

‎.vscode/launch.json

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
"env": {
1212
"DEBUG_VSCODE_JAVA":"true"
1313
},
14-
"stopOnEntry": false,
1514
"sourceMaps": true,
1615
"outFiles": [ "${workspaceFolder}/dist/**/*.js" ],
1716
"preLaunchTask": "npm: watch"
@@ -33,7 +32,6 @@
3332
"--extensionDevelopmentPath=${workspaceFolder}",
3433
"--extensionTestsPath=${workspaceFolder}/dist/test/suite/index"
3534
],
36-
"stopOnEntry": false,
3735
"sourceMaps": true,
3836
"outFiles": [ "${workspaceFolder}/dist/**/*.js" ],
3937
"preLaunchTask": "npm: compile"
@@ -48,7 +46,6 @@
4846
"--extensionDevelopmentPath=${workspaceFolder}",
4947
"--extensionTestsPath=${workspaceFolder}/dist/test/simple-suite/index"
5048
],
51-
"stopOnEntry": false,
5249
"sourceMaps": true,
5350
"outFiles": [ "${workspaceFolder}/dist/**/*.js" ],
5451
"preLaunchTask": "npm: compile"
@@ -63,7 +60,6 @@
6360
"--extensionDevelopmentPath=${workspaceFolder}",
6461
"--extensionTestsPath=${workspaceFolder}/dist/test/maven-suite/index"
6562
],
66-
"stopOnEntry": false,
6763
"sourceMaps": true,
6864
"outFiles": [ "${workspaceFolder}/dist/**/*.js" ],
6965
"preLaunchTask": "npm: compile"
@@ -78,7 +74,6 @@
7874
"--extensionDevelopmentPath=${workspaceFolder}",
7975
"--extensionTestsPath=${workspaceFolder}/dist/test/gradle-suite/index"
8076
],
81-
"stopOnEntry": false,
8277
"sourceMaps": true,
8378
"outFiles": [ "${workspaceFolder}/dist/**/*.js" ],
8479
"preLaunchTask": "npm: compile"
@@ -93,7 +88,6 @@
9388
"--extensionDevelopmentPath=${workspaceFolder}",
9489
"--extensionTestsPath=${workspaceFolder}/dist/test/invisible-suite/index"
9590
],
96-
"stopOnEntry": false,
9791
"sourceMaps": true,
9892
"outFiles": [ "${workspaceFolder}/dist/**/*.js" ],
9993
"preLaunchTask": "npm: compile"

‎javaConfig.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
"projects": [
33
"./jdtls.ext/com.microsoft.jdtls.ext.core"
44
],
5-
"targetPlatform": "./jdtls.ext/target.target"
5+
"targetPlatform": "./jdtls.ext/com.microsoft.jdtls.ext.target/com.microsoft.jdtls.ext.tp.target"
66
}

‎jdtls.ext/com.microsoft.jdtls.ext.core/pom.xml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,6 @@
1414
</properties>
1515
<build>
1616
<plugins>
17-
<plugin>
18-
<groupId>org.eclipse.tycho</groupId>
19-
<artifactId>tycho-maven-plugin</artifactId>
20-
<version>${tycho-version}</version>
21-
<extensions>true</extensions>
22-
</plugin>
2317
<plugin>
2418
<groupId>org.apache.maven.plugins</groupId>
2519
<artifactId>maven-checkstyle-plugin</artifactId>

‎jdtls.ext/target.target renamed to ‎jdtls.ext/com.microsoft.jdtls.ext.target/com.microsoft.jdtls.ext.tp.target

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
<target name="JDTLS.EXT" sequenceNumber="39">
44
<locations>
55
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
6-
<unit id="com.google.gson" version="2.7.0.v20170129-0911"/>
7-
<unit id="com.google.gson.source" version="2.7.0.v20170129-0911"/>
86
<unit id="org.apache.commons.lang3" version="3.1.0.v201403281430"/>
97
<repository location="https://download.eclipse.org/tools/orbit/R-builds/R20200529191137/repository"/>
108
</location>
@@ -16,19 +14,19 @@
1614
<unit id="org.eclipse.equinox.sdk.feature.group" version="0.0.0"/>
1715
<unit id="org.eclipse.jdt.source.feature.group" version="0.0.0"/>
1816
<unit id="org.eclipse.sdk.feature.group" version="0.0.0"/>
19-
<unit id="org.eclipse.xtend.sdk.feature.group" version="0.0.0"/>
20-
<unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
21-
<unit id="org.eclipse.jdt.core.manipulation.source" version="0.0.0"/>
22-
<repository location="https://download.eclipse.org/releases/2022-03/202203161000/"/>
17+
<repository location="https://download.eclipse.org/eclipse/updates/4.27-I-builds/I20230215-0610"/>
18+
</location>
19+
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
20+
<unit id="org.eclipse.xtext.xbase.lib" version="0.0.0"/>
21+
<repository location="https://download.eclipse.org/releases/2022-12/"/>
2322
</location>
2423
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
2524
<unit id="org.eclipse.jdt.ls.core" version="0.0.0"/>
2625
<repository location="https://download.eclipse.org/jdtls/snapshots/repository/latest/"/>
2726
</location>
2827
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
29-
<repository location="https://download.eclipse.org/lsp4j/updates/releases/0.11.0/"/>
28+
<repository location="https://download.eclipse.org/lsp4j/updates/releases/0.20.0/"/>
3029
<unit id="org.eclipse.lsp4j.sdk.feature.group" version="0.0.0"/>
3130
</location>
3231
</locations>
3332
</target>
34-

‎jdtls.ext/com.microsoft.jdtls.ext.target/pom.xml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3+
<modelVersion>4.0.0</modelVersion>
4+
<parent>
5+
<groupId>com.microsoft.jdtls.ext</groupId>
6+
<artifactId>jdtls-ext-parent</artifactId>
7+
<version>0.21.1</version>
8+
</parent>
9+
<artifactId>com.microsoft.jdtls.ext.tp</artifactId>
10+
<name>${base.name} :: Target Platform</name>
11+
<packaging>eclipse-target-definition</packaging>
12+
</project>

‎jdtls.ext/pom.xml

Lines changed: 38 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323

2424
<modules>
2525
<module>com.microsoft.jdtls.ext.core</module>
26+
<module>com.microsoft.jdtls.ext.target</module>
2627
</modules>
2728
<build>
2829
<pluginManagement>
@@ -51,27 +52,6 @@
5152
</execution>
5253
</executions>
5354
</plugin>
54-
<plugin>
55-
<groupId>org.apache.maven.plugins</groupId>
56-
<artifactId>maven-dependency-plugin</artifactId>
57-
<executions>
58-
<execution>
59-
<?m2e execute onConfiguration?>
60-
<id>get-libs</id>
61-
<goals>
62-
<goal>copy</goal>
63-
</goals>
64-
<phase>validate</phase>
65-
</execution>
66-
</executions>
67-
<configuration>
68-
<skip>false</skip>
69-
<outputDirectory>${basedir}/lib/</outputDirectory>
70-
<!-- baseVersion is to avoid SNAPSHOT dependencies
71-
being copied with ever daily changing timestamp -->
72-
<useBaseVersion>true</useBaseVersion>
73-
</configuration>
74-
</plugin>
7555
<plugin>
7656
<groupId>org.apache.maven.plugins</groupId>
7757
<artifactId>maven-checkstyle-plugin</artifactId>
@@ -97,9 +77,46 @@
9777
<groupId>org.eclipse.tycho</groupId>
9878
<artifactId>target-platform-configuration</artifactId>
9979
<version>${tycho-version}</version>
80+
<configuration>
81+
<resolver>p2</resolver>
82+
<target>
83+
<artifact>
84+
<groupId>com.microsoft.jdtls.ext</groupId>
85+
<artifactId>com.microsoft.jdtls.ext.tp</artifactId>
86+
<version>${project.version}</version>
87+
</artifact>
88+
</target>
89+
<environments>
90+
<environment>
91+
<os>linux</os>
92+
<ws>gtk</ws>
93+
<arch>x86_64</arch>
94+
</environment>
95+
<environment>
96+
<os>win32</os>
97+
<ws>win32</ws>
98+
<arch>x86_64</arch>
99+
</environment>
100+
<environment>
101+
<os>macosx</os>
102+
<ws>cocoa</ws>
103+
<arch>x86_64</arch>
104+
</environment>
105+
</environments>
106+
<dependency-resolution>
107+
</dependency-resolution>
108+
</configuration>
100109
</plugin>
101110
</plugins>
102111
</pluginManagement>
112+
<plugins>
113+
<plugin>
114+
<groupId>org.eclipse.tycho</groupId>
115+
<artifactId>tycho-maven-plugin</artifactId>
116+
<version>${tycho-version}</version>
117+
<extensions>true</extensions>
118+
</plugin>
119+
</plugins>
103120
</build>
104121
<profiles>
105122
<profile>
@@ -115,32 +132,12 @@
115132
</profile>
116133
</profiles>
117134
<repositories>
118-
<repository>
119-
<id>202203</id>
120-
<layout>p2</layout>
121-
<url>https://download.eclipse.org/releases/2022-03/202203161000/</url>
122-
</repository>
123135
<repository>
124136
<id>oss.sonatype.org</id>
125137
<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
126138
<snapshots>
127139
<enabled>true</enabled>
128140
</snapshots>
129141
</repository>
130-
<repository>
131-
<id>JDT.LS</id>
132-
<layout>p2</layout>
133-
<url>https://download.eclipse.org/jdtls/snapshots/repository/latest/</url>
134-
</repository>
135-
<repository>
136-
<id>LSP4J</id>
137-
<layout>p2</layout>
138-
<url>https://download.eclipse.org/lsp4j/updates/releases/0.11.0/</url>
139-
</repository>
140-
<repository>
141-
<id>orbit</id>
142-
<layout>p2</layout>
143-
<url>https://download.eclipse.org/tools/orbit/R-builds/R20200529191137/repository/</url>
144-
</repository>
145142
</repositories>
146143
</project>

0 commit comments

Comments
 (0)