odlparent.git
8 years agoMerge "Handle property place-holders in features.xml"
Robert Varga [Fri, 8 Apr 2016 11:42:36 +0000 (11:42 +0000)]
Merge "Handle property place-holders in features.xml"

8 years agoHandle property place-holders in features.xml 82/37282/2
Stephen Kitt [Thu, 7 Apr 2016 17:09:37 +0000 (19:09 +0200)]
Handle property place-holders in features.xml

When processing {{VERSION}}, we need to handle property place-holders
ourselves. This patch implements this using the project bean exposed
by BSF.

Change-Id: I33d37e73486c96709ebce71057463cb7b3af7f78
Signed-off-by: Stephen Kitt <skitt@redhat.com>
8 years agoAdd aries blueprint core dependency to odlparent 81/37281/1
Ryan Goulding [Thu, 7 Apr 2016 17:04:25 +0000 (13:04 -0400)]
Add aries blueprint core dependency to odlparent

Adds blueprint core in odlparent for sharing the common version across
projects.

Change-Id: I2485940b8d1a0c5c0e76963412c306f480b8fbd6
Signed-off-by: Ryan Goulding <ryandgoulding@gmail.com>
8 years agoMerge "Bump Scala to 2.11.8 and akka to 2.4.3"
Stephen Kitt [Thu, 7 Apr 2016 12:24:07 +0000 (12:24 +0000)]
Merge "Bump Scala to 2.11.8 and akka to 2.4.3"

8 years agoAdded Asciidoc support to maven sites. 86/37186/1
Tony Tkacik [Wed, 6 Apr 2016 12:24:05 +0000 (14:24 +0200)]
Added Asciidoc support to maven sites.

Introduces base support of asciidoc into Maven site.
Patch does not deal with support of asciidoctor-diagram
yet.

Change-Id: Ide7e23efedb5c01e15eb38d7563af5c49b464441
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
8 years agoBump Scala to 2.11.8 and akka to 2.4.3 52/36652/7
Robert Varga [Wed, 23 Mar 2016 18:07:38 +0000 (19:07 +0100)]
Bump Scala to 2.11.8 and akka to 2.4.3

Since we are still at the start of our development cycle, it should be relatively
safe to upgrade to these bugfix releases.

Change-Id: I85d1698551acb25c15c67d8a6164d3e6f4a5d6a0
Signed-off-by: Robert Varga <rovarga@cisco.com>
8 years agoUpdate settings.xml to use https 72/37172/1
Robert Varga [Wed, 6 Apr 2016 09:28:11 +0000 (11:28 +0200)]
Update settings.xml to use https

nexus.opendaylight.org redirects (using HTML, no less) to https,
adjust repository specification.

Change-Id: I29179db6bf7011bd6a00c37944773ec83f44ee8f
Signed-off-by: Robert Varga <rovarga@cisco.com>
8 years agoSwitch to https for Nexus communication 52/37152/1
Thanh Ha [Tue, 5 Apr 2016 15:53:34 +0000 (11:53 -0400)]
Switch to https for Nexus communication

ODL Nexus requires https and causes a redirect if you use http. Default
configuration to use https.

Change-Id: I89d4b6abcc2c9247b1a2ff026b3689e562716f6e
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
8 years agoMerge "Add dependency management for stax-utils"
Thanh Ha [Thu, 31 Mar 2016 21:33:28 +0000 (21:33 +0000)]
Merge "Add dependency management for stax-utils"

8 years agoAdd dependency management for stax-utils 74/36974/1
Tom Pantelis [Thu, 31 Mar 2016 18:04:12 +0000 (14:04 -0400)]
Add dependency management for stax-utils

Added a dependency in the management section for the javanet stax-utils
artifact to reuse the version. Currently it's only used in sal-rest-connector
bundle but I want to use it elsewhere.

Change-Id: I9786e0440b98afa40c6d7cd1c7cb3e99b52b3c53
Signed-off-by: Tom Pantelis <tpanteli@brocade.com>
8 years agoMerge "Install eventadmin feature in SingleFeatureTest"
Stephen Kitt [Wed, 30 Mar 2016 08:12:38 +0000 (08:12 +0000)]
Merge "Install eventadmin feature in SingleFeatureTest"

