Skip to content
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

Support java 17 #456

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Support java 17 #456

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
99759ff
Open modules to support Java17
Jun 1, 2023
395d8d8
Update asm and xstream
Jun 1, 2023
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
5 changes: 5 additions & 0 deletions client/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,11 @@
</dependency>

<!-- Third-party modules -->
<dependency>
<groupId>org.burningwave</groupId>
<artifactId>core</artifactId>
<version>12.62.7</version>
</dependency>

<dependency>
<groupId>junit</groupId>
Expand Down
4 changes: 4 additions & 0 deletions client/src/main/java/org/evosuite/TestSuiteGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
*/
package org.evosuite;

import org.burningwave.core.assembler.StaticComponentContainer;
import org.evosuite.Properties.AssertionStrategy;
import org.evosuite.Properties.Criterion;
import org.evosuite.Properties.TestFactory;
Expand Down Expand Up @@ -85,6 +86,9 @@ public class TestSuiteGenerator {


private void initializeTargetClass() throws Throwable {
// opens all modules by invoking addExportsToAll0
StaticComponentContainer.Modules.exportAllToAll();

String cp = ClassPathHandler.getInstance().getTargetProjectClasspath();

// Generate inheritance tree and call graph *before* loading the CUT
Expand Down
18 changes: 12 additions & 6 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -349,31 +349,31 @@
<!-- Adhoc license, copyright holder is INRIA -->
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
<version>9.2</version>
<version>9.5</version>
</dependency>
<dependency>
<!-- Adhoc license, copyright holder is INRIA -->
<groupId>org.ow2.asm</groupId>
<artifactId>asm-commons</artifactId>
<version>9.2</version>
<version>9.5</version>
</dependency>
<dependency>
<!-- Adhoc license, copyright holder is INRIA -->
<groupId>org.ow2.asm</groupId>
<artifactId>asm-tree</artifactId>
<version>9.2</version>
<version>9.5</version>
</dependency>
<dependency>
<!-- Adhoc license, copyright holder is INRIA -->
<groupId>org.ow2.asm</groupId>
<artifactId>asm-analysis</artifactId>
<version>9.2</version>
<version>9.5</version>
</dependency>
<dependency>
<!-- Adhoc license, copyright holder is INRIA -->
<groupId>org.ow2.asm</groupId>
<artifactId>asm-util</artifactId>
<version>9.2</version>
<version>9.5</version>
</dependency>
<dependency>
<!-- Apache 2 -->
Expand All @@ -388,11 +388,17 @@
<version>0.8.3</version>
</dependency>

<dependency>
<groupId>org.burningwave</groupId>
<artifactId>core</artifactId>
<version>12.62.7</version>
</dependency>

<dependency>
<!-- BSD -->
<groupId>com.thoughtworks.xstream</groupId>
<artifactId>xstream</artifactId>
<version>1.4.18</version>
<version>1.4.20</version>
</dependency>
<dependency>
<!-- Apache 2 -->
Expand Down
5 changes: 5 additions & 0 deletions runtime/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,11 @@
<artifactId>junit-jupiter</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.burningwave</groupId>
<artifactId>core</artifactId>
<version>12.62.7</version>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
Expand Down
4 changes: 3 additions & 1 deletion runtime/src/main/java/org/evosuite/runtime/classhandling/JDKClassResetter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
*/
package org.evosuite.runtime.classhandling;

import org.burningwave.core.assembler.StaticComponentContainer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand All @@ -44,8 +45,9 @@ public class JDKClassResetter {
* Save current state of all JDK static fields we are going te reset later on
*/
public static void init() {

try {
// opens all modules by invoking addExportsToAll0
StaticComponentContainer.Modules.exportAllToAll();
Field field = RenderingHints.Key.class.getDeclaredField("identitymap");
field.setAccessible(true);
renderingHintsKeyIdentityMap = (Map) field.get(null);
Expand Down