aaa.git
2 years agoClean up AAAShiroProvider 32/100932/3
Robert Varga [Tue, 3 May 2022 08:22:16 +0000 (10:22 +0200)]
Clean up AAAShiroProvider

AAAShiroProvider has a ton of constructor arguments, which are not
really used anywhere. Remove them along with their fields and accessors.

Change-Id: I49112e08c9af629c5ba62fe19a01d6306229dae8
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
2 years agoDo not require commons-text 26/100926/1
Robert Varga [Mon, 2 May 2022 19:14:58 +0000 (21:14 +0200)]
Do not require commons-text

This dependency seems to be unused, remove it.

Change-Id: Ifc7943de3575e0fce2370e2a920ea8ca66003291
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
2 years agoDitch references to oauth2 25/100925/1
Robert Varga [Mon, 2 May 2022 18:49:16 +0000 (20:49 +0200)]
Ditch references to oauth2

This string is defunct, remove it.

Change-Id: I7ff56b61643884fbe809eb7c6ddd9fa7723084dd
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
2 years agoAdd an @Override annotation 24/100924/1
Robert Varga [Mon, 2 May 2022 18:40:14 +0000 (20:40 +0200)]
Add an @Override annotation

We are implementing a method from superclass, annotate that.

Change-Id: Id63bfbcd637db03546a60f0e7c9bdc6bb00f82c7
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
2 years agoRemove AAAShiroProvider.INSTANCE_FUTURE 23/100923/1
Robert Varga [Mon, 2 May 2022 18:23:41 +0000 (20:23 +0200)]
Remove AAAShiroProvider.INSTANCE_FUTURE

Last user of this future was KarafIniWebEnvironment, remove it to
reduce leakage.

Change-Id: I6279c5f7018484317f105195ccadc945e3a2ecbf
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
2 years agoDo not reference yangtools.concepts.Builder 22/100922/1
Robert Varga [Mon, 2 May 2022 16:25:35 +0000 (18:25 +0200)]
Do not reference yangtools.concepts.Builder

Builder is being retired, just do not use it.

Change-Id: I3c1fba0010b89cf466847065cce18e47a2f2c7db
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
2 years agoMerge "Bump versions to 0.16.0-SNAPSHOT"
Robert Varga [Thu, 28 Apr 2022 21:36:10 +0000 (21:36 +0000)]
Merge "Bump versions to 0.16.0-SNAPSHOT"

2 years agoModernize FileUtils.delete() 81/100881/1
Robert Varga [Thu, 28 Apr 2022 19:26:43 +0000 (21:26 +0200)]
Modernize FileUtils.delete()

We have Java 8, hence we can cut down on the code here.

Change-Id: I7e82ca15d0c7c27f2868770ec90029f03ed068b9
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
2 years agoDitch Truth from aaa-cli-jar 80/100880/1
Robert Varga [Thu, 28 Apr 2022 19:00:03 +0000 (21:00 +0200)]
Ditch Truth from aaa-cli-jar

Simple JUnit assertions are good enough to cover the tests here, ditch
Truth.

Change-Id: Ic2f80c5ae18e84c985cb0b8021d7e9ba4c4b94d0
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
2 years agoDitch Truth from web-jetty-impl 79/100879/1
Robert Varga [Thu, 28 Apr 2022 18:30:37 +0000 (20:30 +0200)]
Ditch Truth from web-jetty-impl

Use JUnit assertions instead.

Change-Id: Id5cc0addd95c0b313c86bc825f128163e7b6aa6e
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
2 years agoDitch Truth from IdmLightConfigTest 78/100878/1
Robert Varga [Thu, 28 Apr 2022 18:16:04 +0000 (20:16 +0200)]
Ditch Truth from IdmLightConfigTest

The use case here is a verbose alternative to assertEquals(), just ditch
Truth.

Change-Id: I9391e5bb6611a1986d9991b1d51e3f4ea3fbf956
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
2 years agoDitch Google Truth from web/testutils 77/100877/1
Robert Varga [Thu, 28 Apr 2022 18:11:34 +0000 (20:11 +0200)]
Ditch Google Truth from web/testutils

There are only two simple asserts there, use plain JUnit instead of
Google Truth. Also fixup the testing servlet.

Change-Id: Iea922ebe5c2d6888fb1116a28c9cab88c66eb6e8
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
2 years agoDitch Google Truth from web-api 76/100876/1
Robert Varga [Thu, 28 Apr 2022 18:07:31 +0000 (20:07 +0200)]
Ditch Google Truth from web-api

Use plain JUnit/Hamcrest matchers instead. Also improve a few
assertions.

Change-Id: I2539e01bd441cbd7e72a8a911de89929fc91949a
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
2 years agoBump versions to 0.16.0-SNAPSHOT 75/100875/1
Robert Varga [Thu, 28 Apr 2022 15:07:46 +0000 (17:07 +0200)]
Bump versions to 0.16.0-SNAPSHOT

