This is an automated email from the ASF dual-hosted git repository.
yamer pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-kie-tools.git
The following commit(s) were added to refs/heads/main by this push:
new ff03657f8bd kie-issues#1099: Upgrade Java version and project's
dependencies of Java Code completion package (#2250)
ff03657f8bd is described below
commit ff03657f8bdd79c79144057eef77bdde166ddc94
Author: Yeser Amer <[email protected]>
AuthorDate: Fri Apr 19 15:25:53 2024 +0200
kie-issues#1099: Upgrade Java version and project's dependencies of Java
Code completion package (#2250)
---
.../vscode-java-code-completion-extension-plugin/pom.xml | 16 ++++++----------
.../META-INF/MANIFEST.MF | 2 +-
.../core/internal/engine/ActivationCheckerTest.java | 2 +-
.../core/internal/handlers/GetAccessorsHandlerTest.java | 8 +-------
.../test/resources/test proj\303\251ct/Activator.java" | 3 ---
.../test/resources/test proj\303\251ct/MyActivator.java" | 8 --------
.../src/test/resources/testProject/pom.xml | 8 --------
.../src/main/java/org/kogito/test/project/Activator.java | 3 ---
8 files changed, 9 insertions(+), 41 deletions(-)
diff --git a/packages/vscode-java-code-completion-extension-plugin/pom.xml
b/packages/vscode-java-code-completion-extension-plugin/pom.xml
index 24080b71f4b..ccd04d03413 100644
--- a/packages/vscode-java-code-completion-extension-plugin/pom.xml
+++ b/packages/vscode-java-code-completion-extension-plugin/pom.xml
@@ -30,30 +30,26 @@
<name>vscode-java-code-completion-extension-plugin :: parent</name>
<description>vscode-java-code-completion-extension-plugin
parent</description>
- <prerequisites>
- <maven>3.0</maven>
- </prerequisites>
-
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <tycho.version>2.7.5</tycho.version>
+ <tycho.version>3.0.5</tycho.version>
<tycho.extras.version>${tycho.version}</tycho.extras.version>
<tycho.scmUrl>scm:git:https://github.com/apache/incubator-kie-tools.git</tycho.scmUrl>
<tycho.generateSourceReferences>true</tycho.generateSourceReferences>
- <jdt.ls.version>1.29.0.20231026174049</jdt.ls.version>
+ <jdt.ls.version>1.30.1.20231207151730</jdt.ls.version>
<tycho.test.platformArgs />
<tycho.test.jvmArgs>-Xmx512m
${tycho.test.platformArgs}</tycho.test.jvmArgs>
<!-- Code coverage -->
- <jacoco.version>0.8.11</jacoco.version>
+ <jacoco.version>0.8.12</jacoco.version>
<coverage.filter>org.eclipse.jdt.ls.*</coverage.filter>
<sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis>
<jacoco.destFile>${project.build.directory}/jacoco.exec</jacoco.destFile>
<sonar.jacoco.reportPath>${jacoco.destFile}</sonar.jacoco.reportPath>
- <maven.compiler.target>11</maven.compiler.target>
- <maven.compiler.source>11</maven.compiler.source>
+ <maven.compiler.target>17</maven.compiler.target>
+ <maven.compiler.source>17</maven.compiler.source>
<version.flatten.plugin>1.3.0</version.flatten.plugin>
</properties>
@@ -61,7 +57,7 @@
<repository>
<id>jdt.ls.p2</id>
<layout>p2</layout>
-
<url>https://download.eclipse.org/jdtls/milestones/1.29.0/repository/</url>
+
<url>https://download.eclipse.org/jdtls/milestones/1.30.1/repository/</url>
</repository>
<repository>
<id>jdt.ls.maven</id>
diff --git
a/packages/vscode-java-code-completion-extension-plugin/vscode-java-code-completion-extension-plugin-core/META-INF/MANIFEST.MF
b/packages/vscode-java-code-completion-extension-plugin/vscode-java-code-completion-extension-plugin-core/META-INF/MANIFEST.MF
index 116d7d437cd..8f6549aca9e 100644
---
a/packages/vscode-java-code-completion-extension-plugin/vscode-java-code-completion-extension-plugin-core/META-INF/MANIFEST.MF
+++
b/packages/vscode-java-code-completion-extension-plugin/vscode-java-code-completion-extension-plugin-core/META-INF/MANIFEST.MF
@@ -10,6 +10,6 @@ Require-Bundle: org.eclipse.core.runtime,
org.eclipse.lsp4j,
org.eclipse.lsp4j.jsonrpc
Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-11
+Bundle-RequiredExecutionEnvironment: JavaSE-17
Bundle-ClassPath: lib/freemarker-2.3.32.jar, .
Import-Package: com.google.gson, com.google.gson.stream
diff --git
a/packages/vscode-java-code-completion-extension-plugin/vscode-java-code-completion-extension-plugin-core/src/test/java/org/kogito/core/internal/engine/ActivationCheckerTest.java
b/packages/vscode-java-code-completion-extension-plugin/vscode-java-code-completion-extension-plugin-core/src/test/java/org/kogito/core/internal/engine/ActivationCheckerTest.java
index 6c7e62e296d..1facffedc3c 100644
---
a/packages/vscode-java-code-completion-extension-plugin/vscode-java-code-completion-extension-plugin-core/src/test/java/org/kogito/core/internal/engine/ActivationCheckerTest.java
+++
b/packages/vscode-java-code-completion-extension-plugin/vscode-java-code-completion-extension-plugin-core/src/test/java/org/kogito/core/internal/engine/ActivationCheckerTest.java
@@ -51,7 +51,7 @@ class ActivationCheckerTest {
TestUtil.mockWorkspace(COMMON_RESOURCE_PATH + "test projéct" +
File.separator, () -> activationChecker.check());
assertThat(activationChecker.existActivator()).isTrue();
-
assertThat(activationChecker.getActivatorPath().endsWith("MyActivator.java")).isTrue();
+
assertThat(activationChecker.getActivatorPath().endsWith("Activator.java")).isTrue();
}
@Test
diff --git
a/packages/vscode-java-code-completion-extension-plugin/vscode-java-code-completion-extension-plugin-core/src/test/java/org/kogito/core/internal/handlers/GetAccessorsHandlerTest.java
b/packages/vscode-java-code-completion-extension-plugin/vscode-java-code-completion-extension-plugin-core/src/test/java/org/kogito/core/internal/handlers/GetAccessorsHandlerTest.java
index 1d3b50232e7..9a1e36fcde1 100644
---
a/packages/vscode-java-code-completion-extension-plugin/vscode-java-code-completion-extension-plugin-core/src/test/java/org/kogito/core/internal/handlers/GetAccessorsHandlerTest.java
+++
b/packages/vscode-java-code-completion-extension-plugin/vscode-java-code-completion-extension-plugin-core/src/test/java/org/kogito/core/internal/handlers/GetAccessorsHandlerTest.java
@@ -22,12 +22,12 @@ package org.kogito.core.internal.handlers;
import java.util.Map;
import org.eclipse.lsp4j.CompletionItem;
+
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.kogito.core.internal.api.GetPublicResult;
import static org.assertj.core.api.Assertions.assertThat;
-import static
org.eclipse.jdt.ls.core.internal.handlers.CompletionResolveHandler.DATA_FIELD_SIGNATURE;
class GetAccessorsHandlerTest {
@@ -72,8 +72,6 @@ class GetAccessorsHandlerTest {
void testCorrectGetFQCNAccessor() {
CompletionItem completionItem = new CompletionItem();
completionItem.setLabel("getName() : String");
- Map<String, String> data = Map.of(DATA_FIELD_SIGNATURE,
"()Ljava.lang.String;");
- completionItem.setData(data);
GetPublicResult accessor =
this.getAccessorHandler.getAccessor(completionItem, "org.kogito.Class");
assertThat(accessor.getFqcn()).isEqualTo("org.kogito.Class");
assertThat(accessor.getType()).isEqualTo("java.lang.String");
@@ -84,8 +82,6 @@ class GetAccessorsHandlerTest {
void testCorrectGetFQCListAccessor() {
CompletionItem completionItem = new CompletionItem();
completionItem.setLabel("getBooksList() : List<Book>");
- Map<String, String> data = Map.of(DATA_FIELD_SIGNATURE,
"()Ljava.util.List<Lcom.Book;>");
- completionItem.setData(data);
GetPublicResult accessor =
this.getAccessorHandler.getAccessor(completionItem, "org.kogito.Class");
assertThat(accessor.getFqcn()).isEqualTo("org.kogito.Class");
assertThat(accessor.getType()).isEqualTo("java.util.List<Lcom.Book;>");
@@ -96,8 +92,6 @@ class GetAccessorsHandlerTest {
void testCorrectGetFQCNMapAccessor() {
CompletionItem completionItem = new CompletionItem();
completionItem.setLabel("getBooksMap() : Map<String,Book>");
- Map<String, String> data = Map.of(DATA_FIELD_SIGNATURE,
"()Ljava.util.Map<Ljava.lang.String;Lcom.Book;>;");
- completionItem.setData(data);
GetPublicResult accessor =
this.getAccessorHandler.getAccessor(completionItem, "org.kogito.Class");
assertThat(accessor.getFqcn()).isEqualTo("org.kogito.Class");
assertThat(accessor.getType()).isEqualTo("java.util.Map<Ljava.lang.String;Lcom.Book;>");
diff --git
a/packages/vscode-java-code-completion-extension-plugin/vscode-java-code-completion-extension-plugin-core/src/test/resources/testProject/src/main/java/org/kogito/test/project/Activator.java
"b/packages/vscode-java-code-completion-extension-plugin/vscode-java-code-completion-extension-plugin-core/src/test/resources/test
proj\303\251ct/Activator.java"
similarity index 51%
copy from
packages/vscode-java-code-completion-extension-plugin/vscode-java-code-completion-extension-plugin-core/src/test/resources/testProject/src/main/java/org/kogito/test/project/Activator.java
copy to
"packages/vscode-java-code-completion-extension-plugin/vscode-java-code-completion-extension-plugin-core/src/test/resources/test
proj\303\251ct/Activator.java"
index b909d7ca4b7..a3b15912ee7 100644
---
a/packages/vscode-java-code-completion-extension-plugin/vscode-java-code-completion-extension-plugin-core/src/test/resources/testProject/src/main/java/org/kogito/test/project/Activator.java
+++
"b/packages/vscode-java-code-completion-extension-plugin/vscode-java-code-completion-extension-plugin-core/src/test/resources/test
proj\303\251ct/Activator.java"
@@ -1,8 +1,5 @@
package org.kogito.test.project;
-import org.kie.api.project.KieActivator;
-
-@KieActivator
public class Activator {
}
\ No newline at end of file
diff --git
"a/packages/vscode-java-code-completion-extension-plugin/vscode-java-code-completion-extension-plugin-core/src/test/resources/test
proj\303\251ct/MyActivator.java"
"b/packages/vscode-java-code-completion-extension-plugin/vscode-java-code-completion-extension-plugin-core/src/test/resources/test
proj\303\251ct/MyActivator.java"
deleted file mode 100644
index 14bcbc090bc..00000000000
---
"a/packages/vscode-java-code-completion-extension-plugin/vscode-java-code-completion-extension-plugin-core/src/test/resources/test
proj\303\251ct/MyActivator.java"
+++ /dev/null
@@ -1,8 +0,0 @@
-package org.kogito.test.project;
-
-import org.kie.api.project.KieActivator;
-
-@KieActivator
-public class MyActivator {
-
-}
\ No newline at end of file
diff --git
a/packages/vscode-java-code-completion-extension-plugin/vscode-java-code-completion-extension-plugin-core/src/test/resources/testProject/pom.xml
b/packages/vscode-java-code-completion-extension-plugin/vscode-java-code-completion-extension-plugin-core/src/test/resources/testProject/pom.xml
index 84d21c4e09c..7c1c432ed33 100644
---
a/packages/vscode-java-code-completion-extension-plugin/vscode-java-code-completion-extension-plugin-core/src/test/resources/testProject/pom.xml
+++
b/packages/vscode-java-code-completion-extension-plugin/vscode-java-code-completion-extension-plugin-core/src/test/resources/testProject/pom.xml
@@ -22,12 +22,4 @@
<artifactId>test</artifactId>
<version>1.0.0-SNAPSHOT</version>
- <dependencies>
- <dependency>
- <groupId>org.kie</groupId>
- <artifactId>kie-api</artifactId>
- <version>999-20240417-SNAPSHOT</version>
- </dependency>
- </dependencies>
-
</project>
diff --git
a/packages/vscode-java-code-completion-extension-plugin/vscode-java-code-completion-extension-plugin-core/src/test/resources/testProject/src/main/java/org/kogito/test/project/Activator.java
b/packages/vscode-java-code-completion-extension-plugin/vscode-java-code-completion-extension-plugin-core/src/test/resources/testProject/src/main/java/org/kogito/test/project/Activator.java
index b909d7ca4b7..a3b15912ee7 100644
---
a/packages/vscode-java-code-completion-extension-plugin/vscode-java-code-completion-extension-plugin-core/src/test/resources/testProject/src/main/java/org/kogito/test/project/Activator.java
+++
b/packages/vscode-java-code-completion-extension-plugin/vscode-java-code-completion-extension-plugin-core/src/test/resources/testProject/src/main/java/org/kogito/test/project/Activator.java
@@ -1,8 +1,5 @@
package org.kogito.test.project;
-import org.kie.api.project.KieActivator;
-
-@KieActivator
public class Activator {
}
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
