Skip to content

Commit

Permalink
Java: Update dependencies (#2261)
Browse files Browse the repository at this point in the history
### Motivation and Context

Keep our security and stability baseline for dependencies as high as
possible.

### Description

Maven POM changes mainly, removing a bunch of warnings and updating
dependencies

### Contribution Checklist

<!-- Before submitting this PR, please make sure: -->

- [X] The code builds clean without any errors or warnings
- [X] 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
- [X] All unit tests pass, and I have added new tests where possible
- [X] I didn't break anyone 😄
  • Loading branch information
karianna authored Aug 1, 2023
1 parent 4b583df commit 0600c1e
Show file tree
Hide file tree
Showing 9 changed files with 93 additions and 42 deletions.
2 changes: 1 addition & 1 deletion java/.mvn/wrapper/maven-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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.2/apache-maven-3.9.2-bin.zip
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.3/apache-maven-3.9.3-bin.zip
wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar
4 changes: 0 additions & 4 deletions java/connectors/semantickernel-connectors-ai-openai/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,6 @@
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,6 @@
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
Expand Down
54 changes: 30 additions & 24 deletions java/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,48 +14,49 @@
<description>Parent pom for the Semantic Kernel Project</description>

<properties>
<!-- TODO API change in beta.3 -->
<azure-ai-openai.version>1.0.0-beta.2</azure-ai-openai.version>
<checkstyle.version>10.11.0</checkstyle.version>
<checkstyle.version>10.12.2</checkstyle.version>
<com.uber.nullaway.version>0.10.10</com.uber.nullaway.version>
<google.errorprone.core.version>2.19.1</google.errorprone.core.version>
<google.java.format.version>1.17.0</google.java.format.version>
<jreleaser.plugin.version>1.6.0</jreleaser.plugin.version>
<junit5.version>5.9.3</junit5.version>
<junit5.version>5.10.0</junit5.version>
<log4j2.version>2.20.0</log4j2.version>
<maven.antrun-plugin.version>3.1.0</maven.antrun-plugin.version>
<maven.changes-plugin.version>2.12.1</maven.changes-plugin.version>
<maven.checkstyle-plugin.version>3.2.1</maven.checkstyle-plugin.version>
<maven.clean-plugin.version>3.2.0</maven.clean-plugin.version>
<maven.checkstyle-plugin.version>3.3.0</maven.checkstyle-plugin.version>
<maven.clean-plugin.version>3.3.1</maven.clean-plugin.version>
<maven.compiler-plugin.version>3.11.0</maven.compiler-plugin.version>
<maven.compiler.release>8</maven.compiler.release>
<maven.compiler.source>8</maven.compiler.source>
<maven.compiler.target>8</maven.compiler.target>
<maven.dependency-plugin.version>3.5.0</maven.dependency-plugin.version>
<maven.deploy-plugin.version>3.1.0</maven.deploy-plugin.version>
<maven.dependency-plugin.version>3.6.0</maven.dependency-plugin.version>
<maven.deploy-plugin.version>3.1.1</maven.deploy-plugin.version>
<maven.directory-maven-plugin.version>1.0</maven.directory-maven-plugin.version>
<maven.enforcer-plugin.version>3.2.1</maven.enforcer-plugin.version>
<maven.enforcer-plugin.version>3.3.0</maven.enforcer-plugin.version>
<maven.exec-plugin.version>3.1.0</maven.exec-plugin.version>
<maven.install-plugin.version>3.1.0</maven.install-plugin.version>
<maven.jacoco-plugin.version>0.8.8</maven.jacoco-plugin.version>
<maven.install-plugin.version>3.1.1</maven.install-plugin.version>
<maven.jacoco-plugin.version>0.8.10</maven.jacoco-plugin.version>
<maven.jar-plugin.version>3.3.0</maven.jar-plugin.version>
<maven.javadoc-plugin.version>3.5.0</maven.javadoc-plugin.version>
<maven.jxr-plugin.version>3.3.0</maven.jxr-plugin.version>
<!-- TODO: 2.0.x https://github.com/mojohaus/license-maven-plugin/issues/358 fixed -->
<maven.license-plugin.version>1.20</maven.license-plugin.version>
<maven.pmd-plugin.version>3.20.0</maven.pmd-plugin.version>
<maven.project-info-reports-plugin.version>3.4.2</maven.project-info-reports-plugin.version>
<maven.license-plugin.version>2.2.0</maven.license-plugin.version>
<maven.pmd-plugin.version>3.21.0</maven.pmd-plugin.version>
<maven.project-info-reports-plugin.version>3.4.5</maven.project-info-reports-plugin.version>
<maven.rat-plugin.version>0.15</maven.rat-plugin.version>
<maven.resources-plugin.version>3.3.0</maven.resources-plugin.version>
<maven.site-plugin.version>4.0.0-M5</maven.site-plugin.version>
<maven.shade-plugin.version>3.4.1</maven.shade-plugin.version>
<maven.source-plugin.version>3.2.1</maven.source-plugin.version>
<maven.spotbugs-plugin.version>4.7.3.4</maven.spotbugs-plugin.version>
<!-- TODO 2.30.0 is the last supported version for Java 8 -->
<maven.spotless-plugin.version>2.36.0</maven.spotless-plugin.version>
<maven.surefire-plugin.version>3.0.0</maven.surefire-plugin.version>
<maven.version>3.9.2</maven.version>
<maven.versions-plugin.version>2.15.0</maven.versions-plugin.version>
<mockito.version>5.3.1</mockito.version>
<maven.release-plugin.version>3.0.1</maven.release-plugin.version>
<maven.resources-plugin.version>3.3.1</maven.resources-plugin.version>
<maven.site-plugin.version>4.0.0-M9</maven.site-plugin.version>
<maven.shade-plugin.version>3.5.0</maven.shade-plugin.version>
<maven.source-plugin.version>3.3.0</maven.source-plugin.version>
<maven.spotbugs-plugin.version>4.7.3.5</maven.spotbugs-plugin.version>
<!-- TODO 2.30.0 is the last supported version for Java 8 Not sure how 2.38.0 is working... -->
<maven.spotless-plugin.version>2.38.0</maven.spotless-plugin.version>
<maven.surefire-plugin.version>3.1.2</maven.surefire-plugin.version>
<maven.version>3.9.3</maven.version>
<maven.versions-plugin.version>2.16.0</maven.versions-plugin.version>
<mockito.version>5.4.0</mockito.version>
<mutability.detector.version>0.9.1</mutability.detector.version>
<pmd.version>6.55.0</pmd.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Expand Down Expand Up @@ -285,6 +286,11 @@
</dependency>
</dependencies>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<version>${maven.release-plugin.version}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
Expand Down
32 changes: 31 additions & 1 deletion java/samples/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -38,17 +38,47 @@
</dependencyManagement>

<build>

<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>${maven.compiler-plugin.version}</version>
</plugin>
</plugins>
</pluginManagement>

<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>${maven.compiler-plugin.version}</version>
<configuration>
<source>${maven.compiler.release}</source>
<target>${maven.compiler.release}</target>
<release>${maven.compiler.release}</release>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>3.3.0</version>
<executions>
<execution>
<id>enforce-maven</id>
<goals>
<goal>enforce</goal>
</goals>
<configuration>
<rules>
<requireMavenVersion>
<version>3.9.3</version>
</requireMavenVersion>
</rules>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>

Expand Down
2 changes: 2 additions & 0 deletions java/samples/sample-code/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@
<scope>compile</scope>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
Expand All @@ -73,6 +74,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>3.1.0</version>
<executions>
<execution>
<id>run-sample</id>
Expand Down
2 changes: 1 addition & 1 deletion java/samples/semantickernel-guice/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
<version>5.9.2</version>
<version>5.10.0</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
30 changes: 28 additions & 2 deletions java/semantickernel-bom/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,36 @@
<name>Semantic Kernel Java BOM</name>
<description>Bill of Materials for all Semantic Kernel (Java) modules</description>
<url>https://www.github.com/microsoft/semantic-kernel</url>

<properties>
<com.fasterxml.jackson.core.version>2.15.1</com.fasterxml.jackson.core.version>
<com.fasterxml.jackson.core.version>2.15.2</com.fasterxml.jackson.core.version>
</properties>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>3.3.0</version>
<executions>
<execution>
<id>enforce-maven</id>
<goals>
<goal>enforce</goal>
</goals>
<configuration>
<rules>
<requireMavenVersion>
<version>3.9.3</version>
</requireMavenVersion>
</rules>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>

<dependencyManagement>
<dependencies>
<dependency>
Expand Down Expand Up @@ -86,7 +112,7 @@
<dependency>
<groupId>io.projectreactor</groupId>
<artifactId>reactor-core</artifactId>
<version>3.5.6</version>
<version>3.5.8</version>
</dependency>
<dependency>
<groupId>com.google.code.findbugs</groupId>
Expand Down
5 changes: 0 additions & 5 deletions java/semantickernel-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -86,11 +86,6 @@
<artifactId>semantickernel-planners</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.microsoft.semantic-kernel</groupId>
<artifactId>semantickernel-planners</artifactId>
<scope>test</scope>
</dependency>

<dependency>
<groupId>jakarta.inject</groupId>
Expand Down

0 comments on commit 0600c1e

Please sign in to comment.