Merge pull request #373 from simonjhy/IDE-5116

IDE-5116 upgrade IDE base eclipse jee version to 202312
simonjhy · Nov 24, 2023 · ee8fc3b · ee8fc3b
2 parents 3c84b12 + 762c5ad
commit ee8fc3b
Show file tree

Hide file tree

Showing 680 changed files with 3,662 additions and 11,824 deletions.
diff --git a/.github/workflows/verify.yml b/.github/workflows/verify.yml
@@ -17,18 +17,18 @@ jobs:
         with:
           repository: gamerson/liferay-ide-m2-repository
           path: liferay-ide-m2-repository
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v1
         with:
-          java-version: 11
+          java-version: 17
       - name: sf.sh
         shell: bash
         working-directory: build/com.liferay.ide.build.source.formatter
         run: |
           ./csf.sh
   Verify:
     name: Verify
-    runs-on: macos-latest
+    runs-on: ubuntu-latest
     timeout-minutes: 60
     steps:
       - name: Checkout liferay-ide
@@ -38,10 +38,10 @@ jobs:
         with:
           repository: gamerson/liferay-ide-m2-repository
           path: liferay-ide-m2-repository
-      - name: Set up JDK 11
-        uses: actions/setup-java@v1
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
         with:
-          java-version: 11
+          java-version: 17
           distribution: 'zulu'
           cache: maven
 

diff --git a/.gitignore b/.gitignore
@@ -2,6 +2,7 @@
 .apt_generated/
 .resources/
 .springBeans
+.tycho-consumer-pom.xml
 *.swp
 hs_err_pid*.log
 bin/

diff --git a/build/com.liferay.ide-repository/.project b/build/com.liferay.ide-repository/.project
@@ -14,4 +14,15 @@
 	<natures>
 		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 	</natures>
+	<filteredResources>
+		<filter>
+			<id>1700017524982</id>
+			<name></name>
+			<type>30</type>
+			<matcher>
+				<id>org.eclipse.core.resources.regexFilterMatcher</id>
+				<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
 </projectDescription>
diff --git a/build/com.liferay.ide-repository/category.xml b/build/com.liferay.ide-repository/category.xml
@@ -12,21 +12,6 @@
     <feature id="org.eclipse.buildship" version="0.0.0">
         <category name="liferay-ide" />
     </feature>
-    <feature id="org.eclipse.m2e.feature" version="0.0.0">
-        <category name="liferay-ide" />
-    </feature>
-    <feature id="org.eclipse.m2e.wtp.feature" version="0.0.0">
-        <category name="liferay-ide" />
-    </feature>
-    <feature id="org.eclipse.m2e.wtp.jsf.feature" version="0.0.0">
-        <category name="liferay-ide" />
-    </feature>
-    <feature id="org.eclipse.m2e.logback.feature" version="0.0.0">
-        <category name="liferay-ide" />
-    </feature>
-    <feature id="org.eclipse.m2e.wtp.jpa.feature" version="0.0.0">
-        <category name="liferay-ide" />
-    </feature>
 
     <category-def name="liferay-ide" label="Liferay IDE">
         <description>

diff --git a/build/com.liferay.ide-repository/hidden.features.product b/build/com.liferay.ide-repository/hidden.features.product
@@ -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>
@@ -31,8 +31,6 @@
 
    <features>
       <feature id="com.liferay.ide.hidden" />
-      <feature id="org.apache.ivyde.feature" />
-      <feature id="org.apache.ivy.feature" />
       <feature id="org.eclipse.sapphire" />
       <feature id="org.eclipse.sapphire.java" />
       <feature id="org.eclipse.sapphire.java.jdt" />
@@ -43,13 +41,9 @@
       <feature id="org.eclipse.sapphire.ui.swt.gef" />
       <feature id="org.eclipse.sapphire.ui.swt.xml.editor" />
       <feature id="org.eclipse.wst.xml.search.core-feature" />
-      <feature id="org.sonatype.m2e.mavenarchiver.feature" />
-      <feature id="org.sonatype.tycho.m2e.feature" />
       <feature id="org.eclipse.tm.terminal.connector.telnet.feature" />
       <feature id="org.eclipse.tm.terminal.control.feature" />
       <feature id="org.eclipse.tm.terminal.view.feature" />
-      <feature id="com.ianbrandt.tools.m2e.mdp.feature" />
-      <feature id="org.eclipse.m2e.sdk.feature" />
    </features>
 
    <configurations>

diff --git a/build/com.liferay.ide-repository/pom.xml b/build/com.liferay.ide-repository/pom.xml
@@ -22,14 +22,18 @@
     <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-repository</artifactId>
     <packaging>eclipse-repository</packaging>
 
     <name>Liferay IDE Repository</name>
 
+    <properties>
+        <maven.build.timestamp.format>yyyyMMddHHmm</maven.build.timestamp.format>
+    </properties>
+
     <build>
         <plugins>
             <!-- Added the switch to final name in the AddAssociateSites -->
