odlparent.git
3 years agoAdd odlparent-8 release notes 55/92755/2
Robert Varga [Mon, 28 Sep 2020 16:22:27 +0000 (18:22 +0200)]
Add odlparent-8 release notes

Summarize the changes done in this release cycle in preparation for
release.

Change-Id: Ifca23bcadfed92776d810b6e50a7a76130b30cb7
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
3 years agoEnforce modernizer warnings by default 18/92718/4
Robert Varga [Fri, 25 Sep 2020 15:07:17 +0000 (17:07 +0200)]
Enforce modernizer warnings by default

Modernizer is reporting quite a few useful warnings, which should
be fixed to keep our codebase in best shape possible.

Make any reported warnings fail the build by default, while allowing
projects to opt out.

Change-Id: I55d76947ae6bf3a11beb309532ea678a7e37ab73
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
3 years agoConfigure modernizer for Java 11 17/92717/4
Robert Varga [Fri, 25 Sep 2020 14:45:04 +0000 (16:45 +0200)]
Configure modernizer for Java 11

We require Java 11 these days, let's make sure modernizer targets
this release.

Add an exclusion for all rules involving Guava's immutable collections,
as we use them heavily and suggested replacements are not actually
one-to-one replacements.

Change-Id: I64f2ebfa37eeb1375c792af946ef18971623ae01
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
3 years agoRevert "Upgrade maven-bundle-plugin to 5.1.1" 34/92734/2
Robert Varga [Sat, 26 Sep 2020 23:05:56 +0000 (01:05 +0200)]
Revert "Upgrade maven-bundle-plugin to 5.1.1"

This reverts commit 59a3bdfd47d42ce22f952670074946cf75378ce3, as
the upgraded plugin does not generate correct provides, breaking
SCR.

https://issues.apache.org/jira/browse/FELIX-6337 tracks the issue
upstream.

Change-Id: Ifee016d8214681b6091affada738891ab4832001
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
3 years agoBump immutables.org to 2.8.8 42/92642/1
Robert Varga [Wed, 23 Sep 2020 23:17:49 +0000 (01:17 +0200)]
Bump immutables.org to 2.8.8

https://github.com/immutables/immutables/releases/tag/2.8.0
https://github.com/immutables/immutables/releases/tag/2.8.1
https://github.com/immutables/immutables/releases/tag/2.8.2
https://github.com/immutables/immutables/releases/tag/2.8.3
https://github.com/immutables/immutables/releases/tag/2.8.4
https://github.com/immutables/immutables/releases/tag/2.8.8

Change-Id: Ic56b121f612956d4846bc69cedc4dd2f49e85ddf
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
3 years agoBump commons-net to 3.7 86/92586/1
Robert Varga [Tue, 22 Sep 2020 10:22:38 +0000 (12:22 +0200)]
Bump commons-net to 3.7

https://commons.apache.org/proper/commons-net/changes-report.html#a3.7

Change-Id: Id440f13080593f9a977bba8c30a8f5e12f257585
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
3 years agoRealign checker-qual/error_prone-annotations to Guava 79/92579/6
Robert Varga [Tue, 22 Sep 2020 06:59:52 +0000 (08:59 +0200)]
Realign checker-qual/error_prone-annotations to Guava

Guava is the component pulling these two in, relocate their
declaration to Guava and re-align with what 29.0 is using.

Change-Id: I8b024ea437bd24936b28c4394c57f5ba8b1db318
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
3 years agoBump dropwizard-metrics to 4.1.12.1 72/92572/6
Robert Varga [Tue, 22 Sep 2020 06:22:17 +0000 (08:22 +0200)]
Bump dropwizard-metrics to 4.1.12.1

https://github.com/dropwizard/metrics/releases/tag/v4.1.10
https://github.com/dropwizard/metrics/releases/tag/v4.1.10.1
https://github.com/dropwizard/metrics/releases/tag/v4.1.11
https://github.com/dropwizard/metrics/releases/tag/v4.1.12
https://github.com/dropwizard/metrics/releases/tag/v4.1.12.1

Change-Id: I0236e27b8af2891613da8c69831933672b2f9fc2
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
3 years agoRemove Felix Dependency Manager declaration 78/92578/4
Robert Varga [Tue, 22 Sep 2020 06:51:29 +0000 (08:51 +0200)]
Remove Felix Dependency Manager declaration

This is an ancient way of dealing with OSGi and has been superseded
by other technologies, such as Blueprint and OSGi DS. The only
user downstream in AAA, hence let that project deal with versions.

Change-Id: I431deb2f857afdaf44301ecc5767546e6f5b9344
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
3 years agoUpgrade maven-bundle-plugin to 5.1.1 77/92577/4
Robert Varga [Tue, 22 Sep 2020 06:42:32 +0000 (08:42 +0200)]
Upgrade maven-bundle-plugin to 5.1.1

https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310100&version=12346016

Change-Id: I4d415f40e5bf39a96ea493f808f69b066f7daafe
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
3 years agoBump project-info-reports-plugin to 3.1.1 76/92576/4
Robert Varga [Tue, 22 Sep 2020 06:34:44 +0000 (08:34 +0200)]
Bump project-info-reports-plugin to 3.1.1

https://blogs.apache.org/maven/entry/apache-maven-project-info-reports1

Change-Id: I02e9314fc223026e183528dffca63539d025e2c6
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
3 years agoBump maven-archetype-plugin to 3.2.0 75/92575/4
Robert Varga [Tue, 22 Sep 2020 06:33:58 +0000 (08:33 +0200)]
Bump maven-archetype-plugin to 3.2.0

