odlparent.git
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>
8 years agoRemove obsolete properties 04/38304/1
Stephen Kitt [Tue, 3 May 2016 07:08:28 +0000 (09:08 +0200)]
Remove obsolete properties

Now that the patches to didm and tsdr have been merged, along with the
Jersey clean-up patch to centinel, jersey.version and mockito.version
are no longer used anywhere; this patch removes them.

Change-Id: I00f91166609dffe9bafe100090dd69dc75c188cd
Signed-off-by: Stephen Kitt <skitt@redhat.com>
8 years agoMerge "Checkstyle clean-up"
Thanh Ha [Sat, 30 Apr 2016 14:21:14 +0000 (14:21 +0000)]
Merge "Checkstyle clean-up"

8 years agoUpgrade Jetty 8.1.14.v20131031 -> 8.1.19.v20160209 29/27529/10
Stephen Kitt [Mon, 28 Sep 2015 11:49:24 +0000 (13:49 +0200)]
Upgrade Jetty 8.1.14.v20131031 -> 8.1.19.v20160209

We're sticking to the 8 series for now because iotdm uses
ContentExchange which has been removed in Jetty 9. This patch adds
jetty-client and jetty-server so that iotdm can pull them in from
odlparent (simplifying later upgrades), jetty-servlet-tester for aaa
and jetty-webapp for defense4all.

Change-Id: I4d6a4ed546431ccf546cb90406a1960c7db4fb28
Signed-off-by: Stephen Kitt <skitt@redhat.com>
8 years agoUpgrade resteasy jaxrs-api 3.0.4 -> 3.0.12 36/36536/4
Stephen Kitt [Tue, 22 Mar 2016 09:31:29 +0000 (10:31 +0100)]
Upgrade resteasy jaxrs-api 3.0.4 -> 3.0.12

The release notes are available on the upstream tracker:
* 3.0.5: https://issues.jboss.org/secure/ReleaseNote.jspa?version=12322452&styleName=Html&projectId=12310560
* 3.0.6: https://issues.jboss.org/secure/ReleaseNote.jspa?version=12323117&styleName=Html&projectId=12310560
* 3.0.7: https://issues.jboss.org/secure/ReleaseNote.jspa?version=12323844&styleName=Html&projectId=12310560
* 3.0.8: https://issues.jboss.org/secure/ReleaseNote.jspa?version=12323980&styleName=Html&projectId=12310560
* 3.0.9: https://issues.jboss.org/secure/ReleaseNote.jspa?version=12324625&styleName=Html&projectId=12310560
* 3.0.10: https://issues.jboss.org/secure/ReleaseNote.jspa?version=12325657&styleName=Html&projectId=12310560
* 3.0.11: https://issues.jboss.org/secure/ReleaseNote.jspa?version=12325993&styleName=Html&projectId=12310560
* 3.0.12: https://issues.jboss.org/secure/ReleaseNote.jspa?version=12327705&styleName=Html&projectId=12310560

Change-Id: I46dd536a6bc7f825d7d91be900d04c11f82b04dd
Signed-off-by: Stephen Kitt <skitt@redhat.com>
8 years agoCheckstyle clean-up 40/38240/1
Stephen Kitt [Fri, 29 Apr 2016 14:29:53 +0000 (16:29 +0200)]
Checkstyle clean-up

Let's ensure odlparent adheres to its own Checkstyle rules...

Change-Id: I7bf3d3b1e2288a95dd3a298098760438282545a5
Signed-off-by: Stephen Kitt <skitt@redhat.com>
8 years agoUpdate property uses 21/38221/1
Stephen Kitt [Fri, 29 Apr 2016 09:12:00 +0000 (11:12 +0200)]
Update property uses

The following properties are no longer used in ODL, remove them:
* jackson.version
* javassist.version
* logback.version

Update the usage information and removal patches for the remaining
dependency properties.

Change-Id: I97112a47ab27669ed984adb52863a76ae08c5035
Signed-off-by: Stephen Kitt <skitt@redhat.com>
8 years agoMerge "Upgrade lmax disruptor 3.3.2 -> 3.3.4"
Stephen Kitt [Wed, 27 Apr 2016 07:49:45 +0000 (07:49 +0000)]
Merge "Upgrade lmax disruptor 3.3.2 -> 3.3.4"

