Merge pull request #379 from drewbrokke/LPD-29388-TECHNICAL-TASK-v0-e…

…clipse-ide-quarterly-support LPD-29388 Technical Task | Update Eclipse plugin
liferay · Aug 5, 2024 · 520ba79 · 520ba79
2 parents fa25bf3 + 7993441
commit 520ba79
Show file tree

Hide file tree

Showing 427 changed files with 650 additions and 977 deletions.
diff --git a/.sdkmanrc b/.sdkmanrc
@@ -0,0 +1 @@
+java=17.0.11-zulu
diff --git a/build-updatesite.sh b/build-updatesite.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-./mvnw clean package -DskipTests=true
+./mvnw clean package -DskipTests=true "$@"
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="4.0.0.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="3.10.0.qualifier" useFeatures="true" includeLaunchers="false">
 
    <aboutInfo>
    </aboutInfo>

diff --git a/build/com.liferay.ide-repository/pom.xml b/build/com.liferay.ide-repository/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>com.liferay.ide.build</groupId>
         <artifactId>build</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>3.10.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>com.liferay.ide-repository</artifactId>

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="4.0.0.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="3.10.0.qualifier" useFeatures="true" includeLaunchers="true">
 
    <aboutInfo>
       <image path="images/about.png"/>

diff --git a/build/com.liferay.ide.testing-repository/pom.xml b/build/com.liferay.ide.testing-repository/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>com.liferay.ide.build</groupId>
         <artifactId>build</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>3.10.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>com.liferay.ide.testing-repository</artifactId>

diff --git a/build/com.liferay.ide.upgrade.planner-repository/pom.xml b/build/com.liferay.ide.upgrade.planner-repository/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>com.liferay.ide.build</groupId>
         <artifactId>build</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>3.10.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>com.liferay.ide.upgrade.planner-repository</artifactId>

diff --git a/build/com.liferay.ide.upgrade.planner-repository/upgrade-planner.product b/build/com.liferay.ide.upgrade.planner-repository/upgrade-planner.product
@@ -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="4.0.0.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="3.10.0.qualifier" useFeatures="true" includeLaunchers="true">
 
    <aboutInfo>
       <image path="images/about.png"/>

diff --git a/build/installers/components/run-jpm-install-bnd-win.xml b/build/installers/components/run-jpm-install-bnd-win.xml
diff --git a/build/installers/components/run-jpm-install-bnd.xml b/build/installers/components/run-jpm-install-bnd.xml
diff --git a/build/installers/components/run-jpm-install-gw-win.xml b/build/installers/components/run-jpm-install-gw-win.xml
diff --git a/build/installers/components/run-jpm-install-gw.xml b/build/installers/components/run-jpm-install-gw.xml
diff --git a/build/installers/components/set-installer-variable-bnd.xml b/build/installers/components/set-installer-variable-bnd.xml
diff --git a/build/installers/components/set-installer-variable-gw.xml b/build/installers/components/set-installer-variable-gw.xml
diff --git a/build/installers/installer-tests/pom.xml b/build/installers/installer-tests/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.liferay.ide.build</groupId>
     <artifactId>installers</artifactId>
-    <version>4.0.0-SNAPSHOT</version>
+    <version>3.10.0-SNAPSHOT</version>
   </parent>
   <groupId>com.liferay.ide.installer.tests</groupId>
   <artifactId>installer-tests</artifactId>

diff --git a/...allers/installer-tests/src/test/java/com/liferay/ide/installer/tests/DevStudioCETest.java b/...allers/installer-tests/src/test/java/com/liferay/ide/installer/tests/DevStudioCETest.java
@@ -50,8 +50,6 @@ public void quickInstallOnWindows() throws Exception{
 
 		Assertions.assertTrue(AppChecker.jpmInstalled());	
 		Assertions.assertTrue(AppChecker.bladeInstalled());
-		Assertions.assertTrue(AppChecker.bndInstalled());
-		Assertions.assertTrue(AppChecker.gwInstalled());
 	}
 
 	@EnabledOnOs(OS.LINUX)

