odlparent.git
8 years agoBUG-3964 Enabled the generation of sources and javadocs artifacts for all projects... 05/23905/1
Shaleen Saxena [Wed, 8 Jul 2015 14:40:06 +0000 (07:40 -0700)]
BUG-3964 Enabled the generation of sources and javadocs artifacts for all projects. The relevant
plugins were already present in the <pluginManagement> section. These were added to the execution
list as well.

Tested this change by building the controller, openflowplugin and l2switch projects. The sources and
javadocs jar files were generated for the components.

Change-Id: I493c7479ecac189b4eec5e4190c707264219cf1b
Signed-off-by: Shaleen Saxena <ssaxena@brocade.com>
9 years agoBUG-3761: handle repository declaration versions 05/23505/2
Robert Varga [Mon, 29 Jun 2015 11:44:37 +0000 (13:44 +0200)]
BUG-3761: handle repository declaration versions

Adds {{VERSION}} substitution to <repository/> declarations, so they can
be adjusted based on the dependency tree.

Change-Id: I45fe7d6471534be52b7db224737f063b337924b4
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoBUG-1289: bump slf4j to 1.7.7 04/23504/1
Robert Varga [Fri, 26 Jun 2015 17:15:57 +0000 (19:15 +0200)]
BUG-1289: bump slf4j to 1.7.7

While 1.7.12 is the latest release, karaf 3.0.3 is shipping 1.7.7, so
align the versions with that.

Change-Id: I377412fe94a978043901b97272e7a7ed67aad928
Signed-off-by: Robert Varga <rovarga@cisco.com>
(cherry picked from commit 871cf1b8d84dc0a54c32a30f572a1dffda02701d)

9 years agoHandle wrap:mvn: URLs in features-parent 44/23244/1
Robert Varga [Wed, 24 Jun 2015 19:48:39 +0000 (21:48 +0200)]
Handle wrap:mvn: URLs in features-parent

Couple of projects (AAA for example) use wrap:mvn: to wrap a non-osgi
jar into a bundle. For this usage we want to handle {{VERSION}}
replacement, too.

Change-Id: Ieff3ea862e5a95bf0ff416d3f03d46ff84b1914c
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoUse Beryllium version of parent pom 26/23226/1
Thanh Ha [Wed, 24 Jun 2015 14:32:52 +0000 (10:32 -0400)]
Use Beryllium version of parent pom

Change-Id: Idad02fba88919efdd313854f8ba694067e7190cd
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
9 years agoBUG-3837: fix classifier incorrectly used as version 94/23194/1
Robert Varga [Tue, 23 Jun 2015 09:10:01 +0000 (09:10 +0000)]
BUG-3837: fix classifier incorrectly used as version

dependencies.txt includes an optional classifier before the version
field. This means if we pull in the same artifact with and without
classifier.

Change-Id: I3544bcc40aa0327ab7383266b2d8baf5d4f02af9
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
Signed-off-by: Robert Varga <rovarga@cisco.com>
(cherry picked from commit 11b40b2ce899b78ef8d6ba2b66acae0f6a4b4d02)

9 years agoBug 3656: Introducing karaf-plugin 41/22741/1
Ed Warnicke [Mon, 15 Jun 2015 23:07:29 +0000 (17:07 -0600)]
Bug 3656:  Introducing karaf-plugin

This plugin recursively walks down the features files and
installs all related artifacts.

Change-Id: Ie466f22a71945fa7fb19199820196551688d2d6d
Signed-off-by: Ed Warnicke <hagbard@gmail.com>
(cherry picked from commit 6331216aa2e4c5c4935e26e22416d3eec2663f4a)

9 years agoExplicitly set default branch to master 66/21666/1
Thanh Ha [Tue, 2 Jun 2015 14:05:35 +0000 (10:05 -0400)]
Explicitly set default branch to master

This makes it easier to update this setting for future branching and
clear which branch a patch will be submitted to.

Change-Id: Iac586ef5e29d919baf025d9f136a93008964433a
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
9 years agoBug 3533: jetty.version to fix Cors issue 89/21589/1
Ed Warnicke [Mon, 1 Jun 2015 21:13:24 +0000 (14:13 -0700)]
Bug 3533: jetty.version to fix Cors issue