8 years agoRevert "Minor upgrade of Jersey from 1.17 to 1.19.1" 65/38065/1
Ryan Goulding [Mon, 25 Apr 2016 15:13:35 +0000 (15:13 +0000)]
Revert "Minor upgrade of Jersey from 1.17 to 1.19.1"

This reverts commit 9d92f22d7d3641ff20da942500c96adf5725753e.

Change-Id: I4e35688414555fc3ede4a6a4ee7f78ad101d9949
Signed-off-by: Ryan Goulding <ryandgoulding@gmail.com>
8 years agoMinor upgrade of Jersey from 1.17 to 1.19.1 56/38056/1
Ryan Goulding [Mon, 25 Apr 2016 13:07:33 +0000 (09:07 -0400)]
Minor upgrade of Jersey from 1.17 to 1.19.1

Since a major upgrade of Jersey and JAX-RS might not have enough support
or contributors, we should look at least to upgrade to the latest 1.X
version.  This patch bumps Jersey from 1.17 to 1.19.1.

Change-Id: I216a1712444fbdeb95c53b2a18619ceafdc9985b
Signed-off-by: Ryan Goulding <ryandgoulding@gmail.com>
8 years agoMerge "Bug 5787 Upgrade for Jersey from 2.8 to 2.22.2, the latest version"
Stephen Kitt [Mon, 25 Apr 2016 07:52:11 +0000 (07:52 +0000)]
Merge "Bug 5787 Upgrade for Jersey from 2.8 to 2.22.2, the latest version"

8 years agoMerge "Fix for improved Eclipse IDE setup: m2e's no longer explodes on import"
Robert Varga [Sat, 23 Apr 2016 11:10:06 +0000 (11:10 +0000)]
Merge "Fix for improved Eclipse IDE setup: m2e's no longer explodes on import"

8 years agoBug 5787 Upgrade for Jersey from 2.8 to 2.22.2, the latest version 38/38038/1
Ryan Goulding [Fri, 22 Apr 2016 19:41:07 +0000 (15:41 -0400)]
Bug 5787 Upgrade for Jersey from 2.8 to 2.22.2, the latest version

Upgrades jersey dependencies in the root pom to utilize the latest
version of jersey; from 2.8 to 2.22.2.

Change-Id: Ie886c1478fe32bf7ee9730300bfc952a8721f951
Signed-off-by: Ryan Goulding <ryandgoulding@gmail.com>
8 years agoremoving <version> as previously declared in <pluginManagement> 27/37727/2
Michael Vorburger [Mon, 18 Apr 2016 13:12:08 +0000 (15:12 +0200)]
removing <version> as previously declared in <pluginManagement>

Change-Id: I024e70e576a1a610605bf4385cbb44983f4bb3f9
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
8 years agoFix for improved Eclipse IDE setup: m2e's no longer explodes on import 18/37718/2
Michael Vorburger [Mon, 18 Apr 2016 10:17:17 +0000 (12:17 +0200)]
Fix for improved Eclipse IDE setup: m2e's no longer explodes on import

Eclipse setup experience improvement #2.  More to come - much more.

java.lang.IllegalArgumentException: Missing parameter for
pluginExecutionFilter. groupId, artifactId, versionRange and goals must
be specificed, but found: groupId = 'null'
artifactId = 'maven-dependency-plugin'
versionRange = '[0.0,)'
goals = '[resolve]'
  at
org.eclipse.m2e.core.internal.lifecyclemapping.model.PluginExecutionFilter.checkAllFieldsSet(PluginExecutionFilter.java:320)

Change-Id: I43fe777e70fdb742e08e4b69d975423b203075ac
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
8 years agoMerge "Fix for improved Eclipse IDE setup: m2e Checkstyle ConversionException"
Robert Varga [Thu, 21 Apr 2016 23:07:14 +0000 (23:07 +0000)]
Merge "Fix for improved Eclipse IDE setup: m2e Checkstyle ConversionException"

