odlparent.git
7 years agoUpgrade Servlet API 3.0.1 -> 3.1.0 69/38269/7
Stephen Kitt [Mon, 2 May 2016 13:15:23 +0000 (15:15 +0200)]
Upgrade Servlet API 3.0.1 -> 3.1.0

This is part of Java EE 7 and adds non-blocking I/O and WebSocket
support. See https://jcp.org/en/jsr/detail?id=340 for details.

Change-Id: Ia615749593971421b9388d37700b957f847cbb6b
Signed-off-by: Stephen Kitt <skitt@redhat.com>
7 years agoFix jacoco and sonar exclusions for yang-generated files 86/49286/3
AbdulRahman AlHamali [Tue, 13 Dec 2016 09:05:07 +0000 (11:05 +0200)]
Fix jacoco and sonar exclusions for yang-generated files

Jacoco and Sonar exclusions lists were missing some yang-generated
files that should be excluded. Also update the jacoco and sonar
exclusions to match.

Change-Id: Iff7f68102d66724a86d1654fd59145e9bc22e66a
Signed-off-by: AbdulRahman AlHamali <a.alhamali93@gmail.com>
7 years agoAdd maven-help-plugin and exec-maven-plugin 45/49345/1
Robert Varga [Wed, 14 Dec 2016 12:00:00 +0000 (13:00 +0100)]
Add maven-help-plugin and exec-maven-plugin

This just defines the versions, so they can be used
downstream without specifying versions.

Change-Id: I186b326e4d69403888074c30e7c92f6d8a2e69eb
Signed-off-by: Robert Varga <rovarga@cisco.com>
7 years agogit-commit-id-plugin skipped on mvn -Pq, because it slows down a little 73/49273/1
Michael Vorburger [Mon, 12 Dec 2016 21:09:06 +0000 (22:09 +0100)]
git-commit-id-plugin skipped on mvn -Pq, because it slows down a little

Change-Id: I5570855a6de43858f5f7305e7c2a53da778f1ad2
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
7 years ago[eclipse] git-commit-id-plugin ignored in M2E by lifecycle-mapping 89/49089/2
Michael Vorburger [Wed, 7 Dec 2016 11:45:42 +0000 (12:45 +0100)]
[eclipse] git-commit-id-plugin ignored in M2E by lifecycle-mapping

The recently git-commit-id-plugin likely was the culprit for the
recently very badly dropped Build Workspace performance issue I've
started noticing in Eclipse... there is really no need at all to produce
the new META-INF/git.properties during incremental in-IDE build (as
useful as it is on CLI build) - so ignore it!

Change-Id: I1a5a8282cdee236a5911560b80b1193522173c1d
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
7 years agoBug 6523: Use opendaylight-karaf-empty for SingleFeatureTest 34/48934/1
Vratko Polak [Fri, 2 Dec 2016 18:20:38 +0000 (19:20 +0100)]
Bug 6523: Use opendaylight-karaf-empty for SingleFeatureTest

This makes feature-parent to use the same karaf container
as integration/distribution uses for testing its features.

The downside is developers experiencing
daily download of a big snapshot artifact.

A solution which replaces org.apache.aries.proxy.impl
in maven-surefire-plugin default (non-snapshot) karaf container would be preferable.

Change-Id: I6cd4f0ee4c9883e0376f262bd2f09d1bc1c29911
Signed-off-by: Vratko Polak <vrpolak@cisco.com>
7 years agoBug 7285 - CENTINEL Carbon Autorelease Build Failure 06/48906/2
Alexis de Talhouët [Fri, 2 Dec 2016 12:20:07 +0000 (07:20 -0500)]
Bug 7285 - CENTINEL Carbon Autorelease Build Failure

guice dependency shouldn't be targeted with scope test
as downstream consumer of that dependency needs it during
some other lifecycle state (compile).

Centinel is pulling graylog2-plugin that requires guice at
compile time, and does pull it as transitice dependency.
But since odlparent provide it with the scope test, and centinel
isn't speficically defining that dependency, odlparent overwrite
the transitive dependency of graylog2-plugin

Change-Id: I9c109f942804637463113db56d0bce45d4cf65ae
Signed-off-by: Alexis de Talhouët <adetalhouet@inocybe.com>
7 years agogit-commit-id-plugin cannot fail build for new projects w.o. .git/ 65/48865/2
Michael Vorburger [Thu, 1 Dec 2016 10:41:29 +0000 (11:41 +0100)]
git-commit-id-plugin cannot fail build for new projects w.o. .git/

Change-Id: I5483524047476b9fcf3562dde55b07c79efbea0b
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
7 years agoBUG-4219: eliminate odlparent-version 35/48535/2
Robert Varga [Mon, 21 Nov 2016 13:45:24 +0000 (14:45 +0100)]
BUG-4219: eliminate odlparent-version

Since karaf4-parent is derived from odlparent,
we can just add branding and conf to our artifacts
and not specify the version. Hence we can eliminate
odlparent.version.

Change-Id: Ic62f80cca737cfc386a428d33ccac2b4ab43c395
Signed-off-by: Robert Varga <rovarga@cisco.com>
7 years agoCheckstyle Windows EOL single message instead of each line 37/48437/2
Michael Vorburger [Thu, 17 Nov 2016 14:12:20 +0000 (15:12 +0100)]
Checkstyle Windows EOL single message instead of each line

The current configuration prints a Checkstyle violation for EACH LINE in
a file with Windows (CR+LF) instead of UNIX (LF) end of line (EOL)
delimiters.

This change adjusts that to cause only 1 violation per such file.

This leads to clearer and shorter logs.

Change-Id: I4ef2825608966e3dbd714f73fbc462e10cc5d8d8
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
7 years agoAdd akka-distributed-data to akka features 88/48788/1
Tomas Cere [Tue, 29 Nov 2016 14:44:50 +0000 (15:44 +0100)]
Add akka-distributed-data to akka features

Change-Id: I2548ab02df746dc076dc5a7153accd54b39e22ba
Signed-off-by: Tomas Cere <tcere@cisco.com>
7 years agogit-commit-id-plugin to put a META-INF/git.properties in all built JAR 43/48443/6
Michael Vorburger [Thu, 17 Nov 2016 15:14:32 +0000 (16:14 +0100)]
git-commit-id-plugin to put a META-INF/git.properties in all built JAR

see https://github.com/ktoso/maven-git-commit-id-plugin for background

This automatically works for all ODL JARs without any changes needed in
any other POM (unlike buildnumber-maven-plugin which needs SCM info).

This required https://git.opendaylight.org/gerrit/#/c/48447/ before.

Change-Id: I43f9692b4a3ae83a90cdfbeaf20bd2cba323bce8
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
7 years agoUpgrade commons-fileupload from 1.3.1 to 1.3.2 (security vulnerability) 34/48734/2
Michael Vorburger [Mon, 28 Nov 2016 11:24:45 +0000 (12:24 +0100)]
Upgrade commons-fileupload from 1.3.1 to 1.3.2 (security vulnerability)

https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2016-3092

http://mail-archives.us.apache.org/mod_mbox/www-announce/201606.mbox/%3C6223ece6-2b41-ef4f-22f9-d3481e492832@apache.org%3E

https://bugzilla.redhat.com/show_bug.cgi?id=1349475

Change-Id: Ifc63c3b6021d8a8b3a906905fee96ce7287fd96b
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
7 years agoUpgrade Spring Framework from 3.2.14 to 3.2.17 (security vulnerability) 37/48737/1
Michael Vorburger [Mon, 28 Nov 2016 12:48:22 +0000 (13:48 +0100)]
Upgrade Spring Framework from 3.2.14 to 3.2.17 (security vulnerability)

and org.springframework.security from 3.2.8 to 3.2.9 just while we're at
it