https://blogs.apache.org/maven/entry/apache-maven-archetype-plugin-version1

Change-Id: Iabbb80830bf37577b44b6a0c52374f6829ad7caf
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
3 years agoBump netty to 4.1.52.Final 74/92574/4
Robert Varga [Tue, 22 Sep 2020 06:32:42 +0000 (08:32 +0200)]
Bump netty to 4.1.52.Final

https://netty.io/news/2020/09/08/4-1-52-Final.html

Change-Id: Ibc21784d6c3b04662093ffaafabfe607b02ed2f3
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
3 years agoBump awaitility to 4.0.3 73/92573/3
Robert Varga [Tue, 22 Sep 2020 06:27:04 +0000 (08:27 +0200)]
Bump awaitility to 4.0.3

https://github.com/awaitility/awaitility/wiki/ReleaseNotes40

Change-Id: Ia8410699a5d467ea7c65bbf56179619dd669ecd6
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
3 years agoBump com.puppycrawl.tools/checkstyle to 8.36.1 71/92571/1
Robert Varga [Tue, 22 Sep 2020 06:18:59 +0000 (08:18 +0200)]
Bump com.puppycrawl.tools/checkstyle to 8.36.1

https://checkstyle.org/releasenotes.html#Release_8.35
https://checkstyle.org/releasenotes.html#Release_8.36
https://checkstyle.org/releasenotes.html#Release_8.36.1

Change-Id: Iff06ca1fff9735c7f234fae5697262bc7cdfc681
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
3 years agoBump mockito to 3.5.11 70/92570/1
Robert Varga [Tue, 22 Sep 2020 06:15:57 +0000 (08:15 +0200)]
Bump mockito to 3.5.11

There is a number of changes here, detailed in
https://github.com/mockito/mockito/blob/release/3.x/doc/release-notes/official.md

Change-Id: Idc2a74d27ddc1193f8efe09862ba28a673916162
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
3 years agoBump Guava to 29.0 49/92549/2
Robert Varga [Mon, 21 Sep 2020 08:46:47 +0000 (10:46 +0200)]
Bump Guava to 29.0

https://github.com/google/guava/releases/tag/v29.0

Change-Id: Icece615b53640449bb877ebfd885e23a787c083a
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
3 years agoRemove all Scala/Akka dependencies 89/92489/3
Robert Varga [Fri, 18 Sep 2020 21:00:12 +0000 (23:00 +0200)]
Remove all Scala/Akka dependencies

Akka has a next major release train, 2.6.x, which simply does not
work with OSGi unless we repackage it. Upstream is not interested
in fixing this problem and in fact is geared towards completely
removing OSGi support.

Completely remove any mention of Akka/Scala in odlparent, so that
controller and other downstreams can do their thing to use Akka
whichever way they see fit.

JIRA: ODLPARENT-243
Change-Id: Iab6fcd59d04cdd1abdefaa9f24d5582f28169fd4
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
3 years agoUpgrade SCR to 2.1.24 46/92546/1
Robert Varga [Fri, 18 Sep 2020 06:04:14 +0000 (08:04 +0200)]
Upgrade SCR to 2.1.24

https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310100&version=12348094
https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310100&version=12348738

JIRA: ODLPARENT-242
Change-Id: I53da147d6c9033731d2f59a9bbbfdb8987519f5f
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
(cherry picked from commit 3bb0c81a8aa91252560345fd84a320eff08013c2)
(cherry picked from commit 38391190fe9c7728ced353ef75bab6c4b29b5a8a)

3 years agoUpgrade xtend to 2.23.0 88/92488/2
Robert Varga [Fri, 18 Sep 2020 20:50:16 +0000 (22:50 +0200)]
Upgrade xtend to 2.23.0

https://www.eclipse.org/xtend/releasenotes.html#/releasenotes/2020/09/01/version-2-23-0

Change-Id: I8ae589f2a0593da1b54c8ffff90214c0b7b25ab4
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
3 years agoFix commons-codec upgrade 01/92501/1
Robert Varga [Sat, 19 Sep 2020 13:02:31 +0000 (15:02 +0200)]
Fix commons-codec upgrade

Karaf's standard feature references version 1.14, make sure we align
to 1.15.

Change-Id: I9e6fff0d6080eade2b51a30bf9cd1233e5c2efc7
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
3 years agoBump commons-io 2.7 → 2.8.0 38/92438/1
Stephen Kitt [Fri, 11 Sep 2020 07:21:58 +0000 (09:21 +0200)]
Bump commons-io 2.7 → 2.8.0

https://commons.apache.org/proper/commons-io/changes-report.html#a2.8.0

Change-Id: Icd73518adf49bd88525d3dff1c999b607f33fc59
Signed-off-by: Stephen Kitt <skitt@redhat.com>
3 years agoBump commons-codec 1.14 → 1.15 74/92374/1
Stephen Kitt [Wed, 2 Sep 2020 11:09:26 +0000 (13:09 +0200)]
Bump commons-codec 1.14 → 1.15

Release notes:
http://www.apache.org/dist/commons/codec/RELEASE-NOTES.txt

Change-Id: I2887edd6c5743e02e10ff5131d311728adf38d26
Signed-off-by: Stephen Kitt <skitt@redhat.com>
3 years agoRemove org.eclipse.persistence declarations 78/92178/1
Robert Varga [Tue, 18 Aug 2020 10:53:48 +0000 (12:53 +0200)]
Remove org.eclipse.persistence declarations