This starts the next major development iteration.

Change-Id: Iaa15978d6ab7ea9db3d2cbc61cfd7b0625a0ea98
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
2 years agoBump versions to 0.15.4-SNAPSHOT 84/100784/1
Robert Varga [Sun, 24 Apr 2022 21:56:10 +0000 (23:56 +0200)]
Bump versions to 0.15.4-SNAPSHOT

This starts the next development iteration.

Change-Id: I205a001d824110d48a081697634891a59523391b
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
2 years agoBump controller to 5.0.3 83/100783/1
Robert Varga [Sun, 24 Apr 2022 21:55:39 +0000 (23:55 +0200)]
Bump controller to 5.0.3

Pick up fixes from upstream.

Change-Id: If086e2384305135dd2cc7da6c22f7030e1da1fee
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
2 years agoBump versions to 0.15.3-SNAPSHOT 12/100612/1
Robert Varga [Thu, 14 Apr 2022 11:43:52 +0000 (13:43 +0200)]
Bump versions to 0.15.3-SNAPSHOT

This starts the next development iteration.

Change-Id: I5880b948ab4e2e2dbcd6aea32cfce0138e805b02
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
2 years agoBump upstream versions 11/100611/1
Robert Varga [Thu, 14 Apr 2022 11:42:45 +0000 (13:42 +0200)]
Bump upstream versions

Adopt:
- yangtools-8.0.3
- mdsal-9.0.2
- controller-5.0.2

Change-Id: I2d51e10cd444e587d431397b64e2a09134833f12
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
2 years agoBump shiro to 1.9.0 54/100354/2
Robert Varga [Fri, 1 Apr 2022 09:04:46 +0000 (11:04 +0200)]
Bump shiro to 1.9.0

https://shiro.apache.org/blog/2022/03/22/apache-shiro-190-released.html

JIRA: AAA-223
Change-Id: Idcf1a3b802e6c0c1fc21c420c13db9c67398c56a
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
2 years agoBump versions to 0.15.2-SNAPSHOT 66/100266/2
Robert Varga [Fri, 25 Mar 2022 18:10:36 +0000 (19:10 +0100)]
Bump versions to 0.15.2-SNAPSHOT

This starts the next development iteration.

Change-Id: I53b9cfa330fdd5b92effa1fad77e7899c954158a
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
2 years agoBump upstreams 65/100265/1
Robert Varga [Fri, 25 Mar 2022 18:01:06 +0000 (19:01 +0100)]
Bump upstreams

Adopt:
- yangtools-8.0.2
- mdsal-9.0.1
- controller-5.0.1

Change-Id: I6cf224fa634df78ae58017f78556d15c32ab37b9
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
2 years agoBump versions to 0.15.1-SNAPSHOT 61/100161/1
Robert Varga [Sun, 20 Mar 2022 16:32:31 +0000 (17:32 +0100)]
Bump versions to 0.15.1-SNAPSHOT

This starts the next development iteration.

Change-Id: I616c716d23bae88c4a54d97f50aa698e6253625e
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
2 years agoUse controller-5.0.0 60/100160/1
Robert Varga [Sun, 20 Mar 2022 16:31:43 +0000 (17:31 +0100)]
Use controller-5.0.0

Use released artifacts instead of snapshots.

Change-Id: Icd5a95fb9616b03e1b05b0b82107908d6ef4895f
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
2 years agoUse mdsal-9.0.0 58/100158/1
Robert Varga [Sun, 20 Mar 2022 13:32:35 +0000 (14:32 +0100)]
Use mdsal-9.0.0

Use released artifacts instead of snapshots.

Change-Id: Ia573833bb970d61e8d2d65a80953615b6402f7af
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
2 years agoBump yangtools to 8.0.1 13/100113/1
Robert Varga [Sun, 13 Mar 2022 23:16:09 +0000 (00:16 +0100)]
Bump yangtools to 8.0.1

There is a slight regression in yangtools-8.0.1, pick up the fix.

Change-Id: I2c04349f46f662219725ba479165ca3a8b21d470
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
2 years agoBump yangtools to 8.0.0 08/100108/1
Robert Varga [Sun, 13 Mar 2022 20:02:32 +0000 (21:02 +0100)]
Bump yangtools to 8.0.0

Pick up release instead of snapshots.

Change-Id: Ic2b2c9e68fc8169c75170de6c4ac677fb63b140f
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
2 years agoBump upstreams 06/99506/7
Robert Varga [Thu, 27 Jan 2022 19:15:27 +0000 (20:15 +0100)]
Bump upstreams

Adopt:
- odlparent-10.0.0
- infrautils-3.0.0
- yangtools-8.0.0-SNAPSHOT
- mdsal-9.0.0-SNAPSHOT
- controller-5.0.0-SNAPSHOT