https://pivotal.io/security/cve-2015-5211

Change-Id: I6896c592803a105c2c44ea9f4a9fcfd7ff50f595
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
7 years agoCheckstyle suppressions XML to completely avoid checking target/ 15/48715/1
Michael Vorburger [Fri, 25 Nov 2016 19:43:46 +0000 (20:43 +0100)]
Checkstyle suppressions XML to completely avoid checking target/

This is the only reliably way that I found to avoid checking generated
code and resources.  See also e.g.
http://stackoverflow.com/questions/2362652/excluding-classes-in-maven-checkstyle-plugin-reports
and my comment on that page.

Change-Id: I8b2ec5ee6d46dc108e781031996a1022b8c5330a
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
7 years agoBUG-6577: package fixed TrieMap 31/48531/3
Robert Varga [Mon, 21 Nov 2016 11:15:33 +0000 (12:15 +0100)]
BUG-6577: package fixed TrieMap

Until upstream releases a fix, we need a private package,
which has been populated to nexus.

Change-Id: I709f3516c80fb06fd41dc29eed4bcb56df92cf72
Signed-off-by: Robert Varga <rovarga@cisco.com>
7 years agoBUG-4219: disable filtering in opendaylight-karaf4-resources 71/48571/1
Stephen Kitt [Tue, 22 Nov 2016 13:00:18 +0000 (14:00 +0100)]
BUG-4219: disable filtering in opendaylight-karaf4-resources

We *don't* want any filtering in the resources here. Hopefully this
will fix the patching issue during merges (and avoid any future
problems with filtered values).

Change-Id: I77301bf76772c0487ec2a27b6f1398f429608a27
Signed-off-by: Stephen Kitt <skitt@redhat.com>
7 years agoBUG-4219: add karaf4-plugin 15/48415/3
Stephen Kitt [Mon, 7 Nov 2016 17:03:17 +0000 (18:03 +0100)]
BUG-4219: add karaf4-plugin

Change-Id: Ic7c497521b5683f452100dddd243b7513573d48f
Signed-off-by: Stephen Kitt <skitt@redhat.com>
7 years agoBUG-4219: Add wrap as a boot feature 38/48538/3
Stephen Kitt [Mon, 21 Nov 2016 14:26:41 +0000 (15:26 +0100)]
BUG-4219: Add wrap as a boot feature

In Karaf 4, wrapped bundles aren't supported by default. Features
containing wrapped bundles are supposed to declare a prerequisite
dependency on the "wrap" feature; until that's done, we simply add
"wrap" as a boot feature to enable loading old features.

Change-Id: If4fe6da367915c6c5474a5f87b062c71226b2a3a
Signed-off-by: Stephen Kitt <skitt@redhat.com>
7 years agoBUG-4219: copy ODL branding and configuration [WIP] 89/47689/5
Stephen Kitt [Thu, 27 Oct 2016 11:15:56 +0000 (13:15 +0200)]
BUG-4219: copy ODL branding and configuration [WIP]

This applies patches to the upstream-provided startup scripts, instead
of replacing them wholesale — this helps identify the changes we're
interested in, allows upstream improvements to be picked up
automatically, and fails the build if our changes can no longer be
applied (but this will only happen with a Karaf upgrade, so a working
build can't start failing for outside reasons).

Change-Id: I677d18403800ff5ee5aac665ba040dd1ceb43962
Signed-off-by: Stephen Kitt <skitt@redhat.com>
7 years agoBUG-4219: Add basic Karaf 4 artifacts 84/47484/5
Stephen Kitt [Tue, 25 Oct 2016 09:53:15 +0000 (11:53 +0200)]
BUG-4219: Add basic Karaf 4 artifacts

This patch adds karaf4-parent and opendaylight-karaf4-empty, currently
only equivalent to apache-karaf-minimal, as groundwork for the Karaf 4
migration.

Change-Id: I699ace7247cea4544857288313822571b97d9460
Signed-off-by: Stephen Kitt <skitt@redhat.com>
7 years agoLICENSE bundled in all built OSGi bundle JARs 47/48447/1
Michael Vorburger [Thu, 17 Nov 2016 16:47:08 +0000 (17:47 +0100)]
LICENSE bundled in all built OSGi bundle JARs

Work was done a while ago (by Thanh) to put a LICENSE into
target/classes expecting that to end up in all built JARs, but it
actually never did, which I stumbled upon in the context of
https://git.opendaylight.org/gerrit/#/c/48443/.  This remedies that by
explicitly instructing the maven-bundle-plugin to additionally bundle
the LICENSE text file (and the META-INF/git.properties after this is
merged).

Change-Id: If382d763b5fabe21cfed9e7c51fa3d4f9b31e47a
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
7 years agoAdd Google Guice to dependencyManagement 88/48288/3
Michael Vorburger [Sat, 12 Nov 2016 00:55:35 +0000 (01:55 +0100)]
Add Google Guice to dependencyManagement

Actually we already have it anyway, through mycila, but in
https://git.opendaylight.org/gerrit/#/c/48077/ for
https://git.opendaylight.org/gerrit/#/c/48078/ I'd like to depend only
on Guice directly, because there I don't need anything from mycila, so I
need the adjustment proposed here.

Change-Id: Ia1fcc56c3e650759dc483c8d8c36091e047efde7
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
7 years agoImmutables.org in dependencyManagement 26/48426/1
Michael Vorburger [Wed, 16 Nov 2016 18:20:35 +0000 (19:20 +0100)]
Immutables.org in dependencyManagement

https://immutables.github.io is really great IMHO.  So far I've used it
to write a few structs for test data, have made some small contributions
to it (bug reports & testing; no code) but I'd like to start using it
more in ODL work, and thus am proposing it into odlparent.  It's a fast
moving project, so having a single place (odlparent) for the version and
keep moving it forward is useful from the start IMHO, instead of
plastering it across projects.

I do realize this code. gen. could be seen under the YANG lens, but IMHO
it's complementary and has a different sweet spot (YANG for persistent
data store, remotable objects) and this Immutables.org for private
in-bundle code for tests and configuration data - notably anything
threading related such as https://git.opendaylight.org/gerrit/#/c/48373/
discussion, where easy true immutability is of interest (YANG gen. code
is NOT immutable; it pretends to be, but it's actually not at all).

Change-Id: I1bc87c3d11316aa42002eb1a4b1f49f820058860
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
7 years agoBUG-7183: bump scala-java8-compat to 0.8.0 33/48333/2
Robert Varga [Mon, 14 Nov 2016 17:59:11 +0000 (18:59 +0100)]
BUG-7183: bump scala-java8-compat to 0.8.0

This is the first build available for scala 2.12
and is a prerequisite.

Change-Id: I399a5d2d8e623caca7e649c2aa07020ecb1c16b7
Signed-off-by: Robert Varga <rovarga@cisco.com>
7 years agoBug 6236: Add mdsal.skip.verbose to -Pq Quick profile 90/48290/1
Michael Vorburger [Sat, 12 Nov 2016 01:26:31 +0000 (02:26 +0100)]
Bug 6236: Add mdsal.skip.verbose to -Pq Quick profile

see https://git.opendaylight.org/gerrit/#/c/47036/

Change-Id: I47286b9a9bc3bf69594b74add275a24251d0e924
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
7 years agoIntroduce awaitility utility for asynchronous testing 09/48109/1
Michael Vorburger [Tue, 8 Nov 2016 10:24:28 +0000 (11:24 +0100)]
Introduce awaitility utility for asynchronous testing

see https://github.com/awaitility/awaitility for awaitility details

Already used in netconf/netconf/netconf-topology/pom.xml, and about to
be introduced in https://git.opendaylight.org/gerrit/#/c/48061/ and
https://git.opendaylight.org/gerrit/#/c/48077/

Change-Id: I555ceaeae9007e33ce4c8c8d851558e68da0ce2f
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
7 years agoUse target-ide/ instead of target/ as output folder under M2E in Eclipse 78/47178/2
Michael Vorburger [Wed, 19 Oct 2016 23:55:54 +0000 (01:55 +0200)]
Use target-ide/ instead of target/ as output folder under M2E in Eclipse

Change-Id: I884ce4854509fb4b474a86c82449e600b6f639ed
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
7 years agoCheckstyle enforce space-instead-tab control for *.xtend 76/47976/2
Michael Vorburger [Fri, 4 Nov 2016 09:30:35 +0000 (10:30 +0100)]
Checkstyle enforce space-instead-tab control for *.xtend

https://git.opendaylight.org/gerrit/#/c/47975/ must be merged before
this one, otherwise the build will break (because that affects a project
which is already enforcing CS compliance).

I've verified, using a simplified version of the
https://wiki.opendaylight.org/view/EvolvingCheckstyle procedure, that
this tightening of CS rules has no impacts anywhere else (other than
c/47975).

Change-Id: I772391310907b5890b5e64e5039f689a2f91e520
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
7 years agoBump akka to 2.4.11 80/46680/5
Robert Varga [Fri, 7 Oct 2016 14:07:38 +0000 (16:07 +0200)]
Bump akka to 2.4.11

http://akka.io/news/2016/09/30/akka-2.4.11-released.html, brings
options to use alternative remoting transport, potentially increasing
performance and stability.

Change-Id: Ib26f8557ccca278c1057b91bbe3bd4236ed4e46b
Signed-off-by: Robert Varga <rovarga@cisco.com>
7 years agoRevert "BUG-7053: bump findbugs annotations" 49/47849/1
Robert Varga [Wed, 2 Nov 2016 17:16:30 +0000 (17:16 +0000)]
Revert "BUG-7053: bump findbugs annotations"

This reverts commit b5739e344964ea69474f43c15e6b85d350c8171c.

Change-Id: I9931a183d1293af56b6b56fb51ce374bdbd2aec6
Signed-off-by: Robert Varga <rovarga@cisco.com>
7 years agoBUG-7053: bump findbugs annotations 60/47760/2
Robert Varga [Sun, 30 Oct 2016 15:05:50 +0000 (16:05 +0100)]
BUG-7053: bump findbugs annotations

Bumps findbugs annotations to latest version.

Change-Id: I55626a2b7b28f39f460e4208f12dede683684ae1
Signed-off-by: Robert Varga <rovarga@cisco.com>
7 years agoUpgrade xtend 2.9.2 -> 2.10.0 42/47442/2
Stephen Kitt [Mon, 24 Oct 2016 15:49:59 +0000 (17:49 +0200)]
Upgrade xtend 2.9.2 -> 2.10.0

Change-Id: I95352c6ab2a95f43517672a839ee3c0322ad511d
Signed-off-by: Stephen Kitt <skitt@redhat.com>
7 years agotarget-ide/ on .gitignore 79/47779/1
Michael Vorburger [Mon, 31 Oct 2016 13:31:22 +0000 (14:31 +0100)]
target-ide/ on .gitignore

Change-Id: Ibcbd701bf3b9c7fd19261678ee1378f6ea076af5
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
7 years agoIntro. @Nullable / @NonNull (and @NonNullByDefault) "type" annotations 59/47359/2
Michael Vorburger [Thu, 1 Sep 2016 20:32:20 +0000 (22:32 +0200)]
Intro. @Nullable / @NonNull (and @NonNullByDefault) "type" annotations

These are "better" than those in package javax.annotation from FindBugs
(JSR-305), because they are (newer) @Target({ TYPE_USE } annotations,
which can annotate more places than similar older annotations.

FYI: I'll start to use these annotations in some work I'm doing, and
annotate some ODL code with these - just because they are more flexible
than FindBugs' annotations.

FTR: This is *NOT* a jab at FindBugs - I love FindBugs and will strongly
support its introduction in OpenDaylight; as I have for Checkstyle.
FindBugs does a lot of interesting and useful static code analysis in
addition to null analysis, all of which will add value to code quality
in ODL.  I just happen to think that specifically for null analysis, not
other checks, FindBugs is not the best game in town (anymore); and both
Eclipse and probably IntelliJ's (which I know very little about) are
superior (now); and e.g. https://sourceforge.net/p/findbugs/bugs/1355/
seems to confirm this.

Please note that the fact that this has "org.eclipse.jdt" in its name
does *NOT* in any way tie this (only) to "Eclipse" as in the IDE per se!
Eclipse does indeed now have native built-in support for static null
analysis (which BTW FYI can also be run on the command line, outside of
the IDE...), but putting these annotations on code does NOT "tie" ODL in
any way to Eclipse ... these are JUST annotations, which presumably
(hopefully) e.g. IntelliJ is flexible enough to be configured to use as
well (an IntelliJ user should ideally test and confirm this).  They are
just better, more modern, versions of this kind of annotations than are
available elsewhere (we could even define our own in ODL; but why would
we).

There is no strong technical need for us to exclusively use only these
annotations in ODL; at least Eclipse' null analysis supports several
types (and so does IntelliJ presumably; FYI in Eclipse, one type has to
be designated the "primary", but AFAIK it can be configured for interop.
compatibility with code annotated with the other, older,
javax.annotation @Nullable / @NonNull from FindBugs (JSR-305) as well).

This is a very small new JAR with only 4 annotations in it related to
static code analysis for null-ability.  Its declared <scope>provided, so
it can be used at compilation time, but doesn't end up in the shipped
product.

Change-Id: Ie60241a3b7b0845496d3af8393db2661720f5394
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
7 years agoBUG-7053: Add SCM connection 59/47759/2
Robert Varga [Sun, 30 Oct 2016 15:00:01 +0000 (16:00 +0100)]
BUG-7053: Add SCM connection

Change-Id: Ia99773bafbc499c089b686776aec916ac005500c
Signed-off-by: Robert Varga <rovarga@cisco.com>
7 years agoBlacklist the Triple DES cipher suite 94/47694/1
Ryan Goulding [Thu, 27 Oct 2016 17:07:29 +0000 (13:07 -0400)]
Blacklist the Triple DES cipher suite

In reaction to CVE-2016-2183 [0], this disables the Triple DES cipher
suites.  JCA nomenclature denotes this using "DESede".

[0] https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2016-2183

Change-Id: I27c0b65bbe07be2ef7664fb7dc023ceb8aa4f551
Signed-off-by: Ryan Goulding <ryandgoulding@gmail.com>
7 years agoAdd configuration and execution to FindBugs plugin 14/46914/12
Tom Pantelis [Thu, 13 Oct 2016 19:13:17 +0000 (15:13 -0400)]
Add configuration and execution to FindBugs plugin

Added the appropriate configuration and execution to the FindBugs plugin
so it can run during compile phase and report violations. failOnError is
set to false by default so it doesn't fail the build. Projects can override
this setting if they want enforcement.

Also added a findbugs project (similar to checkstyle) that defines the rule
filters to exclude. I added one to exclude b/c it's of low priority
and is a common pattern used in ODL. I also added package exclusions for
yang-generated classes and protobuff-generated classes.

Change-Id: Ie01507a23990280d4bee8c2aefdc6c2293a3c6db
Signed-off-by: Tom Pantelis <tpanteli@brocade.com>
Signed-off-by: Stephen Kitt <skitt@redhat.com>
7 years agoUnfork the appropriate karaf bin files 46/45546/13
Ryan Goulding [Tue, 4 Oct 2016 04:22:29 +0000 (00:22 -0400)]
Unfork the appropriate karaf bin files

In Boron based OpenDaylight, karaf 3.0.7 was used.  Karaf 3.0.7 was susceptible
tot he following bugs:

KARAF-4564 - Can't start karaf using symbolic link
KARAF-4566 - "karaf" script invokes /bin/sh but requres /bin/bash functions

In order to avoid an entire container upgrade, the bin scripts were forked with
appropriate fixes to temporarily alleviate the aformentioned issues.

Karaf 3.0.8 fixed the aformenentioned issues.  This change removes the appropriate
forked scripts, as they should now be fixed in upstream karaf.

The following scripts were determined to be unnecessary forks:
* client, shell, start, status and stop

The following scripts were determined to be necessary forks:
* instance* (they load odl.java.security)
* karaf (enforces Java 8, enables heap-dumps on OOMs, loads odl.java.security)
* karaf.bat (includes a workaround for Equinox on Windows 10 and loads odl.java.security)
These five files will remain forked for the forseeable future.
* setenv* (set up java max memory to appropriate value for ODL)

Change-Id: I769b30b1661a1fb8daec4de8b7cf170d1edcba7c
Signed-off-by: Ryan Goulding <ryandgoulding@gmail.com>
7 years agoUpgrade Apache Shiro from 1.3.1 to 1.3.2 63/47463/2
Ryan Goulding [Mon, 24 Oct 2016 22:18:24 +0000 (18:18 -0400)]
Upgrade Apache Shiro from 1.3.1 to 1.3.2

Upgrades Apache Shiro to the newest release (September 2016).  This includes
the following bugfixes:

SHIRO-577 Fixes bug allow enabling of SessionValidationScheduler when set
          via setSessionValidationScheduler

Release notes are not currently available, but this information was determined
through looking at the Apache Shiro git commit history.

Change-Id: I0cc2983df285402a93b8887410c53f98a6bd8a3e
Signed-off-by: Ryan Goulding <ryandgoulding@gmail.com>
7 years agoUpgrade maven-jar-plugin 3.0.0 -> 3.0.2 40/47440/2
Stephen Kitt [Mon, 24 Oct 2016 15:42:25 +0000 (17:42 +0200)]
Upgrade maven-jar-plugin 3.0.0 -> 3.0.2

Release notes for 3.0.1:
https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12317526&version=12335708

Release notes for 3.0.2:
https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12317526&version=12336062

Change-Id: Ie214fea2fb51c2467b99e9c10a59c6d9a8f3e7a0
Signed-off-by: Stephen Kitt <skitt@redhat.com>
7 years agoUpgrade build-helper-maven-plugin 1.10 -> 1.12 45/47445/3
Stephen Kitt [Mon, 24 Oct 2016 16:05:38 +0000 (18:05 +0200)]
Upgrade build-helper-maven-plugin 1.10 -> 1.12

Release notes:
http://www.mojohaus.org/build-helper-maven-plugin/github-report.html

Change-Id: Ifda76e4447e8ea2373b712132229c52154da6d9f
Signed-off-by: Stephen Kitt <skitt@redhat.com>
7 years agoUpgrade maven-javadoc-plugin 2.10.3 -> 2.10.4 46/47446/2
Stephen Kitt [Mon, 24 Oct 2016 16:10:21 +0000 (18:10 +0200)]
Upgrade maven-javadoc-plugin 2.10.3 -> 2.10.4

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

Change-Id: I1075c75f620b53f8fa6857d69226a0498c973a72
Signed-off-by: Stephen Kitt <skitt@redhat.com>
7 years agoUpgrade maven-plugin-plugin 3.4 -> 3.5 48/47448/2
Stephen Kitt [Mon, 24 Oct 2016 16:16:44 +0000 (18:16 +0200)]
Upgrade maven-plugin-plugin 3.4 -> 3.5

http://maven.40175.n5.nabble.com/Apache-Maven-Plugin-Tools-3-5-Released-td5879432.html

Change-Id: Id730c854f0e19276ca4b2b47cfded3030edc42fb
Signed-off-by: Stephen Kitt <skitt@redhat.com>
7 years agoUpgrade maven-source-plugin 3.0.0 -> 3.0.1 50/47450/2
Stephen Kitt [Mon, 24 Oct 2016 16:24:48 +0000 (18:24 +0200)]
Upgrade maven-source-plugin 3.0.0 -> 3.0.1

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

Change-Id: I80c471511263ca727ed65779eb5d28ef12f94172
Signed-off-by: Stephen Kitt <skitt@redhat.com>
7 years agoBug 647: Use bin/karaf arguments as JVM arguments 62/47062/2
Vratko Polak [Tue, 18 Oct 2016 10:30:18 +0000 (12:30 +0200)]
Bug 647: Use bin/karaf arguments as JVM arguments

This is just a convenience for users,
so that they do not have to manipulate JAVA_OPTS.

Using JAVA_OPTS requires user to know DEFAULT_JAVA_OPTS,
this change only appends to default options (possibly overriding them).

Example usage:
$ bin/karaf -Xmx4g -DmySystemProperty=foo

Change-Id: Ice07a9c3a2c9455d622722498f3433501091728e
Signed-off-by: Vratko Polak <vrpolak@cisco.com>
7 years agoDisable stack trace trimming 01/47401/2
Robert Varga [Sun, 23 Oct 2016 20:36:01 +0000 (22:36 +0200)]
Disable stack trace trimming

We use exception chaining quite extensively, which means
that full error details are not visible when the stack trace
is trimmed.

Change-Id: If55f22ed9771d7c14c9787bccd2d7439e2e1ce98
Signed-off-by: Robert Varga <rovarga@cisco.com>
7 years agoIntro. FindBugs' full :annotation (in addition to existing :jsr305) 57/47357/1
Michael Vorburger [Fri, 21 Oct 2016 17:47:18 +0000 (19:47 +0200)]
Intro. FindBugs' full :annotation (in addition to existing :jsr305)

Having both of these is a required intermediate step, in order to switch
completely over to :annotation instead of :jsr305, which would be
preferable, because these two JARs define the same annotations and
overlap, which is never great.

This change will allow all downstream projects to gradually switch their
<dependency><groupId>com.google.code.findbugs from <artifactId>jsr305 to
<artifactId>annotations in all pom.xml. They will NOT have to adapt any
code, because the actual Java types are exactly the same (just from a
different Maven artefact).

When all downstream projects have switched over, then we'll replace what
this change added by the cleaner "real" solution prepared in
https://git.opendaylight.org/gerrit/#/c/47337/

see also discussion in https://git.opendaylight.org/gerrit/#/c/46914/

Change-Id: Ib026cd0338b263bb9663f2d1fa2a6cb167d6f136
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
7 years agoBUG-6705: remove enunciate-maven-plugin 82/47082/2
Stephen Kitt [Tue, 18 Oct 2016 15:35:50 +0000 (17:35 +0200)]
BUG-6705: remove enunciate-maven-plugin

With the removal of enunciate-parent from controller,
enunciate-maven-plugin is no longer used anywhere in ODL, so let's
remove it.

This depends on https://git.opendaylight.org/gerrit/47080

Change-Id: Ifde699521a9e1db71013445b614b8892b65e7472
Signed-off-by: Stephen Kitt <skitt@redhat.com>
7 years agoReplace target/ by ${project.build.directory}/ to make target-ide/ possible 85/47185/2
Michael Vorburger [Thu, 20 Oct 2016 00:20:48 +0000 (02:20 +0200)]
Replace target/ by ${project.build.directory}/ to make target-ide/ possible

Change-Id: Ia4f9508c3db4aac94f00b861cfef0669b7c15ef7
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
7 years agoUpgrade commons-lang3 3.4 -> 3.5 10/47110/1
Stephen Kitt [Wed, 19 Oct 2016 07:37:19 +0000 (09:37 +0200)]
Upgrade commons-lang3 3.4 -> 3.5

The release notes are at
http://www.apache.org/dist/commons/lang/RELEASE-NOTES.txt

Change-Id: I0f27a25031e28d3081546297a492c1ad4b4ec9ec
Signed-off-by: Stephen Kitt <skitt@redhat.com>
7 years agoBUG-6652: generate features.xml with karaf-maven-plugin 39/39539/14
Stephen Kitt [Tue, 10 May 2016 14:29:01 +0000 (16:29 +0200)]
BUG-6652: generate features.xml with karaf-maven-plugin

features.xml can be generated from POM information; this allows us to
produce features which are simultaneously Karaf artifacts and Maven
artifacts. Thus downstream projects can simply depend (at a Maven
level) on Karaf features — this automatically gives the correct Maven
dependencies at build and test time, and the correct Karaf feature
dependencies at run time.

Karaf 3.0.8 now includes enough features handling improvements to
produce useful results here. This patch preserves old features for
backwards-compatibility, which results in some inelegant feature
names; the intention is to allow experimentation in downstream
projects without breaking anything.

This patch introduces two new parent POMs: single-feature-parent is
intended for modules packaging a single feature, feature-repo-parent
for modules packaging a repository of features. SingleFeatureTest is
used to test the feature repositories — this ensures that the features
we ship are tested. single-feature-parent doesn't run
SingleFeatureTest to avoid testing features twice.

Change-Id: I2858891618360710a13756dbd4d005aa1a48c703
Signed-off-by: Stephen Kitt <skitt@redhat.com>
7 years agoodlparents-artifacts is a POM 79/46679/2
Stephen Kitt [Fri, 7 Oct 2016 14:01:46 +0000 (16:01 +0200)]
odlparents-artifacts is a POM

If we don't specify its packaging, Maven complains that we're
producing an empty JAR.

Change-Id: I0414f28f28f4dee396fc41d036cab5e69608b663
Signed-off-by: Stephen Kitt <skitt@redhat.com>
7 years agoHave slf4j-simple as an "always there" <scope>test dependency. 82/46882/2
Michael Vorburger [Thu, 13 Oct 2016 13:01:03 +0000 (15:01 +0200)]
Have slf4j-simple as an "always there" <scope>test dependency.

The "always there" as in always, literally, not just in
<dependencyManagement>.  This makes sense because in (unit and
component, not integration) tests you want logging to "just work" - you
don't want to have to remember to add slf4j-simple yourself as a
dependency every time (and you certainly don't want to have to add
logback every time, and configure it with an XML or properties; for
every project).

Also the problem with manually adding a slf4j-simple dependency to
projects with tests is that there is a risk of it getting accidentally
removed, because "mvn dependency:analyze" will find it's "not needed";
as happened e.g. in
https://git.opendaylight.org/gerrit/#/c/45090/6/vpnservice/aclservice/impl/pom.xml

Change-Id: I5af53bbd8d69ad5cebac08f97225c2f9cbe60ab7
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
7 years agoAllow '_' in checkstyle PackageName rule 60/46860/2
Tom Pantelis [Thu, 13 Oct 2016 06:06:39 +0000 (02:06 -0400)]
Allow '_' in checkstyle PackageName rule

The JLS allows '_' in package names but the default checkstyle regex
pattern for the PackageName rule doesn't. Underscores shouldn't normally
be used but the yang code generator can generate package names with
underscores. We can exclude most yang-generated code from checkstyle but
the CSS code generator places some classes under src/main/java to be
completed (ie *Module classes) so we need the regex pattern to allow
underscores.

Change-Id: I14fdb1955499d5684b1bdaeabd188f7d425caf60
Signed-off-by: Tom Pantelis <tpanteli@brocade.com>
7 years agoCopy in supporting bouncycastle PKIX/CMS/EAC/PKCS/OCSP/TSP/OPENSSL packages 77/46577/2
Ryan Goulding [Wed, 5 Oct 2016 19:39:45 +0000 (15:39 -0400)]
Copy in supporting bouncycastle PKIX/CMS/EAC/PKCS/OCSP/TSP/OPENSSL packages

Since we already ship the Bouncy Castle Provider (bcprov-jdk15on) in lib/ext,
we should also ship the other key exchange packages.  Bouncy castle provides
these packages in bcpkix-jdk15on.  This change adds the bcpkix-jdk15on
dependency, and an appropriate action to copy the library into lib/ext, very
similar to how the bcprov-jdk15on is copied.

Change-Id: Id706f58c8f56193a717013ffc5446643004045ad
Signed-off-by: Ryan Goulding <ryandgoulding@gmail.com>
7 years agoBump the bouncy castle version to the latest, 1.55 79/46579/2
Ryan Goulding [Wed, 5 Oct 2016 19:44:12 +0000 (15:44 -0400)]
Bump the bouncy castle version to the latest, 1.55

Bumps the bouncy castle version to the latest, version 1.55.  Specifics
regarding what was fixed can be found in the bouncy castle release notes:

http://www.bouncycastle.org/releasenotes.html

Change-Id: Iad9b000d15be91781c3de7501cce6c8e95cefb09
Signed-off-by: Ryan Goulding <ryandgoulding@gmail.com>
7 years agoComplete enforcer setup in odlparent-lite 78/46678/1
Stephen Kitt [Fri, 7 Oct 2016 13:59:48 +0000 (15:59 +0200)]
Complete enforcer setup in odlparent-lite

We need to specify the plugin version and ignore it in m2eclipse.

Change-Id: Ied2769679be6e58f0299120b513693d66d2185e5
Signed-off-by: Stephen Kitt <skitt@redhat.com>
7 years agoAdd maven-antrun-plugin to m2e lifecycle mapping 19/46619/2
Lorand Jakab [Thu, 6 Oct 2016 13:35:58 +0000 (16:35 +0300)]
Add maven-antrun-plugin to m2e lifecycle mapping

Change-Id: Ib28a8b6d8e576186673ca1fa7637f0eda8c84659
Signed-off-by: Lorand Jakab <lojakab@cisco.com>
7 years agoMove maven-enforcer-plugin from odlparent to odlparent-lite 41/46641/2
Michael Vorburger [Thu, 6 Oct 2016 23:16:14 +0000 (01:16 +0200)]
Move maven-enforcer-plugin from odlparent to odlparent-lite

That way it's detected earlier, e.g. Maven version mismatch is already
flagged up to end-users on their root parent project (which has
odlparent-lite as parent), and only a little later on the first Java
project (which have odlparent as parent).

Change-Id: I9c285fc45ffc0a82e8375a2b77dc89da19238033
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
7 years agoBump maven-javadoc-plugin version from 2.10.3 to 2.10.4 43/46643/1
Michael Vorburger [Fri, 7 Oct 2016 00:38:44 +0000 (02:38 +0200)]
Bump maven-javadoc-plugin version from 2.10.3 to 2.10.4

Not just for fun, but because I've just figured, through trial and
error, that this fixes a weird problem seen in the failed builds of
https://git.opendaylight.org/gerrit/#/c/46206/ - the older 2.10.3 seems
to have some bug which causes it to choke on finding references between
(two different kinds of) generated code in JavaDoc gen. and the 2.10.4
upgrade magically fixes it (I've locally tested this).

Note that we seem to have our maven-javadoc-plugin version defined in
two places, which is a bit of a shame (and very confusing at first).  I
wanted to get this bump merged in ASAP, with minimal side effect, so in
this commit have just changed both places.  A follow-up commit which
unifies this into a single place for the next time around would be cool.

Change-Id: Ie2c35f4a7dea357eed5ce8b72c9e757dbdf85565
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
7 years agoodlparent/pom.xml: Parameter tasks is deprecated 25/46525/2
Isaku Yamahata [Tue, 4 Oct 2016 00:48:22 +0000 (17:48 -0700)]
odlparent/pom.xml: Parameter tasks is deprecated

remove maven warning by replacing tasks with target
> [WARNING] Parameter tasks is deprecated, use target instead

Change-Id: I6cf82b1760e711de60dd836024b6e67239214c2c
Signed-off-by: Isaku Yamahata <isaku.yamahata@intel.com>
7 years agoUpgrade jsonassert 1.2.3 -> 1.3.0 38/36538/3
Stephen Kitt [Tue, 22 Mar 2016 09:35:05 +0000 (10:35 +0100)]
Upgrade jsonassert 1.2.3 -> 1.3.0

Change-Id: Icf7717624601182e96ae21821d50131e059b63ac
Signed-off-by: Stephen Kitt <skitt@redhat.com>
7 years agoUpgrade webcohesion enunciate 2.1.1 -> 2.6.0 35/36535/6
Stephen Kitt [Tue, 22 Mar 2016 09:29:49 +0000 (10:29 +0100)]
Upgrade webcohesion enunciate 2.1.1 -> 2.6.0

Enunciate 2.2.0 adds support for Spring Web annotations and fixes a
number of bugs:
https://github.com/stoicflame/enunciate/issues?q=milestone%3A2.2.0+is%3Aclosed

Enunciate 2.3.0 fixes a number of bugs:
https://github.com/stoicflame/enunciate/issues?q=milestone%3A2.3.0+is%3Aclosed

Enunciate 2.4.0 includes many bug fixes and enhancements:
https://github.com/stoicflame/enunciate/issues?q=milestone%3A2.4.0+is%3Aclosed

Enunciate 2.5.0 includes minor bug fixes and support for Spring's
@ModelAttribute:
https://github.com/stoicflame/enunciate/issues?q=milestone%3A2.5.0+is%3Aclosed

Enunciate 2.6.0 includes support for Bean Validation annotations and
Jackson annotations, and fixes a number of bugs:
https://github.com/stoicflame/enunciate/milestone/13?closed=1

Change-Id: Ic61354408b64089d228cb89a7f13e11874ecf5d5
Signed-off-by: Stephen Kitt <skitt@redhat.com>
7 years agoBump enforced Maven version to 3.3.9+ 20/46220/3
Vratko Polak [Wed, 28 Sep 2016 09:29:28 +0000 (11:29 +0200)]
Bump enforced Maven version to 3.3.9+

Also, remove enforcer section from karaf-parent,
as odlparent:odlparent already sets strong enough requirement.

Change-Id: I6952b1a5bfd98180ea9f6fc598029163780ffa9a
Signed-off-by: Vratko Polak <vrpolak@cisco.com>
7 years agoWork around apparent Checkstyle bug re. JavaDoc in package-info.java 32/44632/3
Michael Vorburger [Wed, 24 Aug 2016 21:08:44 +0000 (23:08 +0200)]
Work around apparent Checkstyle bug re. JavaDoc in package-info.java

We have earlier agreed to, and aligned our Checkstyle rules accordingly,
not enforce JavaDoc presence, just validate its content if it's present.
However, we are still enforcing every package-info.java (of which we
have almost none..) to have a JavaDoc.

While experimenting with plastering package-info.java into EVERY package
everywhere (to have an annotation @NonNullByDefault package in it..),
I don't want to put in bogus empty JavaDoc into every package just to
satisfy Checkstyle, that would be ridiculous.

Related to https://github.com/checkstyle/checkstyle/issues/3416

Change-Id: I397763f9e09bc7db009ade5da1a5b35bdc518169
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
7 years agoBug 6790: use non-blocking /dev/urandom 60/45760/4
Stephen Kitt [Fri, 16 Sep 2016 21:29:09 +0000 (23:29 +0200)]
Bug 6790: use non-blocking /dev/urandom

Set Karaf up to use /dev/urandom (where available) instead of
/dev/random, to avoid blocking (and failing incoming SSH connections)
in low entropy situations.

Bug: 6790
Change-Id: I17c5681151a4bb6c61def952a7898b018d3ece86
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
Signed-off-by: Stephen Kitt <skitt@redhat.com>
7 years agoRevert "Bump akka to 2.4.10" 21/46121/1
Stephen Kitt [Fri, 23 Sep 2016 11:34:22 +0000 (11:34 +0000)]
Revert "Bump akka to 2.4.10"

This reverts commit 6ef4fcc3b02cb261afa0fd6fb615e4f5f9002d95. (The upgrade breaks controller.)

Change-Id: I6af4777350c0254f95b2acc52a5657f54091984a
Signed-off-by: Stephen Kitt <skitt@redhat.com>
7 years agoBump akka to 2.4.10 96/45996/1
Robert Varga [Wed, 21 Sep 2016 16:52:41 +0000 (18:52 +0200)]
Bump akka to 2.4.10

Not so much it would impact us, but it is still good to keep
up with upstream.

Change-Id: Idaea34037e190378abe821be015506083306cd0a
Signed-off-by: Robert Varga <rovarga@cisco.com>
7 years agoAdd org.apache.karaf.shell.console 71/42971/3
Stephen Kitt [Tue, 2 Aug 2016 13:19:08 +0000 (15:19 +0200)]
Add org.apache.karaf.shell.console

This is useful for projects implementing Karaf CLI commands.

Change-Id: Id08c52d66a1992ba1645fb1691be4f967088d82f
Signed-off-by: Stephen Kitt <skitt@redhat.com>
7 years agoBUG-6341: add Cassandra and Coda Hale Metrics 17/43717/3
Stephen Kitt [Thu, 11 Aug 2016 12:44:26 +0000 (14:44 +0200)]
BUG-6341: add Cassandra and Coda Hale Metrics

(io.dropwizard is Metrics' new home. These releases are
backwards-compatible.)

Change-Id: Id8bfc25548238b806f10771b86f478249d84faef
Signed-off-by: Stephen Kitt <skitt@redhat.com>
7 years agoEnable Blueprint annotation support 02/44502/7
Stephen Kitt [Mon, 22 Aug 2016 16:14:50 +0000 (18:14 +0200)]
Enable Blueprint annotation support

This enables injection annotations everywhere. To activate Blueprint
annotation support (which generates an autowire.xml Blueprint file),
projects need to add

    <build>
        <plugins>
            <plugin>
                <groupId>org.apache.aries.blueprint</groupId>
                <artifactId>blueprint-maven-plugin</artifactId>
            </plugin>
        </plugins>
    </build>

and

    <dependency>
        <groupId>javax.inject</groupId>
        <artifactId>javax.inject</artifactId>
    </dependency>

The generated XML file is moved to org/opendaylight/blueprint so it is
loaded alongside other Blueprint descriptors.

Change-Id: I4423f691ca5c475e8d14f5210d61855a7ddc2328
Signed-off-by: Stephen Kitt <skitt@redhat.com>
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
7 years agoBug 6730: Upgrade Apache Shiro to the latest compatible release 48/45648/3
Ryan Goulding [Thu, 15 Sep 2016 21:09:47 +0000 (17:09 -0400)]
Bug 6730: Upgrade Apache Shiro to the latest compatible release

Upgrade Apache Shiro to the latest release.  1.X stream contains
only compatible changes.

Change-Id: I3b89215842f469bea21fba3ca86589501cd516bc
Signed-off-by: Ryan Goulding <ryandgoulding@gmail.com>
7 years agoBUG-6712: fix bin/shell's classpath 66/45566/1
Stephen Kitt [Wed, 14 Sep 2016 07:57:18 +0000 (09:57 +0200)]
BUG-6712: fix bin/shell's classpath

bin/shell is duplicated from Karaf, but needs ${karaf.version} instead
of ${project.version} to define its classpath.

The correct long-term fix is to drop bin/shell and rely on upstream's
version (https://git.opendaylight.org/gerrit/45546); this patch is
intended for cherry-picking to Boron.

Change-Id: I91658bc9068119aa29d0b3a93d9fce53cfe9d9c6
Signed-off-by: Stephen Kitt <skitt@redhat.com>
7 years agoIntro. Google Guice DI with JSR-250 Extensions from Mycila 27/45427/1
Michael Vorburger [Fri, 9 Sep 2016 15:57:57 +0000 (17:57 +0200)]
Intro. Google Guice DI with JSR-250 Extensions from Mycila

See https://github.com/mycila/guice/ & https://github.com/google/guice

See https://github.com/mycila/guice/issues/11 re. <version>4.0.rc1

This is already used in aclservice-impl for the first end2end test.

Intentionally <dependencyManagement> only with <scope>test, for now, as
it's not required at RT, yet.  (When it will be, then we'll look at OSGi
MANIFEST.MF, and a Karaf feature; later.  For the time being the
intention is to use Guice for more end2end style tests.)

Change-Id: Ia4c99a958ee0a5d687a311936693501a2a68c36d
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
7 years agoUpgrade karaf from 3.0.7 to 3.0.8 12/44012/4
Ryan Goulding [Tue, 9 Aug 2016 19:32:58 +0000 (15:32 -0400)]
Upgrade karaf from 3.0.7 to 3.0.8

Change-Id: Ieb3e4424a84332d6bd4c1d12e62e6eba50440874
Signed-off-by: Ryan Goulding <ryandgoulding@gmail.com>
7 years agoEnable JSR-305 annotations everywhere 42/44642/1
Stephen Kitt [Thu, 25 Aug 2016 07:52:56 +0000 (09:52 +0200)]
Enable JSR-305 annotations everywhere

Change-Id: I1f0b62a629f206957cdcd928d1f0b5ae8cb97ec9
Signed-off-by: Stephen Kitt <skitt@redhat.com>
7 years agoUpgrade gson 2.3.1 -> 2.7 65/29765/16
Stephen Kitt [Mon, 16 Nov 2015 17:08:47 +0000 (18:08 +0100)]
Upgrade gson 2.3.1 -> 2.7

Change-Id: I09c99491b259939603639cdea165253ce2848ade
Signed-off-by: Stephen Kitt <skitt@redhat.com>
7 years agoBump akka-companion netty to 3.10.6 31/44231/1
Robert Varga [Thu, 18 Aug 2016 08:22:56 +0000 (10:22 +0200)]
Bump akka-companion netty to 3.10.6

This is the latest bugfix release, possibly even
improving performance. Changelog is at
https://github.com/netty/netty/issues?q=milestone%3A3.10.6.Final

Change-Id: I67232fec57864cad01f8702f61e910ad098ed6f7
Signed-off-by: Robert Varga <rovarga@cisco.com>
7 years agoBug 6278: Move opendaylight-karaf-empty to odlparent 88/43988/2
Ryan Goulding [Tue, 9 Aug 2016 16:24:16 +0000 (12:24 -0400)]
Bug 6278: Move opendaylight-karaf-empty to odlparent

Move opendaylight-karaf-empty from controller to odlparent.  As with
moves of other artifacts, the following process will happen:

1) Copy opendaylight-karaf-empty into odlparent and adjust the groupId.
   This patch handles the copy work.

2) Change opendaylight-karaf-empty in controller to derive from
   odlparent's opendaylight-karaf-empty

3) Change references to use the artifact added in #1.

