odlparent.git
9 years agoMerge "Fix feature-test failing with surefire 2.18"
Vaishali Mithbaokar [Thu, 4 Dec 2014 17:54:28 +0000 (17:54 +0000)]
Merge "Fix feature-test failing with surefire 2.18"

9 years agoFix feature-test failing with surefire 2.18 66/13366/1
Robert Varga [Thu, 4 Dec 2014 12:16:23 +0000 (13:16 +0100)]
Fix feature-test failing with surefire 2.18

feature-test fails maven-surefire-plugin 2.18 (but works with 2.17) due
to it assumming the constructor is called only once and modifying global
state. That global state is guarded from multiple modifications with an
Error. Move the offending initialization into static initializer, thus
ensuring we invoke the function only once.

Change-Id: I0f546e3c01a48daaa84dde905383463e248f24ed
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoRemove duplicate declaration of maven-bundle-plugin. 60/13360/1
Shigeru Yasuda [Thu, 4 Dec 2014 06:40:33 +0000 (15:40 +0900)]
Remove duplicate declaration of maven-bundle-plugin.

Plugin declaration in pluginManagement must be unique.

Change-Id: Icbc78cf99ff6fa545974562ef334166c2770cf68
Signed-off-by: Shigeru Yasuda <s-yasuda@da.jp.nec.com>
9 years agoMerge "Fix missing <nexusproxy> variable in root pom.xml"
Surekha Bejgam [Wed, 3 Dec 2014 22:16:23 +0000 (22:16 +0000)]
Merge "Fix missing <nexusproxy> variable in root pom.xml"

9 years agoMerge "Fixed maven-paxexam-plugin version."
Surekha Bejgam [Wed, 3 Dec 2014 21:20:04 +0000 (21:20 +0000)]
Merge "Fixed maven-paxexam-plugin version."

9 years agoFixed maven-paxexam-plugin version. 46/13346/1
Tony Tkacik [Wed, 3 Dec 2014 17:22:23 +0000 (18:22 +0100)]
Fixed maven-paxexam-plugin version.

Latest version of maven-paxexam-plugin is 1.2.4 and not 3.0.0,
this incorrect declaration broke build in controller project.

Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
Change-Id: Id430fab8dde594e418cbebe496edd1f15f4258dc

9 years agoRevert xtend version bump 39/13339/1
Robert Varga [Wed, 3 Dec 2014 10:40:52 +0000 (11:40 +0100)]
Revert xtend version bump

This reverts the version bump of xtend-maven-plugin and adds the
appropriate explanation.

Change-Id: I6cb2e1088cf8a1e688fca1c58fd9eab9e98ffeb7
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoFix missing <nexusproxy> variable in root pom.xml 34/13334/3
Thanh Ha [Wed, 3 Dec 2014 04:58:48 +0000 (23:58 -0500)]
Fix missing <nexusproxy> variable in root pom.xml

Change-Id: I1f421096b7fe0ea93518d92b6b4b4c0f9832bbf6
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
9 years agoUpdate Maven plugin versions 61/13161/3
Thanh Ha [Thu, 27 Nov 2014 03:42:28 +0000 (22:42 -0500)]
Update Maven plugin versions

Change-Id: I4945bce8e27baa920d9eea189a3af04b8a067df0
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
9 years agoMerge changes I85ada413,Idd2417d0,I45a88760,I4cef2990,Iae30f52a
Surekha Bejgam [Wed, 3 Dec 2014 03:37:32 +0000 (03:37 +0000)]
Merge changes I85ada413,Idd2417d0,I45a88760,I4cef2990,Iae30f52a

* changes:
  Add depends-maven-plugin declaration
  Add default Sonar configuration
  Add maven-resources-plugin declaration
  Add maven shade plugin declaration
  Add pluginManagement section for declared plugin versions

9 years agoMerge changes I7e6275ea,Ia4ee994b
Surekha Bejgam [Wed, 3 Dec 2014 03:36:43 +0000 (03:36 +0000)]
Merge changes I7e6275ea,Ia4ee994b

* changes:
  Introduce features-test
  Introduce bundle-parent

9 years agoIntroduce features-test 45/12045/3
Robert Varga [Fri, 17 Oct 2014 10:06:53 +0000 (12:06 +0200)]
Introduce features-test

This patch introduces the features-test from yangtools. It validates
that a project's feature is self-contained.

Change-Id: I7e6275ea465b79b2dc3cee5b105d8ca36c728cbc
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoAdd depends-maven-plugin declaration 96/13196/2
Robert Varga [Fri, 28 Nov 2014 12:25:25 +0000 (13:25 +0100)]
Add depends-maven-plugin declaration