Change-Id: I76f7fe3dcaba9b981445e56de36b1f00154a22bc
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
2 years agoBump versions to 0.15.0-SNAPSHOT 17/100017/1
Robert Varga [Wed, 9 Mar 2022 09:18:56 +0000 (10:18 +0100)]
Bump versions to 0.15.0-SNAPSHOT

This starts the next major development iteration.

Change-Id: Iea15e413e9fd44ae480d46d292382b0ac0384052
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
2 years agoBump versions to 0.14.11-SNAPSHOT 38/99738/1
Robert Varga [Mon, 14 Feb 2022 16:29:05 +0000 (17:29 +0100)]
Bump versions to 0.14.11-SNAPSHOT

This starts the next development iteration.

Change-Id: Ic035a41c81e3a8043794f665f8e059a332d13d2a
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
2 years agoAdopt controller-4.0.10 37/99737/1
Robert Varga [Mon, 14 Feb 2022 15:29:50 +0000 (16:29 +0100)]
Adopt controller-4.0.10

controller-4.0.9 has broken yangtools dependencies, adopt a fixed-up
version.

Change-Id: I22b2ff27b5ab50bd118d559640272b48ba5f5f7b
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
2 years agoBump versions to 0.14.10-SNAPSHOT 15/99715/1
Robert Varga [Mon, 14 Feb 2022 10:34:03 +0000 (11:34 +0100)]
Bump versions to 0.14.10-SNAPSHOT

This starts the next development iteration.

Change-Id: Ie4554d92e8b31c960bcb912b9922a7cbabe6f058
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
2 years agoBump upstreams 13/99713/1
Robert Varga [Mon, 14 Feb 2022 10:12:11 +0000 (11:12 +0100)]
Bump upstreams

Adopt:
- odlparent-9.0.13
- infrautils-2.0.13
- mdsal-8.0.11
- controller-4.0.9

Change-Id: I87d114aaee1a96964e99b99cf7c9495656c45a48
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
2 years agoAdd explicit storage for authentication methods 69/99569/2
Shibu Vijayakumar [Thu, 3 Feb 2022 13:38:02 +0000 (13:38 +0000)]
Add explicit storage for authentication methods

We seem to need an explicit field for methods, add it.

JIRA: AAA-220
Change-Id: I503f0118370eea6e6ba4ff6909c652314c2ca8b3
Signed-off-by: Shibu Vijayakumar <shibu.vijayakumar@infosys.com>
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
2 years agoUse JsonParser.parseString() 42/99642/1
Robert Varga [Tue, 8 Feb 2022 09:20:23 +0000 (10:20 +0100)]
Use JsonParser.parseString()

Instantiating JsonParser is deprecate, do not use it.

Change-Id: I5486632f3ac00c89941df93096817fca2f820b22
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
2 years agoBump versions to 0.14.9-SNAPSHOT 03/99403/1
Robert Varga [Thu, 20 Jan 2022 13:09:26 +0000 (14:09 +0100)]
Bump versions to 0.14.9-SNAPSHOT

This starts the next development iteration.

Change-Id: I4b5723082888157f9d0025f030aba548262c6fc7
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
2 years agoBump upstreams 02/99402/1
Robert Varga [Thu, 20 Jan 2022 13:08:04 +0000 (14:08 +0100)]
Bump upstreams

Adopt:
- odlparent-9.0.12
- infrautils-2.0.12
- mdsal-8.0.10
- controller-4.0.8

Change-Id: Ic029bf0fffa8e6d124e1222c2d946c6fd58379cc
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
2 years agominor updates to dev and user guide 03/98603/1
Bancala, Benjamin (bb3476) [Wed, 17 Nov 2021 19:46:15 +0000 (14:46 -0500)]
minor updates to dev and user guide

shiro.ini is no longer directly used. point the user to the new file.

Issue-ID: AAA-219
Signed-off-by: Bancala, Benjamin (bb3476) <bb3476@att.com>
Change-Id: I2f378be0a93c7d54eb898423b88b927abbe77428

2 years agoBump versions to 0.14.8-SNAPSHOT 01/98501/1
Robert Varga [Sun, 14 Nov 2021 11:40:56 +0000 (12:40 +0100)]
Bump versions to 0.14.8-SNAPSHOT

This starts the next development iteration.

Change-Id: I7222ea7c3b4dd4b6dbe5c40a70298c19e61693a3
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
2 years agoBump controller to 4.0.7 96/98496/1
Robert Varga [Sun, 14 Nov 2021 09:15:54 +0000 (10:15 +0100)]
Bump controller to 4.0.7

Adopt latest fixes from upstream.

Change-Id: I8b01853a00626cee2ff18f943d1b3553a06fda53
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
2 years agoBump shiro to 1.8.0 68/98368/2
Robert Varga [Mon, 8 Nov 2021 13:15:49 +0000 (14:15 +0100)]
Bump shiro to 1.8.0

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

