Skip to content
This repository has been archived by the owner on Aug 2, 2022. It is now read-only.

Upgrade from 1.9.0 to 1.10.0 #215

Merged

Conversation

VijayanB
Copy link
Member

  1. Upgraded ES-OSS from 7.8 to 7.9
  2. Fixed compilation errors due to changes in 7.9
  3. Added dependencies explicitly since after upgrading to 7.9, we saw error in powemockito.
  4. Exclude asm transitive dependency, since those jar is already added by es in 7.9 explicitly
  5. Remove jacoco.core, jacoco.report since it is part of ant.

By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.

1. Upgraded ES-OSS from 7.8 to 7.9
2. Fixed compilation errors due to changes in 7.9
3. Added dependencies explicitly since after upgrading to 7.9, we saw error in powemockito.
4. Exclude asm transitive dependency, since those jar is already added by es in 7.9 explicitly
5. Remove jacoco.core, jacoco.report since it is part of ant.
@VijayanB VijayanB requested review from kaituo and ylwu-amzn August 24, 2020 18:57
@codecov
Copy link

codecov bot commented Aug 24, 2020

Codecov Report

Merging #215 into master will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff            @@
##             master     #215   +/-   ##
=========================================
  Coverage     72.40%   72.40%           
  Complexity     1289     1289           
=========================================
  Files           139      139           
  Lines          6073     6073           
  Branches        469      469           
=========================================
  Hits           4397     4397           
  Misses         1464     1464           
  Partials        212      212           
Flag Coverage Δ Complexity Δ
#cli 80.30% <ø> (ø) 0.00 <ø> (ø)
#plugin 71.34% <ø> (ø) 1289.00 <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

compile "org.jacoco:org.jacoco.core:0.8.5"
compile "org.jacoco:org.jacoco.report:0.8.5"
compile ("org.jacoco:org.jacoco.ant:0.8.5") {
exclude group: 'org.ow2.asm', module: 'asm-commons'
Copy link
Contributor

@ylwu-amzn ylwu-amzn Aug 24, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just asking, why exclude these modules?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In ES 7.9, they added those dependencies ( https://github.com/elastic/elasticsearch/blob/master/modules/lang-painless/build.gradle#L36 ). We are also including this dependency through transitive from code-coverage . This caused jar Hell error ( es checks whether any multiple jars of same or different version is being included ). Hence, i excluded this jar to be added into our plugin while downloading org.jacoco:org.jacoco.ant for code coverage.

@VijayanB
Copy link
Member Author

Launched ESS-OSS + Job-scheduler +AD
From CLI following API is tested
Create, start, stop, get, delete, update

@VijayanB VijayanB self-assigned this Aug 24, 2020
@VijayanB VijayanB added the AnomalyDetection Items related to Anomaly Detection plugin label Aug 24, 2020
@VijayanB VijayanB requested a review from ylwu-amzn August 24, 2020 22:01
@VijayanB VijayanB merged commit 3dc945c into opendistro-for-elasticsearch:master Aug 24, 2020
@yizheliu-amazon yizheliu-amazon added the version upgrade upgrade version like ES, java label Aug 25, 2020
@VijayanB VijayanB removed the AnomalyDetection Items related to Anomaly Detection plugin label Aug 25, 2020
@yizheliu-amazon yizheliu-amazon mentioned this pull request Aug 27, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
version upgrade upgrade version like ES, java
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants