upgrading to java17, cloudevents latest version#228

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
abhupadh wants to merge 6 commits into
base:main
Choose a base branch
from
Open

upgrading to java17, cloudevents latest version #228

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
39db8b2
upgrading to java17, cloudevents latest version
abhupadh Mar 6, 2025
572e199
adding license header
abhupadh Mar 6, 2025
e84f396
upgrading aio-lib-java version to 3.0.0 as major release for java17 u…
abhupadh Mar 6, 2025
38a4d18
minor refactoring
abhupadh Mar 7, 2025
52c8f90
review comment
abhupadh Mar 7, 2025
4478d8c
using correct snapshot version for aio-lib-java in all child modules
abhupadh Mar 13, 2025
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: 1 addition & 1 deletion aem/aio_aem_events/pom.xml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@
<groupId>com.adobe.aio.aem</groupId>
<artifactId>aio-aem</artifactId>
<relativePath>../pom.xml</relativePath>
<version>2.0.1-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
</parent>

<artifactId>aio-aem-events</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion aem/core_aem/pom.xml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,7 @@
<groupId>com.adobe.aio.aem</groupId>
<artifactId>aio-aem</artifactId>
<relativePath>../pom.xml</relativePath>
<version>2.0.1-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
</parent>

<artifactId>aio-aem-core</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion aem/events_ingress_aem/pom.xml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,7 @@
<groupId>com.adobe.aio.aem</groupId>
<artifactId>aio-aem</artifactId>
<relativePath>../pom.xml</relativePath>
<version>2.0.1-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
</parent>

<artifactId>aio-aem-events-publish</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion aem/events_mgmt_aem/pom.xml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,7 @@
<groupId>com.adobe.aio.aem</groupId>
<artifactId>aio-aem</artifactId>
<relativePath>../pom.xml</relativePath>
<version>2.0.1-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
</parent>

<artifactId>aio-aem-events-mgmt</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion aem/events_osgi_mapping/pom.xml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,7 @@
<groupId>com.adobe.aio.aem</groupId>
<artifactId>aio-aem</artifactId>
<relativePath>../pom.xml</relativePath>
<version>2.0.1-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
</parent>

<artifactId>aio-aem-events-osgi-mapping</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion aem/lib_osgi/pom.xml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@
<groupId>com.adobe.aio.aem</groupId>
<artifactId>aio-aem</artifactId>
<relativePath>../pom.xml</relativePath>
<version>2.0.1-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
</parent>

<artifactId>aio-lib-osgi</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion aem/pom.xml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,7 @@
<groupId>com.adobe.aio</groupId>
<artifactId>aio-lib-java</artifactId>
<relativePath>../pom.xml</relativePath>
<version>2.0.1-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
</parent>

<groupId>com.adobe.aio.aem</groupId>
Expand Down
2 changes: 1 addition & 1 deletion core/pom.xml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@
<parent>
<groupId>com.adobe.aio</groupId>
<artifactId>aio-lib-java</artifactId>
<version>2.0.1-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
35 changes: 35 additions & 0 deletions core/src/main/java/com/adobe/aio/cloudevents/ZonedDateTimeDeserializer.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
/*
* 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.cloudevents;

import com.fasterxml.jackson.core.JacksonException;
import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.databind.DeserializationContext;
import com.fasterxml.jackson.databind.JsonDeserializer;
import java.io.IOException;
import java.time.DateTimeException;
import java.time.ZonedDateTime;
import java.time.format.DateTimeFormatter;

public class ZonedDateTimeDeserializer extends JsonDeserializer<ZonedDateTime> {

@Override
public ZonedDateTime deserialize(
JsonParser jsonParser, DeserializationContext deserializationContext)
throws IOException, JacksonException {
try {
return ZonedDateTime.parse(jsonParser.getText(), DateTimeFormatter.ISO_OFFSET_DATE_TIME);
} catch (DateTimeException e) {
throw new IllegalArgumentException("could not parse", e);
}
}
}
31 changes: 31 additions & 0 deletions core/src/main/java/com/adobe/aio/cloudevents/ZonedDateTimeSerializer.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
/*
* 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.cloudevents;

import com.fasterxml.jackson.core.JsonGenerator;
import com.fasterxml.jackson.databind.JsonSerializer;
import com.fasterxml.jackson.databind.SerializerProvider;
import java.io.IOException;
import java.time.ZonedDateTime;
import java.time.format.DateTimeFormatter;

public class ZonedDateTimeSerializer extends JsonSerializer<ZonedDateTime> {

@Override
public void serialize(
ZonedDateTime zonedDateTime,
JsonGenerator jsonGenerator,
SerializerProvider serializerProvider)
throws IOException {
jsonGenerator.writeString(zonedDateTime.format(DateTimeFormatter.ISO_OFFSET_DATE_TIME));
}
}
4 changes: 2 additions & 2 deletions core/src/main/java/com/adobe/aio/util/JacksonUtil.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,8 @@
*/
package com.adobe.aio.util;

import com.adobe.aio.cloudevents.ZonedDateTimeDeserializer;
import com.adobe.aio.cloudevents.ZonedDateTimeSerializer;
import com.fasterxml.jackson.annotation.JsonInclude.Include;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.DeserializationFeature;
Expand All@@ -20,8 +22,6 @@
import com.fasterxml.jackson.databind.module.SimpleModule;
import com.fasterxml.jackson.databind.node.TextNode;
import com.fasterxml.jackson.datatype.jdk8.Jdk8Module;
import io.cloudevents.json.ZonedDateTimeDeserializer;
import io.cloudevents.json.ZonedDateTimeSerializer;
import io.openapitools.jackson.dataformat.hal.JacksonHALModule;
import java.time.ZonedDateTime;
import org.apache.commons.lang3.StringUtils;
Expand Down
2 changes: 1 addition & 1 deletion events_ingress/pom.xml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@
<parent>
<groupId>com.adobe.aio</groupId>
<artifactId>aio-lib-java</artifactId>
<version>2.0.1-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion events_journal/pom.xml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@
<parent>
<groupId>com.adobe.aio</groupId>
<artifactId>aio-lib-java</artifactId>
<version>2.0.1-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion events_mgmt/pom.xml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@
<parent>
<groupId>com.adobe.aio</groupId>
<artifactId>aio-lib-java</artifactId>
<version>2.0.1-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion events_test/pom.xml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@
<parent>
<groupId>com.adobe.aio</groupId>
<artifactId>aio-lib-java</artifactId>
<version>2.0.1-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion events_webhook/pom.xml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@
<parent>
<groupId>com.adobe.aio</groupId>
<artifactId>aio-lib-java</artifactId>
<version>2.0.1-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
15 changes: 6 additions & 9 deletions events_webhook/src/test/java/com/adobe/aio/event/webhook/feign/FeignPubKeyServiceTest.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,20 @@
package com.adobe.aio.event.webhook.feign;

import java.io.File;
import java.security.KeyFactory;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.mockserver.model.HttpRequest.request;
import static org.mockserver.model.HttpResponse.response;

import java.security.KeyPair;
import java.security.KeyPairGenerator;
import java.security.PublicKey;

import javax.crypto.KeyGenerator;

import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockserver.client.MockServerClient;
import org.mockserver.junit.jupiter.MockServerExtension;
import shaded_package.org.apache.commons.codec.binary.Base64;

import static org.junit.jupiter.api.Assertions.*;
import static org.mockserver.model.HttpRequest.*;
import static org.mockserver.model.HttpResponse.*;

@ExtendWith(MockServerExtension.class)
public class FeignPubKeyServiceTest {

Expand Down
2 changes: 1 addition & 1 deletion events_xdm/pom.xml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@
<parent>
<groupId>com.adobe.aio</groupId>
<artifactId>aio-lib-java</artifactId>
<version>2.0.1-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion ims/pom.xml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@
<parent>
<groupId>com.adobe.aio</groupId>
<artifactId>aio-lib-java</artifactId>
<version>2.0.1-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
16 changes: 8 additions & 8 deletions pom.xml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,7 @@

<groupId>com.adobe.aio</groupId>
<artifactId>aio-lib-java</artifactId>
<version>2.0.1-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
<packaging>pom</packaging>

<modules>
Expand DownExpand Up@@ -96,15 +96,15 @@

<jacoco.version>0.8.10</jacoco.version>

<commons-text.version>1.10.0</commons-text.version>
<commons-text.version>1.13.0</commons-text.version>
<commons-lang3.version>3.13.0</commons-lang3.version>
<junit.version>5.10.0</junit.version>
<mockito.version>5.4.0</mockito.version>
<slf4j.version>1.7.6</slf4j.version>
<jackson.version>2.13.4</jackson.version>
<mockito.version>5.11.0</mockito.version>
<slf4j.version>2.0.12</slf4j.version>
<jackson.version>2.17.2</jackson.version>
<jjwt.version>0.11.5</jjwt.version>

<cloudevents.version>1.2.0</cloudevents.version>
<cloudevents.version>4.0.1</cloudevents.version>
<!-- we'll stick to this CloudEvents v1 version for now -->

<!-- https://github.com/openapi-tools/jackson-dataformat-hal/blob/v1.0.9/pom.xml -->
Expand DownExpand Up@@ -259,8 +259,8 @@
<version>[3.3.9,)</version>
</requireMavenVersion>
<requireJavaVersion>
<message>Maven must be executed with a Java 8 JRE or higher.</message>
<version>1.8.0</version>
<message>Maven must be executed with a Java 17 JRE or higher.</message>
<version>1.17.0</version>
</requireJavaVersion>
</rules>
</configuration>
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
upgrading to java17, cloudevents latest version#228

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

abhupadh
wants to merge
6
commits into

base:main
Choose a base branch

from

 Open


upgrading to java17, cloudevents latest version
#228
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
39db8b2

upgrading to java17, cloudevents latest version


abhupadh Mar 6, 2025
572e199

adding license header


abhupadh Mar 6, 2025
e84f396

upgrading aio-lib-java version to 3.0.0 as major release for java17 u…


abhupadh Mar 6, 2025
38a4d18

minor refactoring


abhupadh Mar 7, 2025
52c8f90

review comment


abhupadh Mar 7, 2025
4478d8c

using correct snapshot version for aio-lib-java in all child modules


abhupadh Mar 13, 2025

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: 1 addition & 1 deletion
aem/aio_aem_events/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@
 <groupId>com.adobe.aio.aem</groupId>
 <artifactId>aio-aem</artifactId>
 <relativePath>../pom.xml</relativePath>
 <version>2.0.1-SNAPSHOT</version>
 <version>3.0.0-SNAPSHOT</version>
 </parent>

 <artifactId>aio-aem-events</artifactId>
Expand Down

2 changes: 1 addition & 1 deletion
aem/core_aem/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,7 @@
 <groupId>com.adobe.aio.aem</groupId>
 <artifactId>aio-aem</artifactId>
 <relativePath>../pom.xml</relativePath>
 <version>2.0.1-SNAPSHOT</version>
 <version>3.0.0-SNAPSHOT</version>
 </parent>

 <artifactId>aio-aem-core</artifactId>
Expand Down

2 changes: 1 addition & 1 deletion
aem/events_ingress_aem/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,7 @@
 <groupId>com.adobe.aio.aem</groupId>
 <artifactId>aio-aem</artifactId>
 <relativePath>../pom.xml</relativePath>
 <version>2.0.1-SNAPSHOT</version>
 <version>3.0.0-SNAPSHOT</version>
 </parent>

 <artifactId>aio-aem-events-publish</artifactId>
Expand Down

2 changes: 1 addition & 1 deletion
aem/events_mgmt_aem/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,7 @@
 <groupId>com.adobe.aio.aem</groupId>
 <artifactId>aio-aem</artifactId>
 <relativePath>../pom.xml</relativePath>
 <version>2.0.1-SNAPSHOT</version>
 <version>3.0.0-SNAPSHOT</version>
 </parent>

 <artifactId>aio-aem-events-mgmt</artifactId>
Expand Down

2 changes: 1 addition & 1 deletion
aem/events_osgi_mapping/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,7 @@
 <groupId>com.adobe.aio.aem</groupId>
 <artifactId>aio-aem</artifactId>
 <relativePath>../pom.xml</relativePath>
 <version>2.0.1-SNAPSHOT</version>
 <version>3.0.0-SNAPSHOT</version>
 </parent>

 <artifactId>aio-aem-events-osgi-mapping</artifactId>
Expand Down

2 changes: 1 addition & 1 deletion
aem/lib_osgi/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@
 <groupId>com.adobe.aio.aem</groupId>
 <artifactId>aio-aem</artifactId>
 <relativePath>../pom.xml</relativePath>
 <version>2.0.1-SNAPSHOT</version>
 <version>3.0.0-SNAPSHOT</version>
 </parent>

 <artifactId>aio-lib-osgi</artifactId>
Expand Down

2 changes: 1 addition & 1 deletion
aem/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,7 @@
 <groupId>com.adobe.aio</groupId>
 <artifactId>aio-lib-java</artifactId>
 <relativePath>../pom.xml</relativePath>
 <version>2.0.1-SNAPSHOT</version>
 <version>3.0.0-SNAPSHOT</version>
 </parent>

 <groupId>com.adobe.aio.aem</groupId>
Expand Down

2 changes: 1 addition & 1 deletion
core/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@
 <parent>
 <groupId>com.adobe.aio</groupId>
 <artifactId>aio-lib-java</artifactId>
 <version>2.0.1-SNAPSHOT</version>
 <version>3.0.0-SNAPSHOT</version>
 <relativePath>../pom.xml</relativePath>
 </parent>
 <modelVersion>4.0.0</modelVersion>
Expand Down

35 changes: 35 additions & 0 deletions
core/src/main/java/com/adobe/aio/cloudevents/ZonedDateTimeDeserializer.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
/*
 * 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.cloudevents;

import com.fasterxml.jackson.core.JacksonException;
import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.databind.DeserializationContext;
import com.fasterxml.jackson.databind.JsonDeserializer;
import java.io.IOException;
import java.time.DateTimeException;
import java.time.ZonedDateTime;
import java.time.format.DateTimeFormatter;

public class ZonedDateTimeDeserializer extends JsonDeserializer<ZonedDateTime> {

 @Override
 public ZonedDateTime deserialize(
 JsonParser jsonParser, DeserializationContext deserializationContext)
 throws IOException, JacksonException {
 try {
 return ZonedDateTime.parse(jsonParser.getText(), DateTimeFormatter.ISO_OFFSET_DATE_TIME);
 } catch (DateTimeException e) {
 throw new IllegalArgumentException("could not parse", e);
 }
 }
}

31 changes: 31 additions & 0 deletions
core/src/main/java/com/adobe/aio/cloudevents/ZonedDateTimeSerializer.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
/*
 * 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.cloudevents;

import com.fasterxml.jackson.core.JsonGenerator;
import com.fasterxml.jackson.databind.JsonSerializer;
import com.fasterxml.jackson.databind.SerializerProvider;
import java.io.IOException;
import java.time.ZonedDateTime;
import java.time.format.DateTimeFormatter;

public class ZonedDateTimeSerializer extends JsonSerializer<ZonedDateTime> {

 @Override
 public void serialize(
 ZonedDateTime zonedDateTime,
 JsonGenerator jsonGenerator,
 SerializerProvider serializerProvider)
 throws IOException {
 jsonGenerator.writeString(zonedDateTime.format(DateTimeFormatter.ISO_OFFSET_DATE_TIME));
 }
}

4 changes: 2 additions & 2 deletions
core/src/main/java/com/adobe/aio/util/JacksonUtil.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,8 @@
 */
package com.adobe.aio.util;

import com.adobe.aio.cloudevents.ZonedDateTimeDeserializer;
import com.adobe.aio.cloudevents.ZonedDateTimeSerializer;
import com.fasterxml.jackson.annotation.JsonInclude.Include;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.DeserializationFeature;
Expand All@@ -20,8 +22,6 @@
import com.fasterxml.jackson.databind.module.SimpleModule;
import com.fasterxml.jackson.databind.node.TextNode;
import com.fasterxml.jackson.datatype.jdk8.Jdk8Module;
import io.cloudevents.json.ZonedDateTimeDeserializer;
import io.cloudevents.json.ZonedDateTimeSerializer;
import io.openapitools.jackson.dataformat.hal.JacksonHALModule;
import java.time.ZonedDateTime;
import org.apache.commons.lang3.StringUtils;
Expand Down

2 changes: 1 addition & 1 deletion
events_ingress/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@
 <parent>
 <groupId>com.adobe.aio</groupId>
 <artifactId>aio-lib-java</artifactId>
 <version>2.0.1-SNAPSHOT</version>
 <version>3.0.0-SNAPSHOT</version>
 <relativePath>../pom.xml</relativePath>
 </parent>
 <modelVersion>4.0.0</modelVersion>
Expand Down

2 changes: 1 addition & 1 deletion
events_journal/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@
 <parent>
 <groupId>com.adobe.aio</groupId>
 <artifactId>aio-lib-java</artifactId>
 <version>2.0.1-SNAPSHOT</version>
 <version>3.0.0-SNAPSHOT</version>
 <relativePath>../pom.xml</relativePath>
 </parent>
 <modelVersion>4.0.0</modelVersion>
Expand Down

2 changes: 1 addition & 1 deletion
events_mgmt/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@
 <parent>
 <groupId>com.adobe.aio</groupId>
 <artifactId>aio-lib-java</artifactId>
 <version>2.0.1-SNAPSHOT</version>
 <version>3.0.0-SNAPSHOT</version>
 <relativePath>../pom.xml</relativePath>
 </parent>
 <modelVersion>4.0.0</modelVersion>
Expand Down

2 changes: 1 addition & 1 deletion
events_test/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@
 <parent>
 <groupId>com.adobe.aio</groupId>
 <artifactId>aio-lib-java</artifactId>
 <version>2.0.1-SNAPSHOT</version>
 <version>3.0.0-SNAPSHOT</version>
 <relativePath>../pom.xml</relativePath>
 </parent>
 <modelVersion>4.0.0</modelVersion>
Expand Down

2 changes: 1 addition & 1 deletion
events_webhook/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@
 <parent>
 <groupId>com.adobe.aio</groupId>
 <artifactId>aio-lib-java</artifactId>
 <version>2.0.1-SNAPSHOT</version>
 <version>3.0.0-SNAPSHOT</version>
 <relativePath>../pom.xml</relativePath>
 </parent>
 <modelVersion>4.0.0</modelVersion>
Expand Down

15 changes: 6 additions & 9 deletions
events_webhook/src/test/java/com/adobe/aio/event/webhook/feign/FeignPubKeyServiceTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,23 +1,20 @@
package com.adobe.aio.event.webhook.feign;

import java.io.File;
import java.security.KeyFactory;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.mockserver.model.HttpRequest.request;
import static org.mockserver.model.HttpResponse.response;

import java.security.KeyPair;
import java.security.KeyPairGenerator;
import java.security.PublicKey;

import javax.crypto.KeyGenerator;

import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockserver.client.MockServerClient;
import org.mockserver.junit.jupiter.MockServerExtension;
import shaded_package.org.apache.commons.codec.binary.Base64;

import static org.junit.jupiter.api.Assertions.*;
import static org.mockserver.model.HttpRequest.*;
import static org.mockserver.model.HttpResponse.*;

@ExtendWith(MockServerExtension.class)
public class FeignPubKeyServiceTest {

Expand Down

2 changes: 1 addition & 1 deletion
events_xdm/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@
 <parent>
 <groupId>com.adobe.aio</groupId>
 <artifactId>aio-lib-java</artifactId>
 <version>2.0.1-SNAPSHOT</version>
 <version>3.0.0-SNAPSHOT</version>
 <relativePath>../pom.xml</relativePath>
 </parent>
 <modelVersion>4.0.0</modelVersion>
Expand Down

2 changes: 1 addition & 1 deletion
ims/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@
 <parent>
 <groupId>com.adobe.aio</groupId>
 <artifactId>aio-lib-java</artifactId>
 <version>2.0.1-SNAPSHOT</version>
 <version>3.0.0-SNAPSHOT</version>
 <relativePath>../pom.xml</relativePath>
 </parent>
 <modelVersion>4.0.0</modelVersion>
Expand Down

16 changes: 8 additions & 8 deletions
pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,7 @@

 <groupId>com.adobe.aio</groupId>
 <artifactId>aio-lib-java</artifactId>
 <version>2.0.1-SNAPSHOT</version>
 <version>3.0.0-SNAPSHOT</version>
 <packaging>pom</packaging>

 <modules>
Expand DownExpand Up@@ -96,15 +96,15 @@

 <jacoco.version>0.8.10</jacoco.version>

 <commons-text.version>1.10.0</commons-text.version>
 <commons-text.version>1.13.0</commons-text.version>
 <commons-lang3.version>3.13.0</commons-lang3.version>
 <junit.version>5.10.0</junit.version>
 <mockito.version>5.4.0</mockito.version>
 <slf4j.version>1.7.6</slf4j.version>
 <jackson.version>2.13.4</jackson.version>
 <mockito.version>5.11.0</mockito.version>
 <slf4j.version>2.0.12</slf4j.version>
 <jackson.version>2.17.2</jackson.version>
 <jjwt.version>0.11.5</jjwt.version>

 <cloudevents.version>1.2.0</cloudevents.version>
 <cloudevents.version>4.0.1</cloudevents.version>
 <!-- we'll stick to this CloudEvents v1 version for now -->

 <!-- https://github.com/openapi-tools/jackson-dataformat-hal/blob/v1.0.9/pom.xml -->
Expand DownExpand Up@@ -259,8 +259,8 @@
 <version>[3.3.9,)</version>
 </requireMavenVersion>
 <requireJavaVersion>
 <message>Maven must be executed with a Java 8 JRE or higher.</message>
 <version>1.8.0</version>
 <message>Maven must be executed with a Java 17 JRE or higher.</message>
 <version>1.17.0</version>
 </requireJavaVersion>
 </rules>
 </configuration>
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
upgrading to java17, cloudevents latest version#228

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

abhupadh
wants to merge
6
commits into

base:main
Choose a base branch

from

 Open


upgrading to java17, cloudevents latest version
#228
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
39db8b2

upgrading to java17, cloudevents latest version


abhupadh Mar 6, 2025
572e199

adding license header


abhupadh Mar 6, 2025
e84f396

upgrading aio-lib-java version to 3.0.0 as major release for java17 u…


abhupadh Mar 6, 2025
38a4d18

minor refactoring


abhupadh Mar 7, 2025
52c8f90

review comment


abhupadh Mar 7, 2025
4478d8c

using correct snapshot version for aio-lib-java in all child modules


abhupadh Mar 13, 2025

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: 1 addition & 1 deletion
aem/aio_aem_events/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@
 <groupId>com.adobe.aio.aem</groupId>
 <artifactId>aio-aem</artifactId>
 <relativePath>../pom.xml</relativePath>
 <version>2.0.1-SNAPSHOT</version>
 <version>3.0.0-SNAPSHOT</version>
 </parent>

 <artifactId>aio-aem-events</artifactId>
Expand Down

2 changes: 1 addition & 1 deletion
aem/core_aem/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,7 @@
 <groupId>com.adobe.aio.aem</groupId>
 <artifactId>aio-aem</artifactId>
 <relativePath>../pom.xml</relativePath>
 <version>2.0.1-SNAPSHOT</version>
 <version>3.0.0-SNAPSHOT</version>
 </parent>

 <artifactId>aio-aem-core</artifactId>
Expand Down

2 changes: 1 addition & 1 deletion
aem/events_ingress_aem/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,7 @@
 <groupId>com.adobe.aio.aem</groupId>
 <artifactId>aio-aem</artifactId>
 <relativePath>../pom.xml</relativePath>
 <version>2.0.1-SNAPSHOT</version>
 <version>3.0.0-SNAPSHOT</version>
 </parent>

 <artifactId>aio-aem-events-publish</artifactId>
Expand Down

2 changes: 1 addition & 1 deletion
aem/events_mgmt_aem/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,7 @@
 <groupId>com.adobe.aio.aem</groupId>
 <artifactId>aio-aem</artifactId>
 <relativePath>../pom.xml</relativePath>
 <version>2.0.1-SNAPSHOT</version>
 <version>3.0.0-SNAPSHOT</version>
 </parent>

 <artifactId>aio-aem-events-mgmt</artifactId>
Expand Down

2 changes: 1 addition & 1 deletion
aem/events_osgi_mapping/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,7 @@
 <groupId>com.adobe.aio.aem</groupId>
 <artifactId>aio-aem</artifactId>
 <relativePath>../pom.xml</relativePath>
 <version>2.0.1-SNAPSHOT</version>
 <version>3.0.0-SNAPSHOT</version>
 </parent>

 <artifactId>aio-aem-events-osgi-mapping</artifactId>
Expand Down

2 changes: 1 addition & 1 deletion
aem/lib_osgi/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@
 <groupId>com.adobe.aio.aem</groupId>
 <artifactId>aio-aem</artifactId>
 <relativePath>../pom.xml</relativePath>
 <version>2.0.1-SNAPSHOT</version>
 <version>3.0.0-SNAPSHOT</version>
 </parent>

 <artifactId>aio-lib-osgi</artifactId>
Expand Down

2 changes: 1 addition & 1 deletion
aem/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,7 @@
 <groupId>com.adobe.aio</groupId>
 <artifactId>aio-lib-java</artifactId>
 <relativePath>../pom.xml</relativePath>
 <version>2.0.1-SNAPSHOT</version>
 <version>3.0.0-SNAPSHOT</version>
 </parent>

 <groupId>com.adobe.aio.aem</groupId>
Expand Down

2 changes: 1 addition & 1 deletion
core/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@
 <parent>
 <groupId>com.adobe.aio</groupId>
 <artifactId>aio-lib-java</artifactId>
 <version>2.0.1-SNAPSHOT</version>
 <version>3.0.0-SNAPSHOT</version>
 <relativePath>../pom.xml</relativePath>
 </parent>
 <modelVersion>4.0.0</modelVersion>
Expand Down

35 changes: 35 additions & 0 deletions
core/src/main/java/com/adobe/aio/cloudevents/ZonedDateTimeDeserializer.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
/*
 * 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.cloudevents;

import com.fasterxml.jackson.core.JacksonException;
import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.databind.DeserializationContext;
import com.fasterxml.jackson.databind.JsonDeserializer;
import java.io.IOException;
import java.time.DateTimeException;
import java.time.ZonedDateTime;
import java.time.format.DateTimeFormatter;

public class ZonedDateTimeDeserializer extends JsonDeserializer<ZonedDateTime> {

 @Override
 public ZonedDateTime deserialize(
 JsonParser jsonParser, DeserializationContext deserializationContext)
 throws IOException, JacksonException {
 try {
 return ZonedDateTime.parse(jsonParser.getText(), DateTimeFormatter.ISO_OFFSET_DATE_TIME);
 } catch (DateTimeException e) {
 throw new IllegalArgumentException("could not parse", e);
 }
 }
}

31 changes: 31 additions & 0 deletions
core/src/main/java/com/adobe/aio/cloudevents/ZonedDateTimeSerializer.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
/*
 * 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.cloudevents;

import com.fasterxml.jackson.core.JsonGenerator;
import com.fasterxml.jackson.databind.JsonSerializer;
import com.fasterxml.jackson.databind.SerializerProvider;
import java.io.IOException;
import java.time.ZonedDateTime;
import java.time.format.DateTimeFormatter;

public class ZonedDateTimeSerializer extends JsonSerializer<ZonedDateTime> {

 @Override
 public void serialize(
 ZonedDateTime zonedDateTime,
 JsonGenerator jsonGenerator,
 SerializerProvider serializerProvider)
 throws IOException {
 jsonGenerator.writeString(zonedDateTime.format(DateTimeFormatter.ISO_OFFSET_DATE_TIME));
 }
}

4 changes: 2 additions & 2 deletions
core/src/main/java/com/adobe/aio/util/JacksonUtil.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,8 @@
 */
package com.adobe.aio.util;

import com.adobe.aio.cloudevents.ZonedDateTimeDeserializer;
import com.adobe.aio.cloudevents.ZonedDateTimeSerializer;
import com.fasterxml.jackson.annotation.JsonInclude.Include;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.DeserializationFeature;
Expand All@@ -20,8 +22,6 @@
import com.fasterxml.jackson.databind.module.SimpleModule;
import com.fasterxml.jackson.databind.node.TextNode;
import com.fasterxml.jackson.datatype.jdk8.Jdk8Module;
import io.cloudevents.json.ZonedDateTimeDeserializer;
import io.cloudevents.json.ZonedDateTimeSerializer;
import io.openapitools.jackson.dataformat.hal.JacksonHALModule;
import java.time.ZonedDateTime;
import org.apache.commons.lang3.StringUtils;
Expand Down

2 changes: 1 addition & 1 deletion
events_ingress/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@
 <parent>
 <groupId>com.adobe.aio</groupId>
 <artifactId>aio-lib-java</artifactId>
 <version>2.0.1-SNAPSHOT</version>
 <version>3.0.0-SNAPSHOT</version>
 <relativePath>../pom.xml</relativePath>
 </parent>
 <modelVersion>4.0.0</modelVersion>
Expand Down

2 changes: 1 addition & 1 deletion
events_journal/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@
 <parent>
 <groupId>com.adobe.aio</groupId>
 <artifactId>aio-lib-java</artifactId>
 <version>2.0.1-SNAPSHOT</version>
 <version>3.0.0-SNAPSHOT</version>
 <relativePath>../pom.xml</relativePath>
 </parent>
 <modelVersion>4.0.0</modelVersion>
Expand Down

2 changes: 1 addition & 1 deletion
events_mgmt/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@
 <parent>
 <groupId>com.adobe.aio</groupId>
 <artifactId>aio-lib-java</artifactId>
 <version>2.0.1-SNAPSHOT</version>
 <version>3.0.0-SNAPSHOT</version>
 <relativePath>../pom.xml</relativePath>
 </parent>
 <modelVersion>4.0.0</modelVersion>
Expand Down

2 changes: 1 addition & 1 deletion
events_test/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@
 <parent>
 <groupId>com.adobe.aio</groupId>
 <artifactId>aio-lib-java</artifactId>
 <version>2.0.1-SNAPSHOT</version>
 <version>3.0.0-SNAPSHOT</version>
 <relativePath>../pom.xml</relativePath>
 </parent>
 <modelVersion>4.0.0</modelVersion>
Expand Down

2 changes: 1 addition & 1 deletion
events_webhook/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@
 <parent>
 <groupId>com.adobe.aio</groupId>
 <artifactId>aio-lib-java</artifactId>
 <version>2.0.1-SNAPSHOT</version>
 <version>3.0.0-SNAPSHOT</version>
 <relativePath>../pom.xml</relativePath>
 </parent>
 <modelVersion>4.0.0</modelVersion>
Expand Down

15 changes: 6 additions & 9 deletions
events_webhook/src/test/java/com/adobe/aio/event/webhook/feign/FeignPubKeyServiceTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,23 +1,20 @@
package com.adobe.aio.event.webhook.feign;

import java.io.File;
import java.security.KeyFactory;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.mockserver.model.HttpRequest.request;
import static org.mockserver.model.HttpResponse.response;

import java.security.KeyPair;
import java.security.KeyPairGenerator;
import java.security.PublicKey;

import javax.crypto.KeyGenerator;

import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockserver.client.MockServerClient;
import org.mockserver.junit.jupiter.MockServerExtension;
import shaded_package.org.apache.commons.codec.binary.Base64;

import static org.junit.jupiter.api.Assertions.*;
import static org.mockserver.model.HttpRequest.*;
import static org.mockserver.model.HttpResponse.*;

@ExtendWith(MockServerExtension.class)
public class FeignPubKeyServiceTest {

Expand Down

2 changes: 1 addition & 1 deletion
events_xdm/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@
 <parent>
 <groupId>com.adobe.aio</groupId>
 <artifactId>aio-lib-java</artifactId>
 <version>2.0.1-SNAPSHOT</version>
 <version>3.0.0-SNAPSHOT</version>
 <relativePath>../pom.xml</relativePath>
 </parent>
 <modelVersion>4.0.0</modelVersion>
Expand Down

2 changes: 1 addition & 1 deletion
ims/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@
 <parent>
 <groupId>com.adobe.aio</groupId>
 <artifactId>aio-lib-java</artifactId>
 <version>2.0.1-SNAPSHOT</version>
 <version>3.0.0-SNAPSHOT</version>
 <relativePath>../pom.xml</relativePath>
 </parent>
 <modelVersion>4.0.0</modelVersion>
Expand Down

16 changes: 8 additions & 8 deletions
pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,7 @@

 <groupId>com.adobe.aio</groupId>
 <artifactId>aio-lib-java</artifactId>
 <version>2.0.1-SNAPSHOT</version>
 <version>3.0.0-SNAPSHOT</version>
 <packaging>pom</packaging>

 <modules>
Expand DownExpand Up@@ -96,15 +96,15 @@

 <jacoco.version>0.8.10</jacoco.version>

 <commons-text.version>1.10.0</commons-text.version>
 <commons-text.version>1.13.0</commons-text.version>
 <commons-lang3.version>3.13.0</commons-lang3.version>
 <junit.version>5.10.0</junit.version>
 <mockito.version>5.4.0</mockito.version>
 <slf4j.version>1.7.6</slf4j.version>
 <jackson.version>2.13.4</jackson.version>
 <mockito.version>5.11.0</mockito.version>
 <slf4j.version>2.0.12</slf4j.version>
 <jackson.version>2.17.2</jackson.version>
 <jjwt.version>0.11.5</jjwt.version>

 <cloudevents.version>1.2.0</cloudevents.version>
 <cloudevents.version>4.0.1</cloudevents.version>
 <!-- we'll stick to this CloudEvents v1 version for now -->

 <!-- https://github.com/openapi-tools/jackson-dataformat-hal/blob/v1.0.9/pom.xml -->
Expand DownExpand Up@@ -259,8 +259,8 @@
 <version>[3.3.9,)</version>
 </requireMavenVersion>
 <requireJavaVersion>
 <message>Maven must be executed with a Java 8 JRE or higher.</message>
 <version>1.8.0</version>
 <message>Maven must be executed with a Java 17 JRE or higher.</message>
 <version>1.17.0</version>
 </requireJavaVersion>
 </rules>
 </configuration>
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
upgrading to java17, cloudevents latest version#228

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

abhupadh
wants to merge
6
commits into

base:main
Choose a base branch

from

 Open


upgrading to java17, cloudevents latest version
#228
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
39db8b2

upgrading to java17, cloudevents latest version


abhupadh Mar 6, 2025
572e199

adding license header


abhupadh Mar 6, 2025
e84f396

upgrading aio-lib-java version to 3.0.0 as major release for java17 u…


abhupadh Mar 6, 2025
38a4d18

minor refactoring


abhupadh Mar 7, 2025
52c8f90

review comment


abhupadh Mar 7, 2025
4478d8c

using correct snapshot version for aio-lib-java in all child modules


abhupadh Mar 13, 2025

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: 1 addition & 1 deletion
aem/aio_aem_events/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@
 <groupId>com.adobe.aio.aem</groupId>
 <artifactId>aio-aem</artifactId>
 <relativePath>../pom.xml</relativePath>
 <version>2.0.1-SNAPSHOT</version>
 <version>3.0.0-SNAPSHOT</version>
 </parent>

 <artifactId>aio-aem-events</artifactId>
Expand Down

2 changes: 1 addition & 1 deletion
aem/core_aem/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,7 @@
 <groupId>com.adobe.aio.aem</groupId>
 <artifactId>aio-aem</artifactId>
 <relativePath>../pom.xml</relativePath>
 <version>2.0.1-SNAPSHOT</version>
 <version>3.0.0-SNAPSHOT</version>
 </parent>

 <artifactId>aio-aem-core</artifactId>
Expand Down

2 changes: 1 addition & 1 deletion
aem/events_ingress_aem/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,7 @@
 <groupId>com.adobe.aio.aem</groupId>
 <artifactId>aio-aem</artifactId>
 <relativePath>../pom.xml</relativePath>
 <version>2.0.1-SNAPSHOT</version>
 <version>3.0.0-SNAPSHOT</version>
 </parent>

 <artifactId>aio-aem-events-publish</artifactId>
Expand Down

2 changes: 1 addition & 1 deletion
aem/events_mgmt_aem/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,7 @@
 <groupId>com.adobe.aio.aem</groupId>
 <artifactId>aio-aem</artifactId>
 <relativePath>../pom.xml</relativePath>
 <version>2.0.1-SNAPSHOT</version>
 <version>3.0.0-SNAPSHOT</version>
 </parent>

 <artifactId>aio-aem-events-mgmt</artifactId>
Expand Down

2 changes: 1 addition & 1 deletion
aem/events_osgi_mapping/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,7 @@
 <groupId>com.adobe.aio.aem</groupId>
 <artifactId>aio-aem</artifactId>
 <relativePath>../pom.xml</relativePath>
 <version>2.0.1-SNAPSHOT</version>
 <version>3.0.0-SNAPSHOT</version>
 </parent>

 <artifactId>aio-aem-events-osgi-mapping</artifactId>
Expand Down

2 changes: 1 addition & 1 deletion
aem/lib_osgi/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@
 <groupId>com.adobe.aio.aem</groupId>
 <artifactId>aio-aem</artifactId>
 <relativePath>../pom.xml</relativePath>
 <version>2.0.1-SNAPSHOT</version>
 <version>3.0.0-SNAPSHOT</version>
 </parent>

 <artifactId>aio-lib-osgi</artifactId>
Expand Down

2 changes: 1 addition & 1 deletion
aem/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,7 @@
 <groupId>com.adobe.aio</groupId>
 <artifactId>aio-lib-java</artifactId>
 <relativePath>../pom.xml</relativePath>
 <version>2.0.1-SNAPSHOT</version>
 <version>3.0.0-SNAPSHOT</version>
 </parent>

 <groupId>com.adobe.aio.aem</groupId>
Expand Down

2 changes: 1 addition & 1 deletion
core/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@
 <parent>
 <groupId>com.adobe.aio</groupId>
 <artifactId>aio-lib-java</artifactId>
 <version>2.0.1-SNAPSHOT</version>
 <version>3.0.0-SNAPSHOT</version>
 <relativePath>../pom.xml</relativePath>
 </parent>
 <modelVersion>4.0.0</modelVersion>
Expand Down

35 changes: 35 additions & 0 deletions
core/src/main/java/com/adobe/aio/cloudevents/ZonedDateTimeDeserializer.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
/*
 * 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.cloudevents;

import com.fasterxml.jackson.core.JacksonException;
import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.databind.DeserializationContext;
import com.fasterxml.jackson.databind.JsonDeserializer;
import java.io.IOException;
import java.time.DateTimeException;
import java.time.ZonedDateTime;
import java.time.format.DateTimeFormatter;

public class ZonedDateTimeDeserializer extends JsonDeserializer<ZonedDateTime> {

 @Override
 public ZonedDateTime deserialize(
 JsonParser jsonParser, DeserializationContext deserializationContext)
 throws IOException, JacksonException {
 try {
 return ZonedDateTime.parse(jsonParser.getText(), DateTimeFormatter.ISO_OFFSET_DATE_TIME);
 } catch (DateTimeException e) {
 throw new IllegalArgumentException("could not parse", e);
 }
 }
}

31 changes: 31 additions & 0 deletions
core/src/main/java/com/adobe/aio/cloudevents/ZonedDateTimeSerializer.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
/*
 * 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.cloudevents;

import com.fasterxml.jackson.core.JsonGenerator;
import com.fasterxml.jackson.databind.JsonSerializer;
import com.fasterxml.jackson.databind.SerializerProvider;
import java.io.IOException;
import java.time.ZonedDateTime;
import java.time.format.DateTimeFormatter;

public class ZonedDateTimeSerializer extends JsonSerializer<ZonedDateTime> {

 @Override
 public void serialize(
 ZonedDateTime zonedDateTime,
 JsonGenerator jsonGenerator,
 SerializerProvider serializerProvider)
 throws IOException {
 jsonGenerator.writeString(zonedDateTime.format(DateTimeFormatter.ISO_OFFSET_DATE_TIME));
 }
}

4 changes: 2 additions & 2 deletions
core/src/main/java/com/adobe/aio/util/JacksonUtil.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,8 @@
 */
package com.adobe.aio.util;

import com.adobe.aio.cloudevents.ZonedDateTimeDeserializer;
import com.adobe.aio.cloudevents.ZonedDateTimeSerializer;
import com.fasterxml.jackson.annotation.JsonInclude.Include;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.DeserializationFeature;
Expand All@@ -20,8 +22,6 @@
import com.fasterxml.jackson.databind.module.SimpleModule;
import com.fasterxml.jackson.databind.node.TextNode;
import com.fasterxml.jackson.datatype.jdk8.Jdk8Module;
import io.cloudevents.json.ZonedDateTimeDeserializer;
import io.cloudevents.json.ZonedDateTimeSerializer;
import io.openapitools.jackson.dataformat.hal.JacksonHALModule;
import java.time.ZonedDateTime;
import org.apache.commons.lang3.StringUtils;
Expand Down

2 changes: 1 addition & 1 deletion
events_ingress/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@
 <parent>
 <groupId>com.adobe.aio</groupId>
 <artifactId>aio-lib-java</artifactId>
 <version>2.0.1-SNAPSHOT</version>
 <version>3.0.0-SNAPSHOT</version>
 <relativePath>../pom.xml</relativePath>
 </parent>
 <modelVersion>4.0.0</modelVersion>
Expand Down

2 changes: 1 addition & 1 deletion
events_journal/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@
 <parent>
 <groupId>com.adobe.aio</groupId>
 <artifactId>aio-lib-java</artifactId>
 <version>2.0.1-SNAPSHOT</version>
 <version>3.0.0-SNAPSHOT</version>
 <relativePath>../pom.xml</relativePath>
 </parent>
 <modelVersion>4.0.0</modelVersion>
Expand Down

2 changes: 1 addition & 1 deletion
events_mgmt/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@
 <parent>
 <groupId>com.adobe.aio</groupId>
 <artifactId>aio-lib-java</artifactId>
 <version>2.0.1-SNAPSHOT</version>
 <version>3.0.0-SNAPSHOT</version>
 <relativePath>../pom.xml</relativePath>
 </parent>
 <modelVersion>4.0.0</modelVersion>
Expand Down

2 changes: 1 addition & 1 deletion
events_test/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@
 <parent>
 <groupId>com.adobe.aio</groupId>
 <artifactId>aio-lib-java</artifactId>
 <version>2.0.1-SNAPSHOT</version>
 <version>3.0.0-SNAPSHOT</version>
 <relativePath>../pom.xml</relativePath>
 </parent>
 <modelVersion>4.0.0</modelVersion>
Expand Down

2 changes: 1 addition & 1 deletion
events_webhook/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@
 <parent>
 <groupId>com.adobe.aio</groupId>
 <artifactId>aio-lib-java</artifactId>
 <version>2.0.1-SNAPSHOT</version>
 <version>3.0.0-SNAPSHOT</version>
 <relativePath>../pom.xml</relativePath>
 </parent>
 <modelVersion>4.0.0</modelVersion>
Expand Down

15 changes: 6 additions & 9 deletions
events_webhook/src/test/java/com/adobe/aio/event/webhook/feign/FeignPubKeyServiceTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,23 +1,20 @@
package com.adobe.aio.event.webhook.feign;

import java.io.File;
import java.security.KeyFactory;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.mockserver.model.HttpRequest.request;
import static org.mockserver.model.HttpResponse.response;

import java.security.KeyPair;
import java.security.KeyPairGenerator;
import java.security.PublicKey;

import javax.crypto.KeyGenerator;

import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockserver.client.MockServerClient;
import org.mockserver.junit.jupiter.MockServerExtension;
import shaded_package.org.apache.commons.codec.binary.Base64;

import static org.junit.jupiter.api.Assertions.*;
import static org.mockserver.model.HttpRequest.*;
import static org.mockserver.model.HttpResponse.*;

@ExtendWith(MockServerExtension.class)
public class FeignPubKeyServiceTest {

Expand Down

2 changes: 1 addition & 1 deletion
events_xdm/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@
 <parent>
 <groupId>com.adobe.aio</groupId>
 <artifactId>aio-lib-java</artifactId>
 <version>2.0.1-SNAPSHOT</version>
 <version>3.0.0-SNAPSHOT</version>
 <relativePath>../pom.xml</relativePath>
 </parent>
 <modelVersion>4.0.0</modelVersion>
Expand Down

2 changes: 1 addition & 1 deletion
ims/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@
 <parent>
 <groupId>com.adobe.aio</groupId>
 <artifactId>aio-lib-java</artifactId>
 <version>2.0.1-SNAPSHOT</version>
 <version>3.0.0-SNAPSHOT</version>
 <relativePath>../pom.xml</relativePath>
 </parent>
 <modelVersion>4.0.0</modelVersion>
Expand Down

16 changes: 8 additions & 8 deletions
pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,7 @@

 <groupId>com.adobe.aio</groupId>
 <artifactId>aio-lib-java</artifactId>
 <version>2.0.1-SNAPSHOT</version>
 <version>3.0.0-SNAPSHOT</version>
 <packaging>pom</packaging>

 <modules>
Expand DownExpand Up@@ -96,15 +96,15 @@

 <jacoco.version>0.8.10</jacoco.version>

 <commons-text.version>1.10.0</commons-text.version>
 <commons-text.version>1.13.0</commons-text.version>
 <commons-lang3.version>3.13.0</commons-lang3.version>
 <junit.version>5.10.0</junit.version>
 <mockito.version>5.4.0</mockito.version>
 <slf4j.version>1.7.6</slf4j.version>
 <jackson.version>2.13.4</jackson.version>
 <mockito.version>5.11.0</mockito.version>
 <slf4j.version>2.0.12</slf4j.version>
 <jackson.version>2.17.2</jackson.version>
 <jjwt.version>0.11.5</jjwt.version>

 <cloudevents.version>1.2.0</cloudevents.version>
 <cloudevents.version>4.0.1</cloudevents.version>
 <!-- we'll stick to this CloudEvents v1 version for now -->

 <!-- https://github.com/openapi-tools/jackson-dataformat-hal/blob/v1.0.9/pom.xml -->
Expand DownExpand Up@@ -259,8 +259,8 @@
 <version>[3.3.9,)</version>
 </requireMavenVersion>
 <requireJavaVersion>
 <message>Maven must be executed with a Java 8 JRE or higher.</message>
 <version>1.8.0</version>
 <message>Maven must be executed with a Java 17 JRE or higher.</message>
 <version>1.17.0</version>
 </requireJavaVersion>
 </rules>
 </configuration>
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
upgrading to java17, cloudevents latest version#228

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

abhupadh
wants to merge
6
commits into

base:main
Choose a base branch

from

 Open


upgrading to java17, cloudevents latest version
#228
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
39db8b2

upgrading to java17, cloudevents latest version


abhupadh Mar 6, 2025
572e199

adding license header


abhupadh Mar 6, 2025
e84f396

upgrading aio-lib-java version to 3.0.0 as major release for java17 u…


abhupadh Mar 6, 2025
38a4d18

minor refactoring


abhupadh Mar 7, 2025
52c8f90

review comment


abhupadh Mar 7, 2025
4478d8c

using correct snapshot version for aio-lib-java in all child modules


abhupadh Mar 13, 2025

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: 1 addition & 1 deletion
aem/aio_aem_events/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@
 <groupId>com.adobe.aio.aem</groupId>
 <artifactId>aio-aem</artifactId>
 <relativePath>../pom.xml</relativePath>
 <version>2.0.1-SNAPSHOT</version>
 <version>3.0.0-SNAPSHOT</version>
 </parent>

 <artifactId>aio-aem-events</artifactId>
Expand Down

2 changes: 1 addition & 1 deletion
aem/core_aem/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,7 @@
 <groupId>com.adobe.aio.aem</groupId>
 <artifactId>aio-aem</artifactId>
 <relativePath>../pom.xml</relativePath>
 <version>2.0.1-SNAPSHOT</version>
 <version>3.0.0-SNAPSHOT</version>
 </parent>

 <artifactId>aio-aem-core</artifactId>
Expand Down

2 changes: 1 addition & 1 deletion
aem/events_ingress_aem/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,7 @@
 <groupId>com.adobe.aio.aem</groupId>
 <artifactId>aio-aem</artifactId>
 <relativePath>../pom.xml</relativePath>
 <version>2.0.1-SNAPSHOT</version>
 <version>3.0.0-SNAPSHOT</version>
 </parent>

 <artifactId>aio-aem-events-publish</artifactId>
Expand Down

2 changes: 1 addition & 1 deletion
aem/events_mgmt_aem/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,7 @@
 <groupId>com.adobe.aio.aem</groupId>
 <artifactId>aio-aem</artifactId>
 <relativePath>../pom.xml</relativePath>
 <version>2.0.1-SNAPSHOT</version>
 <version>3.0.0-SNAPSHOT</version>
 </parent>

 <artifactId>aio-aem-events-mgmt</artifactId>
Expand Down

2 changes: 1 addition & 1 deletion
aem/events_osgi_mapping/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,7 @@
 <groupId>com.adobe.aio.aem</groupId>
 <artifactId>aio-aem</artifactId>
 <relativePath>../pom.xml</relativePath>
 <version>2.0.1-SNAPSHOT</version>
 <version>3.0.0-SNAPSHOT</version>
 </parent>

 <artifactId>aio-aem-events-osgi-mapping</artifactId>
Expand Down

2 changes: 1 addition & 1 deletion
aem/lib_osgi/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@
 <groupId>com.adobe.aio.aem</groupId>
 <artifactId>aio-aem</artifactId>
 <relativePath>../pom.xml</relativePath>
 <version>2.0.1-SNAPSHOT</version>
 <version>3.0.0-SNAPSHOT</version>
 </parent>

 <artifactId>aio-lib-osgi</artifactId>
Expand Down

2 changes: 1 addition & 1 deletion
aem/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,7 @@
 <groupId>com.adobe.aio</groupId>
 <artifactId>aio-lib-java</artifactId>
 <relativePath>../pom.xml</relativePath>
 <version>2.0.1-SNAPSHOT</version>
 <version>3.0.0-SNAPSHOT</version>
 </parent>

 <groupId>com.adobe.aio.aem</groupId>
Expand Down

2 changes: 1 addition & 1 deletion
core/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@
 <parent>
 <groupId>com.adobe.aio</groupId>
 <artifactId>aio-lib-java</artifactId>
 <version>2.0.1-SNAPSHOT</version>
 <version>3.0.0-SNAPSHOT</version>
 <relativePath>../pom.xml</relativePath>
 </parent>
 <modelVersion>4.0.0</modelVersion>
Expand Down

35 changes: 35 additions & 0 deletions
core/src/main/java/com/adobe/aio/cloudevents/ZonedDateTimeDeserializer.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
/*
 * 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.cloudevents;

import com.fasterxml.jackson.core.JacksonException;
import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.databind.DeserializationContext;
import com.fasterxml.jackson.databind.JsonDeserializer;
import java.io.IOException;
import java.time.DateTimeException;
import java.time.ZonedDateTime;
import java.time.format.DateTimeFormatter;

public class ZonedDateTimeDeserializer extends JsonDeserializer<ZonedDateTime> {

 @Override
 public ZonedDateTime deserialize(
 JsonParser jsonParser, DeserializationContext deserializationContext)
 throws IOException, JacksonException {
 try {
 return ZonedDateTime.parse(jsonParser.getText(), DateTimeFormatter.ISO_OFFSET_DATE_TIME);
 } catch (DateTimeException e) {
 throw new IllegalArgumentException("could not parse", e);
 }
 }
}

31 changes: 31 additions & 0 deletions
core/src/main/java/com/adobe/aio/cloudevents/ZonedDateTimeSerializer.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
/*
 * 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.cloudevents;

import com.fasterxml.jackson.core.JsonGenerator;
import com.fasterxml.jackson.databind.JsonSerializer;
import com.fasterxml.jackson.databind.SerializerProvider;
import java.io.IOException;
import java.time.ZonedDateTime;
import java.time.format.DateTimeFormatter;

public class ZonedDateTimeSerializer extends JsonSerializer<ZonedDateTime> {

 @Override
 public void serialize(
 ZonedDateTime zonedDateTime,
 JsonGenerator jsonGenerator,
 SerializerProvider serializerProvider)
 throws IOException {
 jsonGenerator.writeString(zonedDateTime.format(DateTimeFormatter.ISO_OFFSET_DATE_TIME));
 }
}

4 changes: 2 additions & 2 deletions
core/src/main/java/com/adobe/aio/util/JacksonUtil.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,8 @@
 */
package com.adobe.aio.util;

import com.adobe.aio.cloudevents.ZonedDateTimeDeserializer;
import com.adobe.aio.cloudevents.ZonedDateTimeSerializer;
import com.fasterxml.jackson.annotation.JsonInclude.Include;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.DeserializationFeature;
Expand All@@ -20,8 +22,6 @@
import com.fasterxml.jackson.databind.module.SimpleModule;
import com.fasterxml.jackson.databind.node.TextNode;
import com.fasterxml.jackson.datatype.jdk8.Jdk8Module;
import io.cloudevents.json.ZonedDateTimeDeserializer;
import io.cloudevents.json.ZonedDateTimeSerializer;
import io.openapitools.jackson.dataformat.hal.JacksonHALModule;
import java.time.ZonedDateTime;
import org.apache.commons.lang3.StringUtils;
Expand Down

2 changes: 1 addition & 1 deletion
events_ingress/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@
 <parent>
 <groupId>com.adobe.aio</groupId>
 <artifactId>aio-lib-java</artifactId>
 <version>2.0.1-SNAPSHOT</version>
 <version>3.0.0-SNAPSHOT</version>
 <relativePath>../pom.xml</relativePath>
 </parent>
 <modelVersion>4.0.0</modelVersion>
Expand Down

2 changes: 1 addition & 1 deletion
events_journal/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@
 <parent>
 <groupId>com.adobe.aio</groupId>
 <artifactId>aio-lib-java</artifactId>
 <version>2.0.1-SNAPSHOT</version>
 <version>3.0.0-SNAPSHOT</version>
 <relativePath>../pom.xml</relativePath>
 </parent>
 <modelVersion>4.0.0</modelVersion>
Expand Down

2 changes: 1 addition & 1 deletion
events_mgmt/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@
 <parent>
 <groupId>com.adobe.aio</groupId>
 <artifactId>aio-lib-java</artifactId>
 <version>2.0.1-SNAPSHOT</version>
 <version>3.0.0-SNAPSHOT</version>
 <relativePath>../pom.xml</relativePath>
 </parent>
 <modelVersion>4.0.0</modelVersion>
Expand Down

2 changes: 1 addition & 1 deletion
events_test/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@
 <parent>
 <groupId>com.adobe.aio</groupId>
 <artifactId>aio-lib-java</artifactId>
 <version>2.0.1-SNAPSHOT</version>
 <version>3.0.0-SNAPSHOT</version>
 <relativePath>../pom.xml</relativePath>
 </parent>
 <modelVersion>4.0.0</modelVersion>
Expand Down

2 changes: 1 addition & 1 deletion
events_webhook/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@
 <parent>
 <groupId>com.adobe.aio</groupId>
 <artifactId>aio-lib-java</artifactId>
 <version>2.0.1-SNAPSHOT</version>
 <version>3.0.0-SNAPSHOT</version>
 <relativePath>../pom.xml</relativePath>
 </parent>
 <modelVersion>4.0.0</modelVersion>
Expand Down

15 changes: 6 additions & 9 deletions
events_webhook/src/test/java/com/adobe/aio/event/webhook/feign/FeignPubKeyServiceTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,23 +1,20 @@
package com.adobe.aio.event.webhook.feign;

import java.io.File;
import java.security.KeyFactory;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.mockserver.model.HttpRequest.request;
import static org.mockserver.model.HttpResponse.response;

import java.security.KeyPair;
import java.security.KeyPairGenerator;
import java.security.PublicKey;

import javax.crypto.KeyGenerator;

import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockserver.client.MockServerClient;
import org.mockserver.junit.jupiter.MockServerExtension;
import shaded_package.org.apache.commons.codec.binary.Base64;

import static org.junit.jupiter.api.Assertions.*;
import static org.mockserver.model.HttpRequest.*;
import static org.mockserver.model.HttpResponse.*;

@ExtendWith(MockServerExtension.class)
public class FeignPubKeyServiceTest {

Expand Down

2 changes: 1 addition & 1 deletion
events_xdm/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@
 <parent>
 <groupId>com.adobe.aio</groupId>
 <artifactId>aio-lib-java</artifactId>
 <version>2.0.1-SNAPSHOT</version>
 <version>3.0.0-SNAPSHOT</version>
 <relativePath>../pom.xml</relativePath>
 </parent>
 <modelVersion>4.0.0</modelVersion>
Expand Down

2 changes: 1 addition & 1 deletion
ims/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@
 <parent>
 <groupId>com.adobe.aio</groupId>
 <artifactId>aio-lib-java</artifactId>
 <version>2.0.1-SNAPSHOT</version>
 <version>3.0.0-SNAPSHOT</version>
 <relativePath>../pom.xml</relativePath>
 </parent>
 <modelVersion>4.0.0</modelVersion>
Expand Down

16 changes: 8 additions & 8 deletions
pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,7 @@

 <groupId>com.adobe.aio</groupId>
 <artifactId>aio-lib-java</artifactId>
 <version>2.0.1-SNAPSHOT</version>
 <version>3.0.0-SNAPSHOT</version>
 <packaging>pom</packaging>

 <modules>
Expand DownExpand Up@@ -96,15 +96,15 @@

 <jacoco.version>0.8.10</jacoco.version>

 <commons-text.version>1.10.0</commons-text.version>
 <commons-text.version>1.13.0</commons-text.version>
 <commons-lang3.version>3.13.0</commons-lang3.version>
 <junit.version>5.10.0</junit.version>
 <mockito.version>5.4.0</mockito.version>
 <slf4j.version>1.7.6</slf4j.version>
 <jackson.version>2.13.4</jackson.version>
 <mockito.version>5.11.0</mockito.version>
 <slf4j.version>2.0.12</slf4j.version>
 <jackson.version>2.17.2</jackson.version>
 <jjwt.version>0.11.5</jjwt.version>

 <cloudevents.version>1.2.0</cloudevents.version>
 <cloudevents.version>4.0.1</cloudevents.version>
 <!-- we'll stick to this CloudEvents v1 version for now -->

 <!-- https://github.com/openapi-tools/jackson-dataformat-hal/blob/v1.0.9/pom.xml -->
Expand DownExpand Up@@ -259,8 +259,8 @@
 <version>[3.3.9,)</version>
 </requireMavenVersion>
 <requireJavaVersion>
 <message>Maven must be executed with a Java 8 JRE or higher.</message>
 <version>1.8.0</version>
 <message>Maven must be executed with a Java 17 JRE or higher.</message>
 <version>1.17.0</version>
 </requireJavaVersion>
 </rules>
 </configuration>
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
upgrading to java17, cloudevents latest version#228

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

abhupadh
wants to merge
6
commits into

base:main
Choose a base branch

from

 Open


upgrading to java17, cloudevents latest version
#228
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
39db8b2

upgrading to java17, cloudevents latest version


abhupadh Mar 6, 2025
572e199

adding license header


abhupadh Mar 6, 2025
e84f396

upgrading aio-lib-java version to 3.0.0 as major release for java17 u…


abhupadh Mar 6, 2025
38a4d18

minor refactoring


abhupadh Mar 7, 2025
52c8f90

review comment


abhupadh Mar 7, 2025
4478d8c

using correct snapshot version for aio-lib-java in all child modules


abhupadh Mar 13, 2025

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: 1 addition & 1 deletion
aem/aio_aem_events/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@
 <groupId>com.adobe.aio.aem</groupId>
 <artifactId>aio-aem</artifactId>
 <relativePath>../pom.xml</relativePath>
 <version>2.0.1-SNAPSHOT</version>
 <version>3.0.0-SNAPSHOT</version>
 </parent>