JIRA: AAA-218
Change-Id: Icc353a995eb567cb1a55876d87c22f07f108831c
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
2 years agoBump versions to 0.14.7-SNAPSHOT 25/98325/1
Robert Varga [Sun, 7 Nov 2021 11:20:41 +0000 (12:20 +0100)]
Bump versions to 0.14.7-SNAPSHOT

This starts the next development iteration.

Change-Id: I607ebc876348343aae70b43553d2af4509b907b7
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
2 years agoBump controller to 4.0.6 24/98324/1
Robert Varga [Sun, 7 Nov 2021 11:05:40 +0000 (12:05 +0100)]
Bump controller to 4.0.6

Pick up latest fixes from upstream.

Change-Id: I72aee62c6f050b0d2d0db1f63f67913076f8478e
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
2 years agoBump versions to 0.14.6-SNAPSHOT 58/98158/1
Robert Varga [Wed, 27 Oct 2021 08:58:04 +0000 (10:58 +0200)]
Bump versions to 0.14.6-SNAPSHOT

This starts the next development iteration.

Change-Id: I26e5eaa7fa142aa83f6eb2ab4228348813957e30
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
2 years agoBump upstreams 57/98157/1
Robert Varga [Wed, 27 Oct 2021 08:49:47 +0000 (10:49 +0200)]
Bump upstreams

Adopt:
- odlparent-9.0.8
- infrautils-2.0.8
- mdsal-8.0.7
- controller-4.0.5

JIRA: AAA-217
Change-Id: I80db0e5d87ac405cfa828de9b9e443be0819d4d0
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
2 years agoBump ehcache to 2.10.9.2 58/98058/1
Robert Varga [Sat, 23 Oct 2021 07:35:34 +0000 (09:35 +0200)]
Bump ehcache to 2.10.9.2

Release notes are not available.

Change-Id: Ibf4ebd7436491ea1cfe239a49b14289c7f766f26
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
2 years agoBump versions to 0.14.5-SNAPSHOT 30/98030/1
Robert Varga [Thu, 21 Oct 2021 10:46:00 +0000 (12:46 +0200)]
Bump versions to 0.14.5-SNAPSHOT

This starts the next development iteration.

Change-Id: I3aeb317aa8e18146ca8f22a14e57d655cc59423e
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
2 years agoBump upstreams 28/98028/1
Robert Varga [Thu, 21 Oct 2021 09:58:28 +0000 (11:58 +0200)]
Bump upstreams

We adopt:
- odlparent-9.0.7
- yangtools-7.0.9
- mdsal-8.0.6
- infrautils-2.0.7
- controller-4.0.4

Change-Id: I57372a4df00de12a3c9ec1d90aca594d91ef0105
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
2 years agoUse Base64.encoder() in ODLKeyTool 24/97724/2
Robert Varga [Sun, 3 Oct 2021 16:43:59 +0000 (18:43 +0200)]
Use Base64.encoder() in ODLKeyTool

There is no point in depending on jaxb-api, just use the encoder from
java.util.

Change-Id: I67228d64beff56f41aaeafac1be285c5c5607f1f
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
2 years agoBump versions to 0.14.4-SNAPSHOT 96/97496/1
Robert Varga [Wed, 15 Sep 2021 13:00:42 +0000 (15:00 +0200)]
Bump versions to 0.14.4-SNAPSHOT

This starts the next development iteration.

Change-Id: I9a90e13d42965176cbf18b5e9dea1cdd84990b43
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
2 years agoAlign to controller-4.0.3 95/97495/2
Robert Varga [Wed, 15 Sep 2021 12:03:52 +0000 (14:03 +0200)]
Align to controller-4.0.3

This is an intermediate step to align with upcoming controller release.
We adopt:
- odlparent-9.0.6
- yangtools-7.0.7
- mdsal-8.0.5
- infrautils-2.0.6
- controller-4.0.3

Change-Id: I6c5bd4a9ffc1af3a1f7e7d56929eaf9482a31e22
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
2 years agoBump versions to 0.14.3-SNAPSHOT 26/97326/1
Robert Varga [Wed, 25 Aug 2021 10:27:30 +0000 (12:27 +0200)]
Bump versions to 0.14.3-SNAPSHOT

This starts the next development iteration.

Change-Id: I3acb85914313371da6ff807f2157ffd9f241c9c8
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
2 years agoUse controller-4.0.2 25/97325/1
Robert Varga [Wed, 25 Aug 2021 10:26:51 +0000 (12:26 +0200)]
Use controller-4.0.2

We have a released version, use it instead of snapshots.

Change-Id: I7404c2321e657304bb2e8ae737d7f5f97e0868fa
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
2 years agoAlign to controller-4.0.2-SNAPSHOT 83/97283/6
Robert Varga [Fri, 20 Aug 2021 13:22:13 +0000 (15:22 +0200)]
Align to controller-4.0.2-SNAPSHOT

