diff --git a/README.md b/README.md index 2500f482..1e04cf10 100644 --- a/README.md +++ b/README.md @@ -12,8 +12,21 @@ Check out the Website for more information The release comes with a pre-packaged jar file named gs-core.jar that contains the GraphStream classes. To start using GraphStream, simply put it in your class path. You can download GraphStream on the [github releases pages](https://github.com/graphstream/gs-core/releases), or on the website . -Maven users, you may include gs-core as a dependency to your project using (https://jitpack.io). -Simply add the `jitpack` repository to the `pom.xml`: +Maven users may include major releases of `gs-core` as a dependency: + +```xml + + + org.graphstream + gs-core + 2.0 + + +``` + +### Development Versions + +Using one can also use any development version. Simply add the `jitpack` repository to the `pom.xml` of the project: ```xml @@ -27,14 +40,16 @@ Simply add the `jitpack` repository to the `pom.xml`: then, add the `gs-core` to your dependencies: ```xml - - com.github.graphstream - gs-core - 2.0-alpha - + + + com.github.graphstream + gs-core + dev-SNAPSHOT + + ``` -You can use any version of `gs-core` you need. Simply specify the desired version in the `` tag. The version can be a git tag name (e.g. `2.0-alpha`), a commit number, or a branch name followed by `-SNAPSHOT` (e.g. `dev-SNAPSHOT`). More details on the [possible versions on jitpack](https://jitpack.io/#graphstream/gs-core). +You can use any version of `gs-core` you need. Simply specify the desired version in the `` tag. The version can be a git tag name (e.g. `2.0`), a commit number, or a branch name followed by `-SNAPSHOT` (e.g. `dev-SNAPSHOT`). More details on the [possible versions on jitpack](https://jitpack.io/#graphstream/gs-core). ## User interface diff --git a/pom.xml b/pom.xml index 7d2806db..ab76b559 100644 --- a/pom.xml +++ b/pom.xml @@ -15,14 +15,15 @@ License along with this program. If not, see . The fact that you are presently reading this means that you have had knowledge of the CeCILL-C and LGPL licenses and that you accept their terms. --> - 4.0.0 org.graphstream gs-core - 2.0.0-SNAPSHOT - + 2.0 + jar + gs-core The GraphStream library. With GraphStream you deal with @@ -49,6 +50,57 @@ UTF-8 + + + + hbrahimi + Hicham Brahimi + hicham.brahimi@graphstream-project.org + LITIS + http://www.litislab.eu + + + + sbalev + Stefan Balev + stefan.balev@graphstream-project.org + LITIS + http://www.litislab.eu + + + + jbaudry + Julien Baudry + julien.baudry@graphstream-project.org + LITIS + http://www.litislab.eu + + + + adutot + Antoine Dutot + antoine.dutot@graphstream-project.org + LITIS + http://www.litislab.eu + + + + ypigne + Yoann Pigné + yoann.pigne@graphstream-project.org + University of Luxembourg + http://www.uni.lu + + + + gsavin + Guilhelm Savin + guilhelm.savin@graphstream-project.org + LITIS + http://www.litislab.eu + + + LGPL3 @@ -67,6 +119,12 @@ release + + + ossrh + https://oss.sonatype.org/service/local/staging/deploy/maven2/ + + @@ -79,7 +137,7 @@ sign-artifacts - package + verify sign @@ -286,7 +344,7 @@ junit junit - 4.12 + 4.13.1 false test diff --git a/src-test/org/graphstream/stream/file/test/TestFileSourceBase.java b/src-test/org/graphstream/stream/file/test/TestFileSourceBase.java index 1dd7d933..69916497 100644 --- a/src-test/org/graphstream/stream/file/test/TestFileSourceBase.java +++ b/src-test/org/graphstream/stream/file/test/TestFileSourceBase.java @@ -41,6 +41,7 @@ import java.io.StringReader; import java.net.URL; import java.net.URLConnection; +import java.net.HttpURLConnection; import org.graphstream.graph.Edge; import org.graphstream.graph.Graph; @@ -159,8 +160,40 @@ public void test_Access_ReadAll_URL() { try { URL url = new URL(anUndirectedTriangleHttpURL()); - URLConnection c = url.openConnection(); + HttpURLConnection c = (HttpURLConnection)url.openConnection(); c.setDefaultUseCaches(false); + c.setReadTimeout(5000); + c.addRequestProperty("Accept-Language", "en-US,en;q=0.8"); + c.addRequestProperty("User-Agent", "Mozilla"); + c.addRequestProperty("Referer", "google.com"); + boolean redirect = false; + int status = c.getResponseCode(); + if (status != HttpURLConnection.HTTP_OK) { + if (status == HttpURLConnection.HTTP_MOVED_TEMP + || status == HttpURLConnection.HTTP_MOVED_PERM + || status == HttpURLConnection.HTTP_SEE_OTHER) + redirect = true; + if (redirect) { + + // get redirect url from "location" header field + String newUrl = c.getHeaderField("Location"); + + // get the cookie if need, for login + String cookies = c.getHeaderField("Set-Cookie"); + + // open the new connection again + url = new URL(newUrl); + c = (HttpURLConnection) url.openConnection(); + c.setRequestProperty("Cookie", cookies); + c.addRequestProperty("Accept-Language", "en-US,en;q=0.8"); + c.addRequestProperty("User-Agent", "Mozilla"); + c.addRequestProperty("Referer", "google.com"); + + System.out.println("Redirect to URL : " + newUrl); + + } + + } input.addSink(graph); input.readAll(url);