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.

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

use https dtd url #480

Merged
merged 3 commits into from
Mar 10, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Change Log
====

## Current Dev
## 7.1.1

Supported Metrics:

Expand All @@ -10,6 +10,7 @@ Supported Metrics:
| TestNG for Eclipse | Eclipse Photon (4.8) or above |
| TestNG M2E Integration (Optional) | M2E 1.5 or above |

* use https DTD `https://testng.org/testng-1.0.dtd`

## 7.1.0

Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ TestNG for Eclipse Plugin

<a href="http://marketplace.eclipse.org/marketplace-client-intro?mpc_install=1549" class="drag" title="Drag to your running Eclipse workspace."><img class="img-responsive" src="https://marketplace.eclipse.org/sites/all/themes/solstice/public/images/marketplace/btn-install.png" alt="Drag to your running Eclipse workspace." /></a>

see more at http://testng.org/doc/download.html
see more at https://testng.org/doc/download.html

### Install Snapshot

Expand Down Expand Up @@ -61,7 +61,7 @@ The full changelog is [here](CHANGES.md)

## User documentation

The documentation for this plug-in can be found at http://testng.org/doc/eclipse.html
The documentation for this plug-in can be found at https://testng.org/doc/eclipse.html

## Build

Expand Down
14 changes: 7 additions & 7 deletions docs/Troubleshooting.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,16 @@ Troubleshooting
**Note that, https://dl.bintray.com/testng-team/testng-eclipse/ is the official update site for TestNG Eclipse Plugin**

If you failed to install TestNG Eclipse Plugin with following error:
* Unable to read repository at http://beust.com/eclipse/content.xml.
* HTTP Service 'Service Unavailable': http://beust.com/eclipse-beta/content.xml
* An error occurred while collecting items to be installed session context was:(profile=epp.package.committers, phase=org.eclipse.equinox.internal.p2.engine.phases.Collect, operand=, action=). Unable to read repository at http://beust.com/eclipse/updatesites/6.11.0.201703011520/plugins/org.testng.eclipse_6.11.0.201703011520.jar. Read timed out
* Unable to read repository at https://beust.com/eclipse/content.xml.
* HTTP Service 'Service Unavailable': https://beust.com/eclipse-beta/content.xml
* An error occurred while collecting items to be installed session context was:(profile=epp.package.committers, phase=org.eclipse.equinox.internal.p2.engine.phases.Collect, operand=, action=). Unable to read repository at https://beust.com/eclipse/updatesites/6.11.0.201703011520/plugins/org.testng.eclipse_6.11.0.201703011520.jar. Read timed out

