SDK-31 Adding Java 17 Compatability

openmrs · Dec 6, 2023 · ac84845 · ac84845
2 parents ae13482 + d01a5c0
commit ac84845
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -59,3 +59,4 @@ jobs:
                   cache: maven
             - name: Build with Maven
               run: mvn clean install --file pom.xml
+
diff --git a/api/src/main/java/org/openmrs/module/serialization/xstream/XStreamSerializer.java b/api/src/main/java/org/openmrs/module/serialization/xstream/XStreamSerializer.java
@@ -25,7 +25,6 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import com.thoughtworks.xstream.security.AnyTypePermission;
 import org.openmrs.BaseOpenmrsData;
 import org.openmrs.BaseOpenmrsMetadata;
 import org.openmrs.BaseOpenmrsObject;
@@ -160,7 +159,6 @@ protected MapperWrapper wrapMapper(MapperWrapper next) {
 		xstream.registerConverter(new CustomDynamicProxyConverter(), XStream.PRIORITY_VERY_HIGH);
 		// set our own defined marshalling strategy so that we can build references for cglib
 		xstream.setMarshallingStrategy(new CustomReferenceByIdMarshallingStrategy());
-		xstream.addPermission(AnyTypePermission.ANY);
 	}
 
     @PostConstruct

diff --git a/pom.xml b/pom.xml
@@ -43,7 +43,8 @@
 		<dependency>
 			<groupId>com.thoughtworks.xstream</groupId>
 			<artifactId>xstream</artifactId>
-			<version>1.4.20</version>
+			<version>1.4.17</version>
+			<scope>provided</scope>
 		</dependency>
 	</dependencies>
 
@@ -107,6 +108,7 @@
 				<groupId>javax.annotation</groupId>
 				<artifactId>javax.annotation-api</artifactId>
 				<version>1.3.2</version>
+				<scope>provided</scope>
 			</dependency>
 		</dependencies>
 	</dependencyManagement>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -59,3 +59,4 @@ jobs:
		cache: maven
		- name: Build with Maven
		run: mvn clean install --file pom.xml