8 years agoInstall eventadmin feature in SingleFeatureTest 59/36759/4
Tom Pantelis [Wed, 23 Mar 2016 21:39:36 +0000 (17:39 -0400)]
Install eventadmin feature in SingleFeatureTest

The upcoming blueprint work makes use of karaf's EventAdmin so we need
SingleFeatureTest to install that feature. Our normal karaf distro
installs this and all the other standard karaf features.

Change-Id: I1e03db00633c937676c6be066adad7de6979bb41
Signed-off-by: Tom Pantelis <tpanteli@brocade.com>
8 years agoAdd upgrade notes 39/36539/1
Stephen Kitt [Tue, 22 Mar 2016 09:41:30 +0000 (10:41 +0100)]
Add upgrade notes

Testing dependencies and Config/Akka need special care.

Change-Id: Ie7aa10383b45e7b806dd98f0a1095a612757b2ae
Signed-off-by: Stephen Kitt <skitt@redhat.com>
8 years agoEnable SingleFeatureTest on features-akka 96/36396/1
Stephen Kitt [Thu, 17 Mar 2016 13:17:28 +0000 (14:17 +0100)]
Enable SingleFeatureTest on features-akka

SingleFeatureTest only runs for "jar" packaging POMs; switch
features-akka from "pom" to "jar" to enable this.

Change-Id: I62bf1f645b390f4c909ba4dab0ba09a424c37a5e
Signed-off-by: Stephen Kitt <skitt@redhat.com>
8 years agoRevert "Upgrade logback 1.1.3 -> 1.1.5" 03/36303/2
Stephen Kitt [Wed, 16 Mar 2016 16:58:09 +0000 (16:58 +0000)]
Revert "Upgrade logback 1.1.3 -> 1.1.5"

This reverts commit 7f1b0a52a7d8a1d184bf4a15be9a76287cb93559.

logback 1.1.5 requires slf4j 1.7.16, which causes issues with integration/distribution.

Change-Id: I1450f47a69d6bb2d60bc43a20ec87f8e8a5a19f3
Signed-off-by: Stephen Kitt <skitt@redhat.com>
8 years agoClean up version properties 80/35480/3
Stephen Kitt [Fri, 26 Feb 2016 17:48:38 +0000 (18:48 +0100)]
Clean up version properties

A number of properties are no longer used downstream, so remove them.

Update downstream usage of the remaining properties.

Change-Id: I093b217434a36569648d4f47eba032db2abb3407
Signed-off-by: Stephen Kitt <skitt@redhat.com>
8 years agoMerge "Upgrade jolokia-osgi 1.3.2 -> 1.3.3"
Robert Varga [Wed, 16 Mar 2016 10:43:21 +0000 (10:43 +0000)]
Merge "Upgrade jolokia-osgi 1.3.2 -> 1.3.3"

8 years agoMerge "Upgrade commons-net 3.3 -> 3.4"
Robert Varga [Wed, 16 Mar 2016 10:42:49 +0000 (10:42 +0000)]
Merge "Upgrade commons-net 3.3 -> 3.4"

8 years agoMerge "Upgrade logback 1.1.3 -> 1.1.5"
Robert Varga [Wed, 16 Mar 2016 10:42:13 +0000 (10:42 +0000)]
Merge "Upgrade logback 1.1.3 -> 1.1.5"

8 years agoSet <name> fields for maven-site formatting 17/36017/1
Thanh Ha [Thu, 10 Mar 2016 01:16:37 +0000 (20:16 -0500)]
Set <name> fields for maven-site formatting

Improves the modules naming list in Maven Site generation menus. Fixes
the current naming:

    Unnamed -
    org.opendaylight.odlparent:features-akka:pom:1.7.0-SNAPSHOT

to:

    ODL :: odlparent :: features-akka

A side effect is it also makes the Maven Reactor Summary look more
visually appealing.

Change-Id: I5093137c1f24178ddf69b423c20c6414371f7bea
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
8 years agoAdd instructions to test maven-site locally 16/36016/1
Thanh Ha [Thu, 10 Mar 2016 01:05:38 +0000 (20:05 -0500)]
Add instructions to test maven-site locally

Add details on how to Generate and View Maven Sites locally.

