Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
security:logging
elasticsearch6
0001-use-local-maven-repo.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File 0001-use-local-maven-repo.patch of Package elasticsearch6
From 16fa54cd6e7ad3e35b0328b6fab7ed93a015f18a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <kkaempf@suse.de> Date: Wed, 19 Dec 2018 12:21:28 +0100 Subject: [PATCH 1/6] use local maven repo --- benchmarks/build.gradle | 4 ++++ buildSrc/build.gradle | 5 +---- client/build.gradle | 5 +++++ distribution/build.gradle | 6 ++++++ distribution/packages/build.gradle | 5 +---- gradle/ide.gradle | 4 +--- libs/build.gradle | 3 +++ modules/build.gradle | 7 ++++++- plugins/build.gradle | 6 ++++++ plugins/examples/build.gradle | 3 +++ qa/build.gradle | 9 +-------- qa/die-with-dignity/build.gradle | 4 ++++ qa/vagrant/build.gradle | 4 ++++ qa/wildfly/build.gradle | 1 + server/build.gradle | 4 ++++ test/build.gradle | 3 +++ test/fixtures/hdfs-fixture/build.gradle | 4 ++++ x-pack/build.gradle | 3 +++ x-pack/plugin/ml/build.gradle | 12 +----------- 19 files changed, 61 insertions(+), 31 deletions(-) create mode 100644 client/build.gradle diff --git a/benchmarks/build.gradle b/benchmarks/build.gradle index 1d4d95d41cb..8b25a5da868 100644 --- a/benchmarks/build.gradle +++ b/benchmarks/build.gradle @@ -27,6 +27,10 @@ mainClassName = 'org.openjdk.jmh.Main' unitTest.enabled = false +repositories { + mavenLocal() +} + dependencies { compile("org.elasticsearch:elasticsearch:${version}") { // JMH ships with the conflicting version 4.6. This prevents us from using jopt-simple in benchmarks (which should be ok) but allows diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle index 65a0b515d16..274078ac682 100644 --- a/buildSrc/build.gradle +++ b/buildSrc/build.gradle @@ -109,10 +109,7 @@ jar { *****************************************************************************/ repositories { - mavenCentral() - maven { - url "https://plugins.gradle.org/m2/" - } + mavenLocal() } dependencies { diff --git a/client/build.gradle b/client/build.gradle new file mode 100644 index 00000000000..42d149b88a8 --- /dev/null +++ b/client/build.gradle @@ -0,0 +1,5 @@ +subprojects { + repositories { + mavenLocal() + } +} diff --git a/distribution/build.gradle b/distribution/build.gradle index 6d47e14c993..578c5d6be83 100644 --- a/distribution/build.gradle +++ b/distribution/build.gradle @@ -25,6 +25,12 @@ import org.elasticsearch.gradle.test.RunTask import java.nio.file.Files import java.nio.file.Path +subprojects { + repositories { + mavenLocal() + } +} + /***************************************************************************** * Third party dependencies report * *****************************************************************************/ diff --git a/distribution/packages/build.gradle b/distribution/packages/build.gradle index 414f37a6a34..6d2739ce1c5 100644 --- a/distribution/packages/build.gradle +++ b/distribution/packages/build.gradle @@ -51,10 +51,7 @@ import java.util.regex.Pattern buildscript { repositories { - maven { - name "gradle-plugins" - url "https://plugins.gradle.org/m2/" - } + mavenLocal() } dependencies { classpath 'com.netflix.nebula:gradle-ospackage-plugin:4.7.1' diff --git a/gradle/ide.gradle b/gradle/ide.gradle index 89f2ea798c4..74305997beb 100644 --- a/gradle/ide.gradle +++ b/gradle/ide.gradle @@ -3,9 +3,7 @@ import org.jetbrains.gradle.ext.JUnit buildscript { repositories { - maven { - url "https://plugins.gradle.org/m2/" - } + mavenLocal() } dependencies { classpath "gradle.plugin.org.jetbrains.gradle.plugin.idea-ext:gradle-idea-ext:0.7" diff --git a/libs/build.gradle b/libs/build.gradle index 990a287947c..3ade07f7501 100644 --- a/libs/build.gradle +++ b/libs/build.gradle @@ -18,6 +18,9 @@ */ configure(subprojects - project('log4j')) { + repositories { + mavenLocal() + } /* * All subprojects are java projects using Elasticsearch's standard build * tools. diff --git a/modules/build.gradle b/modules/build.gradle index 7f7e7e0965b..cd00c038464 100644 --- a/modules/build.gradle +++ b/modules/build.gradle @@ -20,7 +20,6 @@ configure(subprojects.findAll { it.parent.path == project.path }) { group = 'org.elasticsearch.plugin' // for modules which publish client jars apply plugin: 'elasticsearch.esplugin' - esplugin { // for local ES plugins, the name of the plugin is the same as the directory name project.name @@ -41,3 +40,9 @@ configure(subprojects.findAll { it.parent.path == project.path }) { throw new InvalidModelException("Modules cannot contain config files") } } + +subprojects { + repositories { + mavenLocal() + } +} diff --git a/plugins/build.gradle b/plugins/build.gradle index cf942148dea..404194d1518 100644 --- a/plugins/build.gradle +++ b/plugins/build.gradle @@ -31,3 +31,9 @@ configure(subprojects.findAll { it.parent.path == project.path }) { noticeFile rootProject.file('NOTICE.txt') } } + +subprojects { + repositories { + mavenLocal() + } +} diff --git a/plugins/examples/build.gradle b/plugins/examples/build.gradle index 2b9f3c6433d..ad31c621f78 100644 --- a/plugins/examples/build.gradle +++ b/plugins/examples/build.gradle @@ -5,5 +5,8 @@ gradle.projectsEvaluated { if (assemble) { assemble.enabled = false } + repositories { + mavenLocal() + } } } diff --git a/qa/build.gradle b/qa/build.gradle index 5a989688a18..74422754b7c 100644 --- a/qa/build.gradle +++ b/qa/build.gradle @@ -11,14 +11,7 @@ subprojects { Project subproj -> * default distribution. Those aren't in maven central. */ repositories { - maven { - name "elastic" - url "https://artifacts-no-kpi.elastic.co/maven" - } - maven { - name "elastic-snapshots" - url "https://snapshots-no-kpi.elastic.co/maven" - } + mavenLocal() } } } diff --git a/qa/die-with-dignity/build.gradle b/qa/die-with-dignity/build.gradle index 26d567ca3ef..460dda0653f 100644 --- a/qa/die-with-dignity/build.gradle +++ b/qa/die-with-dignity/build.gradle @@ -19,6 +19,10 @@ apply plugin: 'elasticsearch.esplugin' +repositories { + mavenLocal() +} + esplugin { description 'Die with dignity plugin' classname 'org.elasticsearch.DieWithDignityPlugin' diff --git a/qa/vagrant/build.gradle b/qa/vagrant/build.gradle index bd5f3e7a2ac..14a5e0343f1 100644 --- a/qa/vagrant/build.gradle +++ b/qa/vagrant/build.gradle @@ -24,6 +24,10 @@ plugins { id 'elasticsearch.vagrant' } +repositories { + mavenLocal() +} + dependencies { compile "junit:junit:${versions.junit}" compile "org.hamcrest:hamcrest-core:${versions.hamcrest}" diff --git a/qa/wildfly/build.gradle b/qa/wildfly/build.gradle index 942230e497b..10a82f9525b 100644 --- a/qa/wildfly/build.gradle +++ b/qa/wildfly/build.gradle @@ -35,6 +35,7 @@ final String wildflyInstall = "${buildDir}/wildfly/wildfly-${wildflyVersion}" int managementPort repositories { + mavenLocal() // the Wildfly distribution is not available via a repository, so we fake an Ivy repository on top of the download site ivy { name "wildfly" diff --git a/server/build.gradle b/server/build.gradle index 172a61f23db..98ed912d8e1 100644 --- a/server/build.gradle +++ b/server/build.gradle @@ -24,6 +24,10 @@ apply plugin: 'nebula.optional-base' apply plugin: 'nebula.maven-base-publish' apply plugin: 'nebula.maven-scm' +repositories { + mavenLocal() +} + publishing { publications { nebula { diff --git a/test/build.gradle b/test/build.gradle index 82938355288..a28353e919d 100644 --- a/test/build.gradle +++ b/test/build.gradle @@ -18,6 +18,9 @@ */ subprojects { + repositories { + mavenLocal() + } // fixtures is just intermediate parent project if (name == 'fixtures') return diff --git a/test/fixtures/hdfs-fixture/build.gradle b/test/fixtures/hdfs-fixture/build.gradle index accca151612..3d354aa4ceb 100644 --- a/test/fixtures/hdfs-fixture/build.gradle +++ b/test/fixtures/hdfs-fixture/build.gradle @@ -19,6 +19,10 @@ apply plugin: 'elasticsearch.build' +repositories { + mavenLocal() +} + dependencies { compile "org.apache.hadoop:hadoop-minicluster:2.8.5" } diff --git a/x-pack/build.gradle b/x-pack/build.gradle index a0db6d9a78b..7bf0089d922 100644 --- a/x-pack/build.gradle +++ b/x-pack/build.gradle @@ -10,6 +10,9 @@ subprojects { // helper method to find the path to a module ext.xpackModule = { String moduleName -> xpackProject("plugin:${moduleName}").path } + repositories { + mavenLocal() + } plugins.withType(PluginBuildPlugin).whenPluginAdded { project.esplugin.licenseFile = rootProject.file('licenses/ELASTIC-LICENSE.txt') project.esplugin.noticeFile = xpackRootProject.file('NOTICE.txt') diff --git a/x-pack/plugin/ml/build.gradle b/x-pack/plugin/ml/build.gradle index 2e32dd70177..2f7134da9fc 100644 --- a/x-pack/plugin/ml/build.gradle +++ b/x-pack/plugin/ml/build.gradle @@ -13,17 +13,7 @@ esplugin { repositories { - ivy { - name "ml-cpp" - url System.getProperty('build.ml_cpp.repo', 'https://prelert-artifacts.s3.amazonaws.com') - metadataSources { - // no repository metadata, look directly for the artifact - artifact() - } - patternLayout { - artifact "maven/org/elasticsearch/ml/ml-cpp/[revision]/ml-cpp-[revision].[ext]" - } - } + mavenLocal() } configurations { -- 2.35.1
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor
