Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
be78141
Update Copyright year.
bstopp Aug 3, 2023
cc1b8a0
Use JUnit Jupiter
bstopp Aug 3, 2023
3317b6a
Add Mockito and some tests.
bstopp Aug 3, 2023
3130660
Upgrade to JUnit Jupiter.
bstopp Aug 3, 2023
236d5dc
Extract JWT context/credentials
bstopp Aug 3, 2023
56974cb
Add OAuthContext support.
bstopp Aug 3, 2023
ce631a1
Move test utilty to test folder.
bstopp Aug 4, 2023
fedb0e0
Use mockserver for validating API calls.
bstopp Aug 4, 2023
70c94b7
Add test cases and modify under-the-hood for JWT deprecation.
bstopp Aug 4, 2023
2f34fb5
Add OAuth API.
bstopp Aug 7, 2023
af95cf5
Some clean up.
bstopp Aug 7, 2023
80385c5
Add test cases for JWT Interceptor.
bstopp Aug 7, 2023
bf71392
Update to JUnit Jupiter.
bstopp Aug 15, 2023
b9a2de2
Update to JUnit Jupiter.
bstopp Aug 15, 2023
3c234f8
Update to JUnit Jupiter & move away from mocking server calls
bstopp Aug 15, 2023
4bc67b2
Build test jar for WorkflowUtil
bstopp Aug 15, 2023
5d1e40a
Remove network requirement for tests.
bstopp Aug 16, 2023
284c3ae
update to JUnit Jupiter, and use test library.
bstopp Aug 16, 2023
2f374b8
Fix Pom order.
bstopp Aug 16, 2023
310a982
Upgrade to JUnit Jupiter
bstopp Aug 16, 2023
9508b84
Need Java8 support.
bstopp Aug 16, 2023
81a0780
Bring versions up-to-date
bstopp Aug 16, 2023
af8d525
Update all plugins.
bstopp Aug 16, 2023
c30f72a
Expect exception at correct spot.
bstopp Aug 17, 2023
8dc5a5e
Add tests for fetching public keys.
bstopp Aug 17, 2023
2efef37
Remove Java11 feature.
bstopp Aug 17, 2023
e0c0f9b
not using JMockit
bstopp Aug 17, 2023
6f87de9
Remove unneded dependency
bstopp Aug 17, 2023
bace0ff
Bump version to next minor release, API changed.
bstopp Aug 17, 2023
7db2de1
Bump all module versions
bstopp Aug 21, 2023
9fa7ee6
Remove Java11 Deprecated API reference.
bstopp Aug 21, 2023
bb57240
Abstract the type of token from interceptor consumers.
bstopp Aug 21, 2023
1b3ea47
Some proposal for better Backward compatibility (#167)
francoisledroff Aug 22, 2023
e1e6e36
Remove tests jar dep as not needed anymore.
bstopp Aug 22, 2023
f98e8ed
Let's stick to the old CloudEvents v1 spec and package for now (#168)
francoisledroff Aug 23, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@ updates:
schedule:
interval: "weekly"
ignore:
- dependency-name: "jacoco-maven-plugin"
versions: ["0.8.x"]
- dependency-name: "org.osgi.service.component.annotations"
versions: ["1.x"]
- dependency-name: "org.osgi.service.component"
Expand Down
2 changes: 1 addition & 1 deletion aem/aio_aem_events/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<groupId>com.adobe.aio.aem</groupId>
<artifactId>aio-aem</artifactId>
<relativePath>../pom.xml</relativePath>
<version>1.0.19-SNAPSHOT</version>
<version>1.1.0-SNAPSHOT</version>
</parent>

<artifactId>aio-aem-events</artifactId>
Expand Down
11 changes: 1 addition & 10 deletions aem/core_aem/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<groupId>com.adobe.aio.aem</groupId>
<artifactId>aio-aem</artifactId>
<relativePath>../pom.xml</relativePath>
<version>1.0.19-SNAPSHOT</version>
<version>1.1.0-SNAPSHOT</version>
</parent>

<artifactId>aio-aem-core</artifactId>
Expand Down Expand Up @@ -52,15 +52,6 @@
<artifactId>jackson-databind</artifactId>
</dependency>

<!-- test -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
</dependency>
</dependencies>

<profiles>
Expand Down
12 changes: 1 addition & 11 deletions aem/events_ingress_aem/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<groupId>com.adobe.aio.aem</groupId>
<artifactId>aio-aem</artifactId>
<relativePath>../pom.xml</relativePath>
<version>1.0.19-SNAPSHOT</version>
<version>1.1.0-SNAPSHOT</version>
</parent>

<artifactId>aio-aem-events-publish</artifactId>
Expand Down Expand Up @@ -51,16 +51,6 @@
<scope>provided</scope>
<version>${project.version}</version>
</dependency>

<!-- test -->
<dependency>
<artifactId>junit</artifactId>
<groupId>junit</groupId>
</dependency>
<dependency>
<artifactId>slf4j-simple</artifactId>
<groupId>org.slf4j</groupId>
</dependency>
</dependencies>

<profiles>
Expand Down
12 changes: 1 addition & 11 deletions aem/events_mgmt_aem/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<groupId>com.adobe.aio.aem</groupId>
<artifactId>aio-aem</artifactId>
<relativePath>../pom.xml</relativePath>
<version>1.0.19-SNAPSHOT</version>
<version>1.1.0-SNAPSHOT</version>
</parent>

<artifactId>aio-aem-events-mgmt</artifactId>
Expand All @@ -39,16 +39,6 @@
<scope>provided</scope>
<version>${project.version}</version>
</dependency>

<!-- test -->
<dependency>
<artifactId>junit</artifactId>
<groupId>junit</groupId>
</dependency>
<dependency>
<artifactId>slf4j-simple</artifactId>
<groupId>org.slf4j</groupId>
</dependency>
</dependencies>

<profiles>
Expand Down
13 changes: 1 addition & 12 deletions aem/events_osgi_mapping/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<groupId>com.adobe.aio.aem</groupId>
<artifactId>aio-aem</artifactId>
<relativePath>../pom.xml</relativePath>
<version>1.0.19-SNAPSHOT</version>
<version>1.1.0-SNAPSHOT</version>
</parent>

<artifactId>aio-aem-events-osgi-mapping</artifactId>
Expand Down Expand Up @@ -58,17 +58,6 @@
<scope>provided</scope>
<version>${project.version}</version>
</dependency>


<!-- test -->
<dependency>
<artifactId>junit</artifactId>
<groupId>junit</groupId>
</dependency>
<dependency>
<artifactId>slf4j-simple</artifactId>
<groupId>org.slf4j</groupId>
</dependency>
</dependencies>

<profiles>
Expand Down
2 changes: 1 addition & 1 deletion aem/lib_osgi/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<groupId>com.adobe.aio.aem</groupId>
<artifactId>aio-aem</artifactId>
<relativePath>../pom.xml</relativePath>
<version>1.0.19-SNAPSHOT</version>
<version>1.1.0-SNAPSHOT</version>
</parent>

<artifactId>aio-lib-osgi</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion aem/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<groupId>com.adobe.aio</groupId>
<artifactId>aio-lib-java</artifactId>
<relativePath>../pom.xml</relativePath>
<version>1.0.19-SNAPSHOT</version>
<version>1.1.0-SNAPSHOT</version>
</parent>

<groupId>com.adobe.aio.aem</groupId>
Expand Down
2 changes: 1 addition & 1 deletion copyright_header.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright 2017 Adobe. All rights reserved.
Copyright 2023 Adobe. All rights reserved.
This file is licensed to you under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License. You may obtain a copy
of the License at http://www.apache.org/licenses/LICENSE-2.0
Expand Down
27 changes: 24 additions & 3 deletions core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<parent>
<groupId>com.adobe.aio</groupId>
<artifactId>aio-lib-java</artifactId>
<version>1.0.19-SNAPSHOT</version>
<version>1.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand All @@ -38,6 +38,19 @@
<artifactId>jackson-databind</artifactId>
</dependency>

<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-jdk8</artifactId>
<version>${jackson.version}</version>
</dependency>
<!-- Java 8 Date/time -->
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-jsr310</artifactId>
<version>${jackson.version}</version>
</dependency>


<dependency>
<groupId>io.github.openfeign</groupId>
<artifactId>feign-core</artifactId>
Expand All @@ -64,8 +77,16 @@
</dependency>

<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-junit-jupiter</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
Expand Down
36 changes: 36 additions & 0 deletions core/src/main/java/com/adobe/aio/auth/Context.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
/*
* Copyright 2023 Adobe. All rights reserved.
* This file is licensed to you under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. You may obtain a copy
* of the License at http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software distributed under
* the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
* OF ANY KIND, either express or implied. See the License for the specific language
* governing permissions and limitations under the License.
*/
package com.adobe.aio.auth;

/**
* Represents an Authentication context to Adobe IMS.
*
* @since 1.1
*/
public interface Context {

/**
* Property name used in maps and config files for setting the AIO IMS URL.
*/
public static final String IMS_URL = "aio_ims_url";
/**
* Property name used in maps and config files for setting the AIO IMS Org Id.
*/
public static final String IMS_ORG_ID = "aio_ims_org_id";

/**
* Validates this context is minimally populated and able to function.
*
* @throws IllegalStateException if this context is not valid for use for generating access tokens
*/
default void validate() throws IllegalStateException {}
}
Loading