Change-Id: I07ba25e699e9b1c8c7346cbc1fd59679dd73613e
Signed-off-by: Ed Warnicke <hagbard@gmail.com>
9 years agoMerge "Bump checkstyle version to 2.15"
Vaishali Mithbaokar [Mon, 27 Apr 2015 23:12:31 +0000 (23:12 +0000)]
Merge "Bump checkstyle version to 2.15"

9 years agoCheckstyle: exclude autogenerated classes 38/18738/1
Lorand Jakab [Tue, 21 Apr 2015 11:49:34 +0000 (14:49 +0300)]
Checkstyle: exclude autogenerated classes

Change-Id: I11d2bee75696923b23bc67d35b1b647a0cab4e90
Signed-off-by: Lorand Jakab <lojakab@cisco.com>
9 years agoBump checkstyle version to 2.15 60/18660/1
Thanh Ha [Mon, 20 Apr 2015 20:15:19 +0000 (16:15 -0400)]
Bump checkstyle version to 2.15

This version will allow us to re-enable the currently disabled Google
Style in odl_checkstyle.

Change-Id: Ide784f794b5137b37c7cd6e622398e66c21b1368
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
9 years agoVersion bump for master after stable/lithium 75/18475/3
Vaishali Mithbaokar [Thu, 16 Apr 2015 19:42:23 +0000 (12:42 -0700)]
Version bump for master after stable/lithium

Change-Id: I8874e7a7cf8408e5c99da44683db95cdbd5e4ed4
Signed-off-by: Vaishali Mithbaokar <vmithbao@cisco.com>
9 years agoBug 2907: Removed open-coded features.xml parsing 02/18402/1
Tony Tkacik [Thu, 16 Apr 2015 09:09:42 +0000 (11:09 +0200)]
Bug 2907: Removed open-coded features.xml parsing

SingleFeatureTest used open-coded feature parsing
which did not accounted for multiple versions of
features.

Replaced open-coded parsing with parser from Karaf
itself.

This fixes issue in SingleFeatureTest when
used with Karaf 3.0.3

Change-Id: Ia734ccfb44d27a2c9402baa25fcc4033f30a30ee
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
9 years agoBug 2907 - upgrade to karaf 3.0.3 91/15391/5
Ed Warnicke [Mon, 16 Feb 2015 23:59:12 +0000 (16:59 -0700)]
Bug 2907 - upgrade to karaf 3.0.3

This is needed to support Java 8

Change-Id: I99efde964392995de35d084522cb01768939f65d
Signed-off-by: Ed Warnicke <eaw@cisco.com>
9 years agoBump eclipse.persistence.version to 2.5.2 65/17565/1
Ryan Moats [Wed, 1 Apr 2015 16:12:36 +0000 (11:12 -0500)]
Bump eclipse.persistence.version to 2.5.2

version 2.5.0 has the following NPE bug:
https://bugs.eclipse.org/bugs/show_bug.cgi?id=414577
bump version to avoid neutron northbound hitting this problem

Change-Id: Iea58a19496687a874b81b1c9f9f8f7da9228741f
Signed-off-by: Ryan Moats <rmoats@us.ibm.com>
9 years agoMerge "Update to latest checkstyle plugin"
Vaishali Mithbaokar [Wed, 25 Mar 2015 15:45:45 +0000 (15:45 +0000)]
Merge "Update to latest checkstyle plugin"

9 years agoMerge "Fix checkstyle warnings"
Vaishali Mithbaokar [Wed, 25 Mar 2015 15:42:12 +0000 (15:42 +0000)]
Merge "Fix checkstyle warnings"

9 years agoMerge "Bump Javassist version to 3.19.0-GA"
Vaishali Mithbaokar [Wed, 25 Mar 2015 15:39:34 +0000 (15:39 +0000)]
Merge "Bump Javassist version to 3.19.0-GA"

9 years agoFix checkstyle warnings 01/17101/1
Robert Varga [Wed, 25 Mar 2015 11:50:00 +0000 (12:50 +0100)]
Fix checkstyle warnings

Reorder keywords to follow JLS.

Change-Id: I7172191d3352afbf2e963c53b30b20430061f742
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoMerge "Bump Bouncy Castle version to 1.52."
Vaishali Mithbaokar [Wed, 25 Mar 2015 06:32:21 +0000 (06:32 +0000)]
Merge "Bump Bouncy Castle version to 1.52."

9 years agoBump Javassist version to 3.19.0-GA 66/17066/1
Gary Wu [Tue, 24 Mar 2015 16:54:25 +0000 (09:54 -0700)]
Bump Javassist version to 3.19.0-GA

This version bump was requested by Robert Varga to
go with the version bump of Netty to 4.0.26.Final.

Change-Id: I3e026c968e63e9b5a8946863d7aafbfd7dbe34fa
Signed-off-by: Gary Wu <Gary.Wu1@huawei.com>
9 years agoBump Netty version to 4.0.26.Final 65/17065/1
Gary Wu [Tue, 24 Mar 2015 16:50:17 +0000 (09:50 -0700)]
Bump Netty version to 4.0.26.Final

Netty 4.0.26.Final is required by the USC project
to support TLS mutual authentication.

Change-Id: I83097a12f14e4feed7ce1655f2a8c04e8d065a2b
Signed-off-by: Gary Wu <Gary.Wu1@huawei.com>
9 years agoBump Bouncy Castle version to 1.52. 64/17064/1
Gary Wu [Tue, 24 Mar 2015 16:45:41 +0000 (09:45 -0700)]
Bump Bouncy Castle version to 1.52.

Bouncy Castle 1.52 is required by the USC project
to support DTLS 1.2.

Change-Id: I24445abe2b3865eefd8ee5b6693899555276f633
Signed-off-by: Gary Wu <Gary.Wu1@huawei.com>
9 years agoBreak circular dependency 25/16425/2
Thanh Ha [Fri, 13 Mar 2015 03:53:33 +0000 (23:53 -0400)]
Break circular dependency

odlparent depends on checkstyle depends on odlparent. We need to break
this circular dependency otherwise building odlparent won't be possible.

Change-Id: I4bda5cc21eed5696fd0253f2effe42afc78517fd
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
9 years agoAdd property skip.karaf.featureTest that can be used on the command line 93/16493/1
Ed Warnicke [Fri, 13 Mar 2015 17:37:59 +0000 (10:37 -0700)]
Add property skip.karaf.featureTest that can be used on the command line

mvn -Dskip.karaf.featureTest will cause SingleFeatureTests to not run.

Many thanks to Sam Hague for the idea :)

Change-Id: Id995d08ba762558a1349a9e3ff77fb703bc8552f
Signed-off-by: Ed Warnicke <eaw@cisco.com>
9 years agoMerge "Enable checkstyle by default"
Vaishali Mithbaokar [Thu, 12 Mar 2015 05:46:17 +0000 (05:46 +0000)]
Merge "Enable checkstyle by default"

9 years agoMerge "Validate license headers in code files"
Vaishali Mithbaokar [Thu, 12 Mar 2015 05:46:08 +0000 (05:46 +0000)]
Merge "Validate license headers in code files"

9 years agoUpdate to latest checkstyle plugin 91/16291/1
Thanh Ha [Tue, 10 Mar 2015 21:58:42 +0000 (17:58 -0400)]
Update to latest checkstyle plugin

Change-Id: Id5e567a082322ecfd37867d902ec2f6b897e171c
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
9 years agoEnable checkstyle by default 85/16285/1
Thanh Ha [Tue, 10 Mar 2015 21:04:09 +0000 (17:04 -0400)]
Enable checkstyle by default

Change-Id: I014ae79143bc0e0bc8a26fa3b827a7783f68d950
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
9 years agoValidate license headers in code files 83/13983/3
Thanh Ha [Thu, 8 Jan 2015 01:17:43 +0000 (20:17 -0500)]
Validate license headers in code files

Uses checkstyle to scan the code for files that do not conform to the
license header format described on the wiki at:

https://wiki.opendaylight.org/view/ODL_Coding_Guidelines#C.2FC.2B.2B.2FJava

Change-Id: I79520de47369586071237ec9558299a4eb21200e
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
9 years agoActivate javadoc/source generation for bundles 53/16253/2
Robert Varga [Tue, 10 Mar 2015 11:33:26 +0000 (12:33 +0100)]
Activate javadoc/source generation for bundles

This adds javadoc/source plugin triggers to bundle-parent, making all
bundles automatically generate their javadocs/sources jars.

Change-Id: I1d44a5c130ec23ee5d06703c1a94aec4d30c824c
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoAdd common javadoc/source plugin configuration 52/16252/1
Robert Varga [Tue, 10 Mar 2015 11:31:03 +0000 (12:31 +0100)]
Add common javadoc/source plugin configuration