Adds the plugin, along with default configuration to generate a depends
file.

Change-Id: I85ada413d49f5e742c66fb72e50954b5a5666f03
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoAdd default Sonar configuration 95/13195/2
Robert Varga [Fri, 28 Nov 2014 12:25:43 +0000 (13:25 +0100)]
Add default Sonar configuration

Change-Id: Idd2417d0c5cbe1fcc4c25429ffa154fdafb5bf0c
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoAdd maven-resources-plugin declaration 94/13194/2
Robert Varga [Fri, 28 Nov 2014 12:30:27 +0000 (13:30 +0100)]
Add maven-resources-plugin declaration

Change-Id: I45a88760259ef0db8bc57561f7f50e044bda7ea7
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoAdd maven shade plugin declaration 93/13193/2
Robert Varga [Fri, 28 Nov 2014 12:27:22 +0000 (13:27 +0100)]
Add maven shade plugin declaration

Change-Id: I4cef2990299910dd27b57f578c7148823af27671
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoAdd pluginManagement section for declared plugin versions 49/13149/4
Robert Varga [Wed, 26 Nov 2014 17:34:38 +0000 (18:34 +0100)]
Add pluginManagement section for declared plugin versions

Aside the version declarations, this adds pluginManagement, so we get
warnings when versions get overridden. It also allows downstream users
not to hunt for the proper property name.

This should solve the problem of having duplicate property names, which
we are already getting.

Also flags FIXMEs for convergence of the versions which are clashing.
Hopefully these will be taken care of as the warnings are emitted, as
now users do not have to specify versions at all.

Change-Id: Iae30f52a39e356c1f45b0a189ac75a82e0677695
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoIntroduce bundle-parent 44/12044/3
Robert Varga [Fri, 17 Oct 2014 10:31:10 +0000 (12:31 +0200)]
Introduce bundle-parent

This introduces a parent for bundle artifacts. It just makes sure
maven-bundle plugin is executed with a default configuration. It can be
reused by any artifact without having to declare the plugin in its build
section.

Change-Id: Ia4ee994bfdc030a9e8b5d9e86734d26730ab62a8
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoAdd a template settings.xml file 50/12950/1
Robert Varga [Wed, 19 Nov 2014 09:54:07 +0000 (10:54 +0100)]
Add a template settings.xml file

This file is needed to teach maven about OpenDaylight repositories
globally. When copied to ~/.m2/settings.xml, individual pom.xmls do not
need to carry repository definitions.

Change-Id: I12c5f812ff846abfd06fe5b679c183122c821b4e
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoIntroduce top-level aggregator 54/11954/1
Robert Varga [Tue, 14 Oct 2014 14:10:33 +0000 (16:10 +0200)]
Introduce top-level aggregator

This patch introduces a top-level aggregator and moves odlparent itself
to a descendant, thus allowing us to add more infrastructure components.

Change-Id: I195ec5216557d6ada2658c94616257f5ec4dc3be
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoMerge "BUG-2159: bump jacoco version"
Surekha Bejgam [Mon, 13 Oct 2014 16:43:44 +0000 (16:43 +0000)]
Merge "BUG-2159: bump jacoco version"

9 years agoMerge "BUG-1386: Bump javassist to 3.18.2"
Surekha Bejgam [Mon, 13 Oct 2014 16:43:06 +0000 (16:43 +0000)]
Merge "BUG-1386: Bump javassist to 3.18.2"

9 years agoBUG-1956: bump TrieMap library 25/11325/2
Robert Varga [Thu, 18 Sep 2014 14:38:50 +0000 (16:38 +0200)]
BUG-1956: bump TrieMap library

This is a follow-up patch to preserve consistency.

Change-Id: I06a583d10af5dc3a96a42dda3b4835b6d29bdf4f
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoBUG-2159: bump jacoco version 16/11816/1
Robert Varga [Wed, 8 Oct 2014 16:04:12 +0000 (18:04 +0200)]
BUG-2159: bump jacoco version

0.6.2 does not work with Java 8, as it mucks around in its internals.
Version 0.7.2 seems to work okay.

Change-Id: I0b2d2c4a5e58d6574f87ff755bd9319bb6515422
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoBUG-1386: Bump javassist to 3.18.2 46/10846/3
Robert Varga [Fri, 5 Sep 2014 11:24:25 +0000 (13:24 +0200)]
BUG-1386: Bump javassist to 3.18.2

