Updated Branches: refs/heads/develop 27338784c -> f78994cee
upgrade to Java 7 as dependency, because the new Jetty used for testing is built with it and we anyways have it on the agenda (MARMOTTA-124) Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/f78994ce Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/f78994ce Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/f78994ce Branch: refs/heads/develop Commit: f78994cee7eccd1c2122de371580db61fefa2f7b Parents: 2733878 Author: Sebastian Schaffert <[email protected]> Authored: Thu May 23 14:47:14 2013 +0200 Committer: Sebastian Schaffert <[email protected]> Committed: Thu May 23 14:47:14 2013 +0200 ---------------------------------------------------------------------- .../src/main/resources/archetype-resources/pom.xml | 4 ++-- .../src/main/resources/archetype-resources/pom.xml | 4 ++-- build/plugins/buildinfo-maven-plugin/pom.xml | 4 ++-- build/plugins/marmotta-maven-plugin/pom.xml | 4 ++-- build/plugins/refpack-maven-plugin/pom.xml | 4 ++-- .../ldclient/test/rdf/TestStanbolProvider.java | 3 +++ parent/pom.xml | 6 ++++-- pom.xml | 1 - 8 files changed, 17 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f78994ce/build/archetypes/marmotta-archetype-module/src/main/resources/archetype-resources/pom.xml ---------------------------------------------------------------------- diff --git a/build/archetypes/marmotta-archetype-module/src/main/resources/archetype-resources/pom.xml b/build/archetypes/marmotta-archetype-module/src/main/resources/archetype-resources/pom.xml index 3d7ec18..6c11e80 100644 --- a/build/archetypes/marmotta-archetype-module/src/main/resources/archetype-resources/pom.xml +++ b/build/archetypes/marmotta-archetype-module/src/main/resources/archetype-resources/pom.xml @@ -32,8 +32,8 @@ <artifactId>maven-compiler-plugin</artifactId> <version>3.0</version> <configuration> - <source>1.6</source> - <target>1.6</target> + <source>1.7</source> + <target>1.7</target> </configuration> </plugin> <plugin> http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f78994ce/build/archetypes/marmotta-archetype-webapp/src/main/resources/archetype-resources/pom.xml ---------------------------------------------------------------------- diff --git a/build/archetypes/marmotta-archetype-webapp/src/main/resources/archetype-resources/pom.xml b/build/archetypes/marmotta-archetype-webapp/src/main/resources/archetype-resources/pom.xml index 2e163a6..bde7cb0 100644 --- a/build/archetypes/marmotta-archetype-webapp/src/main/resources/archetype-resources/pom.xml +++ b/build/archetypes/marmotta-archetype-webapp/src/main/resources/archetype-resources/pom.xml @@ -41,8 +41,8 @@ <artifactId>maven-compiler-plugin</artifactId> <version>3.0</version> <configuration> - <source>1.6</source> - <target>1.6</target> + <source>1.7</source> + <target>1.7</target> </configuration> </plugin> <plugin> http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f78994ce/build/plugins/buildinfo-maven-plugin/pom.xml ---------------------------------------------------------------------- diff --git a/build/plugins/buildinfo-maven-plugin/pom.xml b/build/plugins/buildinfo-maven-plugin/pom.xml index ab3bf6a..6002171 100644 --- a/build/plugins/buildinfo-maven-plugin/pom.xml +++ b/build/plugins/buildinfo-maven-plugin/pom.xml @@ -95,8 +95,8 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> <configuration> - <source>1.6</source> - <target>1.6</target> + <source>1.7</source> + <target>1.7</target> </configuration> </plugin> <plugin> http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f78994ce/build/plugins/marmotta-maven-plugin/pom.xml ---------------------------------------------------------------------- diff --git a/build/plugins/marmotta-maven-plugin/pom.xml b/build/plugins/marmotta-maven-plugin/pom.xml index eb4f2ca..5126b17 100644 --- a/build/plugins/marmotta-maven-plugin/pom.xml +++ b/build/plugins/marmotta-maven-plugin/pom.xml @@ -58,8 +58,8 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> <configuration> - <source>1.6</source> - <target>1.6</target> + <source>1.7</source> + <target>1.7</target> </configuration> </plugin> </plugins> http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f78994ce/build/plugins/refpack-maven-plugin/pom.xml ---------------------------------------------------------------------- diff --git a/build/plugins/refpack-maven-plugin/pom.xml b/build/plugins/refpack-maven-plugin/pom.xml index 0534b9e..4f129c1 100644 --- a/build/plugins/refpack-maven-plugin/pom.xml +++ b/build/plugins/refpack-maven-plugin/pom.xml @@ -111,8 +111,8 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> <configuration> - <source>1.6</source> - <target>1.6</target> + <source>1.7</source> + <target>1.7</target> </configuration> </plugin> </plugins> http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f78994ce/libraries/ldclient/ldclient-provider-rdf/src/test/java/org/apache/marmotta/ldclient/test/rdf/TestStanbolProvider.java ---------------------------------------------------------------------- diff --git a/libraries/ldclient/ldclient-provider-rdf/src/test/java/org/apache/marmotta/ldclient/test/rdf/TestStanbolProvider.java b/libraries/ldclient/ldclient-provider-rdf/src/test/java/org/apache/marmotta/ldclient/test/rdf/TestStanbolProvider.java index 11a83a4..9df1cd7 100644 --- a/libraries/ldclient/ldclient-provider-rdf/src/test/java/org/apache/marmotta/ldclient/test/rdf/TestStanbolProvider.java +++ b/libraries/ldclient/ldclient-provider-rdf/src/test/java/org/apache/marmotta/ldclient/test/rdf/TestStanbolProvider.java @@ -25,6 +25,7 @@ import org.apache.marmotta.ldclient.model.ClientResponse; import org.apache.marmotta.ldclient.services.ldclient.LDClient; import org.apache.marmotta.ldclient.test.helper.TestLDClient; import org.junit.Assert; +import org.junit.Assume; import org.junit.Test; import org.openrdf.query.BooleanQuery; import org.openrdf.query.QueryLanguage; @@ -53,6 +54,8 @@ public class TestStanbolProvider { LDClientService ldclient = new TestLDClient(new LDClient(config)); + Assume.assumeTrue(ldclient.ping("http://dev.iks-project.eu:8080/";)); + String uriBerlin = "http://dbpedia.org/resource/Berlin";; ClientResponse respBerlin = ldclient.retrieveResource(uriBerlin); http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f78994ce/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 0c48005..4ef6faf 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -99,8 +99,8 @@ <artifactId>maven-compiler-plugin</artifactId> <version>3.0</version> <configuration> - <source>1.6</source> - <target>1.6</target> + <source>1.7</source> + <target>1.7</target> </configuration> </plugin> <plugin> @@ -1525,8 +1525,10 @@ </profile> </profiles> +<!-- <scm> <tag>3.0.0-incubating</tag> </scm> +--> </project> http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f78994ce/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 9c2d1ef..2019b5c 100644 --- a/pom.xml +++ b/pom.xml @@ -112,7 +112,6 @@ <url>https://git-wip-us.apache.org/repos/asf/incubator-marmotta.git</url> <connection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-marmotta.git</connection> <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-marmotta.git</developerConnection> - <tag>3.0.0-incubating</tag> </scm> <issueManagement>