These declarations are used by neutron only, remove them so it can
manage them as needed.

JIRA: ODLPARENT-237
Change-Id: I4bcff83ad03d2d057aa95a5ebb33ec9d5009edd3
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
3 years agoRemove javax.json declaration 77/92177/2
Robert Varga [Tue, 18 Aug 2020 10:50:09 +0000 (12:50 +0200)]
Remove javax.json declaration

This declaration is not used anywhere except neutron, remove it
so that it can be properly managed there.

JIRA: ODLPARENT-238
Change-Id: I1b6f8a36f547f20d164dda82345f95f5a5aba196
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
3 years agoRemove jettison declaration 76/92176/2
Robert Varga [Tue, 18 Aug 2020 10:47:51 +0000 (12:47 +0200)]
Remove jettison declaration

This declaration is only used by lispflowmapping's integration
tests. Remove it.

JIRA: ODLPARENT-239
Change-Id: I3305fe8c62d0dcb624ee683d3c82a417e34fcc5f
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
3 years agoRemove mina-sshd declaration 75/92175/1
Robert Varga [Tue, 18 Aug 2020 10:46:13 +0000 (12:46 +0200)]
Remove mina-sshd declaration

This declaration conflicts with Karaf, and we only use it netconf,
where we completely shade the artifacts required. Remove odl-apache-sshd
feature and all related declarations.

JIRA: ODLPARENT-233
Change-Id: I4917c6d132cd50f5dc22343de1fe583d0e30d3b1
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
3 years agoBump versions to 8.0.0-SNAPSHOT 24/92024/1
Robert Varga [Tue, 11 Aug 2020 06:31:39 +0000 (08:31 +0200)]
Bump versions to 8.0.0-SNAPSHOT

This starts the next major version.

Change-Id: Ib2d4955a705c35279e1e58985f19ac31b81c6c3d
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
3 years agoBump xtend to 2.22.0 40/91840/1
Robert Varga [Tue, 4 Aug 2020 08:22:07 +0000 (10:22 +0200)]
Bump xtend to 2.22.0

https://www.eclipse.org/xtend/releasenotes.html#/releasenotes/2020/06/02/version-2-22-0

Change-Id: Ie2472d187a177a7daccde987583ebfd5e346b607
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
3 years agoBump commons-lang to 3.11 76/91676/3
Stephen Kitt [Mon, 27 Jul 2020 08:47:59 +0000 (10:47 +0200)]
Bump commons-lang to 3.11

https://downloads.apache.org/commons/lang/RELEASE-NOTES.txt

Change-Id: Ibcd57779a4fca35e9460e42145481a70f295e5f0
Signed-off-by: Stephen Kitt <skitt@redhat.com>
3 years agoBump commons-text to 1.9 77/91677/1
Stephen Kitt [Mon, 27 Jul 2020 09:31:14 +0000 (11:31 +0200)]
Bump commons-text to 1.9

https://commons.apache.org/proper/commons-text/changes-report.html#a1.9

Change-Id: I6540976070a634cfe8976167787894064bcfb0d7
Signed-off-by: Stephen Kitt <skitt@redhat.com>
3 years agoRequire all javadocs to be warning-free 76/91576/2
Robert Varga [Thu, 23 Jul 2020 08:12:25 +0000 (10:12 +0200)]
Require all javadocs to be warning-free

We have precious few javadocs, do not tolerate them being sloppy.

Change-Id: I35b53ca81ea0ac766a388b009adad5479ea9455e
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
3 years agoBump versions to 7.0.6-SNAPSHOT 33/91533/1
Robert Varga [Wed, 22 Jul 2020 09:28:45 +0000 (11:28 +0200)]
Bump versions to 7.0.6-SNAPSHOT

This starts the next development iteration.

Change-Id: I2295cb946c1aafb02452fcafeae6c7a2b4bd652a
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
3 years agoAdd news for odlparent-7.0.5 20/91520/1
Robert Varga [Wed, 22 Jul 2020 09:25:12 +0000 (11:25 +0200)]
Add news for odlparent-7.0.5

We have a single bug fix, add a summary.

Change-Id: Ib430ca7d6c41ffc9536a0fa7cf64049ded7d783a
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
3 years agoRemove packaging of epoll for aarch64 17/91517/1
Robert Varga [Wed, 22 Jul 2020 08:35:18 +0000 (10:35 +0200)]
Remove packaging of epoll for aarch64

This causes a regression on our primary platform. Revert support
until we package it properly.

JIRA: ODLPARENT-240
Change-Id: Ib01ca886d1fcd77605d747bcf13a6654a50ece00
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
3 years agoBump versions to 7.0.5-SNAPSHOT 71/91371/1
Robert Varga [Fri, 17 Jul 2020 11:26:36 +0000 (13:26 +0200)]
Bump versions to 7.0.5-SNAPSHOT

This starts the next development iteration.

Change-Id: I775b351bbc6ea136983b132daf93ef463e045d26
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
3 years agoAdd NEWS for 7.0.4 70/91370/1
Robert Varga [Fri, 17 Jul 2020 10:48:07 +0000 (12:48 +0200)]
Add NEWS for 7.0.4

Summarize the changes made in this release cycle in preparation
for release.

Change-Id: Iecc3b36b1e9da248c1efe47fe3b368c09f825b19
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
3 years agoBump triemap to 1.2.0 19/91319/2
Robert Varga [Tue, 14 Jul 2020 13:14:52 +0000 (15:14 +0200)]
Bump triemap to 1.2.0