This is an intermediate step to align with upcoming controller release.
We adopt:
- odlparent-9.0.5
- yangtools-7.0.7
- mdsal-8.0.4
- infrautils-2.0.5
- controller-4.0.2-SNAPSHOT

Change-Id: I4b745bb98ec97d00ccddd76e86461d47cdbba16c
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
2 years agoFix raw type warnings 91/97291/1
Robert Varga [Mon, 23 Aug 2021 13:09:44 +0000 (15:09 +0200)]
Fix raw type warnings

Component{Factory,Instance} are generic with OSGi R7, fix a few raw type
warnings.

Change-Id: I6a923e164a99d0e1959d217401116e0bf381b930
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
2 years agoRemove an unneded exception 49/97149/1
Robert Varga [Tue, 17 Aug 2021 19:56:39 +0000 (21:56 +0200)]
Remove an unneded exception

There is no point in guarding private constructors, just add a comment.

Change-Id: I1ecd2557fa9ebbf9ece4c87e6818934b4f66ed18
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
(cherry picked from commit 6b380f0f5feb2afda551c718e6135c53b9c7cbe3)

2 years agoMerge "Split out datastore implementation from aaa-shiro"
Robert Varga [Mon, 9 Aug 2021 11:45:27 +0000 (11:45 +0000)]
Merge "Split out datastore implementation from aaa-shiro"

2 years agoDo not use javax.bind in encrypt-service 02/97102/1
Robert Varga [Mon, 9 Aug 2021 10:30:08 +0000 (12:30 +0200)]
Do not use javax.bind in encrypt-service

We have a proper Base64 encoder/decoder in java.util, use that instead
of javax.xml.bind.DatatypeConverter. This allows us to ditch a dependency
on javax.xml.bind completely.

Change-Id: Ia6d8aec4cf37ea39b12b8a6c7e233b1f932587e4
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
2 years agoImprove encryption concurrency 01/97101/1
Robert Varga [Mon, 9 Aug 2021 10:16:12 +0000 (12:16 +0200)]
Improve encryption concurrency

Do not perform base64-encoding under lock, allowing cipher to be used
while we process its result.

Change-Id: I804a26eab36b7a78ad3532857cf5edb949bfd81e
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
2 years agoUse odl-aaa-jakarta-activation-api 99/97099/1
Robert Varga [Mon, 9 Aug 2021 09:48:02 +0000 (11:48 +0200)]
Use odl-aaa-jakarta-activation-api

Do not package activation-api, use odlparent-provided feature instead.

Change-Id: I5a374138b976fe1e960f09e0551f084179660fa4
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
2 years agoSplit out datastore implementation from aaa-shiro 33/96833/15
tadei.bilan [Thu, 8 Jul 2021 10:51:08 +0000 (13:51 +0300)]
Split out datastore implementation from aaa-shiro

Split H2 database from aaa-shiro into separate module.
Also split opendaylight.aaa.shiro.tokenauthrealm.auth to
aaa-tokenauthrealm to avoid cyclic dependencies
between aaa-idm-store-h2 and aaa-shiro modules.

JIRA: AAA-208
Change-Id: Ie90e7d7379e598bbf1b62436a27dae8a8b8c7372
Signed-off-by: tadei.bilan <tadei.bilan@pantheon.tech>
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
2 years agoBump versions to 0.14.2-SNAPSHOT 22/97022/1
Robert Varga [Sun, 25 Jul 2021 09:20:10 +0000 (11:20 +0200)]
Bump versions to 0.14.2-SNAPSHOT

This starts the next development iteration.

Change-Id: Ic31480919d2b5c70edce9d94fcfe7a0b301482ba
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
2 years agoBump upstream versions 21/97021/1
Robert Varga [Sun, 25 Jul 2021 09:14:25 +0000 (11:14 +0200)]
Bump upstream versions

Adopt yangtools-7.0.4, mdsal-8.0.1 and controller-4.0.1.

Change-Id: I41789f35fbfd69efa0c5108b2ef88317d6d0617a
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
2 years agoBump versions to 0.14.1-SNAPSHOT 92/96792/1
Robert Varga [Fri, 2 Jul 2021 19:29:39 +0000 (21:29 +0200)]
Bump versions to 0.14.1-SNAPSHOT

This starts the next development iteration.

Change-Id: I584068db04373d20687e2599403d4db255e9c14e
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
2 years agoBump controller to 4.0.0 release 85/96785/1
Robert Varga [Fri, 2 Jul 2021 15:03:44 +0000 (17:03 +0200)]
Bump controller to 4.0.0 release

Use released artifacts instead of snapshots, readying us for release.

Change-Id: I1b2530e792eab0f604841f659c2757f5dd026866
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
2 years agoUse mdsal-8 artifacts 80/96680/1
Robert Varga [Fri, 25 Jun 2021 18:14:31 +0000 (20:14 +0200)]
Use mdsal-8 artifacts

mdsal-8.0.0 has been released, use those artifacts instead of SNAPSHOTs.

