Merge remote-tracking branch 'upstream/java-development' into HEAD

microsoft · May 13, 2024 · 2f418b5 · 2f418b5
2 parents 0bbfb5f + 828998d
commit 2f418b5
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/.github/workflows/java-integration-tests.yml b/.github/workflows/java-integration-tests.yml
@@ -70,8 +70,9 @@ jobs:
           cache: maven
 
       - name: Build with Maven
-        run: ./mvnw -B -Pbug-check -DskipTests -Pcompile-jdk${{ matrix.java-versions }} clean install --file pom.xml
+        run: ./mvnw -B -Pwith-samples -Pbug-check -DskipTests -Pcompile-jdk${{ matrix.java-versions }} clean install --file pom.xml
         working-directory: java
+        if: ${{ matrix.java-versions >= 17 }}
 
       # API tests run on JDK 17+
       - name: Run integration tests

diff --git a/java/api-test/pom.xml b/java/api-test/pom.xml
@@ -20,9 +20,6 @@
     </properties>
 
     <modules>
-        <!--
-        <module>api-usage-example</module>
-        -->
         <module>integration-tests</module>
     </modules>
 
@@ -57,6 +54,13 @@
                     <skip>true</skip>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>com.diffplug.spotless</groupId>
+                <artifactId>spotless-maven-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 

diff --git a/java/pom.xml b/java/pom.xml
@@ -62,6 +62,7 @@
         <project.github.repository>microsoft/semantic-kernel</project.github.repository>
         <repository.url>git@github.com:${project.github.repository}.git</repository.url>
         <spotbugs.version>4.8.3</spotbugs.version>
+        <compilingJdk8>false</compilingJdk8>
     </properties>
 
     <modules>
@@ -566,6 +567,7 @@
             <properties>
                 <maven.compiler.source>1.8</maven.compiler.source>
                 <maven.compiler.target>1.8</maven.compiler.target>
+                <compilingJdk8>true</compilingJdk8>
             </properties>
         </profile>
         <profile>
@@ -643,6 +645,7 @@
                             </execution>
                         </executions>
                         <configuration>
+                            <skip>${compilingJdk8}</skip>
                             <java>
                                 <eclipse>
                                     <version>4.30</version>