You can follow thses steps try to fix/bypass the problem:
* Check if you have any http proxy setting, or behind the company firewall, make you can access the update site: `http://beust.com/eclipse`
* Make sure your network can reach `http://dl.bintray.com/testng-team/testng-eclipse-release/` (the main entrypoint http://beust.com/eclipse redirects to it)
* Check if you have any http proxy setting, or behind the company firewall, make you can access the update site: `https://beust.com/eclipse`
* Make sure your network can reach `https://dl.bintray.com/testng-team/testng-eclipse-release/` (the main entrypoint https://beust.com/eclipse redirects to it)
* Add vmargs '-Djava.net.preferIPv4Stack=true' to Eclipse config.ini, read the wiki [[1]](https://wiki.eclipse.org/Eclipse.ini) for the detail.
* Retry two or more times, if still can't install, it could be the site http://beust.com temporarily unavailable, please install from the updatesite: `http://dl.bintray.com/testng-team/testng-eclipse-release/`
* Or, for whatever reason, you can't access either `http://beust.com/eclipse` or `http://dl.bintray.com/testng-team/testng-eclipse-release/` directly, you can download the [offline updatesite](https://github.com/cbeust/testng-eclipse#update-sites), then copy to your workstation.
* Retry two or more times, if still can't install, it could be the site https://beust.com temporarily unavailable, please install from the updatesite: `http://dl.bintray.com/testng-team/testng-eclipse-release/`
* Or, for whatever reason, you can't access either `https://beust.com/eclipse` or `http://dl.bintray.com/testng-team/testng-eclipse-release/` directly, you can download the [offline updatesite](https://github.com/cbeust/testng-eclipse#update-sites), then copy to your workstation.


## TestNG Eclipse Plugin not showing up
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.testng.eclipse</groupId>
<artifactId>org.testng.eclipse.parent</artifactId>
<version>7.1.0-SNAPSHOT</version>
<version>7.1.1-SNAPSHOT</version>
<packaging>pom</packaging>

<properties>
Expand Down
4 changes: 2 additions & 2 deletions testng-eclipse-feature/feature.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
<feature
id="org.testng.eclipse"
label="TestNG"
version="7.1.0.qualifier"
version="7.1.1.qualifier"
provider-name="Cedric Beust">

<description url="http://testng.org">
<description url="https://testng.org">
TestNG plug-in for Eclipse.
</description>

Expand Down
2 changes: 1 addition & 1 deletion testng-eclipse-feature/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.testng.eclipse</groupId>
<artifactId>org.testng.eclipse.parent</artifactId>
<version>7.1.0-SNAPSHOT</version>
<version>7.1.1-SNAPSHOT</version>
</parent>
<groupId>org.testng.eclipse.features</groupId>
<artifactId>org.testng.eclipse</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion testng-eclipse-plugin/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.testng.eclipse; singleton:=true
Bundle-Version: 7.1.0.qualifier
Bundle-Version: 7.1.1.qualifier
Bundle-Activator: org.testng.eclipse.TestNGPlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Expand Down
2 changes: 1 addition & 1 deletion testng-eclipse-plugin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.testng.eclipse</groupId>
<artifactId>org.testng.eclipse.parent</artifactId>
<version>7.1.0-SNAPSHOT</version>
<version>7.1.1-SNAPSHOT</version>
</parent>
<artifactId>org.testng.eclipse</artifactId>
<packaging>eclipse-plugin</packaging>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,10 @@ public abstract class TestNGPluginConstants {
public static final String TESTNG_DTD = "testng-1.0.dtd";

/** The URL to the deprecated TestNG DTD. */
public static final String DEPRECATED_TESTNG_DTD_URL = "http://beust.com/testng/" + TESTNG_DTD;
public static final String DEPRECATED_TESTNG_DTD_URL = "https://beust.com/testng/" + TESTNG_DTD;

/** The URL to the TestNG DTD. */
public static final String TESTNG_DTD_URL = "http://testng.org/" + TESTNG_DTD;
public static final String TESTNG_DTD_URL = "https://testng.org/" + TESTNG_DTD;
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

use the https dtd url


private TestNGPluginConstants() {}
}
Original file line number Diff line number Diff line change
Expand Up @@ -216,8 +216,8 @@ protected static IFile showSelectionDialog(IResource[] choices) {
}

protected static IResource[] searchSuites(IResource[] scopeResources) {
ISearchQuery query= new FileSearchQuery("<!DOCTYPE suite SYSTEM \"http://testng.org/testng-1.0.dtd\" >",
false /*regexp*/ ,
ISearchQuery query= new FileSearchQuery("<!DOCTYPE suite SYSTEM \"(http|https)://testng.org/testng-1.0.dtd\" >",
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

search both http and https

true /*regexp*/ ,
false /*casesensitive*/,
FileTextSearchScope.newSearchScope(scopeResources, new String[] {"*.xml"}, false));
query.run(null);
Expand Down
2 changes: 1 addition & 1 deletion testng-eclipse-update-site/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.testng.eclipse</groupId>
<artifactId>org.testng.eclipse.parent</artifactId>
<version>7.1.0-SNAPSHOT</version>
<version>7.1.1-SNAPSHOT</version>
</parent>
<artifactId>org.testng.eclipse.updatesite</artifactId>
<packaging>eclipse-repository</packaging>
Expand Down
6 changes: 3 additions & 3 deletions testng-maven-eclipse-feature/feature.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
<feature
id="org.testng.eclipse.maven.feature"
label="%feature.name"
version="7.1.0.qualifier"
version="7.1.1.qualifier"
provider-name="%feature.provider">

<description url="http://testng.org">
<description url="https://testng.org">
TestNG plug-in with M2E integration for Eclipse.
</description>

<copyright url="http://beust.com">
<copyright url="https://beust.com">
Copyright 2004-2016 Cedric Beust.
</copyright>

Expand Down
2 changes: 1 addition & 1 deletion testng-maven-eclipse-feature/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.testng.eclipse</groupId>
<artifactId>org.testng.eclipse.parent</artifactId>
<version>7.1.0-SNAPSHOT</version>
<version>7.1.1-SNAPSHOT</version>
</parent>
<groupId>org.testng.eclipse.features</groupId>
<artifactId>org.testng.eclipse.maven.feature</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion testng-maven-eclipse-plugin/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -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.1.0.qualifier
Bundle-Version: 7.1.1.qualifier
Bundle-Activator: org.testng.eclipse.maven.Activator
Bundle-Vendor: %bundle.provider
Require-Bundle: org.eclipse.ui,
Expand Down
2 changes: 1 addition & 1 deletion testng-maven-eclipse-plugin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.testng.eclipse</groupId>
<artifactId>org.testng.eclipse.parent</artifactId>
<version>7.1.0-SNAPSHOT</version>
<version>7.1.1-SNAPSHOT</version>
</parent>
<artifactId>org.testng.eclipse.maven</artifactId>
<packaging>eclipse-plugin</packaging>
Expand Down