From 896caad60d95cb7e4fdba5f6a7cbbaad5799557a Mon Sep 17 00:00:00 2001
From: jez04 <david.jezek@post.cz>
Date: Wed, 14 Sep 2022 23:00:12 +0200
Subject: [PATCH] update zima 2022

---
 README.md      |   0
 swi-install.sh | 221 ++++++++++++++++++++++++++++++++++++-------------
 2 files changed, 162 insertions(+), 59 deletions(-)
 mode change 100644 => 100755 README.md

diff --git a/README.md b/README.md
old mode 100644
new mode 100755
diff --git a/swi-install.sh b/swi-install.sh
index 7eb4657..fd41b68 100755
--- a/swi-install.sh
+++ b/swi-install.sh
@@ -8,7 +8,7 @@ function downloadAndExtract(){
     local localDir=${4:-/tmp}
     local url=${5:-tmp}
 	echo '============>Downloading '$localFile' .....==========================================================================================================='
-    wget -O $localFile $url
+   wget -O $localFile $url
 	echo '============>Extracting '$localFile' .....==========================================================================================================='
     sudo tar -xz -C $targetDir -f $localFile
     rm $localFile
@@ -21,8 +21,9 @@ function downloadAndExtract(){
 }
 
 
-#Install ORACLE JAVA 8 and OPEN JDK 11, 16
+#Install ORACLE JAVA 8 and OPEN JDK 11, 17
 function installJava(){
+	sudo apt -y purge openjdk-16-doc openjdk-16-jdk openjdk-16-jdk-headless openjdk-16-jre openjdk-16-jre-headless openjdk-16-source openjdk-14-doc openjdk-14-jdk openjdk-14-jdk-headless openjdk-14-jre openjdk-14-jre-headless openjdk-14-source
 	echo '============>Install java packages.....==========================================================================================================='
 	sudo apt -y install openjdk-8-jdk
 	
@@ -30,21 +31,20 @@ function installJava(){
     sudo apt -y install openjdk-11-source
     sudo apt -y install openjdk-11-doc
 
-    sudo apt -y install openjdk-16-jdk
-    sudo apt -y install openjdk-16-source
-    sudo apt -y install openjdk-16-doc
+    sudo apt -y install openjdk-17-jdk
+    sudo apt -y install openjdk-17-source
+    sudo apt -y install openjdk-17-doc
 	echo '============>Java installed.==========================================================================================================='
 }
 
 function installJavaFX(){
 	echo '============>Install java FX.....==========================================================================================================='
 #    sudo apt -y install openjfx
-    
-    wget https://download2.gluonhq.com/scenebuilder/16.0.0/install/linux/SceneBuilder-16.0.0.deb
-    sudo dpkg -i SceneBuilder-16.0.0.deb
-    rm SceneBuilder-16.0.0.deb
-    wget -O openjfx-14.0.2.1_linux-x64_bin-sdk.zip https://download2.gluonhq.com/openjfx/14.0.2.1/openjfx-14.0.2.1_linux-x64_bin-sdk.zip
+    wget https://download2.gluonhq.com/scenebuilder/18.0.0/install/linux/SceneBuilder-18.0.0.deb
+    sudo dpkg -i SceneBuilder-18.0.0.deb
+    rm SceneBuilder-18.0.0.deb
     wget -O openjfx-17_linux-x64_bin-sdk.zip https://download2.gluonhq.com/openjfx/17/openjfx-17_linux-x64_bin-sdk.zip
+    rm -r /opt/javafx-sdk-17
     sudo unzip -d /opt openjfx-17_linux-x64_bin-sdk.zip
     rm openjfx-17_linux-x64_bin-sdk.zip
 	echo '============>Java FX installed.==========================================================================================================='
@@ -97,6 +97,13 @@ function downloadAndExtractEclipse(){
     downloadAndExtract /opt eclipse-$suffix.tar.gz $eclipseSrcDir eclipse-$suffix $url
 }
 
+function eclipseChangeVm(){
+    local suffix=$1
+    local vm=$2
+    local altConfigName=${3:-eclipse}
+    printf -v substituteWorkspace "s/plugins\/org\.eclipse\.justj\.openjdk\.hotspot\.jre\.full.*$/$vm/g"
+    sudo sed -i -e $substituteWorkspace /opt/eclipse-$suffix/$altConfigName.ini
+}
 
 function installPlugins(){
     local suffix=$1
@@ -145,6 +152,8 @@ function installEclipseInstance(){
 
  	echo '============>Installing eclipse '$suffix' .....==========================================================================================================='
     downloadAndExtractEclipse $suffix $url $altSrcDirName
+ 	echo '============>Change VM eclipse '$suffix' .....==========================================================================================================='
+    eclipseChangeVm $suffix \\/usr\\/lib\\/jvm\\/java-17-openjdk-amd64\\/bin
  	echo '============>Installing eclipse '$suffix' plugins .....==========================================================================================================='
     installPlugins $suffix $repos $plugins $altRunName
     doConfig $suffix $altRunName
@@ -153,13 +162,14 @@ function installEclipseInstance(){
     fi
 	if [ ! -f /opt/eclipse-$suffix/eclipse-orig ] ; then
 		if [ -f /opt/eclipse-$suffix/$altRunName ] ; then
-			sudo mv /opt/eclipse-$suffix/$altRunName /opt/eclipse-$suffix/eclipse-orig
+			sudo mv /opt/eclipse-$suffix/$altRunName /opt/eclipse-$suffix/$altRunName-orig
+            sudo mv /opt/eclipse-$suffix/$altRunName.ini /opt/eclipse-$suffix/$altRunName-orig.ini
 	cat <<EOF | sudo tee /opt/eclipse-$suffix/$altRunName > /dev/null
 #!/bin/bash
 if [ -f /usr/share/maven/bin/student-setup ] ; then
 	/usr/share/maven/bin/student-setup
 fi
-/opt/eclipse-$suffix/eclipse-orig
+/opt/eclipse-$suffix/$altRunName-orig
 EOF
 			sudo chmod +x /opt/eclipse-$suffix/$altRunName
 		fi
@@ -176,7 +186,7 @@ function addModule(){
 	local moduleBin=$5
 	local xaDSClass=$6
 	local pattern=${@:7}
-	local moduleDir=/opt/wildfly-24/modules/system/layers/base/$dir/main
+	local moduleDir=/opt/wildfly-26/modules/system/layers/base/$dir/main
 	local moduleXmlTmp=""
 	local moduleXml=""
 	local driver=""
@@ -209,14 +219,14 @@ function addModule(){
 					<xa-datasource-class>$xaDSClass<\/xa-datasource-class>\\\\n\
 				<\/driver>\\\\n\
 "
-    if ! grep -q "<driver name=\"$moduleName\" module=\"$moduleName\">" /opt/wildfly-24/standalone/configuration/standalone.xml; then
-    	sudo sed -i -e "s/<\/drivers>/$driver<\/drivers>/g" /opt/wildfly-24/standalone/configuration/standalone.xml
+    if ! grep -q "<driver name=\"$moduleName\" module=\"$moduleName\">" /opt/wildfly-26/standalone/configuration/standalone.xml; then
+    	sudo sed -i -e "s/<\/drivers>/$driver<\/drivers>/g" /opt/wildfly-26/standalone/configuration/standalone.xml
     fi
 	
 }
 
 function createRunScript(){
-	cat <<EOF  | sudo tee /opt/wildfly-24/bin/standalone-student.sh > /dev/null
+	cat <<EOF  | sudo tee /opt/wildfly-26/bin/standalone-student.sh > /dev/null
 #!/bin/bash
 WILDFLY_DIR=\$HOME/.wildfly
 if [ ! -d \"\$WILDFLY_DIR\" ]; then
@@ -226,30 +236,30 @@ if [ ! -d \"\$WILDFLY_DIR\" ]; then
 	mkdir -p \$WILDFLY_DIR/deploymentsAaa
     
 	mkdir -p \$WILDFLY_DIR/log
-	cp /opt/wildfly-24/standalone/configuration/* \$WILDFLY_DIR/configuration/
+	cp /opt/wildfly-26/standalone/configuration/* \$WILDFLY_DIR/configuration/
 fi
-/opt/wildfly-24/bin/standalone.sh -Djboss.server.base.dir=\$WILDFLY_DIR -Djboss.server.temp.dir=/tmp/wildfly
+/opt/wildfly-26/bin/standalone.sh -Djboss.server.base.dir=\$WILDFLY_DIR -Djboss.server.temp.dir=/tmp/wildfly
 EOF
-	sudo chmod +x /opt/wildfly-24/bin/standalone-student.sh
+	sudo chmod +x /opt/wildfly-26/bin/standalone-student.sh
 
-	cat <<EOF  | sudo tee /opt/wildfly-24/bin/add-user-student.sh > /dev/null
+	cat <<EOF  | sudo tee /opt/wildfly-26/bin/add-user-student.sh > /dev/null
 #!/bin/bash
 WILDFLY_DIR=\$HOME/.wildfly
 /opt/wildfly-24/bin/add-user.sh -sc \$WILDFLY_DIR/configuration
 EOF
-	sudo chmod +x /opt/wildfly-24/bin/add-user-student.sh
+	sudo chmod +x /opt/wildfly-26/bin/add-user-student.sh
 }
 
 function installWildfly(){
 	echo '============>Installing wildfly .....==========================================================================================================='
 
-	downloadAndExtract /opt wildfly-24.0.1.Final.tar.gz wildfly-24.0.1.Final wildfly-24 https://download.jboss.org/wildfly/24.0.1.Final/wildfly-24.0.1.Final.tar.gz
+	downloadAndExtract /opt wildfly-26.1.2.Final.tar.gz wildfly-26.1.2.Final wildfly-26  https://github.com/wildfly/wildfly/releases/download/26.1.2.Final/wildfly-26.1.2.Final.tar.gz
 	
-	addModule https://cdn.mysql.com/Downloads/Connector-J/mysql-connector-java-8.0.26.tar.gz com/mysql 1 com.mysql mysql-connector-java-8.0.26.jar com.mysql.cj.jdbc.MysqlXADataSource *mysql-connector-java-8.0.26.jar 
+	addModule https://cdn.mysql.com//Downloads/Connector-J/mysql-connector-java-8.0.30.tar.gz com/mysql 1 com.mysql mysql-connector-java-8.0.30.jar com.mysql.cj.jdbc.MysqlXADataSource *mysql-connector-java-8.0.30.jar 
 	
 	addModule https://www-eu.apache.org/dist//db/derby/db-derby-10.15.2.0/db-derby-10.15.2.0-lib.tar.gz org/apache/derby 2 org.apache.derby derbyclient.jar org.apache.derby.jdbc.ClientXADataSource  *derbyclient.jar *derbyLocale* *derbyshared.jar *derbytools.jar     
 	
-	sudo chmod +r /opt/wildfly-24/standalone/configuration/*
+	sudo chmod +r /opt/wildfly-26/standalone/configuration/*
 	createRunScript
 	echo '============>Wildfly installed==========================================================================================================='
 }
@@ -270,7 +280,7 @@ if [ ! -d \"\$JAVA_DB_DIR\" ]; then
 	mkdir -p \$JAVA_DB_DIR
 fi
 cd \$JAVA_DB_DIR
-JAVA_HOME=/usr/lib/jvm/java-16-openjdk-amd64
+JAVA_HOME=/usr/lib/jvm/java-17-openjdk-amd64
 /opt/db-derby/bin/startNetworkServer -noSecurityManager
 EOF
 	sudo chmod +x /opt/db-derby/bin/startNetworkServer-student
@@ -371,7 +381,7 @@ EOF
 function installJMeter(){
 	echo '============>Installing JMeter .....==========================================================================================================='
 	setupBase
-	downloadAndExtract /opt apache-jmeter-5.4.1.tgz apache-jmeter-5.4.1 jmeter https://mirror.dkm.cz/apache//jmeter/binaries/apache-jmeter-5.4.1.tgz
+	downloadAndExtract /opt apache-jmeter-5.5.tgz apache-jmeter-5.5 jmeter https://dlcdn.apache.org//jmeter/binaries/apache-jmeter-5.5.tgz
 																		   
 
 	cat <<EOF | sudo tee /opt/jmeter/bin/jmeter-student.sh > /dev/null
@@ -390,10 +400,10 @@ EOF
 	createLauncher jmeter "Apache JMeter 5" /opt/jmeter/bin/jmeter-student.sh /opt/jmeter/jmeter-logo.svg "Apache JMeter 5"
 	
 	#plugin manager
-	sudo wget -O /opt/jmeter/lib/ext/jmeter-plugins-manager-1.4.jar https://repo1.maven.org/maven2/kg/apc/jmeter-plugins-manager/1.4/jmeter-plugins-manager-1.4.jar
-	sudo wget -O /opt/jmeter/lib/cmdrunner-2.2.jar http://search.maven.org/remotecontent?filepath=kg/apc/cmdrunner/2.2.1/cmdrunner-2.2.1.jar
-	sudo java -cp /opt/jmeter/lib/ext/jmeter-plugins-manager-1.4.jar org.jmeterplugins.repository.PluginManagerCMDInstaller
-	
+	sudo wget -O /opt/jmeter/lib/ext/jmeter-plugins-manager-1.7.jar https://repo1.maven.org/maven2/kg/apc/jmeter-plugins-manager/1.7/jmeter-plugins-manager-1.7.jar
+	sudo wget -O /opt/jmeter/lib/cmdrunner-2.3.jar https://repo1.maven.org/maven2/kg/apc/cmdrunner/2.3/cmdrunner-2.3.jar
+	sudo java -cp /opt/jmeter/lib/ext/jmeter-plugins-manager-1.7.jar org.jmeterplugins.repository.PluginManagerCMDInstaller
+	sudo sed -i -e "s/cmdrunner-2\.2\.jar/cmdrunner-2\.3\.jar/g"  /opt/jmeter/bin/PluginsManagerCMD.sh
 	#Add Plugins
 	sudo /opt/jmeter/bin/PluginsManagerCMD.sh install jpgc-graphs-basic,jpgc-graphs-additional,jpgc-functions,custom-soap,jpgc-casutg,jpgc-dbmon,jmeter.backendlistener.elasticsearch,jpgc-filterresults,jpgc-httpraw,mqmeter,jpgc-jms,jpgc-jmxmon,jmeter.pack-listener,jpgc-json,jpgc-lockfile,mqtt-sampler,jpgc-oauth,jpgc-pde,bzm-parallel,jpgc-prmctl,jpgc-perfmon,jmeter-prometheus,bzm-random-csv,ssh-sampler,tilln-sshmon,jpgc-webdriver,jpgc-plancheck,jpgc-udp,jpgc-csvars,tilln-wssecurity,websocket-sampler,websocket-samplers,jpgc-wsc,jpgc-xml,jpgc-xmpp,jpgc-standard
 	echo '============>JMeter installed.==========================================================================================================='
@@ -408,12 +418,12 @@ function uninstallJMeter(){
 #deprecated
 function installTomcat(){
 	echo '============>Installing TomCat .....==========================================================================================================='
-	downloadAndExtract /opt apache-tomcat-9.0.37.tar.gz apache-tomcat-9.0.37 apache-tomcat-9 http://mirror.hosting90.cz/apache/tomcat/tomcat-9/v9.0.37/bin/apache-tomcat-9.0.37.tar.gz
-	sudo find /opt/apache-tomcat-9 -type d -exec chmod go+x {} \;
-	sudo find /opt/apache-tomcat-9 -type f -executable -exec chmod go+x {} \;
-	sudo chmod -R +r /opt/apache-tomcat-9/*
+	downloadAndExtract /opt apache-tomcat-10.0.23.tar.gz apache-tomcat-10.0.23 apache-tomcat-10 https://dlcdn.apache.org/tomcat/tomcat-10/v10.0.23/bin/apache-tomcat-10.0.23.tar.gz
+	sudo find /opt/apache-tomcat-10 -type d -exec chmod go+x {} \;
+	sudo find /opt/apache-tomcat-10 -type f -executable -exec chmod go+x {} \;
+	sudo chmod -R +r /opt/apache-tomcat-10/*
 	setupBase
-	cat <<EOF | sudo tee /opt/apache-tomcat-9/bin/startup-student.sh > /dev/null
+	cat <<EOF | sudo tee /opt/apache-tomcat-10/bin/startup-student.sh > /dev/null
 #create default user setting for tomcat 
 export CATALINA_BASE=\$HOME/.tomcat
 if [ ! -d "\$CATALINA_BASE" ]; then
@@ -423,18 +433,18 @@ if [ ! -d "\$CATALINA_BASE" ]; then
 	mkdir -p  \$CATALINA_BASE/webapps
 	mkdir -p  \$CATALINA_BASE/work
 	mkdir -p  \$CATALINA_BASE/temp
-    cp  /opt/apache-tomcat-9/conf/* \$CATALINA_BASE/conf
+    cp  /opt/apache-tomcat-10/conf/* \$CATALINA_BASE/conf
 fi
-/opt/apache-tomcat-9/bin/startup.sh
+/opt/apache-tomcat-10/bin/startup.sh
 EOF
-	sudo chmod +x /opt/apache-tomcat-9/bin/startup-student.sh
+	sudo chmod +x /opt/apache-tomcat-10/bin/startup-student.sh
 	
 	wget https://cdn.mysql.com/Downloads/Connector-J/mysql-connector-java-8.0.26.tar.gz
-	sudo tar -xzf mysql-connector-java-8.0.26.tar.gz -C /opt/apache-tomcat-9/lib --strip-components=1 mysql-connector-java-8.0.26/mysql-connector-java-8.0.26.jar
+	sudo tar -xzf mysql-connector-java-8.0.26.tar.gz -C /opt/apache-tomcat-10/lib --strip-components=1 mysql-connector-java-8.0.26/mysql-connector-java-8.0.26.jar
 	rm mysql-connector-java-8.0.21.tar.gz
 	
 	wget https://www-eu.apache.org/dist//db/derby/db-derby-10.15.2.0/db-derby-10.15.2.0-lib.tar.gz
-	sudo tar --wildcards -xzf db-derby-10.15.2.0-lib.tar.gz -C /opt/apache-tomcat-9/lib --strip-components=2 db-derby-10.15.2.0-lib/lib/derbyclient.jar db-derby-10.15.2.0-lib/lib/derbyLocale*
+	sudo tar --wildcards -xzf db-derby-10.15.2.0-lib.tar.gz -C /opt/apache-tomcat-10/lib --strip-components=2 db-derby-10.15.2.0-lib/lib/derbyclient.jar db-derby-10.15.2.0-lib/lib/derbyLocale*
 	rm db-derby-10.15.2.0-lib.tar.gz
 	echo '============>TomCat installed.==========================================================================================================='
 }
@@ -445,6 +455,7 @@ function uninstallTomcat(){
 	echo '============>TomCat uninstalled.==========================================================================================================='
 }
 
+#deprecated
 function installTomEE(){
 	echo '============>Installing TomEE .....==========================================================================================================='
 	downloadAndExtract /opt apache-tomee-9.0.0-M7-plume.tar.gz apache-tomee-plume-9.0.0-M7 apache-tomee-plume-9 https://dlcdn.apache.org/tomee/tomee-9.0.0-M7/apache-tomee-9.0.0-M7-plume.tar.gz
@@ -475,12 +486,12 @@ function uninstallTomEE(){
 
 function installGecko(){
 	echo '============>Installing GeckoDriver .....==========================================================================================================='
-	wget https://github.com/mozilla/geckodriver/releases/download/v0.29.1/geckodriver-v0.29.1-linux64.tar.gz
-	sudo tar -xz -C /usr/bin -f geckodriver-v0.29.1-linux64.tar.gz
+	wget https://github.com/mozilla/geckodriver/releases/download/v0.31.0/geckodriver-v0.31.0-linux64.tar.gz
+	sudo tar -xz -C /usr/bin -f geckodriver-v0.31.0-linux64.tar.gz
 	sudo chown root:root /usr/bin/geckodriver
 	sudo chmod +x /usr/bin/geckodriver
 	sudo chmod g-w /usr/bin/geckodriver
-	rm geckodriver-v0.29.1-linux64.tar.gz
+	rm geckodriver-v0.31.0-linux64.tar.gz
 	echo '============>GeckoDriver installed.==========================================================================================================='
 }
 
@@ -504,8 +515,8 @@ function uninstallNetBeans(){
 
 function installIdea(){
 	echo '============>Installing Idea IDE .....==========================================================================================================='
-	downloadAndExtract /opt ideaIC-2021.2.1.tar.gz idea-IC-212.5080.55 idea-IC https://download-cdn.jetbrains.com/idea/ideaIC-2021.2.1.tar.gz
-	createLauncher idea-IC "inteliJ IDEA" /opt/idea-IC/bin/idea.sh /opt/idea-IC/bin/idea.png "inteliJ IDEA Community Edition"
+	downloadAndExtract /opt ideaIC-2022.2.2.tar.gz idea-IC-222.4167.29 idea-IC https://download-cdn.jetbrains.com/idea/ideaIC-2022.2.2.tar.gz
+	createLauncher idea-IC "inteliJ IDEA" /opt/idea-IC/bin/idea.sh /opt/idea-IC/bin/idea.png "inteliJ IDEA Comunity Edition"
 	echo '============>Idea IDE installed.==========================================================================================================='
 }
 
@@ -533,12 +544,12 @@ function installEclipseSTS(){
 function installEclipseJava(){
 	######Install Eclipse for JAVA development package
                                 
-	installEclipseInstance java https://mirror.dkm.cz/eclipse/technology/epp/downloads/release/2021-06/R/eclipse-java-2021-06-R-linux-gtk-x86_64.tar.gz \
-"http://download.eclipse.org/releases/2021-06/,\
-https://binaries.sonarsource.com/SonarLint-for-Eclipse/releases/6.1.0.36269/,\
-http://download.eclipse.org/mylyn/incubator/latest/,\
-https://download.eclipse.org/efxclipse/updates-released/3.7.0/site/,\
-http://update.eclemma.org/,\
+	installEclipseInstance java https://ftp.fau.de/eclipse/technology/epp/downloads/release/2022-06/R/eclipse-java-2022-06-R-linux-gtk-x86_64.tar.gz \
+"https://download.eclipse.org/releases/2022-06/,\
+https://binaries.sonarsource.com/SonarLint-for-Eclipse/releases/7.4.0.46482/,\
+https://download.eclipse.org/mylyn/incubator/latest/,\
+https://download.eclipse.org/mylyn/releases/latest/,\
+https://download.eclipse.org/efxclipse/updates-released/3.8.0/site/,\
 https://ecd-plugin.github.io/update/" \
 "org.eclipse.fx.runtime.min.feature.feature.group,\
 org.eclipse.fx.ide.feature.feature.group,\
@@ -549,7 +560,6 @@ org.eclipse.wb.core.java.feature.feature.group,\
 org.eclipse.wb.swing.feature.feature.group,\
 org.eclipse.mylyn_feature.feature.group,\
 org.eclipse.mylyn.web.tasks_feature.feature.group,\
-org.eclipse.eclemma.feature.feature.group,\
 org.sonarlint.eclipse.feature.feature.group,\
 org.sf.feeling.decompiler.feature.group,\
 org.sf.feeling.decompiler.cfr.feature.group,\
@@ -565,13 +575,60 @@ function installEclipsePapyrus(){
 #https://download.eclipse.org/modeling/mdt/papyrus/updates/releases/2021-03/,\
 org.eclipse.papyrus.designer.languages.java.feature.feature.group,\
 
-	installEclipseInstance papyrus https://ftp.snt.utwente.nl/pub/software/eclipse/modeling/mdt/papyrus/rcp/2020-12/5.0.0/papyrus-2020-12-5.0.0-linux64.tar.gz \
-"https://download.eclipse.org/modeling/mdt/papyrus/updates/releases/2020-12/" \
+	installEclipseInstance papyrus https://mirror.dkm.cz/eclipse/modeling/mdt/papyrus/rcp/2022-03/6.1.0/papyrus-2022-03-6.1.0-linux64.tar.gz \
+"https://download.eclipse.org/modeling/mdt/papyrus/updates/releases/2022-03/" \
 "org.eclipse.papyrus.sdk.feature.feature.group" \
 "Eclipse Papyrus" icon.xpm "Eclipse Papyrus" - Papyrus papyrus
 }
 
 function installEclipseEE(){
+######Install Eclipse for EE development package
+	installEclipseInstance ee https://ftp.halifax.rwth-aachen.de/eclipse/technology/epp/downloads/release/2022-06/R/eclipse-jee-2022-06-R-linux-gtk-x86_64.tar.gz \
+"https://download.eclipse.org/releases/2022-06/,\
+https://binaries.sonarsource.com/SonarLint-for-Eclipse/releases/7.4.0.46482/,\
+https://download.jboss.org/jbosstools/photon/stable/updates/,\
+https://ecd-plugin.github.io/update/,\
+https://download.eclipse.org/mylyn/incubator/latest/,\
+https://download.eclipse.org/mylyn/releases/latest/,\
+https://www.thymeleaf.org/eclipse-plugin-update-site/,\
+http://dadacoalition.org/yedit/" \
+"org.eclipse.mylyn_feature.feature.group,\
+org.eclipse.mylyn.web.tasks_feature.feature.group,\
+org.eclipse.eclemma.feature.feature.group,\
+org.sonarlint.eclipse.feature.feature.group,\
+org.jboss.tools.cdi.feature.feature.group,\
+org.eclipse.wst.json_ui.feature.feature.group,\
+org.jboss.ide.eclipse.as.feature.feature.group,\
+org.jboss.tools.ws.jaxrs.feature.feature.group,\
+org.jboss.tools.ws.jaxws.feature.feature.group,\
+org.jboss.tools.wtp.runtimes.tomcat.feature.feature.group,\
+org.jboss.tools.jsf.feature.feature.group,\
+org.sf.feeling.decompiler.feature.group,\
+org.sf.feeling.decompiler.cfr.feature.group,\
+org.sf.feeling.decompiler.jad.feature.group,\
+org.sf.feeling.decompiler.jd.feature.group,\
+org.sf.feeling.decompiler.procyon.feature.group,\
+org.thymeleaf.extras.eclipse.contentassist.feature.feature.group,\
+org.thymeleaf.extras.eclipse.contentassist.feature.source.feature.group,\
+org.dadacoalition.yedit.feature.feature.group" \
+"Eclipse EE" eclipse-ee.png "Eclipse for EE Developers" https://www.eclipse.org/webtools/images/wtp_logo_2010.png
+}
+
+function installEclipseEE2(){
+######Install Eclipse for EE development package
+	installEclipseInstance ee2 https://ftp.halifax.rwth-aachen.de/eclipse/technology/epp/downloads/release/2021-06/R/eclipse-jee-2021-06-R-linux-gtk-x86_64.tar.gz \
+"http://download.eclipse.org/releases/2021-06/,\
+https://binaries.sonarsource.com/SonarLint-for-Eclipse/releases/5.6.0.25634/,\
+http://download.jboss.org/jbosstools/photon/stable/updates/,\
+https://ecd-plugin.github.io/update/,\
+http://download.eclipse.org/mylyn/incubator/3.25/,\
+https://www.thymeleaf.org/eclipse-plugin-update-site/,\
+http://dadacoalition.org/yedit/" \
+"org.dadacoalition.yedit.feature.feature.group" \
+"Eclipse EE2" eclipse-ee.png "Eclipse for EE Developers" https://www.eclipse.org/webtools/images/wtp_logo_2010.png
+}
+
+function installEclipseEE09(){
 ######Install Eclipse for EE development package
 	installEclipseInstance ee https://ftp.halifax.rwth-aachen.de/eclipse/technology/epp/downloads/release/2021-06/R/eclipse-jee-2021-06-R-linux-gtk-x86_64.tar.gz \
 "http://download.eclipse.org/releases/2021-06/,\
@@ -781,6 +838,52 @@ EOF
 	sudo chmod +x /opt/wildfly-20/bin/add-user-student.sh
 }
 
+function upgrade2022(){
+	installJava
+	uninstallJavaFX
+    installJavaFX
+	
+	installGradle
+
+	removeEclipseInstance java12
+	removeEclipseInstance java
+	installEclipseJava
+	
+	removeEclipseInstance ee
+	installEclipseEE
+	removeEclipseInstance sts
+#	installEclipseSTS
+	removeEclipseInstance papyrus
+	installEclipsePapyrus
+
+	installMaven
+
+	uninstallNetBeans
+	installNetBeans
+	uninstallIdea
+	installIdea
+
+	uninstallTomcat
+	installTomcat
+	uninstallTomEE
+#	installTomEE
+	uninstallWildfly
+	installWildfly
+	uninstallAppacheDerby
+	installAppacheDerby
+
+	uninstallJMeter
+	installJMeter
+	uninstallGecko
+	installGecko
+		
+#	installVagrant
+#	uninstallAndroidStudio
+#	installAndroidStudio
+#    installDocker
+	installGitkraken    
+}
+
 function upgrade2021(){
 	installJava
 	uninstallJavaFX
@@ -819,10 +922,10 @@ function upgrade2021(){
 	uninstallGecko
 	installGecko
 		
-	installVagrant
-	uninstallAndroidStudio
-	installAndroidStudio
-    installDocker
+#	installVagrant
+#	uninstallAndroidStudio
+#	installAndroidStudio
+#    installDocker
 	installGitkraken
 
 }
@@ -840,8 +943,8 @@ function test2(){
     else
         echo none
     fi
-
 }
+
 if [ $# == 0 ] ; then
 	commands=("installAll")
 else
-- 
GitLab