https://github.com/PANTHEONtech/triemap/releases/tag/triemap-1.2.0

Change-Id: Ie064300dcc5dc80dbd657105f0510d012c096c04
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
3 years agoFixup dependency-check 20/91320/1
Robert Varga [Tue, 14 Jul 2020 13:25:53 +0000 (15:25 +0200)]
Fixup dependency-check

Netty upgrade updated bom location, update it in dependency-check.

Change-Id: I6b0b030f90a3a0bb77d686796f2ef5d0e083fc15
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
3 years agoAdd INFO.yaml for odlparent 53/91253/3
Anil Belur [Sun, 12 Jul 2020 01:11:46 +0000 (11:11 +1000)]
Add INFO.yaml for odlparent

Add initial import of project information.

Change-Id: I281b82d5222904dac69c7cce59e49ddf3e826525
Signed-off-by: Anil Belur <abelur@linuxfoundation.org>
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
3 years agoUpgrade Jersey to 2.27 83/90683/10
Robert Varga [Thu, 25 Jun 2020 06:25:33 +0000 (08:25 +0200)]
Upgrade Jersey to 2.27

Now that we have a more modern Karaf, with Jackson-2.10 and
javax.annotation-api-1.3.1, we should be able to upgrade to
JAX-RS 2.1 and Jersey-2.27.

https://eclipse-ee4j.github.io/jersey.github.io/release-notes/2.26.html
https://eclipse-ee4j.github.io/jersey.github.io/release-notes/2.27.html

JIRA: ODLPARENT-208
Change-Id: I57d583a160d2f40cc2c589ff7e5e89b736ae21e9
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
3 years agoBump netty to 4.1.51 43/89743/4
Robert Varga [Thu, 14 May 2020 08:25:35 +0000 (10:25 +0200)]
Bump netty to 4.1.51

Bump netty version and add native-epoll support on aarch64:
https://netty.io/news/2020/05/13/4-1-50-Final.html
https://netty.io/news/2020/07/09/4-1-51-Final.html

Change-Id: I2d3079426311a6132ddb68ee1625f08e95e6016a
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
3 years agoAdd jersey-media-sse to odl-jersey-2 36/91236/3
Robert Varga [Sat, 11 Jul 2020 18:58:57 +0000 (20:58 +0200)]
Add jersey-media-sse to odl-jersey-2

Netconf is interested in providing Server Sent Events, add the media
driver needed.

Change-Id: I1e7f45d225046fc4b4220f03050f8cea4fff8bb3
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
3 years agoAccess feature name/version only once 02/91002/1
Robert Varga [Wed, 8 Jul 2020 15:28:24 +0000 (17:28 +0200)]
Access feature name/version only once

Using multiple callouts here is a bit inefficient and does not
lend itself towards extension. Use local fields to store feature
name and version.

Change-Id: I298129691157ab787a50b25831d0cef88f6a14ed
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
3 years agoBump Bouncy Castle to 1.66 81/90981/2
Robert Varga [Wed, 8 Jul 2020 09:19:16 +0000 (11:19 +0200)]
Bump Bouncy Castle to 1.66

https://www.bouncycastle.org/releasenotes.html, which notes an
incompatible change around qTESLA -- which should not matter to us.

Change-Id: Icf25ec47a0dd4bfd948245a8405195c43c2fc8be
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
3 years agoClean up SFT use of assertions 62/90762/2
Robert Varga [Fri, 26 Jun 2020 15:12:45 +0000 (17:12 +0200)]
Clean up SFT use of assertions

This is a test, use proper static imports. Also remove use of
unneeded temporary variables.

Change-Id: Ic1e54121b3c328d8e4becfd3009239cb9d42a0a3
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
3 years agoBump checkstyle to 8.34 70/90870/1
Robert Varga [Thu, 2 Jul 2020 12:53:21 +0000 (14:53 +0200)]
Bump checkstyle to 8.34

https://checkstyle.org/releasenotes.html#Release_8.33
https://checkstyle.org/releasenotes.html#Release_8.34

Change-Id: I1ee26d400a553e0b340820aa2b35f2c32dcd1676
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
3 years agoBump maven-project-info-reports-plugin to 3.1.0 69/90869/1
Robert Varga [Thu, 2 Jul 2020 12:44:13 +0000 (14:44 +0200)]
Bump maven-project-info-reports-plugin to 3.1.0

https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12317821&version=12346620

Change-Id: I939a01d959fb5555bcdacedcb1d1cf495b1d8f7d
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
4 years agoAllow testing on JDK12+ 27/90727/1
Robert Varga [Fri, 26 Jun 2020 11:00:34 +0000 (13:00 +0200)]
Allow testing on JDK12+

Karaf does not support anything newer than 11, disable SFT on those
platforms to allow forward testing. We still issue a message.

Change-Id: I0ec67a4c85e961848fc71bb8c591902c0cc16259
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
4 years agoBump scala to 2.13.3 15/90715/2
Robert Varga [Thu, 25 Jun 2020 23:27:22 +0000 (01:27 +0200)]
Bump scala to 2.13.3

https://github.com/scala/scala/releases/tag/v2.13.3

Change-Id: Idafc4c72f06817a38261783bf4d6c78b3f85ee11
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
4 years agoBump maven-shade-plugin to 3.2.4 16/90716/2
Robert Varga [Thu, 25 Jun 2020 23:40:57 +0000 (01:40 +0200)]
Bump maven-shade-plugin to 3.2.4

