Merge pull request #518 from cbeust/release/7.4.0

release testng-eclipse plugin 7.4.0
testng-team · May 2, 2021 · 2ac742d · 2ac742d
2 parents cb32c16 + 16c7b4a
commit 2ac742d
Show file tree

Hide file tree

Showing 13 changed files with 47 additions and 41 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,6 +1,18 @@
 Change Log
 ====
 
+## 7.4.0
+
+Supported Metrics:
+
+| Plugin | Dependency |
+| ------------- | ------------- |
+| TestNG for Eclipse | Eclipse Photon (4.8) or above |
+| TestNG M2E Integration (Optional) | M2E 1.5 or above |
+
+* update default update site to https://testng.org/testng-eclipse-update-site/
+* IMPORTANT: testng-p2 7.4.0 is required
+
 ## 7.3.0
 
 Supported Metrics:

diff --git a/README.md b/README.md
@@ -17,44 +17,45 @@ see more at https://testng.org/doc/download.html
 
 The update site to install snapshot versions of the TestNG Eclipse plug-in is:
 
-`https://dl.bintray.com/testng-team/testng-eclipse/`
+`https://testng.org/testng-eclipse-update-site`
 
 Use it if you want to experiment with the new features or verify the bug fixes, and please [report back if you encounter any issues](https://github.com/cbeust/testng-eclipse/issues).
 
 To install it:
 * Click "Help -> Install New Software..." on top level menu
-* Paste the url https://dl.bintray.com/testng-team/testng-eclipse/ to `Work with: ` text field and press enter.
+* Paste the url `https://testng.org/testng-eclipse-update-site` to `Work with: ` text field and press enter.
 * Select the plugins
 * Click "Next" button and accept the license to complete the installation.
 * Restart Eclipse
 
-If you want to install previous version of beta, you can pick up one from [here](http://dl.bintray.com/testng-team/testng-eclipse/updatesites/).
+If you want to install previous version of beta, you can pick up one from [here](https://testng.org/testng-eclipse-update-site).
 
 Enjoy.
 
 ### Update sites
 
 Plugin Version            | Online Update-Site | Zipped Update-Site
 ------------------------- | ------------------ | ---------------------
-LATEST RELEASE [![Download](https://api.bintray.com/packages/testng-team/testng-eclipse-release/updatesites/images/download.svg)](http://dl.bintray.com/testng-team/testng-eclipse-release/zipped/)   | `https://dl.bintray.com/testng-team/testng-eclipse-release` | [here](http://dl.bintray.com/testng-team/testng-eclipse-release/zipped/)
-LATEST BETA [![Download](https://api.bintray.com/packages/testng-team/testng-eclipse/updatesites/images/download.svg)](https://dl.bintray.com/testng-team/testng-eclipse/zipped/) | `https://dl.bintray.com/testng-team/testng-eclipse` | [here](https://dl.bintray.com/testng-team/testng-eclipse/zipped/)
+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.3.0.202008060412      | `https://dl.bintray.com/testng-team/testng-eclipse-release/7.3.0/` | [download](https://dl.bintray.com/testng-team/testng-eclipse-release/zipped/7.3.0.202008060412/org.testng.eclipse.updatesite.zip)
-7.2.0.202005051752      | `https://dl.bintray.com/testng-team/testng-eclipse-release/7.2.0/` | [download](https://dl.bintray.com/testng-team/testng-eclipse-release/zipped/7.2.0.202005051752/org.testng.eclipse.updatesite.zip)
-7.1.1.202003100345      | `https://dl.bintray.com/testng-team/testng-eclipse-release/7.1.1/` | [download](https://dl.bintray.com/testng-team/testng-eclipse-release/zipped/7.1.1.202003100345/org.testng.eclipse.updatesite.zip)
-7.1.0.202003090500      | `https://dl.bintray.com/testng-team/testng-eclipse-release/7.1.0/` | [download](https://dl.bintray.com/testng-team/testng-eclipse-release/zipped/7.1.0.202003090500/org.testng.eclipse.updatesite.zip)
-7.0.0.201908240652       | `https://dl.bintray.com/testng-team/testng-eclipse-release/7.0.0/` | [download](https://dl.bintray.com/testng-team/testng-eclipse-release/zipped/7.0.0.201908240652/org.testng.eclipse.updatesite.zip)
-6.14.3.201902250526       | `https://dl.bintray.com/testng-team/testng-eclipse-release/6.14.3/` | [download](https://dl.bintray.com/testng-team/testng-eclipse-release/zipped/6.14.3.201902250526/org.testng.eclipse.updatesite.zip)
-6.14.0.201802161500       | `https://dl.bintray.com/testng-team/testng-eclipse-release/6.14.0/` | [download](https://dl.bintray.com/testng-team/testng-eclipse-release/zipped/6.14.0.201802161500/org.testng.eclipse.updatesite.zip)
-6.13.0.201712040650       | `https://dl.bintray.com/testng-team/testng-eclipse-release/6.13.0/` | [download](https://dl.bintray.com/testng-team/testng-eclipse-release/zipped/6.13.0.201712040650/org.testng.eclipse.updatesite.zip)
-6.12.0.201709050550       | `https://dl.bintray.com/testng-team/testng-eclipse-release/6.12.0/` | [download](https://dl.bintray.com/testng-team/testng-eclipse-release/zipped/6.12.0.201709050550/org.testng.eclipse.updatesite.zip)
-6.11.0.201703011520       | `https://dl.bintray.com/testng-team/testng-eclipse-release/6.11.0/` | [download](https://dl.bintray.com/testng-team/testng-eclipse-release/zipped/6.11.0.201703011520/site_assembly.zip)
-6.10.0.201612030230       | `https://dl.bintray.com/testng-team/testng-eclipse-release/6.10.0/` | [download](https://dl.bintray.com/testng-team/testng-eclipse-release/zipped/6.10.0.201612030230/site_assembly.zip)
-6.9.13.201609291640       | `https://dl.bintray.com/testng-team/testng-eclipse-release/6.9.13/` | [download](https://dl.bintray.com/testng-team/testng-eclipse-release/zipped/6.9.13.201609291640/site_assembly.zip)
-6.9.12.201607091356       | `https://dl.bintray.com/testng-team/testng-eclipse-release/6.9.12/` | [download](https://dl.bintray.com/testng-team/testng-eclipse-release/zipped/6.9.12.201607091356/site_assembly.zip)
-6.9.11.201604020423       | `https://dl.bintray.com/testng-team/testng-eclipse-release/6.9.11/` | [download](https://dl.bintray.com/testng-team/testng-eclipse-release/zipped/6.9.11.201604020423/site_assembly.zip)
-6.9.10.201512240000       | `https://dl.bintray.com/testng-team/testng-eclipse-release/6.9.10/` | [download](https://dl.bintray.com/testng-team/testng-eclipse-release/zipped/6.9.10.201512240000/site_assembly.zip)
-6.9.5.201505251947        | `https://dl.bintray.com/testng-team/testng-eclipse-release/6.9.5/` | [download](https://dl.bintray.com/testng-team/testng-eclipse-release/zipped/6.9.5.201505251947/site_assembly.zip)
+7.4.0.202105021622      | `https://testng.org/testng-eclipse-update-site/7.4.0/` | [download](https://testng.org/testng-eclipse-update-site/zipped/7.4.0.202105021622/org.testng.eclipse.updatesite.zip)
+7.3.0.202008060412      | `https://testng.org/testng-eclipse-update-site/7.3.0/` | [download](https://testng.org/testng-eclipse-update-site/zipped/7.3.0.202008060412/org.testng.eclipse.updatesite.zip)
+7.2.0.202005051752      | `https://testng.org/testng-eclipse-update-site/7.2.0/` | [download](https://testng.org/testng-eclipse-update-site/zipped/7.2.0.202005051752/org.testng.eclipse.updatesite.zip)
+7.1.1.202003100345      | `https://testng.org/testng-eclipse-update-site/7.1.1/` | [download](https://testng.org/testng-eclipse-update-site/zipped/7.1.1.202003100345/org.testng.eclipse.updatesite.zip)
+7.1.0.202003090500      | `https://testng.org/testng-eclipse-update-site/7.1.0/` | [download](https://testng.org/testng-eclipse-update-site/zipped/7.1.0.202003090500/org.testng.eclipse.updatesite.zip)
+7.0.0.201908240652       | `https://testng.org/testng-eclipse-update-site/7.0.0/` | [download](https://testng.org/testng-eclipse-update-site/zipped/7.0.0.201908240652/org.testng.eclipse.updatesite.zip)
+6.14.3.201902250526       | `https://testng.org/testng-eclipse-update-site/6.14.3/` | [download](https://testng.org/testng-eclipse-update-site/zipped/6.14.3.201902250526/org.testng.eclipse.updatesite.zip)
+6.14.0.201802161500       | `https://testng.org/testng-eclipse-update-site/6.14.0/` | [download](https://testng.org/testng-eclipse-update-site/zipped/6.14.0.201802161500/org.testng.eclipse.updatesite.zip)
+6.13.0.201712040650       | `https://testng.org/testng-eclipse-update-site/6.13.0/` | [download](https://testng.org/testng-eclipse-update-site/zipped/6.13.0.201712040650/org.testng.eclipse.updatesite.zip)
+6.12.0.201709050550       | `https://testng.org/testng-eclipse-update-site/6.12.0/` | [download](https://testng.org/testng-eclipse-update-site/zipped/6.12.0.201709050550/org.testng.eclipse.updatesite.zip)
+6.11.0.201703011520       | `https://testng.org/testng-eclipse-update-site/6.11.0/` | [download](https://testng.org/testng-eclipse-update-site/zipped/6.11.0.201703011520/site_assembly.zip)
+6.10.0.201612030230       | `https://testng.org/testng-eclipse-update-site/6.10.0/` | [download](https://testng.org/testng-eclipse-update-site/zipped/6.10.0.201612030230/site_assembly.zip)
+6.9.13.201609291640       | `https://testng.org/testng-eclipse-update-site/6.9.13/` | [download](https://testng.org/testng-eclipse-update-site/zipped/6.9.13.201609291640/site_assembly.zip)
+6.9.12.201607091356       | `https://testng.org/testng-eclipse-update-site/6.9.12/` | [download](https://testng.org/testng-eclipse-update-site/zipped/6.9.12.201607091356/site_assembly.zip)
+6.9.11.201604020423       | `https://testng.org/testng-eclipse-update-site/6.9.11/` | [download](https://testng.org/testng-eclipse-update-site/zipped/6.9.11.201604020423/site_assembly.zip)
+6.9.10.201512240000       | `https://testng.org/testng-eclipse-update-site/6.9.10/` | [download](https://testng.org/testng-eclipse-update-site/zipped/6.9.10.201512240000/site_assembly.zip)
+6.9.5.201505251947        | `https://testng.org/testng-eclipse-update-site/6.9.5/` | [download](https://testng.org/testng-eclipse-update-site/zipped/6.9.5.201505251947/site_assembly.zip)
 
 (**NOTE**: it's always recommended to install from the ***LATEST RELEASE*** updatesite. the version specific updatesites are for cases that you want to stay on old version.)
 

diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.testng.eclipse</groupId>
     <artifactId>org.testng.eclipse.parent</artifactId>
-    <version>7.3.0-SNAPSHOT</version>
+    <version>7.4.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <properties>
@@ -162,15 +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.3.0/</url>
-        </repository>
-        <repository>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-            <id>bintray-testng-team-testng</id>
-            <name>bintray</name>
-            <url>https://dl.bintray.com/testng-team/testng</url>
+            <url>https://testng.org/testng-p2-update-site/7.4.0/</url>
         </repository>
         <repository>
             <snapshots />

diff --git a/testng-eclipse-feature/feature.xml b/testng-eclipse-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.testng.eclipse"
       label="TestNG"
-      version="7.3.0.qualifier"
+      version="7.4.0.qualifier"
       provider-name="Cedric Beust">
 
    <description url="https://testng.org">

diff --git a/testng-eclipse-feature/pom.xml b/testng-eclipse-feature/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.testng.eclipse</groupId>
         <artifactId>org.testng.eclipse.parent</artifactId>
-        <version>7.3.0-SNAPSHOT</version>
+        <version>7.4.0-SNAPSHOT</version>
     </parent>
     <groupId>org.testng.eclipse.features</groupId>
     <artifactId>org.testng.eclipse</artifactId>

diff --git a/testng-eclipse-plugin/META-INF/MANIFEST.MF b/testng-eclipse-plugin/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.testng.eclipse; singleton:=true
-Bundle-Version: 7.3.0.qualifier
+Bundle-Version: 7.4.0.qualifier
 Bundle-Activator: org.testng.eclipse.TestNGPlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin

diff --git a/testng-eclipse-plugin/pom.xml b/testng-eclipse-plugin/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.testng.eclipse</groupId>
         <artifactId>org.testng.eclipse.parent</artifactId>
-        <version>7.3.0-SNAPSHOT</version>
+        <version>7.4.0-SNAPSHOT</version>
     </parent>
     <artifactId>org.testng.eclipse</artifactId>
     <packaging>eclipse-plugin</packaging>

diff --git a/testng-eclipse-plugin/src/main/org/testng/eclipse/refactoring/TestNGXmlPage.java b/testng-eclipse-plugin/src/main/org/testng/eclipse/refactoring/TestNGXmlPage.java
@@ -34,6 +34,7 @@
 import org.testng.xml.XmlClass;
 import org.testng.xml.XmlPackage;
 import org.testng.xml.XmlSuite;
+import org.testng.xml.XmlSuite.ParallelMode;
 import org.testng.xml.XmlTest;
 
 /**
@@ -127,7 +128,7 @@ private String getDefaultTestName() {
   private void updateUi() {
     m_xmlSuite.setName(m_suiteText.getText());
     m_xmlSuite.getTests().get(0).setName(m_testText.getText());
-    m_xmlSuite.setParallel(m_parallelCombo.getItem(m_parallelCombo.getSelectionIndex()));
+    m_xmlSuite.setParallel(ParallelMode.getValidParallel(m_parallelCombo.getItem(m_parallelCombo.getSelectionIndex())));
     Integer threadCount = null;
     try {
       threadCount = Integer.parseInt(m_threadCountText.getText());

diff --git a/testng-eclipse-update-site/pom.xml b/testng-eclipse-update-site/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.testng.eclipse</groupId>
         <artifactId>org.testng.eclipse.parent</artifactId>
-        <version>7.3.0-SNAPSHOT</version>
+        <version>7.4.0-SNAPSHOT</version>
     </parent>
   <artifactId>org.testng.eclipse.updatesite</artifactId>
   <packaging>eclipse-repository</packaging>

diff --git a/testng-maven-eclipse-feature/feature.xml b/testng-maven-eclipse-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.testng.eclipse.maven.feature"
       label="%feature.name"
-      version="7.3.0.qualifier"
+      version="7.4.0.qualifier"
       provider-name="%feature.provider">
 
    <description url="https://testng.org">

diff --git a/testng-maven-eclipse-feature/pom.xml b/testng-maven-eclipse-feature/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.testng.eclipse</groupId>
         <artifactId>org.testng.eclipse.parent</artifactId>
-        <version>7.3.0-SNAPSHOT</version>
+        <version>7.4.0-SNAPSHOT</version>
     </parent>
     <groupId>org.testng.eclipse.features</groupId>
     <artifactId>org.testng.eclipse.maven.feature</artifactId>

diff --git a/testng-maven-eclipse-plugin/META-INF/MANIFEST.MF b/testng-maven-eclipse-plugin/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Localization: plugin
 Bundle-Name: %bundle.name
 Bundle-SymbolicName: org.testng.eclipse.maven;singleton:=true
-Bundle-Version: 7.3.0.qualifier
+Bundle-Version: 7.4.0.qualifier
 Bundle-Activator: org.testng.eclipse.maven.Activator
 Bundle-Vendor: %bundle.provider
 Require-Bundle: org.eclipse.ui,

diff --git a/testng-maven-eclipse-plugin/pom.xml b/testng-maven-eclipse-plugin/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.testng.eclipse</groupId>
         <artifactId>org.testng.eclipse.parent</artifactId>
-        <version>7.3.0-SNAPSHOT</version>
+        <version>7.4.0-SNAPSHOT</version>
     </parent>
     <artifactId>org.testng.eclipse.maven</artifactId>
     <packaging>eclipse-plugin</packaging>