Vratko Polak [Wed, 2 Dec 2015 13:55:01 +0000 (14:55 +0100)]
Set explicit memory options for SingleFeatureTest JVM
PermGen was sometimes too low for testing odl-integration-all feature.
Change-Id: I633a7e94d5b226f73a26c6d8534078a4c2f0be75
Signed-off-by: Vratko Polak <vrpolak@cisco.com>
Stephen Kitt [Thu, 8 Oct 2015 12:08:10 +0000 (14:08 +0200)]
Upgrade Enunciate 1.30.1 -> 1.31
Change-Id: I8f4529ca34a14ec40cecc69500e1aa671ba171f5
Signed-off-by: Stephen Kitt <skitt@redhat.com>
Ryan Goulding [Mon, 30 Nov 2015 19:27:12 +0000 (14:27 -0500)]
Aggregate Apache Shiro Dependencies into odlparent
Centralizes Apache Shiro dependencies since they are used in netconf
and AAA projects.
Change-Id: Id907ccb8abf490dae8d5e2a9b968c312899d9554
Signed-off-by: Ryan Goulding <ryandgoulding@gmail.com>
Stephen Kitt [Fri, 27 Nov 2015 11:05:25 +0000 (12:05 +0100)]
Add an upstream feature for Guava
Change-Id: Ic39ce6a0d6f569ab165310d6aaee54f3e71c393f
Signed-off-by: Stephen Kitt <skitt@redhat.com>
Stephen Kitt [Thu, 26 Nov 2015 12:16:02 +0000 (13:16 +0100)]
Add missing relativePaths
... and drop redundant version in odlparent-artifacts.
Change-Id: Idf07c59bfd1c4b5151cb594602027daadf0c8e5e
Signed-off-by: Stephen Kitt <skitt@redhat.com>
Stephen Kitt [Wed, 25 Nov 2015 14:06:39 +0000 (15:06 +0100)]
Add an upstream feature for Netty
Change-Id: I9a940037b33e1075da95b182c4079df02f653513
Signed-off-by: Stephen Kitt <skitt@redhat.com>
Thanh Ha [Tue, 24 Nov 2015 17:57:18 +0000 (17:57 +0000)]
Merge "Add plugin definition for Enunciate 2.1.1"
Robert Varga [Sat, 21 Nov 2015 20:13:45 +0000 (21:13 +0100)]
Add plugin definition for Enunciate 2.1.1
Enunciate 1.x is not compatible with Java 8. Enunciate 2 works on Java 6
through 8. Introduce plugin declaration for downstream projects to use.
Change-Id: Iff2751f90b19056572c9414e60cbd680dfe553c6
Signed-off-by: Robert Varga <rovarga@cisco.com>
Stephen Kitt [Mon, 16 Nov 2015 16:46:11 +0000 (17:46 +0100)]
Add commons-collections and netty-all
These are added by some downstream projects. Adding netty-all in
particular would allow netty.version to eventually be removed.
Change-Id: I1da78a6fc435c176825febf2447eddeb7e348f04
Signed-off-by: Stephen Kitt <skitt@redhat.com>
Stephen Kitt [Mon, 26 Oct 2015 17:20:06 +0000 (18:20 +0100)]
Track downstream uses and clean up properties
A number of properties are now used only in odlparent or not used at
all. This patch removes these where possible, either outright or by
replacing them with their values in odlparent.
Change-Id: I4539a1bfd042dc8d68e1585bb4751945f8eeec1b
Signed-off-by: Stephen Kitt <skitt@redhat.com>
Vratko Polak [Fri, 6 Nov 2015 16:44:08 +0000 (17:44 +0100)]
Revert "Bug 4375: Bump ANTLR to 4.5 or higher"
This reverts commit
fd156d42f3a46254ac8ef4b3fb7b43726ff5bafc.
Merge jobs started to failing for at least Controller and Bgpcep projects.
Change-Id: I38d9ff77c264fa86e7582559f0fb83817906690e
Signed-off-by: Vratko Polak <vrpolak@cisco.com>
Igor Foltin [Tue, 13 Oct 2015 10:58:23 +0000 (12:58 +0200)]
Bug 4375: Bump ANTLR to 4.5 or higher
- added antlr4-runtime 4.5.1 dependency
to odlparent dependencyManagement.
Change-Id: Ib3a8cf53b5df7f1da5c4d1b22a5f7ad7b6316770
Signed-off-by: Igor Foltin <ifoltin@cisco.com>
Stephen Kitt [Wed, 2 Sep 2015 09:14:23 +0000 (11:14 +0200)]
Upgrade upstream versions (Spring)
Spring 3.1.3 -> 3.2.8.
Spring Security 3.1.3 -> 3.2.14.
Use the new Spring artifacts, drop obsolete artifacts.
Change-Id: Ied0fdc30118f0797ddda420706607ec4d779a477
Signed-off-by: Stephen Kitt <skitt@redhat.com>
Sam Hague [Tue, 6 Oct 2015 15:47:19 +0000 (11:47 -0400)]
Allow child projects to fail on checkstyle errors
When the severity value is set in the odl_checks.xml file it can not
be overwritten in the child projects. Adding a property to the config allows
child projects to override the value. The default is still warning as it is today
and is only overwritten with the changes below in the project pom.
The below is what a child project would add to their pom to override the value:
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<configuration>
<propertyExpansion>checkstyle.violationSeverity=error</propertyExpansion>
</configuration>
</plugin>
Change-Id: Ic271080e4e0b21d49194d66cad72707837cdc16a
Signed-off-by: Sam Hague <shague@redhat.com>
Sam Hague [Tue, 6 Oct 2015 20:20:03 +0000 (16:20 -0400)]
Allow projects to suppress checkstyle warnings
This allows projects to override individual checkstyle rules by
using @SuppressWarnings() annotations. In the example below the
checkstyle error before suppressing the warning is shown and
then the annotation to disable the warning:
(whitespace) MethodParamPad: '(' is preceded with whitespace.
@SuppressWarnings("checkstyle:methodparampad")
public AbstractDataTreeListener (INetvirtSfcOF13Provider provider, Class<T> clazz) {
}
Change-Id: I13cf83a6afca4e8f95e8e2969ebb2ac9129e93f8
Signed-off-by: Sam Hague <shague@redhat.com>
Lorand Jakab [Fri, 9 Oct 2015 10:32:09 +0000 (13:32 +0300)]
Ignore depends-maven-plugin in Eclipse
Change-Id: Ic95ffb6eb55f255e022b7c5362b7e55c09c5699a
Signed-off-by: Lorand Jakab <lojakab@cisco.com>
Stephen Kitt [Wed, 7 Oct 2015 16:31:40 +0000 (18:31 +0200)]
Revert eclipse.persistence upgrade
eclipse.persistence 2.6.0 requires javax.validation, so revert to
2.5.2 for now until all downstreams have added the dependency.
Add javax.validation so we can prepare the upgrade.
Change-Id: If085612a70623608e09165fc89b203bc531990db
Signed-off-by: Stephen Kitt <skitt@redhat.com>
Thanh Ha [Fri, 2 Oct 2015 03:56:08 +0000 (23:56 -0400)]
Fix maven-bundle-plugin multiple executions
maven-bundle-plugin version 2.5.4 has a regression that causes it to
fork and execute multiple times within a build. This is fixed in 2.5.5
and newer.
See:
https://stackoverflow.com/questions/
31231453/when-using-bundle-packaging-with-maven-bundle-plugin-goals-are-executed-twice
Change-Id: I268961bc43a3c3b70a82280f46a8c4fa755abc14
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
Pradeeban Kathiravelu [Thu, 1 Oct 2015 14:14:38 +0000 (15:14 +0100)]
Fix minor typo - 's/dependecy/dependency'
Change-Id: I167bc4d2727293668ff7e3ae0c760e0fe6b54329
Signed-off-by: Pradeeban Kathiravelu <kk.pradeeban@gmail.com>
Thanh Ha [Wed, 30 Sep 2015 22:54:45 +0000 (18:54 -0400)]
Move generate-site phase to install
Running site generation in the package phase seems to cause build issues
in some projects such as yang-common. Moving this goal to the install
phase seems to resolve this issue.
Change-Id: I668fda52de1c8244efab156a78b9a633a2ae0833
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
Stephen Kitt [Wed, 2 Sep 2015 09:05:47 +0000 (11:05 +0200)]
Upgrade upstream versions (part 5, misc)
These should be harmless...
Eclipse Persistence 2.5.2 -> 2.6.0.
GSON 2.2.4 -> 2.3.1.
Javassist 3.19.0-GA -> 3.20.0-GA.
Jettison 1.3.3 -> 1.3.7.
Jolokia 1.1.4 -> 1.3.1.
JSR-305 2.0.3 -> 3.0.0.
OW2 ASM 4.1 -> 5.0.4.
Change-Id: Ic32f6f5908a17153a6d5e3fe11130838af162143
Signed-off-by: Stephen Kitt <skitt@redhat.com>
Thanh Ha [Fri, 25 Sep 2015 19:10:16 +0000 (19:10 +0000)]
Merge "Checkstyle clean-up"
Stephen Kitt [Thu, 24 Sep 2015 15:40:53 +0000 (17:40 +0200)]
Checkstyle clean-up
Also restore the license for PopulateLocalRepoMojo.java.
Change-Id: I310e933d66d73843f0d989e7dc5bbf4159002212
Signed-off-by: Stephen Kitt <skitt@redhat.com>
Robert Varga [Thu, 24 Sep 2015 10:46:00 +0000 (12:46 +0200)]
Do not fork the build cycle
maven-source-plugin:jar forces a for of the build cycle, which results
in multiple executions of enforcer/checkstyle and other plugins.
jar-no-fork attaches cleanly, thus speeding up the build.
Change-Id: Ib9f030997cb828d5d82e015046292a488c1a710c
Signed-off-by: Robert Varga <rovarga@cisco.com>
Stephen Kitt [Wed, 2 Sep 2015 08:59:11 +0000 (10:59 +0200)]
Upgrade upstream versions (part 4, logging)
Logback 1.0.9 -> 1.1.3.
SLF4J 1.7.7 -> 1.7.12.
Change-Id: I1231f4acb299c9111efb353aa8de8a70c442514b
Signed-off-by: Stephen Kitt <skitt@redhat.com>
Stephen Kitt [Wed, 2 Sep 2015 08:53:41 +0000 (10:53 +0200)]
Upgrade upstream versions (part 3, testing)
XMLUnit 1.5 -> 1.6.
JUnit can't be upgraded yet.
Change-Id: Ie9a3e4a4e417bf8d6235486ffe01f4cf33146efc
Signed-off-by: Stephen Kitt <skitt@redhat.com>
Stephen Kitt [Wed, 2 Sep 2015 08:25:13 +0000 (10:25 +0200)]
Upgrade upstream versions (part 2, Commons)
Codec 1.8 -> 1.10.
Lang3 3.1 -> 3.4.
Net 3.0.1 -> 3.3.
Change-Id: Ib7f03d3e6f8b4514790159b18015402006eb26f0
Signed-off-by: Stephen Kitt <skitt@redhat.com>
Stephen Kitt [Wed, 2 Sep 2015 08:18:00 +0000 (10:18 +0200)]
Upgrade upstream versions (part 1, Maven)
The versions were checked with versions:display-plugin-updates and
versions:display-dependency-updates.
With the following fixes, all of Beryllium builds, from scratch, with
no external snapshots:
* yangtools: https://git.opendaylight.org/gerrit/#/c/26854/
* controller: https://git.opendaylight.org/gerrit/#/c/26859/
* aaa: https://git.opendaylight.org/gerrit/#/c/26959/
* toolkit: https://git.opendaylight.org/gerrit/#/c/26914/
* dlux: https://git.opendaylight.org/gerrit/#/c/26916/
All Maven plugins updated to the latest upstream versions, apart from
Karaf (in a later patch in the set).
Change-Id: Ia40a9d1f6428784429ddd8474c39be8984c7da19
Signed-off-by: Stephen Kitt <skitt@redhat.com>
Pradeeban Kathiravelu [Sat, 19 Sep 2015 00:25:48 +0000 (01:25 +0100)]
Fix javadoc tags to fix the jdk 1.8 javadoc lint checker
- Move maven-javadoc-plugins <tags> to odlparent-lite
- Resolves missing javadoc strings
Change-Id: I5883003366b4d17b5b3547d2a3c0652db7bc0cb0
Also-by: Thanh Ha <thanh.ha@linuxfoundation.org>
Signed-off-by: Pradeeban Kathiravelu <kk.pradeeban@gmail.com>
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
Robert Varga [Fri, 18 Sep 2015 07:22:35 +0000 (07:22 +0000)]
Merge "Bug 3086: Add timeout to SingleFeatureTest#installFeature"
Tom Pantelis [Sun, 26 Apr 2015 05:27:10 +0000 (01:27 -0400)]
Bug 3086: Add timeout to SingleFeatureTest#installFeature
This test sometimes hangs indefinitely on jenkins builds so I added a
5 minute timeout for the test to complete.
Change-Id: I8c2c39d7ec8a66445a65148b13181daf55f82068
Signed-off-by: Tom Pantelis <tpanteli@brocade.com>
Thanh Ha [Wed, 16 Sep 2015 14:03:33 +0000 (14:03 +0000)]
Merge "Maven site configuration for OpenDaylight"
Robert Varga [Wed, 16 Sep 2015 14:02:57 +0000 (14:02 +0000)]
Merge "Create odlparent-lite"
Thanh Ha [Thu, 10 Sep 2015 23:53:51 +0000 (19:53 -0400)]
Maven site configuration for OpenDaylight
Change-Id: If75585bbaeabeb2fd6ed9b1fb4ea36f9b015d8ce
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
Thanh Ha [Thu, 10 Sep 2015 03:23:23 +0000 (23:23 -0400)]
Create odlparent-lite
The purpose of odlparent-lite is to provide a small minimal top level
parent that can be used for projects where odlparent might be too bulky
to inherit from.
See discussion:
https://lists.opendaylight.org/pipermail/odlparent-dev/2015-September/000142.html
Change-Id: Ia1b5118441b5f5eb90c019956a1bb9d75e9e7874
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
Thanh Ha [Mon, 14 Sep 2015 20:52:38 +0000 (16:52 -0400)]
Revert back to 0.7.2 version of jacoco
Tests that use PowerMock have issues with jacoco versions >=0.7.3
https://github.com/jayway/powermock/issues/564
Change-Id: I7b55ef3f3eef9d7ba44b739b2b1363c71534d40e
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
Robert Varga [Mon, 14 Sep 2015 20:03:59 +0000 (22:03 +0200)]
Silence javadoc plugin
Executing the plugin dumps all the html files onto the console, which
makes the build very verbose. Add the quiet option to only print out
warnings/errors.
Change-Id: Ia4d957fb897554528d0a3d7031767b77f602df5a
Signed-off-by: Robert Varga <rovarga@cisco.com>
Thanh Ha [Sun, 6 Sep 2015 13:07:33 +0000 (09:07 -0400)]
Remove <repositories> and <pluginRepositories> sections
In January 2015 we made the decision to remove <repositories> and
<pluginRepositories> sections from all ODL projects. This was to meet
the Maven Central requirements that these sections cannot be defined in
your local project poms if you wish to push your artifacts to Maven
Central. Instead we started recommending developers to define these
sections in their local settings.xml file.
https://lists.opendaylight.org/pipermail/discuss/2015-January/004482.html
Change-Id: I4bdf45ed3cbb5e297c8a7ce1165ea63bf917efbb
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
Vaishali Mithbaokar [Tue, 8 Sep 2015 01:52:06 +0000 (01:52 +0000)]
Merge "Add missing lifecycle mapping from dependency plugin"
Robert Varga [Sat, 5 Sep 2015 19:52:37 +0000 (21:52 +0200)]
Add missing lifecycle mapping from dependency plugin
Eclipse complains that the execution is not covered by lifecycle
mapping. Add an appropriate entry to have the plugin executed.
Change-Id: Ia0dd74a665689cd2cd3f06be56567e9dc4ec1332
Signed-off-by: Robert Varga <rovarga@cisco.com>
Stephen Kitt [Mon, 7 Sep 2015 15:45:06 +0000 (17:45 +0200)]
Remove a number of unnecessary variables
A few plugin variables aren't used elsewhere, and only appear once in
odlparent, so remove them (to avoid further uses in other projects).
Change-Id: I6adf0a94de51146432ae005111ac7590f36fef3b
Signed-off-by: Stephen Kitt <skitt@redhat.com>
Vaishali Mithbaokar [Sat, 5 Sep 2015 20:25:25 +0000 (20:25 +0000)]
Merge "Build Jacoco / Sonar reports for unit tests"
Vaishali Mithbaokar [Sat, 5 Sep 2015 20:24:39 +0000 (20:24 +0000)]
Merge "Bump jacoco-plugin version to 0.7.4"
Thanh Ha [Thu, 3 Sep 2015 15:51:15 +0000 (11:51 -0400)]
Add missing odl-license dependency
Change-Id: I6d93f3d94dbdfe28a09c153017b201dd5a2d3f78
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
Thanh Ha [Mon, 31 Aug 2015 01:50:34 +0000 (21:50 -0400)]
Build Jacoco / Sonar reports for unit tests
Change-Id: Ie3f682bf39d2371b5369211d234f3b4e504ed3dd
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
Thanh Ha [Tue, 1 Sep 2015 20:04:26 +0000 (16:04 -0400)]
Bump jacoco-plugin version to 0.7.4
There is a regression in jacococ-plugin version 0.7.5 so we will not
attempt to use the latest.
http://jira.xwiki.org/browse/XCOMMONS-821
Change-Id: I3fad08e6d35dd8cb7bdaafad67168fc54e7f9e2f
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
Vaishali Mithbaokar [Fri, 28 Aug 2015 15:37:39 +0000 (15:37 +0000)]
Merge "Cleanup features-test"
Vaishali Mithbaokar [Fri, 28 Aug 2015 15:36:29 +0000 (15:36 +0000)]
Merge "Bump netty to 4.0.30"
Vaishali Mithbaokar [Fri, 28 Aug 2015 15:35:50 +0000 (15:35 +0000)]
Merge "Bug 2515 - Jersey to support JAX-RS 2.0"
Robert Varga [Thu, 27 Aug 2015 20:54:15 +0000 (22:54 +0200)]
Bump netty to 4.0.30
Latest upstream version, brings a couple of performance/correctness
fixes.
Change-Id: I7021e711220fc529d044483602c9bbacd6bbfb94
Signed-off-by: Robert Varga <rovarga@cisco.com>
Robert Varga [Mon, 29 Jun 2015 13:15:01 +0000 (15:15 +0200)]
Cleanup features-test
Add @Override annotations, remove commented-out imports, hide fields and
use getters for access.
Change-Id: Ib218b19498864960dedb0710fd35009fd52a7661
Signed-off-by: Robert Varga <rovarga@cisco.com>
Robert Varga [Mon, 29 Jun 2015 12:54:05 +0000 (14:54 +0200)]
Add lifecycle mapping for checkstyle
Checkstyle in eclipse can be safely ingored, as we have no way to push
warnings to the user.
Change-Id: Id76e6afeb2b7055f6cddea08982b2858f0587f2a
Signed-off-by: Robert Varga <rovarga@cisco.com>
Robert Varga [Mon, 29 Jun 2015 12:51:53 +0000 (14:51 +0200)]
Remove duplicate groupId declaration
Silences an eclipse warning
Change-Id: I62125f5f38f6d034fddef5d630334a3dc821f5bb
Signed-off-by: Robert Varga <rovarga@cisco.com>
Thanh Ha [Tue, 25 Aug 2015 02:12:37 +0000 (22:12 -0400)]
Add maven-plugin-plugin to pluginDependencies
Change-Id: Ia09c11ce75ed25d782c311f6dc4360b2976b142b
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
Stephen Kitt [Mon, 24 Aug 2015 09:19:12 +0000 (11:19 +0200)]
Allow © symbol
Change-Id: I8f074a1c5d03a3cda575ef37df8d2b64f7ee8679
Signed-off-by: Stephen Kitt <skitt@redhat.com>
Vaishali Mithbaokar [Sun, 23 Aug 2015 17:25:39 +0000 (17:25 +0000)]
Merge "Enforce license checker"
Stephen Kitt [Tue, 18 Aug 2015 11:56:59 +0000 (13:56 +0200)]
Remove duplicate declaration of dependency plugin
Use a variable for the version.
Change-Id: I9f6d536ba187316ee0b8977663c609e183192146
Signed-off-by: Stephen Kitt <skitt@redhat.com>
Vaishali Mithbaokar [Fri, 14 Aug 2015 05:59:00 +0000 (05:59 +0000)]
Merge "Create odl-license bundle"
Thanh Ha [Thu, 13 Aug 2015 16:13:25 +0000 (12:13 -0400)]
Downgrade maven-plugin-plugin version to 3.3
Due to discussions on the integration mailing list using 3.4 seems to
break users who build with Maven 3.1.1. Downgrading to Maven 3.3 allows
us to continue to build with Maven 3.1.1 as well as build with JDK8.
Change-Id: I775f975ddfd86bc8aa604ab2c6a55a6f1b651fec
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
Thanh Ha [Tue, 21 Jul 2015 00:40:43 +0000 (20:40 -0400)]
Create odl-license bundle
odl-license bundle is created to easy include LICENSE and related files
in packaged jars. Using odlparent we can automatically include LICENSE
files in all ODL artifacts automatically.
Change-Id: I70e7f394b8d06cc9700e9451aa581d4d752cb013
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
Thanh Ha [Mon, 10 Aug 2015 04:30:56 +0000 (00:30 -0400)]
Enforce license checker
Change-Id: I2387e12722ebcc8fb636084c1d93ff675b06374d
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
Thanh Ha [Wed, 5 Aug 2015 20:59:48 +0000 (16:59 -0400)]
Improve LICENSE header rules
- Improve LICENSE.txt RegEx
- Move license checking into it's own separate execution
Change-Id: I80885d81d0419d2654ce5127c047b2f9ca36ca79
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
Thanh Ha [Wed, 5 Aug 2015 21:23:18 +0000 (17:23 -0400)]
Add missing license headers
Change-Id: I7ba601979821bfd7cae71f1ffe153fe495dc2d2b
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
Thanh Ha [Wed, 5 Aug 2015 22:28:15 +0000 (18:28 -0400)]
Change ImportOrder to Eclipse style
Change-Id: I365c885fc1fb1e96e91bae0eb5ad9a5e27eb3097
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
Vaclav Demcak [Thu, 16 Jul 2015 14:00:50 +0000 (16:00 +0200)]
Bug 2515 - Jersey to support JAX-RS 2.0
* add basic dependencies for glassfish jersey core
Fix jackson version from: https://git.opendaylight.org/gerrit/#/c/24502/
(ovsdb & sfc project dependencies)
Change-Id: I74fdcc5778a114a57be4f281b021b32687724c65
Signed-off-by: Vaclav Demcak <vdemcak@cisco.com>
Ed Warnicke [Wed, 5 Aug 2015 21:37:54 +0000 (21:37 +0000)]
Revert "Bug 2515 - Jersey to support JAX-RS 2.0"
This appears to be breaking multiple downstream projects (sfc, ovsdb, etc). Reverting till we can sort it out.
This reverts commit
c464b9a2a63c4ff41468b2e20ac48db806c918d6.
Change-Id: If60ba99a77c7d491d5a056e3e8b28002ff05f3ae
Signed-off-by: Ed Warnicke <eaw@cisco.com>
Vaclav Demcak [Thu, 16 Jul 2015 14:00:50 +0000 (16:00 +0200)]
Bug 2515 - Jersey to support JAX-RS 2.0
* add basic dependencies for glassfish jersey core
Change-Id: Ie16698f1af24238295b613f64f7820919ccbe565
Signed-off-by: Vaclav Demcak <vdemcak@cisco.com>
Vaishali Mithbaokar [Mon, 3 Aug 2015 18:03:39 +0000 (18:03 +0000)]
Merge "fix build failures due to maven-plugin-plugin in JDK8"
Vaishali Mithbaokar [Tue, 28 Jul 2015 05:12:53 +0000 (05:12 +0000)]
Merge "Add license and organization metadata to odlparent"
Stephen Kitt [Tue, 28 Jul 2015 00:16:12 +0000 (17:16 -0700)]
Update commons-fileupload to 1.3.1
CVE-2013-2186, CVE-2014-0050.
Change-Id: I4e21468110694a70874ba6355550af5042481fac
Signed-off-by: Stephen Kitt <skitt@redhat.com>
Jon Rosenberger [Wed, 22 Jul 2015 19:09:03 +0000 (12:09 -0700)]
fix build failures due to maven-plugin-plugin in JDK8
Change-Id: Ic318a3cd40def8647f499e3c591ecb25b09cc43c
Signed-off-by: Jon Rosenberger <jon@ivydesign.com>
Thanh Ha [Wed, 22 Jul 2015 18:55:33 +0000 (14:55 -0400)]
Add license and organization metadata to odlparent
Change-Id: Iff648d2af4a10b68c3c1695dbf2a1d519b49a1e1
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
Thanh Ha [Mon, 20 Jul 2015 23:12:29 +0000 (19:12 -0400)]
Unlock missing Google style checks supported by checkstyle plugin 2.15
Change-Id: Ief8cd74f3d2bc5585cfe517b18e067cf96dfb3af
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
Vaishali Mithbaokar [Mon, 13 Jul 2015 19:54:57 +0000 (19:54 +0000)]
Merge "Bug 3656: Fix to take into account the repos installed by karaf framework"
Shaleen Saxena [Wed, 8 Jul 2015 14:40:06 +0000 (07:40 -0700)]
BUG-3964 Enabled the generation of sources and javadocs artifacts for all projects. The relevant
plugins were already present in the <pluginManagement> section. These were added to the execution
list as well.
Tested this change by building the controller, openflowplugin and l2switch projects. The sources and
javadocs jar files were generated for the components.
Change-Id: I493c7479ecac189b4eec5e4190c707264219cf1b
Signed-off-by: Shaleen Saxena <ssaxena@brocade.com>
Robert Varga [Mon, 29 Jun 2015 11:44:37 +0000 (13:44 +0200)]
BUG-3761: handle repository declaration versions
Adds {{VERSION}} substitution to <repository/> declarations, so they can
be adjusted based on the dependency tree.
Change-Id: I45fe7d6471534be52b7db224737f063b337924b4
Signed-off-by: Robert Varga <rovarga@cisco.com>
Robert Varga [Fri, 26 Jun 2015 17:15:57 +0000 (19:15 +0200)]
BUG-1289: bump slf4j to 1.7.7
While 1.7.12 is the latest release, karaf 3.0.3 is shipping 1.7.7, so
align the versions with that.
Change-Id: I377412fe94a978043901b97272e7a7ed67aad928
Signed-off-by: Robert Varga <rovarga@cisco.com>
(cherry picked from commit
871cf1b8d84dc0a54c32a30f572a1dffda02701d)
Robert Varga [Wed, 24 Jun 2015 19:48:39 +0000 (21:48 +0200)]
Handle wrap:mvn: URLs in features-parent
Couple of projects (AAA for example) use wrap:mvn: to wrap a non-osgi
jar into a bundle. For this usage we want to handle {{VERSION}}
replacement, too.
Change-Id: Ieff3ea862e5a95bf0ff416d3f03d46ff84b1914c
Signed-off-by: Robert Varga <rovarga@cisco.com>
Thanh Ha [Wed, 24 Jun 2015 14:32:52 +0000 (10:32 -0400)]
Use Beryllium version of parent pom
Change-Id: Idad02fba88919efdd313854f8ba694067e7190cd
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
Robert Varga [Tue, 23 Jun 2015 09:10:01 +0000 (09:10 +0000)]
BUG-3837: fix classifier incorrectly used as version
dependencies.txt includes an optional classifier before the version
field. This means if we pull in the same artifact with and without
classifier.
Change-Id: I3544bcc40aa0327ab7383266b2d8baf5d4f02af9
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
Signed-off-by: Robert Varga <rovarga@cisco.com>
(cherry picked from commit
11b40b2ce899b78ef8d6ba2b66acae0f6a4b4d02)
Ed Warnicke [Wed, 17 Jun 2015 23:57:35 +0000 (17:57 -0600)]
Bug 3656: Fix to take into account the repos installed by karaf framework
Change-Id: I954d9ca3abb122c427b9800fd2407586dcf50b96
Signed-off-by: Ed Warnicke <hagbard@gmail.com>
Ed Warnicke [Mon, 15 Jun 2015 23:07:29 +0000 (17:07 -0600)]
Bug 3656: Introducing karaf-plugin
This plugin recursively walks down the features files and
installs all related artifacts.
Change-Id: Ie466f22a71945fa7fb19199820196551688d2d6d
Signed-off-by: Ed Warnicke <hagbard@gmail.com>
(cherry picked from commit
6331216aa2e4c5c4935e26e22416d3eec2663f4a)
Thanh Ha [Tue, 2 Jun 2015 14:05:35 +0000 (10:05 -0400)]
Explicitly set default branch to master
This makes it easier to update this setting for future branching and
clear which branch a patch will be submitted to.
Change-Id: Iac586ef5e29d919baf025d9f136a93008964433a
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
Ed Warnicke [Mon, 1 Jun 2015 21:13:24 +0000 (14:13 -0700)]
Bug 3533: jetty.version to fix Cors issue
Change-Id: I07ba25e699e9b1c8c7346cbc1fd59679dd73613e
Signed-off-by: Ed Warnicke <hagbard@gmail.com>
Vaishali Mithbaokar [Mon, 27 Apr 2015 23:12:31 +0000 (23:12 +0000)]
Merge "Bump checkstyle version to 2.15"
Lorand Jakab [Tue, 21 Apr 2015 11:49:34 +0000 (14:49 +0300)]
Checkstyle: exclude autogenerated classes
Change-Id: I11d2bee75696923b23bc67d35b1b647a0cab4e90
Signed-off-by: Lorand Jakab <lojakab@cisco.com>
Thanh Ha [Mon, 20 Apr 2015 20:15:19 +0000 (16:15 -0400)]
Bump checkstyle version to 2.15
This version will allow us to re-enable the currently disabled Google
Style in odl_checkstyle.
Change-Id: Ide784f794b5137b37c7cd6e622398e66c21b1368
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
Vaishali Mithbaokar [Thu, 16 Apr 2015 19:42:23 +0000 (12:42 -0700)]
Version bump for master after stable/lithium
Change-Id: I8874e7a7cf8408e5c99da44683db95cdbd5e4ed4
Signed-off-by: Vaishali Mithbaokar <vmithbao@cisco.com>
Tony Tkacik [Thu, 16 Apr 2015 09:09:42 +0000 (11:09 +0200)]
Bug 2907: Removed open-coded features.xml parsing
SingleFeatureTest used open-coded feature parsing
which did not accounted for multiple versions of
features.
Replaced open-coded parsing with parser from Karaf
itself.
This fixes issue in SingleFeatureTest when
used with Karaf 3.0.3
Change-Id: Ia734ccfb44d27a2c9402baa25fcc4033f30a30ee
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
Ed Warnicke [Mon, 16 Feb 2015 23:59:12 +0000 (16:59 -0700)]
Bug 2907 - upgrade to karaf 3.0.3
This is needed to support Java 8
Change-Id: I99efde964392995de35d084522cb01768939f65d
Signed-off-by: Ed Warnicke <eaw@cisco.com>
Ryan Moats [Wed, 1 Apr 2015 16:12:36 +0000 (11:12 -0500)]
Bump eclipse.persistence.version to 2.5.2
version 2.5.0 has the following NPE bug:
https://bugs.eclipse.org/bugs/show_bug.cgi?id=414577
bump version to avoid neutron northbound hitting this problem
Change-Id: Iea58a19496687a874b81b1c9f9f8f7da9228741f
Signed-off-by: Ryan Moats <rmoats@us.ibm.com>
Vaishali Mithbaokar [Wed, 25 Mar 2015 15:45:45 +0000 (15:45 +0000)]
Merge "Update to latest checkstyle plugin"
Vaishali Mithbaokar [Wed, 25 Mar 2015 15:42:12 +0000 (15:42 +0000)]
Merge "Fix checkstyle warnings"
Vaishali Mithbaokar [Wed, 25 Mar 2015 15:39:34 +0000 (15:39 +0000)]
Merge "Bump Javassist version to 3.19.0-GA"
Robert Varga [Wed, 25 Mar 2015 11:50:00 +0000 (12:50 +0100)]
Fix checkstyle warnings
Reorder keywords to follow JLS.
Change-Id: I7172191d3352afbf2e963c53b30b20430061f742
Signed-off-by: Robert Varga <rovarga@cisco.com>
Vaishali Mithbaokar [Wed, 25 Mar 2015 06:32:21 +0000 (06:32 +0000)]
Merge "Bump Bouncy Castle version to 1.52."
Gary Wu [Tue, 24 Mar 2015 16:54:25 +0000 (09:54 -0700)]
Bump Javassist version to 3.19.0-GA
This version bump was requested by Robert Varga to
go with the version bump of Netty to 4.0.26.Final.
Change-Id: I3e026c968e63e9b5a8946863d7aafbfd7dbe34fa
Signed-off-by: Gary Wu <Gary.Wu1@huawei.com>
Gary Wu [Tue, 24 Mar 2015 16:50:17 +0000 (09:50 -0700)]
Bump Netty version to 4.0.26.Final
Netty 4.0.26.Final is required by the USC project
to support TLS mutual authentication.
Change-Id: I83097a12f14e4feed7ce1655f2a8c04e8d065a2b
Signed-off-by: Gary Wu <Gary.Wu1@huawei.com>
Gary Wu [Tue, 24 Mar 2015 16:45:41 +0000 (09:45 -0700)]
Bump Bouncy Castle version to 1.52.
Bouncy Castle 1.52 is required by the USC project
to support DTLS 1.2.
Change-Id: I24445abe2b3865eefd8ee5b6693899555276f633
Signed-off-by: Gary Wu <Gary.Wu1@huawei.com>
Thanh Ha [Fri, 13 Mar 2015 03:53:33 +0000 (23:53 -0400)]
Break circular dependency
odlparent depends on checkstyle depends on odlparent. We need to break
this circular dependency otherwise building odlparent won't be possible.
Change-Id: I4bda5cc21eed5696fd0253f2effe42afc78517fd
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>