https://blogs.apache.org/maven/entry/apache-maven-shade-plugin-version5

Change-Id: I7907a8b2bd6d8413256852abdba43b5fb94b205f
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
4 years agoupdate poms wiki URL 85/90685/1
guillaume.lambert [Thu, 25 Jun 2020 07:15:16 +0000 (09:15 +0200)]
update poms wiki URL

Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I2c84c7b855501014f6b9044ffdb8bf356787dc86

4 years agoUpdate README and CONTRIBUTING files 84/90684/1
guillaume.lambert [Thu, 25 Jun 2020 07:07:04 +0000 (09:07 +0200)]
Update README and CONTRIBUTING files

Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I39c3771849b0e9af23f830b0821d4431ac3feae9

4 years agoBump karaf to 4.2.9 99/90299/10
Robert Varga [Fri, 5 Jun 2020 12:59:16 +0000 (14:59 +0200)]
Bump karaf to 4.2.9

https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311140&version=12346465

Change-Id: Ice52bc39e3c43d9efdf3986ddde85fd8bbe83893
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
4 years agoUse TCP socket to communicate with Karaf in SFT 30/90430/2
Robert Varga [Fri, 12 Jun 2020 10:38:34 +0000 (12:38 +0200)]
Use TCP socket to communicate with Karaf in SFT

surefire-3.0.0-M5 finally implements proper separation of communication
channels, so that we do not get cross-talk from the forked process.

Use this version and TCP for communication with Karaf.

JIRA: ODLPARENT-179
Change-Id: I2954180c7085be56cf6e5bc574a5a380d0992c75
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
4 years agoSpecify karaf version 31/90431/2
Robert Varga [Fri, 12 Jun 2020 11:16:26 +0000 (13:16 +0200)]
Specify karaf version

We need karaf.version in SFT, as that is pointing to the correct
specs locator.

JIRA: ODLPARENT-228
Change-Id: Icc3f1ad024372b52efd4351069756b1dfefbb83d
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
4 years agoDrop ASM from dependency management 48/90348/1
Stephen Kitt [Tue, 9 Jun 2020 12:43:36 +0000 (14:43 +0200)]
Drop ASM from dependency management

Nothing in odlparent's dependencies relies on this; it seems
preferable to let Karaf control it.

Change-Id: Ib08c1575a9c07756c9b183bb08fbb59cca55cb34
Signed-off-by: Stephen Kitt <skitt@redhat.com>
4 years agoBump XBean to 4.17 44/90344/2
Robert Varga [Tue, 9 Jun 2020 10:56:05 +0000 (12:56 +0200)]
Bump XBean to 4.17

https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310312&version=12345583
https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310312&version=12345584
https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310312&version=12346905

Change-Id: I5710e92749722762cea2dbc423ebf1f28d00c244
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
4 years agoFixup wrong commons-io replacement 43/90343/1
Robert Varga [Tue, 9 Jun 2020 10:14:51 +0000 (12:14 +0200)]
Fixup wrong commons-io replacement

We should be replacing 2.6, not 2.7, with 2.7.

Change-Id: Icbd2ce38581b42029810c833d6786abf7acf5082
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
4 years agoBump to commons-io 2.7 26/90326/2
Stephen Kitt [Mon, 8 Jun 2020 07:39:10 +0000 (09:39 +0200)]
Bump to commons-io 2.7

Changes:
https://commons.apache.org/proper/commons-io/changes-report.html#a2.7

Change-Id: I987e2ad68fda1db63ff95bb82486df54cb8ade3c
Signed-off-by: Stephen Kitt <skitt@redhat.com>
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
4 years agoResync odlparent-dependency-check 00/90300/1
Robert Varga [Fri, 5 Jun 2020 13:13:08 +0000 (15:13 +0200)]
Resync odlparent-dependency-check

Dependency check is pointing to wrong versions, fix that up.

Change-Id: I9d22c690f02d38574c37b67839df807ab6ab86f8
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
4 years agoBump versions to 7.0.4-SNAPSHOT 95/90295/2
Robert Varga [Thu, 4 Jun 2020 21:07:07 +0000 (23:07 +0200)]
Bump versions to 7.0.4-SNAPSHOT

This starts the next development iteration.

Change-Id: I983050dbd23692021982fd9efdf82dda368bf4a0
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
4 years agoUpdate NEWS.rst for 7.0.3 94/90294/2
Robert Varga [Thu, 4 Jun 2020 21:05:48 +0000 (23:05 +0200)]
Update NEWS.rst for 7.0.3

Downstream integration has uncovered a few issues with Karaf
packaging. Update NEWS for upcoming 7.0.3 release.

Change-Id: Ib3efa574c4c98f3f87a2696b141988bcfce01d08
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
4 years agoUpgrade pax-logging to 1.11.6 92/90192/9
Robert Varga [Mon, 1 Jun 2020 13:59:34 +0000 (15:59 +0200)]
Upgrade pax-logging to 1.11.6

This upgrade log4j2, which is embedded from 2.13.0 to 2.13.2,
the best on offer. Issues fixed:

https://ops4j1.jira.com/browse/PAXLOGGING-308
https://ops4j1.jira.com/browse/PAXLOGGING-310
https://ops4j1.jira.com/browse/PAXLOGGING-311
https://ops4j1.jira.com/browse/PAXLOGGING-312

Change-Id: I870007ddda87d6af5a4d4143bcf91b1d314ec404
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
4 years agoUpgrade Felix SCR from 2.1.16 to 2.1.20 28/90228/5
Robert Varga [Wed, 3 Jun 2020 10:25:26 +0000 (12:25 +0200)]
Upgrade Felix SCR from 2.1.16 to 2.1.20

