Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 14 additions & 6 deletions .github/workflows/verify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

Expand All @@ -53,6 +54,13 @@ jobs:
restore-keys: |
${{ runner.os }}-maven-
- name: Run tests
id: run-tests
shell: bash
run: |
./run-tests.sh
./run-tests.sh
- name: Upload Surefire Reports
if: failure()
uses: actions/upload-artifact@v4
with:
name: surefire-reports
path: ./tools/tests/**/target/surefire-reports/
2 changes: 1 addition & 1 deletion .mvn/wrapper/maven-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion .sdkmanrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
java=17.0.11-zulu
java=21.0.6-zulu
4 changes: 2 additions & 2 deletions build/com.liferay.ide-repository/studio.product
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ com.liferay.ide.studio.ui
openFile
</programArgs>
<vmArgs>
-Dosgi.requiredJavaVersion=17
-Dosgi.requiredJavaVersion=21
-Xms1024m
-Xmx2048m
-XX:+UseG1GC
Expand All @@ -37,7 +37,7 @@ openFile
</vmArgs>
<vmArgsMac>
-XstartOnFirstThread
-Dosgi.requiredJavaVersion=17
-Dosgi.requiredJavaVersion=21
-Xms1024m
-Xmx2048m
-XX:+UseG1GC
Expand Down
14 changes: 7 additions & 7 deletions build/parent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
<upgrade-plan-content-zip-url>https://us-east-1.linodeobjects.com/devtools-s3.liferay.com/liferay-ide-files/docs/code-upgrade-docs-20210312.zip</upgrade-plan-content-zip-url>
<upgrade-plan-content-zip-md5>c4bce64c362ecffcce300f31e88b2e63</upgrade-plan-content-zip-md5>
<bndtools-site>https://bndtools.org/bndtools.p2.repo/7.0.0/</bndtools-site>
<eclipse-site>https://download.eclipse.org/releases/2023-12/202312061001/</eclipse-site>
<eclipse-site>https://download.eclipse.org/releases/2025-03/202503121000/</eclipse-site>
<eclipse-xml-search-site>https://us-east-1.linodeobjects.com/devtools-s3.liferay.com/eclipse/eclipse-wtp-xml-search/</eclipse-xml-search-site>
<gradle-site>https://download.eclipse.org/buildship/updates/e427/releases/3.x/3.1.8.v20231117-1658/</gradle-site>
<liferay-ide-swtbot-testing-site>https://files.liferay.org.es/staged/public-files/liferay-ide/unstable/build/com.liferay.ide.testing-repository/target/repository/</liferay-ide-swtbot-testing-site>
Expand All @@ -44,9 +44,9 @@
<sign-apps>false</sign-apps>
<swtbot-site>https://download.eclipse.org/technology/swtbot/releases/2.8.0/</swtbot-site>
<tm-site>https://download.eclipse.org/tm/updates/4.5.500/repository/</tm-site>
<jre-site>https://download.eclipse.org/justj/jres/17/updates/release/latest</jre-site>
<jre-site>https://download.eclipse.org/justj/jres/21/updates/release/latest</jre-site>
<tycho-packaging-format>yyyyMMddHHmm</tycho-packaging-format>
<tycho-version>3.0.5</tycho-version>
<tycho-version>4.0.12</tycho-version>
</properties>

<repositories>
Expand All @@ -59,7 +59,7 @@
<id>lide-deps</id>
<layout>p2</layout>
<url>${osgi-bundles-site}</url>
</repository>
</repository>
<repository>
<id>eclipse</id>
<layout>p2</layout>
Expand Down Expand Up @@ -158,7 +158,7 @@
<extensions>true</extensions>
<configuration>
<digest>sha256</digest>
</configuration>
</configuration>
</plugin>

<plugin>
Expand Down Expand Up @@ -194,7 +194,7 @@
</extraRequirements>
</dependency-resolution>
<resolver>p2</resolver>
<executionEnvironment>org.eclipse.justj.openjdk.hotspot.jre.full-17</executionEnvironment>
<executionEnvironment>org.eclipse.justj.openjdk.hotspot.jre.full-21</executionEnvironment>
<resolveWithExecutionEnvironmentConstraints>true</resolveWithExecutionEnvironmentConstraints>
<allowConflictingDependencies>true</allowConflictingDependencies>
<environments>
Expand Down Expand Up @@ -222,7 +222,7 @@
<os>macosx</os>
<ws>cocoa</ws>
<arch>aarch64</arch>
</environment>
</environment>
</environments>
</configuration>
</plugin>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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: .
2 changes: 1 addition & 1 deletion tools/plugins/com.liferay.ide.core/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion tools/plugins/com.liferay.ide.hook.ui/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Loading
Loading