JDK 18 support (#1802)

microsoft · Apr 20, 2022 · 55019b1 · 55019b1
1 parent 584fea7
commit 55019b1
Show file tree

Hide file tree

Showing 3 changed files with 53 additions and 7 deletions.
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -43,7 +43,7 @@ jobs:
     - uses: actions/setup-java@v2
       with:
         distribution: microsoft
-        java-version: '17'
+        java-version: '18'
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL

diff --git a/build.gradle b/build.gradle
@@ -32,7 +32,20 @@ test {
     }
 }
 
-if (!hasProperty('buildProfile') || (hasProperty('buildProfile') && buildProfile == "jre17")){
+if (!hasProperty('buildProfile') || (hasProperty('buildProfile') && buildProfile == "jre18")) {
+
+	jreVersion = "jre18"
+	excludedFile = 'com/microsoft/sqlserver/jdbc/SQLServerJdbc42.java'
+	jar {
+		manifest {
+			attributes 'Automatic-Module-Name': 'com.microsoft.sqlserver.jdbc'
+		}
+	}
+	sourceCompatibility = 18
+	targetCompatibility = 18
+}
+
+if (hasProperty('buildProfile') && buildProfile == "jre17") {
 
 	jreVersion = "jre17"
 	excludedFile = 'com/microsoft/sqlserver/jdbc/SQLServerJdbc42.java'
@@ -45,7 +58,7 @@ if (!hasProperty('buildProfile') || (hasProperty('buildProfile') && buildProfile
 	targetCompatibility = 17
 }
 
-if (hasProperty('buildProfile') && buildProfile == "jre11"){
+if (hasProperty('buildProfile') && buildProfile == "jre11") {
 
 	jreVersion = "jre11"
 	excludedFile = 'com/microsoft/sqlserver/jdbc/SQLServerJdbc42.java'

diff --git a/pom.xml b/pom.xml
@@ -322,9 +322,6 @@
 		</profile>
 		<profile>
 			<id>jre17</id>
-			<activation>
-				<activeByDefault>true</activeByDefault>
-			</activation>
 			<build>
 				<finalName>${project.artifactId}-${project.version}.jre17${releaseExt}</finalName>
 				<plugins>
@@ -356,6 +353,42 @@
 				</plugins>
 			</build>
 		</profile>
+		<profile>
+			<id>jre18</id>
+			<activation>
+				<activeByDefault>true</activeByDefault>
+			</activation>
+			<build>
+				<finalName>${project.artifactId}-${project.version}.jre18${releaseExt}</finalName>
+				<plugins>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-compiler-plugin</artifactId>
+						<version>3.8.0</version>
+						<configuration>
+							<excludes>
+								<exclude>**/com/microsoft/sqlserver/jdbc/SQLServerJdbc42.java</exclude>
+							</excludes>
+							<source>18</source>
+							<target>18</target>
+						</configuration>
+					</plugin>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-jar-plugin</artifactId>
+						<version>3.1.1</version>
+						<configuration>
+							<archive>
+								<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+								<manifestEntries>
+									<Automatic-Module-Name>com.microsoft.sqlserver.jdbc</Automatic-Module-Name>
+								</manifestEntries>
+							</archive>
+						</configuration>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
 	</profiles>
 	<build>
 		<resources>
@@ -497,7 +530,7 @@
 			<plugin>
 				<groupId>org.jacoco</groupId>
 				<artifactId>jacoco-maven-plugin</artifactId>
-				<version>0.8.7</version>
+				<version>0.8.8</version>
 				<executions>
 					<execution>
 						<id>pre-test</id>