From addfd66e476840ebdb80e3b2ea950ca063a92ab4 Mon Sep 17 00:00:00 2001 From: Pulkit Gupta Date: Wed, 26 Oct 2022 17:42:26 +0530 Subject: [PATCH 1/8] Made the code compatible with java 8 --- .../test/java/com/adobe/aio/util/FileUtilTest.java | 11 +++++++---- .../feign/FeignProviderServiceIntegrationTest.java | 11 +++++------ .../FeignRegistrationServiceIntegrationTest.java | 4 ++-- .../java/com/adobe/aio/ims/util/KeyStoreUtil.java | 3 ++- pom.xml | 8 ++++---- 5 files changed, 20 insertions(+), 17 deletions(-) diff --git a/core/src/test/java/com/adobe/aio/util/FileUtilTest.java b/core/src/test/java/com/adobe/aio/util/FileUtilTest.java index 58894fb5..b77f9f88 100644 --- a/core/src/test/java/com/adobe/aio/util/FileUtilTest.java +++ b/core/src/test/java/com/adobe/aio/util/FileUtilTest.java @@ -14,6 +14,8 @@ import static org.junit.Assert.assertEquals; import com.adobe.aio.util.FileUtil; + +import java.util.HashMap; import java.util.Map; import java.util.Properties; import org.junit.Assert; @@ -33,14 +35,15 @@ private Properties getTestProperties() { @Test public void testGetMapFromProperties() { - assertEquals(Map.ofEntries(Map.entry(KEY, VALUE)), - FileUtil.getMapFromProperties(getTestProperties())); + Map map = new HashMap<>(); + map.put(KEY, VALUE); + assertEquals(map, FileUtil.getMapFromProperties(getTestProperties())); } @Test public void testReadPropertiesFromFile() throws Exception { - Assert.assertTrue(FileUtil.readPropertiesFromFile("").isEmpty()); - Assert.assertTrue(FileUtil.readPropertiesFromFile(null).isEmpty()); + Assert.assertFalse(FileUtil.readPropertiesFromFile("").isPresent()); + Assert.assertFalse(FileUtil.readPropertiesFromFile(null).isPresent()); } @Test diff --git a/events_journal/src/test/java/com/adobe/aio/event/management/feign/FeignProviderServiceIntegrationTest.java b/events_journal/src/test/java/com/adobe/aio/event/management/feign/FeignProviderServiceIntegrationTest.java index 81f2c744..0ac41920 100644 --- a/events_journal/src/test/java/com/adobe/aio/event/management/feign/FeignProviderServiceIntegrationTest.java +++ b/events_journal/src/test/java/com/adobe/aio/event/management/feign/FeignProviderServiceIntegrationTest.java @@ -90,7 +90,7 @@ public static void deleteProvider(ProviderService providerService, String provid providerService.deleteProvider(providerId); logger.info("Deleted AIO Events Provider: {}", providerId); Optional deleted = providerService.findProviderById(providerId); - Assert.assertTrue(deleted.isEmpty()); +// Assert.assertTrue(deleted.isEmpty()); logger.info("No more AIO Events Provider with id: {}", providerId); } @@ -125,10 +125,9 @@ public void invalidFindByArg() { @Test public void getNotFound() { String idNotToBeFound = "this_id_should_not_exist"; - Assert.assertTrue(providerService.findProviderById(idNotToBeFound).isEmpty()); - Assert.assertTrue(providerService.getEventMetadata(idNotToBeFound).isEmpty()); - Assert.assertTrue( - providerService.findCustomEventsProviderByInstanceId(idNotToBeFound).isEmpty()); +// Assert.assertTrue(providerService.findProviderById(idNotToBeFound).isEmpty()); + //Assert.assertTrue(providerService.getEventMetadata(idNotToBeFound).isEmpty()); + //Assert.assertTrue(providerService.findCustomEventsProviderByInstanceId(idNotToBeFound).isEmpty()); } @Test @@ -169,7 +168,7 @@ public void createGetUpdateDelete() { logger.info("Found AIO Events Provider `{}` by InstanceId", providerById); providerService.deleteEventMetadata(providerId, TEST_EVENT_CODE); - Assert.assertTrue(providerService.getEventMetadata(providerId, TEST_EVENT_CODE).isEmpty()); + Assert.assertFalse(providerService.getEventMetadata(providerId, TEST_EVENT_CODE).isPresent()); Assert.assertTrue(providerService.getEventMetadata(providerId).isEmpty()); logger.info("Deleted EventMetadata {} from AIO Events Provider `{}`", TEST_EVENT_CODE, providerById); diff --git a/events_journal/src/test/java/com/adobe/aio/event/management/feign/FeignRegistrationServiceIntegrationTest.java b/events_journal/src/test/java/com/adobe/aio/event/management/feign/FeignRegistrationServiceIntegrationTest.java index 6256fec1..804fff98 100644 --- a/events_journal/src/test/java/com/adobe/aio/event/management/feign/FeignRegistrationServiceIntegrationTest.java +++ b/events_journal/src/test/java/com/adobe/aio/event/management/feign/FeignRegistrationServiceIntegrationTest.java @@ -86,7 +86,7 @@ public static Registration createRegistration(RegistrationService registrationSe public static void deleteRegistration(RegistrationService registrationService, String registrationId) { registrationService.delete(registrationId); - Assert.assertTrue(registrationService.findById(registrationId).isEmpty()); + Assert.assertFalse(registrationService.findById(registrationId).isPresent()); logger.info("Deleted AIO Event Registration: {}", registrationId); } @@ -121,7 +121,7 @@ public void missingWorkspace() { @Test public void getNotFound() { String idNotToBeFound = "this_id_should_not_exist"; - Assert.assertTrue(registrationService.findById(idNotToBeFound).isEmpty()); + Assert.assertFalse(registrationService.findById(idNotToBeFound).isPresent()); } @Test diff --git a/ims/src/main/java/com/adobe/aio/ims/util/KeyStoreUtil.java b/ims/src/main/java/com/adobe/aio/ims/util/KeyStoreUtil.java index ec6d54ee..85e6a346 100644 --- a/ims/src/main/java/com/adobe/aio/ims/util/KeyStoreUtil.java +++ b/ims/src/main/java/com/adobe/aio/ims/util/KeyStoreUtil.java @@ -18,6 +18,7 @@ import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.nio.file.Path; +import java.nio.file.Paths; import java.security.KeyFactory; import java.security.KeyStore; import java.security.KeyStoreException; @@ -55,7 +56,7 @@ public static PrivateKey getPrivateKeyFromEncodedPkcs8(String base64EncodedPkcs8 public static PrivateKey getPrivateKeyFromPkcs8File(String filePath) throws IOException, InvalidKeySpecException, NoSuchAlgorithmException { - return getPrivateKeyFromPkcs8(Files.readAllBytes(Path.of(filePath))); + return getPrivateKeyFromPkcs8(Files.readAllBytes(Paths.get(filePath))); } private static PrivateKey getPrivateKeyFromPkcs8(byte[] pkcs8) diff --git a/pom.xml b/pom.xml index 86c4ec13..633a2f4c 100644 --- a/pom.xml +++ b/pom.xml @@ -108,7 +108,7 @@ 11.2 3.8.0 - 0.92.5 + 0.92.7-SNAPSHOT @@ -367,8 +367,8 @@ maven-compiler-plugin 3.10.1 - 11 - 11 + 1.8 + 1.8 @@ -425,7 +425,7 @@ maven-javadoc-plugin 3.3.2 - 11 + 1.8 true true Adobe I/O - Java SDK API v${project.version} From da1cf54c0f9e683b506520cc94d3b828ef839e01 Mon Sep 17 00:00:00 2001 From: Pulkit Gupta Date: Wed, 26 Oct 2022 17:47:02 +0530 Subject: [PATCH 2/8] fixed missing migration --- .../feign/FeignProviderServiceIntegrationTest.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/events_journal/src/test/java/com/adobe/aio/event/management/feign/FeignProviderServiceIntegrationTest.java b/events_journal/src/test/java/com/adobe/aio/event/management/feign/FeignProviderServiceIntegrationTest.java index 0ac41920..171d31d1 100644 --- a/events_journal/src/test/java/com/adobe/aio/event/management/feign/FeignProviderServiceIntegrationTest.java +++ b/events_journal/src/test/java/com/adobe/aio/event/management/feign/FeignProviderServiceIntegrationTest.java @@ -125,9 +125,9 @@ public void invalidFindByArg() { @Test public void getNotFound() { String idNotToBeFound = "this_id_should_not_exist"; -// Assert.assertTrue(providerService.findProviderById(idNotToBeFound).isEmpty()); - //Assert.assertTrue(providerService.getEventMetadata(idNotToBeFound).isEmpty()); - //Assert.assertTrue(providerService.findCustomEventsProviderByInstanceId(idNotToBeFound).isEmpty()); + Assert.assertFalse(providerService.findProviderById(idNotToBeFound).isPresent()); + Assert.assertTrue(providerService.getEventMetadata(idNotToBeFound).isEmpty()); + Assert.assertFalse(providerService.findCustomEventsProviderByInstanceId(idNotToBeFound).isPresent()); } @Test From 7b00d1370f1ab5c20287d3f670b636d2e55296dd Mon Sep 17 00:00:00 2001 From: Pulkit Gupta Date: Wed, 26 Oct 2022 17:54:48 +0530 Subject: [PATCH 3/8] added one more missing migration statement --- .../management/feign/FeignProviderServiceIntegrationTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/events_journal/src/test/java/com/adobe/aio/event/management/feign/FeignProviderServiceIntegrationTest.java b/events_journal/src/test/java/com/adobe/aio/event/management/feign/FeignProviderServiceIntegrationTest.java index 171d31d1..2854cad9 100644 --- a/events_journal/src/test/java/com/adobe/aio/event/management/feign/FeignProviderServiceIntegrationTest.java +++ b/events_journal/src/test/java/com/adobe/aio/event/management/feign/FeignProviderServiceIntegrationTest.java @@ -90,7 +90,7 @@ public static void deleteProvider(ProviderService providerService, String provid providerService.deleteProvider(providerId); logger.info("Deleted AIO Events Provider: {}", providerId); Optional deleted = providerService.findProviderById(providerId); -// Assert.assertTrue(deleted.isEmpty()); + Assert.assertFalse(deleted.isPresent()); logger.info("No more AIO Events Provider with id: {}", providerId); } From 1e047417f5baff515b7f27254f04d2ce23432267 Mon Sep 17 00:00:00 2001 From: Pulkit Gupta Date: Wed, 9 Nov 2022 11:14:15 +0530 Subject: [PATCH 4/8] removed the miss in conflict resolution --- core/src/test/java/com/adobe/aio/util/FileUtilTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/test/java/com/adobe/aio/util/FileUtilTest.java b/core/src/test/java/com/adobe/aio/util/FileUtilTest.java index e77ddb84..7d91cc96 100644 --- a/core/src/test/java/com/adobe/aio/util/FileUtilTest.java +++ b/core/src/test/java/com/adobe/aio/util/FileUtilTest.java @@ -41,7 +41,7 @@ public void testGetMapFromProperties() { } @Test - public void testReadPropertiesFromFile() throws Exception { + public void testReadPropertiesFromFile() { Assert.assertFalse(FileUtil.readPropertiesFromFile("").isPresent()); Assert.assertFalse(FileUtil.readPropertiesFromFile(null).isPresent()); } From 511b6d30bc8ddec1377422dc49fee9daa1caeaf7 Mon Sep 17 00:00:00 2001 From: Pulkit Gupta Date: Wed, 9 Nov 2022 11:20:12 +0530 Subject: [PATCH 5/8] fixed more failing tests on java8 --- .../adobe/aio/event/management/ProviderServiceTester.java | 6 ++++-- .../aio/event/management/RegistrationServiceTester.java | 2 +- .../event/management/ProviderServiceIntegrationTest.java | 8 ++++---- .../management/RegistrationServiceIntegrationTest.java | 2 +- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/events_test/src/main/java/com/adobe/aio/event/management/ProviderServiceTester.java b/events_test/src/main/java/com/adobe/aio/event/management/ProviderServiceTester.java index 6d680ec5..1d948361 100644 --- a/events_test/src/main/java/com/adobe/aio/event/management/ProviderServiceTester.java +++ b/events_test/src/main/java/com/adobe/aio/event/management/ProviderServiceTester.java @@ -17,6 +17,8 @@ import com.adobe.aio.event.publish.model.CloudEvent; import com.adobe.aio.util.WorkspaceUtil; import com.adobe.aio.workspace.Workspace; + +import java.util.Collections; import java.util.Optional; import java.util.Set; import java.util.function.Supplier; @@ -59,7 +61,7 @@ public ProviderService getProviderService(){ public Provider createOrUpdateProvider(String providerLabel, String eventCode) { return createOrUpdateProvider(getTestProviderInputModelBuilder(providerLabel).build(), - Set.of(getTestEventMetadataBuilder(eventCode).build())); + Collections.singleton(getTestEventMetadataBuilder(eventCode).build())); } public Provider createOrUpdateProvider(ProviderInputModel providerInputModel, @@ -112,7 +114,7 @@ public void deleteProvider(String providerId) { providerService.deleteProvider(providerId); logger.info("Deleted AIO Events Provider: {}", providerId); Optional deleted = providerService.findProviderById(providerId); - Assert.assertTrue(deleted.isEmpty()); + Assert.assertFalse(deleted.isPresent()); logger.info("No more AIO Events Provider with id: {}", providerId); } diff --git a/events_test/src/main/java/com/adobe/aio/event/management/RegistrationServiceTester.java b/events_test/src/main/java/com/adobe/aio/event/management/RegistrationServiceTester.java index f9419b11..ba16973e 100644 --- a/events_test/src/main/java/com/adobe/aio/event/management/RegistrationServiceTester.java +++ b/events_test/src/main/java/com/adobe/aio/event/management/RegistrationServiceTester.java @@ -91,7 +91,7 @@ public Registration createRegistration( public void deleteRegistration(String registrationId) { registrationService.delete(registrationId); - Assert.assertTrue(registrationService.findById(registrationId).isEmpty()); + Assert.assertFalse(registrationService.findById(registrationId).isPresent()); logger.info("Deleted AIO Event Registration: {}", registrationId); } diff --git a/events_test/src/test/java/com/adobe/aio/event/management/ProviderServiceIntegrationTest.java b/events_test/src/test/java/com/adobe/aio/event/management/ProviderServiceIntegrationTest.java index 2a489045..2b04c9b7 100644 --- a/events_test/src/test/java/com/adobe/aio/event/management/ProviderServiceIntegrationTest.java +++ b/events_test/src/test/java/com/adobe/aio/event/management/ProviderServiceIntegrationTest.java @@ -54,10 +54,10 @@ public void invalidFindByArg() { @Test public void getNotFound() { String idNotToBeFound = "this_id_should_not_exist"; - Assert.assertTrue(providerService.findProviderById(idNotToBeFound).isEmpty()); + Assert.assertFalse(providerService.findProviderById(idNotToBeFound).isPresent()); Assert.assertTrue(providerService.getEventMetadata(idNotToBeFound).isEmpty()); - Assert.assertTrue( - providerService.findCustomEventsProviderByInstanceId(idNotToBeFound).isEmpty()); + Assert.assertFalse( + providerService.findCustomEventsProviderByInstanceId(idNotToBeFound).isPresent()); } @Test @@ -100,7 +100,7 @@ public void createGetUpdateDelete() { logger.info("Found AIO Events Provider `{}` by InstanceId", providerById); providerService.deleteEventMetadata(providerId, TEST_EVENT_CODE); - Assert.assertTrue(providerService.getEventMetadata(providerId, TEST_EVENT_CODE).isEmpty()); + Assert.assertFalse(providerService.getEventMetadata(providerId, TEST_EVENT_CODE).isPresent()); Assert.assertTrue(providerService.getEventMetadata(providerId).isEmpty()); logger.info("Deleted EventMetadata {} from AIO Events Provider `{}`", TEST_EVENT_CODE, providerById); diff --git a/events_test/src/test/java/com/adobe/aio/event/management/RegistrationServiceIntegrationTest.java b/events_test/src/test/java/com/adobe/aio/event/management/RegistrationServiceIntegrationTest.java index 0ed4583d..004e4117 100644 --- a/events_test/src/test/java/com/adobe/aio/event/management/RegistrationServiceIntegrationTest.java +++ b/events_test/src/test/java/com/adobe/aio/event/management/RegistrationServiceIntegrationTest.java @@ -40,7 +40,7 @@ public void missingWorkspace() { @Test public void getNotFound() { String idNotToBeFound = "this_id_should_not_exist"; - Assert.assertTrue(registrationService.findById(idNotToBeFound).isEmpty()); + Assert.assertFalse(registrationService.findById(idNotToBeFound).isPresent()); } @Test From 19e29b8ab9267bb9ce025d3ea93f15d35ce5453f Mon Sep 17 00:00:00 2001 From: Pulkit Gupta Date: Fri, 11 Nov 2022 16:18:51 +0530 Subject: [PATCH 6/8] wip: added java8 as a separate profile --- .gitignore | 1 + aem/aio_aem_events/pom.xml | 5 +++ aem/core_aem/pom.xml | 2 ++ aem/events_ingress_aem/pom.xml | 4 +++ aem/events_mgmt_aem/pom.xml | 2 ++ aem/events_osgi_mapping/pom.xml | 6 ++++ aem/lib_osgi/pom.xml | 7 ++++ events_ingress/pom.xml | 2 ++ events_journal/pom.xml | 4 +++ events_mgmt/pom.xml | 2 ++ events_test/pom.xml | 5 +++ ims/pom.xml | 1 + pom.xml | 61 ++++++++++++++++++++++++++++++--- 13 files changed, 98 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 538a39c7..320b8171 100644 --- a/.gitignore +++ b/.gitignore @@ -105,3 +105,4 @@ slingInstall.sh secrets */docs */*/docs +.DS_Store diff --git a/aem/aio_aem_events/pom.xml b/aem/aio_aem_events/pom.xml index 051dd390..dd527777 100644 --- a/aem/aio_aem_events/pom.xml +++ b/aem/aio_aem_events/pom.xml @@ -174,26 +174,31 @@ com.adobe.aio.aem aio-aem-events-osgi-mapping ${project.version} + ${java.version.classifier} com.adobe.aio.aem aio-aem-events-publish ${project.version} + ${java.version.classifier} com.adobe.aio.aem aio-aem-events-mgmt ${project.version} + ${java.version.classifier} com.adobe.aio.aem aio-aem-core ${project.version} + ${java.version.classifier} com.adobe.aio.aem aio-lib-osgi ${project.version} + ${java.version.classifier} diff --git a/aem/core_aem/pom.xml b/aem/core_aem/pom.xml index 71e906e4..c278f23a 100644 --- a/aem/core_aem/pom.xml +++ b/aem/core_aem/pom.xml @@ -31,12 +31,14 @@ com.adobe.aio aio-lib-java-core ${project.version} + ${java.version.classifier} provided com.adobe.aio aio-lib-java-ims ${project.version} + ${java.version.classifier} provided diff --git a/aem/events_ingress_aem/pom.xml b/aem/events_ingress_aem/pom.xml index ba794954..800b9e80 100644 --- a/aem/events_ingress_aem/pom.xml +++ b/aem/events_ingress_aem/pom.xml @@ -32,24 +32,28 @@ aio-aem-core provided ${project.version} + ${java.version.classifier} com.adobe.aio.aem aio-aem-events-mgmt provided ${project.version} + ${java.version.classifier} com.adobe.aio aio-lib-java-events-mgmt provided ${project.version} + ${java.version.classifier} com.adobe.aio aio-lib-java-events-ingress provided ${project.version} + ${java.version.classifier} diff --git a/aem/events_mgmt_aem/pom.xml b/aem/events_mgmt_aem/pom.xml index 555084c6..86b9400c 100644 --- a/aem/events_mgmt_aem/pom.xml +++ b/aem/events_mgmt_aem/pom.xml @@ -32,12 +32,14 @@ aio-aem-core provided ${project.version} + ${java.version.classifier} com.adobe.aio aio-lib-java-events-mgmt provided ${project.version} + ${java.version.classifier} diff --git a/aem/events_osgi_mapping/pom.xml b/aem/events_osgi_mapping/pom.xml index 3452fb60..52050d25 100644 --- a/aem/events_osgi_mapping/pom.xml +++ b/aem/events_osgi_mapping/pom.xml @@ -32,18 +32,21 @@ aio-aem-core provided ${project.version} + ${java.version.classifier} com.adobe.aio.aem aio-aem-events-mgmt provided ${project.version} + ${java.version.classifier} com.adobe.aio.aem aio-aem-events-publish provided ${project.version} + ${java.version.classifier} @@ -51,11 +54,14 @@ com.adobe.aio provided ${project.version} + ${java.version.classifier} xdm-event-model com.adobe.event + ${xdm.event-model.version} + ${java.version.classifier} provided diff --git a/aem/lib_osgi/pom.xml b/aem/lib_osgi/pom.xml index 852f51d9..4137bd37 100644 --- a/aem/lib_osgi/pom.xml +++ b/aem/lib_osgi/pom.xml @@ -34,32 +34,39 @@ com.adobe.event xdm-event-model + ${xdm.event-model.version} + ${java.version.classifier} com.adobe.aio aio-lib-java-ims ${project.version} + ${java.version.classifier} com.adobe.aio aio-lib-java-core ${project.version} + ${java.version.classifier} com.adobe.aio aio-lib-java-events-mgmt ${project.version} + ${java.version.classifier} com.adobe.aio aio-lib-java-events-ingress ${project.version} + ${java.version.classifier} com.adobe.aio aio-lib-java-events-journal ${project.version} + ${java.version.classifier} diff --git a/events_ingress/pom.xml b/events_ingress/pom.xml index 10d9e2f9..ea62b248 100644 --- a/events_ingress/pom.xml +++ b/events_ingress/pom.xml @@ -32,6 +32,7 @@ com.adobe.aio aio-lib-java-core ${project.version} + ${java.version.classifier} @@ -47,6 +48,7 @@ com.adobe.aio aio-lib-java-ims ${project.version} + ${java.version.classifier} diff --git a/events_journal/pom.xml b/events_journal/pom.xml index 5d76aa70..5ccb10a6 100644 --- a/events_journal/pom.xml +++ b/events_journal/pom.xml @@ -32,6 +32,7 @@ com.adobe.aio aio-lib-java-core ${project.version} + ${java.version.classifier} @@ -39,12 +40,14 @@ com.adobe.aio aio-lib-java-events-mgmt ${project.version} + ${java.version.classifier} test com.adobe.aio aio-lib-java-events-ingress ${project.version} + ${java.version.classifier} test @@ -64,6 +67,7 @@ com.adobe.aio aio-lib-java-ims ${project.version} + ${java.version.classifier} diff --git a/events_mgmt/pom.xml b/events_mgmt/pom.xml index 85aa3642..04f1c228 100644 --- a/events_mgmt/pom.xml +++ b/events_mgmt/pom.xml @@ -32,6 +32,7 @@ com.adobe.aio aio-lib-java-core ${project.version} + ${java.version.classifier} @@ -47,6 +48,7 @@ com.adobe.aio aio-lib-java-ims ${project.version} + ${java.version.classifier} diff --git a/events_test/pom.xml b/events_test/pom.xml index 0a7c3a2c..7595702f 100644 --- a/events_test/pom.xml +++ b/events_test/pom.xml @@ -32,26 +32,31 @@ com.adobe.aio aio-lib-java-core ${project.version} + ${java.version.classifier} com.adobe.aio aio-lib-java-ims ${project.version} + ${java.version.classifier} com.adobe.aio aio-lib-java-events-mgmt ${project.version} + ${java.version.classifier} com.adobe.aio aio-lib-java-events-ingress ${project.version} + ${java.version.classifier} com.adobe.aio aio-lib-java-events-journal ${project.version} + ${java.version.classifier} diff --git a/ims/pom.xml b/ims/pom.xml index 016db8ae..94ac134d 100644 --- a/ims/pom.xml +++ b/ims/pom.xml @@ -32,6 +32,7 @@ com.adobe.aio aio-lib-java-core ${project.version} + ${java.version.classifier} diff --git a/pom.xml b/pom.xml index 7bfd56be..3cb56052 100644 --- a/pom.xml +++ b/pom.xml @@ -110,7 +110,8 @@ 11.2 3.8.0 - 0.92.7-SNAPSHOT + 0.92.6-SNAPSHOT + @@ -121,6 +122,7 @@ com.adobe.event xdm-event-model ${xdm.event-model.version} + ${java.version.classifier} provided @@ -369,8 +371,8 @@ maven-compiler-plugin 3.10.1 - 1.8 - 1.8 + 11 + 11 @@ -427,7 +429,7 @@ maven-javadoc-plugin 3.3.2 - 1.8 + 11 true true Adobe I/O - Java SDK API v${project.version} @@ -662,6 +664,57 @@ + + java8 + + false + + + java8 + + + + + + + org.apache.maven.plugins + maven-jar-plugin + 3.2.0 + + ${java.version.classifier} + + + + org.apache.maven.plugins + maven-compiler-plugin + + 1.8 + 1.8 + + + + org.apache.maven.plugins + maven-javadoc-plugin + 3.3.2 + + 1.8 + true + true + Adobe I/O - Java SDK API v${project.version} + Adobe I/O - Java SDK API v${project.version} + + *.impl, + *.internal, + *.internal.*, + *.api, + *.feign, + *.feign.* + + + + + + From 20604ad69c07c0d7a8996b9a265fb92b7ac735f4 Mon Sep 17 00:00:00 2001 From: Pulkit Gupta Date: Wed, 16 Nov 2022 15:40:52 +0530 Subject: [PATCH 7/8] Revert "wip: added java8 as a separate profile" This reverts commit 19e29b8ab9267bb9ce025d3ea93f15d35ce5453f. --- .gitignore | 1 - aem/aio_aem_events/pom.xml | 5 --- aem/core_aem/pom.xml | 2 -- aem/events_ingress_aem/pom.xml | 4 --- aem/events_mgmt_aem/pom.xml | 2 -- aem/events_osgi_mapping/pom.xml | 6 ---- aem/lib_osgi/pom.xml | 7 ---- events_ingress/pom.xml | 2 -- events_journal/pom.xml | 4 --- events_mgmt/pom.xml | 2 -- events_test/pom.xml | 5 --- ims/pom.xml | 1 - pom.xml | 61 +++------------------------------ 13 files changed, 4 insertions(+), 98 deletions(-) diff --git a/.gitignore b/.gitignore index 320b8171..538a39c7 100644 --- a/.gitignore +++ b/.gitignore @@ -105,4 +105,3 @@ slingInstall.sh secrets */docs */*/docs -.DS_Store diff --git a/aem/aio_aem_events/pom.xml b/aem/aio_aem_events/pom.xml index dd527777..051dd390 100644 --- a/aem/aio_aem_events/pom.xml +++ b/aem/aio_aem_events/pom.xml @@ -174,31 +174,26 @@ com.adobe.aio.aem aio-aem-events-osgi-mapping ${project.version} - ${java.version.classifier} com.adobe.aio.aem aio-aem-events-publish ${project.version} - ${java.version.classifier} com.adobe.aio.aem aio-aem-events-mgmt ${project.version} - ${java.version.classifier} com.adobe.aio.aem aio-aem-core ${project.version} - ${java.version.classifier} com.adobe.aio.aem aio-lib-osgi ${project.version} - ${java.version.classifier} diff --git a/aem/core_aem/pom.xml b/aem/core_aem/pom.xml index c278f23a..71e906e4 100644 --- a/aem/core_aem/pom.xml +++ b/aem/core_aem/pom.xml @@ -31,14 +31,12 @@ com.adobe.aio aio-lib-java-core ${project.version} - ${java.version.classifier} provided com.adobe.aio aio-lib-java-ims ${project.version} - ${java.version.classifier} provided diff --git a/aem/events_ingress_aem/pom.xml b/aem/events_ingress_aem/pom.xml index 800b9e80..ba794954 100644 --- a/aem/events_ingress_aem/pom.xml +++ b/aem/events_ingress_aem/pom.xml @@ -32,28 +32,24 @@ aio-aem-core provided ${project.version} - ${java.version.classifier} com.adobe.aio.aem aio-aem-events-mgmt provided ${project.version} - ${java.version.classifier} com.adobe.aio aio-lib-java-events-mgmt provided ${project.version} - ${java.version.classifier} com.adobe.aio aio-lib-java-events-ingress provided ${project.version} - ${java.version.classifier} diff --git a/aem/events_mgmt_aem/pom.xml b/aem/events_mgmt_aem/pom.xml index 86b9400c..555084c6 100644 --- a/aem/events_mgmt_aem/pom.xml +++ b/aem/events_mgmt_aem/pom.xml @@ -32,14 +32,12 @@ aio-aem-core provided ${project.version} - ${java.version.classifier} com.adobe.aio aio-lib-java-events-mgmt provided ${project.version} - ${java.version.classifier} diff --git a/aem/events_osgi_mapping/pom.xml b/aem/events_osgi_mapping/pom.xml index 52050d25..3452fb60 100644 --- a/aem/events_osgi_mapping/pom.xml +++ b/aem/events_osgi_mapping/pom.xml @@ -32,21 +32,18 @@ aio-aem-core provided ${project.version} - ${java.version.classifier} com.adobe.aio.aem aio-aem-events-mgmt provided ${project.version} - ${java.version.classifier} com.adobe.aio.aem aio-aem-events-publish provided ${project.version} - ${java.version.classifier} @@ -54,14 +51,11 @@ com.adobe.aio provided ${project.version} - ${java.version.classifier} xdm-event-model com.adobe.event - ${xdm.event-model.version} - ${java.version.classifier} provided diff --git a/aem/lib_osgi/pom.xml b/aem/lib_osgi/pom.xml index 4137bd37..852f51d9 100644 --- a/aem/lib_osgi/pom.xml +++ b/aem/lib_osgi/pom.xml @@ -34,39 +34,32 @@ com.adobe.event xdm-event-model - ${xdm.event-model.version} - ${java.version.classifier} com.adobe.aio aio-lib-java-ims ${project.version} - ${java.version.classifier} com.adobe.aio aio-lib-java-core ${project.version} - ${java.version.classifier} com.adobe.aio aio-lib-java-events-mgmt ${project.version} - ${java.version.classifier} com.adobe.aio aio-lib-java-events-ingress ${project.version} - ${java.version.classifier} com.adobe.aio aio-lib-java-events-journal ${project.version} - ${java.version.classifier} diff --git a/events_ingress/pom.xml b/events_ingress/pom.xml index ea62b248..10d9e2f9 100644 --- a/events_ingress/pom.xml +++ b/events_ingress/pom.xml @@ -32,7 +32,6 @@ com.adobe.aio aio-lib-java-core ${project.version} - ${java.version.classifier} @@ -48,7 +47,6 @@ com.adobe.aio aio-lib-java-ims ${project.version} - ${java.version.classifier} diff --git a/events_journal/pom.xml b/events_journal/pom.xml index 5ccb10a6..5d76aa70 100644 --- a/events_journal/pom.xml +++ b/events_journal/pom.xml @@ -32,7 +32,6 @@ com.adobe.aio aio-lib-java-core ${project.version} - ${java.version.classifier} @@ -40,14 +39,12 @@ com.adobe.aio aio-lib-java-events-mgmt ${project.version} - ${java.version.classifier} test com.adobe.aio aio-lib-java-events-ingress ${project.version} - ${java.version.classifier} test @@ -67,7 +64,6 @@ com.adobe.aio aio-lib-java-ims ${project.version} - ${java.version.classifier} diff --git a/events_mgmt/pom.xml b/events_mgmt/pom.xml index 04f1c228..85aa3642 100644 --- a/events_mgmt/pom.xml +++ b/events_mgmt/pom.xml @@ -32,7 +32,6 @@ com.adobe.aio aio-lib-java-core ${project.version} - ${java.version.classifier} @@ -48,7 +47,6 @@ com.adobe.aio aio-lib-java-ims ${project.version} - ${java.version.classifier} diff --git a/events_test/pom.xml b/events_test/pom.xml index 7595702f..0a7c3a2c 100644 --- a/events_test/pom.xml +++ b/events_test/pom.xml @@ -32,31 +32,26 @@ com.adobe.aio aio-lib-java-core ${project.version} - ${java.version.classifier} com.adobe.aio aio-lib-java-ims ${project.version} - ${java.version.classifier} com.adobe.aio aio-lib-java-events-mgmt ${project.version} - ${java.version.classifier} com.adobe.aio aio-lib-java-events-ingress ${project.version} - ${java.version.classifier} com.adobe.aio aio-lib-java-events-journal ${project.version} - ${java.version.classifier} diff --git a/ims/pom.xml b/ims/pom.xml index 94ac134d..016db8ae 100644 --- a/ims/pom.xml +++ b/ims/pom.xml @@ -32,7 +32,6 @@ com.adobe.aio aio-lib-java-core ${project.version} - ${java.version.classifier} diff --git a/pom.xml b/pom.xml index 3cb56052..7bfd56be 100644 --- a/pom.xml +++ b/pom.xml @@ -110,8 +110,7 @@ 11.2 3.8.0 - 0.92.6-SNAPSHOT - + 0.92.7-SNAPSHOT @@ -122,7 +121,6 @@ com.adobe.event xdm-event-model ${xdm.event-model.version} - ${java.version.classifier} provided @@ -371,8 +369,8 @@ maven-compiler-plugin 3.10.1 - 11 - 11 + 1.8 + 1.8 @@ -429,7 +427,7 @@ maven-javadoc-plugin 3.3.2 - 11 + 1.8 true true Adobe I/O - Java SDK API v${project.version} @@ -664,57 +662,6 @@ - - java8 - - false - - - java8 - - - - - - - org.apache.maven.plugins - maven-jar-plugin - 3.2.0 - - ${java.version.classifier} - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.8 - 1.8 - - - - org.apache.maven.plugins - maven-javadoc-plugin - 3.3.2 - - 1.8 - true - true - Adobe I/O - Java SDK API v${project.version} - Adobe I/O - Java SDK API v${project.version} - - *.impl, - *.internal, - *.internal.*, - *.api, - *.feign, - *.feign.* - - - - - - From ebf2824bf91667a4ad225635711c380ecff7dd50 Mon Sep 17 00:00:00 2001 From: Pulkit Gupta Date: Wed, 16 Nov 2022 15:52:02 +0530 Subject: [PATCH 8/8] fixed the dependency of xdm event model --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7bfd56be..f52362bb 100644 --- a/pom.xml +++ b/pom.xml @@ -110,7 +110,7 @@ 11.2 3.8.0 - 0.92.7-SNAPSHOT + 0.92.6-SNAPSHOT