Skip to content

Java 17 #380

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
u-kalifon wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Java 17 #380

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
280c2a9
Java 17
Aug 15, 2025
fec3f7b
Revert changes to JUnitReporter
Aug 23, 2025
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
4 changes: 2 additions & 2 deletions jsystem-archetypes/jsystem-so-archetype/src/main/resources/archetype-resources/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
<properties>
<jsystem.version>${jsystem.dependency.version}</jsystem.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
</properties>
<repositories>
<repository>
Expand Down
4 changes: 2 additions & 2 deletions jsystem-archetypes/jsystem-tests-archetype/src/main/resources/archetype-resources/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
<properties>
<jsystem.version>${jsystem.dependency.version}</jsystem.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
</properties>
<repositories>
<repository>
Expand Down
53 changes: 45 additions & 8 deletions jsystem-assembly/jsystem-runner/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,25 @@
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-core</artifactId>
<version>2.3.0.1</version>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
<version>2.3.1</version>
</dependency>
<dependency>
<groupId>org.javassist</groupId>
<artifactId>javassist</artifactId>
<version>3.25.0-GA</version>
</dependency>
<dependency>
<groupId>ant</groupId>
<artifactId>ant-full</artifactId>
Expand Down Expand Up @@ -77,11 +96,6 @@
<artifactId>comm</artifactId>
<!-- type>pom</type -->
</dependency>
<!-- dependency> <groupId>org.apache.ftpserver</groupId> <artifactId>ftpserver-core</artifactId>
<version>1.0.0</version> </dependency> <dependency> <groupId>org.apache.ftpserver</groupId>
<artifactId>ftplet-api</artifactId> <version>1.0.0</version> </dependency>
<dependency> <groupId>org.apache.ftpserver</groupId> <artifactId>ftpserver-deprecated</artifactId>
<version>1.0.0-M2</version> </dependency -->
<dependency>
<groupId>org.apache.ftpserver</groupId>
<artifactId>ftpserver-core</artifactId>
Expand Down Expand Up @@ -174,8 +188,31 @@
<version>${project.version}</version>
<classifier>sources</classifier>
</dependency>


<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>2.15.2</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.15.2</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<version>2.15.2</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-xml</artifactId>
<version>2.15.2</version>
</dependency>
<dependency>
<groupId>org.codehaus.woodstox</groupId>
<artifactId>stax2-api</artifactId>
<version>4.2.2</version>
</dependency>
</dependencies>

<packaging>jar</packaging>
Expand Down Expand Up @@ -203,4 +240,4 @@
</plugin>
</plugins>
</build>
</project>
</project>
8 changes: 7 additions & 1 deletion jsystem-assembly/jsystem-runner/src/main/assembly/runner.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,12 @@
<include>*:jackson-databind:*</include>
<include>*:jackson-annotations:*</include>
<include>*:jackson-core:*</include>
<include>*:jackson-dataformat-xml:*</include>
<include>*:stax2-api:*</include>
<include>*:jaxb-api:*</include>
<include>*:jaxb-core:*</include>
<include>*:jaxb-impl:*</include>
<include>*:javassist:*</include>
<include>*:difido-reports-common:*</include>
</includes>
</dependencySet>
Expand Down Expand Up @@ -170,4 +176,4 @@

</fileSets>

</assembly>
</assembly>
5 changes: 0 additions & 5 deletions jsystem-core-projects/jsystemApp/src/main/java/jsystem/treeui/WaitDialog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@
import javax.swing.JProgressBar;
import javax.swing.SwingWorker;

import sun.awt.AppContext;

import jsystem.framework.TestRunnerFrame;