We want to produce source/javadoc jars by default, so this adds the
appropriate configuration to the default configuration.

Change-Id: I954619d6168e0f0f05308b6ad35fcea4522cd092
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoFix indents to 4 spaces 52/15952/2
Thanh Ha [Tue, 3 Mar 2015 01:21:57 +0000 (20:21 -0500)]
Fix indents to 4 spaces

While the Google Java Style guidelines recommends 2 spaces. Most
projects on ODL actually today follow the 4 space rule for indents. If
there is agreement I think we should make 4 spaces an exception for ODL
code style instead of following Google's guidelines here.

https://google-styleguide.googlecode.com/svn/trunk/javaguide.html#s4.2-block-indentation

Change-Id: I64a4492e2f72e885c1e7373850eda382f956844a
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
9 years agoMerge "Bug 2761: Disables external snapshot repositories for feature-test"
Surekha Bejgam [Mon, 2 Mar 2015 17:40:08 +0000 (17:40 +0000)]
Merge "Bug 2761: Disables external snapshot repositories for feature-test"

9 years agoBug 2761: Disables external snapshot repositories for feature-test 73/15773/1
Tony Tkacik [Thu, 26 Feb 2015 12:22:59 +0000 (13:22 +0100)]
Bug 2761: Disables external snapshot repositories for feature-test

Pax URL and Karaf by default always search for new version of snapshots
in all snapshots repository, even if that snapshots does not belong to that
repository and maven is invoked even with -nsu (no snapshot update)
or offline mode.

This is also true for OpenDaylight snapshot artefacts - pax url tries
to resolve them from third-party repositories, even if they are not present
there - this increases time which takes for features to install.

For more complex projects this actually means several HTTP GETs for each
snapshot bundle referenced, even if the bundle is already present
in local maven repository.

In order to speed-up installation and remove unnecessary network traffic,
which fails for obvious reasons, external snapshot repositories are
removed.

BGPCEP feture test (all snapshots downloaded, running with mvn clean install -o)
takes 2:16 minutes with this patch. Originally it took 12 minutes and hundreds of
 HTTP GET calls to snapshot repositories were observed.

Change-Id: I939cbfcab86eddc1ba7663e78c37bb57f2d8f0f5
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
9 years agoIgnore Eclipse warning on enforcer plugin 90/15490/1
Lorand Jakab [Thu, 19 Feb 2015 10:14:54 +0000 (12:14 +0200)]
Ignore Eclipse warning on enforcer plugin

Eclipse shows the following warning 'maven-enforcer-plugin (goal
"enforce") is ignored by m2e' for all POM files.  This commit silences
that warning, since there's not much we can do about it (building in the
command line, or, at the latests, Jenkins will run the enforcer plugin).

Change-Id: Ifc9e1617fa9934f95216126b00fafd6cab5909c2
Signed-off-by: Lorand Jakab <lojakab@cisco.com>
9 years agoMerge "Completely remove references to xtend"
Vaishali Mithbaokar [Sat, 14 Feb 2015 18:13:14 +0000 (18:13 +0000)]
Merge "Completely remove references to xtend"

9 years agoMerge "BUG-2680: downgrade to netty 4.0.24"
Vaishali Mithbaokar [Sat, 14 Feb 2015 18:02:37 +0000 (18:02 +0000)]
Merge "BUG-2680: downgrade to netty 4.0.24"

9 years agoBUG-2680: downgrade to netty 4.0.24 22/15322/1
Robert Varga [Sat, 14 Feb 2015 11:22:46 +0000 (12:22 +0100)]
BUG-2680: downgrade to netty 4.0.24

Netty 4.0.25 has introduced an OSGi regression, as reported in
https://github.com/netty/netty/issues/3302. Go back one version, waiting
for 4.0.26.

Change-Id: I1ab04e6b5b46d82f68b08ceac327a85d0dbe6b3b
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoCompletely remove references to xtend 13/15313/2
Robert Varga [Sat, 14 Feb 2015 08:17:47 +0000 (09:17 +0100)]
Completely remove references to xtend

The problem we have had before was that the dependencyManagement
declaration overrode the normal version when importing dependencies,
throwing feature tests off.