Change-Id: Ic531dd8d5a836f46e4e7c934668e410b6f9a667c
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
8 years agoAdd link to Javadoc generation section 15/36015/1
Thanh Ha [Thu, 10 Mar 2016 00:59:05 +0000 (19:59 -0500)]
Add link to Javadoc generation section

Change-Id: I7b7b87b493053e9ed900fb9bef754320fc88f519
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
8 years agoMove maven-site documentation to odlparent 65/35965/1
Thanh Ha [Wed, 9 Mar 2016 02:33:37 +0000 (21:33 -0500)]
Move maven-site documentation to odlparent

Currently lives in the releng/builder project but moving it to odlparent
would make more sense since this is where all the code for it lives.

Change-Id: I030af85d885bbeeeec00175b29529cec960ec081
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
8 years agoBug 4964: Add akka/scala dependencies and karaf features 62/34862/8
Tom Pantelis [Wed, 17 Feb 2016 03:32:08 +0000 (22:32 -0500)]
Bug 4964: Add akka/scala dependencies and karaf features

Added akka and scala dependency definitions from the controller project
to the odlparent pom so they're avaialble to project. These definitions
will be removed from the controller commons pom.

Also added the akka features.xml from the controller project which will
be subsequently removed. The artifactId is now
org.opendaylight.odlparent instead of org.opendaylight.controller.

Akka 2.4.1 requires com.typesafe/config version 1.3.0 so the version was
bumped.

Change-Id: Ia6c3918f2854b1b6dcbc8fc2e3325f227edc3e18
Signed-off-by: Tom Pantelis <tpanteli@brocade.com>
8 years agoUpgrade logback 1.1.3 -> 1.1.5 32/35332/1
Stephen Kitt [Wed, 24 Feb 2016 13:03:04 +0000 (14:03 +0100)]
Upgrade logback 1.1.3 -> 1.1.5

Change-Id: Id96b610a033122a2d13d266b0791e80786cb1e56
Signed-off-by: Stephen Kitt <skitt@redhat.com>
8 years agoUpgrade jolokia-osgi 1.3.2 -> 1.3.3 31/35331/1
Stephen Kitt [Wed, 24 Feb 2016 12:59:41 +0000 (13:59 +0100)]
Upgrade jolokia-osgi 1.3.2 -> 1.3.3

This is needed for AAA in Boron.

Change-Id: I653073df2745fb2c0c07d49f7e7bfffcd3af84f5
Signed-off-by: Stephen Kitt <skitt@redhat.com>
8 years agoUpgrade commons-net 3.3 -> 3.4 29/35329/1
Stephen Kitt [Wed, 24 Feb 2016 12:56:43 +0000 (13:56 +0100)]
Upgrade commons-net 3.3 -> 3.4

All uses of the commons.net.version property downstream have been
removed, so we turn this into a simple version declaration in
dependency management.

Change-Id: Ia48abe2d112390a557d92b6b69d2fd5705abba7e
Signed-off-by: Stephen Kitt <skitt@redhat.com>
8 years agoMerge "Upgrade bouncycastle 1.53 -> 1.54"
Thanh Ha [Tue, 23 Feb 2016 22:02:17 +0000 (22:02 +0000)]
Merge "Upgrade bouncycastle 1.53 -> 1.54"

8 years agoUpgrade bouncycastle 1.53 -> 1.54 76/35276/1
Stephen Kitt [Tue, 23 Feb 2016 16:58:14 +0000 (17:58 +0100)]
Upgrade bouncycastle 1.53 -> 1.54

This fixes CVE-2015-7575 in particular.

Change-Id: I90d11b9d447b43ccc8c394d99b65c38b464470b0
Signed-off-by: Stephen Kitt <skitt@redhat.com>
8 years agoUpgrade Apache Shiro Dependency from 1.2.3 to 1.2.4 68/35268/1
Ryan Goulding [Tue, 23 Feb 2016 13:48:31 +0000 (08:48 -0500)]
Upgrade Apache Shiro Dependency from 1.2.3 to 1.2.4

Upstream documentation of the changes between releases 1.2.3 and 1.2.4 is
located here:

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

In short, there were five bug fixes between 1.2.3 and 1.2.4, one of which is
security related:

Bug
[SHIRO-517] - Caused by: java.lang.NoClassDefFoundError: Lcom/google/inject/internal/util/$ImmutableList;
[SHIRO-518] - Shiro-CAS: Security Problem in cas-client-core versions older than 3.3.2
Improvement
[SHIRO-332] - Change access level of method 'isPermitted' in org.apache.shiro.realm.AuthorizingRealm (line 461) from private to protected
[SHIRO-496] - Update shior.guice dependency
[SHIRO-498] - ThreadLocal should not be created when not necessary

This was tested and does not seem to present any regressions from Shiro 1.2.3.

Change-Id: I4969fb669f628547804a9071cfe3b89cc4ca4073
Signed-off-by: Ryan Goulding <ryandgoulding@gmail.com>
8 years agoMerge "Revert "Miscellaneous upgrades""
Stephen Kitt [Tue, 23 Feb 2016 12:10:01 +0000 (12:10 +0000)]
Merge "Revert "Miscellaneous upgrades""

8 years agoRevert "Miscellaneous upgrades" 49/35249/1
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>
8 years agoMerge "Revert "Upgrade guava 18 -> 19""
Robert Varga [Tue, 23 Feb 2016 09:23:09 +0000 (09:23 +0000)]
Merge "Revert "Upgrade guava 18 -> 19""

8 years agoRevert "Upgrade guava 18 -> 19" 41/35241/1
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>
8 years agoMerge "Upgrade guava 18 -> 19"
Thanh Ha [Tue, 23 Feb 2016 01:00:07 +0000 (01:00 +0000)]
Merge "Upgrade guava 18 -> 19"

8 years agoMerge "Miscellaneous upgrades"
Thanh Ha [Tue, 23 Feb 2016 00:39:09 +0000 (00:39 +0000)]
Merge "Miscellaneous upgrades"

8 years agoUpgrade guava 18 -> 19 14/35214/1
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>
8 years agoProvide PowerMock in dependency management 10/35210/1
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>
8 years agoMiscellaneous upgrades 02/35202/1
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>
8 years agoBump mockito version to 1.10.19 37/35137/1
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>
8 years agobundle-parent should pull in junit 25/35125/1
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>
8 years agoOnly build index and javadoc reports 03/35103/1
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>
8 years agoRevert "Upgrade jsr305 3.0.0 -> 3.0.1" 19/34919/1
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>
8 years agoUpgrade jsr305 3.0.0 -> 3.0.1 68/29768/4
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>
8 years agoMerge "Upgrade jolokia 1.3.1 -> 1.3.2"
Thanh Ha [Thu, 18 Feb 2016 02:09:47 +0000 (02:09 +0000)]
Merge "Upgrade jolokia 1.3.1 -> 1.3.2"

8 years agoUpgrade Bouncycastle 1.52 -> 1.53 64/29764/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>
8 years agoUse CustomBundleURLStreamHandlerFactory from features-test 83/32283/5
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>
8 years agoDeclare maven groups in lifecycle mapping 41/34641/1
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>
8 years agoUpgrade jolokia 1.3.1 -> 1.3.2 69/29769/3
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>
8 years agoUse more specific dependencies than karaf-maven-plugin 65/32265/6
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>
8 years agoConstrain plugin dependencies 95/27395/8
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>
8 years agoMerge "Utility classes should be final with a hidden constructor"
Thanh Ha [Tue, 9 Feb 2016 19:07:28 +0000 (19:07 +0000)]
Merge "Utility classes should be final with a hidden constructor"

8 years agoSquash Sonar warnings in FeatureUtil 39/34339/3
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>
8 years agoUtility classes should be final with a hidden constructor 37/34337/4
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>
8 years agoReorder imports 36/34336/4
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>
8 years agoSwitch logging to slf4j 35/34335/4
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>
8 years agoMerge "Do not fork javadoc reports"
Thanh Ha [Tue, 9 Feb 2016 18:13:50 +0000 (18:13 +0000)]
Merge "Do not fork javadoc reports"

8 years agoDo not fork javadoc reports 33/34333/4
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>
8 years agoDo not declare RuntimeException as thrown 38/34338/4
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>
8 years agoDo not fork jdepend take 2 44/34344/2
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>
8 years agoMerge "Remove lmax.version"
Stephen Kitt [Tue, 9 Feb 2016 15:30:23 +0000 (15:30 +0000)]
Merge "Remove lmax.version"

