You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marmotta.apache.org by wi...@apache.org on 2016/05/03 12:20:06 UTC
[1/2] marmotta git commit: simplified backends' profiles,
moving Ostrich (MARMOTTA-621) into the experimental ones
Repository: marmotta
Updated Branches:
refs/heads/develop 68c9cce46 -> df0a65f71
simplified backends' profiles, moving Ostrich (MARMOTTA-621) into the experimental ones
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/3b133278
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/3b133278
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/3b133278
Branch: refs/heads/develop
Commit: 3b1332785a5bfcbc53b7840604ccac8dae7bef7b
Parents: 68c9cce
Author: Sergio Fern�ndez <wi...@apache.org>
Authored: Tue May 3 11:55:35 2016 +0200
Committer: Sergio Fern�ndez <wi...@apache.org>
Committed: Tue May 3 11:55:35 2016 +0200
----------------------------------------------------------------------
.../platform/backend/ostrich/OstrichSailRepository.java | 4 +++-
platform/backends/pom.xml | 7 +------
2 files changed, 4 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/marmotta/blob/3b133278/platform/backends/marmotta-backend-ostrich/src/main/java/org/apache/marmotta/platform/backend/ostrich/OstrichSailRepository.java
----------------------------------------------------------------------
diff --git a/platform/backends/marmotta-backend-ostrich/src/main/java/org/apache/marmotta/platform/backend/ostrich/OstrichSailRepository.java b/platform/backends/marmotta-backend-ostrich/src/main/java/org/apache/marmotta/platform/backend/ostrich/OstrichSailRepository.java
index 684ae5b..5952154 100644
--- a/platform/backends/marmotta-backend-ostrich/src/main/java/org/apache/marmotta/platform/backend/ostrich/OstrichSailRepository.java
+++ b/platform/backends/marmotta-backend-ostrich/src/main/java/org/apache/marmotta/platform/backend/ostrich/OstrichSailRepository.java
@@ -162,7 +162,9 @@ public class OstrichSailRepository extends SailRepository {
return (OstrichSailConnection)current;
} else if (current instanceof SailConnectionWrapper) {
return findConnection(((SailConnectionWrapper) current).getWrappedConnection());
+ } else {
+ return null;
}
- return null;
}
+
}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/3b133278/platform/backends/pom.xml
----------------------------------------------------------------------
diff --git a/platform/backends/pom.xml b/platform/backends/pom.xml
index 766d1b3..ecc5375 100644
--- a/platform/backends/pom.xml
+++ b/platform/backends/pom.xml
@@ -80,16 +80,11 @@
</modules>
</profile>
<profile>
- <id>ostrich</id>
- <modules>
- <module>marmotta-backend-ostrich</module>
- </modules>
- </profile>
- <profile>
<id>experimental</id>
<modules>
<module>marmotta-backend-http</module>
<module>marmotta-backend-sparql</module>
+ <module>marmotta-backend-ostrich</module>
</modules>
</profile>
</profiles>
[2/2] marmotta git commit: moved marmotta-client-php to a deprecated
profile in our build
Posted by wi...@apache.org.
moved marmotta-client-php to a deprecated profile in our build
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/df0a65f7
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/df0a65f7
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/df0a65f7
Branch: refs/heads/develop
Commit: df0a65f71f18dcf9e10eef5171436a586c9540a2
Parents: 3b13327
Author: Sergio Fern�ndez <wi...@apache.org>
Authored: Tue May 3 12:13:29 2016 +0200
Committer: Sergio Fern�ndez <wi...@apache.org>
Committed: Tue May 3 12:13:29 2016 +0200
----------------------------------------------------------------------
client/marmotta-client-php/pom.xml | 2 +-
client/pom.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/marmotta/blob/df0a65f7/client/marmotta-client-php/pom.xml
----------------------------------------------------------------------
diff --git a/client/marmotta-client-php/pom.xml b/client/marmotta-client-php/pom.xml
index 8607933..92f011e 100644
--- a/client/marmotta-client-php/pom.xml
+++ b/client/marmotta-client-php/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.3.0-SNAPSHOT</version>
+ <version>3.4.0-SNAPSHOT</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/marmotta/blob/df0a65f7/client/pom.xml
----------------------------------------------------------------------
diff --git a/client/pom.xml b/client/pom.xml
index def772b..6ba9da1 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -69,7 +69,7 @@
<profiles>
<profile>
- <id>experimental</id>
+ <id>deprecated</id>
<modules>
<module>marmotta-client-php</module>
</modules>