diff --git a/.gitignore b/.gitignore index ec394ab09063a..309342f3b611d 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,12 @@ *.ipr *.iws build-idea/ +out/ + +# include shared intellij config +!.idea/scopes/x_pack.xml +!.idea/inspectionProfiles/Project_Default.xml + # These files are generated in the main tree by IntelliJ benchmarks/src/main/generated/* diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml new file mode 100644 index 0000000000000..5cf789707c58c --- /dev/null +++ b/.idea/inspectionProfiles/Project_Default.xml @@ -0,0 +1,9 @@ + + + + \ No newline at end of file diff --git a/.idea/scopes/x_pack.xml b/.idea/scopes/x_pack.xml new file mode 100644 index 0000000000000..1ccf16614d596 --- /dev/null +++ b/.idea/scopes/x_pack.xml @@ -0,0 +1,3 @@ + + + diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 8598b6001a667..c072b7b3649ad 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -111,7 +111,7 @@ using the wrapper via the `gradlew` script on Unix systems or `gradlew.bat` script on Windows in the root of the repository. The examples below show the usage on Unix. -We support development in IntelliJ versions [IntelliJ 2017.2][intellij] and +We support development in IntelliJ versions IntelliJ 2019.2 and onwards. We would like to support Eclipse, but few of us use it and has fallen into [disrepair][eclipse]. @@ -123,40 +123,18 @@ You can access Elasticsearch with: curl -u elastic:password localhost:9200 -### Configuring IDEs And Running Tests - -IntelliJ users can automatically configure their IDE: `./gradlew idea` -then `File->New Project From Existing Sources`. Point to the root of -the source directory, select -`Import project from external model->Gradle`, enable -`Use auto-import`. In order to run tests directly from -IDEA 2017.2 and above, it is required to disable the IDEA run launcher in order to avoid -`idea_rt.jar` causing "jar hell". This can be achieved by adding the -`-Didea.no.launcher=true` [JVM -option](https://intellij-support.jetbrains.com/hc/en-us/articles/206544869-Configuring-JVM-options-and-platform-properties). -Alternatively, `idea.no.launcher=true` can be set in the -[`idea.properties`](https://www.jetbrains.com/help/idea/file-idea-properties.html) -file which can be accessed under Help > Edit Custom Properties (this will require a -restart of IDEA). For IDEA 2017.3 and above, in addition to the JVM option, you will need to go to -`Run->Edit Configurations->...->Defaults->JUnit` and verify that the `Shorten command line` setting is set to -`user-local default: none`. You may also need to [remove `ant-javafx.jar` from your -classpath](https://github.com/elastic/elasticsearch/issues/14348) if that is -reported as a source of jar hell. - -To run an instance of elasticsearch from the source code run `./gradlew run` - -The Elasticsearch codebase makes heavy use of Java `assert`s and the -test runner requires that assertions be enabled within the JVM. This -can be accomplished by passing the flag `-ea` to the JVM on startup. - -You can enable these in IntelliJ by going to -`Run->Edit Configurations...->Defaults->JUnit->VM options` and input -`-ea`. - -Some tests related to locale testing also require the flag -`-Djava.locale.providers` to be set. Set the VM options/VM arguments for -IntelliJ like describe above to use -`-Djava.locale.providers=SPI,COMPAT`. +### Importing the project into IntelliJ IDEA + +Elasticsearch builds using Java 13. Before importing into IntelliJ you will need +to define an appropriate SDK. The convention is that **this SDK should be named +"13"** so that the project import will detect it automatically. For more details +on defining an SDK in IntelliJ please refer to [their documentation](https://www.jetbrains.com/help/idea/sdk.html#define-sdk). + +You can import the Elasticsearch project into IntelliJ IDEA via: + + - Select **File > Open** + - In the subsequent dialog navigate to the root `build.gradle` file + - In the subsequent dialog select **Open as Project** ### REST Endpoint Conventions @@ -204,11 +182,7 @@ Please follow these formatting guidelines: part of a file. Please format such sections sympathetically with the rest of the code, while keeping lines to maximum length of 76 characters. * Wildcard imports (`import foo.bar.baz.*`) are forbidden and will cause - the build to fail. This can be done automatically by your IDE: - * IntelliJ: `Preferences/Settings->Editor->Code Style->Java->Imports`. - There are two configuration options: `Class count to use import with - '*'` and `Names count to use static import with '*'`. Set their values - to 99999 or some other absurdly high value. + the build to fail. * If *absolutely* necessary, you can disable formatting for regions of code with the `// tag::NAME` and `// end::NAME` directives, but note that these are intended for use in documentation, so please make it clear what @@ -379,26 +353,9 @@ It is important that the only code covered by the Elastic licence is contained within the top-level `x-pack` directory. The build will fail its pre-commit checks if contributed code does not have the appropriate license headers. -You may find it helpful to configure your IDE to automatically insert the -appropriate license header depending on the part of the project to which you are -contributing. - -#### IntelliJ: Copyright & Scope Profiles - -To have IntelliJ insert the correct license, it is necessary to create to copyright profiles. -These may potentially be called `apache2` and `commercial`. These can be created in -`Preferences/Settings->Editor->Copyright->Copyright Profiles`. To associate these profiles to -their respective directories, two "Scopes" will need to be created. These can be created in -`Preferences/Settings->Appearances & Behavior->Scopes`. When creating scopes, be sure to choose -the `shared` scope type. Create a scope, `apache2`, with -the associated pattern of `!file[group:x-pack]:*/`. This pattern will exclude all the files contained in -the `x-pack` directory. The other scope, `commercial`, will have the inverse pattern of `file[group:x-pack]:*/`. -The two scopes, together, should account for all the files in the project. To associate the scopes -with their copyright-profiles, go into `Preferences/Settings->Editor>Copyright` and use the `+` to add -the associations `apache2/apache2` and `commercial/commercial`. - -Configuring these options in IntelliJ can be quite buggy, so do not be alarmed if you have to open/close -the settings window and/or restart IntelliJ to see your changes take effect. +> **NOTE:** If you have imported the project into IntelliJ IDEA the project will +> be automatically configured to add the correct license header to new source +> files based on the source location. ### Creating A Distribution @@ -411,7 +368,7 @@ cd elasticsearch/ To build a darwin-tar distribution, run this command: ```sh -./gradlew -p distribution/archives/darwin-tar assemble --parallel +./gradlew -p distribution/archives/darwin-tar assemble ``` You will find the distribution under: @@ -421,9 +378,12 @@ To create all build artifacts (e.g., plugins and Javadocs) as well as distributions in all formats, run this command: ```sh -./gradlew assemble --parallel +./gradlew assemble ``` +> **NOTE:** Running the task above will fail if you don't have a available +> Docker installation. + The package distributions (Debian and RPM) can be found under: `./distribution/packages/(deb|rpm|oss-deb|oss-rpm)/build/distributions/` @@ -556,10 +516,6 @@ known as "transitive" dependencies". should not be shipped with the project because it is "provided" by the runtime somehow. Elasticsearch plugins use this configuration to include dependencies that are bundled with Elasticsearch's server. -
`bundle`
Only available in projects with the shadow plugin, -dependencies with this configuration are bundled into the jar produced by the -build. Since IDEs do not understand this configuration we rig them to treat -dependencies in this configuration as `compile` dependencies.
`testCompile`
Code that is on the classpath for compiling tests that are part of this project but not production code. The canonical example of this is `junit`.
diff --git a/TESTING.asciidoc b/TESTING.asciidoc index 6c3ca01c7ae72..fe04cc49637ba 100644 --- a/TESTING.asciidoc +++ b/TESTING.asciidoc @@ -20,9 +20,9 @@ To create a platform-specific build including the x-pack modules, use the following depending on your operating system: ----------------------------- -./gradlew :distribution:archives:linux-tar:assemble --parallel -./gradlew :distribution:archives:darwin-tar:assemble --parallel -./gradlew :distribution:archives:windows-zip:assemble --parallel +./gradlew :distribution:archives:linux-tar:assemble +./gradlew :distribution:archives:darwin-tar:assemble +./gradlew :distribution:archives:windows-zip:assemble ----------------------------- === Running Elasticsearch from a checkout @@ -51,6 +51,10 @@ recommended to configure the IDE to initiate multiple listening attempts. In cas is called "Auto restart" and needs to be checked. In case of Eclipse, "Connection limit" setting needs to be configured with a greater value (ie 10 or more). +NOTE: If you have imported the project into IntelliJ according to the instructions in +link:/CONTRIBUTING.md#importing-the-project-into-intellij-idea[CONTRIBUTING.md] then a debug run configuration +named "Debug Elasticsearch" will be created for you and configured appropriately. + ==== Distribution By default a node is started with the zip distribution. diff --git a/build.gradle b/build.gradle index b83f19efbba42..64cfbd1e58284 100644 --- a/build.gradle +++ b/build.gradle @@ -43,6 +43,7 @@ apply plugin: 'nebula.info-scm' apply from: 'gradle/build-scan.gradle' apply from: 'gradle/build-complete.gradle' apply from: 'gradle/runtime-jdk-provision.gradle' +apply from: 'gradle/ide.gradle' // common maven publishing configuration allprojects { @@ -180,7 +181,6 @@ allprojects { System.getProperty("eclipse.application") != null || // Detects gradle launched from the Eclipse compiler server gradle.startParameter.taskNames.contains('eclipse') || // Detects gradle launched from the command line to do eclipse stuff gradle.startParameter.taskNames.contains('cleanEclipse') - isIdea = System.getProperty("idea.active") != null || gradle.startParameter.taskNames.contains('idea') || gradle.startParameter.taskNames.contains('cleanIdea') // for BWC testing bwcVersions = versions @@ -356,36 +356,6 @@ gradle.projectsEvaluated { } } -// intellij configuration -allprojects { - apply plugin: 'idea' - - if (isIdea) { - project.buildDir = file('build-idea') - } - idea { - module { - inheritOutputDirs = false - outputDir = file('build-idea/classes/main') - testOutputDir = file('build-idea/classes/test') - - // also ignore other possible build dirs - excludeDirs += file('build') - excludeDirs += file('build-eclipse') - } - } - - tasks.named('cleanIdea') { - delete 'build-idea' - } -} - -idea { - project { - vcs = 'Git' - } -} - // eclipse configuration allprojects { apply plugin: 'eclipse' diff --git a/gradle/ide.gradle b/gradle/ide.gradle new file mode 100644 index 0000000000000..3580f4a28f28e --- /dev/null +++ b/gradle/ide.gradle @@ -0,0 +1,147 @@ +import org.jetbrains.gradle.ext.Remote +import org.jetbrains.gradle.ext.JUnit + +buildscript { + repositories { + maven { + url "https://plugins.gradle.org/m2/" + } + } + dependencies { + classpath "gradle.plugin.org.jetbrains.gradle.plugin.idea-ext:gradle-idea-ext:0.7" + } +} + +apply plugin: org.jetbrains.gradle.ext.IdeaExtPlugin + +allprojects { + apply plugin: 'idea' + + tasks.named('idea') { + doFirst { throw new GradleException("Use of the 'idea' task has been deprecated. For details on importing into IntelliJ see CONTRIBUTING.md.") } + } +} + +tasks.register('configureIdeaGradleJvm') { + group = 'ide' + description = 'Configures the appropriate JVM for Gradle' + + doLast { + modifyXml('.idea/gradle.xml') { xml -> + def gradleSettings = xml.component.find { it.'@name' == 'GradleSettings' }.option[0].GradleProjectSettings + // Remove configured JVM option to force IntelliJ to use the project JDK for Gradle + gradleSettings.option.findAll { it.'@name' == 'gradleJvm' }.each { it.parent().remove(it) } + } + } +} + +tasks.register('configureIdeaRunConfigs') { + group = 'ide' + description = 'Configures default run configuration settings' + + doLast { + modifyXml('.idea/workspace.xml') { xml -> + def runManager = xml.component.find { it.'@name' == 'RunManager' } + if (runManager == null) { + throw new GradleException("IntelliJ 'RunManager' configuration is missing from workspace.xml. You may need to refresh your Gradle project.") + } + + def debugConfig = runManager.configuration.find { it.'@name' == 'Debug Elasticsearch' } + // Enable "auto restart" on remote debug run configuration + if (debugConfig.option.any { it.'@name' == 'AUTO_RESTART' && it.'@value' == 'true'} == false) { + def restart = new NodeBuilder().option(name: 'AUTO_RESTART', value: 'true') + debugConfig.append(restart) + } + } + } +} + +idea { + project { + vcs = 'Git' + jdkName = '13' + + settings { + delegateActions { + delegateBuildRunToGradle = false + testRunner = 'choose_per_test' + } + taskTriggers { + afterSync tasks.named('configureIdeaGradleJvm'), tasks.named('configureIdeaRunConfigs') + } + codeStyle { + java { + classCountToUseImportOnDemand = 999 + } + } + encodings { + encoding = 'UTF-8' + } + compiler { + parallelCompilation = true + javac { + generateDeprecationWarnings = false + } + } + runConfigurations { + 'Debug Elasticsearch'(Remote) { + mode = 'listen' + host = 'localhost' + port = 5005 + } + defaults(JUnit) { + vmParameters = '-Djava.locale.providers=SPI,COMPAT' + } + } + copyright { + useDefault = 'Apache' + scopes = ['x-pack': 'Elastic'] + profiles { + Apache { + keyword = 'Licensed to Elasticsearch under one or more contributor' + notice = '''\ + Licensed to Elasticsearch under one or more contributor + license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright + ownership. Elasticsearch licenses this file to you under + the Apache License, Version 2.0 (the "License"); you may + not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License.'''.stripIndent() + } + Elastic { + keyword = 'Licensed under the Elastic License' + notice = '''\ + Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + or more contributor license agreements. Licensed under the Elastic License; + you may not use this file except in compliance with the Elastic License.'''.stripIndent() + } + } + } + } + } +} + +/** + * Parses a given XML file, applies a set of changes, and writes those changes back to the original file. + * + * @param path Path to existing XML file + * @param action Action to perform on parsed XML document + */ +void modifyXml(Object path, Action action) { + File xmlFile = project.file(path) + Node xml = new XmlParser().parse(xmlFile) + action.execute(xml) + + xmlFile.withPrintWriter { writer -> + new XmlNodePrinter(writer).print(xml) + } +} diff --git a/server/build.gradle b/server/build.gradle index fe0b2c3fee933..59c41c7679d20 100644 --- a/server/build.gradle +++ b/server/build.gradle @@ -35,7 +35,7 @@ publishing { archivesBaseName = 'elasticsearch' // we want to keep the JDKs in our IDEs set to JDK 11 until minimum JDK is bumped to 17 so we do not include this source set in our IDEs -if (!isEclipse && !isIdea) { +if (!isEclipse) { sourceSets { java12 { java { @@ -82,7 +82,7 @@ dependencies { compile project(":libs:elasticsearch-geo") compileOnly project(':libs:elasticsearch-plugin-classloader') - testRuntime project(':libs:elasticsearch-plugin-classloader') + testRuntimeOnly project(':libs:elasticsearch-plugin-classloader') // lucene compile "org.apache.lucene:lucene-core:${versions.lucene}" @@ -123,7 +123,7 @@ dependencies { // repackaged jna with native bits linked against all elastic supported platforms compile "org.elasticsearch:jna:${versions.jna}" - if (!isEclipse && !isIdea) { + if (!isEclipse) { java12Compile sourceSets.main.output }