Change-Id: Ie09f034251e7e29ada2c75eeddf1b642158189c8
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
2 years agoCleanup aaa-cli dependencies 43/96643/3
Robert Varga [Wed, 23 Jun 2021 21:07:01 +0000 (23:07 +0200)]
Cleanup aaa-cli dependencies

We do not need ehcache, do not pull it in.

Change-Id: I604168264b696ac2b6d2065b78bb5f97e2727107
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
2 years agoCleanup aaa-shiro-api dependencies 42/96642/2
Robert Varga [Wed, 23 Jun 2021 21:02:37 +0000 (23:02 +0200)]
Cleanup aaa-shiro-api dependencies

We do not require aaa-authn-api, do not pull it in.

Change-Id: I3349b1261c6adc6f2463a771aef2a2ca4696d8ad
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
2 years agoDrop unneeded BouncyCastle dependencies 41/96641/1
Robert Varga [Wed, 23 Jun 2021 21:01:54 +0000 (23:01 +0200)]
Drop unneeded BouncyCastle dependencies

We are pulling in BC jars for no particularly good reason. Do not do
that.

Change-Id: I857641f5051c16a8e114dcd13e79fb7fa1d75847
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
2 years agoBump yangtools to 7.0.3 69/96569/1
Robert Varga [Sat, 19 Jun 2021 11:30:14 +0000 (13:30 +0200)]
Bump yangtools to 7.0.3

Pick up latest updates from upstream.

Change-Id: I4656cd4633e25085470a3a8f303276204072d526
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
2 years agoUse yangtools-7.0.2 51/96451/1
Robert Varga [Tue, 8 Jun 2021 10:00:19 +0000 (12:00 +0200)]
Use yangtools-7.0.2

We have an upstream release, use that instead of snapshots.

Change-Id: I6bb8f2094057e49f9a2ffc51be3132a088afd94f
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
3 years agoBump infrautils to 2.0.2 49/96349/1
Robert Varga [Mon, 24 May 2021 22:26:03 +0000 (00:26 +0200)]
Bump infrautils to 2.0.2

Bump to released version to nail down changes.

Change-Id: I5cc1301c02f6a271d059382b95e1bf9ab808bc81
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
3 years agoUpdate MRI upstreams 39/96339/1
Robert Varga [Mon, 24 May 2021 18:13:08 +0000 (20:13 +0200)]
Update MRI upstreams

Pick up odlparent-9.0.2, yangotols-7.0.2-SNAPSHOT and
infrautils-2.0.2-SNAPSHOT. These contain some fixes required for
netconf as well as our SFT.

Change-Id: I8fa025d05e177933f458fa66bcff45b8eb9cb8a1
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
3 years agoTie together CORS filter initialization constats 12/96212/1
Robert Varga [Mon, 17 May 2021 15:48:33 +0000 (17:48 +0200)]
Tie together CORS filter initialization constats

CrossOriginFilter has well-known constants, use them to ensure
consistency of configuration properties.

Change-Id: Ie4f5021fc5b9f3b617286fe03a303ae67baf3c2c
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
3 years agoFix repackaged-shiro sources 11/96211/1
Robert Varga [Mon, 17 May 2021 15:47:52 +0000 (17:47 +0200)]
Fix repackaged-shiro sources

There is a simple typo in the shading process, rendering sources empty.
Fix that.

JIRA: AAA-188
Change-Id: If3a40c92d466aef7fb96b2a479fe8f039fe47e5c
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
3 years agoSupport async servlets in Jetty 97/96197/1
Robert Varga [Sat, 15 May 2021 11:44:14 +0000 (13:44 +0200)]
Support async servlets in Jetty

I83d579bbe33cfeb33f44150ecbe3619654bebe36 failed to update Jetty
implementation to propagate the async flag. Fix that omission.

Change-Id: I167de479e6e26cbe88ff6f1c5c92d892e394f4ed
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
3 years agoIntegrate upstream MRI projects 97/96097/6
Robert Varga [Sun, 9 May 2021 19:59:42 +0000 (21:59 +0200)]
Integrate upstream MRI projects

Adopt latest versions, namely;
- odlparent-9.0.1
- yangtools-7.0.1
- infrautils-2.0.1
- mdsal-8.0.0-SNAPSHOT
- controller-4.0.0-SNAPSHOT

This forms the baseline for our next major release.

Change-Id: I74c0af013cbb8545e1bef515a9b7fb392f3f09a8
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
3 years agoRealign odlparent version 16/96116/1
Robert Varga [Tue, 11 May 2021 12:30:18 +0000 (14:30 +0200)]
Realign odlparent version

This mistake slipped review, not that it matters that much, but it
would be problematic going forward.

JIRA: AAA-188
Change-Id: I2c9da4ee0f580470d6cc3893b2ef190d4f1bdc28
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
3 years agoBump shiro to 1.7.1 29/89629/19
Robert Varga [Thu, 7 May 2020 09:54:30 +0000 (11:54 +0200)]
Bump shiro to 1.7.1

