From affabe0bb8a3897c240f92ee87af6e58151d9f0d Mon Sep 17 00:00:00 2001 From: ramsessanchez <63934382+ramsessanchez@users.noreply.github.com> Date: Mon, 14 Aug 2023 10:41:52 -0700 Subject: [PATCH] revert jakarta to implementation dependency --- components/abstractions/gradle/dependencies.gradle | 4 +--- components/authentication/azure/gradle/dependencies.gradle | 1 + components/http/okHttp/gradle/dependencies.gradle | 1 + components/serialization/form/gradle/dependencies.gradle | 1 + .../com/microsoft/kiota/serialization/mocks/TestEntity.java | 2 +- components/serialization/json/gradle/dependencies.gradle | 1 + components/serialization/multipart/gradle/dependencies.gradle | 1 + components/serialization/text/gradle/dependencies.gradle | 1 + 8 files changed, 8 insertions(+), 4 deletions(-) diff --git a/components/abstractions/gradle/dependencies.gradle b/components/abstractions/gradle/dependencies.gradle index 3d3c13051..2c924fbb3 100644 --- a/components/abstractions/gradle/dependencies.gradle +++ b/components/abstractions/gradle/dependencies.gradle @@ -7,12 +7,10 @@ dependencies { // Use JUnit Jupiter Engine for testing. testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine' - //This dependency is used internally and also by Kiota generated code which leverages this library. - api 'jakarta.annotation:jakarta.annotation-api:2.1.1' - // This dependency is used internally, and not exposed to consumers on their own compile classpath. implementation 'com.google.guava:guava:32.1.2-jre' implementation 'org.javatuples:javatuples:1.2' implementation 'io.opentelemetry:opentelemetry-api:1.28.0' implementation 'io.opentelemetry:opentelemetry-context:1.28.0' + implementation 'jakarta.annotation:jakarta.annotation-api:2.1.1' } \ No newline at end of file diff --git a/components/authentication/azure/gradle/dependencies.gradle b/components/authentication/azure/gradle/dependencies.gradle index d3de84264..c81db54c7 100644 --- a/components/authentication/azure/gradle/dependencies.gradle +++ b/components/authentication/azure/gradle/dependencies.gradle @@ -11,6 +11,7 @@ dependencies { implementation 'io.opentelemetry:opentelemetry-api:1.28.0' implementation 'io.opentelemetry:opentelemetry-context:1.28.0' implementation 'com.google.guava:guava:32.1.2-jre' + implementation 'jakarta.annotation:jakarta.annotation-api:2.1.1' api 'com.azure:azure-core:1.42.0' api project(':components:abstractions') diff --git a/components/http/okHttp/gradle/dependencies.gradle b/components/http/okHttp/gradle/dependencies.gradle index e045a5931..08f65e598 100644 --- a/components/http/okHttp/gradle/dependencies.gradle +++ b/components/http/okHttp/gradle/dependencies.gradle @@ -13,6 +13,7 @@ dependencies { implementation 'io.opentelemetry:opentelemetry-context:1.28.0' implementation 'io.opentelemetry:opentelemetry-semconv:1.28.0-alpha' implementation 'com.google.guava:guava:32.1.2-jre' + implementation 'jakarta.annotation:jakarta.annotation-api:2.1.1' api 'com.squareup.okhttp3:okhttp:4.11.0' api project(':components:abstractions') diff --git a/components/serialization/form/gradle/dependencies.gradle b/components/serialization/form/gradle/dependencies.gradle index d2c0793ee..8509d0bad 100644 --- a/components/serialization/form/gradle/dependencies.gradle +++ b/components/serialization/form/gradle/dependencies.gradle @@ -7,6 +7,7 @@ dependencies { // This dependency is used internally, and not exposed to consumers on their own compile classpath. implementation 'com.google.guava:guava:32.1.2-jre' + implementation 'jakarta.annotation:jakarta.annotation-api:2.1.1' api project(':components:abstractions') } diff --git a/components/serialization/form/src/test/java/com/microsoft/kiota/serialization/mocks/TestEntity.java b/components/serialization/form/src/test/java/com/microsoft/kiota/serialization/mocks/TestEntity.java index b439f663b..bea48bd3e 100644 --- a/components/serialization/form/src/test/java/com/microsoft/kiota/serialization/mocks/TestEntity.java +++ b/components/serialization/form/src/test/java/com/microsoft/kiota/serialization/mocks/TestEntity.java @@ -54,7 +54,7 @@ public PeriodAndDuration getWorkDuration() { return _workDuration; } - public void setWorkDuration(final PeriodAndDuration value) { + public void setWorkDuration(PeriodAndDuration value) { this._workDuration = PeriodAndDuration.of(value.getPeriod(), value.getDuration()); } diff --git a/components/serialization/json/gradle/dependencies.gradle b/components/serialization/json/gradle/dependencies.gradle index 4a239ba94..c443d0d66 100644 --- a/components/serialization/json/gradle/dependencies.gradle +++ b/components/serialization/json/gradle/dependencies.gradle @@ -7,6 +7,7 @@ dependencies { // This dependency is used internally, and not exposed to consumers on their own compile classpath. implementation 'com.google.guava:guava:32.1.2-jre' + implementation 'jakarta.annotation:jakarta.annotation-api:2.1.1' api 'com.google.code.gson:gson:2.10.1' api project(':components:abstractions') diff --git a/components/serialization/multipart/gradle/dependencies.gradle b/components/serialization/multipart/gradle/dependencies.gradle index 6ef8cf374..16e971239 100644 --- a/components/serialization/multipart/gradle/dependencies.gradle +++ b/components/serialization/multipart/gradle/dependencies.gradle @@ -8,6 +8,7 @@ dependencies { // This dependency is used internally, and not exposed to consumers on their own compile classpath. implementation 'com.google.guava:guava:32.1.2-jre' + implementation 'jakarta.annotation:jakarta.annotation-api:2.1.1' api project(':components:abstractions') testImplementation project(':components:serialization:json') diff --git a/components/serialization/text/gradle/dependencies.gradle b/components/serialization/text/gradle/dependencies.gradle index 70bc11818..174403073 100644 --- a/components/serialization/text/gradle/dependencies.gradle +++ b/components/serialization/text/gradle/dependencies.gradle @@ -7,6 +7,7 @@ dependencies { // This dependency is used internally, and not exposed to consumers on their own compile classpath. implementation 'com.google.guava:guava:32.1.2-jre' + implementation 'jakarta.annotation:jakarta.annotation-api:2.1.1' api project(':components:abstractions') }