Change-Id: Ic7520ffafbcf8f9582dc3508a467bd4b97dfd0a7
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoAdded the xtend version declaration and set 2.7.3. 09/15309/1
Hideyuki Tai [Sat, 14 Feb 2015 01:42:12 +0000 (20:42 -0500)]
Added the xtend version declaration and set 2.7.3.

Because yangtools project uses the version 2.7.3 and other project does
not use xtend at all, this patch set 2.7.3.

Change-Id: Ied6cbbd49fc8e8db156af1f11958a5731a074ea7
Signed-off-by: Hideyuki Tai <Hideyuki.Tai@necam.com>
9 years agoMerge "Use scope=provided for OSGi bundles"
Surekha Bejgam [Sat, 14 Feb 2015 00:14:49 +0000 (00:14 +0000)]
Merge "Use scope=provided for OSGi bundles"

9 years agoMerge "Unify maven jar plugin versions"
Surekha Bejgam [Sat, 14 Feb 2015 00:14:22 +0000 (00:14 +0000)]
Merge "Unify maven jar plugin versions"

9 years agoMerge "Add dependency plugin version declaration"
Surekha Bejgam [Sat, 14 Feb 2015 00:13:55 +0000 (00:13 +0000)]
Merge "Add dependency plugin version declaration"

9 years agoMerge "Unify compiler version"
Surekha Bejgam [Sat, 14 Feb 2015 00:13:18 +0000 (00:13 +0000)]
Merge "Unify compiler version"

9 years agoMerge "Unify maven release plugin version"
Surekha Bejgam [Sat, 14 Feb 2015 00:05:35 +0000 (00:05 +0000)]
Merge "Unify maven release plugin version"

9 years agoMerge "Remove xtend version declaration"
Surekha Bejgam [Sat, 14 Feb 2015 00:03:49 +0000 (00:03 +0000)]
Merge "Remove xtend version declaration"

9 years agoMerge "Use Maven Enforcer plugin to require Maven version"
Surekha Bejgam [Sat, 14 Feb 2015 00:02:30 +0000 (00:02 +0000)]
Merge "Use Maven Enforcer plugin to require Maven version"

9 years agoMerge "BUG-2680: bump netty to 4.0.25"
Surekha Bejgam [Sat, 14 Feb 2015 00:01:42 +0000 (00:01 +0000)]
Merge "BUG-2680: bump netty to 4.0.25"

9 years agoMerge "BUG-1173: bump guava version to 18.0"
Surekha Bejgam [Fri, 13 Feb 2015 23:59:32 +0000 (23:59 +0000)]
Merge "BUG-1173: bump guava version to 18.0"

9 years agoRemove xtend version declaration 03/15303/1
Robert Varga [Fri, 13 Feb 2015 22:45:42 +0000 (23:45 +0100)]
Remove xtend version declaration

This version is no longer used, as yangtools uses a different version
and other projects do not use xtend at all.

Change-Id: I7563de41a4b69b1f7c55db3f75d1119afc060d7b
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoUnify maven release plugin version 99/15299/1
Robert Varga [Fri, 13 Feb 2015 22:36:02 +0000 (23:36 +0100)]
Unify maven release plugin version

Instead of defining two properties with differing versions, keep the
version in one and reference it in the other.

Change-Id: I58d229be6b0e18f176e23c9008d57da42fe0f5c7
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoUnify compiler version 98/15298/1
Robert Varga [Fri, 13 Feb 2015 22:34:27 +0000 (23:34 +0100)]
Unify compiler version

We have had two defines for this particular plugin. Unify them.

Change-Id: I1ecf26e19d8cdc8e82015782898960fe44842694
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoAdd dependency plugin version declaration 97/15297/1
Robert Varga [Fri, 13 Feb 2015 22:33:11 +0000 (23:33 +0100)]
Add dependency plugin version declaration

Some downstream projects already define this. Provide a common
definition.

Change-Id: I75d2c43caf6bdb6a4f079081a3cfe946ed9cc008
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoUnify maven jar plugin versions 94/15294/1
Robert Varga [Fri, 13 Feb 2015 22:22:16 +0000 (23:22 +0100)]
Unify maven jar plugin versions

Make sure we use precisely one version.

