Don't change snapshot version setting and use shared repository decla… (#3084)
* Don't change snapshot version setting and use shared repository declaration * Override repositories declaration with full declaration * MavenCentral to muzzle
This commit is contained in:
parent
1402d11592
commit
860ff84768
|
@ -55,11 +55,6 @@ allprojects {
|
||||||
apply from: "$rootDir/gradle/util.gradle"
|
apply from: "$rootDir/gradle/util.gradle"
|
||||||
}
|
}
|
||||||
|
|
||||||
repositories {
|
|
||||||
mavenLocal()
|
|
||||||
mavenCentral()
|
|
||||||
}
|
|
||||||
|
|
||||||
description = 'OpenTelemetry instrumentations for Java'
|
description = 'OpenTelemetry instrumentations for Java'
|
||||||
|
|
||||||
allprojects {
|
allprojects {
|
||||||
|
|
|
@ -42,6 +42,7 @@ import org.gradle.api.Plugin;
|
||||||
import org.gradle.api.Project;
|
import org.gradle.api.Project;
|
||||||
import org.gradle.api.artifacts.Configuration;
|
import org.gradle.api.artifacts.Configuration;
|
||||||
import org.gradle.api.artifacts.ModuleDependency;
|
import org.gradle.api.artifacts.ModuleDependency;
|
||||||
|
import org.gradle.api.artifacts.repositories.ArtifactRepository;
|
||||||
import org.gradle.api.artifacts.repositories.MavenArtifactRepository;
|
import org.gradle.api.artifacts.repositories.MavenArtifactRepository;
|
||||||
import org.gradle.api.file.ConfigurableFileCollection;
|
import org.gradle.api.file.ConfigurableFileCollection;
|
||||||
import org.gradle.api.file.FileCollection;
|
import org.gradle.api.file.FileCollection;
|
||||||
|
@ -392,16 +393,25 @@ public class MuzzlePlugin implements Plugin<Project> {
|
||||||
}
|
}
|
||||||
|
|
||||||
private static List<RemoteRepository> getProjectRepositories(Project project) {
|
private static List<RemoteRepository> getProjectRepositories(Project project) {
|
||||||
return project.getRepositories().stream()
|
List<RemoteRepository> repositories = new ArrayList<>();
|
||||||
.filter(MavenArtifactRepository.class::isInstance)
|
// Manually add mavenCentral until https://github.com/gradle/gradle/issues/17295
|
||||||
.map(
|
// Adding mavenLocal is much more complicated but hopefully isn't required for normal usage of
|
||||||
repo -> {
|
// Muzzle.
|
||||||
MavenArtifactRepository mavenRepo = (MavenArtifactRepository) repo;
|
repositories.add(
|
||||||
return new RemoteRepository.Builder(
|
new RemoteRepository.Builder(
|
||||||
mavenRepo.getName(), "default", mavenRepo.getUrl().toString())
|
"MavenCentral", "default", "https://repo.maven.apache.org/maven2/")
|
||||||
.build();
|
.build());
|
||||||
})
|
for (ArtifactRepository repository : project.getRepositories()) {
|
||||||
.collect(Collectors.toList());
|
if (repository instanceof MavenArtifactRepository) {
|
||||||
|
repositories.add(
|
||||||
|
new RemoteRepository.Builder(
|
||||||
|
repository.getName(),
|
||||||
|
"default",
|
||||||
|
((MavenArtifactRepository) repository).getUrl().toString())
|
||||||
|
.build());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return repositories;
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Create a list of muzzle directives which assert the opposite of the given MuzzleDirective. */
|
/** Create a list of muzzle directives which assert the opposite of the given MuzzleDirective. */
|
||||||
|
|
|
@ -64,11 +64,6 @@ tasks.withType(ScalaCompile).configureEach {
|
||||||
targetCompatibility = JavaVersion.toVersion(project.ext.release)
|
targetCompatibility = JavaVersion.toVersion(project.ext.release)
|
||||||
}
|
}
|
||||||
|
|
||||||
repositories {
|
|
||||||
mavenCentral()
|
|
||||||
mavenLocal()
|
|
||||||
}
|
|
||||||
|
|
||||||
evaluationDependsOn(":dependencyManagement")
|
evaluationDependsOn(":dependencyManagement")
|
||||||
configurations {
|
configurations {
|
||||||
dependencyManagement {
|
dependencyManagement {
|
||||||
|
|
|
@ -15,12 +15,14 @@ muzzle {
|
||||||
}
|
}
|
||||||
|
|
||||||
repositories {
|
repositories {
|
||||||
|
mavenCentral()
|
||||||
maven {
|
maven {
|
||||||
url "https://repo.grails.org/grails/core"
|
url "https://repo.grails.org/grails/core"
|
||||||
mavenContent {
|
mavenContent {
|
||||||
releasesOnly()
|
releasesOnly()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
mavenLocal()
|
||||||
}
|
}
|
||||||
|
|
||||||
// first version where our tests work
|
// first version where our tests work
|
||||||
|
|
|
@ -5,7 +5,9 @@ apply from: "$rootDir/gradle/java.gradle"
|
||||||
|
|
||||||
// add repo for org.gradle:gradle-tooling-api which org.jboss.shrinkwrap.resolver:shrinkwrap-resolver-gradle-depchain depends on
|
// add repo for org.gradle:gradle-tooling-api which org.jboss.shrinkwrap.resolver:shrinkwrap-resolver-gradle-depchain depends on
|
||||||
repositories {
|
repositories {
|
||||||
|
mavenCentral()
|
||||||
maven { url 'https://repo.gradle.org/gradle/libs-releases' }
|
maven { url 'https://repo.gradle.org/gradle/libs-releases' }
|
||||||
|
mavenLocal()
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
|
|
|
@ -6,7 +6,9 @@ apply from: "$rootDir/gradle/instrumentation.gradle"
|
||||||
// add repo for org.gradle:gradle-tooling-api which org.jboss.shrinkwrap.resolver:shrinkwrap-resolver-gradle-depchain
|
// add repo for org.gradle:gradle-tooling-api which org.jboss.shrinkwrap.resolver:shrinkwrap-resolver-gradle-depchain
|
||||||
// which is used by jaxrs-2.0-arquillian-testing depends on
|
// which is used by jaxrs-2.0-arquillian-testing depends on
|
||||||
repositories {
|
repositories {
|
||||||
|
mavenCentral()
|
||||||
maven { url 'https://repo.gradle.org/gradle/libs-releases' }
|
maven { url 'https://repo.gradle.org/gradle/libs-releases' }
|
||||||
|
mavenLocal()
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
|
|
|
@ -6,7 +6,9 @@ apply from: "$rootDir/gradle/instrumentation.gradle"
|
||||||
// add repo for org.gradle:gradle-tooling-api which org.jboss.shrinkwrap.resolver:shrinkwrap-resolver-gradle-depchain
|
// add repo for org.gradle:gradle-tooling-api which org.jboss.shrinkwrap.resolver:shrinkwrap-resolver-gradle-depchain
|
||||||
// which is used by jaxrs-2.0-arquillian-testing depends on
|
// which is used by jaxrs-2.0-arquillian-testing depends on
|
||||||
repositories {
|
repositories {
|
||||||
|
mavenCentral()
|
||||||
maven { url 'https://repo.gradle.org/gradle/libs-releases' }
|
maven { url 'https://repo.gradle.org/gradle/libs-releases' }
|
||||||
|
mavenLocal()
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
|
|
|
@ -6,7 +6,9 @@ apply from: "$rootDir/gradle/instrumentation.gradle"
|
||||||
// add repo for org.gradle:gradle-tooling-api which org.jboss.shrinkwrap.resolver:shrinkwrap-resolver-gradle-depchain
|
// add repo for org.gradle:gradle-tooling-api which org.jboss.shrinkwrap.resolver:shrinkwrap-resolver-gradle-depchain
|
||||||
// which is used by jaxrs-2.0-arquillian-testing depends on
|
// which is used by jaxrs-2.0-arquillian-testing depends on
|
||||||
repositories {
|
repositories {
|
||||||
|
mavenCentral()
|
||||||
maven { url 'https://repo.gradle.org/gradle/libs-releases' }
|
maven { url 'https://repo.gradle.org/gradle/libs-releases' }
|
||||||
|
mavenLocal()
|
||||||
}
|
}
|
||||||
|
|
||||||
configurations {
|
configurations {
|
||||||
|
|
|
@ -29,7 +29,9 @@ jms2Test.forkEvery 1
|
||||||
test.dependsOn jms2Test
|
test.dependsOn jms2Test
|
||||||
|
|
||||||
repositories {
|
repositories {
|
||||||
|
mavenCentral()
|
||||||
maven { url "https://repository.jboss.org/nexus/content/groups/public/" }
|
maven { url "https://repository.jboss.org/nexus/content/groups/public/" }
|
||||||
|
mavenLocal()
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
|
|
|
@ -19,6 +19,13 @@ plugins {
|
||||||
id 'com.github.burrunan.s3-build-cache' version '1.1'
|
id 'com.github.burrunan.s3-build-cache' version '1.1'
|
||||||
}
|
}
|
||||||
|
|
||||||
|
dependencyResolutionManagement {
|
||||||
|
repositories {
|
||||||
|
mavenCentral()
|
||||||
|
mavenLocal()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
def isCI = System.getenv("CI") != null
|
def isCI = System.getenv("CI") != null
|
||||||
def skipBuildscan = Boolean.valueOf(System.getenv("SKIP_BUILDSCAN"))
|
def skipBuildscan = Boolean.valueOf(System.getenv("SKIP_BUILDSCAN"))
|
||||||
gradleEnterprise {
|
gradleEnterprise {
|
||||||
|
|
Loading…
Reference in New Issue