8 years agoImproved Eclipse IDE experience: m2e's maven-dependency-plugin 92/37792/3
Michael Vorburger [Tue, 19 Apr 2016 10:07:35 +0000 (12:07 +0200)]
Improved Eclipse IDE experience: m2e's maven-dependency-plugin

It now now longer whines about "Artifact has not been packaged yet. When
used on reactor artifact, unpack should be executed after packaging: see
MDEP-98" nor "Plugin execution not covered by lifecycle
configuration: org.apache.maven.plugins:maven-dependency-plugin
:2.10:unpack (execution: unpack-license, phase: generate-resources)"

Strangely, changing this in odlparent/pom.xml (only) does not work and
leads to an "Error" in Project > Properties > Maven > Lifecycle Mapping,
Copy to Clipboard, and despite M2E offering a Quick Fix to add the
ignore anywhere in the pom.xml hiearchy, it has no effect / causes error
in odlparent - but when added to its parent odlparent-lite then it's OK!
(Or inside the last/leaf pom.xml; but this should be higher up.)

Alternatively it would have been possible to install the m2e connector
for the Maven Dependency Plugin - BUT that only hurts build performance,
and for something as minor as copying a license file around during
build, I don't see the point in-IDE, and so IMHO this one should be
ignore instead of execute.

Change-Id: I3754096209e28fb03ad84db3fe847f0ae776f9d1
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
8 years agoMerge "Revert "Cleanup: Checkstyle does NOT require dependency to odl-license""
Thanh Ha [Thu, 21 Apr 2016 16:22:22 +0000 (16:22 +0000)]
Merge "Revert "Cleanup: Checkstyle does NOT require dependency to odl-license""

8 years agoRevert "Cleanup: Checkstyle does NOT require dependency to odl-license" 80/37980/1
Thanh Ha [Thu, 21 Apr 2016 15:35:50 +0000 (15:35 +0000)]
Revert "Cleanup: Checkstyle does NOT require dependency to odl-license"

This reverts commit 117a2f25dd73887adddf5d1e5e741c1fa95e985e.

Change-Id: I0f39ac0f8afa6ee7f103391555d4a7bd2f321e5d
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
8 years agoFix for improved Eclipse IDE setup: m2e Checkstyle ConversionException 42/37842/1
Michael Vorburger [Tue, 19 Apr 2016 20:48:48 +0000 (22:48 +0200)]
Fix for improved Eclipse IDE setup: m2e Checkstyle ConversionException

This solves an Error that occurs in Eclipse with the Checkstyle Eclipse
plugin, where it gets confused between the REGEXP license for Checkstyle
and a default APL (not EPL) LICENSE.txt that is on the classpath of the
Checkstyle Maven plugin org.apache.commons.beanutils.ConversionException
line 83 in header specification is not a regular expression at
com.puppycrawl.tools.checkstyle.checks.header.RegexpHeaderCheck.postProcessHeaderLines(RegexpHeaderCheck.java:160)

https://github.com/m2e-code-quality/m2e-code-quality/issues/83 has the
full background story and and further technical analysis details.

Change-Id: I34b286b23be195ff7bd2836d58faf983f5c5b500
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
8 years agoMerge "Bug 5752 Add jersey-test-framework-inmemory for downstream consumption"
Stephen Kitt [Tue, 19 Apr 2016 16:35:08 +0000 (16:35 +0000)]
Merge "Bug 5752 Add jersey-test-framework-inmemory for downstream consumption"

8 years agoMerge "Add org.glassfish javax.json dependency for downstream consumers"
Stephen Kitt [Tue, 19 Apr 2016 16:24:45 +0000 (16:24 +0000)]
Merge "Add org.glassfish javax.json dependency for downstream consumers"

8 years agoMerge "Cleanup: Checkstyle does NOT require dependency to odl-license"
Thanh Ha [Tue, 19 Apr 2016 16:21:43 +0000 (16:21 +0000)]
Merge "Cleanup: Checkstyle does NOT require dependency to odl-license"

8 years agoBug 5752 Add jersey-test-framework-inmemory for downstream consumption 26/37826/1
Ryan Goulding [Tue, 19 Apr 2016 15:54:59 +0000 (11:54 -0400)]
Bug 5752 Add jersey-test-framework-inmemory for downstream consumption