@@ -42,41 +46,32 @@
                     <finalName>liferay-ide-updatesite-${unqualifiedVersion}-${liferay-ide-tag}-${maven.build.timestamp}</finalName>
                 </configuration>
             </plugin>
-
             <plugin>
-                <groupId>org.codehaus.gmaven</groupId>
-                <artifactId>gmaven-plugin</artifactId>
-                <version>1.4</version>
+                <groupId>org.codehaus.gmavenplus</groupId>
+                <artifactId>gmavenplus-plugin</artifactId>
+                <version>3.0.2</version>
                 <dependencies>
                     <dependency>
-                        <groupId>org.apache.groovy</groupId>
-                        <artifactId>groovy-ant</artifactId>
-                        <version>4.0.7</version>
-                    </dependency>
-                   <dependency>
-                        <groupId>org.apache.groovy</groupId>
+                        <groupId>org.codehaus.groovy</groupId>
                         <artifactId>groovy-all</artifactId>
-                        <version>4.0.7</version>
+                        <version>3.0.19</version>
                         <type>pom</type>
-                        <scope>runtime</scope>
-                    </dependency>
-                     <dependency>
-                        <groupId>org.apache.groovy</groupId>
-                        <artifactId>groovy-xml</artifactId>
-                        <version>4.0.7</version>
                     </dependency>
                 </dependencies>
                 <executions>
                     <execution>
-                        <id>fix-repository</id>
+                        <id>fix-updatesite-package</id>
                         <phase>package</phase>
                         <goals>
                             <goal>execute</goal>
                         </goals>
                     </execution>
                 </executions>
                 <configuration>
-                    <source>${pom.basedir}/src/main/assembly/RemoveUnwantedInstallUnits.groovy</source>
+                    <scripts>
+                        <script>${pom.basedir}/src/main/assembly/RemoveUnwantedInstallUnits.groovy</script>
+                        <script>${pom.basedir}/src/main/assembly/RemoveUnusedJstujLib.groovy</script>
+                    </scripts>
                 </configuration>
             </plugin>
             <plugin>
@@ -175,9 +170,17 @@
                         </configuration>
                     </plugin>
                     <plugin>
-                        <groupId>org.codehaus.gmaven</groupId>
-                        <artifactId>groovy-maven-plugin</artifactId>
-                        <version>2.0</version>
+                        <groupId>org.codehaus.gmavenplus</groupId>
+                        <artifactId>gmavenplus-plugin</artifactId>
+                        <version>3.0.2</version>
+                        <dependencies>
+                            <dependency>
+                                <groupId>org.codehaus.groovy</groupId>
+                                <artifactId>groovy-all</artifactId>
+                                <version>3.0.19</version>
+                                <type>pom</type>
+                            </dependency>
+                        </dependencies>
                         <executions>
                             <execution>
                                 <id>sign-app-x86</id>
@@ -193,7 +196,9 @@
                                         <certificate>Developer+ID+Application%3A+Liferay%2C+Inc.+%287H3SPU5TB9%29</certificate>
                                         <createDmg>false</createDmg>
                                     </properties>
-                                    <source>${pom.basedir}/../installers/shared/scripts/SignApp.groovy</source>
+                                    <scripts>
+                                        <script>${pom.basedir}/../installers/shared/scripts/SignApp.groovy</script>
+                                    </scripts>
                                 </configuration>
                             </execution>
                             <execution>
@@ -210,7 +215,33 @@
                                         <certificate>Developer+ID+Application%3A+Liferay%2C+Inc.+%287H3SPU5TB9%29</certificate>
                                         <createDmg>false</createDmg>
                                     </properties>
-                                    <source>${pom.basedir}/../installers/shared/scripts/SignApp.groovy</source>
+                                    <scripts>
+                                        <script>${pom.basedir}/../installers/shared/scripts/SignApp.groovy</script>
+                                    </scripts>
+                                </configuration>
+                            </execution>
+                            <execution>
+                                <id>fix-updatesite-package</id>
+                                <phase>verify</phase>
+                                <goals>
+                                    <goal>execute</goal>
+                                </goals>
+                                <configuration>
+                                    <scripts>
+                                        <script>${pom.basedir}/src/main/assembly/RemoveUnusedJstujLib.groovy</script>
+                                    </scripts>
+                                </configuration>
+                            </execution>
+                            <execution>
+                                <id>fix-updatesite-content</id>
+                                <phase>prepare-package</phase>
+                                <goals>
+                                    <goal>execute</goal>
+                                </goals>
+                                <configuration>
+                                    <scripts>
+                                        <script>${pom.basedir}/src/main/assembly/RemoveUnwantedInstallUnits.groovy</script>
+                                    </scripts>
                                 </configuration>
                             </execution>
                         </executions>