 <artifactId>aio-aem-events</artifactId>
Expand Down

2 changes: 1 addition & 1 deletion
aem/core_aem/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,7 @@
 <groupId>com.adobe.aio.aem</groupId>
 <artifactId>aio-aem</artifactId>
 <relativePath>../pom.xml</relativePath>
 <version>2.0.1-SNAPSHOT</version>
 <version>3.0.0-SNAPSHOT</version>
 </parent>

 <artifactId>aio-aem-core</artifactId>
Expand Down

2 changes: 1 addition & 1 deletion
aem/events_ingress_aem/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,7 @@
 <groupId>com.adobe.aio.aem</groupId>
 <artifactId>aio-aem</artifactId>
 <relativePath>../pom.xml</relativePath>
 <version>2.0.1-SNAPSHOT</version>
 <version>3.0.0-SNAPSHOT</version>
 </parent>

 <artifactId>aio-aem-events-publish</artifactId>
Expand Down

2 changes: 1 addition & 1 deletion
aem/events_mgmt_aem/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,7 @@
 <groupId>com.adobe.aio.aem</groupId>
 <artifactId>aio-aem</artifactId>
 <relativePath>../pom.xml</relativePath>
 <version>2.0.1-SNAPSHOT</version>
 <version>3.0.0-SNAPSHOT</version>
 </parent>

 <artifactId>aio-aem-events-mgmt</artifactId>
Expand Down

2 changes: 1 addition & 1 deletion
aem/events_osgi_mapping/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,7 @@
 <groupId>com.adobe.aio.aem</groupId>
 <artifactId>aio-aem</artifactId>
 <relativePath>../pom.xml</relativePath>
 <version>2.0.1-SNAPSHOT</version>
 <version>3.0.0-SNAPSHOT</version>
 </parent>

 <artifactId>aio-aem-events-osgi-mapping</artifactId>
Expand Down

2 changes: 1 addition & 1 deletion
aem/lib_osgi/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@
 <groupId>com.adobe.aio.aem</groupId>
 <artifactId>aio-aem</artifactId>
 <relativePath>../pom.xml</relativePath>
 <version>2.0.1-SNAPSHOT</version>
 <version>3.0.0-SNAPSHOT</version>
 </parent>

 <artifactId>aio-lib-osgi</artifactId>
Expand Down

2 changes: 1 addition & 1 deletion
aem/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,7 @@
 <groupId>com.adobe.aio</groupId>
 <artifactId>aio-lib-java</artifactId>
 <relativePath>../pom.xml</relativePath>
 <version>2.0.1-SNAPSHOT</version>
 <version>3.0.0-SNAPSHOT</version>
 </parent>

 <groupId>com.adobe.aio.aem</groupId>
Expand Down

2 changes: 1 addition & 1 deletion
core/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@
 <parent>
 <groupId>com.adobe.aio</groupId>
 <artifactId>aio-lib-java</artifactId>
 <version>2.0.1-SNAPSHOT</version>
 <version>3.0.0-SNAPSHOT</version>
 <relativePath>../pom.xml</relativePath>
 </parent>
 <modelVersion>4.0.0</modelVersion>
Expand Down

35 changes: 35 additions & 0 deletions
core/src/main/java/com/adobe/aio/cloudevents/ZonedDateTimeDeserializer.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
/*
 * 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.cloudevents;

import com.fasterxml.jackson.core.JacksonException;
import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.databind.DeserializationContext;
import com.fasterxml.jackson.databind.JsonDeserializer;
import java.io.IOException;
import java.time.DateTimeException;
import java.time.ZonedDateTime;
import java.time.format.DateTimeFormatter;

public class ZonedDateTimeDeserializer extends JsonDeserializer<ZonedDateTime> {

 @Override
 public ZonedDateTime deserialize(
 JsonParser jsonParser, DeserializationContext deserializationContext)
 throws IOException, JacksonException {
 try {
 return ZonedDateTime.parse(jsonParser.getText(), DateTimeFormatter.ISO_OFFSET_DATE_TIME);
 } catch (DateTimeException e) {
 throw new IllegalArgumentException("could not parse", e);
 }
 }
}

31 changes: 31 additions & 0 deletions
core/src/main/java/com/adobe/aio/cloudevents/ZonedDateTimeSerializer.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
/*
 * 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.cloudevents;

import com.fasterxml.jackson.core.JsonGenerator;
import com.fasterxml.jackson.databind.JsonSerializer;
import com.fasterxml.jackson.databind.SerializerProvider;
import java.io.IOException;
import java.time.ZonedDateTime;
import java.time.format.DateTimeFormatter;

public class ZonedDateTimeSerializer extends JsonSerializer<ZonedDateTime> {

 @Override
 public void serialize(
 ZonedDateTime zonedDateTime,
 JsonGenerator jsonGenerator,
 SerializerProvider serializerProvider)
 throws IOException {
 jsonGenerator.writeString(zonedDateTime.format(DateTimeFormatter.ISO_OFFSET_DATE_TIME));
 }
}

4 changes: 2 additions & 2 deletions
core/src/main/java/com/adobe/aio/util/JacksonUtil.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,8 @@
 */
package com.adobe.aio.util;

import com.adobe.aio.cloudevents.ZonedDateTimeDeserializer;
import com.adobe.aio.cloudevents.ZonedDateTimeSerializer;
import com.fasterxml.jackson.annotation.JsonInclude.Include;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.DeserializationFeature;
Expand All@@ -20,8 +22,6 @@
import com.fasterxml.jackson.databind.module.SimpleModule;
import com.fasterxml.jackson.databind.node.TextNode;
import com.fasterxml.jackson.datatype.jdk8.Jdk8Module;
import io.cloudevents.json.ZonedDateTimeDeserializer;
import io.cloudevents.json.ZonedDateTimeSerializer;
import io.openapitools.jackson.dataformat.hal.JacksonHALModule;
import java.time.ZonedDateTime;
import org.apache.commons.lang3.StringUtils;
Expand Down

2 changes: 1 addition & 1 deletion
events_ingress/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@
 <parent>
 <groupId>com.adobe.aio</groupId>
 <artifactId>aio-lib-java</artifactId>
 <version>2.0.1-SNAPSHOT</version>
 <version>3.0.0-SNAPSHOT</version>
 <relativePath>../pom.xml</relativePath>
 </parent>
 <modelVersion>4.0.0</modelVersion>
Expand Down

2 changes: 1 addition & 1 deletion
events_journal/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@
 <parent>
 <groupId>com.adobe.aio</groupId>
 <artifactId>aio-lib-java</artifactId>
 <version>2.0.1-SNAPSHOT</version>
 <version>3.0.0-SNAPSHOT</version>
 <relativePath>../pom.xml</relativePath>
 </parent>
 <modelVersion>4.0.0</modelVersion>
Expand Down

2 changes: 1 addition & 1 deletion
events_mgmt/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@
 <parent>
 <groupId>com.adobe.aio</groupId>
 <artifactId>aio-lib-java</artifactId>
 <version>2.0.1-SNAPSHOT</version>
 <version>3.0.0-SNAPSHOT</version>
 <relativePath>../pom.xml</relativePath>
 </parent>
 <modelVersion>4.0.0</modelVersion>
Expand Down

2 changes: 1 addition & 1 deletion
events_test/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@
 <parent>
 <groupId>com.adobe.aio</groupId>
 <artifactId>aio-lib-java</artifactId>
 <version>2.0.1-SNAPSHOT</version>
 <version>3.0.0-SNAPSHOT</version>
 <relativePath>../pom.xml</relativePath>
 </parent>
 <modelVersion>4.0.0</modelVersion>
Expand Down

2 changes: 1 addition & 1 deletion
events_webhook/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@
 <parent>
 <groupId>com.adobe.aio</groupId>
 <artifactId>aio-lib-java</artifactId>
 <version>2.0.1-SNAPSHOT</version>
 <version>3.0.0-SNAPSHOT</version>
 <relativePath>../pom.xml</relativePath>
 </parent>
 <modelVersion>4.0.0</modelVersion>
Expand Down

15 changes: 6 additions & 9 deletions
events_webhook/src/test/java/com/adobe/aio/event/webhook/feign/FeignPubKeyServiceTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,23 +1,20 @@
package com.adobe.aio.event.webhook.feign;

import java.io.File;
import java.security.KeyFactory;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.mockserver.model.HttpRequest.request;
import static org.mockserver.model.HttpResponse.response;

import java.security.KeyPair;
import java.security.KeyPairGenerator;
import java.security.PublicKey;

import javax.crypto.KeyGenerator;

import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockserver.client.MockServerClient;
import org.mockserver.junit.jupiter.MockServerExtension;
import shaded_package.org.apache.commons.codec.binary.Base64;

import static org.junit.jupiter.api.Assertions.*;
import static org.mockserver.model.HttpRequest.*;
import static org.mockserver.model.HttpResponse.*;

@ExtendWith(MockServerExtension.class)
public class FeignPubKeyServiceTest {

Expand Down

2 changes: 1 addition & 1 deletion
events_xdm/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@
 <parent>
 <groupId>com.adobe.aio</groupId>
 <artifactId>aio-lib-java</artifactId>
 <version>2.0.1-SNAPSHOT</version>
 <version>3.0.0-SNAPSHOT</version>
 <relativePath>../pom.xml</relativePath>
 </parent>
 <modelVersion>4.0.0</modelVersion>
Expand Down

2 changes: 1 addition & 1 deletion
ims/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@
 <parent>
 <groupId>com.adobe.aio</groupId>
 <artifactId>aio-lib-java</artifactId>
 <version>2.0.1-SNAPSHOT</version>
 <version>3.0.0-SNAPSHOT</version>
 <relativePath>../pom.xml</relativePath>
 </parent>
 <modelVersion>4.0.0</modelVersion>
Expand Down

16 changes: 8 additions & 8 deletions
pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,7 @@

 <groupId>com.adobe.aio</groupId>
 <artifactId>aio-lib-java</artifactId>
 <version>2.0.1-SNAPSHOT</version>
 <version>3.0.0-SNAPSHOT</version>
 <packaging>pom</packaging>

 <modules>
Expand DownExpand Up@@ -96,15 +96,15 @@

 <jacoco.version>0.8.10</jacoco.version>

 <commons-text.version>1.10.0</commons-text.version>
 <commons-text.version>1.13.0</commons-text.version>
 <commons-lang3.version>3.13.0</commons-lang3.version>
 <junit.version>5.10.0</junit.version>
 <mockito.version>5.4.0</mockito.version>
 <slf4j.version>1.7.6</slf4j.version>
 <jackson.version>2.13.4</jackson.version>
 <mockito.version>5.11.0</mockito.version>
 <slf4j.version>2.0.12</slf4j.version>
 <jackson.version>2.17.2</jackson.version>
 <jjwt.version>0.11.5</jjwt.version>

 <cloudevents.version>1.2.0</cloudevents.version>
 <cloudevents.version>4.0.1</cloudevents.version>
 <!-- we'll stick to this CloudEvents v1 version for now -->

 <!-- https://github.com/openapi-tools/jackson-dataformat-hal/blob/v1.0.9/pom.xml -->
Expand DownExpand Up@@ -259,8 +259,8 @@
 <version>[3.3.9,)</version>
 </requireMavenVersion>
 <requireJavaVersion>
 <message>Maven must be executed with a Java 8 JRE or higher.</message>
 <version>1.8.0</version>
 <message>Maven must be executed with a Java 17 JRE or higher.</message>
 <version>1.17.0</version>
 </requireJavaVersion>
 </rules>
 </configuration>
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
upgrading to java17, cloudevents latest version#228

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

abhupadh
wants to merge
6
commits into

base:main
Choose a base branch

from

 Open


upgrading to java17, cloudevents latest version
#228
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
39db8b2

upgrading to java17, cloudevents latest version


abhupadh Mar 6, 2025
572e199

adding license header


abhupadh Mar 6, 2025
e84f396

upgrading aio-lib-java version to 3.0.0 as major release for java17 u…


abhupadh Mar 6, 2025
38a4d18

minor refactoring


abhupadh Mar 7, 2025
52c8f90

review comment


abhupadh Mar 7, 2025
4478d8c

using correct snapshot version for aio-lib-java in all child modules


abhupadh Mar 13, 2025

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: 1 addition & 1 deletion
aem/aio_aem_events/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@
 <groupId>com.adobe.aio.aem</groupId>
 <artifactId>aio-aem</artifactId>
 <relativePath>../pom.xml</relativePath>
 <version>2.0.1-SNAPSHOT</version>
 <version>3.0.0-SNAPSHOT</version>
 </parent>