4) Deprecate and remove controller's opendaylight-karaf-empty.

This patch just handles the initial groundwork outlined in #1.

Change-Id: I824e61280784409194840ba54bdc0a6a10f0368f
Signed-off-by: Ryan Goulding <ryandgoulding@gmail.com>
7 years agoRemove a few unneeded braces 33/43633/1
Ryan Goulding [Tue, 9 Aug 2016 02:37:38 +0000 (22:37 -0400)]
Remove a few unneeded braces

This avoids maven picking up certain properties (i.e., JAVA_HOME)
and replacing with build time value.

Change-Id: I5a7b0a7e5c8698cfb1469420b8bb358857c3e449
Signed-off-by: Ryan Goulding <ryandgoulding@gmail.com>
7 years agoUpgrade Karaf 3.0.6 -> 3.0.7 18/40818/9
Stephen Kitt [Fri, 24 Jun 2016 13:33:56 +0000 (15:33 +0200)]
Upgrade Karaf 3.0.6 -> 3.0.7

https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311140&version=12334639
has the details; in particular this should fix
https://issues.apache.org/jira/browse/KARAF-4502 (the SSH key
negotiation failure).

This upgrade also pulls in newer versions of Aries Blueprint.

Change-Id: I475281cc9e422bfdd7574c23457259133593966d
Signed-off-by: Stephen Kitt <skitt@redhat.com>
7 years agoBug 6341 Remove copy of dependencies from karaf-parent 60/43260/9
Ed Warnicke [Fri, 5 Aug 2016 22:00:46 +0000 (15:00 -0700)]
Bug 6341 Remove copy of dependencies from karaf-parent

