Merge pull request #567 from testng-team/release/7.10.0

release 7.10.0

Author: missedone

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:

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)

pom.xml

@@ -162,7 +162,7 @@
             <!-- testng-p2 beta -->
             <!-- <url>https://dl.bintray.com/testng-team/testng-p2/7.0.0/</url> -->
             <!-- testng-p2 release -->
-            <url>https://testng.org/testng-p2-update-site/7.9.0/</url>
+            <url>https://testng.org/testng-p2-update-site/7.10.1/</url>
         </repository>
         <repository>
             <snapshots />

testng-eclipse-plugin/lib/testng-remote.jar

@@ -12,7 +12,7 @@
     <packaging>eclipse-plugin</packaging>
 
     <properties>
-        <testng.remote.version>1.6.0</testng.remote.version>
+        <testng.remote.version>1.7.0</testng.remote.version>
     </properties>
 
     <build>

testng-eclipse-plugin/pom.xml

@@ -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");

testng-eclipse-plugin/src/main/org/testng/eclipse/launch/TestNGLaunchConfigurationDelegate.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;
 

testng-eclipse-plugin/src/main/org/testng/eclipse/refactoring/ConvertToYamlAction.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());

testng-eclipse-plugin/src/main/org/testng/eclipse/util/CustomSuite.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.

testng-eclipse-plugin/src/main/org/testng/eclipse/util/SuiteBuilder.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;

testng-eclipse-plugin/src/main/org/testng/eclipse/util/SuiteFileValidator.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;