Change-Id: I07fc2f1260fca8b2d94c2b23e32a9fb963456973
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoMerge "Adding version/dependency info for JSONAssert"
Surekha Bejgam [Fri, 3 Oct 2014 19:59:10 +0000 (19:59 +0000)]
Merge "Adding version/dependency info for JSONAssert"

9 years agobumped the version for lithium 19/11719/1
Surekha Bejgam [Thu, 2 Oct 2014 23:42:27 +0000 (16:42 -0700)]
bumped the version for lithium
Change-Id: Ifd5dcec91669c89007bdcf3df706d1ec4f6cd2a5
Signed-off-by: Surekha Bejgam <sbejgam@cisco.com>
9 years agoAdding version/dependency info for JSONAssert 99/10799/1
Colin Dixon [Thu, 4 Sep 2014 18:17:46 +0000 (13:17 -0500)]
Adding version/dependency info for JSONAssert

This adds version information for using the JSONassert library which can be
found here: https://github.com/skyscreamer/JSONassert/

The library uses the Apache License Version 2.0 as found here:
https://github.com/skyscreamer/JSONassert/blob/master/LICENSE.txt

Change-Id: I0bc2afc5e3b1718a0f202a1c516786902fd4d372
Signed-off-by: Colin Dixon <colin@colindixon.com>
9 years agoMerge "Use variable to reference nexus proxy"
Surekha Bejgam [Thu, 4 Sep 2014 16:38:35 +0000 (16:38 +0000)]
Merge "Use variable to reference nexus proxy"

9 years agoMerge "BUG-1675: bump netty version to 4.0.23"
Surekha Bejgam [Wed, 3 Sep 2014 23:36:30 +0000 (23:36 +0000)]
Merge "BUG-1675: bump netty version to 4.0.23"

9 years agoBUG-1675: bump netty version to 4.0.23 79/10679/1
Robert Varga [Wed, 3 Sep 2014 09:44:47 +0000 (11:44 +0200)]
BUG-1675: bump netty version to 4.0.23

Speed and correctness fixes have gone into the releases which we should
include in Helium.

Change-Id: Ie106b6b7bb523cdcf142f9c11341f0ff568c691f
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoUse variable to reference nexus proxy 21/10321/1
Devin Avery [Tue, 26 Aug 2014 16:34:51 +0000 (12:34 -0400)]
Use variable to reference nexus proxy

*Edited hardcoded URLs to use nexusproxy variable

Change-Id: Iaf64b855759f893fc3935b462d3aa0f77dcbbafd
Signed-off-by: Devin Avery <devin.avery@brocade.com>
9 years agoPatch upgrade for Apache Tomcat from 7.0.32 to 7.0.53 to take care of ODL Karaf North... 10/10110/3
Madhu Venugopal [Thu, 21 Aug 2014 08:38:19 +0000 (01:38 -0700)]
Patch upgrade for Apache Tomcat from 7.0.32 to 7.0.53 to take care of ODL Karaf Northbound issues.

7.0.32 had no support for Cors and hence we added a hack in the past to pull the CorsFilter from Apache Tomcat
project and placed it as a third-party bundle in the controller project.

But the Cors support was added to Tomcat patch version 7.0.42 and hence it is time to upgrade it to the proper
and remove the hack that we added earlier.

Also, the hacked bundle is not loaded in a karaf container (never attaches itself with the Fragment Host).
Debugged the heck of that, but dont know why the hacked bundle wouldnt register.
But since upgrading is cleaner anyways, we are taking that approach.

Tested the Northbound APIs and it is all working fine.

Change-Id: I37bf577320c5257b72e9fbe85313817230507a0c
Signed-off-by: Madhu Venugopal <mavenugo@gmail.com>
9 years agoMake sure we mention surefire plugin 68/10068/1
Robert Varga [Tue, 19 Aug 2014 16:17:37 +0000 (18:17 +0200)]
Make sure we mention surefire plugin

This forces the use of 2.16 (or whatever) version of surefire plugin by
default by downstream projects, so that they do not have to repeat it.

Change-Id: I4bbbac15732b6627049c0049e7c488fee87234dc
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoMerge "Declare jacoco mavne plugin"
Surekha Bejgam [Sun, 10 Aug 2014 01:25:14 +0000 (01:25 +0000)]
Merge "Declare jacoco mavne plugin"

9 years agoAdding a version for jaxrs-api in org.jboss.resteasy 27/9827/1
Colin Dixon [Fri, 8 Aug 2014 20:07:44 +0000 (15:07 -0500)]
Adding a version for jaxrs-api in org.jboss.resteasy