It appears that a lot of bloat is based on the manner in which the transition of
integration/distribution/distribution-karaf was transitioned to using karaf-parent.

There-in lies a tale.  Way back in Helium days... we used a 'dependency' hack for populating system/.
It basically just copied all the dependencies into system/ from the whole shebang.  This had two issues:

a)  Massive overinclusion , as you don't need most of the maven dependencies.
b)  Maven only ever copies *one* version of a thing via the maven dependency mechanisms... so *any* version skew borks you.

To fix this, in Li timeframe I wrote karaf-plugin.  Karaf-plugin walks the features.xml files
and makes sure that we have the needed bundles so all possible features can run.  This radically
reduces the overinclusion, as you are only pulling in the stuff you actually need.
It also solves the version skew problem... which is important because while we don't *want* version skew... it happens.

Because we were at the end of Li, and I did not wish to possibly break someone's
project local distribution, I *only* deployed karaf-plugin to integration/distribution, *not* to karaf-parent.

Since then, others have done good work on karaf-parent (and migrated it to odlparent).
Many thanks to them.  As part of that work, integration/distribution was migrated to use
karaf-parent (again, a good thing).

*But*... this suddenly caused integration/distribution to start doing massive overinclusion again (not good) :(
This appears to account for around 100mb of our size growth since Be.

The correct solution here IMHO would be:

a) To remove the dependency copying behavior of karaf-parent
b) Have the karaf-parent use karaf-plugin

