From 202920f4145d490d31a8e42d81f135ca7ac06348 Mon Sep 17 00:00:00 2001 From: Sebastien Besson Date: Tue, 11 Jan 2022 13:17:59 +0000 Subject: [PATCH] Replace usages of deprecated Git protocol by HTTPS See https://github.blog/2021-09-01-improving-git-protocol-security-github/ for more information --- home/jobs/BIOFORMATS-build/config.xml | 2 +- home/jobs/BIOFORMATS-image/config.xml | 2 +- home/jobs/OMERO-build-push/config.xml | 2 +- home/jobs/OMERO-build/config.xml | 4 ++-- home/jobs/OMERO-gradle-plugins-push/config.xml | 2 +- home/jobs/OMERO-guides-push/config.xml | 2 +- home/jobs/OMERO-insight-push/config.xml | 2 +- home/jobs/OMERO-matlab-push/config.xml | 2 +- home/jobs/OMERO-plugins-push/config.xml | 2 +- home/jobs/OMERO-python-superbuild-push/config.xml | 2 +- home/jobs/OMERO-server/config.xml | 4 ++-- home/jobs/OMERO-test-integration/config.xml | 2 +- home/jobs/OMERO-web/config.xml | 14 +++++++------- home/jobs/WEBSITE-push/config.xml | 2 +- 14 files changed, 22 insertions(+), 22 deletions(-) diff --git a/home/jobs/BIOFORMATS-build/config.xml b/home/jobs/BIOFORMATS-build/config.xml index 53c6a4bf..8674e397 100644 --- a/home/jobs/BIOFORMATS-build/config.xml +++ b/home/jobs/BIOFORMATS-build/config.xml @@ -26,7 +26,7 @@ 2 - git://github.com/$SPACE_USER/bio-formats-build + https://github.com/$SPACE_USER/bio-formats-build diff --git a/home/jobs/BIOFORMATS-image/config.xml b/home/jobs/BIOFORMATS-image/config.xml index 08645065..53baf38a 100644 --- a/home/jobs/BIOFORMATS-image/config.xml +++ b/home/jobs/BIOFORMATS-image/config.xml @@ -8,7 +8,7 @@ 2 - git://github.com/$SPACE_USER/bio-formats-build + https://github.com/$SPACE_USER/bio-formats-build diff --git a/home/jobs/OMERO-build-push/config.xml b/home/jobs/OMERO-build-push/config.xml index f7b9077a..1224df33 100644 --- a/home/jobs/OMERO-build-push/config.xml +++ b/home/jobs/OMERO-build-push/config.xml @@ -42,7 +42,7 @@ library identifier: 'recursiveMerge@master', retriever: modernSCM( [$class: 'GitSCMSource', - remote: 'git://github.com/ome/jenkins-library-recursivemerge.git']) + remote: 'https://github.com/ome/jenkins-library-recursivemerge.git']) recursiveCheckout( repo: 'omero-build.git') diff --git a/home/jobs/OMERO-build/config.xml b/home/jobs/OMERO-build/config.xml index dba8d9b1..088078e2 100644 --- a/home/jobs/OMERO-build/config.xml +++ b/home/jobs/OMERO-build/config.xml @@ -17,7 +17,7 @@ 2 - git://github.com/$SPACE_USER/openmicroscopy.git + https://github.com/$SPACE_USER/openmicroscopy.git @@ -82,4 +82,4 @@ source docs/hudson/OMERO.sh - + \ No newline at end of file diff --git a/home/jobs/OMERO-gradle-plugins-push/config.xml b/home/jobs/OMERO-gradle-plugins-push/config.xml index b5732c43..975ae5f1 100644 --- a/home/jobs/OMERO-gradle-plugins-push/config.xml +++ b/home/jobs/OMERO-gradle-plugins-push/config.xml @@ -42,7 +42,7 @@ library identifier: 'recursiveMerge@master', retriever: modernSCM( [$class: 'GitSCMSource', - remote: 'git://github.com/ome/jenkins-library-recursivemerge.git']) + remote: 'https://github.com/ome/jenkins-library-recursivemerge.git']) recursiveCheckout( repo: 'omero-gradle-plugins.git') diff --git a/home/jobs/OMERO-guides-push/config.xml b/home/jobs/OMERO-guides-push/config.xml index 892b2f0c..0a586617 100644 --- a/home/jobs/OMERO-guides-push/config.xml +++ b/home/jobs/OMERO-guides-push/config.xml @@ -42,7 +42,7 @@ library identifier: 'recursiveMerge@master', retriever: modernSCM( [$class: 'GitSCMSource', - remote: 'git://github.com/ome/jenkins-library-recursivemerge.git']) + remote: 'https://github.com/ome/jenkins-library-recursivemerge.git']) recursiveCheckout( repo: 'omero-guides.git') diff --git a/home/jobs/OMERO-insight-push/config.xml b/home/jobs/OMERO-insight-push/config.xml index 665cb99e..25f08d3b 100644 --- a/home/jobs/OMERO-insight-push/config.xml +++ b/home/jobs/OMERO-insight-push/config.xml @@ -39,7 +39,7 @@ library identifier: 'recursiveMerge@master', retriever: modernSCM( [$class: 'GitSCMSource', - remote: 'git://github.com/ome/jenkins-library-recursivemerge.git']) + remote: 'https://github.com/ome/jenkins-library-recursivemerge.git']) recursiveCheckout( repo: 'omero-insight.git') diff --git a/home/jobs/OMERO-matlab-push/config.xml b/home/jobs/OMERO-matlab-push/config.xml index d2f002fc..886be785 100644 --- a/home/jobs/OMERO-matlab-push/config.xml +++ b/home/jobs/OMERO-matlab-push/config.xml @@ -28,7 +28,7 @@ library identifier: 'recursiveMerge@master', retriever: modernSCM( [$class: 'GitSCMSource', - remote: 'git://github.com/ome/jenkins-library-recursivemerge.git']) + remote: 'https://github.com/ome/jenkins-library-recursivemerge.git']) recursiveCheckout( repo: 'omero-matlab.git') diff --git a/home/jobs/OMERO-plugins-push/config.xml b/home/jobs/OMERO-plugins-push/config.xml index 25523676..68b52249 100644 --- a/home/jobs/OMERO-plugins-push/config.xml +++ b/home/jobs/OMERO-plugins-push/config.xml @@ -42,7 +42,7 @@ library identifier: 'recursiveMerge@master', retriever: modernSCM( [$class: 'GitSCMSource', - remote: 'git://github.com/ome/jenkins-library-recursivemerge.git']) + remote: 'https://github.com/ome/jenkins-library-recursivemerge.git']) recursiveCheckout( repo: 'omero-plugins.git') diff --git a/home/jobs/OMERO-python-superbuild-push/config.xml b/home/jobs/OMERO-python-superbuild-push/config.xml index 92d2a0f8..91532b02 100644 --- a/home/jobs/OMERO-python-superbuild-push/config.xml +++ b/home/jobs/OMERO-python-superbuild-push/config.xml @@ -42,7 +42,7 @@ library identifier: 'recursiveMerge@master', retriever: modernSCM( [$class: 'GitSCMSource', - remote: 'git://github.com/ome/jenkins-library-recursivemerge.git']) + remote: 'https://github.com/ome/jenkins-library-recursivemerge.git']) recursiveCheckout( repo: 'omero-python-superbuild.git') diff --git a/home/jobs/OMERO-server/config.xml b/home/jobs/OMERO-server/config.xml index 5ab51068..d25296af 100644 --- a/home/jobs/OMERO-server/config.xml +++ b/home/jobs/OMERO-server/config.xml @@ -124,8 +124,8 @@ mv $WORKSPACE/$DIST $OMERO_DIST # INSTALL PYTHON PACKAGES source $WORKSPACE/.venv3/bin/activate -pip install git+git://github.com/$SPACE_USER/omero-metadata.git@$MERGE_PUSH_BRANCH#egg=omero-metadata -pip install git+git://github.com/$SPACE_USER/omero-cli-render.git@$MERGE_PUSH_BRANCH#egg=omero-cli-render +pip install git+https://github.com/$SPACE_USER/omero-metadata.git@$MERGE_PUSH_BRANCH#egg=omero-metadata +pip install git+https://github.com/$SPACE_USER/omero-cli-render.git@$MERGE_PUSH_BRANCH#egg=omero-cli-render pip install omero-certificates for x in *.tar.gz; do diff --git a/home/jobs/OMERO-test-integration/config.xml b/home/jobs/OMERO-test-integration/config.xml index 20a26b6b..b097944c 100644 --- a/home/jobs/OMERO-test-integration/config.xml +++ b/home/jobs/OMERO-test-integration/config.xml @@ -96,7 +96,7 @@ done # Cause CLI plugin tests to be run against the relevant version. for x in omero-cli-duplicate; do - pip install git+git://github.com/$SPACE_USER/$x.git@$MERGE_PUSH_BRANCH#egg=$x + pip install git+https://github.com/$SPACE_USER/$x.git@$MERGE_PUSH_BRANCH#egg=$x done ## BUILD diff --git a/home/jobs/OMERO-web/config.xml b/home/jobs/OMERO-web/config.xml index 4e433bc7..9d8ccad0 100644 --- a/home/jobs/OMERO-web/config.xml +++ b/home/jobs/OMERO-web/config.xml @@ -124,13 +124,13 @@ omero config set omero.web.wsgi_args -- '--log-level=DEBUG --error-logfile= omero config set omero.web.application_server.host 0.0.0.0 # OMERO.iviewer installation -pip install "git+git://github.com/$SPACE_USER/omero-iviewer.git@$MERGE_PUSH_BRANCH#egg=omero-iviewer&subdirectory=plugin" +pip install "git+https://github.com/$SPACE_USER/omero-iviewer.git@$MERGE_PUSH_BRANCH#egg=omero-iviewer&subdirectory=plugin" omero config append omero.web.apps '"omero_iviewer"' omero config set omero.web.viewer.view omero_iviewer.views.index omero config append omero.web.open_with '["omero_iviewer", "omero_iviewer_index", {"supported_objects":["images", "dataset", "well"], "script_url": "omero_iviewer/openwith.js", "label": "OMERO.iviewer"}]' # OMERO.figure installation -pip install git+git://github.com/$SPACE_USER/omero-figure.git@$MERGE_PUSH_BRANCH#egg=omero-figure +pip install git+https://github.com/$SPACE_USER/omero-figure.git@$MERGE_PUSH_BRANCH#egg=omero-figure omero config append omero.web.apps '"omero_figure"' omero config append omero.web.ui.top_links '["Figure", "figure_index", {"title": "Open Figure in new tab", "target": "_blank"}]' omero config append omero.web.open_with '["omero_figure", "new_figure", {"supported_objects":["images"], "target": "_blank", "label": "OMERO.figure"}]' @@ -147,28 +147,28 @@ pip --version find $WORKSPACE/.venv3 -name \*parade\* # OMERO.fpbioimage installation -pip install git+git://github.com/$SPACE_USER/omero-fpbioimage.git@$MERGE_PUSH_BRANCH#egg=omero-fpbioimage +pip install git+https://github.com/$SPACE_USER/omero-fpbioimage.git@$MERGE_PUSH_BRANCH#egg=omero-fpbioimage omero config append omero.web.apps '"omero_fpbioimage"' omero config append omero.web.open_with '["omero_fpbioimage", "fpbioimage_index", {"script_url": "fpbioimage/openwith.js", "supported_objects": ["image"], "label": "FPBioimage"}]' # OMERO.gallery installation -pip install git+git://github.com/$SPACE_USER/omero-gallery.git@$MERGE_PUSH_BRANCH#egg=omero-gallery +pip install git+https://github.com/$SPACE_USER/omero-gallery.git@$MERGE_PUSH_BRANCH#egg=omero-gallery omero config append omero.web.apps '"omero_gallery"' omero config append omero.web.ui.top_links '["Gallery", "webgallery_index", {"title": "Browse Gallery"}]' omero config set omero.web.gallery.category_queries '{"all":{"label":"All Studies", "index":0, "query":"FIRST50:Name"}}' # OMERO.mapr installation -pip install git+git://github.com/$SPACE_USER/omero-mapr.git@$MERGE_PUSH_BRANCH#egg=omero-mapr +pip install git+https://github.com/$SPACE_USER/omero-mapr.git@$MERGE_PUSH_BRANCH#egg=omero-mapr omero config append omero.web.apps '"omero_mapr"' omero config append omero.web.mapr.config '{"menu": "anyvalue", "config":{"default":["Any Value"], "all":[], "ns":["openmicroscopy.org/omero/client/mapAnnotation"], "label":"Any"}}' omero config append omero.web.ui.top_links '["Any Map Value", {"viewname": "maprindex_anyvalue"}, {"title": "Search for values in any Key-Value pair"}]' # OMERO.weberror installation -pip install git+git://github.com/$SPACE_USER/omero-weberror.git@$MERGE_PUSH_BRANCH#egg=omero-weberror +pip install git+https://github.com/$SPACE_USER/omero-weberror.git@$MERGE_PUSH_BRANCH#egg=omero-weberror omero config append omero.web.apps '"omero_weberror"' # OMERO.webtest -pip install git+git://github.com/$SPACE_USER/omero-webtest.git@$MERGE_PUSH_BRANCH#egg=omero-webtest +pip install git+https://github.com/$SPACE_USER/omero-webtest.git@$MERGE_PUSH_BRANCH#egg=omero-webtest omero config append omero.web.apps '"omero_webtest"' # OMERO.omero-webtagging-autotag installation diff --git a/home/jobs/WEBSITE-push/config.xml b/home/jobs/WEBSITE-push/config.xml index cd00fc5c..d5a01f95 100644 --- a/home/jobs/WEBSITE-push/config.xml +++ b/home/jobs/WEBSITE-push/config.xml @@ -42,7 +42,7 @@ library identifier: 'recursiveMerge@master', retriever: modernSCM( [$class: 'GitSCMSource', - remote: 'git://github.com/ome/jenkins-library-recursivemerge.git']) + remote: 'https://github.com/ome/jenkins-library-recursivemerge.git']) recursiveCheckout( repo: 'www.openmicroscopy.org')