Merge pull request #2383 from ome/create-pull-request/patch

Changes from upstream repositories: openmicroscopy
ome · Nov 29, 2023 · 263662c · 263662c
2 parents 6fbdb8b + 8d17fd5
commit 263662c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 20 deletions.
diff --git a/omero/sysadmins/unix/walkthrough/walkthrough_ubuntu2004.sh b/omero/sysadmins/unix/walkthrough/walkthrough_ubuntu2004.sh
@@ -10,20 +10,11 @@ apt-get -y install unzip wget bc
 apt-get -y install cron
 
 # install Java
-apt-get -y install software-properties-common
-add-apt-repository ppa:openjdk-r/ppa
 apt-get update -q
-apt-get install -y openjdk-11-jre
+apt-get install -y openjdk-11-jdk
 
 # install dependencies
 
-# start-add-dependencies
-apt-get -y install \
-    unzip \
-    wget \
-    python3 \
-    python3-venv
-# end-add-dependencies
 #end-step01
 # install Ice
 #start-recommended-ice

diff --git a/omero/sysadmins/unix/walkthrough/walkthrough_ubuntu2204.sh b/omero/sysadmins/unix/walkthrough/walkthrough_ubuntu2204.sh
@@ -10,20 +10,11 @@ apt-get -y install unzip wget bc
 apt-get -y install cron
 
 # install Java
-apt-get -y install software-properties-common
-add-apt-repository ppa:openjdk-r/ppa
 apt-get update -q
-apt-get install -y openjdk-11-jre
+apt-get install -y openjdk-11-jdk
 
 # install dependencies
 
-# start-add-dependencies
-apt-get -y install \
-    unzip \
-    wget \
-    python3 \
-    python3-venv
-# end-add-dependencies
 #end-step01
 # install Ice
 #start-recommended-ice