Note: If you do #a without #b... you will likely break the project local distributions.

Sadly, doing #a and #b puts us back in the late breaking change that might impact the
project local distributions place I decided to avoid in Li.  However,
we now have a couple of releases of experience with the karaf-plugin, and thus the risk is somewhat lower.

This patch does #a and #b.

PatchSet #5: Fix karaf-plugin to also install bundles listed in startup.properties as well.

Change-Id: Ie4d99e86cf364fd4fc6d7d99622991133fa3e006
Signed-off-by: Ed Warnicke <eaw@cisco.com>
Signed-off-by: Robert Varga <rovarga@cisco.com>
7 years agoBump versions by 0.1.0 for next dev cycle 34/43434/1
Thanh Ha [Mon, 8 Aug 2016 21:50:18 +0000 (17:50 -0400)]
Bump versions by 0.1.0 for next dev cycle

Change-Id: I5d0c92a382129f35ed2cefe407720a30d1e1332b
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
7 years agoAdd a workaround for Karaf not recognizing Windows 10 45/43045/3
Martin Dindoffer [Wed, 3 Aug 2016 13:56:34 +0000 (15:56 +0200)]
Add a workaround for Karaf not recognizing Windows 10

* Adjusts Karaf(Equinox) properties on startup to allow running on Windows 10
* This fix will be obsolete once we update Karaf to a version
   with w10-compatible Equinox
