Merge branch 'palantir:develop' into aarch64

palantir · Apr 5, 2022 · b824be4 · b824be4
2 parents 4fb80d1 + dd886a6
commit b824be4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 13 deletions.
diff --git a/.policy.yml b/.policy.yml
@@ -3,7 +3,6 @@
 policy:
  approval:
  - or:
- - infrastructure-notify has been notified
  - one admin has approved (PR contributors not allowed)
  - two admins have approved
  - changelog only and contributor approval
@@ -16,15 +15,6 @@ policy:
  organizations: [ "palantir" ]
 
 approval_rules:
- - name: infrastructure-notify has been notified
- options:
- allow_contributor: false
- request_review:
- enabled: true
- requires:
- count: 1
- teams: [ "palantir/infrastructure-notify" ]
-
  - name: one admin has approved (PR contributors not allowed)
  options:
  allow_contributor: false

diff --git a/build.gradle b/build.gradle
@@ -16,8 +16,8 @@
 
 buildscript {
  repositories {
- gradlePluginPortal()
- mavenCentral()
+ gradlePluginPortal() { metadataSources { mavenPom(); ignoreGradleMetadataRedirection() } }
+ mavenCentral() { metadataSources { mavenPom(); ignoreGradleMetadataRedirection() } }
  }
 
  dependencies {
@@ -33,7 +33,7 @@ buildscript {
 
 
 repositories {
- mavenCentral()
+ mavenCentral() { metadataSources { mavenPom(); ignoreGradleMetadataRedirection() } }
 }
 
 apply plugin: 'com.palantir.external-publish'