/**
Expand Down Expand Up @@ -177,9 +175,6 @@ public synchronized static void launchWaitDialog(final String title, final WaitD
/*
* Execute the open of the dialog in a thread as the dialog is modal
*/
// This line suppose to fix bug in the SwingWorker that causes deadlocks
// in some of the Java versions. Please see http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6880336
AppContext.getAppContext().put(SwingWorker.class, Executors.newCachedThreadPool());
dialog = new WaitDialog(TestRunnerFrame.guiMainFrame, listener, title);
class RunWaitDiaolg extends SwingWorker<String, Object> {
public String doInBackground() {
Expand Down
4 changes: 2 additions & 2 deletions jsystem-core-projects/jsystemApp/src/main/java/jsystem/treeui/agents/AgentsDialog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ public void initDialog() throws Exception {
}

private void buildAgentsListTableModel() throws Exception {
Vector<Object> model = new Vector<Object>();
Vector<Vector<Object>> model = new Vector<Vector<Object>>();
RunnerEngine[] clients = JSystemAgentClientsPool.getClients(null);
for (RunnerEngine client : clients) {
Vector<Object> clientRow = getJSystemAgentDataVector(client, false);
Expand Down Expand Up @@ -231,7 +231,7 @@ private void refreshUrl(String url, ProgressNotifier notifier, int progress) {
}

class AgentListTableModel extends DefaultTableModel {
AgentListTableModel(Vector<Object> model, Vector<String> columns) {
AgentListTableModel(Vector<Vector<Object>> model, Vector<String> columns) {
super(model, columns);
}

Expand Down
4 changes: 2 additions & 2 deletions ...m-core-projects/jsystemApp/src/main/java/jsystem/treeui/params/AgentsSelectionDialog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ public void initDialog(String[] selectedUrls) throws Exception {
}

private void buildAgentsListTableModel() throws Exception {
Vector<Object> model = new Vector<Object>();
Vector<Vector<Object>> model = new Vector<Vector<Object>>();
JSystemAgentClient[] clients = (JSystemAgentClient[]) JSystemAgentClientsPool.getClients(null);
for (JSystemAgentClient client : clients) {
Vector<Object> clientRow = getJSystemAgentDataVector(client);
Expand Down Expand Up @@ -132,7 +132,7 @@ public String[] getSelectedUrls() {
class AgentSelectTableModel extends DefaultTableModel {
private static final long serialVersionUID = 1L;

AgentSelectTableModel(Vector<Object> model, Vector<String> columns) {
AgentSelectTableModel(Vector<Vector<Object>> model, Vector<String> columns) {
super(model, columns);
}

Expand Down
2 changes: 1 addition & 1 deletion ...em-core-projects/jsystemApp/src/main/java/jsystem/treeui/teststable/ScenarioTreeNode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ public boolean isLeaf() {
return (!isJTestContainer() || ScenarioHelpers.isScenarioAsTestAndNotRoot(getTest()));
}

public Enumeration<?> children() {
public Enumeration<? extends TreeNode> children() {
Vector<ScenarioTreeNode> elements = new Vector<ScenarioTreeNode>();
Vector<JTest> tests = null;
if (isJTestContainer()) {
Expand Down
4 changes: 2 additions & 2 deletions jsystem-core-projects/jsystemApp/src/main/java/jsystem/treeui/tree/AssetNode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ public AssetNode(AssetNode parent, Object userObject) {
public AssetNode(){
isSelected = false;
if (children == null) {
children = new Vector<AssetNode>();
children = new Vector();
}
}

Expand Down Expand Up @@ -246,7 +246,7 @@ protected void initChildren(Object[] child) throws Exception {
}
}
if("true".equals(JSystemProperties.getInstance().getPreferenceOrDefault(FrameworkOptions.SORT_ASSETS_TREE))){
Collections.sort(children);
Collections.sort(children, null);
}
}

Expand Down
2 changes: 1 addition & 1 deletion jsystem-core-projects/jsystemApp/src/main/java/jsystem/treeui/tree/TestCaseNode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public TestCaseNode(AssetNode parent, Class<?> userObject) throws Exception {
createJUnit4TestNodes(userObject);
}
if("true".equals(JSystemProperties.getInstance().getPreferenceOrDefault(FrameworkOptions.SORT_ASSETS_TREE))){
Collections.sort(children);
Collections.sort(children, null);
}
}

Expand Down
28 changes: 27 additions & 1 deletion jsystem-core-projects/jsystemCore/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,32 @@
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-xml</artifactId>
</dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<version>2.3.1</version>
</dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
<version>2.3.1</version>
</dependency>
</dependencies>
<build>
<plugins>
Expand All @@ -84,4 +110,4 @@
<goal>run</goal> </goals> </execution> </executions> </plugin -->
</plugins>
</build>
</project>
</project>
2 changes: 1 addition & 1 deletion ...ore-projects/jsystemCore/src/main/java/jsystem/extensions/report/junit/JUnitReporter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ private static FailureOrError buildFailureOrError(Throwable throwable) {
}

/**
* Exports the model to XML. The file will be copies to the JSystem root
* Exports the model to XML. The file will be copied to the JSystem root
* directory.
*/
public void toXml() {
Expand Down
5 changes: 3 additions & 2 deletions jsystem-core-projects/jsystemCore/src/main/java/jsystem/utils/Encryptor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
*/
package jsystem.utils;

import java.util.Base64;
import javax.crypto.Cipher;
import javax.crypto.spec.SecretKeySpec;

Expand Down Expand Up @@ -48,7 +49,7 @@ public static String encrypt(String str) throws Exception {
byte[] enc = ecipher.doFinal(utf8);

// Encode bytes to base64 to get a string
return (new sun.misc.BASE64Encoder().encode(enc))+ENCRYPTION_TERMINATING_STRING;
return Base64.getEncoder().encode(enc)+ENCRYPTION_TERMINATING_STRING;
}

/**
Expand All @@ -70,7 +71,7 @@ public static String decrypt(String str) throws Exception {
ecipher.init(Cipher.ENCRYPT_MODE, key);
dcipher.init(Cipher.DECRYPT_MODE, key);
// Decode base64 to get bytes
byte[] dec = new sun.misc.BASE64Decoder().decodeBuffer(str);
byte[] dec = Base64.getDecoder().decode(str);

// Decrypt
byte[] utf8 = dcipher.doFinal(dec);
Expand Down
4 changes: 1 addition & 3 deletions jsystem-core-projects/jsystemCore/src/main/java/jsystem/utils/MailUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
package jsystem.utils;

import java.io.File;
import java.security.Security;

import java.util.ArrayList;
import java.util.Properties;

Expand Down Expand Up @@ -169,8 +169,6 @@ public void sendMail(String title,String msgContent) throws Exception {
props.put("mail.smtp.socketFactory.fallback", "false");
}

Security.addProvider(new com.sun.net.ssl.internal.ssl.Provider());

props.put("mail.smtp.host", smtpHostName);

props.put("mail.debug", isDebug + "");
Expand Down
30 changes: 28 additions & 2 deletions jsystem-core-projects/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,31 @@
<module>jsystemAgent</module>
<module>jsystemApp</module>
</modules>

</project>
<dependencies>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>2.15.2</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.15.2</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<version>2.15.2</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-xml</artifactId>
<version>2.15.2</version>
</dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<version>2.3.1</version>
</dependency>
</dependencies>
</project>
16 changes: 16 additions & 0 deletions jsystem-miscellaneous/jsystem-maven-plugin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,22 @@
<version>2.0.2</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-xml</artifactId>
</dependency>
</dependencies>
<build>
<plugins>
Expand Down
Loading