* Equinox commit needed for a permanent fix:
   https://github.com/eclipse/rt.equinox.framework/commit/5ebd8e732dcca11efc03ac4721e1909565caf679

Change-Id: Ide7cf4600a83dd379a7bb2811735e1980dc0887c
Signed-off-by: Martin Dindoffer <martin.dindoffer@pantheon.tech>
7 years agoAdd more logging from karaf 82/43282/2
Robert Varga [Sun, 7 Aug 2016 21:12:37 +0000 (23:12 +0200)]
Add more logging from karaf

When a feature fails to install, we would really like
some context to the failure. This option will result
in an additional warning with exception being logged.

Change-Id: I44d44f1905e9b2f400dc31b33473b16d839b9874
Signed-off-by: Robert Varga <rovarga@cisco.com>
7 years agoAdd relativePath to karaf poms 51/43251/2
Vratko Polak [Mon, 8 Aug 2016 10:04:43 +0000 (12:04 +0200)]
Add relativePath to karaf poms

Change-Id: I4176f2fdb4ed57d5c69c2b2eac01765c53ddf0e2
Signed-off-by: Vratko Polak <vrpolak@cisco.com>
7 years agoAdd an explicit comment about CPD being brain-dead 39/43239/2
Robert Varga [Fri, 5 Aug 2016 14:57:40 +0000 (16:57 +0200)]
Add an explicit comment about CPD being brain-dead