Standardize the location for jersey-test-framework-inmemory so
downstream consumers can inherit from one location.

Change-Id: I3f19d2e3055463b794c328240f1bffa851f367ac
Signed-off-by: Ryan Goulding <ryandgoulding@gmail.com>
8 years agoAdd org.glassfish javax.json dependency for downstream consumers 16/37816/1
Ryan Goulding [Tue, 19 Apr 2016 13:51:59 +0000 (09:51 -0400)]
Add org.glassfish javax.json dependency for downstream consumers

Add org.glassfish javax.json dependency, so that downstream consumers
can inherit from a single, common place.

Change-Id: Ib635c2510d8aee5ca65946554df1d9714fc8d22a
Signed-off-by: Ryan Goulding <ryandgoulding@gmail.com>
8 years agoCleanup: Checkstyle does NOT require dependency to odl-license 14/37814/1
Michael Vorburger [Tue, 19 Apr 2016 13:43:08 +0000 (15:43 +0200)]
Cleanup: Checkstyle does NOT require dependency to odl-license

The license check STILL WORKS with this clean-up, because that is done
using odlparent.checkstyle/src/main/resources/LICENSE.txt (which is a
REGEXP for Checkstyle). odlparent.odl-license/src/main/resources/LICENSE
on the other hand is a TXT used only by maven-dependency-plugin
unpack-license, and has nothing to do with Checkstyle. While this
doesn't cause any bugs, it's somewhat confusing, and seemed like a good
idea to clean up for the next person coming along and looking at this.