Change-Id: Id265bb89e07518296df31d84d00b62448c9722f0
Signed-off-by: Colin Dixon <colin@colindixon.com>
9 years agoDeclare jacoco mavne plugin 34/9734/2
Robert Varga [Wed, 6 Aug 2014 07:16:53 +0000 (09:16 +0200)]
Declare jacoco mavne plugin

This adds jacoco into dependencyManagement section, so projects pick the
global version as default and do not have to rely on the property.

Change-Id: Iaf2fb36d4aeb60725e20b91b1890c079ae12e86e
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoMerge "Add explicit org.hamcrest dependency"
Surekha Bejgam [Mon, 4 Aug 2014 19:07:49 +0000 (19:07 +0000)]
Merge "Add explicit org.hamcrest dependency"

9 years agoMerge "Add gitignore"
Surekha Bejgam [Mon, 4 Aug 2014 19:03:27 +0000 (19:03 +0000)]
Merge "Add gitignore"

9 years agoMerge "Add support for gitreview"
Surekha Bejgam [Mon, 4 Aug 2014 17:01:31 +0000 (17:01 +0000)]
Merge "Add support for gitreview"

9 years agoAdd explicit org.hamcrest dependency 25/9625/1
Robert Varga [Sun, 3 Aug 2014 12:26:45 +0000 (14:26 +0200)]
Add explicit org.hamcrest dependency

org.mockito is pulling in hamcrest-core 1.1 while junit requires 1.3.
This results in failures when the two meet, for example in yangtools.

Change-Id: I4040d712f939aad698a45fca45c727918524578f
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoCleanup of parent pom 72/8372/2
Giovanni Meo [Thu, 26 Jun 2014 14:19:33 +0000 (16:19 +0200)]
Cleanup of parent pom

- Cleanup of many duplicate version
- use sort-pom to tidyfy the file and then avoid duplicates in an easier way

Change-Id: I941da53bf61c48d52a3669cc078d5d5c86e98d35
Signed-off-by: Giovanni Meo <gmeo@cisco.com>
9 years agoBUG-1275: add TXW2 to dependency management 19/9119/1
Robert Varga [Thu, 17 Jul 2014 14:53:25 +0000 (16:53 +0200)]
BUG-1275: add TXW2 to dependency management

This small package contains IndentingXMLStreamWriter, which is useful
for pretty-printing XMLs which are output via XMLStreamWriter.

Companion change, Ic83e55eb6d0eeea599e909cc0dae3b145ef9cc9f, introduces
the wrapped user. The dependency may be removed at a later point if
someone creates an ODL class with equivalent functionality.

Change-Id: I834a73f6466c2829194184ee0a30bac6d093665d
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoAdd gitignore 17/9017/1
Dave Tucker [Tue, 15 Jul 2014 11:55:48 +0000 (12:55 +0100)]
Add gitignore

- Add ignores for common filetypes
- OSX, Linux
- Maven and Java
- Eclipse and IntelliJ

Change-Id: Ib967d577cb636532b783dfda1e12780f99b083de
Signed-off-by: Dave Tucker <dave@dtucker.co.uk>
9 years agoAdd support for gitreview 87/8987/1
Dave Tucker [Mon, 14 Jul 2014 13:02:34 +0000 (14:02 +0100)]
Add support for gitreview

Change-Id: I9357406d09afbb45322c25a7fe62613a41638dbf
Signed-off-by: Dave Tucker <dave@dtucker.co.uk>
10 years agoremoved slf4j-simple dependency 08/8308/2
Surekha Bejgam [Tue, 24 Jun 2014 21:11:28 +0000 (14:11 -0700)]
removed slf4j-simple dependency
Change-Id: I4d32bf9dc341857e092ac5a3d627f80d4b28145f
Signed-off-by: Surekha Bejgam <sbejgam@cisco.com>
10 years agoadded flatten maven plugin 03/8303/1
Surekha Bejgam [Tue, 24 Jun 2014 17:13:47 +0000 (10:13 -0700)]
added flatten maven plugin
Change-Id: I33b22e4c5003a063f6e4c967e2b32c86c6f1cf26
Signed-off-by: Surekha Bejgam <sbejgam@cisco.com>
10 years agoremoved nexus proxy property 63/8263/1
Surekha Bejgam [Mon, 23 Jun 2014 22:13:50 +0000 (15:13 -0700)]
removed nexus proxy property
Change-Id: I0d41ee8a6515bed25a33638726d18b18eb612a4b
Signed-off-by: Surekha Bejgam <sbejgam@cisco.com>
10 years agoBug 1129: Added couple of new properties which are used in controller project instead... 23/8123/1
Vaishali Mithbaokar [Wed, 18 Jun 2014 22:01:19 +0000 (15:01 -0700)]
Bug 1129: Added couple of new properties which are used in controller project instead of using hard coded versions