diff --git a/...allers/installer-tests/src/test/java/com/liferay/ide/installer/tests/util/AppChecker.java b/...allers/installer-tests/src/test/java/com/liferay/ide/installer/tests/util/AppChecker.java
@@ -32,16 +32,8 @@ public static boolean jpmInstalled() throws IOException {
 		return installed("jpm version", InstallerUtil.getJpmVersion());
 	}
 
-	public static boolean bndInstalled() throws IOException {
-		return installed("bnd version", InstallerUtil.getBndVersion());
-	}
-
 	public static boolean bladeInstalled() throws IOException {
 		return installed("blade version", InstallerUtil.getBladeVersion());
 	}
 
-	public static boolean gwInstalled() throws IOException {
-		return installed("gw", InstallerUtil.getGwOutput());
-	}
-
 }
diff --git a/...ers/installer-tests/src/test/java/com/liferay/ide/installer/tests/util/InstallerUtil.java b/...ers/installer-tests/src/test/java/com/liferay/ide/installer/tests/util/InstallerUtil.java
@@ -93,18 +93,10 @@ public static String getJpmVersion() {
 		return _getInfo().getProperty("jpm.version");
 	}
 
-	public static String getBndVersion() {
-		return _getInfo().getProperty("bnd.version");
-	}
-
 	public static String getBladeVersion() {
 		return _getInfo().getProperty("blade.version");
 	}
 
-	public static String getGwOutput() {
-		return _getInfo().getProperty("gw.output");
-	}
-
 	public static String getJpmHome() {
 		return _getInfo().getProperty("jpm.home.dir");
 	}

diff --git a/build/installers/installer-tests/src/test/resources/installers.properties b/build/installers/installer-tests/src/test/resources/installers.properties
@@ -3,8 +3,6 @@ dev.studio.ce.name=LiferayProjectSDKwithDevStudioCommunityEdition
 dev.studio.dxp.name=LiferayProjectSDKwithDevStudioDXP
 version=2018.3.12
 jpm.version=4.0.0.201803070452
-bnd.version=3.5.0.201709291849
 blade.version=3.0.0.201803070356
-gw.output=Error executing gradle wrapper
 jpm.home.dir=.jpm
 liferay.home.dir=.liferay
diff --git a/build/installers/liferay-workspace-with-devstudio/liferay-workspace-with-devstudio.xml b/build/installers/liferay-workspace-with-devstudio/liferay-workspace-with-devstudio.xml
@@ -23,12 +23,6 @@
                         <distributionFile>
                             <origin>../shared/download/blade.jar</origin>
                         </distributionFile>
-                        <distributionFile>
-                            <origin>../shared/download/gw.jar</origin>
-                        </distributionFile>
-                        <distributionFile>
-                            <origin>../shared/download/biz.aQute.bnd.jar</origin>
-                        </distributionFile>
                     </distributionFileList>
                 </folder>
                 <folder>
@@ -449,30 +443,12 @@ ${java_executable}
                 <include>
                     <file>../components/set-installer-variable-blade.xml</file>
                 </include>
-                <include>
-                    <file>../components/set-installer-variable-gw.xml</file>
-                </include>
-                <include>
-                    <file>../components/set-installer-variable-bnd.xml</file>
-                </include>
                 <include>
                     <file>../components/run-jpm-install-blade.xml</file>
                 </include>
                 <include>
                     <file>../components/run-jpm-install-blade-win.xml</file>
                 </include>
-                <include>
-                    <file>../components/run-jpm-install-gw.xml</file>
-                </include>
-                <include>
-                    <file>../components/run-jpm-install-gw-win.xml</file>
-                </include>
-                <include>
-                    <file>../components/run-jpm-install-bnd.xml</file>
-                </include>
-                <include>
-                    <file>../components/run-jpm-install-bnd-win.xml</file>
-                </include>
                 <runProgram>
                     <program>chown</program>
                     <programArguments>-R ${env(SUDO_USER)} "${userHome}/jpm"</programArguments>
@@ -784,15 +760,9 @@ ${java_executable}
         <deleteFile>
             <path>${installdir}${platform_path_separator}blade.jar</path>
         </deleteFile>
-        <deleteFile>
-            <path>${installdir}${platform_path_separator}gw.jar</path>
-        </deleteFile>
         <deleteFile>
             <path>${installdir}${platform_path_separator}biz.aQute.jpm.run.jar</path>
         </deleteFile>