diff --git a/build/com.liferay.ide-repository/src/main/assembly/RemoveUnusedJstujLib.groovy b/build/com.liferay.ide-repository/src/main/assembly/RemoveUnusedJstujLib.groovy
@@ -0,0 +1,39 @@
+def basedir = project.basedir.canonicalPath
+def targetDir = basedir + "/target/"
+def jarPrefixToRemove = "org.eclipse.justj.openjdk.hotspot.jre.full"
+
+def updateSiteZip = new File(targetDir).listFiles().find { it.name.startsWith("liferay-ide-updatesite") && it.name.endsWith(".zip") }
+
+if (updateSiteZip) {
+  def tempDir = new File(targetDir, "temp-update-site")
+
+  tempDir.mkdir()
+
+  try {
+    ant.unzip(src: updateSiteZip, dest: tempDir)
+
+    def pluginsDir = new File(tempDir, "plugins")
+
+    pluginsDir.listFiles().each { file ->
+      if (file.isFile() && file.getName().startsWith(jarPrefixToRemove)) {
+        if (file.delete()) {
+          println "Removed: ${file.getName()}"
+        } else {
+          println "Failed to remove: ${file.getName()}"
+        }
+      }
+    }
+
+    updateSiteZip.delete()
+
+    ant.zip(destfile: updateSiteZip, basedir: tempDir, update: true)
+  }
+  catch(Exception ex){
+  }
+  finally {
+
+    ant.delete(dir: tempDir)
+  }
+} else {
+  println "Update site zip file not found."
+} 
diff --git a/build/com.liferay.ide-repository/src/main/assembly/RemoveUnwantedInstallUnits.groovy b/build/com.liferay.ide-repository/src/main/assembly/RemoveUnwantedInstallUnits.groovy
@@ -7,7 +7,7 @@ def repositoryDir = basedir + "/target/repository"
 def contentJar = repositoryDir  + "/content.jar"
 def contentDir = basedir  + "/target/content.jar/"
 
-// Remove hidden feature
+//Remove hidden feature
 
 println 'Unzipping content.jar'
 
@@ -75,4 +75,4 @@ def result = writer.toString()
 contentXml.text = result
 
 println 'Zipping back customized content.jar'
-ant.zip( destFile: contentJar, baseDir:contentDir )
+ant.zip( destFile: contentJar, baseDir:contentDir )
diff --git a/build/com.liferay.ide-repository/studio.product b/build/com.liferay.ide-repository/studio.product
@@ -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"/>
@@ -19,29 +19,35 @@
 com.liferay.ide.studio.ui.product
 --launcher.defaultAction
 openFile
---launcher.XXMaxPermSize
-384M
 -showsplash
 com.liferay.ide.studio.ui
 --launcher.defaultAction
 openFile
 </programArgs>
       <vmArgs>
--Dosgi.requiredJavaVersion=1.8
--Xms40m
--Xmx1024m
--Dsun.java2d.noddraw=true
+-Dosgi.requiredJavaVersion=17
+-Xms1024m
+-Xmx2048m
+-XX:+UseG1GC
+-XX:+UseStringDeduplication
+-Dosgi.dataAreaRequiresExplicitInit=true
+-Dorg.eclipse.swt.graphics.Resource.reportNonDisposed=false
+-Dorg.slf4j.simpleLogger.defaultLogLevel=off
+--add-modules=ALL-SYSTEM
 </vmArgs>
       <vmArgsMac>
--Dosgi.requiredJavaVersion=1.8
 -XstartOnFirstThread
--Dorg.eclipse.swt.internal.carbon.smallFonts
--XX:MaxPermSize=384m
--Xms40m
--Xmx1024m
+-Dosgi.requiredJavaVersion=17
+-Xms1024m
+-Xmx2048m
+-XX:+UseG1GC
+-XX:+UseStringDeduplication
+-Dosgi.dataAreaRequiresExplicitInit=true
+-Dorg.eclipse.swt.graphics.Resource.reportNonDisposed=false
+-Dorg.slf4j.simpleLogger.defaultLogLevel=off
 -Xdock:icon=../Resources/DeveloperStudio.icns
--XstartOnFirstThread
 -Dorg.eclipse.swt.internal.carbon.smallFonts
+--add-modules=ALL-SYSTEM
 </vmArgsMac>
    </launcherArgs>
 
@@ -81,6 +87,7 @@ to distribution rights of the Software.
    </license>
 
    <plugins>
+      <plugin id="org.eclipse.justj.openjdk.hotspot.jre.full"/>
    </plugins>
 
    <features>
@@ -123,6 +130,7 @@ to distribution rights of the Software.
 
       <feature id="org.eclipse.jdt" installMode="root"/>
 
+      <feature id="org.eclipse.justj.openjdk.hotspot.jre.full" installMode="root"/>
 
       <feature id="org.eclipse.jpt.common.feature" installMode="root"/>
       <feature id="org.eclipse.jpt.jaxb.feature" installMode="root"/>

diff --git a/build/com.liferay.ide.testing-repository/.project b/build/com.liferay.ide.testing-repository/.project
@@ -14,4 +14,15 @@
 	<natures>
 		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 	</natures>
+	<filteredResources>
+		<filter>
+			<id>1700017525018</id>
+			<name></name>
+			<type>30</type>
+			<matcher>
+				<id>org.eclipse.core.resources.regexFilterMatcher</id>
+				<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
 </projectDescription>