From 2e96f09eae7f174271bb4fe08557cc861178f433 Mon Sep 17 00:00:00 2001 From: Martijn Verburg Date: Sat, 27 May 2023 05:10:17 +1200 Subject: [PATCH] Update Maven Dependencies to latest versions and refactor parent vs BOM (#1192) ### Motivation and Context ### Description ### Contribution Checklist - [ ] The code builds clean without any errors or warnings - [x] The PR follows SK Contribution Guidelines (https://github.com/microsoft/semantic-kernel/blob/main/CONTRIBUTING.md) - [ ] The code follows the .NET coding conventions (https://learn.microsoft.com/dotnet/csharp/fundamentals/coding-style/coding-conventions) verified with `dotnet format` - [x] All unit tests pass, and I have added new tests where possible - [x] I didn't break anyone :smile: --------- Co-authored-by: Mark Wallace <127216156+markwallace-microsoft@users.noreply.github.com> --- java/.mvn/wrapper/maven-wrapper.properties | 2 +- java/api-test/api-usage-example/pom.xml | 8 +- java/api-test/integration-tests/pom.xml | 9 +- java/api-test/pom.xml | 59 +-- java/openai-sdk/pom.xml | 15 +- java/pom.xml | 482 ++++++++++++++++-- java/samples/pom.xml | 39 +- java/semantickernel-api/pom.xml | 15 +- .../orchestration/SKContext.java | 1 - .../SemanticFunctionConfig.java | 1 + java/semantickernel-bom/pom.xml | 29 +- .../semantickernel-connectors/pom.xml | 11 +- java/semantickernel-core/pom.xml | 14 +- 13 files changed, 506 insertions(+), 179 deletions(-) diff --git a/java/.mvn/wrapper/maven-wrapper.properties b/java/.mvn/wrapper/maven-wrapper.properties index d8b2495a1e..3c6fda8c6e 100644 --- a/java/.mvn/wrapper/maven-wrapper.properties +++ b/java/.mvn/wrapper/maven-wrapper.properties @@ -14,5 +14,5 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.1/apache-maven-3.9.1-bin.zip +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.2/apache-maven-3.9.2-bin.zip wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar diff --git a/java/api-test/api-usage-example/pom.xml b/java/api-test/api-usage-example/pom.xml index 886d3a22f5..0e836aed5d 100644 --- a/java/api-test/api-usage-example/pom.xml +++ b/java/api-test/api-usage-example/pom.xml @@ -1,7 +1,8 @@ - + - + 4.0.0 @@ -19,7 +20,6 @@ com.microsoft.semantickernel semantickernel-core - org.apache.logging.log4j log4j-api diff --git a/java/api-test/integration-tests/pom.xml b/java/api-test/integration-tests/pom.xml index 255be8e545..9e0f5e518d 100644 --- a/java/api-test/integration-tests/pom.xml +++ b/java/api-test/integration-tests/pom.xml @@ -1,7 +1,8 @@ - + - + 4.0.0 @@ -19,8 +20,6 @@ com.microsoft.semantickernel semantickernel-core - - org.apache.logging.log4j log4j-api diff --git a/java/api-test/pom.xml b/java/api-test/pom.xml index 251a75a97a..fb10374517 100644 --- a/java/api-test/pom.xml +++ b/java/api-test/pom.xml @@ -1,7 +1,8 @@ - + - + 4.0.0 @@ -16,12 +17,7 @@ pom - 17 - 17 - 17 - 17 - 17 - UTF-8 + 17 @@ -41,49 +37,4 @@ - - - bug-check - - - false - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.10.1 - - 17 - 17 - UTF-8 - true - - -XDcompilePolicy=simple - - - -Xplugin:ErrorProne -XepOpt:NullAway:AnnotatedPackages=com.microsoft.semantickernel - -Xep:AlmostJavadoc:OFF -Xep:MissingSummary:OFF -Xep:UnusedVariable:OFF -Xep:EmptyBlockTag:OFF - - - - - com.google.errorprone - error_prone_core - 2.18.0 - - - com.uber.nullaway - nullaway - 0.10.10 - - - - - - - - \ No newline at end of file diff --git a/java/openai-sdk/pom.xml b/java/openai-sdk/pom.xml index 7fc73a83a6..830c4e7d06 100644 --- a/java/openai-sdk/pom.xml +++ b/java/openai-sdk/pom.xml @@ -1,7 +1,8 @@ - + - + 4.0.0 @@ -25,12 +26,4 @@ - - - - org.apache.maven.plugins - maven-javadoc-plugin - - - \ No newline at end of file diff --git a/java/pom.xml b/java/pom.xml index 76f2e26804..84ecabd5db 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -1,22 +1,64 @@ - + - + 4.0.0 com.microsoft.semantickernel semantickernel-parent 0.2.0-SNAPSHOT pom - + https://www.github.com/microsoft/semantic-kernel - 1.8 - 1.8 - 1.8 - 1.8 - 1.8 + 1.0.0-beta.1 + 10.11.0 + 0.10.10 + 2.19.1 + 1.17.0 + 1.6.0 + 5.9.3 + 2.20.0 + 3.1.0 + 2.12.1 + 3.2.1 + 3.2.0 + 3.11.0 + 8 + 3.5.0 + 3.1.0 + 1.0 + 3.2.1 + 3.1.0 + 3.1.0 + 0.8.8 + 3.3.0 + 3.5.0 + 3.3.0 + + 1.20 + 1.6.13 + 3.20.0 + 3.4.2 + 0.15 + 3.3.0 + 4.0.0-M5 + 3.4.1 + 3.2.1 + 4.7.3.4 + + 2.36.0 + 3.0.0 + 3.9.2 + 2.15.0 + 5.3.1 + 0.9.1 + 6.55.0 UTF-8 + microsoft/semantic-kernel + git@github.com:${project.github.repository}.git + 4.7.3 @@ -38,49 +80,46 @@ pom import - org.junit.jupiter junit-jupiter - 5.9.2 + ${junit5.version} test org.junit.jupiter junit-jupiter-api - 5.9.2 + ${junit5.version} test - org.apache.logging.log4j log4j-api - 2.20.0 + ${log4j2.version} test org.apache.logging.log4j log4j-core - 2.20.0 + ${log4j2.version} test org.apache.logging.log4j log4j-slf4j2-impl - 2.20.0 + ${log4j2.version} test - org.mockito mockito-core - 4.11.0 + ${mockito.version} test com.azure azure-ai-openai - 1.0.0-alpha.20230505.3 + ${azure-ai-openai.version} com.microsoft.semantickernel.connectors @@ -95,6 +134,367 @@ + + + + + + com.github.spotbugs + spotbugs-maven-plugin + ${maven.spotbugs-plugin.version} + + + com.github.spotbugs + spotbugs + ${spotbugs.version} + + + + + + org.apache.maven.plugins + maven-changes-plugin + ${maven.changes-plugin.version} + + + org.apache.maven.plugins + maven-checkstyle-plugin + ${maven.checkstyle-plugin.version} + + + com.puppycrawl.tools + checkstyle + ${checkstyle.version} + + + + + org.apache.maven.plugins + maven-clean-plugin + ${maven.clean-plugin.version} + + + org.apache.maven.plugins + maven-compiler-plugin + ${maven.compiler-plugin.version} + + ${maven.compiler.release} + ${maven.compiler.release} + + + + org.apache.maven.plugins + maven-dependency-plugin + ${maven.dependency-plugin.version} + + + org.apache.maven.plugins + maven-deploy-plugin + ${maven.deploy-plugin.version} + + + org.apache.maven.plugins + maven-enforcer-plugin + ${maven.enforcer-plugin.version} + + + enforce-maven + + enforce + + + + + ${maven.version} + + + + + + + + org.apache.maven.plugins + maven-install-plugin + ${maven.install-plugin.version} + + + org.apache.maven.plugins + maven-jar-plugin + ${maven.jar-plugin.version} + + + org.apache.maven.plugins + maven-javadoc-plugin + ${maven.javadoc-plugin.version} + + + false + + + + org.apache.maven.plugins + maven-jxr-plugin + ${maven.jxr-plugin.version} + + + org.apache.maven.plugins + maven-pmd-plugin + ${maven.pmd-plugin.version} + + + net.sourceforge.pmd + pmd-core + ${pmd.version} + + + net.sourceforge.pmd + pmd-java + ${pmd.version} + + + net.sourceforge.pmd + pmd-javascript + ${pmd.version} + + + net.sourceforge.pmd + pmd-jsp + ${pmd.version} + + + + + org.apache.maven.plugins + maven-shade-plugin + ${maven.shade-plugin.version} + + + org.apache.maven.plugins + maven-source-plugin + ${maven.source-plugin.version} + + + org.apache.maven.plugins + maven-surefire-plugin + ${maven.surefire-plugin.version} + + + org.apache.maven.plugins + maven-site-plugin + ${maven.site-plugin.version} + + + org.apache.maven.plugins + maven-project-info-reports-plugin + ${maven.project-info-reports-plugin.version} + + + org.apache.maven.plugins + maven-resources-plugin + ${maven.resources-plugin.version} + + + org.apache.maven.plugins + maven-antrun-plugin + ${maven.antrun-plugin.version} + + + org.apache.rat + apache-rat-plugin + ${maven.rat-plugin.version} + + + org.codehaus.mojo + exec-maven-plugin + ${maven.exec-plugin.version} + + + org.codehaus.mojo + license-maven-plugin + ${maven.license-plugin.version} + + + org.codehaus.mojo + versions-maven-plugin + ${maven.versions-plugin.version} + + + org.commonjava.maven.plugins + directory-maven-plugin + ${maven.directory-maven-plugin.version} + + + org.jacoco + jacoco-maven-plugin + ${maven.jacoco-plugin.version} + + + + prepare-agent + + + + report + prepare-package + + report + + + + + + + + + + com.github.spotbugs + spotbugs-maven-plugin + + + org.apache.maven.plugins + maven-enforcer-plugin + + + org.apache.maven.plugins + maven-javadoc-plugin + + + org.apache.maven.plugins + maven-source-plugin + + + org.sonatype.plugins + nexus-staging-maven-plugin + ${maven.nexus-staging-maven-plugin.version} + true + + ossrh + https://oss.sonatype.org/ + false + 10 + + + + + + + + + + + com.github.spotbugs + spotbugs-maven-plugin + + + + org.mutabilitydetector + MutabilityDetector4FindBugs + ${mutability.detector.version} + + + + + + org.apache.maven.plugins + maven-changes-plugin + + + + + + changes-report + + + + + + + + org.apache.maven.plugins + maven-checkstyle-plugin + + + + checkstyle + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + org.apache.maven.plugins + maven-javadoc-plugin + + + org.apache.maven.plugins + maven-jxr-plugin + + + org.apache.maven.plugins + maven-pmd-plugin + + ${maven.compiler.release} + + + + + + org.apache.maven.plugins + maven-project-info-reports-plugin + + + org.apache.rat + apache-rat-plugin + + + org.codehaus.mojo + license-maven-plugin + + + org.codehaus.mojo + versions-maven-plugin + + + + dependency-updates-report + plugin-updates-report + property-updates-report + + + + + + org.jacoco + jacoco-maven-plugin + ${maven.jacoco-plugin.version} + + + + central @@ -118,18 +518,6 @@ - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 3.5.0 - - - - - bug-check @@ -143,30 +531,32 @@ org.apache.maven.plugins maven-compiler-plugin - 3.10.1 + ${maven.compiler-plugin.version} - 8 - 8 - UTF-8 + ${maven.compiler.release} + ${maven.compiler.release} + ${project.build.sourceEncoding} true -XDcompilePolicy=simple - - -Xplugin:ErrorProne -XepOpt:NullAway:AnnotatedPackages=com.microsoft.semantickernel - -Xep:AlmostJavadoc:OFF -Xep:MissingSummary:OFF -Xep:UnusedVariable:OFF -Xep:EmptyBlockTag:OFF + + -Xplugin:ErrorProne + -XepOpt:NullAway:AnnotatedPackages=com.microsoft.semantickernel + -Xep:AlmostJavadoc:OFF -Xep:MissingSummary:OFF + -Xep:UnusedVariable:OFF -Xep:EmptyBlockTag:OFF com.google.errorprone error_prone_core - 2.18.0 + ${google.errorprone.core.version} com.uber.nullaway nullaway - 0.10.10 + ${com.uber.nullaway.version} @@ -174,7 +564,7 @@ com.diffplug.spotless spotless-maven-plugin - 2.36.0 + ${maven.spotless-plugin.version} check @@ -191,26 +581,24 @@ process-sources - - 1.16.0 + ${google.java.format.version} true - // Copyright (c) Microsoft. All rights reserved. - + com.github.spotbugs spotbugs-maven-plugin - 4.7.3.4 + ${maven.spotbugs-plugin.version} spotbugs-exclude.xml Max @@ -230,4 +618,4 @@ - + \ No newline at end of file diff --git a/java/samples/pom.xml b/java/samples/pom.xml index 5dbc091f40..af12925b41 100644 --- a/java/samples/pom.xml +++ b/java/samples/pom.xml @@ -1,17 +1,20 @@ + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 com.microsoft.semantickernel samples 0.2.0-SNAPSHOT + - 17 - 17 - 17 + 0.10.10 + 2.19.1 + 2.20.0 + 2.11.0 + 17 UTF-8 @@ -50,22 +53,20 @@ semantickernel-core-skills ${project.version} - - org.apache.logging.log4j log4j-api - 2.20.0 + ${log4j2.version} org.apache.logging.log4j log4j-core - 2.20.0 + ${log4j2.version} org.apache.logging.log4j log4j-slf4j2-impl - 2.20.0 + ${log4j2.version} com.microsoft.semantickernel.extensions @@ -87,30 +88,32 @@ org.apache.maven.plugins maven-compiler-plugin - 3.10.1 + {maven.compiler-plugin.version} - 17 - 17 - UTF-8 + ${maven.compiler.release} + ${maven.compiler.release} + ${project.build.sourceEncoding} true -XDcompilePolicy=simple - -Xplugin:ErrorProne -XepOpt:NullAway:AnnotatedPackages=com.microsoft.semantickernel - -Xep:AlmostJavadoc:OFF -Xep:MissingSummary:OFF -Xep:UnusedVariable:OFF -Xep:EmptyBlockTag:OFF + -Xplugin:ErrorProne + -XepOpt:NullAway:AnnotatedPackages=com.microsoft.semantickernel + -Xep:AlmostJavadoc:OFF -Xep:MissingSummary:OFF + -Xep:UnusedVariable:OFF -Xep:EmptyBlockTag:OFF com.google.errorprone error_prone_core - 2.18.0 + ${google.errorprone.core.version} com.uber.nullaway nullaway - 0.10.10 + ${com.uber.nullaway.version} diff --git a/java/semantickernel-api/pom.xml b/java/semantickernel-api/pom.xml index d25efe785c..ff4bec2b43 100644 --- a/java/semantickernel-api/pom.xml +++ b/java/semantickernel-api/pom.xml @@ -1,7 +1,8 @@ - + - + 4.0.0 @@ -38,12 +39,4 @@ - - - - org.apache.maven.plugins - maven-javadoc-plugin - - - \ No newline at end of file diff --git a/java/semantickernel-api/src/main/java/com/microsoft/semantickernel/orchestration/SKContext.java b/java/semantickernel-api/src/main/java/com/microsoft/semantickernel/orchestration/SKContext.java index 264a22b918..b32148acd6 100644 --- a/java/semantickernel-api/src/main/java/com/microsoft/semantickernel/orchestration/SKContext.java +++ b/java/semantickernel-api/src/main/java/com/microsoft/semantickernel/orchestration/SKContext.java @@ -1,6 +1,5 @@ // Copyright (c) Microsoft. All rights reserved. package com.microsoft.semantickernel.orchestration; -// Copyright (c) Microsoft. All rights reserved. import com.microsoft.semantickernel.memory.SemanticTextMemory; import com.microsoft.semantickernel.skilldefinition.ReadOnlySkillCollection; diff --git a/java/semantickernel-api/src/main/java/com/microsoft/semantickernel/semanticfunctions/SemanticFunctionConfig.java b/java/semantickernel-api/src/main/java/com/microsoft/semantickernel/semanticfunctions/SemanticFunctionConfig.java index 6d27900c8d..70ec601acf 100644 --- a/java/semantickernel-api/src/main/java/com/microsoft/semantickernel/semanticfunctions/SemanticFunctionConfig.java +++ b/java/semantickernel-api/src/main/java/com/microsoft/semantickernel/semanticfunctions/SemanticFunctionConfig.java @@ -4,6 +4,7 @@ package com.microsoft.semantickernel.semanticfunctions; /** Semantic function configuration */ public class SemanticFunctionConfig { private final PromptTemplateConfig config; + /** Prompt template */ private final PromptTemplate template; diff --git a/java/semantickernel-bom/pom.xml b/java/semantickernel-bom/pom.xml index e6cb82ec24..9e3ede46db 100644 --- a/java/semantickernel-bom/pom.xml +++ b/java/semantickernel-bom/pom.xml @@ -1,7 +1,8 @@ - + - + 4.0.0 com.microsoft.semantickernel @@ -9,6 +10,13 @@ 0.2.0-SNAPSHOT pom + Semantic Kernel Java BOM + Bill of Materials for all Semantic Kernel (Java) modules + + + 2.15.1 + + @@ -26,11 +34,6 @@ semantickernel-connectors ${project.version} - - com.microsoft.semantickernel - semantickernel-core - ${project.version} - com.microsoft.semantickernel.extensions sequentialplanner-extensions @@ -41,27 +44,26 @@ semantickernel-core-skills ${project.version} - org.slf4j slf4j-api - 2.0.6 + 2.0.7 com.fasterxml.jackson.core jackson-annotations - 2.14.2 + ${com.fasterxml.jackson.core.version} com.fasterxml.jackson.core jackson-databind - 2.14.2 + ${com.fasterxml.jackson.core.version} runtime io.projectreactor reactor-core - 3.5.0 + 3.5.6 com.google.code.findbugs @@ -81,4 +83,5 @@ + \ No newline at end of file diff --git a/java/semantickernel-connectors-parent/semantickernel-connectors/pom.xml b/java/semantickernel-connectors-parent/semantickernel-connectors/pom.xml index d1b0e6b700..a7079769fe 100644 --- a/java/semantickernel-connectors-parent/semantickernel-connectors/pom.xml +++ b/java/semantickernel-connectors-parent/semantickernel-connectors/pom.xml @@ -1,7 +1,8 @@ - + - + 4.0.0 @@ -26,8 +27,8 @@ jakarta.inject jakarta.inject-api - 2.0.1 + 2.0.1.MR - + \ No newline at end of file diff --git a/java/semantickernel-core/pom.xml b/java/semantickernel-core/pom.xml index 74ae80735f..556f7e8655 100644 --- a/java/semantickernel-core/pom.xml +++ b/java/semantickernel-core/pom.xml @@ -1,7 +1,8 @@ - + - + 4.0.0 @@ -37,9 +38,6 @@ jackson-databind compile - - - org.apache.logging.log4j log4j-api @@ -70,8 +68,6 @@ junit-jupiter-api test - - com.microsoft.semantickernel semantickernel-api @@ -99,7 +95,7 @@ jakarta.inject jakarta.inject-api - 2.0.1 + 2.0.1.MR \ No newline at end of file