Change-Id: Ib5950fb7d8afe88c23f0dd51cf1e8ae49e1e6de4
Signed-off-by: Vaishali Mithbaokar <vmithbao@cisco.com>
10 years agoadded more common dependencies 95/7995/1
Surekha Bejgam [Fri, 13 Jun 2014 16:43:44 +0000 (09:43 -0700)]
added more common dependencies
Change-Id: I864666f0cd2fc745d639a4a68fc62173b49b13b6
Signed-off-by: Surekha Bejgam <sbejgam@cisco.com>
10 years agoRemovd javadoc plugin from build section 00/7700/1
Vaishali Mithbaokar [Wed, 4 Jun 2014 21:25:20 +0000 (14:25 -0700)]
Removd javadoc plugin from build section

Change-Id: I6f2841a68ebfc8ca75f6b029c6ddfc340c2d6c8e
Signed-off-by: Vaishali Mithbaokar <vmithbao@cisco.com>
10 years agocommenting out javadoc plugin 96/7696/2
Vaishali Mithbaokar [Wed, 4 Jun 2014 17:25:53 +0000 (10:25 -0700)]
commenting out javadoc plugin

Change-Id: I203b899645c968adadc74709413bf28718ecea91
Signed-off-by: Vaishali Mithbaokar <vmithbao@cisco.com>
10 years agoremoved maven jar and bundle plugins 15/7615/1
Vaishali Mithbaokar [Mon, 2 Jun 2014 23:07:22 +0000 (16:07 -0700)]
removed maven jar and bundle plugins

Signed-off-by: Vaishali Mithbaokar <vmithbao@cisco.com>
Change-Id: I252262e68621eee1eeb2f2ea3ca682ba820ef6c3

10 years agoRevert "modified nexus url" 00/7600/1
Andrew Grimberg [Mon, 2 Jun 2014 16:01:26 +0000 (09:01 -0700)]
Revert "modified nexus url"

This reverts commit 8241478188dd1a5790e28bb28a337d3c7b2b814e.

Projects should not be pointing at the localized nexus cache as they
will _not_ be able to push artifacts to the cache.

Change-Id: I9d4aeb9938ce326a7fa6d93d1d6c7e4802c3bc8d
Signed-off-by: Andrew Grimberg <agrimberg@linuxfoundation.org>
10 years agomodified artifactId 48/7548/1
Surekha Bejgam [Fri, 30 May 2014 18:50:13 +0000 (11:50 -0700)]
modified artifactId

Signed-off-by: Surekha Bejgam <sbejgam@cisco.com>
Change-Id: I7dd6f15ceecc5d0df381e170894f7d4196dccc28

10 years agomodified nexus url 47/7547/1
Surekha Bejgam [Fri, 30 May 2014 17:55:44 +0000 (10:55 -0700)]
modified nexus url

Signed-off-by: Surekha Bejgam <sbejgam@cisco.com>
Change-Id: I993e9380bc20366626e13d342e6a31960a3917b6

10 years agomodified groupid for parent 46/7546/1
Surekha Bejgam [Fri, 30 May 2014 17:20:42 +0000 (10:20 -0700)]
modified groupid for parent

Signed-off-by: Surekha Bejgam <sbejgam@cisco.com>
Change-Id: I08a23dc0086540d384706b6024ba3df514653456

10 years agofixed the nexus repo url 30/7530/1
Surekha Bejgam [Fri, 30 May 2014 01:35:10 +0000 (18:35 -0700)]
fixed the nexus repo url

Signed-off-by: Surekha Bejgam <sbejgam@cisco.com>
Change-Id: I1ee0f2a1d69c7278c8f092ce0611bcd28950cd01

10 years agoinitial commit for odl parent which contains common thirdparty dependencies 38/7138/1
Surekha Bejgam [Sat, 17 May 2014 05:06:05 +0000 (22:06 -0700)]
initial commit for odl parent which contains common thirdparty dependencies
Change-Id: I94c0539757a0ebf86e930d07fbecd65c4ce02664
Signed-off-by: Surekha Bejgam <sbejgam@cisco.com>
10 years agoInitial empty repository
Andrew Grimberg [Tue, 13 May 2014 20:01:29 +0000 (20:01 +0000)]
Initial empty repository