 <artifactId>aio-aem-events</artifactId>
Expand Down

2 changes: 1 addition & 1 deletion
aem/core_aem/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,7 @@
 <groupId>com.adobe.aio.aem</groupId>
 <artifactId>aio-aem</artifactId>
 <relativePath>../pom.xml</relativePath>
 <version>2.0.1-SNAPSHOT</version>
 <version>3.0.0-SNAPSHOT</version>
 </parent>

 <artifactId>aio-aem-core</artifactId>
Expand Down

2 changes: 1 addition & 1 deletion
aem/events_ingress_aem/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,7 @@
 <groupId>com.adobe.aio.aem</groupId>
 <artifactId>aio-aem</artifactId>
 <relativePath>../pom.xml</relativePath>
 <version>2.0.1-SNAPSHOT</version>
 <version>3.0.0-SNAPSHOT</version>
 </parent>

 <artifactId>aio-aem-events-publish</artifactId>
Expand Down

2 changes: 1 addition & 1 deletion
aem/events_mgmt_aem/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,7 @@
 <groupId>com.adobe.aio.aem</groupId>
 <artifactId>aio-aem</artifactId>
 <relativePath>../pom.xml</relativePath>
 <version>2.0.1-SNAPSHOT</version>
 <version>3.0.0-SNAPSHOT</version>
 </parent>

 <artifactId>aio-aem-events-mgmt</artifactId>
Expand Down

2 changes: 1 addition & 1 deletion
aem/events_osgi_mapping/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,7 @@
 <groupId>com.adobe.aio.aem</groupId>
 <artifactId>aio-aem</artifactId>
 <relativePath>../pom.xml</relativePath>
 <version>2.0.1-SNAPSHOT</version>
 <version>3.0.0-SNAPSHOT</version>
 </parent>

 <artifactId>aio-aem-events-osgi-mapping</artifactId>
Expand Down

2 changes: 1 addition & 1 deletion
aem/lib_osgi/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@
 <groupId>com.adobe.aio.aem</groupId>
 <artifactId>aio-aem</artifactId>
 <relativePath>../pom.xml</relativePath>
 <version>2.0.1-SNAPSHOT</version>
 <version>3.0.0-SNAPSHOT</version>
 </parent>

 <artifactId>aio-lib-osgi</artifactId>
Expand Down

2 changes: 1 addition & 1 deletion
aem/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,7 @@
 <groupId>com.adobe.aio</groupId>
 <artifactId>aio-lib-java</artifactId>
 <relativePath>../pom.xml</relativePath>
 <version>2.0.1-SNAPSHOT</version>
 <version>3.0.0-SNAPSHOT</version>
 </parent>

 <groupId>com.adobe.aio.aem</groupId>
Expand Down

2 changes: 1 addition & 1 deletion
core/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@
 <parent>
 <groupId>com.adobe.aio</groupId>
 <artifactId>aio-lib-java</artifactId>
 <version>2.0.1-SNAPSHOT</version>
 <version>3.0.0-SNAPSHOT</version>
 <relativePath>../pom.xml</relativePath>
 </parent>
 <modelVersion>4.0.0</modelVersion>
Expand Down

35 changes: 35 additions & 0 deletions
core/src/main/java/com/adobe/aio/cloudevents/ZonedDateTimeDeserializer.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
/*
 * 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.cloudevents;

import com.fasterxml.jackson.core.JacksonException;
import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.databind.DeserializationContext;
import com.fasterxml.jackson.databind.JsonDeserializer;
import java.io.IOException;
import java.time.DateTimeException;
import java.time.ZonedDateTime;
import java.time.format.DateTimeFormatter;

public class ZonedDateTimeDeserializer extends JsonDeserializer<ZonedDateTime> {

 @Override
 public ZonedDateTime deserialize(
 JsonParser jsonParser, DeserializationContext deserializationContext)
 throws IOException, JacksonException {
 try {
 return ZonedDateTime.parse(jsonParser.getText(), DateTimeFormatter.ISO_OFFSET_DATE_TIME);
 } catch (DateTimeException e) {
 throw new IllegalArgumentException("could not parse", e);
 }
 }
}

31 changes: 31 additions & 0 deletions
core/src/main/java/com/adobe/aio/cloudevents/ZonedDateTimeSerializer.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
/*
 * 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.cloudevents;

import com.fasterxml.jackson.core.JsonGenerator;
import com.fasterxml.jackson.databind.JsonSerializer;
import com.fasterxml.jackson.databind.SerializerProvider;
import java.io.IOException;
import java.time.ZonedDateTime;
import java.time.format.DateTimeFormatter;

public class ZonedDateTimeSerializer extends JsonSerializer<ZonedDateTime> {

 @Override
 public void serialize(
 ZonedDateTime zonedDateTime,
 JsonGenerator jsonGenerator,
 SerializerProvider serializerProvider)
 throws IOException {
 jsonGenerator.writeString(zonedDateTime.format(DateTimeFormatter.ISO_OFFSET_DATE_TIME));
 }
}

4 changes: 2 additions & 2 deletions
core/src/main/java/com/adobe/aio/util/JacksonUtil.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,8 @@
 */
package com.adobe.aio.util;

import com.adobe.aio.cloudevents.ZonedDateTimeDeserializer;
import com.adobe.aio.cloudevents.ZonedDateTimeSerializer;
import com.fasterxml.jackson.annotation.JsonInclude.Include;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.DeserializationFeature;
Expand All@@ -20,8 +22,6 @@
import com.fasterxml.jackson.databind.module.SimpleModule;
import com.fasterxml.jackson.databind.node.TextNode;
import com.fasterxml.jackson.datatype.jdk8.Jdk8Module;
import io.cloudevents.json.ZonedDateTimeDeserializer;
import io.cloudevents.json.ZonedDateTimeSerializer;
import io.openapitools.jackson.dataformat.hal.JacksonHALModule;
import java.time.ZonedDateTime;
import org.apache.commons.lang3.StringUtils;
Expand Down

2 changes: 1 addition & 1 deletion
events_ingress/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@
 <parent>
 <groupId>com.adobe.aio</groupId>
 <artifactId>aio-lib-java</artifactId>
 <version>2.0.1-SNAPSHOT</version>
 <version>3.0.0-SNAPSHOT</version>
 <relativePath>../pom.xml</relativePath>
 </parent>
 <modelVersion>4.0.0</modelVersion>
Expand Down

2 changes: 1 addition & 1 deletion
events_journal/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@
 <parent>
 <groupId>com.adobe.aio</groupId>
 <artifactId>aio-lib-java</artifactId>
 <version>2.0.1-SNAPSHOT</version>
 <version>3.0.0-SNAPSHOT</version>
 <relativePath>../pom.xml</relativePath>
 </parent>
 <modelVersion>4.0.0</modelVersion>
Expand Down

2 changes: 1 addition & 1 deletion
events_mgmt/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@
 <parent>
 <groupId>com.adobe.aio</groupId>
 <artifactId>aio-lib-java</artifactId>
 <version>2.0.1-SNAPSHOT</version>
 <version>3.0.0-SNAPSHOT</version>
 <relativePath>../pom.xml</relativePath>
 </parent>
 <modelVersion>4.0.0</modelVersion>
Expand Down

2 changes: 1 addition & 1 deletion
events_test/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@
 <parent>
 <groupId>com.adobe.aio</groupId>
 <artifactId>aio-lib-java</artifactId>
 <version>2.0.1-SNAPSHOT</version>
 <version>3.0.0-SNAPSHOT</version>
 <relativePath>../pom.xml</relativePath>
 </parent>
 <modelVersion>4.0.0</modelVersion>
Expand Down

2 changes: 1 addition & 1 deletion
events_webhook/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@
 <parent>
 <groupId>com.adobe.aio</groupId>
 <artifactId>aio-lib-java</artifactId>
 <version>2.0.1-SNAPSHOT</version>
 <version>3.0.0-SNAPSHOT</version>
 <relativePath>../pom.xml</relativePath>
 </parent>
 <modelVersion>4.0.0</modelVersion>
Expand Down

15 changes: 6 additions & 9 deletions
events_webhook/src/test/java/com/adobe/aio/event/webhook/feign/FeignPubKeyServiceTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,23 +1,20 @@
package com.adobe.aio.event.webhook.feign;

import java.io.File;
import java.security.KeyFactory;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.mockserver.model.HttpRequest.request;
import static org.mockserver.model.HttpResponse.response;

import java.security.KeyPair;
import java.security.KeyPairGenerator;
import java.security.PublicKey;

import javax.crypto.KeyGenerator;

import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockserver.client.MockServerClient;
import org.mockserver.junit.jupiter.MockServerExtension;
import shaded_package.org.apache.commons.codec.binary.Base64;

import static org.junit.jupiter.api.Assertions.*;
import static org.mockserver.model.HttpRequest.*;
import static org.mockserver.model.HttpResponse.*;

@ExtendWith(MockServerExtension.class)
public class FeignPubKeyServiceTest {

Expand Down

2 changes: 1 addition & 1 deletion
events_xdm/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@
 <parent>
 <groupId>com.adobe.aio</groupId>
 <artifactId>aio-lib-java</artifactId>
 <version>2.0.1-SNAPSHOT</version>
 <version>3.0.0-SNAPSHOT</version>
 <relativePath>../pom.xml</relativePath>
 </parent>
 <modelVersion>4.0.0</modelVersion>
Expand Down

2 changes: 1 addition & 1 deletion
ims/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@
 <parent>
 <groupId>com.adobe.aio</groupId>
 <artifactId>aio-lib-java</artifactId>
 <version>2.0.1-SNAPSHOT</version>
 <version>3.0.0-SNAPSHOT</version>
 <relativePath>../pom.xml</relativePath>
 </parent>
 <modelVersion>4.0.0</modelVersion>
Expand Down

16 changes: 8 additions & 8 deletions
pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,7 @@

 <groupId>com.adobe.aio</groupId>
 <artifactId>aio-lib-java</artifactId>
 <version>2.0.1-SNAPSHOT</version>
 <version>3.0.0-SNAPSHOT</version>
 <packaging>pom</packaging>

 <modules>
Expand DownExpand Up@@ -96,15 +96,15 @@

 <jacoco.version>0.8.10</jacoco.version>

 <commons-text.version>1.10.0</commons-text.version>
 <commons-text.version>1.13.0</commons-text.version>
 <commons-lang3.version>3.13.0</commons-lang3.version>
 <junit.version>5.10.0</junit.version>
 <mockito.version>5.4.0</mockito.version>
 <slf4j.version>1.7.6</slf4j.version>
 <jackson.version>2.13.4</jackson.version>
 <mockito.version>5.11.0</mockito.version>
 <slf4j.version>2.0.12</slf4j.version>
 <jackson.version>2.17.2</jackson.version>
 <jjwt.version>0.11.5</jjwt.version>

 <cloudevents.version>1.2.0</cloudevents.version>
 <cloudevents.version>4.0.1</cloudevents.version>
 <!-- we'll stick to this CloudEvents v1 version for now -->

 <!-- https://github.com/openapi-tools/jackson-dataformat-hal/blob/v1.0.9/pom.xml -->
Expand DownExpand Up@@ -259,8 +259,8 @@
 <version>[3.3.9,)</version>
 </requireMavenVersion>
 <requireJavaVersion>
 <message>Maven must be executed with a Java 8 JRE or higher.</message>
 <version>1.8.0</version>
 <message>Maven must be executed with a Java 17 JRE or higher.</message>
 <version>1.17.0</version>
 </requireJavaVersion>
 </rules>
 </configuration>
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
upgrading to java17, cloudevents latest version#228

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

abhupadh
wants to merge
6
commits into

base:main
Choose a base branch

from

