diff --git a/.github/workflows/verify.yml b/.github/workflows/verify.yml index df6e07d643..de181dfb23 100644 --- a/.github/workflows/verify.yml +++ b/.github/workflows/verify.yml @@ -17,10 +17,11 @@ jobs: with: repository: gamerson/liferay-ide-m2-repository path: liferay-ide-m2-repository - - name: Set up JDK 17 - uses: actions/setup-java@v1 + - name: Set up JDK 21 + uses: actions/setup-java@v3 with: - java-version: 17 + java-version: 21 + distribution: 'zulu' - name: sf.sh shell: bash working-directory: build/com.liferay.ide.build.source.formatter @@ -38,10 +39,10 @@ jobs: with: repository: gamerson/liferay-ide-m2-repository path: liferay-ide-m2-repository - - name: Set up JDK 17 + - name: Set up JDK 21 uses: actions/setup-java@v3 with: - java-version: 17 + java-version: 21 distribution: 'zulu' cache: maven @@ -53,6 +54,13 @@ jobs: restore-keys: | ${{ runner.os }}-maven- - name: Run tests + id: run-tests shell: bash run: | - ./run-tests.sh \ No newline at end of file + ./run-tests.sh + - name: Upload Surefire Reports + if: failure() + uses: actions/upload-artifact@v4 + with: + name: surefire-reports + path: ./tools/tests/**/target/surefire-reports/ \ No newline at end of file diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties index 642d572ce9..9b66d8c7a3 100644 --- a/.mvn/wrapper/maven-wrapper.properties +++ b/.mvn/wrapper/maven-wrapper.properties @@ -1,2 +1,2 @@ -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar diff --git a/.sdkmanrc b/.sdkmanrc index 6017856ef0..02cfc18499 100644 --- a/.sdkmanrc +++ b/.sdkmanrc @@ -1 +1 @@ -java=17.0.11-zulu +java=21.0.6-zulu diff --git a/build/com.liferay.ide-repository/studio.product b/build/com.liferay.ide-repository/studio.product index fdcbc4894b..801fc47782 100644 --- a/build/com.liferay.ide-repository/studio.product +++ b/build/com.liferay.ide-repository/studio.product @@ -25,7 +25,7 @@ com.liferay.ide.studio.ui openFile --Dosgi.requiredJavaVersion=17 +-Dosgi.requiredJavaVersion=21 -Xms1024m -Xmx2048m -XX:+UseG1GC @@ -37,7 +37,7 @@ openFile -XstartOnFirstThread --Dosgi.requiredJavaVersion=17 +-Dosgi.requiredJavaVersion=21 -Xms1024m -Xmx2048m -XX:+UseG1GC diff --git a/build/parent/pom.xml b/build/parent/pom.xml index 8acdf473eb..bc17ad84f3 100644 --- a/build/parent/pom.xml +++ b/build/parent/pom.xml @@ -34,7 +34,7 @@ https://us-east-1.linodeobjects.com/devtools-s3.liferay.com/liferay-ide-files/docs/code-upgrade-docs-20210312.zip c4bce64c362ecffcce300f31e88b2e63 https://bndtools.org/bndtools.p2.repo/7.0.0/ - https://download.eclipse.org/releases/2023-12/202312061001/ + https://download.eclipse.org/releases/2025-03/202503121000/ https://us-east-1.linodeobjects.com/devtools-s3.liferay.com/eclipse/eclipse-wtp-xml-search/ https://download.eclipse.org/buildship/updates/e427/releases/3.x/3.1.8.v20231117-1658/ https://files.liferay.org.es/staged/public-files/liferay-ide/unstable/build/com.liferay.ide.testing-repository/target/repository/ @@ -44,9 +44,9 @@ false https://download.eclipse.org/technology/swtbot/releases/2.8.0/ https://download.eclipse.org/tm/updates/4.5.500/repository/ - https://download.eclipse.org/justj/jres/17/updates/release/latest + https://download.eclipse.org/justj/jres/21/updates/release/latest yyyyMMddHHmm - 3.0.5 + 4.0.12 @@ -59,7 +59,7 @@ lide-deps p2 ${osgi-bundles-site} - + eclipse p2 @@ -158,7 +158,7 @@ true sha256 - + @@ -194,7 +194,7 @@ p2 - org.eclipse.justj.openjdk.hotspot.jre.full-17 + org.eclipse.justj.openjdk.hotspot.jre.full-21 true true @@ -222,7 +222,7 @@ macosx cocoa aarch64 - + diff --git a/enterprise/plugins/com.liferay.ide.kaleo.core/META-INF/MANIFEST.MF b/enterprise/plugins/com.liferay.ide.kaleo.core/META-INF/MANIFEST.MF index 98480fed06..0087113ac3 100644 --- a/enterprise/plugins/com.liferay.ide.kaleo.core/META-INF/MANIFEST.MF +++ b/enterprise/plugins/com.liferay.ide.kaleo.core/META-INF/MANIFEST.MF @@ -23,7 +23,7 @@ Require-Bundle: com.liferay.ide.core, org.eclipse.wst.validation, org.eclipse.wst.xml.core, org.json -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-ActivationPolicy: lazy Export-Package: com.liferay.ide.kaleo.core, com.liferay.ide.kaleo.core.model, diff --git a/enterprise/plugins/com.liferay.ide.kaleo.ui/META-INF/MANIFEST.MF b/enterprise/plugins/com.liferay.ide.kaleo.ui/META-INF/MANIFEST.MF index 46bc1be519..c5a48238a5 100644 --- a/enterprise/plugins/com.liferay.ide.kaleo.ui/META-INF/MANIFEST.MF +++ b/enterprise/plugins/com.liferay.ide.kaleo.ui/META-INF/MANIFEST.MF @@ -38,7 +38,7 @@ Require-Bundle: com.liferay.ide.core, org.eclipse.wst.xml.core, org.eclipse.wst.xml.ui, org.json -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-ActivationPolicy: lazy Export-Package: com.liferay.ide.kaleo.ui, com.liferay.ide.kaleo.ui.action, diff --git a/enterprise/plugins/com.liferay.ide.scripting.core/META-INF/MANIFEST.MF b/enterprise/plugins/com.liferay.ide.scripting.core/META-INF/MANIFEST.MF index e94d91f162..22b93d79b3 100644 --- a/enterprise/plugins/com.liferay.ide.scripting.core/META-INF/MANIFEST.MF +++ b/enterprise/plugins/com.liferay.ide.scripting.core/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-Version: 3.10.4.qualifier Bundle-Activator: com.liferay.ide.scripting.core.ScriptingCore Bundle-Vendor: Liferay, Inc. Require-Bundle: org.eclipse.core.runtime -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-ActivationPolicy: lazy Export-Package: com.liferay.ide.scripting.core, groovy.beans, diff --git a/enterprise/plugins/com.liferay.ide.studio.ui/META-INF/MANIFEST.MF b/enterprise/plugins/com.liferay.ide.studio.ui/META-INF/MANIFEST.MF index 61a350a335..ddca602de6 100644 --- a/enterprise/plugins/com.liferay.ide.studio.ui/META-INF/MANIFEST.MF +++ b/enterprise/plugins/com.liferay.ide.studio.ui/META-INF/MANIFEST.MF @@ -17,7 +17,7 @@ Require-Bundle: com.liferay.ide.core, org.eclipse.sapphire.ui;bundle-version="[9,10)", org.eclipse.ui, org.eclipse.ui.intro -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-ActivationPolicy: lazy Bundle-Localization: plugin Export-Package: com.liferay.ide.studio.ui diff --git a/maven/plugins/com.liferay.ide.maven.core/META-INF/MANIFEST.MF b/maven/plugins/com.liferay.ide.maven.core/META-INF/MANIFEST.MF index 7fad014550..e377352b39 100644 --- a/maven/plugins/com.liferay.ide.maven.core/META-INF/MANIFEST.MF +++ b/maven/plugins/com.liferay.ide.maven.core/META-INF/MANIFEST.MF @@ -46,7 +46,7 @@ Require-Bundle: biz.aQute.bndlib, org.eclipse.equinox.registry, org.osgi.service.component.annotations, slf4j.api -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-ActivationPolicy: lazy Bundle-ClassPath: ., lib/maven-portal-support.jar diff --git a/maven/plugins/com.liferay.ide.maven.ui/META-INF/MANIFEST.MF b/maven/plugins/com.liferay.ide.maven.ui/META-INF/MANIFEST.MF index 49037bf42f..f64e06da05 100644 --- a/maven/plugins/com.liferay.ide.maven.ui/META-INF/MANIFEST.MF +++ b/maven/plugins/com.liferay.ide.maven.ui/META-INF/MANIFEST.MF @@ -25,7 +25,7 @@ Require-Bundle: com.liferay.ide.core, org.eclipse.ui.ide, org.eclipse.wst.sse.core, org.eclipse.wst.xml.core -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-ActivationPolicy: lazy Bundle-ClassPath: . Export-Package: com.liferay.ide.maven.ui, diff --git a/maven/tests/com.liferay.ide.maven.core.tests/META-INF/MANIFEST.MF b/maven/tests/com.liferay.ide.maven.core.tests/META-INF/MANIFEST.MF index cb85931173..dd56e217e5 100644 --- a/maven/tests/com.liferay.ide.maven.core.tests/META-INF/MANIFEST.MF +++ b/maven/tests/com.liferay.ide.maven.core.tests/META-INF/MANIFEST.MF @@ -24,6 +24,6 @@ Require-Bundle: com.liferay.ide.core, org.eclipse.wst.common.frameworks, org.eclipse.wst.server.core, org.junit -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-ActivationPolicy: lazy Export-Package: com.liferay.ide.maven.core.tests diff --git a/tools/plugins/com.liferay.ide.bndtools.core/META-INF/MANIFEST.MF b/tools/plugins/com.liferay.ide.bndtools.core/META-INF/MANIFEST.MF index 37ac1fa6a6..feb724d8ff 100644 --- a/tools/plugins/com.liferay.ide.bndtools.core/META-INF/MANIFEST.MF +++ b/tools/plugins/com.liferay.ide.bndtools.core/META-INF/MANIFEST.MF @@ -13,7 +13,7 @@ Require-Bundle: org.eclipse.core.runtime, bndtools.core, com.liferay.ide.server.core, org.apache.commons.lang -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-ActivationPolicy: lazy Export-Package: com.liferay.ide.bndtools.core Bundle-ClassPath: . diff --git a/tools/plugins/com.liferay.ide.core/META-INF/MANIFEST.MF b/tools/plugins/com.liferay.ide.core/META-INF/MANIFEST.MF index 8254e416ea..459376e68f 100644 --- a/tools/plugins/com.liferay.ide.core/META-INF/MANIFEST.MF +++ b/tools/plugins/com.liferay.ide.core/META-INF/MANIFEST.MF @@ -27,7 +27,7 @@ Require-Bundle: com.google.gson, org.eclipse.jface.text, org.eclipse.sapphire.modeling, org.json -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-ActivationPolicy: lazy Export-Package: com.liferay.ide.core, com.liferay.ide.core.adapter, diff --git a/tools/plugins/com.liferay.ide.gradle.core/META-INF/MANIFEST.MF b/tools/plugins/com.liferay.ide.gradle.core/META-INF/MANIFEST.MF index 3193fc896b..a0dcd15bae 100644 --- a/tools/plugins/com.liferay.ide.gradle.core/META-INF/MANIFEST.MF +++ b/tools/plugins/com.liferay.ide.gradle.core/META-INF/MANIFEST.MF @@ -10,7 +10,7 @@ Bundle-Name: Liferay IDE Gradle Core Bundle-SymbolicName: com.liferay.ide.gradle.core;singleton:=true Bundle-Vendor: Liferay, Inc. Bundle-Version: 3.10.4.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Export-Package: com.liferay.blade.gradle.tooling, com.liferay.ide.gradle.core, com.liferay.ide.gradle.core.model diff --git a/tools/plugins/com.liferay.ide.gradle.ui/META-INF/MANIFEST.MF b/tools/plugins/com.liferay.ide.gradle.ui/META-INF/MANIFEST.MF index 555face23f..797166c2e2 100644 --- a/tools/plugins/com.liferay.ide.gradle.ui/META-INF/MANIFEST.MF +++ b/tools/plugins/com.liferay.ide.gradle.ui/META-INF/MANIFEST.MF @@ -37,7 +37,7 @@ Require-Bundle: com.google.guava, org.eclipse.wst.server.core, org.eclipse.wst.server.ui, org.json -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-ActivationPolicy: lazy Bundle-ClassPath: . Export-Package: com.liferay.ide.gradle.ui diff --git a/tools/plugins/com.liferay.ide.hook.core/META-INF/MANIFEST.MF b/tools/plugins/com.liferay.ide.hook.core/META-INF/MANIFEST.MF index 5efe36c886..f503fcefed 100644 --- a/tools/plugins/com.liferay.ide.hook.core/META-INF/MANIFEST.MF +++ b/tools/plugins/com.liferay.ide.hook.core/META-INF/MANIFEST.MF @@ -26,7 +26,7 @@ Require-Bundle: com.liferay.ide.core, org.eclipse.wst.sse.core, org.eclipse.wst.validation, org.eclipse.wst.xml.core -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-ActivationPolicy: lazy Export-Package: com.liferay.ide.hook.core, com.liferay.ide.hook.core.dd, diff --git a/tools/plugins/com.liferay.ide.hook.ui/META-INF/MANIFEST.MF b/tools/plugins/com.liferay.ide.hook.ui/META-INF/MANIFEST.MF index 4f7c204f8e..747b3d96f2 100644 --- a/tools/plugins/com.liferay.ide.hook.ui/META-INF/MANIFEST.MF +++ b/tools/plugins/com.liferay.ide.hook.ui/META-INF/MANIFEST.MF @@ -27,7 +27,7 @@ Require-Bundle: com.liferay.ide.core, org.eclipse.ui.ide, org.eclipse.ui.views.properties.tabbed, org.eclipse.wst.common.frameworks.ui -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-ActivationPolicy: lazy Export-Package: com.liferay.ide.hook.ui, com.liferay.ide.hook.ui.action, diff --git a/tools/plugins/com.liferay.ide.layouttpl.core/META-INF/MANIFEST.MF b/tools/plugins/com.liferay.ide.layouttpl.core/META-INF/MANIFEST.MF index 90cd20f439..2674128610 100644 --- a/tools/plugins/com.liferay.ide.layouttpl.core/META-INF/MANIFEST.MF +++ b/tools/plugins/com.liferay.ide.layouttpl.core/META-INF/MANIFEST.MF @@ -21,7 +21,7 @@ Require-Bundle: com.liferay.ide.core, org.eclipse.wst.common.project.facet.core, org.eclipse.wst.sse.core, org.eclipse.wst.xml.core -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-ActivationPolicy: lazy Export-Package: com.liferay.ide.layouttpl.core, com.liferay.ide.layouttpl.core.descriptor, diff --git a/tools/plugins/com.liferay.ide.layouttpl.ui/META-INF/MANIFEST.MF b/tools/plugins/com.liferay.ide.layouttpl.ui/META-INF/MANIFEST.MF index 1cb3e9d055..62d1f80f5a 100644 --- a/tools/plugins/com.liferay.ide.layouttpl.ui/META-INF/MANIFEST.MF +++ b/tools/plugins/com.liferay.ide.layouttpl.ui/META-INF/MANIFEST.MF @@ -27,7 +27,7 @@ Require-Bundle: com.liferay.ide.core, org.eclipse.wst.sse.core, org.eclipse.wst.sse.ui, org.eclipse.wst.xml.core -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-ActivationPolicy: lazy Export-Package: com.liferay.ide.layouttpl.ui, com.liferay.ide.layouttpl.ui.draw2d, diff --git a/tools/plugins/com.liferay.ide.portlet.core/META-INF/MANIFEST.MF b/tools/plugins/com.liferay.ide.portlet.core/META-INF/MANIFEST.MF index bff0f76d89..732e33e0b6 100644 --- a/tools/plugins/com.liferay.ide.portlet.core/META-INF/MANIFEST.MF +++ b/tools/plugins/com.liferay.ide.portlet.core/META-INF/MANIFEST.MF @@ -29,7 +29,7 @@ Require-Bundle: com.liferay.ide.core, org.eclipse.wst.server.core, org.eclipse.wst.sse.core, org.eclipse.wst.xml.core -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-ActivationPolicy: lazy Export-Package: com.liferay.ide.portlet.core, com.liferay.ide.portlet.core.dd, diff --git a/tools/plugins/com.liferay.ide.portlet.ui/META-INF/MANIFEST.MF b/tools/plugins/com.liferay.ide.portlet.ui/META-INF/MANIFEST.MF index e3590be5a3..ad0f7e1707 100644 --- a/tools/plugins/com.liferay.ide.portlet.ui/META-INF/MANIFEST.MF +++ b/tools/plugins/com.liferay.ide.portlet.ui/META-INF/MANIFEST.MF @@ -41,7 +41,7 @@ Require-Bundle: com.liferay.ide.core, org.eclipse.wst.sse.ui, org.eclipse.wst.xml.core, org.eclipse.wst.xml.search.core -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-ActivationPolicy: lazy Export-Package: com.liferay.ide.portlet.ui, com.liferay.ide.portlet.ui.action, diff --git a/tools/plugins/com.liferay.ide.project.core/META-INF/MANIFEST.MF b/tools/plugins/com.liferay.ide.project.core/META-INF/MANIFEST.MF index d27678018f..575a6072f9 100644 --- a/tools/plugins/com.liferay.ide.project.core/META-INF/MANIFEST.MF +++ b/tools/plugins/com.liferay.ide.project.core/META-INF/MANIFEST.MF @@ -41,7 +41,7 @@ Require-Bundle: biz.aQute.bndlib, org.eclipse.wst.validation, org.eclipse.wst.xml.core, org.jsoup -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-ActivationPolicy: lazy Export-Package: com.liferay.ide.project.core, com.liferay.ide.project.core.descriptor, diff --git a/tools/plugins/com.liferay.ide.project.core/src/com/liferay/ide/project/core/util/ProjectUtil.java b/tools/plugins/com.liferay.ide.project.core/src/com/liferay/ide/project/core/util/ProjectUtil.java index 508586202d..a3bc79e2d1 100644 --- a/tools/plugins/com.liferay.ide.project.core/src/com/liferay/ide/project/core/util/ProjectUtil.java +++ b/tools/plugins/com.liferay.ide.project.core/src/com/liferay/ide/project/core/util/ProjectUtil.java @@ -1208,8 +1208,14 @@ else if (javaVersion.startsWith(JavaCore.VERSION_20) && compliance = JavaCore.VERSION_20; } + else if (javaVersion.startsWith(JavaCore.VERSION_21) && + ((javaVersion.length() == JavaCore.VERSION_21.length()) || + (javaVersion.charAt(JavaCore.VERSION_21.length()) == '.'))) { + + compliance = JavaCore.VERSION_21; + } else { - compliance = JavaCore.VERSION_20; // use latest by default + compliance = JavaCore.VERSION_21; // use latest by default } return compliance; diff --git a/tools/plugins/com.liferay.ide.project.ui/META-INF/MANIFEST.MF b/tools/plugins/com.liferay.ide.project.ui/META-INF/MANIFEST.MF index b5a8f815b6..c16608c0f1 100644 --- a/tools/plugins/com.liferay.ide.project.ui/META-INF/MANIFEST.MF +++ b/tools/plugins/com.liferay.ide.project.ui/META-INF/MANIFEST.MF @@ -49,7 +49,7 @@ Require-Bundle: biz.aQute.bndlib, org.eclipse.wst.web.ui, org.eclipse.wst.xml.core, org.eclipse.jdt.launching -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-ActivationPolicy: lazy Export-Package: com.liferay.ide.project.ui, com.liferay.ide.project.ui.action, diff --git a/tools/plugins/com.liferay.ide.sdk.core/META-INF/MANIFEST.MF b/tools/plugins/com.liferay.ide.sdk.core/META-INF/MANIFEST.MF index 8c66ead462..b47000f4b3 100644 --- a/tools/plugins/com.liferay.ide.sdk.core/META-INF/MANIFEST.MF +++ b/tools/plugins/com.liferay.ide.sdk.core/META-INF/MANIFEST.MF @@ -18,6 +18,6 @@ Require-Bundle: com.liferay.ide.core, org.eclipse.jdt.core, org.eclipse.jdt.launching, org.eclipse.wst.server.core -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-ActivationPolicy: lazy Export-Package: com.liferay.ide.sdk.core diff --git a/tools/plugins/com.liferay.ide.server.core/META-INF/MANIFEST.MF b/tools/plugins/com.liferay.ide.server.core/META-INF/MANIFEST.MF index 35f68e339e..69814752fe 100644 --- a/tools/plugins/com.liferay.ide.server.core/META-INF/MANIFEST.MF +++ b/tools/plugins/com.liferay.ide.server.core/META-INF/MANIFEST.MF @@ -37,7 +37,7 @@ Require-Bundle: com.fasterxml.jackson.core.jackson-annotations, org.gradle.toolingapi, org.json, org.slf4j.api -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-ActivationPolicy: lazy Export-Package: com.github.dockerjava.api.model, com.liferay.ide.server.core, diff --git a/tools/plugins/com.liferay.ide.server.tomcat.core/META-INF/MANIFEST.MF b/tools/plugins/com.liferay.ide.server.tomcat.core/META-INF/MANIFEST.MF index d6ba4e6244..9eea0497ca 100644 --- a/tools/plugins/com.liferay.ide.server.tomcat.core/META-INF/MANIFEST.MF +++ b/tools/plugins/com.liferay.ide.server.tomcat.core/META-INF/MANIFEST.MF @@ -20,7 +20,7 @@ Require-Bundle: com.liferay.ide.core, org.eclipse.jst.server.tomcat.core, org.eclipse.wst.common.project.facet.core, org.eclipse.wst.server.core -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-ActivationPolicy: lazy Export-Package: com.liferay.ide.server.tomcat.core, com.liferay.ide.server.tomcat.core.job, diff --git a/tools/plugins/com.liferay.ide.server.tomcat.ui/META-INF/MANIFEST.MF b/tools/plugins/com.liferay.ide.server.tomcat.ui/META-INF/MANIFEST.MF index b84f74ceb0..f11ac3b99c 100644 --- a/tools/plugins/com.liferay.ide.server.tomcat.ui/META-INF/MANIFEST.MF +++ b/tools/plugins/com.liferay.ide.server.tomcat.ui/META-INF/MANIFEST.MF @@ -24,7 +24,7 @@ Require-Bundle: com.liferay.ide.core, org.eclipse.wst.common.project.facet.ui, org.eclipse.wst.server.core, org.eclipse.wst.server.ui -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-ActivationPolicy: lazy Export-Package: com.liferay.ide.server.tomcat.ui, com.liferay.ide.server.tomcat.ui.command, diff --git a/tools/plugins/com.liferay.ide.server.ui/META-INF/MANIFEST.MF b/tools/plugins/com.liferay.ide.server.ui/META-INF/MANIFEST.MF index 401c5d2d1e..dfc35c5969 100644 --- a/tools/plugins/com.liferay.ide.server.ui/META-INF/MANIFEST.MF +++ b/tools/plugins/com.liferay.ide.server.ui/META-INF/MANIFEST.MF @@ -41,7 +41,7 @@ Require-Bundle: com.liferay.ide.core, org.apache.commons.logging, com.google.guava, org.slf4j.api -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-ActivationPolicy: lazy Export-Package: com.liferay.ide.server.ui, com.liferay.ide.server.ui.action, diff --git a/tools/plugins/com.liferay.ide.service.core/META-INF/MANIFEST.MF b/tools/plugins/com.liferay.ide.service.core/META-INF/MANIFEST.MF index 71bda5a76b..a59180e114 100644 --- a/tools/plugins/com.liferay.ide.service.core/META-INF/MANIFEST.MF +++ b/tools/plugins/com.liferay.ide.service.core/META-INF/MANIFEST.MF @@ -21,7 +21,7 @@ Require-Bundle: com.liferay.ide.core, org.eclipse.wst.common.frameworks, org.eclipse.wst.sse.core, org.eclipse.wst.xml.core -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-ActivationPolicy: lazy Export-Package: com.liferay.ide.service.core, com.liferay.ide.service.core.job, diff --git a/tools/plugins/com.liferay.ide.service.ui/META-INF/MANIFEST.MF b/tools/plugins/com.liferay.ide.service.ui/META-INF/MANIFEST.MF index 923fbb8979..63410912c4 100644 --- a/tools/plugins/com.liferay.ide.service.ui/META-INF/MANIFEST.MF +++ b/tools/plugins/com.liferay.ide.service.ui/META-INF/MANIFEST.MF @@ -31,7 +31,7 @@ Require-Bundle: com.liferay.ide.core, org.eclipse.ui.views.properties.tabbed, org.eclipse.wst.common.frameworks.ui, org.eclipse.wst.common.modulecore -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-ActivationPolicy: lazy Export-Package: com.liferay.ide.service.ui, com.liferay.ide.service.ui.actions, diff --git a/tools/plugins/com.liferay.ide.theme.core/META-INF/MANIFEST.MF b/tools/plugins/com.liferay.ide.theme.core/META-INF/MANIFEST.MF index d0a5541b3b..d205e80809 100644 --- a/tools/plugins/com.liferay.ide.theme.core/META-INF/MANIFEST.MF +++ b/tools/plugins/com.liferay.ide.theme.core/META-INF/MANIFEST.MF @@ -21,7 +21,7 @@ Require-Bundle: com.liferay.ide.core, org.eclipse.wst.server.core, org.eclipse.wst.sse.core, org.eclipse.wst.xml.core -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-ActivationPolicy: lazy Export-Package: com.liferay.ide.theme.core, com.liferay.ide.theme.core.facet, diff --git a/tools/plugins/com.liferay.ide.ui.snippets/META-INF/MANIFEST.MF b/tools/plugins/com.liferay.ide.ui.snippets/META-INF/MANIFEST.MF index be220fcc37..c349b9c488 100644 --- a/tools/plugins/com.liferay.ide.ui.snippets/META-INF/MANIFEST.MF +++ b/tools/plugins/com.liferay.ide.ui.snippets/META-INF/MANIFEST.MF @@ -17,7 +17,7 @@ Require-Bundle: com.liferay.ide.core, org.eclipse.ui, org.eclipse.ui.ide, org.eclipse.wst.common.snippets -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-ActivationPolicy: lazy Export-Package: com.liferay.ide.ui.snippets, com.liferay.ide.ui.snippets.util, diff --git a/tools/plugins/com.liferay.ide.ui/META-INF/MANIFEST.MF b/tools/plugins/com.liferay.ide.ui/META-INF/MANIFEST.MF index 9ed4afc7d0..11639458d3 100644 --- a/tools/plugins/com.liferay.ide.ui/META-INF/MANIFEST.MF +++ b/tools/plugins/com.liferay.ide.ui/META-INF/MANIFEST.MF @@ -24,7 +24,7 @@ Require-Bundle: com.liferay.ide.core, org.eclipse.ui.navigator, org.eclipse.wst.common.project.facet.core, org.eclipse.wst.server.core -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-ActivationPolicy: lazy Export-Package: com.liferay.ide.ui, com.liferay.ide.ui.action, diff --git a/tools/plugins/com.liferay.ide.upgrade.commands.core/META-INF/MANIFEST.MF b/tools/plugins/com.liferay.ide.upgrade.commands.core/META-INF/MANIFEST.MF index 8e44b47421..5e87888158 100644 --- a/tools/plugins/com.liferay.ide.upgrade.commands.core/META-INF/MANIFEST.MF +++ b/tools/plugins/com.liferay.ide.upgrade.commands.core/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-ClassPath: . Bundle-ManifestVersion: 2 Automatic-Module-Name: com.liferay.ide.upgrade.commands.core Bundle-Name: Liferay IDE Upgrade Plan Commands Core -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-SymbolicName: com.liferay.ide.upgrade.commands.core;singleton:=true Bundle-Vendor: Liferay, Inc. Bundle-Version: 3.10.4.qualifier diff --git a/tools/plugins/com.liferay.ide.upgrade.commands.ui/META-INF/MANIFEST.MF b/tools/plugins/com.liferay.ide.upgrade.commands.ui/META-INF/MANIFEST.MF index f55c90e7e7..2f73a282d2 100644 --- a/tools/plugins/com.liferay.ide.upgrade.commands.ui/META-INF/MANIFEST.MF +++ b/tools/plugins/com.liferay.ide.upgrade.commands.ui/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-ClassPath: . Bundle-ManifestVersion: 2 Automatic-Module-Name: com.liferay.ide.upgrade.commands.ui Bundle-Name: Liferay IDE Upgrade Plan Commands UI -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-SymbolicName: com.liferay.ide.upgrade.commands.ui;singleton:=true Bundle-Vendor: Liferay, Inc. Bundle-Version: 3.10.4.qualifier diff --git a/tools/plugins/com.liferay.ide.upgrade.plan.core/META-INF/MANIFEST.MF b/tools/plugins/com.liferay.ide.upgrade.plan.core/META-INF/MANIFEST.MF index d0638e60ad..40320ed8d3 100644 --- a/tools/plugins/com.liferay.ide.upgrade.plan.core/META-INF/MANIFEST.MF +++ b/tools/plugins/com.liferay.ide.upgrade.plan.core/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Activator: com.liferay.ide.upgrade.plan.core.UpgradePlanCorePlugin Bundle-ManifestVersion: 2 Automatic-Module-Name: com.liferay.ide.upgrade.plan.core Bundle-Name: Liferay IDE Upgrade Plan Core -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-SymbolicName: com.liferay.ide.upgrade.plan.core;singleton:=true Bundle-Vendor: Liferay, Inc. Bundle-Version: 3.10.4.qualifier diff --git a/tools/plugins/com.liferay.ide.upgrade.plan.ui/META-INF/MANIFEST.MF b/tools/plugins/com.liferay.ide.upgrade.plan.ui/META-INF/MANIFEST.MF index f0285e9a5a..6bb197ce10 100644 --- a/tools/plugins/com.liferay.ide.upgrade.plan.ui/META-INF/MANIFEST.MF +++ b/tools/plugins/com.liferay.ide.upgrade.plan.ui/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-ClassPath: ., Bundle-ManifestVersion: 2 Automatic-Module-Name: com.liferay.ide.upgrade.plan.ui Bundle-Name: Liferay IDE Upgrade Plan UI -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-SymbolicName: com.liferay.ide.upgrade.plan.ui;singleton:=true Bundle-Vendor: Liferay, Inc. Bundle-Version: 3.10.4.qualifier diff --git a/tools/plugins/com.liferay.ide.upgrade.planner.ui/META-INF/MANIFEST.MF b/tools/plugins/com.liferay.ide.upgrade.planner.ui/META-INF/MANIFEST.MF index c1d0e205c2..cd4f59a361 100644 --- a/tools/plugins/com.liferay.ide.upgrade.planner.ui/META-INF/MANIFEST.MF +++ b/tools/plugins/com.liferay.ide.upgrade.planner.ui/META-INF/MANIFEST.MF @@ -12,7 +12,7 @@ Require-Bundle: com.liferay.ide.core, org.eclipse.core.runtime, org.eclipse.ui, org.eclipse.ui.intro -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-ActivationPolicy: lazy Bundle-Localization: plugin Export-Package: com.liferay.ide.upgrade.planner.ui diff --git a/tools/plugins/com.liferay.ide.upgrade.problems.core/META-INF/MANIFEST.MF b/tools/plugins/com.liferay.ide.upgrade.problems.core/META-INF/MANIFEST.MF index 7f361765a8..df5600fd40 100644 --- a/tools/plugins/com.liferay.ide.upgrade.problems.core/META-INF/MANIFEST.MF +++ b/tools/plugins/com.liferay.ide.upgrade.problems.core/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-ClassPath: ., Bundle-ManifestVersion: 2 Automatic-Module-Name: com.liferay.ide.upgrade.problems.core Bundle-Name: Liferay IDE Upgrade Problems Core -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-SymbolicName: com.liferay.ide.upgrade.problems.core;singleton:=true Bundle-Vendor: Liferay, Inc. Bundle-Version: 3.10.4.qualifier diff --git a/tools/plugins/com.liferay.ide.upgrade.problems.ui/META-INF/MANIFEST.MF b/tools/plugins/com.liferay.ide.upgrade.problems.ui/META-INF/MANIFEST.MF index 8d36248692..75ad82dce9 100644 --- a/tools/plugins/com.liferay.ide.upgrade.problems.ui/META-INF/MANIFEST.MF +++ b/tools/plugins/com.liferay.ide.upgrade.problems.ui/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-ActivationPolicy: lazy Bundle-ManifestVersion: 2 Automatic-Module-Name: com.liferay.ide.upgrade.problems.ui Bundle-Name: Liferay IDE Upgrade Problems UI -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-SymbolicName: com.liferay.ide.upgrade.problems.ui;singleton:=true Bundle-Vendor: Liferay, Inc. Bundle-Version: 3.10.4.qualifier diff --git a/tools/plugins/com.liferay.ide.xml.search.ui/META-INF/MANIFEST.MF b/tools/plugins/com.liferay.ide.xml.search.ui/META-INF/MANIFEST.MF index 209cbe4aef..1e33a06bac 100644 --- a/tools/plugins/com.liferay.ide.xml.search.ui/META-INF/MANIFEST.MF +++ b/tools/plugins/com.liferay.ide.xml.search.ui/META-INF/MANIFEST.MF @@ -36,7 +36,7 @@ Require-Bundle: org.eclipse.core.runtime, org.eclipse.wst.jsdt.web.support.jsp, org.eclipse.jst.j2ee Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Export-Package: com.liferay.ide.xml.search.ui, com.liferay.ide.xml.search.ui.editor, com.liferay.ide.xml.search.ui.markerResolutions, diff --git a/tools/tests/com.liferay.ide.core.tests/META-INF/MANIFEST.MF b/tools/tests/com.liferay.ide.core.tests/META-INF/MANIFEST.MF index c6995dab71..6cc89252da 100644 --- a/tools/tests/com.liferay.ide.core.tests/META-INF/MANIFEST.MF +++ b/tools/tests/com.liferay.ide.core.tests/META-INF/MANIFEST.MF @@ -11,6 +11,6 @@ Require-Bundle: com.liferay.ide.core, org.eclipse.sapphire.modeling;bundle-version="[9,10)", org.eclipse.wst.validation, org.junit -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-ActivationPolicy: lazy Export-Package: com.liferay.ide.core.tests diff --git a/tools/tests/com.liferay.ide.hook.core.tests/META-INF/MANIFEST.MF b/tools/tests/com.liferay.ide.hook.core.tests/META-INF/MANIFEST.MF index 3f1564406a..7a071978c6 100644 --- a/tools/tests/com.liferay.ide.hook.core.tests/META-INF/MANIFEST.MF +++ b/tools/tests/com.liferay.ide.hook.core.tests/META-INF/MANIFEST.MF @@ -16,6 +16,6 @@ Require-Bundle: com.liferay.ide.core, org.eclipse.sapphire.modeling;bundle-version="[9,10)", org.eclipse.sapphire.modeling.xml;bundle-version="[9,10)", org.junit -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-ActivationPolicy: lazy Export-Package: com.liferay.ide.hook.core.tests diff --git a/tools/tests/com.liferay.ide.layouttpl.core.tests/META-INF/MANIFEST.MF b/tools/tests/com.liferay.ide.layouttpl.core.tests/META-INF/MANIFEST.MF index 4e8be5fc2a..f4f786594a 100644 --- a/tools/tests/com.liferay.ide.layouttpl.core.tests/META-INF/MANIFEST.MF +++ b/tools/tests/com.liferay.ide.layouttpl.core.tests/META-INF/MANIFEST.MF @@ -11,6 +11,6 @@ Require-Bundle: com.liferay.ide.core, org.eclipse.core.runtime, org.eclipse.sapphire.modeling;bundle-version="[9,10)", org.junit -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-ActivationPolicy: lazy Export-Package: com.liferay.ide.layouttpl.core.tests diff --git a/tools/tests/com.liferay.ide.portlet.core.tests/META-INF/MANIFEST.MF b/tools/tests/com.liferay.ide.portlet.core.tests/META-INF/MANIFEST.MF index 965d0e6f1c..7e7d706894 100644 --- a/tools/tests/com.liferay.ide.portlet.core.tests/META-INF/MANIFEST.MF +++ b/tools/tests/com.liferay.ide.portlet.core.tests/META-INF/MANIFEST.MF @@ -19,6 +19,6 @@ Require-Bundle: com.liferay.ide.core, org.eclipse.sapphire.java;bundle-version="[9,10)", com.liferay.ide.server.core.tests, org.junit -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-ActivationPolicy: lazy Export-Package: com.liferay.ide.portlet.core.tests diff --git a/tools/tests/com.liferay.ide.project.core.tests/META-INF/MANIFEST.MF b/tools/tests/com.liferay.ide.project.core.tests/META-INF/MANIFEST.MF index a29b905e60..eff2c6eadc 100644 --- a/tools/tests/com.liferay.ide.project.core.tests/META-INF/MANIFEST.MF +++ b/tools/tests/com.liferay.ide.project.core.tests/META-INF/MANIFEST.MF @@ -28,6 +28,6 @@ Require-Bundle: biz.aQute.bndlib, org.eclipse.wst.validation, org.eclipse.wst.xml.core, org.junit -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-ActivationPolicy: lazy Export-Package: com.liferay.ide.project.core.tests diff --git a/tools/tests/com.liferay.ide.server.core.tests/META-INF/MANIFEST.MF b/tools/tests/com.liferay.ide.server.core.tests/META-INF/MANIFEST.MF index 9d9a8a908a..ddab11ab6a 100644 --- a/tools/tests/com.liferay.ide.server.core.tests/META-INF/MANIFEST.MF +++ b/tools/tests/com.liferay.ide.server.core.tests/META-INF/MANIFEST.MF @@ -17,6 +17,6 @@ Require-Bundle: com.liferay.ide.core, org.eclipse.wst.common.project.facet.core, org.eclipse.wst.server.core, org.junit -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-ActivationPolicy: lazy Export-Package: com.liferay.ide.server.core.tests diff --git a/tools/tests/com.liferay.ide.service.core.tests/META-INF/MANIFEST.MF b/tools/tests/com.liferay.ide.service.core.tests/META-INF/MANIFEST.MF index 82b7585bd7..ce61e664bc 100644 --- a/tools/tests/com.liferay.ide.service.core.tests/META-INF/MANIFEST.MF +++ b/tools/tests/com.liferay.ide.service.core.tests/META-INF/MANIFEST.MF @@ -17,6 +17,6 @@ Require-Bundle: com.liferay.ide.core, org.eclipse.sapphire.modeling.xml;bundle-version="[9,10)", org.eclipse.wst.common.frameworks, org.junit -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-ActivationPolicy: lazy Export-Package: com.liferay.ide.service.core.tests diff --git a/tools/tests/com.liferay.ide.ui.tests/META-INF/MANIFEST.MF b/tools/tests/com.liferay.ide.ui.tests/META-INF/MANIFEST.MF index d3e6ee34b9..4a896fc35a 100644 --- a/tools/tests/com.liferay.ide.ui.tests/META-INF/MANIFEST.MF +++ b/tools/tests/com.liferay.ide.ui.tests/META-INF/MANIFEST.MF @@ -19,6 +19,6 @@ Require-Bundle: com.liferay.ide.core, org.eclipse.wst.xml.core, org.eclipse.wst.xml.ui, org.junit -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-ActivationPolicy: lazy Export-Package: com.liferay.ide.ui.tests diff --git a/tools/tests/com.liferay.ide.upgrade.problems.core.tests/META-INF/MANIFEST.MF b/tools/tests/com.liferay.ide.upgrade.problems.core.tests/META-INF/MANIFEST.MF index 87c8346ee5..8d3d00a943 100644 --- a/tools/tests/com.liferay.ide.upgrade.problems.core.tests/META-INF/MANIFEST.MF +++ b/tools/tests/com.liferay.ide.upgrade.problems.core.tests/META-INF/MANIFEST.MF @@ -10,5 +10,5 @@ Require-Bundle: org.eclipse.core.runtime, org.junit;bundle-version="4.12.0", com.liferay.ide.upgrade.plan.core, com.liferay.ide.core -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-ActivationPolicy: lazy diff --git a/tools/tests/com.liferay.ide.xml.search.ui.tests/META-INF/MANIFEST.MF b/tools/tests/com.liferay.ide.xml.search.ui.tests/META-INF/MANIFEST.MF index a8dc1db223..91d69e93a8 100644 --- a/tools/tests/com.liferay.ide.xml.search.ui.tests/META-INF/MANIFEST.MF +++ b/tools/tests/com.liferay.ide.xml.search.ui.tests/META-INF/MANIFEST.MF @@ -22,6 +22,6 @@ Require-Bundle: com.liferay.ide.core, org.eclipse.wst.xml.core, org.eclipse.wst.xml.search.editor, org.junit -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-ActivationPolicy: lazy Export-Package: com.liferay.ide.xml.search.ui.tests