Stephen Kitt [Tue, 23 Feb 2016 12:10:01 +0000 (12:10 +0000)]
Merge "Revert "Miscellaneous upgrades""
Robert Varga [Tue, 23 Feb 2016 11:55:55 +0000 (11:55 +0000)]
Revert "Miscellaneous upgrades"
This reverts commit
901cce03b075f4da532c82d295017a3bb987fb14.
Change-Id: Ieb4ba61c57439b3d00437df58e74116dcff17245
Signed-off-by: Robert Varga <rovarga@cisco.com>
Robert Varga [Tue, 23 Feb 2016 09:23:09 +0000 (09:23 +0000)]
Merge "Revert "Upgrade guava 18 -> 19""
Tony Tkacik [Tue, 23 Feb 2016 09:09:35 +0000 (09:09 +0000)]
Revert "Upgrade guava 18 -> 19"
This reverts commit
20210cc89be01276bd1df28b4067f9d3228139aa.
Change-Id: I566c008dde48d08eeae965e0a834c5618979b2e4
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
Thanh Ha [Tue, 23 Feb 2016 01:00:07 +0000 (01:00 +0000)]
Merge "Upgrade guava 18 -> 19"
Thanh Ha [Tue, 23 Feb 2016 00:39:09 +0000 (00:39 +0000)]
Merge "Miscellaneous upgrades"
Stephen Kitt [Mon, 22 Feb 2016 17:19:40 +0000 (18:19 +0100)]
Upgrade guava 18 -> 19
Change-Id: I16a212a63eea8b1e5f36f80ecf0b8c50c9598d7d
Signed-off-by: Stephen Kitt <skitt@redhat.com>
Stephen Kitt [Mon, 22 Feb 2016 16:51:22 +0000 (17:51 +0100)]
Provide PowerMock in dependency management
Given the ties between Mockito, Hamcrest, JUnit, JaCoCo etc. and
PowerMock, it makes sense to provide that from odlparent too.
Change-Id: I2bc056b33da32dc352c41f301660c9d61c2a68c2
Signed-off-by: Stephen Kitt <skitt@redhat.com>
Stephen Kitt [Thu, 18 Feb 2016 12:49:48 +0000 (13:49 +0100)]
Miscellaneous upgrades
These upgrades should be painless:
* commons-net 3.3 -> 3.4
* com.typesafe.config 1.2.1 -> 1.3.0
* disruptor 3.3.2 -> 3.3.4
* enunciate-core-annotations 2.1.1 -> 2.2.0
* jaxrs-api 3.0.4 -> 3.0.12
* jolokia-osgi 1.3.2 -> 1.3.3
* json
20131018 ->
20160212
* jsonassert 1.2.3 -> 1.3.0
* logback 1.1.3 -> 1.1.5
* shiro 1.2.3 -> 1.2.4
* slf4j 1.7.12 -> 1.7.16
Change-Id: If911493786551a034a1b5c6c277e5d15702cd729
Signed-off-by: Stephen Kitt <skitt@redhat.com>
Robert Varga [Sat, 20 Feb 2016 18:22:33 +0000 (19:22 +0100)]
Bump mockito version to 1.10.19
powermock has weird interactions with hamcrest, which do not happen with
latest powermock (1.6.4). That version needs mockito 1.10.x, though,
hence the update. OVSDB already has this override.
Change-Id: Ifb342d72b34ad05da96f85db26f5d66f20626427
Signed-off-by: Robert Varga <rovarga@cisco.com>
Robert Varga [Sat, 20 Feb 2016 00:31:41 +0000 (01:31 +0100)]
bundle-parent should pull in junit
It is a fair assumption that bundles will require junits. Pull it in so
our users do not have to do that.
Change-Id: I16f8fc0f5f0641691ef2ede4be6cc1aca0ad356e
Signed-off-by: Robert Varga <rovarga@cisco.com>
Thanh Ha [Fri, 19 Feb 2016 14:36:33 +0000 (09:36 -0500)]
Only build index and javadoc reports
There was concern that generating all the reports causes builds to take
significantly longer. Disable all reports except for the index page and
javadoc for now. We can add reports one at a time later if we need them
and decide if they add significantly to build times.
I took some benchmarks on my machine.
odlparent build times without this patch:
Total time: 01:54 min
odlparent build times with this patch:
Total time: 56.617 s
Change-Id: Ida5e4e8e0846526134ec5ad8c385f46c649776ff
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
Stephen Kitt [Thu, 18 Feb 2016 16:49:26 +0000 (16:49 +0000)]
Revert "Upgrade jsr305 3.0.0 -> 3.0.1"
This reverts commit
6c5000ef252b17ac6f2e706554f045e3c8942754.
The upgrade to 3.0.1 is breaking at least OVSDB, and probably other projects using @Nonnull. I'll revert the revert once the appropriate fix is determined.
Change-Id: Id9595e9f2bfce5eac46d237a538b94455e01ab23
Signed-off-by: Stephen Kitt <skitt@redhat.com>
Stephen Kitt [Mon, 16 Nov 2015 17:09:36 +0000 (18:09 +0100)]
Upgrade jsr305 3.0.0 -> 3.0.1
Change-Id: I45b41696f0ae0af44a9ebcf7ffa52904659f63e2
Signed-off-by: Stephen Kitt <skitt@redhat.com>
Thanh Ha [Thu, 18 Feb 2016 02:09:47 +0000 (02:09 +0000)]
Merge "Upgrade jolokia 1.3.1 -> 1.3.2"
Stephen Kitt [Mon, 16 Nov 2015 17:07:50 +0000 (18:07 +0100)]
Upgrade Bouncycastle 1.52 -> 1.53
Change-Id: I4bd5e37db0b8ed31184093643a8a9c1073045521
Signed-off-by: Stephen Kitt <skitt@redhat.com>
Stephen Kitt [Fri, 8 Jan 2016 14:02:17 +0000 (15:02 +0100)]
Use CustomBundleURLStreamHandlerFactory from features-test
This allows karaf-plugin's dependency tree to be simplified.
Change-Id: If9273f1a793b51cc4479473134591203713d0cbf
Signed-off-by: Stephen Kitt <skitt@redhat.com>
Robert Varga [Sun, 14 Feb 2016 23:08:11 +0000 (00:08 +0100)]
Declare maven groups in lifecycle mapping
Eclipse does not assume the default group, leading to a build error.
Change-Id: I41b5e1a1dd025ec13eb71912c75f6ec71acd7f06
Signed-off-by: Robert Varga <rovarga@cisco.com>
Stephen Kitt [Mon, 16 Nov 2015 17:10:15 +0000 (18:10 +0100)]
Upgrade jolokia 1.3.1 -> 1.3.2
Change-Id: Ie35eebd1f4c83cc6625517abe2d341428050a3a5
Signed-off-by: Stephen Kitt <skitt@redhat.com>
Stephen Kitt [Fri, 8 Jan 2016 09:54:04 +0000 (10:54 +0100)]
Use more specific dependencies than karaf-maven-plugin
PerRepoTestRunner currently relies on karaf-maven-plugin to provide a
URLStreamHandlerFactory. This involves pulling in all
karaf-maven-plugin's dependencies, which end up contributing to all
ODL projects' complex dependencies trees as soon as they start using
features-test.
To avoid this, copy CustomBundleURLStreamHandlerFactory from
karaf-maven-plugin; the code is trivial. This allows
karaf-maven-plugin to be removed from the dependencies, as long as the
specific deployers we need are added. I copied mvn, wrap, feature,
spring and blueprint for now. A number of other dependencies become
unnecessary as a result.
Another approach would be to exclude all the irrelevant dependencies
from karaf-maven-plugin but this feels more fragile to me. With our
own CustomBundleURLStreamHandlerFactory we get to decide what
protocols we want to support.
Change-Id: I6b660582d0fbca57d8f20c7dd53375884a982e10
Signed-off-by: Stephen Kitt <skitt@redhat.com>
Stephen Kitt [Thu, 24 Sep 2015 14:37:26 +0000 (16:37 +0200)]
Constrain plugin dependencies
* Move dependencies up to odlparent-lite where appropriate
(i.e. odlparent-lite has an undeclared plugin dependency).
* Drop org.apache.maven.plugins group identifiers.
* Move the 3.0.5 prerequisite to odlparent-lite so it's inherited
everywhere (just to keep maven-versions-plugin happy).
* Sort the plugin definitions in odlparent-lite.
* Upgrade maven-enforcer (1.4 -> 1.4.1),
maven-project-info-reports-plugin (2.6 -> 2.8.1),
depends-maven-plugin (1.2 -> 1.3.1) and
findbugs-maven-plugin (3.0.2 -> 3.0.3).
With these changes the versions:display-plugin-updates report is clean
apart from the M2E plugin.
Change-Id: Ia7972b001fe92c00b56dd327bf856b0c0548a4b5
Signed-off-by: Stephen Kitt <skitt@redhat.com>
Thanh Ha [Tue, 9 Feb 2016 19:07:28 +0000 (19:07 +0000)]
Merge "Utility classes should be final with a hidden constructor"
Robert Varga [Tue, 9 Feb 2016 15:17:47 +0000 (16:17 +0100)]
Squash Sonar warnings in FeatureUtil
Utility class, should be final and private constructor. Also use Set
declaration, without leaking implementation.
Change-Id: Idac8a364081bfdc26a703df84c61c48891fc1083
Signed-off-by: Robert Varga <rovarga@cisco.com>
Robert Varga [Tue, 9 Feb 2016 15:05:17 +0000 (16:05 +0100)]
Utility classes should be final with a hidden constructor
Fixes a sonar warning.
Change-Id: Id39a19162c3658be4b40ac51a9804a806acba188
Signed-off-by: Robert Varga <rovarga@cisco.com>
Robert Varga [Tue, 9 Feb 2016 15:04:18 +0000 (16:04 +0100)]
Reorder imports
Fixes checkstyle warnings.
Change-Id: I1833e72652871e7c9837f7297262318e4594a0a5
Signed-off-by: Robert Varga <rovarga@cisco.com>
Robert Varga [Tue, 9 Feb 2016 15:00:04 +0000 (16:00 +0100)]
Switch logging to slf4j
SLF4J provides a better logging facility, switch to it, also fixing some
Sonar issues in the process.
Change-Id: I7286f9fed0364277a4d0e2ae91e3a607b1026a0b
Signed-off-by: Robert Varga <rovarga@cisco.com>
Thanh Ha [Tue, 9 Feb 2016 18:13:50 +0000 (18:13 +0000)]
Merge "Do not fork javadoc reports"
Robert Varga [Tue, 9 Feb 2016 14:34:59 +0000 (15:34 +0100)]
Do not fork javadoc reports
This shaves off 20 seconds from build time and 30 seconds from CPU usage
in my local build.
Change-Id: I178464fc0b5965bbf4ed3de4a8d24f65b8dbe467
Signed-off-by: Robert Varga <rovarga@cisco.com>
Robert Varga [Tue, 9 Feb 2016 15:14:31 +0000 (16:14 +0100)]
Do not declare RuntimeException as thrown
Fixes a Sonar warning.
Change-Id: Ie4f984da3ba7960f917a5429d2586b2fee67031f
Signed-off-by: Robert Varga <rovarga@cisco.com>
Robert Varga [Tue, 9 Feb 2016 13:16:34 +0000 (14:16 +0100)]
Do not fork jdepend take 2
A reportSet with no-fork, too.
Change-Id: I70a80d966bf136605031043577e9d0d75f9909e1
Signed-off-by: Robert Varga <rovarga@cisco.com>
Stephen Kitt [Tue, 9 Feb 2016 15:30:23 +0000 (15:30 +0000)]
Merge "Remove lmax.version"
Stephen Kitt [Tue, 9 Feb 2016 15:28:47 +0000 (15:28 +0000)]
Merge "Do not fork jdepend"
Robert Varga [Tue, 9 Feb 2016 13:16:34 +0000 (14:16 +0100)]
Do not fork jdepend
Change plugin configuration so that it does not fork lifecycle. This
shaves off 28 seconds from CPU time in my local build.
Change-Id: I04976d50cf49e7c42abea175bf6e44ecca7c9d57
Signed-off-by: Robert Varga <rovarga@cisco.com>
Thanh Ha [Tue, 15 Dec 2015 21:38:33 +0000 (16:38 -0500)]
Remove config/yang files from license check excludes
**/config/yang/** files are generated but the project needs to modify
them so does need to have a license after all.
Change-Id: Idd22eba4c7f880658f8e667a563b7d133b197cdb
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
Robert Varga [Thu, 4 Feb 2016 17:44:28 +0000 (18:44 +0100)]
Remove lmax.version
This crept in, downstream users have already been fixed up.
Change-Id: I185a30c2fa24d5f97cbcad8492c4a638ec326630
Signed-off-by: Robert Varga <rovarga@cisco.com>
Signed-off-by: Stephen Kitt <skitt@redhat.com>
Robert Varga [Mon, 1 Feb 2016 09:59:13 +0000 (09:59 +0000)]
Revert "Revert "BUG-2625: bump Java source/target to 1.8""
This reverts commit
620e137d615abdc8ceacb47a0acfdfea467e76a1
Change-Id: Id96baa2780d243b9529971ffa22da99a80986821
Signed-off-by: Robert Varga <rovarga@cisco.com>
Tony Tkacik [Fri, 29 Jan 2016 09:16:59 +0000 (10:16 +0100)]
BUG 4869: Unify lmax versions in ODL.
- added lmax disruptor to dependency management
- introduced odl-lmax feature
Change-Id: I631ef892d155c860d9afabfab0b4fe6c13f786b3
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
(cherry picked from commit
f0ad6aab8182a3d67e9208269a9ca8f3e71e2bb2)
Robert Varga [Wed, 27 Jan 2016 21:12:10 +0000 (22:12 +0100)]
BUG-2625: introduce updated equinox
Our equinox snapshot used in some test does not support Java 8 well,
introduce a bumped version.
Change-Id: I3e99f7010a952760f1502e33d91ee76e4d9b0514
Signed-off-by: Robert Varga <rovarga@cisco.com>
Robert Varga [Wed, 27 Jan 2016 14:37:00 +0000 (14:37 +0000)]
Merge "Revert "BUG-2625: bump Java source/target to 1.8""
Robert Varga [Wed, 27 Jan 2016 14:36:47 +0000 (14:36 +0000)]
Revert "BUG-2625: bump Java source/target to 1.8"
This reverts commit
02e0b7b9d02d0a948aa98b44155ce2bbd1de9270. Breaks controller verify, will address that after done with BUG-5019.
Change-Id: I07e73718c4af8d4e83104a3381e4eb9239340cd3
Signed-off-by: Robert Varga <rovarga@cisco.com>
Stephen Kitt [Wed, 27 Jan 2016 11:42:59 +0000 (11:42 +0000)]
Merge "BUG-2625: bump Java source/target to 1.8"
Stephen Kitt [Tue, 26 Jan 2016 09:28:26 +0000 (09:28 +0000)]
Merge "Add README and CONTRIBUTING files"
Robert Varga [Fri, 15 Jan 2016 09:17:34 +0000 (10:17 +0100)]
BUG-2625: bump Java source/target to 1.8
Switch source compatibility and runtime target versions to Java 8.
Change-Id: I793b679c4d82301b07e5694ccfcd1e0d499aa12e
Signed-off-by: Robert Varga <rovarga@cisco.com>
Thanh Ha [Thu, 21 Jan 2016 00:32:27 +0000 (19:32 -0500)]
No longer require 'All rights reserved.' in copyright line
We've been told that this line should not be required in the license
header so removing the requirement.
Change-Id: I39d04665b95e61abe37a442bc0304860232380d0
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
Thanh Ha [Fri, 4 Dec 2015 22:55:00 +0000 (17:55 -0500)]
Bumping versions by 0.1.0 for next dev cycle
Change-Id: Ibd200e36c4572783bfd15825de68ef0108eb91ac
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
(cherry picked from commit
e1a907fe9a5e3d451d1c85939b1882b7a2e85b50)
Thanh Ha [Wed, 6 Jan 2016 14:46:30 +0000 (14:46 +0000)]
Merge "Drop commons-collections"
Stephen Kitt [Wed, 6 Jan 2016 13:58:13 +0000 (14:58 +0100)]
Drop commons-collections
No ODL project uses commons-collections any more; let's drop it to
avoid accidental uses (Guava should provide everything we need here).
Change-Id: Ided6ad42932cc2d665984edc9229e157164747d7
Signed-off-by: Stephen Kitt <skitt@redhat.com>
Thanh Ha [Wed, 6 Jan 2016 02:45:25 +0000 (21:45 -0500)]
Add README and CONTRIBUTING files
Change-Id: I1c0e89f09cb497e35c979966605b234ad7453f27
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
Thanh Ha [Mon, 4 Jan 2016 16:05:56 +0000 (16:05 +0000)]
Merge "Stop unit tests from flooding the console"
Stephen Kitt [Wed, 23 Dec 2015 15:35:57 +0000 (16:35 +0100)]
Add junit:junit-dep
This is used by integration/distribution. (Adding this to odlparent
will eventually allow the ${junit.version} property to be dropped.)
Change-Id: Ifc78d144f63e9fb2e7723fd338e9ea3eb961667a
Signed-off-by: Stephen Kitt <skitt@redhat.com>
Robert Varga [Tue, 22 Dec 2015 10:25:20 +0000 (11:25 +0100)]
Stop unit tests from flooding the console
This patch instructs surefire to redirect the output of tests into a
per-test file, reducing the amount of spam we get on the console. The
output is saved in target/surefire-reports/<testname>-output.txt.
Change-Id: Idb6b67d58b801959a649e7532feabf7cc2249849
Signed-off-by: Robert Varga <rovarga@cisco.com>
Stephen Kitt [Tue, 15 Dec 2015 17:23:16 +0000 (18:23 +0100)]
Support extended mvn: URIs in features-parent
In mvn: URIs, the version information can be followed by a number of
specifiers. This patch unifies the component handling and supports
{{VERSION}} tags followed by extra specifiers (which are just copied
as-is).
Change-Id: I5033fae1ea13a31b1f2e3b97806829fe086e5f92
Signed-off-by: Stephen Kitt <skitt@redhat.com>
Stephen Kitt [Tue, 15 Dec 2015 15:42:32 +0000 (16:42 +0100)]
Add com.typesafe:config:1.2.1
Let's stick to the 1.2 series for now (this is mainly to get the
versions used in controller and netconf in sync).
Change-Id: Ic899a4924147d05bacc356d6e44abe377ea75a2a
Signed-off-by: Stephen Kitt <skitt@redhat.com>
Thanh Ha [Tue, 15 Dec 2015 04:15:03 +0000 (04:15 +0000)]
Merge changes I1547ade3,Iefeb63b5
* changes:
BUG-4691: Bump netty to 4.0.33
Add netty-codec-http to odl-netty
Stephen Kitt [Mon, 14 Dec 2015 14:30:25 +0000 (15:30 +0100)]
Add org.springframework:spring-webmvc
org.springframework:spring-webmvc is used by integration/distribution;
adding it to odlparent would allow ${spring.version} to be dropped.
Change-Id: I1f470c7684f6224a2e4ebe84a892e01e4a0cb5dc
Signed-off-by: Stephen Kitt <skitt@redhat.com>
Stephen Kitt [Mon, 14 Dec 2015 14:28:50 +0000 (15:28 +0100)]
Add jersey-test-framework-grizzly2
com.sun.jersey.jersey-test-framework:jersey-test-framework-grizzly2 is
used by aaa and is the only reason we still need ${jersey.version}
there.
Change-Id: I9e3e7e287a13f3d5b739ae4078392594b143f622
Signed-off-by: Stephen Kitt <skitt@redhat.com>
Robert Varga [Wed, 4 Nov 2015 18:43:39 +0000 (19:43 +0100)]
BUG-4691: Bump netty to 4.0.33
Change-Id: I1547ade3dcb543b1c9fa230a02e2cf4993827a9f
Signed-off-by: Robert Varga <rovarga@cisco.com>
Robert Varga [Thu, 10 Dec 2015 14:18:19 +0000 (15:18 +0100)]
Add netty-codec-http to odl-netty
RESTCONF uses this package, add it to the feature.
Change-Id: Iefeb63b5df91f0116237b09311659d4ed0251c8d
Signed-off-by: Robert Varga <rovarga@cisco.com>
Stephen Kitt [Thu, 10 Dec 2015 18:12:07 +0000 (19:12 +0100)]
Restore com.sun.jersey:jersey-json
This is used by sfc, restoring this allows ${jersey.version} to be
cleaned up in sfc.
Change-Id: I5f16c7225fad76a2e61cc5603bffc7168fc3fa7f
Signed-off-by: Stephen Kitt <skitt@redhat.com>
Stephen Kitt [Thu, 10 Dec 2015 12:39:34 +0000 (13:39 +0100)]
Restore com.sun.jersey:jersey-servlet
It's used by netconf, restoring it in odlparent allows
${jersey.version} to be cleaned up in netconf.
Change-Id: Ifb388ce08e1870b50ce720061550e72137bce798
Signed-off-by: Stephen Kitt <skitt@redhat.com>
Thanh Ha [Fri, 4 Dec 2015 01:29:44 +0000 (01:29 +0000)]
Merge "Set explicit memory options for SingleFeatureTest JVM"
Stephen Kitt [Wed, 2 Dec 2015 15:38:47 +0000 (16:38 +0100)]
Use ${karaf.version} in SingleFeatureTest
Instead of hard-coding the default version of Karaf in
SingleFeatureTest, pull in the version stored in ${karaf.version} via
a filtered properties file.
Change-Id: I3f61c26f19b7d0735101504e0971ef1a05a22992
Signed-off-by: Stephen Kitt <skitt@redhat.com>
Vratko Polak [Wed, 2 Dec 2015 13:55:01 +0000 (14:55 +0100)]
Set explicit memory options for SingleFeatureTest JVM
PermGen was sometimes too low for testing odl-integration-all feature.
Change-Id: I633a7e94d5b226f73a26c6d8534078a4c2f0be75
Signed-off-by: Vratko Polak <vrpolak@cisco.com>
Stephen Kitt [Thu, 8 Oct 2015 12:08:10 +0000 (14:08 +0200)]
Upgrade Enunciate 1.30.1 -> 1.31
Change-Id: I8f4529ca34a14ec40cecc69500e1aa671ba171f5
Signed-off-by: Stephen Kitt <skitt@redhat.com>
Ryan Goulding [Mon, 30 Nov 2015 19:27:12 +0000 (14:27 -0500)]
Aggregate Apache Shiro Dependencies into odlparent
Centralizes Apache Shiro dependencies since they are used in netconf
and AAA projects.
Change-Id: Id907ccb8abf490dae8d5e2a9b968c312899d9554
Signed-off-by: Ryan Goulding <ryandgoulding@gmail.com>
Stephen Kitt [Fri, 27 Nov 2015 11:05:25 +0000 (12:05 +0100)]
Add an upstream feature for Guava
Change-Id: Ic39ce6a0d6f569ab165310d6aaee54f3e71c393f
Signed-off-by: Stephen Kitt <skitt@redhat.com>
Stephen Kitt [Thu, 26 Nov 2015 12:16:02 +0000 (13:16 +0100)]
Add missing relativePaths
... and drop redundant version in odlparent-artifacts.
Change-Id: Idf07c59bfd1c4b5151cb594602027daadf0c8e5e
Signed-off-by: Stephen Kitt <skitt@redhat.com>
Stephen Kitt [Wed, 25 Nov 2015 14:06:39 +0000 (15:06 +0100)]
Add an upstream feature for Netty
Change-Id: I9a940037b33e1075da95b182c4079df02f653513
Signed-off-by: Stephen Kitt <skitt@redhat.com>
Thanh Ha [Tue, 24 Nov 2015 17:57:18 +0000 (17:57 +0000)]
Merge "Add plugin definition for Enunciate 2.1.1"
Robert Varga [Sat, 21 Nov 2015 20:13:45 +0000 (21:13 +0100)]
Add plugin definition for Enunciate 2.1.1
Enunciate 1.x is not compatible with Java 8. Enunciate 2 works on Java 6
through 8. Introduce plugin declaration for downstream projects to use.
Change-Id: Iff2751f90b19056572c9414e60cbd680dfe553c6
Signed-off-by: Robert Varga <rovarga@cisco.com>
Stephen Kitt [Mon, 16 Nov 2015 16:46:11 +0000 (17:46 +0100)]
Add commons-collections and netty-all
These are added by some downstream projects. Adding netty-all in
particular would allow netty.version to eventually be removed.
Change-Id: I1da78a6fc435c176825febf2447eddeb7e348f04
Signed-off-by: Stephen Kitt <skitt@redhat.com>
Stephen Kitt [Mon, 26 Oct 2015 17:20:06 +0000 (18:20 +0100)]
Track downstream uses and clean up properties
A number of properties are now used only in odlparent or not used at
all. This patch removes these where possible, either outright or by
replacing them with their values in odlparent.
Change-Id: I4539a1bfd042dc8d68e1585bb4751945f8eeec1b
Signed-off-by: Stephen Kitt <skitt@redhat.com>
Vratko Polak [Fri, 6 Nov 2015 16:44:08 +0000 (17:44 +0100)]
Revert "Bug 4375: Bump ANTLR to 4.5 or higher"
This reverts commit
fd156d42f3a46254ac8ef4b3fb7b43726ff5bafc.
Merge jobs started to failing for at least Controller and Bgpcep projects.
Change-Id: I38d9ff77c264fa86e7582559f0fb83817906690e
Signed-off-by: Vratko Polak <vrpolak@cisco.com>
Igor Foltin [Tue, 13 Oct 2015 10:58:23 +0000 (12:58 +0200)]
Bug 4375: Bump ANTLR to 4.5 or higher
- added antlr4-runtime 4.5.1 dependency
to odlparent dependencyManagement.
Change-Id: Ib3a8cf53b5df7f1da5c4d1b22a5f7ad7b6316770
Signed-off-by: Igor Foltin <ifoltin@cisco.com>
Stephen Kitt [Wed, 2 Sep 2015 09:14:23 +0000 (11:14 +0200)]
Upgrade upstream versions (Spring)
Spring 3.1.3 -> 3.2.8.
Spring Security 3.1.3 -> 3.2.14.
Use the new Spring artifacts, drop obsolete artifacts.
Change-Id: Ied0fdc30118f0797ddda420706607ec4d779a477
Signed-off-by: Stephen Kitt <skitt@redhat.com>
Sam Hague [Tue, 6 Oct 2015 15:47:19 +0000 (11:47 -0400)]
Allow child projects to fail on checkstyle errors
When the severity value is set in the odl_checks.xml file it can not
be overwritten in the child projects. Adding a property to the config allows
child projects to override the value. The default is still warning as it is today
and is only overwritten with the changes below in the project pom.
The below is what a child project would add to their pom to override the value:
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<configuration>
<propertyExpansion>checkstyle.violationSeverity=error</propertyExpansion>
</configuration>
</plugin>
Change-Id: Ic271080e4e0b21d49194d66cad72707837cdc16a
Signed-off-by: Sam Hague <shague@redhat.com>
Sam Hague [Tue, 6 Oct 2015 20:20:03 +0000 (16:20 -0400)]
Allow projects to suppress checkstyle warnings
This allows projects to override individual checkstyle rules by
using @SuppressWarnings() annotations. In the example below the
checkstyle error before suppressing the warning is shown and
then the annotation to disable the warning:
(whitespace) MethodParamPad: '(' is preceded with whitespace.
@SuppressWarnings("checkstyle:methodparampad")
public AbstractDataTreeListener (INetvirtSfcOF13Provider provider, Class<T> clazz) {
}
Change-Id: I13cf83a6afca4e8f95e8e2969ebb2ac9129e93f8
Signed-off-by: Sam Hague <shague@redhat.com>
Lorand Jakab [Fri, 9 Oct 2015 10:32:09 +0000 (13:32 +0300)]
Ignore depends-maven-plugin in Eclipse
Change-Id: Ic95ffb6eb55f255e022b7c5362b7e55c09c5699a
Signed-off-by: Lorand Jakab <lojakab@cisco.com>
Stephen Kitt [Wed, 7 Oct 2015 16:31:40 +0000 (18:31 +0200)]
Revert eclipse.persistence upgrade
eclipse.persistence 2.6.0 requires javax.validation, so revert to
2.5.2 for now until all downstreams have added the dependency.
Add javax.validation so we can prepare the upgrade.
Change-Id: If085612a70623608e09165fc89b203bc531990db
Signed-off-by: Stephen Kitt <skitt@redhat.com>
Thanh Ha [Fri, 2 Oct 2015 03:56:08 +0000 (23:56 -0400)]
Fix maven-bundle-plugin multiple executions
maven-bundle-plugin version 2.5.4 has a regression that causes it to
fork and execute multiple times within a build. This is fixed in 2.5.5
and newer.
See:
https://stackoverflow.com/questions/
31231453/when-using-bundle-packaging-with-maven-bundle-plugin-goals-are-executed-twice
Change-Id: I268961bc43a3c3b70a82280f46a8c4fa755abc14
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
Pradeeban Kathiravelu [Thu, 1 Oct 2015 14:14:38 +0000 (15:14 +0100)]
Fix minor typo - 's/dependecy/dependency'
Change-Id: I167bc4d2727293668ff7e3ae0c760e0fe6b54329
Signed-off-by: Pradeeban Kathiravelu <kk.pradeeban@gmail.com>
Thanh Ha [Wed, 30 Sep 2015 22:54:45 +0000 (18:54 -0400)]
Move generate-site phase to install
Running site generation in the package phase seems to cause build issues
in some projects such as yang-common. Moving this goal to the install
phase seems to resolve this issue.
Change-Id: I668fda52de1c8244efab156a78b9a633a2ae0833
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
Stephen Kitt [Wed, 2 Sep 2015 09:05:47 +0000 (11:05 +0200)]
Upgrade upstream versions (part 5, misc)
These should be harmless...
Eclipse Persistence 2.5.2 -> 2.6.0.
GSON 2.2.4 -> 2.3.1.
Javassist 3.19.0-GA -> 3.20.0-GA.
Jettison 1.3.3 -> 1.3.7.
Jolokia 1.1.4 -> 1.3.1.
JSR-305 2.0.3 -> 3.0.0.
OW2 ASM 4.1 -> 5.0.4.
Change-Id: Ic32f6f5908a17153a6d5e3fe11130838af162143
Signed-off-by: Stephen Kitt <skitt@redhat.com>
Thanh Ha [Fri, 25 Sep 2015 19:10:16 +0000 (19:10 +0000)]
Merge "Checkstyle clean-up"
Stephen Kitt [Thu, 24 Sep 2015 15:40:53 +0000 (17:40 +0200)]
Checkstyle clean-up
Also restore the license for PopulateLocalRepoMojo.java.
Change-Id: I310e933d66d73843f0d989e7dc5bbf4159002212
Signed-off-by: Stephen Kitt <skitt@redhat.com>
Robert Varga [Thu, 24 Sep 2015 10:46:00 +0000 (12:46 +0200)]
Do not fork the build cycle
maven-source-plugin:jar forces a for of the build cycle, which results
in multiple executions of enforcer/checkstyle and other plugins.
jar-no-fork attaches cleanly, thus speeding up the build.
Change-Id: Ib9f030997cb828d5d82e015046292a488c1a710c
Signed-off-by: Robert Varga <rovarga@cisco.com>
Stephen Kitt [Wed, 2 Sep 2015 08:59:11 +0000 (10:59 +0200)]
Upgrade upstream versions (part 4, logging)
Logback 1.0.9 -> 1.1.3.
SLF4J 1.7.7 -> 1.7.12.
Change-Id: I1231f4acb299c9111efb353aa8de8a70c442514b
Signed-off-by: Stephen Kitt <skitt@redhat.com>
Stephen Kitt [Wed, 2 Sep 2015 08:53:41 +0000 (10:53 +0200)]
Upgrade upstream versions (part 3, testing)
XMLUnit 1.5 -> 1.6.
JUnit can't be upgraded yet.
Change-Id: Ie9a3e4a4e417bf8d6235486ffe01f4cf33146efc
Signed-off-by: Stephen Kitt <skitt@redhat.com>
Stephen Kitt [Wed, 2 Sep 2015 08:25:13 +0000 (10:25 +0200)]
Upgrade upstream versions (part 2, Commons)
Codec 1.8 -> 1.10.
Lang3 3.1 -> 3.4.
Net 3.0.1 -> 3.3.
Change-Id: Ib7f03d3e6f8b4514790159b18015402006eb26f0
Signed-off-by: Stephen Kitt <skitt@redhat.com>
Stephen Kitt [Wed, 2 Sep 2015 08:18:00 +0000 (10:18 +0200)]
Upgrade upstream versions (part 1, Maven)
The versions were checked with versions:display-plugin-updates and
versions:display-dependency-updates.
With the following fixes, all of Beryllium builds, from scratch, with
no external snapshots:
* yangtools: https://git.opendaylight.org/gerrit/#/c/26854/
* controller: https://git.opendaylight.org/gerrit/#/c/26859/
* aaa: https://git.opendaylight.org/gerrit/#/c/26959/
* toolkit: https://git.opendaylight.org/gerrit/#/c/26914/
* dlux: https://git.opendaylight.org/gerrit/#/c/26916/
All Maven plugins updated to the latest upstream versions, apart from
Karaf (in a later patch in the set).
Change-Id: Ia40a9d1f6428784429ddd8474c39be8984c7da19
Signed-off-by: Stephen Kitt <skitt@redhat.com>
Pradeeban Kathiravelu [Sat, 19 Sep 2015 00:25:48 +0000 (01:25 +0100)]
Fix javadoc tags to fix the jdk 1.8 javadoc lint checker
- Move maven-javadoc-plugins <tags> to odlparent-lite
- Resolves missing javadoc strings
Change-Id: I5883003366b4d17b5b3547d2a3c0652db7bc0cb0
Also-by: Thanh Ha <thanh.ha@linuxfoundation.org>
Signed-off-by: Pradeeban Kathiravelu <kk.pradeeban@gmail.com>
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
Robert Varga [Fri, 18 Sep 2015 07:22:35 +0000 (07:22 +0000)]
Merge "Bug 3086: Add timeout to SingleFeatureTest#installFeature"
Tom Pantelis [Sun, 26 Apr 2015 05:27:10 +0000 (01:27 -0400)]
Bug 3086: Add timeout to SingleFeatureTest#installFeature
This test sometimes hangs indefinitely on jenkins builds so I added a
5 minute timeout for the test to complete.
Change-Id: I8c2c39d7ec8a66445a65148b13181daf55f82068
Signed-off-by: Tom Pantelis <tpanteli@brocade.com>
Thanh Ha [Wed, 16 Sep 2015 14:03:33 +0000 (14:03 +0000)]
Merge "Maven site configuration for OpenDaylight"
Robert Varga [Wed, 16 Sep 2015 14:02:57 +0000 (14:02 +0000)]
Merge "Create odlparent-lite"
Thanh Ha [Thu, 10 Sep 2015 23:53:51 +0000 (19:53 -0400)]
Maven site configuration for OpenDaylight
Change-Id: If75585bbaeabeb2fd6ed9b1fb4ea36f9b015d8ce
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
Thanh Ha [Thu, 10 Sep 2015 03:23:23 +0000 (23:23 -0400)]
Create odlparent-lite
The purpose of odlparent-lite is to provide a small minimal top level
parent that can be used for projects where odlparent might be too bulky
to inherit from.
See discussion:
https://lists.opendaylight.org/pipermail/odlparent-dev/2015-September/000142.html
Change-Id: Ia1b5118441b5f5eb90c019956a1bb9d75e9e7874
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
Thanh Ha [Mon, 14 Sep 2015 20:52:38 +0000 (16:52 -0400)]
Revert back to 0.7.2 version of jacoco
Tests that use PowerMock have issues with jacoco versions >=0.7.3
https://github.com/jayway/powermock/issues/564
Change-Id: I7b55ef3f3eef9d7ba44b739b2b1363c71534d40e
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
Robert Varga [Mon, 14 Sep 2015 20:03:59 +0000 (22:03 +0200)]
Silence javadoc plugin
Executing the plugin dumps all the html files onto the console, which
makes the build very verbose. Add the quiet option to only print out
warnings/errors.
Change-Id: Ia4d957fb897554528d0a3d7031767b77f602df5a
Signed-off-by: Robert Varga <rovarga@cisco.com>
Thanh Ha [Sun, 6 Sep 2015 13:07:33 +0000 (09:07 -0400)]
Remove <repositories> and <pluginRepositories> sections
In January 2015 we made the decision to remove <repositories> and
<pluginRepositories> sections from all ODL projects. This was to meet
the Maven Central requirements that these sections cannot be defined in
your local project poms if you wish to push your artifacts to Maven
Central. Instead we started recommending developers to define these
sections in their local settings.xml file.
https://lists.opendaylight.org/pipermail/discuss/2015-January/004482.html
Change-Id: I4bdf45ed3cbb5e297c8a7ce1165ea63bf917efbb
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>