Skip to content

Commit d6a59c8

Browse files
committed
ADDR-131:Adding Java 17 Compatability
1 parent dedc525 commit d6a59c8

File tree

2 files changed

+37
-3
lines changed

2 files changed

+37
-3
lines changed

api/src/test/java/org/openmrs/module/addresshierarchy/AddressHierarchyActivatorTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,4 +211,4 @@ public void started_shouldWipeExistingEntries() {
211211
Assert.assertTrue(entryNames.contains("Auburndale"));
212212
Assert.assertTrue(entryNames.contains("Chestnut Hill"));
213213
}
214-
}
214+
}

pom.xml

Lines changed: 36 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,22 @@
7575
<type>pom</type>
7676
<scope>test</scope>
7777
</dependency>
78+
<dependency>
79+
<groupId>com.thoughtworks.xstream</groupId>
80+
<artifactId>xstream</artifactId>
81+
<version>1.4.17</version>
82+
<scope>provided</scope>
83+
</dependency>
7884
</dependencies>
7985
</dependencyManagement>
8086

87+
<dependencies>
88+
<dependency>
89+
<groupId>com.thoughtworks.xstream</groupId>
90+
<artifactId>xstream</artifactId>
91+
</dependency>
92+
</dependencies>
93+
8194
<properties>
8295
<openMRSVersion>1.10.6</openMRSVersion>
8396
<openMRSMinorVersion>1.9</openMRSMinorVersion>
@@ -93,8 +106,8 @@
93106
<groupId>org.apache.maven.plugins</groupId>
94107
<artifactId>maven-compiler-plugin</artifactId>
95108
<configuration>
96-
<target>1.6</target>
97-
<source>1.6</source>
109+
<target>1.7</target>
110+
<source>1.7</source>
98111
<encoding>UTF-8</encoding>
99112
</configuration>
100113
</plugin>
@@ -188,6 +201,27 @@
188201
<openMRSMinorVersion>1.10</openMRSMinorVersion>
189202
</properties>
190203
</profile>
204+
205+
<profile>
206+
<id>Java 17</id>
207+
<activation>
208+
<jdk>17</jdk>
209+
</activation>
210+
<build>
211+
<plugins>
212+
<plugin>
213+
<groupId>org.apache.maven.plugins</groupId>
214+
<artifactId>maven-surefire-plugin</artifactId>
215+
<version>3.2.2</version>
216+
<configuration>
217+
<argLine>--add-opens java.base/java.lang=ALL-UNNAMED
218+
--add-opens java.base/java.util=ALL-UNNAMED
219+
</argLine>
220+
</configuration>
221+
</plugin>
222+
</plugins>
223+
</build>
224+
</profile>
191225
</profiles>
192226

193227
</project>

0 commit comments

Comments
 (0)