From a41e7d6b9ad6486df07fdfe4c31d8492403dc762 Mon Sep 17 00:00:00 2001 From: Nishaat Rajabali <12186256+nishaatr@users.noreply.github.com> Date: Tue, 27 Aug 2024 12:51:37 +0100 Subject: [PATCH] Remove all DEVEL references [DI-241][5.3.z] (#233) Backport [224](https://github.com/hazelcast/hazelcast-packaging/pull/224) Co-authored-by: Jack Green --- README.md | 21 +++++++-------------- build-hazelcast-homebrew-package.sh | 4 ++-- common.sh | 3 --- common_tests.sh | 3 --- packages/brew/test_brew_functions.sh | 3 --- pom.xml | 5 ----- repos/prod/hazelcast-rpm-devel.repo | 7 ------- repos/test/hazelcast-rpm-devel.repo | 7 ------- 8 files changed, 9 insertions(+), 44 deletions(-) delete mode 100644 repos/prod/hazelcast-rpm-devel.repo delete mode 100644 repos/test/hazelcast-rpm-devel.repo diff --git a/README.md b/README.md index 30fe6767..834375bd 100644 --- a/README.md +++ b/README.md @@ -164,13 +164,13 @@ Run the following to install e.g. version `5.0.1`: brew install hazelcast@5.0.1 ``` -## Installing a SNAPSHOT/DEVEL/BETA version +## Installing a SNAPSHOT/BETA version NOTE: The same steps apply to `hazelcast` and `hazelcast-enterprise` packages -### Install a SNAPSHOT/DEVEL/BETA version with apt +### Install a SNAPSHOT/BETA version with apt -You need to replace `stable` with `snapshot`/`devel`/`beta` in +You need to replace `stable` with `snapshot`/`beta` in the repository definition to use Hazelcast snapshots. Run the following to install the latest snapshot version: @@ -192,9 +192,9 @@ or Hazelcast Enterprise (license required) sudo apt install hazelcast-enterprise ``` -### Install a SNAPSHOT/DEVEL/BETA version with yum +### Install a SNAPSHOT/BETA version with yum -You need to replace `stable` with `snapshot`/`devel`/`beta` in +You need to replace `stable` with `snapshot`/`beta` in the repository definition to use Hazelcast snapshots. Run the following to install the latest snapshot version: @@ -215,9 +215,9 @@ or Hazelcast Enterprise (license required) sudo yum install hazelcast-enterprise ``` -### Install a SNAPSHOT/DEVEL/BETA version with Homebrew +### Install a SNAPSHOT/BETA version with Homebrew -You need to add `snapshot`/`devel`/`beta` suffix to the package version when +You need to add `snapshot`/`beta` suffix to the package version when installing a snapshot. Run the following to install the latest `snapshot` version of open-source Hazelcast: @@ -227,13 +227,6 @@ brew tap hazelcast/hz brew install hazelcast-snapshot ``` -Run the following to install the latest `devel` version of Hazelcast Enterprise: - -```shell -brew tap hazelcast/hz -brew install hazelcast-enterprise-devel -``` - Search for available versions using the following command: ```shell diff --git a/build-hazelcast-homebrew-package.sh b/build-hazelcast-homebrew-package.sh index 1f06c148..ff8b2571 100755 --- a/build-hazelcast-homebrew-package.sh +++ b/build-hazelcast-homebrew-package.sh @@ -58,7 +58,7 @@ function generateFormula { all_hz_versions=({hazelcast.rb,hazelcast-devel.rb,hazelcast-snapshot.rb,hazelcast?[0-9]*\.rb,hazelcast-enterprise*\.rb}) for version in "${all_hz_versions[@]}" do - if [[ "$version" != "$file" ]] && [[ ! "$version" =~ .*(beta|devel).* ]] ; then + if [[ "$version" != "$file" && ! "$version" =~ .*beta.* ]] ; then sed -i "/sha256.*$/a \ \ \ \ conflicts_with \"${version%.rb}\", because: \"you can install only a single hazelcast or hazelcast-enterprise package\"" "$file" fi done @@ -67,7 +67,7 @@ function generateFormula { BREW_CLASS=$(brewClass "${HZ_DISTRIBUTION}" "${BREW_PACKAGE_VERSION}") generateFormula "$BREW_CLASS" "${HZ_DISTRIBUTION}@${BREW_PACKAGE_VERSION}.rb" -# Update hazelcast and hazelcast-x.y aliases only if the version is a stable release (not SNAPSHOT/DEVEL/BETA) +# Update hazelcast and hazelcast-x.y aliases only if the version is a stable release (not SNAPSHOT/BETA) if [[ "$RELEASE_TYPE" = "stable" ]]; then rm -f "Aliases/${HZ_DISTRIBUTION}-${HZ_MINOR_VERSION}" #migrate incrementally from symlinks to regular files BREW_CLASS=$(brewClass "${HZ_DISTRIBUTION}${HZ_MINOR_VERSION}") diff --git a/common.sh b/common.sh index 91f82319..2bed67c1 100755 --- a/common.sh +++ b/common.sh @@ -9,9 +9,6 @@ export RELEASE_TYPE=stable if [[ "$HZ_VERSION" == *"SNAPSHOT"* ]]; then export RELEASE_TYPE=snapshot fi -if [[ "$HZ_VERSION" == *"DEVEL"* ]]; then - export RELEASE_TYPE=devel -fi if [[ "$HZ_VERSION" == *"BETA"* ]]; then export RELEASE_TYPE=beta fi diff --git a/common_tests.sh b/common_tests.sh index 997f9d1a..b480e73a 100755 --- a/common_tests.sh +++ b/common_tests.sh @@ -21,8 +21,6 @@ assertReleaseType "5.2.0-SNAPSHOT" "snapshot" assertReleaseType "5.2-SNAPSHOT" "snapshot" assertReleaseType "5.2.0-BETA-1" "beta" assertReleaseType "5.2-BETA-1" "beta" -assertReleaseType "5.1.0-DEVEL-8" "devel" -assertReleaseType "5.1-DEVEL-8" "devel" assertReleaseType "5.0" "stable" assertReleaseType "5.1" "stable" assertReleaseType "5.1.1" "stable" @@ -44,7 +42,6 @@ assertPackageVersions "5.0.2" "5.0.2-1" "5.0.2-1" "5.0.2- assertPackageVersions "5.1" "5.1" "5.1-1" "5.1-1" assertPackageVersions "5.1" "5.1-1" "5.1-1" "5.1-1" assertPackageVersions "5.1-SNAPSHOT" "5.1-SNAPSHOT" "5.1-SNAPSHOT-1" "5.1.SNAPSHOT-1" -assertPackageVersions "5.1-DEVEL" "5.1-DEVEL" "5.1-DEVEL-1" "5.1.DEVEL-1" assertPackageVersions "5.1-BETA-1" "5.1-BETA-1" "5.1-BETA-1-1" "5.1.BETA.1-1" assertPackageVersions "5.1-BETA-1" "5.1-BETA-1-2" "5.1-BETA-1-2" "5.1.BETA.1-2" assertPackageVersions "5.2.0-SNAPSHOT" "5.2.0-SNAPSHOT" "5.2.0-SNAPSHOT-1" "5.2.0.SNAPSHOT-1" diff --git a/packages/brew/test_brew_functions.sh b/packages/brew/test_brew_functions.sh index 131a4dd8..bddef5c3 100755 --- a/packages/brew/test_brew_functions.sh +++ b/packages/brew/test_brew_functions.sh @@ -18,14 +18,12 @@ log_header "Tests for alphanumCamelCase" assertAlphanumCamelCase "5.2.0-SNAPSHOT" "520Snapshot" assertAlphanumCamelCase "5.2-SNAPSHOT" "52Snapshot" assertAlphanumCamelCase "5.2-BETA-1" "52Beta1" -assertAlphanumCamelCase "5.1-DEVEL-8" "51Devel8" assertAlphanumCamelCase "5.2" "52" assertAlphanumCamelCase "5.2.0" "520" assertAlphanumCamelCase "5.2.1" "521" assertAlphanumCamelCase "" "" assertAlphanumCamelCase "snapshot" "Snapshot" assertAlphanumCamelCase "beta" "Beta" -assertAlphanumCamelCase "devel" "Devel" function assertBrewClass { local distribution=$1 @@ -39,7 +37,6 @@ log_header "Tests for brewClass" assertBrewClass "hazelcast" "5.2.0-SNAPSHOT" "HazelcastAT520Snapshot" assertBrewClass "hazelcast" "5.2-SNAPSHOT" "HazelcastAT52Snapshot" assertBrewClass "hazelcast-enterprise" "5.2-BETA-1" "HazelcastEnterpriseAT52Beta1" -assertBrewClass "hazelcast" "5.2-DEVEL-3" "HazelcastAT52Devel3" assertBrewClass "hazelcast" "5.2" "HazelcastAT52" assertBrewClass "hazelcast" "5.2.0" "HazelcastAT520" assertBrewClass "hazelcast" "" "Hazelcast" diff --git a/pom.xml b/pom.xml index 1a4ba7e3..2917a3bd 100644 --- a/pom.xml +++ b/pom.xml @@ -45,10 +45,5 @@ true - - hazelcast-devel-repository - Hazelcast Private Development Repository - https://repository.hazelcast.com/devel/ - diff --git a/repos/prod/hazelcast-rpm-devel.repo b/repos/prod/hazelcast-rpm-devel.repo deleted file mode 100644 index d4e9c2e4..00000000 --- a/repos/prod/hazelcast-rpm-devel.repo +++ /dev/null @@ -1,7 +0,0 @@ -[Hazelcast-Devel-RPM] -name=Hazelcast RPM Development Repository -baseurl=https://repository.hazelcast.com/rpm/devel -enabled=1 -gpgcheck=1 -gpgkey=https://repository.hazelcast.com/rpm/devel/repodata/repomd.xml.key -repo_gpgcheck=1 diff --git a/repos/test/hazelcast-rpm-devel.repo b/repos/test/hazelcast-rpm-devel.repo deleted file mode 100644 index 85422cd9..00000000 --- a/repos/test/hazelcast-rpm-devel.repo +++ /dev/null @@ -1,7 +0,0 @@ -[Hazelcast-Devel-RPM] -name=Hazelcast RPM Development Repository -baseurl=https://repository.hazelcast.com/rpm-test-local/devel -enabled=1 -gpgcheck=1 -gpgkey=https://repository.hazelcast.com/rpm-test-local/devel/repodata/repomd.xml.key -repo_gpgcheck=1