You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marmotta.apache.org by ja...@apache.org on 2018/04/27 08:20:41 UTC

[2/3] marmotta git commit: pre-release cleanup: remove extra repositories from ostrich

pre-release cleanup: remove extra repositories from ostrich


Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/ffbd964e
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/ffbd964e
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/ffbd964e

Branch: refs/heads/develop
Commit: ffbd964e2b67d67ea4418dfc7bc7f9fad37d7c0a
Parents: bb75e2e
Author: Jakob Frank <ja...@apache.org>
Authored: Tue Apr 24 17:08:22 2018 +0200
Committer: Jakob Frank <ja...@apache.org>
Committed: Tue Apr 24 17:08:22 2018 +0200

----------------------------------------------------------------------
 libraries/ostrich/client/pom.xml | 19 +------------------
 libraries/ostrich/model/pom.xml  | 17 -----------------
 libraries/ostrich/pom.xml        | 17 +++++++----------
 3 files changed, 8 insertions(+), 45 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/marmotta/blob/ffbd964e/libraries/ostrich/client/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ostrich/client/pom.xml b/libraries/ostrich/client/pom.xml
index 1479110..01e3370 100644
--- a/libraries/ostrich/client/pom.xml
+++ b/libraries/ostrich/client/pom.xml
@@ -31,23 +31,6 @@
     <name>Ostrich Triplestore: Persistence Client</name>
     <description>Sesame Sail wrapper around C++ Marmotta Services</description>
 
-    <pluginRepositories>
-        <pluginRepository>
-            <releases>
-                <updatePolicy>never</updatePolicy>
-            </releases>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-            <id>central</id>
-            <name>Central Repository</name>
-            <url>https://repo.maven.apache.org/maven2</url>
-        </pluginRepository>
-        <pluginRepository>
-            <id>protoc-plugin</id>
-            <url>https://dl.bintray.com/sergei-ivanov/maven/</url>
-        </pluginRepository>
-    </pluginRepositories>
     <build>
         <extensions>
             <extension>
@@ -101,7 +84,7 @@
         <dependency>
             <groupId>org.apache.marmotta</groupId>
             <artifactId>ostrich-model</artifactId>
-            <version>3.4.0-SNAPSHOT</version>
+            <version>${project.version}</version>
         </dependency>
 
         <!-- Logging -->

http://git-wip-us.apache.org/repos/asf/marmotta/blob/ffbd964e/libraries/ostrich/model/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ostrich/model/pom.xml b/libraries/ostrich/model/pom.xml
index a3d7ecb..7d3711d 100644
--- a/libraries/ostrich/model/pom.xml
+++ b/libraries/ostrich/model/pom.xml
@@ -31,23 +31,6 @@
     <name>Ostrich Triplestore: Model</name>
     <description>Sesame Model wrapper around C++ Marmotta Proto Model</description>
 
-    <pluginRepositories>
-        <pluginRepository>
-            <releases>
-                <updatePolicy>never</updatePolicy>
-            </releases>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-            <id>central</id>
-            <name>Central Repository</name>
-            <url>https://repo.maven.apache.org/maven2</url>
-        </pluginRepository>
-        <pluginRepository>
-            <id>protoc-plugin</id>
-            <url>https://dl.bintray.com/sergei-ivanov/maven/</url>
-        </pluginRepository>
-    </pluginRepositories>
     <build>
         <extensions>
             <extension>

http://git-wip-us.apache.org/repos/asf/marmotta/blob/ffbd964e/libraries/ostrich/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ostrich/pom.xml b/libraries/ostrich/pom.xml
index 46832ff..aac9cca 100644
--- a/libraries/ostrich/pom.xml
+++ b/libraries/ostrich/pom.xml
@@ -33,6 +33,13 @@
 
     <inceptionYear>2015</inceptionYear>
 
+    <pluginRepositories>
+        <pluginRepository>
+            <id>protoc-plugin</id>
+            <url>https://dl.bintray.com/sergei-ivanov/maven/</url>
+        </pluginRepository>
+    </pluginRepositories>
+
     <build>
         <plugins>
             <plugin>
@@ -51,16 +58,6 @@
         </plugins>
     </build>
 
-    <!-- MARMOTTA-621: to be removed as soon as gRPC 0.10.0 gets out -->
-    <repositories>
-        <repository>
-            <id>sonatype-snapshots</id>
-            <url>https://oss.sonatype.org/content/repositories/snapshots</url>
-            <releases><enabled>false</enabled></releases>
-            <snapshots><enabled>true</enabled></snapshots>
-        </repository>
-    </repositories>
-
     <modules>
         <module>model</module>
         <module>client</module>