diff --git a/CHANGES.md b/CHANGES.md index 9eda2283..d2d1a1f5 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,6 +1,19 @@ Change Log ==== +## 7.10.0 + +Supported Metrics: + +| Plugin | Dependency | +| ------------- | ------------- | +| TestNG for Eclipse | Eclipse Photon (4.8) or above | +| TestNG M2E Integration (Optional) | M2E 1.5 or above | +| Java | 11.0 or above | + +* update testng-remote to 1.7.0 +* update testng-p2 to 7.10.1 + ## 7.9.0 Supported Metrics: diff --git a/README.md b/README.md index 27e7b730..091bf2fa 100644 --- a/README.md +++ b/README.md @@ -39,6 +39,7 @@ Plugin Version | Online Update-Site | Zipped Update-Site LATEST RELEASE | `https://testng.org/testng-eclipse-update-site` | [here](https://testng.org/testng-eclipse-update-site) LATEST BETA | `https://testng.org/testng-eclipse-update-site` | [here](https://testng.org/testng-eclipse-update-site) History:|| +7.10.0.202404131040 | `https://testng.org/testng-eclipse-update-site/7.10.0/` | [download](https://testng.org/testng-eclipse-update-site/zipped/7.10.0.202404131040/org.testng.eclipse.updatesite.zip) 7.9.0.202312310355 | `https://testng.org/testng-eclipse-update-site/7.9.0/` | [download](https://testng.org/testng-eclipse-update-site/zipped/7.9.0.202312310355/org.testng.eclipse.updatesite.zip) 7.8.0.202308061717 | `https://testng.org/testng-eclipse-update-site/7.8.0/` | [download](https://testng.org/testng-eclipse-update-site/zipped/7.8.0.202308061717/org.testng.eclipse.updatesite.zip) 7.4.0.202106051955 | `https://testng.org/testng-eclipse-update-site/7.4.0/` | [download](https://testng.org/testng-eclipse-update-site/zipped/7.4.0.202106051955/org.testng.eclipse.updatesite.zip) diff --git a/pom.xml b/pom.xml index fda584be..62fd341a 100755 --- a/pom.xml +++ b/pom.xml @@ -162,7 +162,7 @@ - https://testng.org/testng-p2-update-site/7.9.0/ + https://testng.org/testng-p2-update-site/7.10.1/ diff --git a/testng-eclipse-plugin/lib/testng-remote.jar b/testng-eclipse-plugin/lib/testng-remote.jar index 30f44fef..d0bda446 100644 Binary files a/testng-eclipse-plugin/lib/testng-remote.jar and b/testng-eclipse-plugin/lib/testng-remote.jar differ diff --git a/testng-eclipse-plugin/pom.xml b/testng-eclipse-plugin/pom.xml index f8b27fd8..afb56832 100755 --- a/testng-eclipse-plugin/pom.xml +++ b/testng-eclipse-plugin/pom.xml @@ -12,7 +12,7 @@ eclipse-plugin - 1.6.0 + 1.7.0 diff --git a/testng-eclipse-plugin/src/main/org/testng/eclipse/launch/TestNGLaunchConfigurationDelegate.java b/testng-eclipse-plugin/src/main/org/testng/eclipse/launch/TestNGLaunchConfigurationDelegate.java index 5f20654e..915860eb 100644 --- a/testng-eclipse-plugin/src/main/org/testng/eclipse/launch/TestNGLaunchConfigurationDelegate.java +++ b/testng-eclipse-plugin/src/main/org/testng/eclipse/launch/TestNGLaunchConfigurationDelegate.java @@ -232,7 +232,7 @@ protected VMRunnerConfiguration createVMRunner( switch (protocol) { case STRING: p("Using the string protocol"); - argv.add(CommandLineArgs.PORT); + argv.add(RemoteArgs.PORT); break; case OBJECT: p("Using the object serialization protocol"); diff --git a/testng-eclipse-plugin/src/main/org/testng/eclipse/refactoring/ConvertToYamlAction.java b/testng-eclipse-plugin/src/main/org/testng/eclipse/refactoring/ConvertToYamlAction.java index 207b9e04..6fcb3ee5 100644 --- a/testng-eclipse-plugin/src/main/org/testng/eclipse/refactoring/ConvertToYamlAction.java +++ b/testng-eclipse-plugin/src/main/org/testng/eclipse/refactoring/ConvertToYamlAction.java @@ -17,7 +17,7 @@ import org.testng.eclipse.TestNGPlugin; import org.testng.eclipse.util.Utils; import org.testng.internal.Yaml; -import org.testng.xml.Parser; +import org.testng.xml.internal.Parser; import org.testng.xml.XmlSuite; import org.xml.sax.SAXException; diff --git a/testng-eclipse-plugin/src/main/org/testng/eclipse/util/CustomSuite.java b/testng-eclipse-plugin/src/main/org/testng/eclipse/util/CustomSuite.java index 25597050..7c4a7cde 100644 --- a/testng-eclipse-plugin/src/main/org/testng/eclipse/util/CustomSuite.java +++ b/testng-eclipse-plugin/src/main/org/testng/eclipse/util/CustomSuite.java @@ -26,7 +26,7 @@ import org.testng.remote.RemoteTestNG; import org.testng.reporters.XMLStringBuffer; import org.testng.xml.LaunchSuite; -import org.testng.xml.Parser; +import org.testng.xml.internal.Parser; import org.testng.xml.XmlMethodSelector; import org.testng.xml.XmlSuite; @@ -173,7 +173,7 @@ private void createXmlFileFromTemplate(XMLStringBuffer suiteBuffer, String fileN // them in the suite we are creating. Properties attr = new Properties(); put(attr, "name", s.getName()); - put(attr, "junit", s.isJUnit()); +// put(attr, "junit", s.isJUnit()); put(attr, "verbose", s.getVerbose()); put(attr, "parallel", s.getParallel()); put(attr, "thread-count", s.getThreadCount()); @@ -182,7 +182,7 @@ private void createXmlFileFromTemplate(XMLStringBuffer suiteBuffer, String fileN put(attr, "skipfailedinvocationcounts", s.skipFailedInvocationCounts()); put(attr, "configfailurepolicy", s.getConfigFailurePolicy()); put(attr, "data-provider-thread-count", s.getDataProviderThreadCount()); - put(attr, "object-factory", s.getObjectFactory()); + put(attr, "object-factory", s.getObjectFactoryClass()); put(attr, "allow-return-values", s.getAllowReturnValues()); put(attr, "preserve-order", s.getPreserveOrder()); put(attr, "group-by-instances", s.getGroupByInstances()); diff --git a/testng-eclipse-plugin/src/main/org/testng/eclipse/util/SuiteBuilder.java b/testng-eclipse-plugin/src/main/org/testng/eclipse/util/SuiteBuilder.java index 26fb91de..f184d36f 100644 --- a/testng-eclipse-plugin/src/main/org/testng/eclipse/util/SuiteBuilder.java +++ b/testng-eclipse-plugin/src/main/org/testng/eclipse/util/SuiteBuilder.java @@ -17,7 +17,7 @@ import org.testng.eclipse.util.signature.IMethodDescriptor; import org.testng.eclipse.util.signature.MethodDescriptor; import org.testng.reporters.XMLStringBuffer; -import org.testng.xml.Parser; +import org.testng.xml.internal.Parser; /** * Utility class that builds a temporary suite definition file. diff --git a/testng-eclipse-plugin/src/main/org/testng/eclipse/util/SuiteFileValidator.java b/testng-eclipse-plugin/src/main/org/testng/eclipse/util/SuiteFileValidator.java index f558cbb7..f04f851c 100644 --- a/testng-eclipse-plugin/src/main/org/testng/eclipse/util/SuiteFileValidator.java +++ b/testng-eclipse-plugin/src/main/org/testng/eclipse/util/SuiteFileValidator.java @@ -17,7 +17,6 @@ import javax.xml.parsers.SAXParser; import javax.xml.parsers.SAXParserFactory; -import org.testng.xml.Parser; import org.xml.sax.Attributes; import org.xml.sax.InputSource; import org.xml.sax.SAXException; diff --git a/testng-eclipse-plugin/src/main/org/testng/eclipse/util/param/ParameterSolver.java b/testng-eclipse-plugin/src/main/org/testng/eclipse/util/param/ParameterSolver.java index d2a9ce9c..729e36af 100644 --- a/testng-eclipse-plugin/src/main/org/testng/eclipse/util/param/ParameterSolver.java +++ b/testng-eclipse-plugin/src/main/org/testng/eclipse/util/param/ParameterSolver.java @@ -33,7 +33,7 @@ import org.testng.eclipse.TestNGPlugin; import org.testng.eclipse.TestNGPluginConstants; import org.testng.eclipse.ui.util.SuiteListSelectionDialog; -import org.testng.xml.Parser; +import org.testng.xml.internal.Parser; import org.xml.sax.Attributes; import org.xml.sax.InputSource; import org.xml.sax.SAXException;