This patch bumps the shiro dependency, release notes are here:

https://shiro.apache.org/news.html#1.4.0-RC2-released
https://shiro.apache.org/news.html#1.4.1-released
https://shiro.apache.org/news.html#1.4.2-released
https://shiro.apache.org/news.html#1.5.0-released
https://shiro.apache.org/news.html#1.5.1-released
https://shiro.apache.org/news.html#1.5.2-released
https://shiro.apache.org/news.html#1.5.3-released
https://shiro.apache.org/news.html#1.6.0-released
https://shiro.apache.org/news.html#1.7.0-released
https://shiro.apache.org/news.html#1.7.1-released

We end up repackaging shiro to deal with class loading issues
coming it faces. Those will be cleaned up in version shiro-2,
which when we ill just revert back to using their packaging.

JIRA: AAA-188
Change-Id: Ic1d5c4243776c5cd72778c248ba5824a4acc4a91
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
3 years agoBump versions to 0.14.0-SNAPSHOT 12/96112/1
Robert Varga [Mon, 10 May 2021 20:47:34 +0000 (22:47 +0200)]
Bump versions to 0.14.0-SNAPSHOT

This starts the next major version iteration.

Change-Id: I338bbb190aa3ba53711c89739fba16dd904bfa12
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
3 years agoMigrate javax.inject artifact references 96/96096/1
Robert Varga [Sun, 9 May 2021 20:06:45 +0000 (22:06 +0200)]
Migrate javax.inject artifact references

We are using GuicedEE instead of the ancient (and broken) javax.inject
jar. Migrate references.

Change-Id: I6d4e043eca50c3af1ff3742c6809c3b8118a2100
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
3 years agoMigrate osgi.core references 95/96095/1
Robert Varga [Sun, 9 May 2021 20:05:52 +0000 (22:05 +0200)]
Migrate osgi.core references

OSGi R7's core artifact has been renamed, use that as the dependency.

Change-Id: Ib27399feadf53ca91c816ba3e24f3dd001cf2249
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
3 years agoBump versions to 0.13.4-SNAPSHOT 88/96088/1
Robert Varga [Sun, 9 May 2021 04:56:24 +0000 (06:56 +0200)]
Bump versions to 0.13.4-SNAPSHOT

This starts the next development iteration.

Change-Id: I4d912a211794b8605d4f2a138db7400cf71953a4
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
3 years agoBump infrautils to 1.9.8 51/96051/1
Robert Varga [Fri, 7 May 2021 21:32:38 +0000 (23:32 +0200)]
Bump infrautils to 1.9.8

Pick up the (unneded) fixes from upstream.

Change-Id: Ie67e8136325755b016adee85877f427d33fae2ec
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
3 years agoBump MRI upstreams 24/96024/3
Robert Varga [Fri, 7 May 2021 17:28:58 +0000 (19:28 +0200)]
Bump MRI upstreams

Adopt following versions:
- odlparent-8.1.2
- infrautils-1.9.7
- yangtools-6.0.6
- mdsal-7.0.7
- controller-3.0.8

Change-Id: I2db011755ccea35c4fce4a78ad2c77f9885c2058
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
3 years agoBump versions to 0.13.3-SNAPSHOT 68/95368/1
Robert Varga [Fri, 26 Feb 2021 13:19:44 +0000 (14:19 +0100)]
Bump versions to 0.13.3-SNAPSHOT

This starts the next development iteration.

Change-Id: Iee11b07c32c1a64e66c191a49e6abbfcfb852ee8
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
3 years agoBump MRI upstreams 66/95366/1
Robert Varga [Fri, 26 Feb 2021 09:41:54 +0000 (10:41 +0100)]
Bump MRI upstreams

Adopt following versions:
- odlparent-8.1.1
- infrautils-1.9.6
- yangtools-6.0.5
- mdsal-7.0.6
- controller-3.0.7

Change-Id: I530de6f43ce6fd6897ef5d6bf65dd6e296f50219
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
3 years agoRemove Ryan Goulding from committers 50/95050/1
Robert Varga [Fri, 5 Feb 2021 17:08:59 +0000 (18:08 +0100)]
Remove Ryan Goulding from committers

Ryan has been inactive in this project since 15.5.2018, i.e. more
than 32 months. Remove him from committers on grounds of inactivity.

Change-Id: I7fc68e5d21d24a2e5bb04545f1db57580a9c8b78
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
3 years agoBump versions to 0.13.2-SNAPSHOT 33/95033/1
Robert Varga [Fri, 5 Feb 2021 08:01:44 +0000 (09:01 +0100)]
Bump versions to 0.13.2-SNAPSHOT

This starts the next development iteration.

