Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

IDE-5116 upgrade IDE base eclipse jee version to 202312 #373

Merged
merged 15 commits into from
Nov 24, 2023
Merged
Changes from 1 commit
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
Prev Previous commit
Next Next commit
IDE-5116 fix installer product file name
simonjhy committed Nov 24, 2023
commit 34ae64ff781f5d7b5e04100a7182e73c4232649c
2 changes: 1 addition & 1 deletion build/com.liferay.ide-repository/hidden.features.product
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<?pde version="3.5"?>

<product name="Liferay IDE Hidden Features" uid="com.liferay.ide-repository.hidden.features" id="com.liferay.ide-repository.hidden.features" application="org.eclipse.ui.ide.workbench" version="3.9.9.qualifier" useFeatures="true" includeLaunchers="false">
<product name="Liferay IDE Hidden Features" uid="com.liferay.ide-repository.hidden.features" id="com.liferay.ide-repository.hidden.features" application="org.eclipse.ui.ide.workbench" version="4.0.0.qualifier" useFeatures="true" includeLaunchers="false">

<aboutInfo>
</aboutInfo>
2 changes: 1 addition & 1 deletion build/com.liferay.ide-repository/studio.product
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<?pde version="3.5"?>

<product name="Liferay Developer Studio" uid="com.liferay.ide.studio" id="com.liferay.ide.studio" application="org.eclipse.ui.ide.workbench" version="3.9.9.qualifier" useFeatures="true" includeLaunchers="true">
<product name="Liferay Developer Studio" uid="com.liferay.ide.studio" id="com.liferay.ide.studio" application="org.eclipse.ui.ide.workbench" version="4.0.0.qualifier" useFeatures="true" includeLaunchers="true">

<aboutInfo>
<image path="images/about.png"/>
2 changes: 1 addition & 1 deletion build/com.liferay.ide.upgrade.planner-repository/pom.xml
Original file line number Diff line number Diff line change
@@ -22,7 +22,7 @@
<parent>
<groupId>com.liferay.ide.build</groupId>
<artifactId>build</artifactId>
<version>3.9.9-SNAPSHOT</version>
<version>4.0.0-SNAPSHOT</version>
</parent>

<artifactId>com.liferay.ide.upgrade.planner-repository</artifactId>
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<?pde version="3.5"?>

<product name="Liferay Upgrade Planner" uid="com.liferay.ide.upgrade.planner" id="com.liferay.ide.upgrade.planner" application="org.eclipse.ui.ide.workbench" version="3.9.9.qualifier" useFeatures="true" includeLaunchers="true">
<product name="Liferay Upgrade Planner" uid="com.liferay.ide.upgrade.planner" id="com.liferay.ide.upgrade.planner" application="org.eclipse.ui.ide.workbench" version="4.0.0.qualifier" useFeatures="true" includeLaunchers="true">

<aboutInfo>
<image path="images/about.png"/>
3 changes: 2 additions & 1 deletion build/installers/liferay-workspace-with-devstudio/pom.xml
Original file line number Diff line number Diff line change
@@ -31,7 +31,8 @@
<name>Liferay Workspace with DevStudio Installer</name>

<properties>
<studio-installer-version>${maven.build.timestamp}</studio-installer-version>
<maven.build.timestamp.format>yyyyMMddHHmm</maven.build.timestamp.format>
<studio-installer-version>4.0.0-${liferay-ide-tag}-${maven.build.timestamp}</studio-installer-version>
</properties>

<build>
3 changes: 2 additions & 1 deletion build/installers/liferay-workspace/pom.xml
Original file line number Diff line number Diff line change
@@ -31,7 +31,8 @@
<name>Liferay Workspace Installer</name>

<properties>
<workspace-installer-version>${maven.build.timestamp}</workspace-installer-version>
<maven.build.timestamp.format>yyyyMMddHHmm</maven.build.timestamp.format>
<workspace-installer-version>4.0.0-${liferay-ide-tag}-${maven.build.timestamp}</workspace-installer-version>
</properties>

<build>
28 changes: 28 additions & 0 deletions build/parent/pom.xml
Original file line number Diff line number Diff line change
@@ -233,6 +233,34 @@
<version>${tycho-version}</version>
<configuration>
<format>${tycho-packaging-format}</format>
<archiveSite>true</archiveSite>
<environments>
<environment>
<os>win32</os>
<ws>win32</ws>
<arch>x86_64</arch>
</environment>
<environment>
<os>macosx</os>
<ws>cocoa</ws>
<arch>x86_64</arch>
</environment>
<environment>
<os>linux</os>
<ws>gtk</ws>
<arch>x86_64</arch>
</environment>
<environment>
<os>linux</os>
<ws>gtk</ws>
<arch>aarch64</arch>
</environment>
<environment>
<os>macosx</os>
<ws>cocoa</ws>
<arch>aarch64</arch>
</environment>
</environments>
</configuration>
</plugin>
<plugin>