Change-Id: I8ee6130d4f028bfe65a49c0f010a3bda2d02fb6e
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoUse scope=provided for OSGi bundles 93/15293/1
Robert Varga [Fri, 13 Feb 2015 22:20:03 +0000 (23:20 +0100)]
Use scope=provided for OSGi bundles

OSGi run-time services are always expected to be provided by the
container. Mark them as such by default.

Change-Id: I0b2b9e251760c81519b8780f55565e39f57c3423
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoMerge "Add pluginRepositories section to help resolving Maven plugins"
Vaishali Mithbaokar [Tue, 10 Feb 2015 21:42:47 +0000 (21:42 +0000)]
Merge "Add pluginRepositories section to help resolving Maven plugins"

9 years agoMerge "Added .project and .classpath in .gitignore. These are configuration files...
Vaishali Mithbaokar [Mon, 9 Feb 2015 21:19:10 +0000 (21:19 +0000)]
Merge "Added .project and .classpath in .gitignore. These are configuration files from eclipse and change from system to system."

9 years agoUse Maven Enforcer plugin to require Maven version 38/14238/3
Thanh Ha [Mon, 19 Jan 2015 04:14:52 +0000 (23:14 -0500)]
Use Maven Enforcer plugin to require Maven version

Using the <prerequisites> configuration in pom files is deprecated and
it is recommended to use the maven-enforcer-plugin to enforce these
rules instead.

See:
http://jira.codehaus.org/browse/MNG-5297
http://jira.codehaus.org/browse/MNG-4840

Change-Id: I7b17bd37223a3f92a69b5a02eaa5701e8434b2b1
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
9 years agoAdd pluginRepositories section to help resolving Maven plugins 35/15035/1
Thanh Ha [Sun, 8 Feb 2015 06:48:40 +0000 (01:48 -0500)]
Add pluginRepositories section to help resolving Maven plugins

<pluginRepositories> are used to determine where to download plugins
used by Maven in order to build. While <repositories> is used to
download artifacts depended by a project during a build. We need both
defined in order to successfully download all artifacts using the
OpenDaylight mirror and not relying on Maven Central directly.

- Add pluginRepositories section to help resolve Maven plugins
- Change tab setting to 2 for xml
- Update Copyright year

Change-Id: I5ad09d6337d4f27768cd9f4af185018e0f91f7b8
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
9 years agoMerge "Set root pom.xml <name> for Sonar"
Vaishali Mithbaokar [Sat, 7 Feb 2015 19:32:00 +0000 (19:32 +0000)]
Merge "Set root pom.xml <name> for Sonar"

9 years agoMerge "Add maven install and deploy plugin versions."
Surekha Bejgam [Thu, 5 Feb 2015 23:55:02 +0000 (23:55 +0000)]
Merge "Add maven install and deploy plugin versions."

9 years agoBUG-2680: bump netty to 4.0.25 09/14909/1
Robert Varga [Thu, 5 Feb 2015 10:49:56 +0000 (11:49 +0100)]
BUG-2680: bump netty to 4.0.25

Simple version bump.

Change-Id: I6b5c048baa48b206860c718dab61e9525558a51a
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoAdd maven install and deploy plugin versions. 57/14857/1
Nathan Harmon [Wed, 4 Feb 2015 21:15:40 +0000 (13:15 -0800)]
Add maven install and deploy plugin versions.

Some artifacts may reference these plugins in order to skip the operations.

Change-Id: I5242dfc7c868f29ff2ca596bb105888436a7e47d
Signed-off-by: Nathan Harmon <nathan.harmon@hp.com>
9 years agoBUG-1173: bump guava version to 18.0 32/14832/1
Robert Varga [Wed, 4 Feb 2015 15:37:21 +0000 (16:37 +0100)]
BUG-1173: bump guava version to 18.0

This is a follow-up patch once all the downstreams have removed their
overrides. Bumps guava from 14.0.1 to 18.0.

Change-Id: I4d699aad49e57e942425388a93a210242ffd7f3d
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoBump pax-exam to 4.4.0 37/14437/1
Robert Varga [Fri, 23 Jan 2015 12:42:50 +0000 (13:42 +0100)]
Bump pax-exam to 4.4.0

Switch to latest release train of pax-exam.

Change-Id: Icf89b502d06faa3f25c998708f42dfb8ff813d40
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoHarmonize pax-exam versions 36/14436/1
Robert Varga [Fri, 23 Jan 2015 12:42:08 +0000 (13:42 +0100)]
Harmonize pax-exam versions