Change-Id: I7310e77f7225c307abb3743a7061bba3ae4bd594
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
3 years agoBump controller to 3.0.6 32/95032/1
Robert Varga [Fri, 5 Feb 2021 07:39:50 +0000 (08:39 +0100)]
Bump controller to 3.0.6

Use released version of the snapshots we've been using.

Change-Id: I2e512123765412437a2a9a1210cea9ebe349f32e
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
3 years agoBump controller to 3.0.6-SNAPSHOT 69/94969/1
Robert Varga [Tue, 2 Feb 2021 19:45:50 +0000 (20:45 +0100)]
Bump controller to 3.0.6-SNAPSHOT

We have an incoming integration, switch to its snapshot so it can
test with autorelease on our snapshots.

JIRA: CONTROLLER-1962
Change-Id: I631dd40be87277ec9b9ddddc939fbbcfd4dc7e04
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
3 years agoBump versions to 0.13.1-SNAPSHOT 99/94899/1
Robert Varga [Sat, 30 Jan 2021 19:10:20 +0000 (20:10 +0100)]
Bump versions to 0.13.1-SNAPSHOT

This starts the next development iteration.

Change-Id: I3bd1938363aac60c3a0950b10d6a565485badafe
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
3 years agoAdjust odlparent version range 90/94890/1
Robert Varga [Sat, 30 Jan 2021 09:07:10 +0000 (10:07 +0100)]
Adjust odlparent version range

We are using odlparent-8.1.x, reflect that in the dependencies.

Change-Id: I9bf28bd4b5e354feec3c0b2233b1024d15450cb8
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
3 years agoBump MRI upstreams 09/94709/5
Robert Varga [Thu, 21 Jan 2021 16:50:45 +0000 (17:50 +0100)]
Bump MRI upstreams

Adopt following versions:
- odlparent-8.1.0
- infrautils-1.9.5
- yangtools-6.0.4
- mdsal-7.0.5
- controller-3.0.5

Change-Id: Id1ece586d61dbf3957e67fb04868c24883172df1
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
3 years agoBump MRI upstreams 08/94508/2
Robert Varga [Fri, 8 Jan 2021 20:43:03 +0000 (21:43 +0100)]
Bump MRI upstreams

Adopt following versions:
- odlparent-8.0.3
- infrautils-1.9.4
- yangtools-6.0.3
- mdsal-7.0.4
- controller-3.0.4

Change-Id: I95bbf6ad8899a6fc3e1b7e43d19bec8fa4e4e1ab
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
3 years agoFix various warnings 02/94402/2
Robert Varga [Mon, 4 Jan 2021 13:04:33 +0000 (14:04 +0100)]
Fix various warnings

Cleanup isFoo() callers and perform some drive-by cleanups.

Change-Id: I5c6f6330d9156e9d3804b5e9fe6e212b7f5f3d7d
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
3 years agoBump MRI upstreams 45/94145/5
Robert Varga [Thu, 10 Dec 2020 12:40:01 +0000 (13:40 +0100)]
Bump MRI upstreams

Adopt following versions:
- odlparent-8.0.2
- infrautils-1.9.3
- yangtools-6.0.2
- mdsal-7.0.3
- controller-3.0.3

Change-Id: I96985729c2d54fe69d8494e7012772d8013d6e8e
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
3 years agoMerge changes Ia8d45fdf,I3b4dbc83,I0219f104
Robert Varga [Fri, 6 Nov 2020 15:38:36 +0000 (15:38 +0000)]
Merge changes Ia8d45fdf,I3b4dbc83,I0219f104

* changes:
  Add @Singleton/@Inject to IdmLightProxy
  Use StandardCharsets.UTF_8
  Convert ODLAuthenticator into a component

3 years agoAdd @Singleton/@Inject to IdmLightProxy 29/93629/1
Robert Varga [Fri, 6 Nov 2020 15:13:26 +0000 (16:13 +0100)]
Add @Singleton/@Inject to IdmLightProxy

This is a component, make sure it is tagged as such.

JIRA: AAA-209
Change-Id: Ia8d45fdfa932e14935faf4b9b518ab34e0d981b0
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
3 years agoUse StandardCharsets.UTF_8 28/93628/1
Robert Varga [Fri, 6 Nov 2020 15:01:21 +0000 (16:01 +0100)]
Use StandardCharsets.UTF_8

Let's not lookup the charset, just use a constant.

Change-Id: I3b4dbc83a5d574433822b292c47e9566ec7dca8e
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
3 years agoConvert ODLAuthenticator into a component 19/93619/4
Tomas Cere [Fri, 6 Nov 2020 11:29:13 +0000 (12:29 +0100)]
Convert ODLAuthenticator into a component

ODLAuthenticator does not have any dependencies, convert it to
a Singleton/Component.

JIRA: AAA-210
Change-Id: I0219f104926f43dcd73b77f9794e3d80fc5f9f8e
Signed-off-by: Tomas Cere <tomas.cere@pantheon.tech>
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>