Skip to content

ADDR-131:Adding Java 17 Compatability #40

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wikumChamith wants to merge 1 commit into
base: master
Choose a base branch
from
Open

ADDR-131:Adding Java 17 Compatability #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion api/src/test/java/org/openmrs/module/addresshierarchy/AddressHierarchyActivatorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,4 +211,4 @@ public void started_shouldWipeExistingEntries() {
Assert.assertTrue(entryNames.contains("Auburndale"));
Assert.assertTrue(entryNames.contains("Chestnut Hill"));
}
}
}
38 changes: 36 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,22 @@
<type>pom</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.thoughtworks.xstream</groupId>
<artifactId>xstream</artifactId>
<version>1.4.17</version>
<scope>provided</scope>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>
<dependency>
<groupId>com.thoughtworks.xstream</groupId>
<artifactId>xstream</artifactId>
</dependency>
</dependencies>

<properties>
<openMRSVersion>1.10.6</openMRSVersion>
<openMRSMinorVersion>1.9</openMRSMinorVersion>
Expand All @@ -93,8 +106,8 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<target>1.6</target>
<source>1.6</source>
<target>1.7</target>
<source>1.7</source>
<encoding>UTF-8</encoding>
</configuration>
</plugin>
Expand Down Expand Up @@ -188,6 +201,27 @@
<openMRSMinorVersion>1.10</openMRSMinorVersion>
</properties>
</profile>

<profile>
<id>Java 17</id>
<activation>
<jdk>17</jdk>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.2.2</version>
<configuration>
<argLine>--add-opens java.base/java.lang=ALL-UNNAMED
Copy link
Member

@dkayiwa dkayiwa Dec 25, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we look into avoiding having to add this?

Copy link
Member Author

@wikumChamith wikumChamith Dec 26, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We need these for some of the testing libraries. I think it would be hard to support both Java 8 and 17 if we want to avoid using these.

--add-opens java.base/java.util=ALL-UNNAMED
</argLine>
</configuration>
</plugin>
</plugins>
</build>
</profile>
</profiles>

</project>