Upgrades the global definition to 3.5.0 and removes the override which
was being applied.

Change-Id: I612df24167d058b1aa326f09f094391443ba8dfd
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoAdded .project and .classpath in .gitignore. These are configuration 88/14288/1
Charalampos Kaidos [Tue, 20 Jan 2015 14:37:07 +0000 (16:37 +0200)]
Added .project and .classpath in .gitignore. These are configuration
files from eclipse and change from system to system.

Change-Id: Ie5f0a5628255e5a1e260bd27e84ccb15191f20a6
Signed-off-by: Charalampos Kaidos <ckaidos@intracom-telecom.com>
9 years agoSet root pom.xml <name> for Sonar 53/14053/2
Thanh Ha [Fri, 9 Jan 2015 21:02:50 +0000 (16:02 -0500)]
Set root pom.xml <name> for Sonar

As mentioned on the mailing list Sonar uses the <name> field of the
pom.xml that is passed to the mvn command as the name of the project in
Sonar. In most cases this is the root pom.xml file in a project. This
patch sets the name to the project shortname.

https://lists.opendaylight.org/pipermail/discuss/2014-November/004024.html

Change-Id: Iab4e4dcec94399553b31822d96b88c031ee4958b
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
9 years agoBUG-2159: bump karaf version used in tests 61/14161/1
Robert Varga [Thu, 15 Jan 2015 02:09:26 +0000 (03:09 +0100)]
BUG-2159: bump karaf version used in tests

This is a partial re-application of
Icf65d10734c760bf8ef7f3048e3dadf7c801cd5e and mirrors the change already
made to yangtools (I67d7cd3fb3f7e243fab3cf7f8c36ff0ec3d91040).

We bump the version of karaf used during testing only (not the plugin),
so feature tests are able to succeed with Java 8. This patch is needed
to enable safe migration of downstream projects from yangtools-hosted
feature builder to the one provided in odlparent.

Change-Id: I4c648336a868a722905e82e79d832f541f43b6c2
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoRevert "BUG-2261: bump karaf to 3.0.2" 23/14123/2
Robert Varga [Tue, 13 Jan 2015 14:58:54 +0000 (14:58 +0000)]
Revert "BUG-2261: bump karaf to 3.0.2"

This reverts commit 21d17e3e235979642ee73b8d410961362afc4705.

It turns out Karaf has upgraded schema incompatibly, so we need to schedule and closely execute the upgrade.

Change-Id: Ic7504ef00ca6c854aef8034e4bfa1abbcae7be0a
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoMerge "Change features-parent from using src/main/feature to src/main/features"
Surekha Bejgam [Mon, 12 Jan 2015 20:09:13 +0000 (20:09 +0000)]
Merge "Change features-parent from using src/main/feature to src/main/features"

9 years agoMerge "Add ODL Checkstyle"
Surekha Bejgam [Mon, 12 Jan 2015 20:06:22 +0000 (20:06 +0000)]
Merge "Add ODL Checkstyle"

9 years agoChange features-parent from using src/main/feature to src/main/features 95/14095/1
Ed Warnicke [Fri, 2 Jan 2015 19:54:02 +0000 (13:54 -0600)]
Change features-parent from using src/main/feature to src/main/features

Also add some lifecycle plugin stuff so Eclipse is happy :)

Change-Id: Ie5cc950e1a605890c5707506e92d0421be13c235
Signed-off-by: Ed Warnicke <eaw@cisco.com>
9 years agoAdd ODL Checkstyle 55/13955/5
Thanh Ha [Wed, 7 Jan 2015 01:17:59 +0000 (20:17 -0500)]
Add ODL Checkstyle

Adds a checkstyle resource for ODL projects to use that allows them to
take advantage of ODL code style best practices in Java. Details on ODL
Code Style Guidelines can be found on the wiki at
https://wiki.opendaylight.org/view/ODL_Coding_Guidelines

This odl_checks.xml is based on the google checkstyle found at
https://google-styleguide.googlecode.com/svn-history/r130/trunk/javaguide.html

maven-checkstyle-plugin 2.13 does not yet support some of the Google Style
checks which ODL style is heavily based on. Until this is resolved we need
to comment out unsupported checkstyle sections.
https://jira.codehaus.org/browse/MCHECKSTYLE-261