 Open


upgrading to java17, cloudevents latest version
#228
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
39db8b2

upgrading to java17, cloudevents latest version


abhupadh Mar 6, 2025
572e199

adding license header


abhupadh Mar 6, 2025
e84f396

upgrading aio-lib-java version to 3.0.0 as major release for java17 u…


abhupadh Mar 6, 2025
38a4d18

minor refactoring


abhupadh Mar 7, 2025
52c8f90

review comment


abhupadh Mar 7, 2025
4478d8c

using correct snapshot version for aio-lib-java in all child modules


abhupadh Mar 13, 2025

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: 1 addition & 1 deletion
aem/aio_aem_events/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@
 <groupId>com.adobe.aio.aem</groupId>
 <artifactId>aio-aem</artifactId>
 <relativePath>../pom.xml</relativePath>
 <version>2.0.1-SNAPSHOT</version>
 <version>3.0.0-SNAPSHOT</version>
 </parent>

 <artifactId>aio-aem-events</artifactId>
Expand Down

2 changes: 1 addition & 1 deletion
aem/core_aem/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,7 @@
 <groupId>com.adobe.aio.aem</groupId>
 <artifactId>aio-aem</artifactId>
 <relativePath>../pom.xml</relativePath>
 <version>2.0.1-SNAPSHOT</version>
 <version>3.0.0-SNAPSHOT</version>
 </parent>

 <artifactId>aio-aem-core</artifactId>
Expand Down

2 changes: 1 addition & 1 deletion
aem/events_ingress_aem/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,7 @@
 <groupId>com.adobe.aio.aem</groupId>
 <artifactId>aio-aem</artifactId>
 <relativePath>../pom.xml</relativePath>
 <version>2.0.1-SNAPSHOT</version>
 <version>3.0.0-SNAPSHOT</version>
 </parent>

 <artifactId>aio-aem-events-publish</artifactId>
Expand Down

2 changes: 1 addition & 1 deletion
aem/events_mgmt_aem/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,7 @@
 <groupId>com.adobe.aio.aem</groupId>
 <artifactId>aio-aem</artifactId>
 <relativePath>../pom.xml</relativePath>
 <version>2.0.1-SNAPSHOT</version>
 <version>3.0.0-SNAPSHOT</version>
 </parent>

 <artifactId>aio-aem-events-mgmt</artifactId>
Expand Down

2 changes: 1 addition & 1 deletion
aem/events_osgi_mapping/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,7 @@
 <groupId>com.adobe.aio.aem</groupId>
 <artifactId>aio-aem</artifactId>
 <relativePath>../pom.xml</relativePath>
 <version>2.0.1-SNAPSHOT</version>
 <version>3.0.0-SNAPSHOT</version>
 </parent>

 <artifactId>aio-aem-events-osgi-mapping</artifactId>
Expand Down

2 changes: 1 addition & 1 deletion
aem/lib_osgi/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@
 <groupId>com.adobe.aio.aem</groupId>
 <artifactId>aio-aem</artifactId>
 <relativePath>../pom.xml</relativePath>
 <version>2.0.1-SNAPSHOT</version>
 <version>3.0.0-SNAPSHOT</version>
 </parent>

 <artifactId>aio-lib-osgi</artifactId>
Expand Down

2 changes: 1 addition & 1 deletion
aem/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,7 @@
 <groupId>com.adobe.aio</groupId>
 <artifactId>aio-lib-java</artifactId>
 <relativePath>../pom.xml</relativePath>
 <version>2.0.1-SNAPSHOT</version>
 <version>3.0.0-SNAPSHOT</version>
 </parent>

 <groupId>com.adobe.aio.aem</groupId>
Expand Down

2 changes: 1 addition & 1 deletion
core/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@
 <parent>
 <groupId>com.adobe.aio</groupId>
 <artifactId>aio-lib-java</artifactId>
 <version>2.0.1-SNAPSHOT</version>
 <version>3.0.0-SNAPSHOT</version>
 <relativePath>../pom.xml</relativePath>
 </parent>
 <modelVersion>4.0.0</modelVersion>
Expand Down

35 changes: 35 additions & 0 deletions
core/src/main/java/com/adobe/aio/cloudevents/ZonedDateTimeDeserializer.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
/*
 * 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.cloudevents;

import com.fasterxml.jackson.core.JacksonException;
import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.databind.DeserializationContext;
import com.fasterxml.jackson.databind.JsonDeserializer;
import java.io.IOException;
import java.time.DateTimeException;
import java.time.ZonedDateTime;
import java.time.format.DateTimeFormatter;

public class ZonedDateTimeDeserializer extends JsonDeserializer<ZonedDateTime> {

 @Override
 public ZonedDateTime deserialize(
 JsonParser jsonParser, DeserializationContext deserializationContext)
 throws IOException, JacksonException {
 try {
 return ZonedDateTime.parse(jsonParser.getText(), DateTimeFormatter.ISO_OFFSET_DATE_TIME);
 } catch (DateTimeException e) {
 throw new IllegalArgumentException("could not parse", e);
 }
 }
}

31 changes: 31 additions & 0 deletions
core/src/main/java/com/adobe/aio/cloudevents/ZonedDateTimeSerializer.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
/*
 * 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.cloudevents;

import com.fasterxml.jackson.core.JsonGenerator;
import com.fasterxml.jackson.databind.JsonSerializer;
import com.fasterxml.jackson.databind.SerializerProvider;
import java.io.IOException;
import java.time.ZonedDateTime;
import java.time.format.DateTimeFormatter;

public class ZonedDateTimeSerializer extends JsonSerializer<ZonedDateTime> {

 @Override
 public void serialize(
 ZonedDateTime zonedDateTime,
 JsonGenerator jsonGenerator,
 SerializerProvider serializerProvider)
 throws IOException {
 jsonGenerator.writeString(zonedDateTime.format(DateTimeFormatter.ISO_OFFSET_DATE_TIME));
 }
}

4 changes: 2 additions & 2 deletions
core/src/main/java/com/adobe/aio/util/JacksonUtil.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,8 @@
 */
package com.adobe.aio.util;

import com.adobe.aio.cloudevents.ZonedDateTimeDeserializer;
import com.adobe.aio.cloudevents.ZonedDateTimeSerializer;
import com.fasterxml.jackson.annotation.JsonInclude.Include;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.DeserializationFeature;
Expand All@@ -20,8 +22,6 @@
import com.fasterxml.jackson.databind.module.SimpleModule;
import com.fasterxml.jackson.databind.node.TextNode;
import com.fasterxml.jackson.datatype.jdk8.Jdk8Module;
import io.cloudevents.json.ZonedDateTimeDeserializer;
import io.cloudevents.json.ZonedDateTimeSerializer;
import io.openapitools.jackson.dataformat.hal.JacksonHALModule;
import java.time.ZonedDateTime;
import org.apache.commons.lang3.StringUtils;
Expand Down

2 changes: 1 addition & 1 deletion
events_ingress/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@
 <parent>
 <groupId>com.adobe.aio</groupId>
 <artifactId>aio-lib-java</artifactId>
 <version>2.0.1-SNAPSHOT</version>
 <version>3.0.0-SNAPSHOT</version>
 <relativePath>../pom.xml</relativePath>
 </parent>
 <modelVersion>4.0.0</modelVersion>
Expand Down

2 changes: 1 addition & 1 deletion
events_journal/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@
 <parent>
 <groupId>com.adobe.aio</groupId>
 <artifactId>aio-lib-java</artifactId>
 <version>2.0.1-SNAPSHOT</version>
 <version>3.0.0-SNAPSHOT</version>
 <relativePath>../pom.xml</relativePath>
 </parent>
 <modelVersion>4.0.0</modelVersion>
Expand Down

2 changes: 1 addition & 1 deletion
events_mgmt/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@
 <parent>
 <groupId>com.adobe.aio</groupId>
 <artifactId>aio-lib-java</artifactId>
 <version>2.0.1-SNAPSHOT</version>
 <version>3.0.0-SNAPSHOT</version>
 <relativePath>../pom.xml</relativePath>
 </parent>
 <modelVersion>4.0.0</modelVersion>
Expand Down

2 changes: 1 addition & 1 deletion
events_test/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@
 <parent>
 <groupId>com.adobe.aio</groupId>
 <artifactId>aio-lib-java</artifactId>
 <version>2.0.1-SNAPSHOT</version>
 <version>3.0.0-SNAPSHOT</version>
 <relativePath>../pom.xml</relativePath>
 </parent>
 <modelVersion>4.0.0</modelVersion>
Expand Down

2 changes: 1 addition & 1 deletion
events_webhook/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@
 <parent>
 <groupId>com.adobe.aio</groupId>
 <artifactId>aio-lib-java</artifactId>
 <version>2.0.1-SNAPSHOT</version>
 <version>3.0.0-SNAPSHOT</version>
 <relativePath>../pom.xml</relativePath>
 </parent>
 <modelVersion>4.0.0</modelVersion>
Expand Down

15 changes: 6 additions & 9 deletions
events_webhook/src/test/java/com/adobe/aio/event/webhook/feign/FeignPubKeyServiceTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,23 +1,20 @@
package com.adobe.aio.event.webhook.feign;

import java.io.File;
import java.security.KeyFactory;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.mockserver.model.HttpRequest.request;
import static org.mockserver.model.HttpResponse.response;

import java.security.KeyPair;
import java.security.KeyPairGenerator;
import java.security.PublicKey;

import javax.crypto.KeyGenerator;

import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockserver.client.MockServerClient;
import org.mockserver.junit.jupiter.MockServerExtension;
import shaded_package.org.apache.commons.codec.binary.Base64;

import static org.junit.jupiter.api.Assertions.*;
import static org.mockserver.model.HttpRequest.*;
import static org.mockserver.model.HttpResponse.*;

@ExtendWith(MockServerExtension.class)
public class FeignPubKeyServiceTest {

Expand Down

2 changes: 1 addition & 1 deletion
events_xdm/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@
 <parent>
 <groupId>com.adobe.aio</groupId>
 <artifactId>aio-lib-java</artifactId>
 <version>2.0.1-SNAPSHOT</version>
 <version>3.0.0-SNAPSHOT</version>
 <relativePath>../pom.xml</relativePath>
 </parent>
 <modelVersion>4.0.0</modelVersion>
Expand Down

2 changes: 1 addition & 1 deletion
ims/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@
 <parent>
 <groupId>com.adobe.aio</groupId>
 <artifactId>aio-lib-java</artifactId>
 <version>2.0.1-SNAPSHOT</version>
 <version>3.0.0-SNAPSHOT</version>
 <relativePath>../pom.xml</relativePath>
 </parent>
 <modelVersion>4.0.0</modelVersion>
Expand Down

16 changes: 8 additions & 8 deletions
pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,7 @@

 <groupId>com.adobe.aio</groupId>
 <artifactId>aio-lib-java</artifactId>
 <version>2.0.1-SNAPSHOT</version>
 <version>3.0.0-SNAPSHOT</version>
 <packaging>pom</packaging>

 <modules>
Expand DownExpand Up@@ -96,15 +96,15 @@

 <jacoco.version>0.8.10</jacoco.version>

 <commons-text.version>1.10.0</commons-text.version>
 <commons-text.version>1.13.0</commons-text.version>
 <commons-lang3.version>3.13.0</commons-lang3.version>
 <junit.version>5.10.0</junit.version>
 <mockito.version>5.4.0</mockito.version>
 <slf4j.version>1.7.6</slf4j.version>
 <jackson.version>2.13.4</jackson.version>
 <mockito.version>5.11.0</mockito.version>
 <slf4j.version>2.0.12</slf4j.version>
 <jackson.version>2.17.2</jackson.version>
 <jjwt.version>0.11.5</jjwt.version>

 <cloudevents.version>1.2.0</cloudevents.version>
 <cloudevents.version>4.0.1</cloudevents.version>
 <!-- we'll stick to this CloudEvents v1 version for now -->

 <!-- https://github.com/openapi-tools/jackson-dataformat-hal/blob/v1.0.9/pom.xml -->
Expand DownExpand Up@@ -259,8 +259,8 @@
 <version>[3.3.9,)</version>
 </requireMavenVersion>
 <requireJavaVersion>
 <message>Maven must be executed with a Java 8 JRE or higher.</message>
 <version>1.8.0</version>
 <message>Maven must be executed with a Java 17 JRE or higher.</message>
 <version>1.17.0</version>
 </requireJavaVersion>
 </rules>
 </configuration>
Expand Down