Originally I hoped that this would resolve an Error that occurs in
Eclipse with the Checkstyle Eclipse plugin, where it gets confused
between the REGEXP license for Checkstyle and the TXT. While this does
not solve that - it still seemed like a good idea to clean up.
(org.apache.commons.beanutils.ConversionException: line 83 in header
specification is not a regular expression at
com.puppycrawl.tools.checkstyle.checks.header.RegexpHeaderCheck.postProcessHeaderLines(RegexpHeaderCheck.java:160)

The removal of pluginManagement in license/pom.xml is unrelated, just
seemed like a good idea too, as that doesn't actually do anything.

Change-Id: I66a0678ebb2fc8d4a4a6f1dd3934979ab0bbd6d8
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
8 years agoAdd dependency on org.apache.felix.metatype 1.1.2 08/37808/1
Ryan Goulding [Tue, 19 Apr 2016 12:09:46 +0000 (08:09 -0400)]
Add dependency on org.apache.felix.metatype 1.1.2

Adds dependency on org.apache.felix.metatype version 1.1.2 for downstream
consumption.

Change-Id: I197dcd401577bbe30cc1603b81a158cbc3f05d1a
Signed-off-by: Ryan Goulding <ryandgoulding@gmail.com>
8 years agoMerge "Improved Eclipse IDE experience: Fixed WARN from m2e in Error Log"
Stephen Kitt [Tue, 19 Apr 2016 11:31:33 +0000 (11:31 +0000)]
Merge "Improved Eclipse IDE experience: Fixed WARN from m2e in Error Log"

8 years agoMerge "removing duplicate <groupId>/<version> which are identical to <parent>"
Stephen Kitt [Tue, 19 Apr 2016 09:48:06 +0000 (09:48 +0000)]
Merge "removing duplicate <groupId>/<version> which are identical to <parent>"

8 years agoMerge ".gitignore .checkstyle files created by Checkstyle Eclipse plugin"
Stephen Kitt [Tue, 19 Apr 2016 09:44:15 +0000 (09:44 +0000)]
Merge ".gitignore .checkstyle files created by Checkstyle Eclipse plugin"

8 years agoBump akka to 2.4.4 42/37742/1
Robert Varga [Mon, 18 Apr 2016 17:35:38 +0000 (19:35 +0200)]
Bump akka to 2.4.4

This is an emergency release, fixing some inconveniences and bugs.

Change-Id: Ifc86f2e389e244a8321b262854b355f3963837ca
Signed-off-by: Robert Varga <rovarga@cisco.com>
8 years agoImproved Eclipse IDE experience: Fixed WARN from m2e in Error Log 39/37739/1
Michael Vorburger [Mon, 18 Apr 2016 16:09:44 +0000 (18:09 +0200)]
Improved Eclipse IDE experience: Fixed WARN from m2e in Error Log

Goal prefix is specified as: 'karaf-plugin'. Maven currently expects it
to be 'karaf'.

Change-Id: Ic346473477cf6a05e79172954b3b1b25cd828c57
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
8 years agoAdd jacoco definition to lifecycle plugin 38/37738/1
Robert Varga [Mon, 18 Apr 2016 15:39:14 +0000 (17:39 +0200)]
Add jacoco definition to lifecycle plugin

Projects which name bundle-parent as their parent fail to completely
execute in eclipse due to lifecycle mapping not being present. It is
not useful in eclipse, hence ignore it.

Change-Id: I592f19f9ac475a479930604c7daabbbdac3e2b10
Signed-off-by: Robert Varga <rovarga@cisco.com>
8 years ago.gitignore .checkstyle files created by Checkstyle Eclipse plugin 37/37737/1
Michael Vorburger [Mon, 18 Apr 2016 15:38:01 +0000 (17:38 +0200)]
.gitignore .checkstyle files created by Checkstyle Eclipse plugin

Change-Id: I83c5821d610477496ddfcc8a897b169f25cab933
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
8 years agoremoving duplicate <groupId>/<version> which are identical to <parent> 26/37726/1
Michael Vorburger [Mon, 18 Apr 2016 13:06:47 +0000 (15:06 +0200)]
removing duplicate <groupId>/<version> which are identical to <parent>

Change-Id: I58b47389c11c06b9a8af4611dacc327d563bc27e
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
8 years agoMerge "Clearer error message"
Stephen Kitt [Mon, 18 Apr 2016 11:12:55 +0000 (11:12 +0000)]
Merge "Clearer error message"

8 years agoBUG-5722: hard-code the native epoll architectures 02/37602/1
Stephen Kitt [Thu, 14 Apr 2016 10:02:56 +0000 (12:02 +0200)]
BUG-5722: hard-code the native epoll architectures

We need to support building on any architecture, so we can't rely on
the build architecture to have a native epoll implementation in
Netty. We also need to provide native epoll wherever possible.

Change-Id: I0732dfb5eb1df465f987fdfeec34ede1a41d2079
Signed-off-by: Stephen Kitt <skitt@redhat.com>
8 years agoMerge "BUG-4692: Add Netty's native epoll transport"
Stephen Kitt [Wed, 13 Apr 2016 16:23:12 +0000 (16:23 +0000)]
Merge "BUG-4692: Add Netty's native epoll transport"

8 years agoInline versions for org.eclipse.persistence and deprecate unused property 42/37542/3
Ryan Goulding [Wed, 13 Apr 2016 12:40:54 +0000 (08:40 -0400)]
Inline versions for org.eclipse.persistence and deprecate unused property

The "eclipse.persistence.version" property is not used outside of
odlparent;  I pulled autorelease and ensured only odlparent references
this property.  The property was removed and the correct current
version (2.5.2) was inlined instead.

A separate patch will be used to perform the actual upgrade, as that
will be a longer process.

Change-Id: Id39db716ff8f7540ca72670776bbaf017ec98f16
Signed-off-by: Ryan Goulding <ryandgoulding@gmail.com>
8 years agoMerge "Add javadoc links to akka, guava, netty"
Thanh Ha [Tue, 12 Apr 2016 13:37:38 +0000 (13:37 +0000)]
Merge "Add javadoc links to akka, guava, netty"

8 years agoClearer error message 36/37436/1
Josh [Mon, 11 Apr 2016 14:15:54 +0000 (16:15 +0200)]
Clearer error message

I had to go read the source code to figure out
what went wrong.

Change-Id: Ib231e64c7266bbf997aa1b68ab631a59f1b587cb
Signed-off-by: Josh <jhershbe@redhat.com>
8 years agoBUG-4692: Add Netty's native epoll transport 28/37028/6
Om Prakash [Sat, 2 Apr 2016 00:13:10 +0000 (20:13 -0400)]
BUG-4692: Add Netty's native epoll transport

This obsoletes TCPMD5.

Change-Id: I2b0410305dde2ef228842d6cc0b40c77ce0f99ea
Signed-off-by: Om Prakash <op317q@att.com>
Signed-off-by: Stephen Kitt <skitt@redhat.com>
8 years agoMerge "Add details on site.xml for linking to apidocs"
Stephen Kitt [Mon, 11 Apr 2016 08:45:34 +0000 (08:45 +0000)]
Merge "Add details on site.xml for linking to apidocs"

8 years agoMerge "Bump netty to 4.0.36"
Stephen Kitt [Mon, 11 Apr 2016 08:43:18 +0000 (08:43 +0000)]
Merge "Bump netty to 4.0.36"

8 years agoAdd details on site.xml for linking to apidocs 33/37333/2
Thanh Ha [Fri, 8 Apr 2016 13:49:30 +0000 (09:49 -0400)]
Add details on site.xml for linking to apidocs

Change-Id: I6dac3a253d8d42a5913f055f1b26958517562ad3
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
8 years agoAdd javadoc links to akka, guava, netty 78/37178/5
Robert Varga [Wed, 6 Apr 2016 10:07:21 +0000 (12:07 +0200)]
Add javadoc links to akka, guava, netty

This adds external references to commonly-used libraries.

Change-Id: I8da9b6dbf0b706232bef91febb774f92746985f5
Signed-off-by: Robert Varga <rovarga@cisco.com>
8 years agoMerge "Added documentation how to use Asciidoc in site."
Stephen Kitt [Fri, 8 Apr 2016 13:21:33 +0000 (13:21 +0000)]
Merge "Added documentation how to use Asciidoc in site."

8 years agoMerge "Added support for asciidoctor-diagram to maven site."
Stephen Kitt [Fri, 8 Apr 2016 13:20:49 +0000 (13:20 +0000)]
Merge "Added support for asciidoctor-diagram to maven site."

8 years agoMerge "Added syntax highlighting to AsciiDoc sites."
Stephen Kitt [Fri, 8 Apr 2016 13:20:35 +0000 (13:20 +0000)]
Merge "Added syntax highlighting to AsciiDoc sites."

8 years agoAdded documentation how to use Asciidoc in site. 20/37320/2
Tony Tkacik [Fri, 8 Apr 2016 12:08:13 +0000 (14:08 +0200)]
Added documentation how to use Asciidoc in site.

Documented some of helpful features of Asciidoc
for OpenDaylight - code highlighting and textual
representation of diagram, which is rendered into
images.

Change-Id: I796efaf455ee6d31a2ea8cc68dbf7d9fb16f6255
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
8 years agoAdded support for asciidoctor-diagram to maven site. 19/37319/2
Tony Tkacik [Fri, 8 Apr 2016 09:23:54 +0000 (11:23 +0200)]
Added support for asciidoctor-diagram to maven site.

Change-Id: I2d197f26f743830c75e37d9d6118c95b9d0b0631
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
8 years agoMerge "Handle property place-holders in features.xml"
Robert Varga [Fri, 8 Apr 2016 11:42:36 +0000 (11:42 +0000)]
Merge "Handle property place-holders in features.xml"

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

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

Change-Id: I33d37e73486c96709ebce71057463cb7b3af7f78
Signed-off-by: Stephen Kitt <skitt@redhat.com>
8 years agoAdded syntax highlighting to AsciiDoc sites. 09/37309/1
Tony Tkacik [Fri, 8 Apr 2016 08:16:50 +0000 (10:16 +0200)]
Added syntax highlighting to AsciiDoc sites.

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

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

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

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

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

Change-Id: Ide7e23efedb5c01e15eb38d7563af5c49b464441
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
8 years agoBump netty to 4.0.36 80/37180/1
Robert Varga [Wed, 6 Apr 2016 10:26:17 +0000 (12:26 +0200)]
Bump netty to 4.0.36

It includes a lot of bugfixes around leaks and TLS, let's use it.

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

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

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

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

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

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

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