https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310100&version=12345045
https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310100&version=12348089

This upgrade is slated for Karaf-4.2.9, but we need it sooner as we
are hitting https://issues.apache.org/jira/browse/FELIX-6206 in
testing.

JIRA: ODLPARENT-236
Change-Id: If393d29e1a7c5dd392458dd278d2d8a92cdcf921
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
4 years agoFix typo in pax-logging configuration 91/90191/2
Robert Varga [Mon, 1 Jun 2020 13:35:40 +0000 (15:35 +0200)]
Fix typo in pax-logging configuration

pax-logging has changed packaged log4j2 during karaf-4.2.8 upgrade,
so that we are exposed to
https://issues.apache.org/jira/browse/LOG4J2-2219, which leads to
annoying message due to us using 'onMisMatch'.

Fix the configuration bit to 'onMismatch' to make things alright
again.

Change-Id: Iadeffa51232de48d23f6bb2d08e32ef6b4e72b03
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
4 years agoFix a NEWS typo 41/90141/1
Robert Varga [Sat, 30 May 2020 13:42:09 +0000 (15:42 +0200)]
Fix a NEWS typo

Scala was bumped to 2.13.2.

Change-Id: Ie96965078f8406338538880eeb1c55de57763508
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
4 years agoBump versions to 7.0.3-SNAPSHOT 30/90130/1
Robert Varga [Sat, 30 May 2020 01:28:44 +0000 (03:28 +0200)]
Bump versions to 7.0.3-SNAPSHOT

This starts the next development iteration.

Change-Id: Ideb3d3fbe6c81239e5e5d5f661e9d736e6a859cd
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
4 years agoUpdate NEWS.rst for 7.0.2 22/90122/2
Robert Varga [Fri, 29 May 2020 22:21:43 +0000 (00:21 +0200)]
Update NEWS.rst for 7.0.2

We have another chunk of updates, update release notes before
staging the release.

Change-Id: Icaa84a6036ffce3d8f2e3b2db74fd49d79251f1d
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
4 years agoFurther reductions to bundles-test-lib versions 25/90125/1
Robert Varga [Fri, 29 May 2020 22:40:54 +0000 (00:40 +0200)]
Further reductions to bundles-test-lib versions

Since we have bundles-test-lib declared, there is no point in
repeating the version declaration.

Change-Id: I1bf44a675cea34641854c0880ff2be63fc1f04e1
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
4 years agoDeclare bundles-test-lib in odlparent-artifacts 21/90121/1
Robert Varga [Fri, 29 May 2020 22:05:55 +0000 (00:05 +0200)]
Declare bundles-test-lib in odlparent-artifacts

infrautils is using an explicit version to get at this version,
let's make it easier for them.

Change-Id: Ic12f9613f457022fe895e9d638f55877501a0eb1
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
4 years agoAdd logging-markers to javadocs 20/90120/1
Robert Varga [Fri, 29 May 2020 22:00:57 +0000 (00:00 +0200)]
Add logging-markers to javadocs

Make sure our aggregate javadocs include logging-markers.

JIRA: ODLPARENT-231
Change-Id: I92ab5ee07b9b24f82b8708493f86f280fc2e79ed
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
4 years agoRetro-write powermock-2.0.6 to 7.0.0 release notes 36/90036/2
Robert Varga [Thu, 28 May 2020 13:22:28 +0000 (15:22 +0200)]
Retro-write powermock-2.0.6 to 7.0.0 release notes

Upgrade to powermock-2.0.6 is not mentioned anywhere, make sure
we mention it.

Change-Id: I7796bfab926e2f0300380d0cba7e437b903619cc
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
4 years agoBump powermock to 2.0.7 35/90035/2
Robert Varga [Thu, 28 May 2020 13:17:25 +0000 (15:17 +0200)]
Bump powermock to 2.0.7

https://github.com/powermock/powermock/blob/release/2.x/docs/release-notes/official.md#207

Change-Id: I74146dc9e0f3563bf349fe3f12b51286ae3044ce
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
4 years agoBump xmlunit to 2.7.0 34/90034/2
Robert Varga [Thu, 28 May 2020 13:13:53 +0000 (15:13 +0200)]
Bump xmlunit to 2.7.0

https://github.com/xmlunit/xmlunit/releases/tag/v2.6.4
https://github.com/xmlunit/xmlunit/releases/tag/v2.7.0

Change-Id: Ia150717cc1f87e84e7119066d0daac92f4fe66b2
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
4 years agoBump dropwizard-metrics from 4.1.5 to 4.1.9 33/90033/2
Robert Varga [Thu, 28 May 2020 13:07:10 +0000 (15:07 +0200)]
Bump dropwizard-metrics from 4.1.5 to 4.1.9

https://github.com/dropwizard/metrics/releases/tag/v4.1.6
https://github.com/dropwizard/metrics/releases/tag/v4.1.7
https://github.com/dropwizard/metrics/releases/tag/v4.1.8
https://github.com/dropwizard/metrics/releases/tag/v4.1.9

Change-Id: I438eebb494e8d91767588ad4cc8cd3728f4c1262
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
4 years agoBump checkstyle to 8.32 32/90032/2
Robert Varga [Thu, 28 May 2020 13:04:17 +0000 (15:04 +0200)]
Bump checkstyle to 8.32

https://checkstyle.org/releasenotes.html#Release_8.32