This is a follow-up to the reverted CPD commit. Appropriate
configuration is added to mdsal's binding parent.

Change-Id: I38616d2e1b7e4340d31bb977d07c2e7858a352ca
Signed-off-by: Robert Varga <rovarga@cisco.com>
7 years agoRemove tcpmd5 even from comments 34/43134/1
Vratko Polak [Thu, 4 Aug 2016 16:09:11 +0000 (18:09 +0200)]
Remove tcpmd5 even from comments

Change-Id: I5a4510d964b017871004c0096f2114775e113db4
Signed-off-by: Vratko Polak <vrpolak@cisco.com>
7 years agoRemove a few unneeded braces 05/43105/1
Stephen Kitt [Thu, 4 Aug 2016 09:57:14 +0000 (11:57 +0200)]
Remove a few unneeded braces

This avoids Maven picking up certain properties in some circumstances
(e.g. ${PWD} getting replaced by the current directory at
build-time).

Change-Id: I33e664605d9b715295fbc0214fa384f8c1177be6
Signed-off-by: Stephen Kitt <skitt@redhat.com>
7 years agoRevert "Do not run CPD on anything in target/generated-sources" 57/43057/1
Lorand Jakab [Wed, 3 Aug 2016 14:31:45 +0000 (09:31 -0500)]
Revert "Do not run CPD on anything in target/generated-sources"

This breaks the lispflowmapping build.

This reverts commit ef60163bb91025f24881897e8916902187207d02.

Change-Id: I55715d0796620fe95371728babf4935909112db8
Signed-off-by: Lorand Jakab <lojakab@cisco.com>
7 years agoBUG-6027: merge upstream realname fix 30/43030/3
Stephen Kitt [Wed, 3 Aug 2016 10:04:02 +0000 (12:04 +0200)]
BUG-6027: merge upstream realname fix

This patch syncs the startup scripts with Karaf 3.0.6 and adds the
upstream fix to handle symlinks (see
https://git-wip-us.apache.org/repos/asf?p=karaf.git;a=commit;h=5bbaf71814df514b112cbe8cd73ba57fefdc869f
for details).

Once we upgrade to a version of Karaf which includes this fix, then
client, shell, start, status and stop should be deleted.

Change-Id: I82efe6d29206c37bc46a08bc367342d63dea51c9
Signed-off-by: Stephen Kitt <skitt@redhat.com>
7 years agoDo not run CPD on anything in target/generated-sources 39/43039/2
Robert Varga [Wed, 3 Aug 2016 12:30:56 +0000 (14:30 +0200)]
Do not run CPD on anything in target/generated-sources

From layering perspective odlparent does not know anything
about mdsal, hence it must not make any special handling
for its behavior.

What it can do is to say that we simply do not CPD any
source that is generated -- which is actually the correct
thing to do.

Change-Id: If325f2c1da00fdba8f337f6b75fb860ac86797fa
Signed-off-by: Robert Varga <rovarga@cisco.com>
7 years agoAdd odl-triemap feature 20/42820/3
Robert Varga [Sat, 30 Jul 2016 11:37:09 +0000 (13:37 +0200)]
Add odl-triemap feature

The TrieMap bundle is being packaged by multiple projects.
provide a separate package so it can be reused.

Change-Id: If29bec69ef4b06fd32346d150a378c69be0b222d
Signed-off-by: Robert Varga <rovarga@cisco.com>
7 years agoAdd maven-cpd-plugin to m2e lifecycle mapping 77/42577/3
Lorand Jakab [Tue, 26 Jul 2016 14:42:14 +0000 (09:42 -0500)]
Add maven-cpd-plugin to m2e lifecycle mapping

Change-Id: Ie564815a81a28da608d5e1ef8577df97706a3c7a
Signed-off-by: Lorand Jakab <lojakab@cisco.com>
7 years agoAdd missing properties for startup scripts 27/43027/2
Stephen Kitt [Thu, 28 Jul 2016 14:24:20 +0000 (16:24 +0200)]
Add missing properties for startup scripts

The Karaf startup scripts use a number of Maven properties; this patch
copies the values used in Karaf 3.0.6.

Change-Id: I4d2a3e0ae98955c32cc07af2713f6c759a8c4fb5
Signed-off-by: Stephen Kitt <skitt@redhat.com>
7 years agoDo not specify MaxPermSize 25/43025/1
Robert Varga [Wed, 3 Aug 2016 09:03:43 +0000 (11:03 +0200)]
Do not specify MaxPermSize

In Boron we only support Java 8, which does not need
this deprecated option. Remove it.

Change-Id: Iad00670c2298ac105fa078d26e6520bd0bdf832b
Signed-off-by: Robert Varga <rovarga@cisco.com>
7 years agoBug 6187: Force more maven resolution in karaf-plugin 42/42842/3
Vratko Polak [Mon, 1 Aug 2016 13:22:41 +0000 (15:22 +0200)]
Bug 6187: Force more maven resolution in karaf-plugin

Especially concerning level 1 feature repository dependencies.
This fixed Bug 6187 in my local testing.

+ Improve logging.

Change-Id: Ie973e3669510061afd59a6c9d22f7a9161f0bd13
Signed-off-by: Vratko Polak <vrpolak@cisco.com>
7 years agoEliminate karaf.resources.version 18/42818/3
Robert Varga [Sat, 30 Jul 2016 11:28:03 +0000 (13:28 +0200)]
Eliminate karaf.resources.version

This property is only used once, inline it in dependency
declaration.

Change-Id: I618ead3ad2a4232e8f41283ddd68649c78f2601d
Signed-off-by: Robert Varga <rovarga@cisco.com>
7 years agoBug 6278: Delete incorrect start script 25/42925/1
Stephen Kitt [Mon, 1 Aug 2016 16:23:57 +0000 (18:23 +0200)]
Bug 6278: Delete incorrect start script

This version doesn't work, the version provided by Karaf does.

Change-Id: I694e926d1917951708ed9740b51ad38f4b826de9
Signed-off-by: Stephen Kitt <skitt@redhat.com>