odlparent.git
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>
7 years agoRemove duplicate karaf-branding declaration 17/42817/2
Robert Varga [Sat, 30 Jul 2016 11:25:47 +0000 (13:25 +0200)]
Remove duplicate karaf-branding declaration

scope=compile is the default, hence elimite the duplicate
which emits a maven warning.

Change-Id: Id352a6a11008effec98371d8f4e48ec95df60b41
Signed-off-by: Robert Varga <rovarga@cisco.com>
7 years agoInclude README and CONTRIBUTING & PROJECT_INFO.yaml files in built JARs 70/42370/4
Michael Vorburger [Sat, 23 Jul 2016 01:38:43 +0000 (03:38 +0200)]
Include README and CONTRIBUTING & PROJECT_INFO.yaml files in built JARs

Bug: 4134
Change-Id: I455c815270a2f71f12ecd78727461e4403009850
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
7 years agoEnable the license checker on src/test/** files 81/42381/2
Thanh Ha [Sat, 23 Jul 2016 04:26:49 +0000 (00:26 -0400)]
Enable the license checker on src/test/** files

Should be merged once all the Boron projects merged their patches first.
See:
https://git.opendaylight.org/gerrit/#/q/status:open++topic:fix-license

Change-Id: I067c5034bf5b9897d030700f3956a0cbc2abce06
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
7 years agoBug 6278: Copy karaf-parent from controller to odlparent 50/42650/5
Ryan Goulding [Fri, 22 Jul 2016 07:29:11 +0000 (03:29 -0400)]
Bug 6278: Copy karaf-parent from controller to odlparent

As discussed in the MD-SAL call, there is an architectural need to move
karaf-parent from the controller project to the odlparent project.  This
is particularly useful for karaf upgrades, since right now a bump in karaf
version within odlparent requires a rebuild of controller to reflect the
change in karaf-parent, and our build jobs are not set up to support such
a process.

The move process will be handled in multiple steps:

1) Copy karaf-parent, karaf-branding and opendaylight-karaf-resources to
odlparent.  All three of these should belong in odlparent.  All three must
be moved since karaf-parent depends on the latter two artifacts.  Since
controller depends on odlparent (and not the other way around), they must
be moved upstream to odlparent.  [THIS PATCH]

2) Have controller's karaf-parent derive from odlparent's karaf-parent.
This preserves the ability for downstream consumers to derive from the
controller karaf-parent in the interim, while allowing changes to odlparent's
karaf-parent to be recognized since controller does not need to be rebuilt.

https://git.opendaylight.org/gerrit/#/c/42649/

This also involves removing karaf-branding and opendaylight-karaf-resources
from the controller project, since they are no longer needed.  There are two
consumers that need to be patched:
lispflowmapping: https://git.opendaylight.org/gerrit/42647
vtn: https://git.opendaylight.org/gerrit/42648

3) Change all downstream projects to utilize odlparent's karaf-parent.  This
is future work and will be done in several patches.

4) Remove controller's karaf-parent once we feel all downstream consumers
are using the odlparent's karaf-parent.

Change-Id: If2cdb2796a0649dbea5e289d35a95647eb3bdb60
Signed-off-by: Ryan Goulding <ryandgoulding@gmail.com>
Signed-off-by: Stephen Kitt <skitt@redhat.com>
7 years agoUpgrade pax-url-aether 1.5.0 -> 2.4.7 35/28335/14
Stephen Kitt [Tue, 13 Oct 2015 14:09:27 +0000 (16:09 +0200)]
Upgrade pax-url-aether 1.5.0 -> 2.4.7

In particular this removes an old dependency on httpclient 3.1 which
suffers from CVE-2012-6153 and CVE-2014-3577 (SSL MITM attacks).

Add a few missing dependencies (which used to be pulled in by
pax-url-aether).

Explicitly scope feature-test's dependencies.

Change-Id: I9430f2f646ea050359a9c52bd978d8fb6c6a01e5
Signed-off-by: Stephen Kitt <skitt@redhat.com>
7 years agoActivate PMD CPD by default 27/42427/3
Michael Vorburger [Mon, 25 Jul 2016 03:47:07 +0000 (05:47 +0200)]
Activate PMD CPD by default

The new Copy-Paste detector which I recently introduced in
c5cfbc434448b646fd93a89e0928111e2a4d500c and announced on
https://lists.opendaylight.org/pipermail/odlparent-dev/2016-July/000443.html
would probably be of more value if it was actually on by default, and
not just dormant in an pluginManagement doing nothing? ;-)  Note again
that this will never break a build - just log; unless enforcement is
enabled (same model as for Checkstyle).

Change-Id: I07b90dfb5a9c3f724eba77d2b87e08c25699c8b6
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
7 years agomaven-compiler-plugin javac -parameters 15/42515/1
Michael Vorburger [Mon, 25 Jul 2016 23:55:18 +0000 (01:55 +0200)]
maven-compiler-plugin javac -parameters

Quote e.g.
https://docs.oracle.com/javase/8/docs/technotes/tools/windows/javac.html:
"Stores formal parameter names of constructors and methods in the
generated class file so that the method
java.lang.reflect.Executable.getParameters from the Reflection API can
retrieve them."

The XtendBeanGenerator successfully uses this Java feature, and in order
to be able to use this across all projects, this should be the new
default setting in odlparent.

AFAIK some IDEs can now also leverage this to offer better default
method parameter name e.g. on @Override.  Dito AFAIK some other
libraries, such as e.g. Jackson JSON stuff, may also be able to benefit
from this and need less annotations, if present.  I do remember that
e.g. Spring Framework can leverage this for it's REST thing - it saves
you from having to say: void foo(@ParamName("bar") int bar) kind of
thing.

I can't think of any real downside.. I'm guessing that it leads to an
ever so slight increase in .class and thus JAR file size (logical), but
that seems a very small disadvantage, and fair price to pay, for the
benefit.

Change-Id: I24015bd00b777c0a68fcf17316a13a86dd1251df
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
7 years agoAdd sensible defaults for metadata required for Maven Central deployment 52/42052/2
Michael Vorburger [Tue, 19 Jul 2016 14:28:44 +0000 (16:28 +0200)]
Add sensible defaults for metadata required for Maven Central deployment

Change-Id: I15d09744aede2e54b5c4f63167777ab6b98600eb
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
7 years agoCheckstyle now also covers src/test/java & src/test|main/resources 57/40957/4
Michael Vorburger [Tue, 28 Jun 2016 17:16:48 +0000 (19:16 +0200)]
Checkstyle now also covers src/test/java & src/test|main/resources

But license headers are not enforced in src/test/java - not because that
wouldn't be nice, but just because it is way too much work to fix up
everything - I've tried, and then realized that's not realistic.

Change-Id: I66bcca1c8a54cb8a242579884a33032eba3ee100
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
7 years agoCheckstyle new rule ConstantName 89/41289/4
Michael Vorburger [Mon, 4 Jul 2016 17:05:22 +0000 (19:05 +0200)]
Checkstyle new rule ConstantName

Change-Id: I2497c871880139142fc79cb05b677eb2629dce94
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
7 years agoCheckstyle IllegalThrows with ignoreOverriddenMethods 06/42306/2
Michael Vorburger [Fri, 22 Jul 2016 11:37:50 +0000 (13:37 +0200)]
Checkstyle IllegalThrows with ignoreOverriddenMethods

The default is true, and for good reason; it was stupid of me to
originally have used ignoreOverriddenMethods = false.

This is because when you @Override a method, you cannot do anything
anymore about its throws clause - you have to comply with what you are
overriding.

Based on doing some real world Checkstyle clean up work and noticing
that this was wrong.

Change-Id: Ifbfd677074d7b84cbea52f5ca520791d648def75
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
7 years agoAdd NoCleanIfFailure option to SingleFeatureTest 44/42244/3
Yakir Dorani [Thu, 21 Jul 2016 14:57:34 +0000 (17:57 +0300)]
Add NoCleanIfFailure option to SingleFeatureTest

This will as shown much clearer errors in case of SFT failures; e.g.
"java.lang.IllegalStateException: Can't install
feature odl-integration-compatible-with-all/0.5.0-SNAPSHOT:
Could not start bundle mvn:org.opendaylight.snmp4sdn/snmp4sdn/0.4.0-SNAPSHOT
in feature(s) odl-snmp4sdn-snmp4sdn-0.4.0-SNAPSHOT: The bundle
"org.opendaylight.snmp4sdn_0.4.0.SNAPSHOT [504]" could not be resolved.
Reason: Missing Constraint: Import-Package: org.opendaylight.controller.sal.packet; version="[0.7.0,1.0.0)""

as shown on https://lists.opendaylight.org/pipermail/odlparent-dev/2016-July/000467.html

Change-Id: I5b5df8807e87c76975598a0f3311010b781227c6
Signed-off-by: Yakir Dorani <yakir.dorani@hpe.com>
7 years agoOption to performance profile SingleFeatureTest 49/41349/3
Michael Vorburger [Tue, 5 Jul 2016 14:48:32 +0000 (16:48 +0200)]
Option to performance profile SingleFeatureTest

with Java Mission Control FlightRecorder

via -Dkaraf.featureTest.profile=true

Change-Id: I7450f44bb4543718253bda742d111c5050d5bf2b
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
7 years agoQuick (-Pq) should skip running tests, but not building them 06/42106/2
Michael Vorburger [Wed, 20 Jul 2016 00:26:48 +0000 (02:26 +0200)]
Quick (-Pq) should skip running tests, but not building them

Change-Id: Ie537fc006265da0492f8bf620a73280301af91e2
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
7 years agoIntro. Google Truth into dependencyManagement 90/42090/2
Michael Vorburger [Tue, 19 Jul 2016 20:30:39 +0000 (22:30 +0200)]
Intro. Google Truth into dependencyManagement

see http://google.github.io/truth/.  This seems neater than Hamcrest in
particular for tests on Iterables (Collections).  For example, in
Hamcrest:

assertThat(Arrays.asList("foo", "bar"), contains("foo", "baz")); // OK

assertThat(Arrays.asList("foo", "bar"), contains(Arrays.asList("foo",
"bar"))); // NOK! :-( because contains only works for vararg not List

whereas with Google Truth:

assertThat(Arrays.asList("foo", "bar")).
containsExactlyElementsIn(Arrays.asList("foo", "baz"));

==> AssertionError: Not true that <[foo, bar]> contains exactly <[foo,
baz]>. It is missing <[baz]> and has unexpected items <[bar]>

also see http://google.github.io/truth/comparison

Change-Id: Iac121b302179e64c8cbd339b6f027582abfdd822
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
7 years agoIncrease enforced Maven minimal version from 3.1.1 to 3.2.5 (no upper) 30/42030/3
Michael Vorburger [Tue, 19 Jul 2016 08:43:32 +0000 (10:43 +0200)]
Increase enforced Maven minimal version from 3.1.1 to 3.2.5 (no upper)

as discussed on [odlparent-dev] thread "Re: Introducing PMD Copy/Paste
Detector (CPD)"

Change-Id: I6c1e32029ba993849a368d832a48a442cd396053
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
7 years agoIntroduce PMD Copy/Paste Detector (CPD) 98/41998/2
Michael Vorburger [Mon, 18 Jul 2016 18:42:05 +0000 (20:42 +0200)]
Introduce PMD Copy/Paste Detector (CPD)

Take II - is using <excludeRoots><excludeRoot> better? (We tried this
before and had to revert, despite it passing on Jenkins; very strange.)

Like Checkstyle, this by default only reports to the console during
(local..) builds, but does not enforce it - builds will NOT fail with
this. Then projects ready to "opt-in" for CPD enforcement can use:
<properties> <pmd.cpd.fail>false</pmd.cpd.fail> </properties>

Change-Id: I01de6ce01fe5f7020aae47ee2e9325cdc14e00e4
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
7 years agoCheckstyle java.nio.charset.StandardCharsets instead of com.google.common.base.Charsets 75/41075/5
Michael Vorburger [Wed, 29 Jun 2016 22:24:16 +0000 (00:24 +0200)]
Checkstyle java.nio.charset.StandardCharsets instead of com.google.common.base.Charsets

http://blog2.vorburger.ch/2016/06/how-to-use-checkstyle-to-enforce-using.html

Change-Id: Ibdc5520a7700f548e735c569ee8a3c1c9426dcd1
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
7 years agoRevert "Introduce PMD Copy/Paste Detector (CPD)" 97/41997/2
Robert Varga [Mon, 18 Jul 2016 17:58:12 +0000 (17:58 +0000)]
Revert "Introduce PMD Copy/Paste Detector (CPD)"

This reverts commit 68afa051f302f5f67aedd42bf1ab2f4cc20d75c7.
It breaks build in yangtools: checkstyle fails to parse
configuration and cannot assign String to File[].

Change-Id: I5f9025c1dd79c19f10e8c17a56e270d17cbda043
Signed-off-by: Robert Varga <nite@hq.sk>
7 years agoUpgrade Felix dependencies 85/38285/7
Stephen Kitt [Mon, 2 May 2016 14:01:27 +0000 (16:01 +0200)]
Upgrade Felix dependencies

* Dependency Manager 3.1.0 -> 4.3.0
* Dependency Manager Shell 3.0.1 -> 4.0.4
* File Install 3.1.6 -> 3.5.4
* Web Console 4.2.0 -> 4.2.14

Change-Id: I7d499669cf98e0761b92f7cce6b870ebc3f1d7c5
Signed-off-by: Stephen Kitt <skitt@redhat.com>
7 years agoIntroduce PMD Copy/Paste Detector (CPD) 89/41489/2
Michael Vorburger [Thu, 7 Jul 2016 14:23:15 +0000 (16:23 +0200)]
Introduce PMD Copy/Paste Detector (CPD)

Like Checkstyle, this by default only reports to the console during
(local..) builds, but does not enforce it - builds will NOT fail with
this. Then projects ready to "opt-in" for CPD enforcement can use:

  <properties>
    <pmd.cpd.fail>false</pmd.cpd.fail>
  </properties>

BTW: The "minimumTokens" threshold may take some tuning - let's start
with these approx. 10 line rule, and then adjust it as we see how this
plays out in practice on a number of projects.

Change-Id: If862b8a16db5eed391bb85165987a4302ae44540
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
7 years agoMark slf4j-api as provided 33/39633/3
Stephen Kitt [Tue, 31 May 2016 08:38:36 +0000 (10:38 +0200)]
Mark slf4j-api as provided

Since Karaf provides its own SLF4J encapsulation, it might make sense
to simply identify slf4j-api as provided.

Change-Id: I42f2854eec608155b9013ec6756053ea85104ba6
Signed-off-by: Stephen Kitt <skitt@redhat.com>
7 years agoakka-testkit should be scoped to test 41/41841/2
Robert Varga [Thu, 14 Jul 2016 15:16:09 +0000 (17:16 +0200)]
akka-testkit should be scoped to test

This is a testing framework for testing actor systems,
it should never be carried in production.

Change-Id: I32cd9af660463ee3d981acde29ff635a518b7a88
Signed-off-by: Robert Varga <rovarga@cisco.com>
7 years agoCheckstyle remove duplicate UpperEll (minor) 21/41721/2
Michael Vorburger [Tue, 12 Jul 2016 14:45:42 +0000 (16:45 +0200)]
Checkstyle remove duplicate UpperEll (minor)

Change-Id: I4a557c4b2dc629f6d0544c24b09aa09ea53b673e
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
7 years agoIntroduce hamcrest-library, going beyond hamcrest-core, to the stars.. 26/41526/2
Michael Vorburger [Fri, 8 Jul 2016 02:41:46 +0000 (04:41 +0200)]
Introduce hamcrest-library, going beyond hamcrest-core, to the stars..

http://www.vogella.com/tutorials/Hamcrest/article.html
https://code.google.com/archive/p/hamcrest/wikis/Tutorial.wiki

Change-Id: If042c21216c62509c37176df647369b1fa2757c5
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
7 years agoRelax Checkstyle for JavaDoc, not mandatory for annotations 70/41270/2
Michael Vorburger [Mon, 4 Jul 2016 12:22:33 +0000 (14:22 +0200)]
Relax Checkstyle for JavaDoc, not mandatory for annotations

Because in at least one instance a project (ovsdb/library;
https://git.opendaylight.org/gerrit/#/c/40967/) has adopted Checkstyle
99% but then disabled enforcement because of lack of JavaDoc in a few
annotation types.  This is the wrong way to go about this IMHO; I'd
rather we relax this arbitrary requirement (that even annotations do not
have to have JavaDoc, like everything else), and be able to enforce
Checkstyle in more projects.

Change-Id: I42d1c81aa5ff511c272d39752340dddc5e3b0636
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
7 years agoIntro. Xtend dependencyManagement and Maven plugin 38/41738/1
Michael Vorburger [Tue, 12 Jul 2016 23:37:41 +0000 (01:37 +0200)]
Intro. Xtend dependencyManagement and Maven plugin

Xtend <http://xtend-lang.org> is already used in ODL's MDSAL project,
and I'd like to start using it in other projects as well (for writing
test code, for now).  In order to keep the version of Xtend used
uniform, and to keep child pom.xml shorter re. the xtend-maven-plugin
configuration, it would thus make sense to have this in the ODL parent.

Change-Id: I8356ef07772d3d487b688b5f6789c23a9b698bd2
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
7 years agoAdd guava-testlib to dependencyManagement 95/41595/2
Michael Vorburger [Fri, 8 Jul 2016 21:52:40 +0000 (23:52 +0200)]
Add guava-testlib to dependencyManagement

Guava Testlib has a neat EqualsTester(), and other test helpers.

Change-Id: I843b3f724b545107f0ecf6e3651f2a583fbca820
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
7 years agoAdd skip for pmd & cpd to Q 86/41486/2
Michael Vorburger [Thu, 7 Jul 2016 14:03:38 +0000 (16:03 +0200)]
Add skip for pmd & cpd to Q

Even though PMD / CPD aren't actually used yet, I'm planning to propose
gradually introducing it, and having this already in Q will help not
forgetting it, and people not complaining.  It does not hurt having this
in early.

Change-Id: Ib6021da46129b5e5b9d6c2e79475fbf03ddda199
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
7 years agoCheckstyle rulez for Exception Handling Anti-Patterns 04/41304/3
Michael Vorburger [Mon, 4 Jul 2016 20:55:16 +0000 (22:55 +0200)]
Checkstyle rulez for Exception Handling Anti-Patterns

* http://checkstyle.sourceforge.net/config_coding.html#IllegalCatch
* http://checkstyle.sourceforge.net/config_coding.html#IllegalThrows
* http://checkstyle.sourceforge.net/config_design.html#MutableException

and TBD:
* http://sevntu-checkstyle.github.io/sevntu.checkstyle/apidocs/com/github/sevntu/checkstyle/checks/coding/AvoidHidingCauseExceptionCheck.html
* http://sevntu-checkstyle.github.io/sevntu.checkstyle/apidocs/com/github/sevntu/checkstyle/checks/coding/EitherLogOrThrowCheck.html

Includes fixing "Catching 'Exception' is not allowed" in
SingleFeatureTest.

Change-Id: I716bd43573c4431e0276141acfb3eec2195d5aa6
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
7 years agoCheckstyle enforce no redundant modifiers 02/41302/2
Michael Vorburger [Mon, 4 Jul 2016 20:09:52 +0000 (22:09 +0200)]
Checkstyle enforce no redundant modifiers

see
http://checkstyle.sourceforge.net/config_modifier.html#RedundantModifier

Change-Id: I711de6ea9dc374435af5ba7403eef53ff2a99ce8
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
7 years agoIncrease SingleFeatureTest timeout from 5 to 10 min. 33/41333/3
Michael Vorburger [Tue, 5 Jul 2016 14:50:51 +0000 (16:50 +0200)]
Increase SingleFeatureTest timeout from 5 to 10 min.

Bug: 6156
Change-Id: I1f0a887e2e5fbaad9a934558cd13a28ab43ec434
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
7 years agoSingleFeatureTest PerRepoTestRunner logging 48/41348/2
Michael Vorburger [Tue, 5 Jul 2016 18:55:31 +0000 (20:55 +0200)]
SingleFeatureTest PerRepoTestRunner logging

Clarified; description includes feature name which is what you want to
show here, instead of just features.xml. System.out exceptionally used
because, whatever I did, I could never see that log otherwise..

Change-Id: I1cb1873e7eda3dcf2643888251f49cafec4e4dea
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
7 years agomaven-enforcer-plugin requireJavaVersion 1.8.0 40/41340/1
Michael Vorburger [Tue, 5 Jul 2016 18:44:29 +0000 (20:44 +0200)]
maven-enforcer-plugin requireJavaVersion 1.8.0

but we should probably move this to odlparent-lite, not just odlparent,
so that it already works for <packaging>pom roots.

Change-Id: Ide367d2697341e791bf1b9516a8937d1833cb35b
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
7 years agoCheckstyle System.out violations only in Java not in TXT etc. 72/40972/5
Michael Vorburger [Tue, 28 Jun 2016 21:51:45 +0000 (23:51 +0200)]
Checkstyle System.out violations only in Java not in TXT etc.

In Java sources, still do not permit them even commented out.

Change-Id: If878b9e6954a62cb4a21496e6bb27962d3f59423
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
7 years agoBump akka to 2.4.7 60/40960/2
Robert Varga [Tue, 28 Jun 2016 18:14:41 +0000 (20:14 +0200)]
Bump akka to 2.4.7

The regression introduced in 2.4.6 has been fixed,
bump akka to latest.

Change-Id: I4b569a7f53af4dd77f7211ae9088983d16010f89
Signed-off-by: Robert Varga <rovarga@cisco.com>
7 years agoUpgrade Maven plugins 98/40298/4
Stephen Kitt [Fri, 10 Jun 2016 09:01:57 +0000 (11:01 +0200)]
Upgrade Maven plugins

(maven-surefire-plugin is left out because 2.19.1 breaks our tests.)

build-helper-maven-plugin 1.9.1 -> 1.10
 * 1.10: http://www.mojohaus.org/build-helper-maven-plugin/github-report.html

maven-bundle-plugin 3.0.0 -> 3.0.1
 * http://www.mail-archive.com/users%40felix.apache.org/msg16914.html

maven-clean-plugin 2.6.1 -> 3.0.0
 * 3.0.0: http://mail-archives.apache.org/mod_mbox/maven-announce/201510.mbox/%3C20151023060827.136D6188B5%40minotaur.apache.org%3E

maven-compiler-plugin 3.3 -> 3.5.1
 * 3.5.1: http://mail-archives.apache.org/mod_mbox/maven-announce/201602.mbox/%3CCAK2FUK3FfTSZSeQybK_4KXhFbtRNZ1uo6wxEbfnnyy5MCh1DsQ%40mail.gmail.com%3E
 * 3.5: http://mail-archives.apache.org/mod_mbox/maven-announce/201601.mbox/%3CCAK2FUK1kNz9di_SAUDBO2VjD3XLEL%3D0XLJkLkg68Q7x4ChJh-w%40mail.gmail.com%3E

maven-jar-plugin 2.6 -> 3.0.0 (pending
https://git.opendaylight.org/gerrit/40175)
 * 3.0.0: http://mail-archives.apache.org/mod_mbox/maven-announce/201605.mbox/%3C20160515194703.8B01819730%40minotaur.apache.org%3E

maven-project-info-reports-plugin 2.8.1 -> 2.9
 * 2.9: http://mail-archives.apache.org/mod_mbox/maven-announce/201603.mbox/%3C56DC1611.1050409%40apache.org%3E

maven-release-plugin 2.5.2 -> 2.5.3
 * http://mail-archives.apache.org/mod_mbox/maven-announce/201510.mbox/%3CCALhtWkezhk9ykpxzx-1T7qiyt7VZ88Nn1R%2BsSz9iK%2Buv3r%2B4aA%40mail.gmail.com%3E

maven-resources-plugin 2.7 -> 3.0.1
 * 3.0.1: http://mail-archives.apache.org/mod_mbox/maven-announce/201606.mbox/%3C20160608173951.D512D19E18%40minotaur.apache.org%3E
 * 3.0.0: http://mail-archives.apache.org/mod_mbox/maven-announce/201605.mbox/%3C20160521184859.A223F18263%40minotaur.apache.org%3E

maven-shade-plugin 2.4.1 -> 2.4.3
 * 2.4.3: http://mail-archives.apache.org/mod_mbox/maven-announce/201601.mbox/%3CCAKuVzBS2BeJoxXi3Yotbbyy5kGJemVSSCNr3%2BYW3ytz51G2wbQ%40mail.gmail.com%3E
 * 2.4.2: http://mail-archives.apache.org/mod_mbox/maven-announce/201510.mbox/%3C20151029055337.CB8AC18CD5%40minotaur.apache.org%3E

maven-site-plugin 3.4 -> 3.5.1
 * 3.5.1: http://mail-archives.apache.org/mod_mbox/maven-announce/201604.mbox/%3C7199325.eTch8dpi9I%40herve-desktop%3E
 * 3.5: http://mail-archives.apache.org/mod_mbox/maven-announce/201602.mbox/%3C1518487.5YI36Fm8fR%40herve-desktop%3E

maven-source-plugin 2.4 -> 3.0.0
 * 3.0.0: http://mail-archives.apache.org/mod_mbox/maven-announce/201602.mbox/%3C20160218044420.1FAD3185C6%40minotaur.apache.org%3E

propertymavenplugin 1.0-alpha-2 -> 1.0.0
 * http://www.mojohaus.org/properties-maven-plugin/github-report.html

Change-Id: I7e6a04f98d37d3beb1adc0b270f00c9bc323c0ef
Signed-off-by: Stephen Kitt <skitt@redhat.com>
7 years agoUpdate plugin property info 14/40114/5
Stephen Kitt [Thu, 9 Jun 2016 14:38:51 +0000 (16:38 +0200)]
Update plugin property info

checkstyle.runtime.version, gmaven.plugin.version,
jar.plugin.version, and maven.release.version aren't used outside
odlparent, remove them.

Change-Id: Ic492b2f8ac01736c32485503c5418381423a650a
Signed-off-by: Stephen Kitt <skitt@redhat.com>
7 years agoChange Checkstyle allowedAbbreviationLength from 3 to 4 ("managerUUID") 65/40965/1
Michael Vorburger [Tue, 28 Jun 2016 19:51:34 +0000 (21:51 +0200)]
Change Checkstyle allowedAbbreviationLength from 3 to 4 ("managerUUID")

Change-Id: I617a42df79b201d1def106cc98988c376bff74e0
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
7 years agoFix Checkstyle warnings, and make them errors for the future 95/39495/4
Michael Vorburger [Thu, 26 May 2016 19:13:01 +0000 (21:13 +0200)]
Fix Checkstyle warnings, and make them errors for the future

Change-Id: I8d98314114b3de7038e178cee82acc495a96c7e5
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
8 years agoAdd apache xerces declaration 11/39011/3
Robert Varga [Tue, 17 May 2016 20:50:04 +0000 (22:50 +0200)]
Add apache xerces declaration

Dealing with Xerces is fun, except when we pull in wrong version of
xml-apis. As turns out, 1.4.01 is actually newer than 2.0.2 (based
on search.maven.org). Adjust the xml-apis version and declare xerces
dependency.

Change-Id: Iecdd82ab181768281d820d862378ffe30530cfd1
Signed-off-by: Robert Varga <rovarga@cisco.com>
8 years agoAdd mvn install -DaddInstallRepositoryPath=.../karaf/system 20/40520/1
Michael Vorburger [Sun, 19 Jun 2016 13:11:26 +0000 (15:11 +0200)]
Add mvn install -DaddInstallRepositoryPath=.../karaf/system

http://blog2.vorburger.ch/2016/06/maven-install-into-additional.html

Change-Id: Ia3a347250e22dbecef9558875e889a5a9fd2c5e3
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
8 years agoCheckstyle Import order as per original ODL convention on Wiki 09/39809/2
Michael Vorburger [Thu, 2 Jun 2016 23:37:22 +0000 (01:37 +0200)]
Checkstyle Import order as per original ODL convention on Wiki

see discussion on dev@lists.opendaylight.org email thread "Import
ordering: Going Wiki or Checkstyle way?"

Change-Id: I4568c68bea6a0aaeb358eb133d7201327a413b4d
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
8 years agoUse ${project.remoteProjectRepositories} in karaf-plugin 33/40433/1
Vratko Polak [Thu, 16 Jun 2016 10:38:00 +0000 (12:38 +0200)]
Use ${project.remoteProjectRepositories} in karaf-plugin

This Change is inspired by https://issues.jboss.org/browse/JBASMP-40

Without this, https://git.opendaylight.org/gerrit/#/c/40432/1 fails,
as karaf-plugin picks repositories defined for itself,
and not for the project it is supposed to handle.

Change-Id: I49fb3dd9b8d268ce3d52cae79bd2bbb0f8a06db4
Signed-off-by: Vratko Polak <vrpolak@cisco.com>
8 years agoCheckstyle JavaDoc presence not enforced, but if present, check style 06/39406/6
Michael Vorburger [Tue, 31 May 2016 10:30:48 +0000 (12:30 +0200)]
Checkstyle JavaDoc presence not enforced, but if present, check style

Change-Id: Ic924345a670e2938ee12b7c4f41bdc382aad2409
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
8 years agoRevert "Bump maven-failsafe-plugin version from 2.18.1 to 2.19.1, to solve NoClassDef... 18/40318/1
Robert Varga [Tue, 14 Jun 2016 16:52:02 +0000 (18:52 +0200)]
Revert "Bump maven-failsafe-plugin version from 2.18.1 to 2.19.1, to solve NoClassDefFoundError"

This reverts commit fb0e070b9c331b4487ee476673f5104e0d4f12d9.

Change-Id: Iecebc9322bf63c45355600536a66dae94cd58d8a
Signed-off-by: Robert Varga <rovarga@cisco.com>
8 years agoBump maven-failsafe-plugin version from 2.18.1 to 2.19.1, to solve NoClassDefFoundError 97/40297/1
Michael Vorburger [Tue, 14 Jun 2016 12:51:47 +0000 (14:51 +0200)]
Bump maven-failsafe-plugin version from 2.18.1 to 2.19.1, to solve NoClassDefFoundError

required for https://git.opendaylight.org/gerrit/#/c/39484/

[INFO] ------------------------------------------------------------------------
[INFO] Reactor Summary:
[INFO]
[INFO] archetypes-parent .................................. SUCCESS [  2.431 s]
[INFO] odl-model-project .................................. SUCCESS [  9.970 s]
[INFO] opendaylight-configfile-archetype .................. SUCCESS [  3.365 s]
[INFO] distribution-karaf-archetype ....................... SUCCESS [ 24.224 s]
[INFO] opendaylight-karaf-features-archetype .............. SUCCESS [02:12 min]
[INFO] opendaylight-startup-archetype ..................... FAILURE [05:31 min]
[INFO] ------------------------------------------------------------------------
[INFO] BUILD FAILURE
[INFO] ------------------------------------------------------------------------
[INFO] Total time: 08:23 min
[INFO] Finished at: 2016-06-14T14:25:26+02:00
[INFO] Final Memory: 50M/1025M
[INFO] ------------------------------------------------------------------------
[ERROR] Failed to execute goal org.apache.maven.plugins:maven-failsafe-plugin:2.18.1:integration-test (failsafe-integration-tests) on project opendaylight-startup-archetype: Execution failsafe-integration-tests of goal org.apache.maven.plugins:maven-failsafe-plugin:2.18.1:integration-test failed: There was an error in the forked process
[ERROR] java.lang.NoClassDefFoundError: projects/basic/project/basic/it/target/test-classes/it/pkg/it/BasicIT (wrong name: it/pkg/it/BasicIT)
[ERROR] at java.lang.ClassLoader.defineClass1(Native Method)
[ERROR] at java.lang.ClassLoader.defineClass(ClassLoader.java:763)
[ERROR] at java.security.SecureClassLoader.defineClass(SecureClassLoader.java:142)
[ERROR] at java.net.URLClassLoader.defineClass(URLClassLoader.java:467)
[ERROR] at java.net.URLClassLoader.access$100(URLClassLoader.java:73)
[ERROR] at java.net.URLClassLoader$1.run(URLClassLoader.java:368)
[ERROR] at java.net.URLClassLoader$1.run(URLClassLoader.java:362)
[ERROR] at java.security.AccessController.doPrivileged(Native Method)
[ERROR] at java.net.URLClassLoader.findClass(URLClassLoader.java:361)
[ERROR] at java.lang.ClassLoader.loadClass(ClassLoader.java:424)
[ERROR] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:331)
[ERROR] at java.lang.ClassLoader.loadClass(ClassLoader.java:357)
[ERROR] at org.apache.maven.surefire.util.DefaultScanResult.loadClass(DefaultScanResult.java:131)
[ERROR] at org.apache.maven.surefire.util.DefaultScanResult.applyFilter(DefaultScanResult.java:95)
[ERROR] at org.apache.maven.surefire.junit.JUnit3Provider.scanClassPath(JUnit3Provider.java:137)
[ERROR] at org.apache.maven.surefire.junit.JUnit3Provider.invoke(JUnit3Provider.java:88)
[ERROR] at org.apache.maven.surefire.booter.ForkedBooter.invokeProviderInSameClassLoader(ForkedBooter.java:203)
[ERROR] at org.apache.maven.surefire.booter.ForkedBooter.runSuitesInProcess(ForkedBooter.java:155)
[ERROR] at org.apache.maven.surefire.booter.ForkedBooter.main(ForkedBooter.java:103)
[ERROR] -> [Help 1]

Change-Id: I9d80dc095b21d1ef33e4da214d2399d778a902ac
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
8 years agoIntroduce "mvn -Pq install" to just build JAR, but no tests, QA etc. 45/40245/3
Michael Vorburger [Mon, 13 Jun 2016 15:27:51 +0000 (17:27 +0200)]
Introduce "mvn -Pq install" to just build JAR, but no tests, QA etc.

@see #also http://memory-alpha.wikia.com/wiki/Q ;)

Bumped maven-source-plugin from 2.4 to 3.0.0 just because
maven.source.skip appears to be broken with 2.4 (it gen. the
*-sources.jar anyway) but with 3.0.0 it's correctly "Skipping source per
configuration."

Change-Id: I77e521c60f8390df7b2e15182f1715e1a92db901
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
8 years agoUpgrade Apache Shiro 1.2.4 to 1.2.5 25/40125/2
Ryan Goulding [Thu, 9 Jun 2016 19:56:51 +0000 (15:56 -0400)]
Upgrade Apache Shiro 1.2.4 to 1.2.5

Fixes include the following:
[SHIRO-443] - SessionValidationScheduler created multiple times, enabling it is not thread safe
[SHIRO-462] - Authentication exceptions are swallowed
[SHIRO-467] - Authentication exception gets swallowed
[SHIRO-550] - Randomize default remember me cipher
[SHIRO-504] - Java 8 support
[SHIRO-516] - Explicitly specify the version of aspectjtools to avoid build warning
[SHIRO-562] - WildcardPermission calls String.trim() twice in setParts()

Release notes are located here:

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

Change-Id: Ic4a2342abecc31d7beb1b204adfba03bda78d3a8
Signed-off-by: Ryan Goulding <ryandgoulding@gmail.com>
8 years agoRevert "Upgrade Netty 4.0.37.Final -> 4.1.1.Final" 96/40196/1
Robert Varga [Sun, 12 Jun 2016 09:32:23 +0000 (09:32 +0000)]
Revert "Upgrade Netty 4.0.37.Final -> 4.1.1.Final"

This reverts commit 34a2b5c5d7d09af6dad600f97332e05c65526022. Merged accidentally.

Change-Id: I9128e09fe147bb7059ce2c168f818715a0566338
Signed-off-by: Robert Varga <rovarga@cisco.com>
8 years agoUpgrade Netty 4.0.37.Final -> 4.1.1.Final 79/39979/5
Lorand Jakab [Wed, 8 Jun 2016 23:07:03 +0000 (02:07 +0300)]
Upgrade Netty 4.0.37.Final -> 4.1.1.Final

See also https://lists.opendaylight.org/pipermail/odlparent-dev/2016-April/000269.html

Change-Id: I0403a36eebaa348c6ee1e52585a89eb2f6eb9ad4
Signed-off-by: Lorand Jakab <lojakab@cisco.com>
8 years agoFix use of BAD BAD BAD BAD static class initializer code block 15/39715/5
Michael Vorburger [Wed, 1 Jun 2016 14:42:02 +0000 (16:42 +0200)]
Fix use of BAD BAD BAD BAD static class initializer code block

This clarifies a problem we run into when doing the PAX Exam upgrade.
Fixing this will give us a much clearer error message the next time
anything related to this goes wrong.

Change-Id: I296d7475bf6fbb6390f0c08dafabd42fa1a9891d
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
Signed-off-by: Robert Varga <rovarga@cisco.com>
8 years agoUpgrade Netty 4.0.36.Final -> 4.0.37.Final 78/39978/2
Lorand Jakab [Wed, 8 Jun 2016 07:47:42 +0000 (10:47 +0300)]
Upgrade Netty 4.0.36.Final -> 4.0.37.Final

Fixes CVE-2016-4970, among other thing, see [1] for more.

[1] http://netty.io/news/2016/06/07/4-0-37-Final.html

Change-Id: I34cc70dbf5e9d12f8d3246cfcb4daea353635074
Signed-off-by: Lorand Jakab <lojakab@cisco.com>
8 years agoMove 3 Checkstyle from controller/checkstyle to odlparent 97/39797/2 odlparent-aggregator-1.7.0
Michael Vorburger [Thu, 2 Jun 2016 20:12:21 +0000 (22:12 +0200)]
Move 3 Checkstyle from controller/checkstyle to odlparent

These used to be in
controller/opendaylight/commons/checkstyle/src/main/resources/controller/checkstyle.xml,
but should better be here in odlparent odl_checks.xml:

* http://checkstyle.sourceforge.net/config_misc.html#UpperEll
* http://checkstyle.sourceforge.net/config_coding.html#EmptyStatement
* http://checkstyle.sourceforge.net/config_coding.html#EqualsHashCode

Change-Id: Ia6bded1dadc2e07620f8372f9d9323ec933299be
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
8 years agoMove Checkstyle module MethodName up in XML. 03/39403/3
Michael Vorburger [Wed, 25 May 2016 11:57:29 +0000 (13:57 +0200)]
Move Checkstyle module MethodName up in XML.

There must be order. Always.

Change-Id: I37fc452bac88267e2e8d745c82e109b95cda7e07
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
8 years agoRevert "Upgrade Pax Exam 4.4.0 -> 4.9.1" 91/39791/1
Robert Varga [Thu, 2 Jun 2016 17:35:34 +0000 (19:35 +0200)]
Revert "Upgrade Pax Exam 4.4.0 -> 4.9.1"

This reverts commit 223a8cf3cb62c7873f3ba3de15728be06ae39010. It breaks
the features tests in yangtools.

Change-Id: Iac1614e003f89c0ff2f336718412f0a504134262
Signed-off-by: Robert Varga <rovarga@cisco.com>
8 years agoMerge "Upgrade Pax Exam 4.4.0 -> 4.9.1"
Robert Varga [Thu, 2 Jun 2016 15:01:18 +0000 (15:01 +0000)]
Merge "Upgrade Pax Exam 4.4.0 -> 4.9.1"

8 years agoRevert "Upgrade Jackson 2.3.2 -> 2.7.4" 16/39616/2
Michael Vorburger [Mon, 30 May 2016 14:27:12 +0000 (16:27 +0200)]
Revert "Upgrade Jackson 2.3.2 -> 2.7.4"

This reverts commit 2061aa51982fa82d3414d8f03729819b785ff296, because it
broke sal-rest-docgen (as well as SFC according to skitt).

Bug: 5980
Change-Id: If9981709530c3f44f902ba249b577144f1adb639
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
8 years agoUpgrade Pax Exam 4.4.0 -> 4.9.1 70/38270/4
Stephen Kitt [Mon, 2 May 2016 13:30:38 +0000 (15:30 +0200)]
Upgrade Pax Exam 4.4.0 -> 4.9.1

This brings many bug-fixes, and a few improvements:
* support for OSGi 6
* addition of an embedded Karaf container

One important caveat is that the pax-exam POMs no longer pull in
org.osgi:org.osgi.core.

For details, see
https://ops4j1.jira.com/wiki/display/PAXEXAM4/Pax+Exam

Change-Id: I35fe30e5626030105b8ee2cf86069fae0a961dce
Signed-off-by: Stephen Kitt <skitt@redhat.com>
8 years agoMerge "Move Checkstyle rules not related to slfj4 logging from yangtools"
Robert Varga [Fri, 27 May 2016 16:07:22 +0000 (16:07 +0000)]
Merge "Move Checkstyle rules not related to slfj4 logging from yangtools"

8 years agoMerge ".gitignore .factorypath created by m2e-apt"
Stephen Kitt [Fri, 27 May 2016 12:34:45 +0000 (12:34 +0000)]
Merge ".gitignore .factorypath created by m2e-apt"

8 years ago.gitignore .factorypath created by m2e-apt 18/39518/1
Michael Vorburger [Fri, 27 May 2016 09:57:05 +0000 (11:57 +0200)]
.gitignore .factorypath created by m2e-apt

https://github.com/vorburger/opendaylight-eclipse-setup now bundles
https://github.com/jbosstools/m2e-apt, which creates .factorypath files
in projects using "active" (APT) Java annotations.

Change-Id: Ib2bdec1e3277e2eccbbe797d5afcd5c7ecb1b495
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
8 years agoMove Checkstyle rules not related to slfj4 logging from yangtools 16/39416/2
Michael Vorburger [Wed, 25 May 2016 14:12:54 +0000 (16:12 +0200)]
Move Checkstyle rules not related to slfj4 logging from yangtools

All of these used to be in yangtools' checkstyle-logging.xml, but should
better be here in odlparent odl_checks.xml.  Further notes FTR:

* Indentation was slightly different in yangtools, safer to keep as-is
* RedundantImport is new (from neither), and seems sensible
* AvoidStarImport was just moved

Change-Id: I0625b191e07e3f9587d398db2d7a725a529e5f03
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
8 years agoRevert "Bump akka to 2.4.6" 70/39370/1
Robert Varga [Tue, 24 May 2016 17:40:36 +0000 (19:40 +0200)]
Revert "Bump akka to 2.4.6"

This reverts commit be2a37ddcfbd86651c73c809a4b3096555df396d. There
is a regression in akka-2.4.5 and akka-2.4.6 which renders controller's
Remote RPC Broker unusable.

Change-Id: I5e195785b8a8e625272a225852990f468d25e008
Signed-off-by: Robert Varga <rovarga@cisco.com>
8 years agoMerge "Bump akka to 2.4.6"
Stephen Kitt [Tue, 24 May 2016 09:52:04 +0000 (09:52 +0000)]
Merge "Bump akka to 2.4.6"

8 years agoUpgrade moxy to version 2.6.2 41/37541/7
Ryan Goulding [Wed, 13 Apr 2016 15:23:36 +0000 (11:23 -0400)]
Upgrade moxy to version 2.6.2

Upgrade moxy from version 2.5.2 to 2.6.2.
Wait to merge this until all downstream consumers add a dependency
on javax.validation.

Change-Id: I54509f2880730b31573f5d7d653192579bfbf6e3
Signed-off-by: Ryan Goulding <ryandgoulding@gmail.com>
8 years agoMerge "Upgrade Jackson 2.3.2 -> 2.7.4"
Robert Varga [Mon, 23 May 2016 08:39:14 +0000 (08:39 +0000)]
Merge "Upgrade Jackson 2.3.2 -> 2.7.4"

8 years agoMerge "Allow license header to be glue to "package" statement"
Robert Varga [Mon, 23 May 2016 08:38:36 +0000 (08:38 +0000)]
Merge "Allow license header to be glue to "package" statement"

8 years agoBump akka to 2.4.6 41/39241/1
Robert Varga [Mon, 23 May 2016 08:37:50 +0000 (10:37 +0200)]
Bump akka to 2.4.6

Includes a couple of fixes.

Change-Id: I353601d378f9c8c1ac981cb8227fcd22b7bd177d
Signed-off-by: Robert Varga <rovarga@cisco.com>
8 years agoMerge "Bump Checkstyle Maven plugin version from 2.16 to 2.17"
Stephen Kitt [Thu, 19 May 2016 16:05:26 +0000 (16:05 +0000)]
Merge "Bump Checkstyle Maven plugin version from 2.16 to 2.17"

8 years agoAllow license header to be glue to "package" statement 15/39115/1
Michael Vorburger [Thu, 19 May 2016 12:35:55 +0000 (14:35 +0200)]
Allow license header to be glue to "package" statement

This looks nicer, saves 1 line screen space - and seems to be what much
of the ODL code base already does, including e.g. the startup-archetype!

Change-Id: I6eda243883151f9124f6312ec7429b3648a44b90
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
8 years agoUpgrade Jackson 2.3.2 -> 2.7.4 68/38268/3
Stephen Kitt [Mon, 2 May 2016 12:57:00 +0000 (14:57 +0200)]
Upgrade Jackson 2.3.2 -> 2.7.4

Many improvements and bug-fixes; see
https://github.com/FasterXML/jackson/wiki/Jackson-Release-2.7.4 and
linked pages for details. Some highlights:
* map entries are simplified
  (https://github.com/FasterXML/jackson/wiki/Jackson-Release-2.5)
* JSR-303 bean validation annotations are supported
* "True"/"False" are accepted for boolean JSON representations
* Protobuf-encoded data is handled
  (https://github.com/FasterXML/jackson/wiki/Jackson-Release-2.6)
* helper objects can be injected from the OSGi registry

Change-Id: I6363975d1f71835fcf0ec0b97e4685411c0e01cc
Signed-off-by: Stephen Kitt <skitt@redhat.com>
8 years agoMerge "Upgrade org.ow2.asm 5.0.4 -> 5.1"
Robert Varga [Thu, 19 May 2016 06:51:32 +0000 (06:51 +0000)]
Merge "Upgrade org.ow2.asm 5.0.4 -> 5.1"

8 years agoUpgrade org.ow2.asm 5.0.4 -> 5.1 61/36561/4
Stephen Kitt [Tue, 22 Mar 2016 15:36:39 +0000 (16:36 +0100)]
Upgrade org.ow2.asm 5.0.4 -> 5.1

Main changes:
- Remapping...Adapter classes are now deprecated, replaced with
  ...Remapper classes
- Add support for method reference on an interface

Bug fixes:
- 317567: SerialVersionUIDAdder issues
- 317578: incorrect max code size check in MethodWriter getSize()
- 317579: Signature Process in SignatureRemapper is Broken
- 317581: Import-Package headers should denote version by setting the
          version attribute
- 317586: VerifyError caused by LocalVariablesSorter
- 317602: Asmifier does not recognize null value for TypePath
- 317604: Bug in AdviceAdapter.visitFieldInsn()
- 317607: Calling add or set on an InsnListIterator throws NPE when at
          end of list
- 317606: Frequent use of StringBuffer instead of StringBuilder is
          hurting performance

Change-Id: Ia0979856bebb9a86976933b313a86d2960636c03
Signed-off-by: Stephen Kitt <skitt@redhat.com>
8 years agoUpgrade slf4j 1.7.12 -> 1.7.21, logback 1.1.3 -> 1.1.7 99/36299/9
Stephen Kitt [Wed, 16 Mar 2016 15:23:04 +0000 (16:23 +0100)]
Upgrade slf4j 1.7.12 -> 1.7.21, logback 1.1.3 -> 1.1.7

These upgrades need to happen in sync since logback 1.1.4 requires
SLF4J 1.7.16 or later.

For details of the changes, see
* http://logback.qos.ch/news.html
* http://www.slf4j.org/news.html

Change-Id: I09983a7bfeba4c2a423fbf65fdf5a17b0f2071b9
Signed-off-by: Stephen Kitt <skitt@redhat.com>
8 years agoBump Checkstyle Maven plugin version from 2.16 to 2.17 96/37796/9
Michael Vorburger [Tue, 19 Apr 2016 11:19:50 +0000 (13:19 +0200)]
Bump Checkstyle Maven plugin version from 2.16 to 2.17

This change has two pre-requisites which need to merge first:
  1. separate Checkstyle Runtime Core VS. Maven plugin versions
  2. upgrade Checkstyle Runtime Core from 6.2 to 6.16

Change-Id: I0c889fb5a342cb58fc174c1f1980758f8f7ed466
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
8 years agoMerge "Bump Checkstyle version from 6.2 to 6.16"
Robert Varga [Tue, 17 May 2016 15:03:44 +0000 (15:03 +0000)]
Merge "Bump Checkstyle version from 6.2 to 6.16"

8 years agoUpgrade Karaf 3.0.3 -> 3.0.6 23/26323/23
Stephen Kitt [Wed, 2 Sep 2015 09:10:38 +0000 (11:10 +0200)]
Upgrade Karaf 3.0.3 -> 3.0.6

Note that OSGi 6.0.0 needs Karaf 4.0.1.

Release notes:
* 3.0.4: https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311140&version=12329179
* 3.0.5: https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311140&version=12332380
* 3.0.6: https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311140&version=12333641

Change-Id: Ia6e719ab165586be25d664e226815c0df9478cd2
Signed-off-by: Stephen Kitt <skitt@redhat.com>
8 years agoMerge "Refine Checkstyle rules: optional JavaDoc on c'str & getter/setter"
Robert Varga [Tue, 17 May 2016 07:05:35 +0000 (07:05 +0000)]
Merge "Refine Checkstyle rules: optional JavaDoc on c'str & getter/setter"

8 years agoMerge "Refine Checkstyle rules: allowedAbbreviationLength 3 instead 1"
Robert Varga [Tue, 17 May 2016 07:03:51 +0000 (07:03 +0000)]
Merge "Refine Checkstyle rules: allowedAbbreviationLength 3 instead 1"

8 years agoMerge "Upgrade resteasy jaxrs-api 3.0.4 -> 3.0.12"
Robert Varga [Mon, 16 May 2016 17:48:38 +0000 (17:48 +0000)]
Merge "Upgrade resteasy jaxrs-api 3.0.4 -> 3.0.12"

8 years agoMerge "Upgrade commons-net 3.4 -> 3.5"
Robert Varga [Mon, 16 May 2016 17:47:07 +0000 (17:47 +0000)]
Merge "Upgrade commons-net 3.4 -> 3.5"

8 years agoMerge "Refine Checkstyle rules: single letter parameter OK"
Robert Varga [Mon, 16 May 2016 17:46:01 +0000 (17:46 +0000)]
Merge "Refine Checkstyle rules: single letter parameter OK"

8 years agoBump Checkstyle version from 6.2 to 6.16 01/37801/6
Michael Vorburger [Thu, 12 May 2016 17:12:33 +0000 (19:12 +0200)]
Bump Checkstyle version from 6.2 to 6.16

We must stick to v6.16 instead of latest v6.17/18 in order to get
consistent results in-IDE (Eclipse) and on CLI; as the Eclipse
Checkstyle
plugin is still on 6.16 (they'll upgrade eventually); please see
https://sourceforge.net/p/eclipse-cs/feature-requests/158/ and
http://stackoverflow.com/questions/37126270/maven-checkstyle-and-eclipse-checkstyle-report-similar-but-different-results-usi

Change-Id: I866c73d7046ed9f8d4135c4f0cb086d27bb2f4f3
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
8 years agoSeparate the Checkstyle Runtime Core VS. Maven plugin versions 12/38812/2
Michael Vorburger [Tue, 19 Apr 2016 11:19:50 +0000 (13:19 +0200)]
Separate the Checkstyle Runtime Core VS. Maven plugin versions

This change does not actually upgrade the version of either of them, the
maven-checkstyle-plugin v2.16 is the one currently already used, and the
6.2 runtime likewise (but until this change it was implicit & transitive
from the Maven plugin).

This is because then we can get more recent Checkstyle versions faster
and Checkstyle Maven plugin version upgrades are independant of the
Checkstyle runtime version and we don't (automatically) upgrade the
Checkstyle runtime version when upgrading the Checkstyle Maven plugin
version; see
https://maven.apache.org/plugins/maven-checkstyle-plugin/history.html
and
https://maven.apache.org/plugins/maven-checkstyle-plugin/examples/upgrading-checkstyle.html

Change-Id: I55ca403d2caefee0417b5a4fe09410214b478ced
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
8 years agoRefine Checkstyle rules: allowedAbbreviationLength 3 instead 1 52/38752/1
Michael Vorburger [Thu, 12 May 2016 09:42:26 +0000 (11:42 +0200)]
Refine Checkstyle rules: allowedAbbreviationLength 3 instead 1

as in e.g. getYangAST() - that's just fine, and actually much better &
clearer than getYangAst() IMHO.

Change-Id: I0c9bd2286e3eefb0f7a9fe0ee1ad2a24bb844703
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
8 years agoRefine Checkstyle rules: single letter parameter OK 51/38751/1
Michael Vorburger [Thu, 12 May 2016 09:38:00 +0000 (11:38 +0200)]
Refine Checkstyle rules: single letter parameter OK

as in e.g. logError(Exception e) - that's just fine

Change-Id: I3ea1d1c70268b4382d8bf840e48889cdfcaa712b
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
8 years agoRefine Checkstyle rules: optional JavaDoc on c'str & getter/setter 50/38750/2
Michael Vorburger [Thu, 12 May 2016 09:26:31 +0000 (11:26 +0200)]
Refine Checkstyle rules: optional JavaDoc on c'str & getter/setter

See also
http://checkstyle.sourceforge.net/config_javadoc.html#JavadocMethod and
http://stackoverflow.com/questions/9955255/checkstyle-no-javadoc-for-getter-and-setter-only-works-for-getters
re. getter/setter

Change-Id: I37c152a9697647e5381aa1bcd0cf80e18d71493b
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
8 years agoClean up more properties 12/38512/1
Stephen Kitt [Fri, 6 May 2016 13:58:33 +0000 (15:58 +0200)]
Clean up more properties

Now that centinel is updated, and since persistence won't release with
Boron (and is still on odlparent 1.6.0-SNAPSHOT), remove the remaining
obsolete dependency properties:
* guava.version
* org.json.version
* jettison.version
* jsr305.api.version
* junit.version
* slf4j.version

To handle the removal of ${guava.version}, hard-code the provided
feature version; this allows us to cleanly provide both versions 18
and 19, in preparation for migration to the latter. Add both versions
to the linked Javadocs.

Change-Id: I767f35ece600b005677299b7bf07af12b4351a4f
Signed-off-by: Stephen Kitt <skitt@redhat.com>
8 years agoUpgrade commons-net 3.4 -> 3.5 95/38495/1
Stephen Kitt [Fri, 6 May 2016 07:48:59 +0000 (09:48 +0200)]
Upgrade commons-net 3.4 -> 3.5

This is a bug-fix release:
http://www.apache.org/dist/commons/net/RELEASE-NOTES.txt

Change-Id: I079adce9bdfb10088355ac2c3624f698636a3698
Signed-off-by: Stephen Kitt <skitt@redhat.com>
8 years agoMerge "Improved Eclipse IDE experience: m2e's maven-dependency-plugin "
Thanh Ha [Wed, 4 May 2016 14:25:30 +0000 (14:25 +0000)]
Merge "Improved Eclipse IDE experience: m2e's maven-dependency-plugin "

8 years agoremoved checkstyle m2e ignore lifecycle-mapping 50/38350/1
Michael Vorburger [Tue, 3 May 2016 22:50:35 +0000 (00:50 +0200)]
removed checkstyle m2e ignore lifecycle-mapping

This enables the Checkstyle checks to run in Eclipse, now that we have
the appropriate M2E connector plugin m2e-code-quality which configures
things as they should be, thanks to
https://github.com/vorburger/opendaylight-eclipse-setup

Change-Id: Ida50b95ce54bd232e674df5ea4836a13b6e95bc9
Signed-off-by: Michael Vorburger <vorburger@redhat.com>