Change-Id: Ib39ccc1a9f14e879d9d6474c44a5667ae93f2efd
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
4 years agoBump enunciate to 2.13.1 30/90030/2
Robert Varga [Thu, 28 May 2020 12:32:25 +0000 (14:32 +0200)]
Bump enunciate to 2.13.1

https://github.com/stoicflame/enunciate/releases/tag/v2.13.0
https://github.com/stoicflame/enunciate/releases/tag/v2.13.1

Change-Id: I7de918566377da636e068052123e7686748fd960
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
4 years agoBump maven-remote-resources-plugin to 1.7.0 29/90029/2
Robert Varga [Thu, 28 May 2020 12:30:07 +0000 (14:30 +0200)]
Bump maven-remote-resources-plugin to 1.7.0

https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12317825&version=12331232

Change-Id: I8cc1def9e6ca4120952d9281c046dfd07ab36216
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
4 years agoBump maven-invoker-plugin to 3.2.1 28/90028/2
Robert Varga [Thu, 28 May 2020 12:28:13 +0000 (14:28 +0200)]
Bump maven-invoker-plugin to 3.2.1

https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12317525&version=12344863

Change-Id: I934444dba074332ecc51a0965a5e1f29e5264b3f
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
4 years agoBump maven assembly plugin to 3.3.0 27/90027/2
Robert Varga [Thu, 28 May 2020 12:24:20 +0000 (14:24 +0200)]
Bump maven assembly plugin to 3.3.0

https://blogs.apache.org/maven/entry/apache-maven-assembly-plugin-version1

Change-Id: I32407b9b3f8bed745bc55647414839a6f10136de
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
4 years agoBump duplicate finder 1.3.0 → 1.4.0 98/78298/7
Stephen Kitt [Thu, 29 Nov 2018 15:41:15 +0000 (16:41 +0100)]
Bump duplicate finder 1.3.0 → 1.4.0

This fixes the Byte Buddy duplicate class issue and means we can drop
our ignored class pattern.

Release notes:
https://github.com/basepom/duplicate-finder-maven-plugin/releases/tag/duplicate-finder-maven-plugin-1.4.0

Change-Id: If0c5218a7ec2aa121eff0e8dac4f551294a8ac5c
Signed-off-by: Stephen Kitt <skitt@redhat.com>
4 years agoBump to jackson-2.10.4, woodstox-6.2.1 33/89833/2
Robert Varga [Sat, 16 May 2020 20:26:39 +0000 (22:26 +0200)]
Bump to jackson-2.10.4, woodstox-6.2.1

https://github.com/FasterXML/jackson/wiki/Jackson-Release-2.10.3
https://github.com/FasterXML/jackson/wiki/Jackson-Release-2.10.4
https://github.com/FasterXML/woodstox/wiki/Woodstox-Release-6.2#620-25-apr-2020
https://github.com/FasterXML/woodstox/wiki/Woodstox-Release-6.2#621-13-may-2020

Change-Id: Idee671250dfacb131c9e88430d58d2289469ddba
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
4 years agoBump Log4J 2.13.2 → 2.13.3 30/89830/1
Stephen Kitt [Fri, 15 May 2020 11:38:49 +0000 (13:38 +0200)]
Bump Log4J 2.13.2 → 2.13.3

Changes:
https://logging.apache.org/log4j/2.x/changes-report.html#a2.13.3 (this
release fixes a NPE in ThreadContextDataInjector).

Change-Id: I2383040a7bb7858b8838322b7c85762560a4830b
Signed-off-by: Stephen Kitt <skitt@redhat.com>
4 years agoIntegrate logging-markers 42/89742/1
Robert Varga [Wed, 13 May 2020 21:32:58 +0000 (23:32 +0200)]
Integrate logging-markers

Previous patch did not completely integrate our logging markers,
this patch finishes the job by adding them to the baseline karaf-empty
distribution.

Furthermore add some documentation and move Markers into a separate
package, forming a proper JPMS module.

JIRA: ODLPARENT-231
Change-Id: I902d7b87c67fa84cc1f84bb06031952951f98a93
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
(cherry picked from commit 471914379dfe5abdc82654f2d37167135ca5c5bf)

4 years agoFix version, take 2 27/89627/1
Robert Varga [Thu, 7 May 2020 08:31:09 +0000 (10:31 +0200)]
Fix version, take 2

There actually were two releases, not one.

Change-Id: I0cda17c5f60fecbe106a9bce6b12730201b3744f
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
4 years agoFix version mismatch 26/89626/1
Robert Varga [Thu, 7 May 2020 08:27:13 +0000 (10:27 +0200)]
Fix version mismatch

Slight bug crept in due to TOCTOU race on versions. Fix that.

Change-Id: I1dc8cfee3ee3c019d1f14b4dd84af6c3e673910a
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
4 years agoUpgrade maven-antrun-plugin 79/89579/2
Robert Varga [Mon, 4 May 2020 08:35:33 +0000 (10:35 +0200)]
Upgrade maven-antrun-plugin

https://blogs.apache.org/maven/entry/apache-maven-antrun-plugin-version

Change-Id: I8e142435b13f484e89d631d5f0ef35a1d2bec4ed
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
4 years agoUpdate maven-shade-plugin to 3.2.3 78/89578/2
Robert Varga [Mon, 4 May 2020 08:32:43 +0000 (10:32 +0200)]
Update maven-shade-plugin to 3.2.3

https://blogs.apache.org/maven/entry/apache-maven-shade-plugin-version4