-        <deleteFile>
-            <path>${installdir}${platform_path_separator}biz.aQute.bnd.jar</path>
-        </deleteFile>
         <deleteFile>
             <path>${studioZipPath}</path>
         </deleteFile>
@@ -895,7 +865,7 @@ ${java_executable}
         <booleanParameterGroup>
             <name>clitools</name>
             <description>Install Command Line Tools</description>
-            <explanation>Install Command Line Tools such as blade and bnd.</explanation>
+            <explanation>Install Command Line Tools such as blade.</explanation>
             <value></value>
             <default>1</default>
             <parameterList>

diff --git a/build/installers/liferay-workspace-with-devstudio/pom.xml b/build/installers/liferay-workspace-with-devstudio/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>com.liferay.ide.build</groupId>
         <artifactId>installers</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>3.10.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>liferay.workspace.with.devstudio.installer</artifactId>
@@ -32,7 +32,7 @@
 
     <properties>
         <maven.build.timestamp.format>yyyyMMddHHmm</maven.build.timestamp.format>
-        <studio-installer-version>4.0.0-${liferay-ide-tag}-${maven.build.timestamp}</studio-installer-version>
+        <studio-installer-version>3.10.0-${liferay-ide-tag}-${maven.build.timestamp}</studio-installer-version>
     </properties>
 
     <build>
@@ -78,20 +78,6 @@
                             <checkSignature>true</checkSignature>
                         </configuration>
                     </execution>
-                    <execution>
-                        <id>download-gw</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>wget</goal>
-                        </goals>
-                        <configuration>
-                            <url>${gw-latest-download-url}</url>
-                            <outputDirectory>../shared/download/</outputDirectory>
-                            <outputFileName>gw.jar</outputFileName>
-                            <md5>${gw-latest-md5}</md5>
-                            <checkSignature>true</checkSignature>
-                        </configuration>
-                    </execution>
                     <execution>
                         <id>download-jpmcli</id>
                         <phase>package</phase>
@@ -106,20 +92,6 @@
                             <checkSignature>true</checkSignature>
                         </configuration>
                     </execution>
-                    <execution>
-                        <id>download-bnd</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>wget</goal>
-                        </goals>
-                        <configuration>
-                            <url>${bnd-latest-download-url}</url>
-                            <outputDirectory>../shared/download/</outputDirectory>
-                            <outputFileName>biz.aQute.bnd.jar</outputFileName>
-                            <md5>${bnd-latest-md5}</md5>
-                            <checkSignature>true</checkSignature>
-                        </configuration>
-                    </execution>
                 </executions>
             </plugin>
             <plugin>

diff --git a/build/installers/liferay-workspace/liferay-workspace.xml b/build/installers/liferay-workspace/liferay-workspace.xml
@@ -23,12 +23,6 @@
                         <distributionFile>
                             <origin>../shared/download/blade.jar</origin>
                         </distributionFile>
-                        <distributionFile>
-                            <origin>../shared/download/biz.aQute.bnd.jar</origin>
-                        </distributionFile>
-                        <distributionFile>
-                            <origin>../shared/download/gw.jar</origin>
-                        </distributionFile>
                     </distributionFileList>
                 </folder>
                 <folder>
@@ -276,12 +270,6 @@
         <include>
             <file>../components/set-installer-variable-blade.xml</file>
         </include>
-        <include>
-            <file>../components/set-installer-variable-gw.xml</file>
-        </include>
-        <include>
-            <file>../components/set-installer-variable-bnd.xml</file>
-        </include>
         <include>
             <file>../components/run-jpm-install-blade-win.xml</file>
         </include>
@@ -365,18 +353,6 @@
                 </compareValues>
             </ruleList>
         </if>
-        <include>
-            <file>../components/run-jpm-install-gw-win.xml</file>
-        </include>
-        <include>
-            <file>../components/run-jpm-install-gw.xml</file>
-        </include>
-        <include>
-            <file>../components/run-jpm-install-bnd-win.xml</file>
-        </include>
-        <include>
-            <file>../components/run-jpm-install-bnd.xml</file>
-        </include>
         <runProgram>
             <program>chown</program>
             <programArguments>-R ${env(SUDO_USER)} "${userHome}/jpm"</programArguments>