diff options
| author | Jon Marius Venstad <venstad@gmail.com> | 2021-04-13 10:03:40 +0200 |
|---|---|---|
| committer | Jon Marius Venstad <venstad@gmail.com> | 2021-04-13 10:03:40 +0200 |
| commit | ba3de27c17e516f6b5ce8c67ab4e517c575cbb29 (patch) | |
| tree | 4526d85c734403d9c754dc55d02d90c04bbcdb98 | |
| parent | 17b5a326d1e908cd282e1a3a13aa81a6be7ec2a4 (diff) | |
Revert "Revert "No more bintray.""
This reverts commit 4274c514b7ebfae57c7f6e45f7299ae4925ccff1.
| -rw-r--r-- | container-dependency-versions/pom.xml | 6 | ||||
| -rwxr-xr-x | docker/build/build-vespa-internal.sh | 9 | ||||
| -rw-r--r-- | parent/pom.xml | 18 |
3 files changed, 4 insertions, 29 deletions
diff --git a/container-dependency-versions/pom.xml b/container-dependency-versions/pom.xml index afcdf474723..c7353241d35 100644 --- a/container-dependency-versions/pom.xml +++ b/container-dependency-versions/pom.xml @@ -22,12 +22,6 @@ <url>https://github.com/vespa-engine</url> </developer> </developers> - <distributionManagement> - <repository> - <id>bintray-vespa-repo</id> - <url>https://api.bintray.com/maven/yahoo/maven/vespa;publish=1</url> - </repository> - </distributionManagement> <scm> <connection>scm:git:git@github.com:vespa-engine/vespa.git</connection> <developerConnection>scm:git:git@github.com:vespa-engine/vespa.git</developerConnection> diff --git a/docker/build/build-vespa-internal.sh b/docker/build/build-vespa-internal.sh index 780713ec732..63eb0efacb8 100755 --- a/docker/build/build-vespa-internal.sh +++ b/docker/build/build-vespa-internal.sh @@ -22,12 +22,11 @@ yum -y install epel-release yum -y install centos-release-scl if ! yum-config-manager --add-repo https://copr.fedorainfracloud.org/coprs/g/vespa/vespa/repo/epel-7/group_vespa-vespa-epel-7.repo; then - cat << 'EOF' > /etc/yum.repos.d/vespa-engine-stable.repo -[vespa-engine-stable] -name=vespa-engine-stable -baseurl=https://yahoo.bintray.com/vespa-engine/centos/$releasever/stable/$basearch + cat << 'EOF' > /etc/yum.repos.d/vespa-release.repo +[vespa-release] +name=Vespa releases +baseurl=https://verizonmedia.jfrog.io/artifactory/vespa/centos/$releasever/release/$basearch gpgcheck=0 -repo_gpgcheck=0 enabled=1 EOF fi diff --git a/parent/pom.xml b/parent/pom.xml index 341522826d1..80fe5640e54 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -28,30 +28,12 @@ <url>https://github.com/vespa-engine</url> </developer> </developers> - <distributionManagement> - <repository> - <id>bintray-vespa-repo</id> - <url>https://api.bintray.com/maven/yahoo/maven/vespa;publish=1</url> - </repository> - </distributionManagement> <scm> <connection>scm:git:git@github.com:vespa-engine/vespa.git</connection> <developerConnection>scm:git:git@github.com:vespa-engine/vespa.git</developerConnection> <url>git@github.com:vespa-engine/vespa.git</url> </scm> - <repositories> - <!-- Required for Athenz libraries --> - <repository> - <snapshots> - <enabled>false</enabled> - </snapshots> - <id>bintray-yahoo-maven</id> - <name>bintray</name> - <url>https://yahoo.bintray.com/maven</url> - </repository> - </repositories> - <build> <finalName>${project.artifactId}</finalName> <extensions> |