8 years agoMerge "Do not fork jdepend"
Stephen Kitt [Tue, 9 Feb 2016 15:28:47 +0000 (15:28 +0000)]
Merge "Do not fork jdepend"

8 years agoDo not fork jdepend 27/34327/3
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>
8 years agoRemove config/yang files from license check excludes 74/31374/3
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>
8 years agoRemove lmax.version 97/34097/2
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>
8 years agoRevert "Revert "BUG-2625: bump Java source/target to 1.8"" 45/33845/2
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>
8 years agoBUG 4869: Unify lmax versions in ODL. 76/33776/2
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)

8 years agoBUG-2625: introduce updated equinox 60/33660/1
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>
8 years agoMerge "Revert "BUG-2625: bump Java source/target to 1.8""
Robert Varga [Wed, 27 Jan 2016 14:37:00 +0000 (14:37 +0000)]
Merge "Revert "BUG-2625: bump Java source/target to 1.8""

8 years agoRevert "BUG-2625: bump Java source/target to 1.8" 38/33638/1
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>
8 years agoMerge "BUG-2625: bump Java source/target to 1.8"
Stephen Kitt [Wed, 27 Jan 2016 11:42:59 +0000 (11:42 +0000)]
Merge "BUG-2625: bump Java source/target to 1.8"

8 years agoMerge "Add README and CONTRIBUTING files"
Stephen Kitt [Tue, 26 Jan 2016 09:28:26 +0000 (09:28 +0000)]
Merge "Add README and CONTRIBUTING files"

8 years agoBUG-2625: bump Java source/target to 1.8 53/32753/2
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>
8 years agoNo longer require 'All rights reserved.' in copyright line 75/33175/1
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>
8 years agoBumping versions by 0.1.0 for next dev cycle 83/32683/1
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)

8 years agoMerge "Drop commons-collections"
Thanh Ha [Wed, 6 Jan 2016 14:46:30 +0000 (14:46 +0000)]
Merge "Drop commons-collections"

8 years agoDrop commons-collections 89/32189/1
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>
8 years agoAdd README and CONTRIBUTING files 68/32168/1
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>
8 years agoMerge "Stop unit tests from flooding the console"
Thanh Ha [Mon, 4 Jan 2016 16:05:56 +0000 (16:05 +0000)]
Merge "Stop unit tests from flooding the console"

8 years agoAdd junit:junit-dep 34/31834/1
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>
8 years agoStop unit tests from flooding the console 65/31765/1
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>
8 years agoSupport extended mvn: URIs in features-parent 67/31367/1
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>
8 years agoAdd com.typesafe:config:1.2.1 59/31359/1
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>
8 years agoMerge changes I1547ade3,Iefeb63b5
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

8 years agoAdd org.springframework:spring-webmvc 75/31275/1
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>
8 years agoAdd jersey-test-framework-grizzly2 74/31274/1
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>
8 years agoBUG-4691: Bump netty to 4.0.33 69/29269/7
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>
8 years agoAdd netty-codec-http to odl-netty 45/31145/3
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>
8 years agoRestore com.sun.jersey:jersey-json 58/31158/1
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>
8 years agoRestore com.sun.jersey:jersey-servlet 34/31134/1
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>
8 years agoMerge "Set explicit memory options for SingleFeatureTest JVM"
Thanh Ha [Fri, 4 Dec 2015 01:29:44 +0000 (01:29 +0000)]
Merge "Set explicit memory options for SingleFeatureTest JVM"

8 years agoUse ${karaf.version} in SingleFeatureTest 96/30496/3
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>
8 years agoSet explicit memory options for SingleFeatureTest JVM 85/30485/1
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>
8 years agoUpgrade Enunciate 1.30.1 -> 1.31 56/28056/2
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>
8 years agoAggregate Apache Shiro Dependencies into odlparent 00/30400/2
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>
8 years agoAdd an upstream feature for Guava 88/30288/1
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>
8 years agoAdd missing relativePaths 46/30246/1
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>
8 years agoAdd an upstream feature for Netty 00/30200/4
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>
8 years agoMerge "Add plugin definition for Enunciate 2.1.1"
Thanh Ha [Tue, 24 Nov 2015 17:57:18 +0000 (17:57 +0000)]
Merge "Add plugin definition for Enunciate 2.1.1"

8 years agoAdd plugin definition for Enunciate 2.1.1 45/30045/2
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>