Change-Id: I0097a8fb0ab894d0ee11375e4956f51c30229f24
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
9 years agoBUG-2261: bump karaf to 3.0.2 61/13961/2
Robert Varga [Wed, 7 Jan 2015 13:12:31 +0000 (14:12 +0100)]
BUG-2261: bump karaf to 3.0.2

In order to support Java 8, we need to upgrade the Karaf version, which
fixes https://issues.apache.org/jira/browse/KARAF-2602.

Change-Id: Icf65d10734c760bf8ef7f3048e3dadf7c801cd5e
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoMerge "Added version for maven-deploy-plugin in pom.xml."
Vaishali Mithbaokar [Thu, 1 Jan 2015 06:07:22 +0000 (06:07 +0000)]
Merge "Added version for maven-deploy-plugin in pom.xml."

9 years agoMerge "Bug 1918: Set org.json.version to 20131018."
Vaishali Mithbaokar [Wed, 24 Dec 2014 00:57:39 +0000 (00:57 +0000)]
Merge "Bug 1918: Set org.json.version to 20131018."

9 years agoMerge "Fixed url elements in pom.xml."
Vaishali Mithbaokar [Wed, 24 Dec 2014 00:51:42 +0000 (00:51 +0000)]
Merge "Fixed url elements in pom.xml."

9 years agoRemoved <sonar.profile> odlparent/pom.xml. 11/13611/1
Hideyuki Tai [Sat, 13 Dec 2014 04:02:46 +0000 (23:02 -0500)]
Removed <sonar.profile> odlparent/pom.xml.

Daily builds on the master branch have been failing since it is setup
due to the misconfiguration on <sonar.profile> of odlparent/pom.xml.
https://jenkins.opendaylight.org/releng/view/odlparent/job/odlparent-daily-master/

Considering "Sonar way with Findbugs" profile and "Sonar way ODL"
profile, which is the default profile in sonar.opendaylight.org, are
the exactly same, <sonar.profile> is not needed to be set.
https://sonar.opendaylight.org/profiles/compare?id1=1&id2=4

Change-Id: Ida4ab5c7b97c2bab7c51e501241d23bc6ce9f5b8
Signed-off-by: Hideyuki Tai <Hideyuki.Tai@necam.com>
9 years agoAdded version for maven-deploy-plugin in pom.xml. 08/13608/1
Hideyuki Tai [Sat, 13 Dec 2014 02:04:22 +0000 (21:04 -0500)]
Added version for maven-deploy-plugin in pom.xml.

Change-Id: Id5fa84a4973049b182fb07f43f22c17f16b1bfa6
Signed-off-by: Hideyuki Tai <Hideyuki.Tai@necam.com>
9 years agoFixed url elements in pom.xml. 07/13607/1
Hideyuki Tai [Sat, 13 Dec 2014 01:34:11 +0000 (20:34 -0500)]
Fixed url elements in pom.xml.

Change-Id: I83c481f65e04d97a3997c9faa0ee37ec10383d08
Signed-off-by: Hideyuki Tai <Hideyuki.Tai@necam.com>
9 years agoMerge "Introduce features-parent"
Vaishali Mithbaokar [Mon, 8 Dec 2014 19:50:00 +0000 (19:50 +0000)]
Merge "Introduce features-parent"

9 years agoBug 1918: Set org.json.version to 20131018. 15/13415/1
Vratko Polak [Fri, 5 Dec 2014 13:01:34 +0000 (14:01 +0100)]
Bug 1918: Set org.json.version to 20131018.

Previously used value was 20080701,
but that somehow led to (one symptom of) Bug 1918.
20131018 version is more recent,
and already present in /system repository.
The correct fix would also make other projects
refer to version defined here, to avoid skew.

Change-Id: Id6989ba18890c7bc16c21ca9bc703d848958f40d
Signed-off-by: Vratko Polak <vrpolak@cisco.com>
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 agoIntroduce features-parent 55/11955/8
Robert Varga [Tue, 14 Oct 2014 14:14:54 +0000 (16:14 +0200)]
Introduce features-parent

This is a migrated utility parent for features artifact. Downstream
projects should refer to this artifact as their parent, fill in the few
gaps and should be locked'n'ready for generating their feature and run
the test.

Change-Id: I44b892b18a73ce5c2fe8cf2462d70b19840ce6a2
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>