Skip to content

Commit a7dc7bf

Browse files
bstoppbstopp
authored
OAuth2 Support (#166)
 * OAuth2 support added * with full backward compatibility * all services APIs are left unchanged (JWT can still be used) * the `Workspace` can now hold either the `JWT` or `OAuth` context * the `ImsService` is augmented with a new `getOAuthAccessToken()` * a new `AuthInterceptor` interface was added, with 2 implementations: * the now deprecated `JWTAuthInterceptor` * the new `OAuthInterceptor` * improve unit tests * better coverage * Add Mockito * move away from mocking server calls * Update to JUnit Jupiter as well as a few other libraries * commons-text.version 1.10.0 * commons-lang3.version 3.13.0 * junit.version 5.10.0 * mockito.version 5.4.0 * slf4j.version 2.0.7 * jackson.version 2.15.2 * jjwt.version 0.11.5 * feign.version 12.4 * Update all maven plugins * various clean up * Remove a few unneeded dependencies * Update Copyright year * update `aio-lib-java` version from `1.0.X` to `1.1.X`
1 parent 1003a12 commit a7dc7bf

File tree

71 files changed

+2322
-921
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

71 files changed

+2322
-921
lines changed

‎.github/dependabot.yml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@ updates:
55
schedule:
66
interval: "weekly"
77
ignore:
8-
- dependency-name: "jacoco-maven-plugin"
9-
versions: ["0.8.x"]
108
- dependency-name: "org.osgi.service.component.annotations"
119
versions: ["1.x"]
1210
- dependency-name: "org.osgi.service.component"

‎aem/aio_aem_events/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<groupId>com.adobe.aio.aem</groupId>
2323
<artifactId>aio-aem</artifactId>
2424
<relativePath>../pom.xml</relativePath>
25-
<version>1.0.19-SNAPSHOT</version>
25+
<version>1.1.0-SNAPSHOT</version>
2626
</parent>
2727

2828
<artifactId>aio-aem-events</artifactId>

‎aem/core_aem/pom.xml‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<groupId>com.adobe.aio.aem</groupId>
2020
<artifactId>aio-aem</artifactId>
2121
<relativePath>../pom.xml</relativePath>
22-
<version>1.0.19-SNAPSHOT</version>
22+
<version>1.1.0-SNAPSHOT</version>
2323
</parent>
2424

2525
<artifactId>aio-aem-core</artifactId>
@@ -52,15 +52,6 @@
5252
<artifactId>jackson-databind</artifactId>
5353
</dependency>
5454

55-
<!-- test -->
56-
<dependency>
57-
<groupId>junit</groupId>
58-
<artifactId>junit</artifactId>
59-
</dependency>
60-
<dependency>
61-
<groupId>org.slf4j</groupId>
62-
<artifactId>slf4j-simple</artifactId>
63-
</dependency>
6455
</dependencies>
6556

6657
<profiles>

‎aem/events_ingress_aem/pom.xml‎

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<groupId>com.adobe.aio.aem</groupId>
2020
<artifactId>aio-aem</artifactId>
2121
<relativePath>../pom.xml</relativePath>
22-
<version>1.0.19-SNAPSHOT</version>
22+
<version>1.1.0-SNAPSHOT</version>
2323
</parent>
2424

2525
<artifactId>aio-aem-events-publish</artifactId>
@@ -51,16 +51,6 @@
5151
<scope>provided</scope>
5252
<version>${project.version}</version>
5353
</dependency>
54-
55-
<!-- test -->
56-
<dependency>
57-
<artifactId>junit</artifactId>
58-
<groupId>junit</groupId>
59-
</dependency>
60-
<dependency>
61-
<artifactId>slf4j-simple</artifactId>
62-
<groupId>org.slf4j</groupId>
63-
</dependency>
6454
</dependencies>
6555

6656
<profiles>

‎aem/events_mgmt_aem/pom.xml‎

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<groupId>com.adobe.aio.aem</groupId>
2020
<artifactId>aio-aem</artifactId>
2121
<relativePath>../pom.xml</relativePath>
22-
<version>1.0.19-SNAPSHOT</version>
22+
<version>1.1.0-SNAPSHOT</version>
2323
</parent>
2424

2525
<artifactId>aio-aem-events-mgmt</artifactId>
@@ -39,16 +39,6 @@
3939
<scope>provided</scope>
4040
<version>${project.version}</version>
4141
</dependency>
42-
43-
<!-- test -->
44-
<dependency>
45-
<artifactId>junit</artifactId>
46-
<groupId>junit</groupId>
47-
</dependency>
48-
<dependency>
49-
<artifactId>slf4j-simple</artifactId>
50-
<groupId>org.slf4j</groupId>
51-
</dependency>
5242
</dependencies>
5343

5444
<profiles>

‎aem/events_osgi_mapping/pom.xml‎

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<groupId>com.adobe.aio.aem</groupId>
2020
<artifactId>aio-aem</artifactId>
2121
<relativePath>../pom.xml</relativePath>
22-
<version>1.0.19-SNAPSHOT</version>
22+
<version>1.1.0-SNAPSHOT</version>
2323
</parent>
2424

2525
<artifactId>aio-aem-events-osgi-mapping</artifactId>
@@ -58,17 +58,6 @@
5858
<scope>provided</scope>
5959
<version>${project.version}</version>
6060
</dependency>
61-
62-
63-
<!-- test -->
64-
<dependency>
65-
<artifactId>junit</artifactId>
66-
<groupId>junit</groupId>
67-
</dependency>
68-
<dependency>
69-
<artifactId>slf4j-simple</artifactId>
70-
<groupId>org.slf4j</groupId>
71-
</dependency>
7261
</dependencies>
7362

7463
<profiles>

‎aem/lib_osgi/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<groupId>com.adobe.aio.aem</groupId>
1818
<artifactId>aio-aem</artifactId>
1919
<relativePath>../pom.xml</relativePath>
20-
<version>1.0.19-SNAPSHOT</version>
20+
<version>1.1.0-SNAPSHOT</version>
2121
</parent>
2222

2323
<artifactId>aio-lib-osgi</artifactId>

‎aem/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<groupId>com.adobe.aio</groupId>
2020
<artifactId>aio-lib-java</artifactId>
2121
<relativePath>../pom.xml</relativePath>
22-
<version>1.0.19-SNAPSHOT</version>
22+
<version>1.1.0-SNAPSHOT</version>
2323
</parent>
2424

2525
<groupId>com.adobe.aio.aem</groupId>

‎copyright_header.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright 2017 Adobe. All rights reserved.
1+
Copyright 2023 Adobe. All rights reserved.
22
This file is licensed to you under the Apache License, Version 2.0 (the "License");
33
you may not use this file except in compliance with the License. You may obtain a copy
44
of the License at http://www.apache.org/licenses/LICENSE-2.0

‎core/pom.xml‎

Lines changed: 24 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<parent>
1818
<groupId>com.adobe.aio</groupId>
1919
<artifactId>aio-lib-java</artifactId>
20-
<version>1.0.19-SNAPSHOT</version>
20+
<version>1.1.0-SNAPSHOT</version>
2121
<relativePath>../pom.xml</relativePath>
2222
</parent>
2323
<modelVersion>4.0.0</modelVersion>
@@ -38,6 +38,19 @@
3838
<artifactId>jackson-databind</artifactId>
3939
</dependency>
4040

41+
<dependency>
42+
<groupId>com.fasterxml.jackson.datatype</groupId>
43+
<artifactId>jackson-datatype-jdk8</artifactId>
44+
<version>${jackson.version}</version>
45+
</dependency>
46+
<!-- Java 8 Date/time -->
47+
<dependency>
48+
<groupId>com.fasterxml.jackson.datatype</groupId>
49+
<artifactId>jackson-datatype-jsr310</artifactId>
50+
<version>${jackson.version}</version>
51+
</dependency>
52+
53+
4154
<dependency>
4255
<groupId>io.github.openfeign</groupId>
4356
<artifactId>feign-core</artifactId>
@@ -64,8 +77,16 @@
6477
</dependency>
6578

6679
<dependency>
67-
<groupId>junit</groupId>
68-
<artifactId>junit</artifactId>
80+
<groupId>org.junit.jupiter</groupId>
81+
<artifactId>junit-jupiter</artifactId>
82+
</dependency>
83+
<dependency>
84+
<groupId>org.mockito</groupId>
85+
<artifactId>mockito-core</artifactId>
86+
</dependency>
87+
<dependency>
88+
<groupId>org.mockito</groupId>
89+
<artifactId>mockito-junit-jupiter</artifactId>
6990
</dependency>
7091
<dependency>
7192
<groupId>org.slf4j</groupId>

0 commit comments

Comments
 (0)