From 7d374d12a59567a814d16cd846b2bac87a8d2026 Mon Sep 17 00:00:00 2001
From: John Oliver <1615532+johnoliver@users.noreply.github.com>
Date: Tue, 13 Feb 2024 12:08:48 +0000
Subject: [PATCH] Java: Tidy poms (#4989)
### Motivation and Context
### Description
### Contribution Checklist
- [ ] The code builds clean without any errors or warnings
- [ ] The PR follows the [SK Contribution
Guidelines](https://github.com/microsoft/semantic-kernel/blob/main/CONTRIBUTING.md)
and the [pre-submission formatting
script](https://github.com/microsoft/semantic-kernel/blob/main/CONTRIBUTING.md#development-scripts)
raises no violations
- [ ] All unit tests pass, and I have added new tests where possible
- [ ] I didn't break anyone :smile:
---
java/aiservices/openai/pom.xml | 7 +-
java/api-test/integration-tests/pom.xml | 10 +--
java/api-test/pom.xml | 10 ++-
.../pom.xml | 12 ++--
.../semantickernel-plugin-core/pom.xml | 2 +-
java/pom.xml | 45 ++-----------
java/samples/pom.xml | 15 +++--
java/samples/sample-code/pom.xml | 8 +--
java/samples/sk-v1/01-SimpleChat/pom.xml | 4 +-
java/samples/sk-v1/02-PersonaChat/pom.xml | 4 +-
java/samples/sk-v1/03-SimpleRag/pom.xml | 4 +-
java/samples/sk-v1/04-DynamicRag/pom.xml | 2 +-
java/samples/sk-v1/05-MultiModal/pom.xml | 6 +-
java/samples/sk-v1/06-Assistants/pom.xml | 2 +-
java/samples/sk-v1/pom.xml | 15 +++--
java/semantickernel-api/pom.xml | 13 ++--
java/semantickernel-bom/pom.xml | 66 +++----------------
17 files changed, 76 insertions(+), 149 deletions(-)
diff --git a/java/aiservices/openai/pom.xml b/java/aiservices/openai/pom.xml
index 3aa692f4aa..0dd5a6b547 100644
--- a/java/aiservices/openai/pom.xml
+++ b/java/aiservices/openai/pom.xml
@@ -7,12 +7,12 @@
com.microsoft.semantic-kernel
semantickernel-parent
- 1.0.0-alpha.1-SNAPSHOT
+ 1.0.0-alpha.2-SNAPSHOT
../../pom.xml
- aiservices-openai
- OpenAI Services
+ semantickernel-aiservices-openai
+ Semantic Kernel OpenAI Services
OpenAI services for Semantic Kernel
@@ -39,7 +39,6 @@
javax.xml.stream
stax-api
- 1.0-2
provided
diff --git a/java/api-test/integration-tests/pom.xml b/java/api-test/integration-tests/pom.xml
index 443aaf6769..2de167c173 100644
--- a/java/api-test/integration-tests/pom.xml
+++ b/java/api-test/integration-tests/pom.xml
@@ -7,17 +7,18 @@
com.microsoft.semantic-kernel
api-test
- 1.0.0-alpha.1-SNAPSHOT
+ 1.0.0-alpha.2-SNAPSHOT
../pom.xml
+ Semantic Kernel Integration Tests
integration-tests
jar
com.microsoft.semantic-kernel
- sample-code
+ semantickernel-sample-code
${project.version}
test
@@ -56,11 +57,6 @@
semantickernel-api
test
-
- com.microsoft.semantic-kernel
- sample-code
- ${project.version}
-
org.xerial
diff --git a/java/api-test/pom.xml b/java/api-test/pom.xml
index d58fb677fd..e0ec35b229 100644
--- a/java/api-test/pom.xml
+++ b/java/api-test/pom.xml
@@ -7,10 +7,11 @@
com.microsoft.semantic-kernel
semantickernel-parent
- 1.0.0-alpha.1-SNAPSHOT
+ 1.0.0-alpha.2-SNAPSHOT
../pom.xml
+ Semantic Kernel Api Tests
api-test
pom
@@ -50,6 +51,13 @@
${maven.compiler.release}
+
+ org.apache.maven.plugins
+ maven-deploy-plugin
+
+ true
+
+
diff --git a/java/connectors/semantickernel-connectors-web-bing/pom.xml b/java/connectors/semantickernel-connectors-web-bing/pom.xml
index cd586071c2..4a9a76e4a9 100644
--- a/java/connectors/semantickernel-connectors-web-bing/pom.xml
+++ b/java/connectors/semantickernel-connectors-web-bing/pom.xml
@@ -1,12 +1,13 @@
-
+
4.0.0
com.microsoft.semantic-kernel
semantickernel-parent
- 1.0.0-alpha.1-SNAPSHOT
+ 1.0.0-alpha.2-SNAPSHOT
../../pom.xml
@@ -19,13 +20,8 @@
com.microsoft.semantic-kernel
semantickernel-api
- compile
- com.microsoft.semantic-kernel
- semantickernel-api
-
-
com.fasterxml.jackson.core
jackson-databind
compile
@@ -34,7 +30,7 @@
com.fasterxml.jackson.core
jackson-core
compile
-
+
diff --git a/java/plugins/semantickernel-plugin-core/pom.xml b/java/plugins/semantickernel-plugin-core/pom.xml
index d3ba36e213..2775027140 100644
--- a/java/plugins/semantickernel-plugin-core/pom.xml
+++ b/java/plugins/semantickernel-plugin-core/pom.xml
@@ -6,7 +6,7 @@
com.microsoft.semantic-kernel
semantickernel-parent
- 1.0.0-alpha.1-SNAPSHOT
+ 1.0.0-alpha.2-SNAPSHOT
../../pom.xml
diff --git a/java/pom.xml b/java/pom.xml
index 28c20ae658..8604e256ea 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -7,8 +7,9 @@
com.microsoft.semantic-kernel
semantickernel-parent
- 1.0.0-alpha.1-SNAPSHOT
+ 1.0.0-alpha.2-SNAPSHOT
pom
+
https://www.github.com/microsoft/semantic-kernel
Semantic Kernel Parent
Parent pom for the Semantic Kernel Project
@@ -65,25 +66,14 @@
+ semantickernel-bom
+
connectors/semantickernel-connectors-web-bing
-
-
-
-
-
-
-
-
aiservices/openai
-
-
-
-
plugins/semantickernel-plugin-core
- semantickernel-bom
semantickernel-api
@@ -403,17 +393,6 @@
-
-
-
@@ -619,9 +587,6 @@
17
17
-
bug-check
@@ -819,6 +784,6 @@
https://github.com/microsoft/semantic-kernel
scm:git:https://github.com/microsoft/semantic-kernel.git
scm:git:https://github.com/microsoft/semantic-kernel.git
- java-0.2.11-alpha
+ HEAD
diff --git a/java/samples/pom.xml b/java/samples/pom.xml
index ae72b8025c..7bc8da3587 100644
--- a/java/samples/pom.xml
+++ b/java/samples/pom.xml
@@ -5,19 +5,17 @@
com.microsoft.semantic-kernel
semantickernel-parent
- 1.0.0-alpha.1-SNAPSHOT
+ 1.0.0-alpha.2-SNAPSHOT
../pom.xml
- com.microsoft.semantic-kernel
- samples
- 1.0.0-alpha.1-SNAPSHOT
+ semantickernel-samples-parent
+ 1.0.0-alpha.2-SNAPSHOT
pom
Semantic Kernel Samples Parent
Parent pom for sample code for using the Semantic Kernel project
-
sk-v1
sample-code
@@ -104,6 +102,13 @@
true
+
+ org.apache.maven.plugins
+ maven-deploy-plugin
+
+ true
+
+
diff --git a/java/samples/sample-code/pom.xml b/java/samples/sample-code/pom.xml
index 6ccf417079..b8e182987b 100644
--- a/java/samples/sample-code/pom.xml
+++ b/java/samples/sample-code/pom.xml
@@ -4,12 +4,12 @@
4.0.0
com.microsoft.semantic-kernel
- samples
- 1.0.0-alpha.1-SNAPSHOT
+ semantickernel-samples-parent
+ 1.0.0-alpha.2-SNAPSHOT
../pom.xml
- sample-code
+ semantickernel-sample-code
Semantic Kernel Samples
Sample code for using the Semantic Kernel project
jar
@@ -71,7 +71,7 @@
com.microsoft.semantic-kernel
- aiservices-openai
+ semantickernel-aiservices-openai
diff --git a/java/samples/sk-v1/01-SimpleChat/pom.xml b/java/samples/sk-v1/01-SimpleChat/pom.xml
index 5ec59bb19f..ac11a5bd0b 100644
--- a/java/samples/sk-v1/01-SimpleChat/pom.xml
+++ b/java/samples/sk-v1/01-SimpleChat/pom.xml
@@ -6,8 +6,8 @@
com.microsoft.semantic-kernel
- sk-v1-samples
- 1.0.0-alpha.1-SNAPSHOT
+ semantickernel-v1-samples
+ 1.0.0-alpha.2-SNAPSHOT
../pom.xml
diff --git a/java/samples/sk-v1/02-PersonaChat/pom.xml b/java/samples/sk-v1/02-PersonaChat/pom.xml
index fa1ec8ff3b..d94076f072 100644
--- a/java/samples/sk-v1/02-PersonaChat/pom.xml
+++ b/java/samples/sk-v1/02-PersonaChat/pom.xml
@@ -7,8 +7,8 @@
com.microsoft.semantic-kernel
- sk-v1-samples
- 1.0.0-alpha.1-SNAPSHOT
+ semantickernel-v1-samples
+ 1.0.0-alpha.2-SNAPSHOT
../pom.xml
diff --git a/java/samples/sk-v1/03-SimpleRag/pom.xml b/java/samples/sk-v1/03-SimpleRag/pom.xml
index 1a47d2bd3c..0403c77869 100644
--- a/java/samples/sk-v1/03-SimpleRag/pom.xml
+++ b/java/samples/sk-v1/03-SimpleRag/pom.xml
@@ -7,8 +7,8 @@
com.microsoft.semantic-kernel
- sk-v1-samples
- 1.0.0-alpha.1-SNAPSHOT
+ semantickernel-v1-samples
+ 1.0.0-alpha.2-SNAPSHOT
../pom.xml
diff --git a/java/samples/sk-v1/04-DynamicRag/pom.xml b/java/samples/sk-v1/04-DynamicRag/pom.xml
index a6cc1e8fc1..433b40cc33 100644
--- a/java/samples/sk-v1/04-DynamicRag/pom.xml
+++ b/java/samples/sk-v1/04-DynamicRag/pom.xml
@@ -7,7 +7,7 @@
com.microsoft.semantic-kernel
- sk-v1-samples
+ semantickernel-v1-samples
1.0.0-alpha.1-SNAPSHOT
../pom.xml
diff --git a/java/samples/sk-v1/05-MultiModal/pom.xml b/java/samples/sk-v1/05-MultiModal/pom.xml
index 2b8ad559a2..afcd106a10 100644
--- a/java/samples/sk-v1/05-MultiModal/pom.xml
+++ b/java/samples/sk-v1/05-MultiModal/pom.xml
@@ -7,7 +7,7 @@
com.microsoft.semantic-kernel
- sk-v1-samples
+ semantickernel-v1-samples
1.0.0-alpha.1-SNAPSHOT
../pom.xml
@@ -18,7 +18,7 @@
com.microsoft.semantic-kernel
- aiservices-openai
+ semantickernel-aiservices-openai
com.microsoft.semantic-kernel
@@ -30,7 +30,7 @@
com.microsoft.semantic-kernel
- aiservices-openai
+ semantickernel-aiservices-openai
com.microsoft.semantic-kernel
diff --git a/java/samples/sk-v1/06-Assistants/pom.xml b/java/samples/sk-v1/06-Assistants/pom.xml
index 1fed7623bf..e80ebd518a 100644
--- a/java/samples/sk-v1/06-Assistants/pom.xml
+++ b/java/samples/sk-v1/06-Assistants/pom.xml
@@ -7,7 +7,7 @@
com.microsoft.semantic-kernel
- sk-v1-samples
+ semantickernel-v1-samples
1.0.0-alpha.1-SNAPSHOT
../pom.xml
diff --git a/java/samples/sk-v1/pom.xml b/java/samples/sk-v1/pom.xml
index 6ba4918d4d..3ee6f22211 100644
--- a/java/samples/sk-v1/pom.xml
+++ b/java/samples/sk-v1/pom.xml
@@ -3,9 +3,14 @@
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.semantic-kernel
- sk-v1-samples
- 1.0.0-alpha.1-SNAPSHOT
+
+ com.microsoft.semantic-kernel
+ semantickernel-samples-parent
+ 1.0.0-alpha.2-SNAPSHOT
+ ../pom.xml
+
+
+ semantickernel-v1-samples
Semantic Kernel version 1 Samples
Sample code for using the Semantic Kernel version 1 API
@@ -47,7 +52,7 @@
com.microsoft.semantic-kernel
- aiservices-openai
+ semantickernel-aiservices-openai
com.microsoft.semantic-kernel
@@ -59,7 +64,7 @@
com.microsoft.semantic-kernel
- aiservices-openai
+ semantickernel-aiservices-openai
com.azure
diff --git a/java/semantickernel-api/pom.xml b/java/semantickernel-api/pom.xml
index 456c7305a9..53476d750d 100644
--- a/java/semantickernel-api/pom.xml
+++ b/java/semantickernel-api/pom.xml
@@ -1,12 +1,13 @@
-
+
4.0.0
com.microsoft.semantic-kernel
semantickernel-parent
- 1.0.0-alpha.1-SNAPSHOT
+ 1.0.0-alpha.2-SNAPSHOT
../pom.xml
@@ -50,6 +51,10 @@
jackson-dataformat-yaml
compile
+
+ com.github.spotbugs
+ spotbugs-annotations
+
org.mockito
@@ -66,9 +71,5 @@
junit-jupiter-api
test
-
- com.github.spotbugs
- spotbugs-annotations
-
\ No newline at end of file
diff --git a/java/semantickernel-bom/pom.xml b/java/semantickernel-bom/pom.xml
index 4961916361..20b0793855 100644
--- a/java/semantickernel-bom/pom.xml
+++ b/java/semantickernel-bom/pom.xml
@@ -1,11 +1,12 @@
-
+
4.0.0
com.microsoft.semantic-kernel
semantickernel-bom
- 1.0.0-alpha.1-SNAPSHOT
+ 1.0.0-alpha.2-SNAPSHOT
pom
Semantic Kernel Java BOM
@@ -48,19 +49,6 @@
semantickernel-api
${project.version}
-
-
com.microsoft.semantic-kernel
semantickernel-gpt3-tokenizer
@@ -76,28 +64,6 @@
semantickernel-connectors-web-bing
${project.version}
-
com.microsoft.semantic-kernel
aiservices-azureopenai
@@ -115,7 +81,7 @@
com.microsoft.semantic-kernel
- aiservices-openai
+ semantickernel-aiservices-openai
${project.version}
@@ -134,13 +100,6 @@
azure-identity
1.11.2
-
com.fasterxml.jackson.core
jackson-annotations
@@ -190,20 +149,13 @@
3.0.2
-
- org.xerial
- sqlite-jdbc
- 3.42.0.0
+ javax.xml.stream
+ stax-api
+ 1.0-2
+ provided
-
-
- org.postgresql
- postgresql
- 42.6.0
-
--->
-