Michael Vorburger [Tue, 16 Jan 2018 01:38:02 +0000 (02:38 +0100)]
Exclude leveldb-api from odl-akka-leveldb-0.7
to fix this (correct) complaint from ClasspathHellDuplicatesCheckRule:
file:/.../org/iq80/leveldb/leveldb-api/0.7/leveldb-api-0.7.jar overlaps
with
file:/.../leveldbjni/leveldbjni-all/1.8-odl/leveldbjni-all-1.8-odl.jar
- total overlapping classes: 13 - same classloader ! This is an ERROR!
Change-Id: I929fb28606a8f6456747229ac2ceee6a90a9f04e
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
Signed-off-by: Stephen Kitt <skitt@redhat.com>
(cherry picked from commit
a16ccdc6a4f74e98c46cdd346577f5ae61cd6699)
Robert Varga [Thu, 25 Jan 2018 15:12:53 +0000 (16:12 +0100)]
metainf-services should be scope=provided
Feature generation picks up optional dependencies, leading to this
artifact being included in features, which is wrong, as it is
needed at build time only. Mark it at scope=provided to keep downstreams
from worrying about it.
Change-Id: I70fa32bf08a47c18efefa4d3a10e61558f8f62ac
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
(cherry picked from commit
cfd1cf6c23d21e27f95051dbf8b82c65342e1ea0)
Robert Varga [Fri, 12 Jan 2018 10:09:01 +0000 (11:09 +0100)]
Bump H2 database to 1.4.196
http://www.h2database.com/html/changelog.html
Change-Id: Ifb33c7d06c3ec27851276b1c42837c7285a97396
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
(cherry picked from commit
22c909d07d65c68f77ff9fdbcd1c36f72511457b)
Robert Varga [Thu, 25 Jan 2018 15:18:38 +0000 (16:18 +0100)]
Bump antlr to 4.7.1
https://github.com/antlr/antlr4/releases/tag/4.7.1
Change-Id: Ic6139e09043a70c22a72170d1ed4ddba3357ca25
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Fri, 24 Nov 2017 15:30:40 +0000 (16:30 +0100)]
Bump Guava to 23.6
https://github.com/google/guava/releases/tag/v23.4
https://github.com/google/guava/releases/tag/v23.5
https://github.com/google/guava/releases/tag/v23.6
Change-Id: I4b5e1619326e0d624be5743c5178da3447661f73
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
(cherry picked from commit
aba67d780238fc16cc6b8114a05201e78db4a22d)
Robert Varga [Fri, 24 Nov 2017 15:33:30 +0000 (16:33 +0100)]
Bump netty to 4.1.20
http://netty.io/news/2017/11/08/4-0-53-Final-4-1-17-Final.html
http://netty.io/news/2017/12/11/4-0-54-Final-4-1-18-Final.html
http://netty.io/news/2017/12/18/4-1-19-Final.html
http://netty.io/news/2018/01/22/4-0-55-Final-4-1-20-Final.html
Change-Id: I3b2328993299b2ee86ed643b22184a1ea09bbb35
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
(cherry picked from commit
75f122369fcc0d7b2673a5945e6df1726c72e67d)
Stephen Kitt [Tue, 23 Jan 2018 14:08:55 +0000 (15:08 +0100)]
Drop wrap from karaf4-parent
Including wrap in the boot features was a work-around and is no longer
necessary (all features requiring it now include it explicitly).
Change-Id: I061e201d590540d46f30157c6126196ff1add5ac
Signed-off-by: Stephen Kitt <skitt@redhat.com>
(cherry picked from commit
e95c9a2d1502f2475da837f495d737748c8ab5f6)
Robert Varga [Tue, 23 Jan 2018 13:45:37 +0000 (14:45 +0100)]
Bump versions to 3.1.0-SNAPSHOT
In preparation for 3.1.x branch, bump versions on master.
Change-Id: I568e9b5536809d5b90018862fb6c737cc0ead77d
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Tue, 16 Jan 2018 08:55:38 +0000 (09:55 +0100)]
Bump jersey-1.x to 1.19.4 and package it
Rather than relying on downstreams doing their own packaging
of jersey, provide proper package of basic dependencies in a feature.
Change-Id: I576008ca9e9d6673f5f5d3ffc4081d9943b634e7
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Tue, 28 Nov 2017 10:03:01 +0000 (11:03 +0100)]
Align jetty version with karaf
karaf is pulling in version 9.3.21, while we are advertizing
9.2.19 -- which leads to odl-karaf-feat-jetty not squashing
dependencies in features.
Change-Id: I914d9a3c2c83426d58e6d4f8f5def9d7d29f6114
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Sun, 7 Jan 2018 21:02:31 +0000 (22:02 +0100)]
Bump karaf to 4.1.4
https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=
12311140&version=
12341702
of which most notable is jetty version alignment.
Change-Id: I23d74258d40635d78b20c4c3fe9e61f3f1c8ddd2
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Michael Vorburger [Mon, 22 Jan 2018 18:48:03 +0000 (19:48 +0100)]
find-duplicate-classpath-entries in phase verify
instead of already during validate, because that's too early
https://lists.opendaylight.org/pipermail/odlparent-dev/2018-January/001597.html
https://lists.opendaylight.org/pipermail/odlparent-dev/2018-January/001589.html
Change-Id: I0e3ad52a3b8bc7175a2e98e320667a74001f54ae
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
Robert Varga [Thu, 18 Jan 2018 11:22:36 +0000 (12:22 +0100)]
Use jackson-bom to declare jackson dependencies
Importing jackson-bom declares all jackson components versions
in a consistent set.
Change-Id: I839db437eb965925b6a4cd3dd572e7e81df7e10f
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Michael Vorburger [Tue, 16 Jan 2018 22:42:47 +0000 (23:42 +0100)]
add org.osgi.compendium to features-test
fixes SFT bug ODLPARENT-136
java.lang.ClassNotFoundException:
org.osgi.service.resolver.ResolutionException
Change-Id: Ifaa39b35d1975ccd2aec15f6ed56191637f43d73
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
Stephen Kitt [Fri, 12 Jan 2018 10:20:24 +0000 (11:20 +0100)]
Start 3.0.3-SNAPSHOT
Change-Id: Ie676ecbb5c74d7db8654cecb56e25c51d9156f80
Signed-off-by: Stephen Kitt <skitt@redhat.com>
Stephen Kitt [Thu, 21 Dec 2017 09:30:20 +0000 (10:30 +0100)]
odlparent 3.0.2 release notes
Change-Id: Ic8bc02873149704d7673f2d8d594ffcd32416562
Signed-off-by: Stephen Kitt <skitt@redhat.com>
Stephen Kitt [Mon, 18 Dec 2017 16:30:32 +0000 (17:30 +0100)]
Use default upstream logging configuration
Now that Karaf uses Log4J2, our custom configuration no longer works;
this patch uses the default upstream setup for the time being.
Change-Id: I1786d9f50d60a030dc3b265fdb70dc5130806c1a
Signed-off-by: Stephen Kitt <skitt@redhat.com>
Robert Varga [Wed, 13 Dec 2017 06:09:24 +0000 (07:09 +0100)]
Bump javadoc plugin to 3.0.0
Proper release is now available, bump to it:
https://mail-archives.apache.org/mod_mbox/maven-announce/201712.mbox/%3Cop.zaufhhzukdkhrr%40desktop-2khsk44.mshome.net%3E
Change-Id: Icbb6bc02496e937320424a1ec8a4edac0ca09478
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Michael Vorburger [Wed, 6 Dec 2017 13:30:01 +0000 (14:30 +0100)]
Remove JavaDoc <links> from odlparent
because all of these, and more, are already in odlparent-lite now
see also https://jira.opendaylight.org/browse/ODLPARENT-121
This change does NOT fix that performance problem; only
change I4ca0c9e81985c2827e16654e9d9413c7d93f6068 does that,
whereas this one is just a clean up I stumbled upon.
Change-Id: Ifd66f318dfc3b900ad6fe06fa26e80932783cce8
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
Robert Varga [Wed, 13 Dec 2017 08:15:54 +0000 (09:15 +0100)]
Disable hiddenField check for abstract methods
There is a valid use case, where we are forwarding a private field
to an abstract method. This clearly does not hide the field, as it
is invisible to subclasses -- hence disable HiddenField on abstract
methods.
Change-Id: I00adfce58eea65660cae06649168a09a560713a4
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Stephen Kitt [Mon, 11 Dec 2017 14:35:30 +0000 (15:35 +0100)]
ODLPARENT-134: ensure correct startup with BC
In Karaf 4.1, Bouncy Castle no longer starts correctly; or rather,
loading kpix results in prov being refreshed, which restarts sshd and
most of Karaf.
This patch cleans up the startup.properties construction, and enforces
the correct order for Bouncy Castle. It also adds metatype and
blueprint.core.compatibility which must be loaded at boot to avoid
unwanted refreshes.
Change-Id: Ic8e8e0e932b9d9eaea292003118ef1936b67b822
Signed-off-by: Stephen Kitt <skitt@redhat.com>
Stephen Kitt [Wed, 6 Dec 2017 15:56:33 +0000 (16:56 +0100)]
Add a javadoc-links profile
... to build with external links (which adds substantial time to the
build).
Change-Id: Iea9adc7ed49ae39609ecd5d6bd012a35fe36fc81
Signed-off-by: Stephen Kitt <skitt@redhat.com>
Michael Vorburger [Wed, 6 Dec 2017 11:35:02 +0000 (12:35 +0100)]
Bump maven-enforcer-plugin 1.4.1 => 3.0.0-M1
https://mail-archives.apache.org/mod_mbox/maven-announce/201707.mbox/%3Cop.y37atexzkdkhrr%40desktop-2khsk44%3E
Change-Id: I290370bb6619a6fe7c809646995877f73dd891a7
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Stephen Kitt [Thu, 7 Dec 2017 16:44:20 +0000 (17:44 +0100)]
ODLPARENT-133: process conditional dependencies
Karaf 4.1 uses many more conditional dependencies in its features,
which results in a distribution missing many dependencies which we
actually need. This patch adds conditional bundle processing to
PopulateLocalRepoMojo, resulting in a distribution where all
dependencies are available, regardless of the conditions.
Change-Id: Ic9eb2befbed066a486603f28c38d32a7e951dd9f
Signed-off-by: Stephen Kitt <skitt@redhat.com>
Michael Vorburger [Wed, 6 Dec 2017 13:28:07 +0000 (14:28 +0100)]
Comment out JavaDoc <links> for build perf
see https://jira.opendaylight.org/browse/ODLPARENT-121
Change-Id: I4ca0c9e81985c2827e16654e9d9413c7d93f6068
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
Stephen Kitt [Mon, 4 Dec 2017 17:15:45 +0000 (18:15 +0100)]
Use getClass() in equals(), and simplify
Using getClass() enforces the equals() symmetry contract without
having to be careful with subclasses (which is fine since the classes
are final), and is also slightly faster.
Change-Id: I02dcb453c08f1139713b5d72629c2ab98c1ce86f
Signed-off-by: Stephen Kitt <skitt@redhat.com>
Stephen Kitt [Mon, 4 Dec 2017 17:02:31 +0000 (18:02 +0100)]
Avoid unnecessary copies of data structures
In BundleDiagInfosImpl, the constructor is private, and forContext
creates new instances of the collections stored in the resulting
object specifically for that object; there’s no point in making
immutable *copies*.
Change-Id: I453cd97e957248a6f074ce292e685470e2f6973c
Signed-off-by: Stephen Kitt <skitt@redhat.com>
Michael Vorburger [Tue, 28 Nov 2017 21:12:57 +0000 (22:12 +0100)]
BundleDiagInfos with getBundlesStateMap()
Allows infrautils.ready to offer infrautils.diagstatus per bundle infos
see https://jira.opendaylight.org/browse/INFRAUTILS-27
Change-Id: Ib2c529ac0d7d812148b8673c773d439e155c6224
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
Michael Vorburger [Tue, 28 Nov 2017 19:19:14 +0000 (20:19 +0100)]
bundles-test-lib with BundleDiagInfos
instead of BundleDiagInfosImpl (drop the *Impl, where possible)
Change-Id: I65046338016d77409e667a644f19bd3397ce8a0a
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
Michael Vorburger [Tue, 28 Nov 2017 17:36:41 +0000 (18:36 +0100)]
TestBundleDiag with configurable await logging
Allows infrautils.ready to make TestBundleDiag INFO log less verbose
The full list of NOK bundles during boot caused confusion, even if INFO
see https://jira.opendaylight.org/browse/INFRAUTILS-17
Change-Id: Iad1badb29e6a061812640a9182973d7c2b679836
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
Michael Vorburger [Mon, 27 Nov 2017 18:18:21 +0000 (19:18 +0100)]
Fix SFT for Archetype Self Test
This sets the Pax Exam URL Maven localRepository so that the
SingleFeatureTest of the Archetype in controller works, even if
there is a -Dmaven.repo.local=, such as on Gerrit.
see https://jira.opendaylight.org/browse/CONTROLLER-1799
Change-Id: Idd6126944518bab0fa0b886a7012ea94aba3126e
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
Stephen Kitt [Mon, 27 Nov 2017 09:47:27 +0000 (10:47 +0100)]
Start 3.0.2-SNAPSHOT
Change-Id: If127110ae6f0acc181966f748b5768f6461c1405
Signed-off-by: Stephen Kitt <skitt@redhat.com>
Stephen Kitt [Fri, 24 Nov 2017 14:47:26 +0000 (15:47 +0100)]
Release notes for 3.0.1
Change-Id: I2df6a518158836bc4e0d67e1e0bac721d8471a42
Signed-off-by: Stephen Kitt <skitt@redhat.com>
Robert Varga [Fri, 24 Nov 2017 13:49:28 +0000 (14:49 +0100)]
Workaround broken upstream features
hibernate-validator-osgi-karaf-features-[5.3.4,5.4.2) is broken
due to invalid maven URL reference. Add hard exception to fix it up.
Change-Id: I6cc28817b721fd7fa6f7dd940c82a4b80acb81c2
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Fri, 24 Nov 2017 13:09:06 +0000 (14:09 +0100)]
Pre-compile FeatureUtil replacement patterns
When we are discovering features, we end up converting a lot of URLs,
hence we end up recompiling the same patterns over and over again.
Rather than doing that, keep pre-compiled versions and reuse them.
Change-Id: I6b0b2b9e3c6ba9a13d20b7e16b4284feee222797
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Fri, 24 Nov 2017 11:47:42 +0000 (12:47 +0100)]
Add a test distribution to test karaf4-parent
This adds a simple distribution, containing just odl-guava.
Change-Id: I65a9d85238f358072d595e7523a17f2a6eab8fc6
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Stephen Kitt [Tue, 21 Nov 2017 13:48:04 +0000 (14:48 +0100)]
Start 3.0.1-SNAPSHOT
Change-Id: I9be70dcdef4b95a98095df72f7bb5e4eafb7ef59
Signed-off-by: Stephen Kitt <skitt@redhat.com>
Ryan Goulding [Tue, 7 Feb 2017 19:37:08 +0000 (14:37 -0500)]
Bug 7756 Bind web services to single port
Right now, we mirror web service offerings on ports 8080 and 8181.
There has been much discussion surrounding consolidating on a single
port. See these email threads:
https://lists.opendaylight.org/pipermail/release/2017-February/009244.html
https://lists.opendaylight.org/pipermail/controller-dev/2016-September/012677.html
Based on community feedback, it would appear that most people utilize
port 8181, and it would take a LOT of work to change that. Thus, this
change removes the port 8080 offering. If downstream consumers still
wish to use web services on port 8080, then can simply re-add the
connector in etc/jetty.xml without recompiling (will require karaf
container restart to reinitialize pax-web).
This is just a change to the default offering, and makes the ODL
platform a bit more consistent OOB.
Change-Id: I62ccf4a8f9719c7923f06204955239ceea8a780f
Signed-off-by: Ryan Goulding <ryandgoulding@gmail.com>
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Signed-off-by: Daniel Farrell <dfarrell@redhat.com>
Stephen Kitt [Fri, 10 Nov 2017 10:41:51 +0000 (11:41 +0100)]
ODL Parent 3.0.0 release notes
... and supporting Sphinx framework.
Change-Id: Ifa6a8ec9f159aa855868509de588d30f671d2680
Signed-off-by: Stephen Kitt <skitt@redhat.com>
Michael Vorburger [Wed, 15 Nov 2017 15:13:23 +0000 (16:13 +0100)]
Add missing M2E lifecycle mappings metadata
* Ignore for the duplicate-finder-maven-plugin
Not sure why I have to repeat here what I had done back in January in
https://github.com/vorburger/opendaylight-eclipse-setup/commit/
abf867c9a1e58686b79214c9381adcb0e224b3b6
but I can only strongly encourage all ODL developers using Eclipse to
use the opendaylight-eclipse-setup model.
also make bundles-test-lib enable the dupe CP finder (and PMD CPD),
because that actually made the problem appear under Eclipse within
odlparent - after manually locally removing the equivalent in
lifecycle-mapping-metadata.xml by opendaylight-eclipse-setup.
see also I3498cc5f3af7481cd83b4f7f69045d19668fd1da
Change-Id: I2bfbfc05600814df1fa5c866e1db3cbe2576959c
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
Michael Vorburger [Wed, 15 Nov 2017 15:02:50 +0000 (16:02 +0100)]
Add missing M2E lifecycle mappings metadata
* Ignore for the karaf-maven-plugin
This change does intentionally NOT include a lifecycle mapping for the
(new) spotbugs-maven-plugin, because that's one which we do NOT want to
just IGNORE, but have to configure; re. that one, please watch
https://github.com/m2e-code-quality/m2e-code-quality/issues/110
FTR: Originally I started putting these (only) into
opendaylight-eclipse-setup, because "such Eclipse specifics should not
be in our POM", but today on IRC rovarga opined that "it should 'just
work' even if one doesn't want to use your opendaylight-eclipse-setup"
but why? its great!] so putting there here now - meaning we have a bit
of a mix now, but I guess this isn't the end of the world.
see https://github.com/vorburger/opendaylight-eclipse-setup#how-to-add-additional-m2e-lifecycle-mapping
Change-Id: I3498cc5f3af7481cd83b4f7f69045d19668fd1da
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
Stephen Kitt [Wed, 15 Nov 2017 08:30:14 +0000 (09:30 +0100)]
Dependency check: avoid dependency loops
Exclude all org.opendaylight dependencies to avoid introducing
dependency loops with dependency management on third-party artifacts
re-packaged in ODL projects.
Change-Id: I19a235e395f4b8e89e86a054d4e266cc8e101905
Signed-off-by: Stephen Kitt <skitt@redhat.com>
Robert Varga [Wed, 18 Oct 2017 11:46:10 +0000 (13:46 +0200)]
BUG-9202: update maven-javadoc-plugin
Required to make build work with Java 9, release notes are at
https://mail-archives.apache.org/mod_mbox/maven-announce/201707.mbox/%3Cop.y3p20je4kdkhrr%40desktop-2khsk44%3E
Change-Id: I46d348026a41587a04ebc6508fcc649dd5be9a48
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Stephen Kitt [Wed, 15 Nov 2017 09:06:36 +0000 (10:06 +0100)]
SFT needs Karaf branding
For some reason SFT now needs our Karaf branding. We should fix this
so that it’s no longer the case — see
https://jira.opendaylight.org/browse/ODLPARENT-130 — but in the
interest of getting odlparent 3.0.0 out, this adds an explicit test
dependency.
Change-Id: I548e421a63073503be47d239cd9536306ab92bd9
Signed-off-by: Stephen Kitt <skitt@redhat.com>
Stephen Kitt [Thu, 9 Nov 2017 17:09:39 +0000 (18:09 +0100)]
Add a dependency check to validate management
To avoid issues such as the invalid uncommon-maths version bump, add a
module whose sole purpose is to depend on all artifacts specified in
dependency management in odlparent. This ensures that the artifacts
are actually available.
Remove two artifacts which don’t exist (and aren’t used anywhere):
* ssl-config-akka_2.12
* jetty-servlet-tester
Change-Id: Ia18132fb45eb5f87afdc0d63ac3fff4f2caaf04c
Signed-off-by: Stephen Kitt <skitt@redhat.com>
Stephen Kitt [Fri, 10 Nov 2017 17:32:54 +0000 (18:32 +0100)]
Don’t exclude pax-url-commons from pax-url-wrap
Excluding pax-url-commons from pax-url-wrap means that anything
depending on -wrap without -aether fails (including karaf-plugin).
Change-Id: I861f63caac4fdf6405174df4e05e6242d747b2b5
Signed-off-by: Stephen Kitt <skitt@redhat.com>
Michael Vorburger [Thu, 9 Nov 2017 17:36:01 +0000 (18:36 +0100)]
Remove io.dropwizard.metrics dependencyManagement
https://lists.opendaylight.org/pipermail/odlparent-dev/2017-November/001460.html
for https://jira.opendaylight.org/browse/INFRAUTILS-19
Change-Id: I0ce0e4b7ad54e171c061e1bb91d568b25e9d1145
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
Michael Vorburger [Mon, 23 Jan 2017 21:41:14 +0000 (22:41 +0100)]
Fail build if classpath contains duplicates
duplicate-finder-maven-plugin fails build if duplicate classpath entries
see https://github.com/basepom/duplicate-finder-maven-plugin/
This is currently not enforced, but projects opt-in to this quality via:
<properties><duplicate-finder.skip>false
FTR: There are a few other tools in this space, incl. e.g.
http://www.mojohaus.org/extra-enforcer-rules/banDuplicateClasses.html
and http://tattletale.jboss.org/ and http://jhades.github.io, but
duplicate-finder-maven-plugin fits best here.
See https://git.opendaylight.org/gerrit/#/c/50851/ for a related util.
Bug: 7662
Change-Id: I79142549ba7c739ce39285d35f179172d7b099a6
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
Robert Varga [Tue, 7 Nov 2017 02:12:21 +0000 (03:12 +0100)]
Bump jacoco to 0.7.9
https://github.com/jacoco/jacoco/releases/tag/v0.7.8
https://github.com/jacoco/jacoco/releases/tag/v0.7.9
Change-Id: Iced1a38897da53fcf80d2cde4ee76baa93cd8242
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Stephen Kitt [Tue, 7 Nov 2017 16:07:35 +0000 (16:07 +0000)]
Revert "Checkstyle InnerAssignment"
This reverts commit
c115daf2f2548b49b505a12fb3ab26c7e096dd8c.
The Checkstyle InnerAssignment check only handles a subset of cases,
which ends up being confusing.
(E.g. while() { }, but not do { } while().)
Change-Id: I813679f18214e8729bc588ae4e0987579b0e3786
Signed-off-by: Stephen Kitt <skitt@redhat.com>
Stephen Kitt [Wed, 8 Nov 2017 09:28:47 +0000 (09:28 +0000)]
Revert "Bump Uncommons Maths 1.2.2a → 1.2.3"
This reverts commit
cf236575fa87a2928bb83393bb9e5355b8eedd01.
Version 1.2.3 isn’t available on Maven Central...
Change-Id: If524032a85f17dee7a553e5e27cdeb9816904af6
Signed-off-by: Stephen Kitt <skitt@redhat.com>
Michael Vorburger [Sat, 4 Nov 2017 03:15:10 +0000 (04:15 +0100)]
Revert "Checkstyle TrailingComment, Sonar aligned"
This reverts commit
f7680f6a688e26e28515c907328c52d0a35a4515.
This code format convention is actually stupid IMHO after all.
For example, I really do like this a lot more:
@SuppressFBWarnings("SE_BAD_FIELD") // Runnable is not Serializable
private final TrackingLinkedBlockingQueue<Runnable> backingQueue;
than being forced by Checkstyle to have to write this:
// Runnable is not Serializable
@SuppressFBWarnings("SE_BAD_FIELD")
private final TrackingLinkedBlockingQueue<Runnable> backingQueue;
We should change Sonar's configuraiton, not enforce this in odlparent.
Change-Id: Ib3a8708a7a4b43bb72859f69aca33aafb8b6080c
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
Robert Varga [Fri, 27 Oct 2017 11:27:08 +0000 (13:27 +0200)]
Bump scala to 2.12.4
https://github.com/scala/scala/releases/tag/v2.12.4
Change-Id: Id179520eb109053dd99197f5f9665d6be6d40bab
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Tue, 7 Nov 2017 01:55:14 +0000 (02:55 +0100)]
Add -Xlint:deprecation
We do need to clean up callers of deprecated methods. Make sure
we emit details during build.
Change-Id: I3259edafcf0f54b087b38f5270cf67009a0fd885
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Stephen Kitt [Fri, 3 Nov 2017 15:11:39 +0000 (16:11 +0100)]
Bump Awaitility 2 → 3
Release notes:
https://github.com/awaitility/awaitility/wiki/ReleaseNotes30
Change-Id: Iee993116d976a6f61104681e055e8d5f60575895
Signed-off-by: Stephen Kitt <skitt@redhat.com>
Stephen Kitt [Fri, 3 Nov 2017 15:09:08 +0000 (16:09 +0100)]
Bump Felix dependencies
Dependency Manager 4.3.0 → 4.4.1
Dependency Manager Shell 4.0.4 → 4.0.6
Metatype 1.1.2 → 1.1.6
Release notes are few and far between...
Change-Id: Ib13e01ad62ba31d30b8efe20fab10d1564337bd7
Signed-off-by: Stephen Kitt <skitt@redhat.com>
Michael Vorburger [Sun, 5 Nov 2017 11:19:21 +0000 (12:19 +0100)]
maven-compiler-plugin showWarnings
This won't break anything, just spew a few more logs, which MAYBE *some*
people will start looking it. I will be enabled with the upcoming
proposed error-prone integration anyway, so we may as well make a start
with it now, even before getting error-prone in.
Change-Id: Ica17b1a250562c0f083ed252d921dc86278abd3b
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
Stephen Kitt [Fri, 3 Nov 2017 12:55:31 +0000 (13:55 +0100)]
Bump webcohesion enunciate 2.6.0 → 2.10.1
Release notes: https://github.com/stoicflame/enunciate/releases
Change-Id: Id60106cd18b822eb84589bc4bf7c2e9e35c577e8
Signed-off-by: Stephen Kitt <skitt@redhat.com>
Stephen Kitt [Fri, 3 Nov 2017 14:44:32 +0000 (15:44 +0100)]
Remove obsolete dependency management entries
Remove a number of dependencies which are no longer used:
* xml-apis
* Xerces
* txw2
* Eclipse Link
* Gemini Web
* Orbit
* Felix File Install and Web Console
* Equinox HTTP service bridge
* Chameleon MBeans
* Spring Framework
Change-Id: Icbc4368941f109e7b835323b2dfbcef0b335e8bb
Signed-off-by: Stephen Kitt <skitt@redhat.com>
Michael Vorburger [Wed, 1 Nov 2017 10:47:15 +0000 (11:47 +0100)]
Checkstyle InnerAssignment
see http://checkstyle.sourceforge.net/config_coding.html#InnerAssignment
Change-Id: Icaaaa3ff3a08843b2ed1bf013edf7110b49b547c
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
Stephen Kitt [Fri, 3 Nov 2017 15:54:27 +0000 (16:54 +0100)]
Bump Uncommons Maths 1.2.2a → 1.2.3
This version adds OSGi bundle information:
https://maths.uncommons.org/changelog.php
Change-Id: I379e8d857f936f4471a1529adb0f3cc363d20d3e
Signed-off-by: Stephen Kitt <skitt@redhat.com>
Stephen Kitt [Thu, 2 Nov 2017 16:55:43 +0000 (17:55 +0100)]
Bump logback 1.2.2 → 1.2.3
Release notes: https://logback.qos.ch/news.html
Change-Id: If03272caf0a419541d1e4203539a83b85622737b
Signed-off-by: Stephen Kitt <skitt@redhat.com>
Stephen Kitt [Thu, 2 Nov 2017 16:58:58 +0000 (17:58 +0100)]
Bump gson 2.7 → 2.8.2
Release notes: https://github.com/google/gson/blob/master/CHANGELOG.md
Change-Id: If6c7369442a68ce9d2545010335cb422d2f45238
Signed-off-by: Stephen Kitt <skitt@redhat.com>
Stephen Kitt [Fri, 3 Nov 2017 10:39:21 +0000 (11:39 +0100)]
Bump lmax disruptor 3.3.6 → 3.3.7
Release notes: https://github.com/LMAX-Exchange/disruptor/releases/tag/3.3.7
Change-Id: I0fd240efa3d24fb524961cfed01ebf091650adb7
Signed-off-by: Stephen Kitt <skitt@redhat.com>
Stephen Kitt [Fri, 3 Nov 2017 12:57:33 +0000 (13:57 +0100)]
Bump commons-fileupload 1.3.2 → 1.3.3
Release notes:
http://www.apache.org/dist/commons/fileupload/RELEASE-NOTES.txt
Change-Id: Ic18fec72aea51fe33debd160b03d984e512ecbed
Signed-off-by: Stephen Kitt <skitt@redhat.com>
Stephen Kitt [Fri, 3 Nov 2017 12:58:57 +0000 (13:58 +0100)]
Bump commons-io 2.5 → 2.6
Release notes: http://www.apache.org/dist/commons/io/RELEASE-NOTES.txt
This version is now a Java 9 module.
Change-Id: Ie5ca856b636347927d4bf9e3d1fd824d79b02a8d
Signed-off-by: Stephen Kitt <skitt@redhat.com>
Stephen Kitt [Fri, 3 Nov 2017 15:49:29 +0000 (16:49 +0100)]
Bump JSONassert 1.3.0 → 1.5.0
Release notes: https://github.com/skyscreamer/JSONassert/releases
Change-Id: I5d066a5168a22d1b56b61e19d9582deacf9f21a9
Signed-off-by: Stephen Kitt <skitt@redhat.com>
Stephen Kitt [Fri, 3 Nov 2017 15:52:07 +0000 (16:52 +0100)]
Bump SLF4J 1.7.21 → 1.7.25
Release notes: https://www.slf4j.org/news.html
Change-Id: I8092ba8f07824c8433774898c24d25d5e3510680
Signed-off-by: Stephen Kitt <skitt@redhat.com>
Stephen Kitt [Fri, 3 Nov 2017 15:59:23 +0000 (16:59 +0100)]
Bump Karaf 4.1.2 → 4.1.3
Change-Id: Ia3eb52ca11cc3e3e870badf469ef8ead7294d031
Signed-off-by: Stephen Kitt <skitt@redhat.com>
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Tue, 19 Sep 2017 09:08:07 +0000 (11:08 +0200)]
BUG-8258: Bump karaf 4.1.2
This is a straightforward upgrade from 4.0.9 to 4.1.2 and will need
to be updated to 4.1.3.
Change-Id: I9275dd42e53dec3e46bc169b6aafb5cb75b40753
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Signed-off-by: Stephen Kitt <skitt@redhat.com>
Stephen Kitt [Fri, 3 Nov 2017 14:58:17 +0000 (15:58 +0100)]
Bump Coda Hale Metrics 3.1.2 → 3.2.3
Release notes:
http://metrics.dropwizard.io/3.2.3/about/release-notes.html
Change-Id: I723e77d1907fc6dde8724f8236ee9c545a20ebbe
Signed-off-by: Stephen Kitt <skitt@redhat.com>
Stephen Kitt [Fri, 3 Nov 2017 10:47:02 +0000 (11:47 +0100)]
Bump checkstyle 8.2 → 8.4
Release notes:
http://checkstyle.sourceforge.net/releasenotes.html#Release_8.4
Change-Id: Ibf0f3079d0c7911c1106d8dbbbf7a4f32037dc8b
Signed-off-by: Stephen Kitt <skitt@redhat.com>
Stephen Kitt [Tue, 31 Oct 2017 14:50:20 +0000 (15:50 +0100)]
Add support for local feature files
Karaf 4.1 introduces local feature files for some dependencies. This
patch adjusts populate-local-repo so that it copes with them instead
of crashing.
Change-Id: Ia709011d928abd4994346fde5002c3ff35fe874a
Signed-off-by: Stephen Kitt <skitt@redhat.com>
Stephen Kitt [Fri, 3 Nov 2017 15:15:29 +0000 (16:15 +0100)]
Bump Xtend 2.12 → 2.13
Release notes: https://www.eclipse.org/xtend/releasenotes.html
Change-Id: I97f878b8904dc83b04c78e9759d38adf48116b64
Signed-off-by: Stephen Kitt <skitt@redhat.com>
Stephen Kitt [Fri, 3 Nov 2017 10:21:11 +0000 (11:21 +0100)]
Bump Google Truth 0.28 → 0.36
Release notes: https://github.com/google/truth/releases
This also enables the Java 8 extensions.
Change-Id: If374852847f0669d03cd08f6a541465cfbc6bd95
Signed-off-by: Stephen Kitt <skitt@redhat.com>
Robert Varga [Thu, 2 Nov 2017 10:13:13 +0000 (11:13 +0100)]
Bump guava to 23.3-jre
https://github.com/google/guava/releases/tag/v23.3
Change-Id: I887206256c1f4ed611dc350eac3bf887fab6f72e
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Michael Vorburger [Wed, 1 Nov 2017 10:50:35 +0000 (11:50 +0100)]
Checkstyle HiddenField
see http://checkstyle.sourceforge.net/config_coding.html#HiddenField
Change-Id: I7c25835837e63a9580a9f870d2c1d7cef9e2f57d
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
Michael Vorburger [Wed, 29 Jun 2016 23:01:16 +0000 (01:01 +0200)]
Checkstyle TrailingComment, aligned with Sonar
http://checkstyle.sourceforge.net/config_misc.html#TrailingComment
Change-Id: I063cc5b40b561292d3d412d595669851b29951bb
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
Robert Varga [Wed, 18 Oct 2017 11:42:10 +0000 (13:42 +0200)]
BUG-9201: bump maven-enforcer-plugin to 3.0.0-M1
This is required for building with Java 9. Release notes are at:
http://maven.40175.n5.nabble.com/ANN-Apache-Maven-Enforcer-Plugin-3-0-0-M1-Released-td5911744.html
Change-Id: I4b32b3703efea41aed8e3e685896c8fcbd13b4f9
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Wed, 18 Oct 2017 11:56:13 +0000 (13:56 +0200)]
BUG-9200: upgrade maven-shade-plugin
Version 3.1.0 is required for Java 9, release notes at:
https://mail-archives.apache.org/mod_mbox/maven-announce/201708.mbox/raw/%3Cop.y5d393zfkdkhrr%40desktop-2khsk44.dynamic.ziggo.nl%3E/
Change-Id: I5892cba22d1f50708b219aaee35be5ed2af2d2ec
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Wed, 18 Oct 2017 11:49:28 +0000 (13:49 +0200)]
BUG-9200: update failsafe/surefire plugin version
Version 2.20.1 is required to support Java 9, changelogs are at
https://mail-archives.apache.org/mod_mbox/maven-announce/201709.mbox/%3CCAKuVzBTt6gPWkjDS7AcLBKj7C1i9C7CgjRa3s0mQ0S-P%3D3CiiQ%40mail.gmail.com%3E
Change-Id: I08c48631b3ddcec3d36476e759d16f49a1c0a70f
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Stephen Kitt [Mon, 23 Oct 2017 08:17:57 +0000 (10:17 +0200)]
Bump commons-codec 1.10 → 1.11
Release notes: http://www.apache.org/dist/commons/codec/RELEASE-NOTES.txt
Change-Id: I402e984c90e9f59b65c06244a8bade3e2156db6c
Signed-off-by: Stephen Kitt <skitt@redhat.com>
Thanh Ha [Mon, 30 Oct 2017 20:45:42 +0000 (16:45 -0400)]
Remove deploy-site.xml
With the javadoc jobs now available to generate javadoc it is time to
remove the maven-sites and related files.
Change-Id: If751fe5cf6c4b122063699f4ac234c25fc8daffb
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
Michael Vorburger [Mon, 30 Oct 2017 18:22:16 +0000 (19:22 +0100)]
Switch bundles4-test from FindBugs to SpotBug
Change-Id: I4d4a92d3800a1b23705f8cac3d24c44dfcc01950
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
Stephen Kitt [Wed, 11 Oct 2017 02:28:08 +0000 (19:28 -0700)]
Add SpotBugs dependencies
SpotBugs is the maintained replacement for FindBugs, which has been
abandoned. See https://spotbugs.github.io/ for details.
This patch is phase 1 of the (long-term) migration from FindBugs to
SpotBugs: it adds the spotbugs-maven-plugin to plugin management with
the appropriate version specifications and default configuration.
Change-Id: I29a47604bdd25a20dc0fe56f41cd0083ad934e13
Signed-off-by: Stephen Kitt <skitt@redhat.com>
Robert Varga [Wed, 18 Oct 2017 14:47:28 +0000 (16:47 +0200)]
Bump Guava to 23.2-jre
https://github.com/google/guava/releases/tag/v23.1
https://github.com/google/guava/releases/tag/v23.2
Change-Id: I6c9992ad6caf1810359a79203038aaf79a5c8eb5
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Stephen Kitt [Wed, 18 Oct 2017 11:50:57 +0000 (13:50 +0200)]
Exclude jsr305 from guava-testlib
... in the same way as for guava itself. Otherwise our own enforcer
fails builds...
Change-Id: Ibecbbf48c9045c290d439f3666f01fde519b842f
Signed-off-by: Stephen Kitt <skitt@redhat.com>
Stephen Kitt [Mon, 16 Oct 2017 07:53:35 +0000 (09:53 +0200)]
Bump pax-url 2.5.2 → 2.5.3
Release notes:
https://ops4j1.jira.com/browse/PAXURL-345?jql=project%20%3D%20PAXURL%20AND%20fixVersion%20%3D%202.5.3
(in particular, this addresses CVE-2015-5262).
Change-Id: I2c7bfdb9139ae15573fc9d92f47d28a14ef0e345
Signed-off-by: Stephen Kitt <skitt@redhat.com>
Robert Varga [Tue, 10 Oct 2017 08:38:43 +0000 (10:38 +0200)]
Bump netty to 4.1.16
http://netty.io/news/2017/09/25/4-0-52-Final-4-1-16-Final.html
Change-Id: I327ac3968dd3421a20f514a70a25002f7aebfbd5
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Tue, 10 Oct 2017 08:09:52 +0000 (10:09 +0200)]
Bump reactive-streams to 1.0.1
No changes, just clarifications according to
http://www.reactive-streams.org/announce-1.0.1
Change-Id: I9932ef2ede27cce4bae61ab7332c3f5746e2e27e
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Ryan Goulding [Fri, 29 Sep 2017 18:16:04 +0000 (14:16 -0400)]
Bug 9229: Bump bouncycastle from 1.57 to 1.58
Release notes can be found here:
https://www.bouncycastle.org/releasenotes.html
Change-Id: Ie686001b8f02a08ee9f94a8e34c8079a8222366d
Signed-off-by: Ryan Goulding <ryandgoulding@gmail.com>
Michael Vorburger [Fri, 29 Sep 2017 04:12:28 +0000 (06:12 +0200)]
Bug 9169: Bump jdt.annotation from 2.0.0 to 2.1.0
Most importantly, this introduces a handy util for legacy interop
org.eclipse.jdt.annotation.Checks; see its JavaDoc on:
https://help.eclipse.org/neon/index.jsp?topic=%2Forg.eclipse.jdt.doc.isv%2Freference%2Fapi%2Forg%2Feclipse%2Fjdt%2Fannotation%2FChecks.html
Full git change log with more details available on
https://gist.github.com/vorburger/
0479be76f9cd3d10aa5ef86d4034a090
I'm starting to explore using org.eclipse.jdt.annotation more, and want
to have its latest version at my disposal for this. This is part of
https://git.opendaylight.org/gerrit/#/c/47370/ but that's bigger and
still WIP and it would be great if you would agree to get this one in
already now.
This should be very low risk and not break anything anywhere.
Change-Id: Ib1f6389cc0929e08d1585efc7bdc5e75097a3544
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
Michael Vorburger [Thu, 28 Sep 2017 23:37:28 +0000 (01:37 +0200)]
Bump maven-compiler-plugin from 3.6.1 to 3.7.0
This also removes a number of uses of the
maven-compiler-plugin and maven-surefire-plugin
from project with odlparent-lite as parent, which
should not require these two plugins.
Change-Id: Iec5ad374633903cdcda6344eb736ec337f727a1d
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
Ryan Goulding [Fri, 29 Sep 2017 18:09:58 +0000 (14:09 -0400)]
Bug 9228: Package bcprov-ext-jdk15on jar
Bouncycastle is hotwired as the default JCE provider in ODL
since it has greater capabilities than those provided with
the default Oracle and OpenJDK JCE implementations. This
change adds an overlooked and missing jar to the existing
provider infra.
Change-Id: I16cdab1d838285b3d690c61ae9fb3586e8cc69d3
Signed-off-by: Ryan Goulding <ryandgoulding@gmail.com>
Michael Vorburger [Thu, 28 Sep 2017 23:32:56 +0000 (01:32 +0200)]
Bump maven-dependency-plugin from 3.0.1 to 3.0.2
Change-Id: Ib3d7831d2c62bbd1d8b5da1302454f6793c4b554
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
Robert Varga [Mon, 25 Sep 2017 10:12:36 +0000 (12:12 +0200)]
BUG-9161: Bump karaf to 4.0.10
Upstream has delivered a speed up in initial repository indexing
and couple of other fixes. Bump karaf version to consume them.
Release notes:
https://github.com/apache/karaf/commit/
a16c3b095a6f17fb3641c98cbe56b7e9f69418c5
Change-Id: I1a632c51e8af62802473afb3d314743f5ca31cfc
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
(cherry picked from commit
b0e04a0c274d86ea3dbbd71f85ec148c383458f2)
Michael Vorburger [Mon, 11 Sep 2017 14:45:46 +0000 (16:45 +0200)]
maven-archetype-plugin pluginManagement
The new version property introduced here will be used in controller.
Change-Id: Idf0859ee1be990c130735ca93dabf2e7557703a7
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
Michael Vorburger [Tue, 19 Sep 2017 17:12:21 +0000 (19:12 +0200)]
Bump Checkstyle core from 7.6.1 to 8.2
and Sevntu from 1.21.0 to 1.24.2 (note the required change in groupId)
also includes removal of LeftCurly.maxLineLength = 100, which is not
supported (anymore; or -more likely- never was, probably the validation
just became stricter)
and removal of a duplicate RightCurly, which was always wrong
and required fixes to odlparent Java code showing violations now
Change-Id: I3efc1d2e97c87a9c072b3fe097cf388f5a457cf5
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
Robert Varga [Tue, 19 Sep 2017 08:56:52 +0000 (10:56 +0200)]
Eliminate scala.version and scala.micro.version
These properties are interfering with scala-maven-plugin, which is
using scala.version to control target versions.
Change-Id: I501cd941b35f2c0ca738209ca2db1c722743b2e8
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Thu, 7 Sep 2017 12:52:36 +0000 (14:52 +0200)]
Bump akka to 2.5.4
http://akka.io/blog/news/2017/08/10/akka-2.5.4-released
Change-Id: Ib22206bdaf1c0aa4a218d33ecf8335f718868bc7
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>