From 0f0bf85f18d8f52a9f620db8cf2b69986dfab928 Mon Sep 17 00:00:00 2001
From: Tadgh <tadgh@cs.toronto.edu>
Date: Wed, 19 Jan 2022 07:09:21 -0800
Subject: [PATCH] Bump compiler plugin (#3313)

* Bump compiler plugin

* Bump jpaserver fhir test server version

* Bump container for maven
---
 hapi-fhir-jpaserver-uhnfhirtest/pom.xml | 10 ++--------
 pom.xml                                 |  4 ++--
 snapshot-pipeline.yml                   |  3 +++
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/hapi-fhir-jpaserver-uhnfhirtest/pom.xml b/hapi-fhir-jpaserver-uhnfhirtest/pom.xml
index 74ca1677c1f..49509d93ce0 100644
--- a/hapi-fhir-jpaserver-uhnfhirtest/pom.xml
+++ b/hapi-fhir-jpaserver-uhnfhirtest/pom.xml
@@ -192,14 +192,8 @@
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-compiler-plugin</artifactId>
 					<configuration>
-						<!-- 
-							This project is built to 1.8 since our public
-							server runs on a 1.8 JDK. If you are using this
-							project as a basis for your own work, you could
-							probably safely reduce this if needed
-						-->
-						<source>1.8</source>
-						<target>1.8</target>
+						<source>11</source>
+						<target>11</target>
 					</configuration>
 				</plugin>
 				<!--This plugin's configuration is used to store Eclipse m2e settings 
diff --git a/pom.xml b/pom.xml
index 5bc33c8927e..079c7295e29 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2031,8 +2031,8 @@
 					<artifactId>maven-compiler-plugin</artifactId>
 					<version>3.8.1</version>
 					<configuration>
-						<source>1.8</source>
-						<target>1.8</target>
+						<source>11</source>
+						<target>11</target>
 						<forceJavacCompilerUse>true</forceJavacCompilerUse>
 						<encoding>UTF-8</encoding>
 						<fork>true</fork>
diff --git a/snapshot-pipeline.yml b/snapshot-pipeline.yml
index d0859d42449..c1a401697a2 100644
--- a/snapshot-pipeline.yml
+++ b/snapshot-pipeline.yml
@@ -15,6 +15,7 @@ variables:
 - group: GPG_VARIABLE_GROUP
 - group: SONATYPE_VARIABLE_GROUP
 
+container: maven:3.8-openjdk-17
 steps:
 
   # We need a valid signing key to sign our builds for deployment to sonatype. We have uploaded
@@ -81,6 +82,8 @@ steps:
 
   # 5. Deploy SNAPSHOT build to sonatype
   - task: Maven@3
+    env:
+      JAVA_HOME_11_X64: /usr/java/openjdk-17
     displayName: 'Deploy to Sonatype staging'
     inputs:
       mavenPomFile: '$(System.DefaultWorkingDirectory)/pom.xml'