Support ES version 7.7.1 #62

ftianli-amzn · 2020-06-18T21:14:58Z

Issue #, if available:

Description of changes:

Bump ODFE version to 1.8.1
Bump Elasticsearch version to 7.7.1
Bump Gradle version to 6.4.1
Disable the 'validateNebulaPom' task for the sub-projects that are not uploaded to sonatype, due to 'POM validation' are added by ES, which requires 'lisences' and 'developers' elements in POM file. (Add pom validation elastic/elasticsearch#55272)
Add a workaround to remove duplicated content in the generated POM file, as the function of POM generation starts to work in ES7.7.1, which conflicts with our own POM configuration. (Move publishing configuration to a separate plugin elastic/elasticsearch#56727 and Move common repository configuration to java plugin elastic/elasticsearch#57057)
[Thanks @bowenlan-amzn for providing this solution.]
Use new Maven endpoint URL for ODFE (New Maven endpoint URL for ODFE #61)

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

* setup checking pom generate tasks * try solving POM problem introduced by elasticsearch publish plugin

… satisfy 'validateShadowPom'

…ugin instead of 'maven'

ftianli-amzn · 2020-06-18T21:23:04Z

There may have other ways to deal with the issue of POM configuration conflict, this workaround gets the best result.
Another solution could be remove our own POM configuration (https://github.com/opendistro-for-elasticsearch/job-scheduler/blob/v1.8.0.0/spi/build.gradle#L95), then we can use the POM info generated by ES plugin, but we will lose the ability of overriding the project name and description.
The defaults are:

  <name>opendistro-job-scheduler-spi</name>
  <description>null</description>

We are looking forward to hearing advice about the solution.

ftianli-amzn · 2020-06-18T23:10:35Z

Although remove the pom configuration task added by elasticsearch.publish plugin sounds like a better solution.
We couldn't find a separate task made by the plugin from the Gradle task tree.

:opendistro-job-scheduler-spi:build
+--- :opendistro-job-scheduler-spi:assemble
|    +--- :opendistro-job-scheduler-spi:generatePom
|    |    +--- :opendistro-job-scheduler-spi:generatePomFileForNebulaPublication
|    |    \--- :opendistro-job-scheduler-spi:generatePomFileForShadowPublication
|    +--- :opendistro-job-scheduler-spi:jar
|    |    \--- :opendistro-job-scheduler-spi:classes
|    |         +--- :opendistro-job-scheduler-spi:compileJava
|    |         \--- :opendistro-job-scheduler-spi:processResources
|    +--- :opendistro-job-scheduler-spi:javadocJar
|    |    \--- :opendistro-job-scheduler-spi:javadoc
|    +--- :opendistro-job-scheduler-spi:shadowJar
|    |    \--- :opendistro-job-scheduler-spi:classes
|    |         +--- :opendistro-job-scheduler-spi:compileJava
|    |         \--- :opendistro-job-scheduler-spi:processResources
|    \--- :opendistro-job-scheduler-spi:sourcesJar
\--- :opendistro-job-scheduler-spi:check
     +--- :opendistro-job-scheduler-spi:checkstyleMain
     |    +--- :opendistro-job-scheduler-spi:classes
     |    |    +--- :opendistro-job-scheduler-spi:compileJava
     |    |    \--- :opendistro-job-scheduler-spi:processResources
     |    \--- :opendistro-job-scheduler-spi:copyCheckstyleConf
     +--- :opendistro-job-scheduler-spi:checkstyleTest
     |    +--- :opendistro-job-scheduler-spi:classes
     |    |    +--- :opendistro-job-scheduler-spi:compileJava
     |    |    \--- :opendistro-job-scheduler-spi:processResources
     |    +--- :opendistro-job-scheduler-spi:copyCheckstyleConf
     |    \--- :opendistro-job-scheduler-spi:testClasses
     |         +--- :opendistro-job-scheduler-spi:compileTestJava
     |         |    \--- :opendistro-job-scheduler-spi:classes
     |         |         +--- :opendistro-job-scheduler-spi:compileJava
     |         |         \--- :opendistro-job-scheduler-spi:processResources
     |         \--- :opendistro-job-scheduler-spi:processTestResources
     +--- :opendistro-job-scheduler-spi:forbiddenApis
     |    +--- :opendistro-job-scheduler-spi:forbiddenApisMain
     |    |    +--- :opendistro-job-scheduler-spi:buildResources
     |    |    \--- :opendistro-job-scheduler-spi:classes
     |    |         +--- :opendistro-job-scheduler-spi:compileJava
     |    |         \--- :opendistro-job-scheduler-spi:processResources
     |    \--- :opendistro-job-scheduler-spi:forbiddenApisTest
     |         +--- :opendistro-job-scheduler-spi:buildResources
     |         +--- :opendistro-job-scheduler-spi:classes
     |         |    +--- :opendistro-job-scheduler-spi:compileJava
     |         |    \--- :opendistro-job-scheduler-spi:processResources
     |         \--- :opendistro-job-scheduler-spi:testClasses
     |              +--- :opendistro-job-scheduler-spi:compileTestJava
     |              |    \--- :opendistro-job-scheduler-spi:classes
     |              |         +--- :opendistro-job-scheduler-spi:compileJava
     |              |         \--- :opendistro-job-scheduler-spi:processResources
     |              \--- :opendistro-job-scheduler-spi:processTestResources
     +--- :opendistro-job-scheduler-spi:integTest
     |    \--- :opendistro-job-scheduler-spi:integTestRunner
     |         +--- :extractElasticsearchOssDarwin7.7.1
     |         +--- :opendistro-job-scheduler-spi:classes
     |         |    +--- :opendistro-job-scheduler-spi:compileJava
     |         |    \--- :opendistro-job-scheduler-spi:processResources
     |         +--- :opendistro-job-scheduler-spi:shadowJar
     |         |    \--- :opendistro-job-scheduler-spi:classes
     |         |         +--- :opendistro-job-scheduler-spi:compileJava
     |         |         \--- :opendistro-job-scheduler-spi:processResources
     |         \--- :opendistro-job-scheduler-spi:testClasses
     |              +--- :opendistro-job-scheduler-spi:compileTestJava
     |              |    \--- :opendistro-job-scheduler-spi:classes
     |              |         +--- :opendistro-job-scheduler-spi:compileJava
     |              |         \--- :opendistro-job-scheduler-spi:processResources
     |              \--- :opendistro-job-scheduler-spi:processTestResources
     +--- :opendistro-job-scheduler-spi:jacocoTestReport
     |    \--- :opendistro-job-scheduler-spi:classes
     |         +--- :opendistro-job-scheduler-spi:compileJava
     |         \--- :opendistro-job-scheduler-spi:processResources
     +--- :opendistro-job-scheduler-spi:javadoc
     +--- :opendistro-job-scheduler-spi:precommit
     |    +--- :opendistro-job-scheduler-spi:checkstyle
     |    |    +--- :opendistro-job-scheduler-spi:checkstyleMain
     |    |    |    +--- :opendistro-job-scheduler-spi:classes
     |    |    |    |    +--- :opendistro-job-scheduler-spi:compileJava
     |    |    |    |    \--- :opendistro-job-scheduler-spi:processResources
     |    |    |    \--- :opendistro-job-scheduler-spi:copyCheckstyleConf
     |    |    \--- :opendistro-job-scheduler-spi:checkstyleTest
     |    |         +--- :opendistro-job-scheduler-spi:classes
     |    |         |    +--- :opendistro-job-scheduler-spi:compileJava
     |    |         |    \--- :opendistro-job-scheduler-spi:processResources
     |    |         +--- :opendistro-job-scheduler-spi:copyCheckstyleConf
     |    |         \--- :opendistro-job-scheduler-spi:testClasses
     |    |              +--- :opendistro-job-scheduler-spi:compileTestJava
     |    |              |    \--- :opendistro-job-scheduler-spi:classes
     |    |              |         +--- :opendistro-job-scheduler-spi:compileJava
     |    |              |         \--- :opendistro-job-scheduler-spi:processResources
     |    |              \--- :opendistro-job-scheduler-spi:processTestResources
     |    +--- :opendistro-job-scheduler-spi:dependencyLicenses
     |    +--- :opendistro-job-scheduler-spi:filepermissions
     |    +--- :opendistro-job-scheduler-spi:forbiddenApis
     |    |    +--- :opendistro-job-scheduler-spi:forbiddenApisMain
     |    |    |    +--- :opendistro-job-scheduler-spi:buildResources
     |    |    |    \--- :opendistro-job-scheduler-spi:classes
     |    |    |         +--- :opendistro-job-scheduler-spi:compileJava
     |    |    |         \--- :opendistro-job-scheduler-spi:processResources
     |    |    \--- :opendistro-job-scheduler-spi:forbiddenApisTest
     |    |         +--- :opendistro-job-scheduler-spi:buildResources
     |    |         +--- :opendistro-job-scheduler-spi:classes
     |    |         |    +--- :opendistro-job-scheduler-spi:compileJava
     |    |         |    \--- :opendistro-job-scheduler-spi:processResources
     |    |         \--- :opendistro-job-scheduler-spi:testClasses
     |    |              +--- :opendistro-job-scheduler-spi:compileTestJava
     |    |              |    \--- :opendistro-job-scheduler-spi:classes
     |    |              |         +--- :opendistro-job-scheduler-spi:compileJava
     |    |              |         \--- :opendistro-job-scheduler-spi:processResources
     |    |              \--- :opendistro-job-scheduler-spi:processTestResources
     |    +--- :opendistro-job-scheduler-spi:forbiddenPatterns
     |    +--- :opendistro-job-scheduler-spi:jarHell
     |    |    +--- :opendistro-job-scheduler-spi:classes
     |    |    |    +--- :opendistro-job-scheduler-spi:compileJava
     |    |    |    \--- :opendistro-job-scheduler-spi:processResources
     |    |    \--- :opendistro-job-scheduler-spi:testClasses
     |    |         +--- :opendistro-job-scheduler-spi:compileTestJava
     |    |         |    \--- :opendistro-job-scheduler-spi:classes
     |    |         |         +--- :opendistro-job-scheduler-spi:compileJava
     |    |         |         \--- :opendistro-job-scheduler-spi:processResources
     |    |         \--- :opendistro-job-scheduler-spi:processTestResources
     |    +--- :opendistro-job-scheduler-spi:licenseHeaders
     |    +--- :opendistro-job-scheduler-spi:loggerUsageCheck
     |    |    +--- :opendistro-job-scheduler-spi:classes
     |    |    |    +--- :opendistro-job-scheduler-spi:compileJava
     |    |    |    \--- :opendistro-job-scheduler-spi:processResources
     |    |    \--- :opendistro-job-scheduler-spi:testClasses
     |    |         +--- :opendistro-job-scheduler-spi:compileTestJava
     |    |         |    \--- :opendistro-job-scheduler-spi:classes
     |    |         |         +--- :opendistro-job-scheduler-spi:compileJava
     |    |         |         \--- :opendistro-job-scheduler-spi:processResources
     |    |         \--- :opendistro-job-scheduler-spi:processTestResources
     |    +--- :opendistro-job-scheduler-spi:testingConventions
     |    |    +--- :opendistro-job-scheduler-spi:classes
     |    |    |    +--- :opendistro-job-scheduler-spi:compileJava
     |    |    |    \--- :opendistro-job-scheduler-spi:processResources
     |    |    \--- :opendistro-job-scheduler-spi:testClasses
     |    |         +--- :opendistro-job-scheduler-spi:compileTestJava
     |    |         |    \--- :opendistro-job-scheduler-spi:classes
     |    |         |         +--- :opendistro-job-scheduler-spi:compileJava
     |    |         |         \--- :opendistro-job-scheduler-spi:processResources
     |    |         \--- :opendistro-job-scheduler-spi:processTestResources
     |    +--- :opendistro-job-scheduler-spi:thirdPartyAudit
     |    |    \--- :opendistro-job-scheduler-spi:buildResources
     |    \--- :opendistro-job-scheduler-spi:validatePom
     |         +--- :opendistro-job-scheduler-spi:validateNebulaPom
     |         |    \--- :opendistro-job-scheduler-spi:generatePomFileForNebulaPublication
     |         \--- :opendistro-job-scheduler-spi:validateShadowPom
     |              \--- :opendistro-job-scheduler-spi:generatePomFileForShadowPublication
     \--- :opendistro-job-scheduler-spi:test
          +--- :opendistro-job-scheduler-spi:classes
          |    +--- :opendistro-job-scheduler-spi:compileJava
          |    \--- :opendistro-job-scheduler-spi:processResources
          +--- :opendistro-job-scheduler-spi:shadowJar
          |    \--- :opendistro-job-scheduler-spi:classes
          |         +--- :opendistro-job-scheduler-spi:compileJava
          |         \--- :opendistro-job-scheduler-spi:processResources
          \--- :opendistro-job-scheduler-spi:testClasses
               +--- :opendistro-job-scheduler-spi:compileTestJava
               |    \--- :opendistro-job-scheduler-spi:classes
               |         +--- :opendistro-job-scheduler-spi:compileJava
               |         \--- :opendistro-job-scheduler-spi:processResources
               \--- :opendistro-job-scheduler-spi:processTestResources

bowenlan-amzn and others added 7 commits June 18, 2020 10:10

solve 1.8.1 pom problem (#1)

46b69b1

* setup checking pom generate tasks * try solving POM problem introduced by elasticsearch publish plugin

disable 'validateNebulaPom' and add developer name&url in pom file to…

8fe607f

… satisfy 'validateShadowPom'

add comments about the pom configuration and validation

64d1f78

use new Maven endpoint URL for ODFE

7488e84

add a missing comment to build script and preserve 'maven-publish' pl…

91afe50

…ugin instead of 'maven'

slightly change thr comment of 'generatePom' task

61d9eba

slightly change thr comment of 'generatePom' task

ceadb6d

ftianli-amzn requested review from zengyan-amazon, dbbaughe and bowenlan-amzn June 18, 2020 21:14

ftianli-amzn requested a review from qreshi June 18, 2020 21:39

ftianli-amzn closed this Jun 22, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Support ES version 7.7.1 #62

Support ES version 7.7.1 #62

ftianli-amzn commented Jun 18, 2020 •

edited

ftianli-amzn commented Jun 18, 2020 •

edited

ftianli-amzn commented Jun 18, 2020

Support ES version 7.7.1 #62

Support ES version 7.7.1 #62

Conversation

ftianli-amzn commented Jun 18, 2020 • edited

ftianli-amzn commented Jun 18, 2020 • edited

ftianli-amzn commented Jun 18, 2020

ftianli-amzn commented Jun 18, 2020 •

edited

ftianli-amzn commented Jun 18, 2020 •

edited