Change-Id: I8d70546bab0af4187b11170211e5fcededf41a02
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
4 years agoBump builder-helper-maven-plugin to 3.1.0 34/89534/2
Robert Varga [Thu, 30 Apr 2020 19:40:01 +0000 (21:40 +0200)]
Bump builder-helper-maven-plugin to 3.1.0

https://github.com/mojohaus/build-helper-maven-plugin/issues?q=is%3Aissue+milestone%3A3.1.0+is%3Aclosed

Change-Id: I4dac216ae3c319d42e8f210b9d8c1c23c39c3a9e
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
4 years agoRemove sonar/jacoco report configuration 06/89506/3
Robert Varga [Tue, 28 Apr 2020 21:58:58 +0000 (23:58 +0200)]
Remove sonar/jacoco report configuration

Sonar no longer supports binary jacoco reports, only XML reports.
We should not be setting the property to direct sonar, as it is
the caller's (Jenkins job's or operator's) responsibility to provide
correct pointer.

For old versions it should point to individual reports, for new
aggregates, such as MRI projects it should point to the aggregated
XML report (${project.root}/target/site/jacoco-aggregate/jacoco.xml).

Change-Id: I24e25513cf58bb8a9ad006037b4ebc9e72bc54dc
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
4 years agoAdd logging-markers artifact for marking sensitive logs 36/88536/7
Tibor Král [Thu, 19 Mar 2020 17:00:04 +0000 (18:00 +0100)]
Add logging-markers artifact for marking sensitive logs

Some logs might need to be filtered out or processed in
a different way. Log4j provides the Marker objects for
such cases. This artifact will provide set of markers
to be used by all child ODL projects.

JIRA: ODLPARENT-231
Change-Id: I6c7071f548806759799df489d9e93fdf19ef4643
Signed-off-by: Tibor Král <tibor.kral@pantheon.tech>
4 years agoBump Log4J2 2.13.1 → 2.13.2 10/89410/1
Stephen Kitt [Mon, 27 Apr 2020 07:34:20 +0000 (09:34 +0200)]
Bump Log4J2 2.13.1 → 2.13.2

This addresses CVE-2020-9488, affecting SMTPS appenders; see
https://issues.apache.org/jira/browse/LOG4J2-2819 for details.

Changes:
https://logging.apache.org/log4j/2.x/changes-report.html#a2.13.2

Change-Id: Id92ef4fc07db6329344c4cafb50957d898e8676b
Signed-off-by: Stephen Kitt <skitt@redhat.com>
4 years agoBump Scala to 2.13.2 00/89300/6
Robert Varga [Thu, 23 Apr 2020 06:24:54 +0000 (08:24 +0200)]
Bump Scala to 2.13.2

https://github.com/scala/scala/releases/tag/v2.13.2

Change-Id: Id34fd72fd37027a57bec3b3c34ef12bb21a825a0
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
4 years agoDo not pull odl-javassist-3 into odl-netty-4 04/89304/2
Robert Varga [Thu, 23 Apr 2020 07:34:43 +0000 (09:34 +0200)]
Do not pull odl-javassist-3 into odl-netty-4

Ever since netty-4.1.9 there was no optional support for Javassist,
as it was removed here:
https://github.com/netty/netty/commit/7d08b4fc357e12ee2487e87d8fdcbeee1152e5a0

Remove the unneeded dependency, lowering footprint a bit.

Change-Id: I162dfd336ab1b22d1e4d14456371b3d3b7decd42
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
4 years agoBump Netty to 4.1.49 03/89303/2
Robert Varga [Thu, 23 Apr 2020 07:19:08 +0000 (09:19 +0200)]
Bump Netty to 4.1.49

https://netty.io/news/2020/04/22/4-1-49-Final.html

Also use netty-bom to get all the declarations we may ever need
in a single import.

Change-Id: I17185a971f97e2fc2719d391f7cdf236d9f6dd41
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
4 years agoBump versions to 7.0.2-SNAPSHOT 86/88986/1
Robert Varga [Thu, 9 Apr 2020 06:25:03 +0000 (08:25 +0200)]
Bump versions to 7.0.2-SNAPSHOT

This starts the next development iteration.

Change-Id: Id1694fa0f8fddf5729603b8bdaa3f0b9e4be8494
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
4 years agoUpdate NEWS for 7.0.1 78/88978/2
Robert Varga [Wed, 8 Apr 2020 13:25:50 +0000 (15:25 +0200)]
Update NEWS for 7.0.1

Sum up the fixes we have in 7.0.1 prior to releasing it.

Change-Id: I2e46aaa8187c6b1ce209a94a4dded2f2121c8535
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
4 years agoBump xtend to 2.21.0 79/88979/1
Robert Varga [Wed, 8 Apr 2020 14:13:54 +0000 (16:13 +0200)]
Bump xtend to 2.21.0

https://www.eclipse.org/xtend/releasenotes.html#/releasenotes/2019/12/03/version-2-20-0
https://www.eclipse.org/xtend/releasenotes.html#/releasenotes/2020/03/03/version-2-21-0

Change-Id: I91b6e7f24b0c35feeff2955cf3c2bbf173116983
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
4 years agoFix commons-lang docs link 70/88970/1
Robert Varga [Wed, 8 Apr 2020 11:47:50 +0000 (13:47 +0200)]
Fix commons-lang docs link

docs is containing a separate links section, as we have still not
solved linking to external dependencies. Update commons-lang3 link
and add a few notes.

Change-Id: Ic1eda07299b8aafd7a133f6c80d26889b77a6840
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>