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:40 UTC
[1/3] marmotta git commit: pre-release cleanup: shared version-number
for blueprints
Repository: marmotta
Updated Branches:
refs/heads/develop 62c125076 -> 3844ae46c
pre-release cleanup: shared version-number for blueprints
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/bb75e2e5
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/bb75e2e5
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/bb75e2e5
Branch: refs/heads/develop
Commit: bb75e2e56fb69b5ab499c78d6c1a7e55a9e52be8
Parents: 62c1250
Author: Jakob Frank <ja...@apache.org>
Authored: Tue Apr 24 16:21:05 2018 +0200
Committer: Jakob Frank <ja...@apache.org>
Committed: Tue Apr 24 16:21:05 2018 +0200
----------------------------------------------------------------------
launchers/marmotta-webapp/pom.xml | 3 +--
parent/pom.xml | 1 +
platform/backends/marmotta-backend-accumulograph/pom.xml | 3 +--
platform/backends/marmotta-backend-titan/pom.xml | 2 +-
4 files changed, 4 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/marmotta/blob/bb75e2e5/launchers/marmotta-webapp/pom.xml
----------------------------------------------------------------------
diff --git a/launchers/marmotta-webapp/pom.xml b/launchers/marmotta-webapp/pom.xml
index 82470d6..6636410 100644
--- a/launchers/marmotta-webapp/pom.xml
+++ b/launchers/marmotta-webapp/pom.xml
@@ -263,8 +263,7 @@
<dependency>
<groupId>com.tinkerpop.blueprints</groupId>
<artifactId>blueprints-graph-sail</artifactId>
- <!-- TODO: create a shared blueprints version in marmotta-parent -->
- <version>2.6.0</version>
+ <version>${blueprints.version}</version>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
http://git-wip-us.apache.org/repos/asf/marmotta/blob/bb75e2e5/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 051c251..cba0452 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -54,6 +54,7 @@
<jackson.version>2.3.3</jackson.version>
<titan.version>0.4.2</titan.version>
<accumulograph.version>0.2.1</accumulograph.version>
+ <blueprints.version>2.6.0</blueprints.version>
<jax.doclets.version>0.10.1</jax.doclets.version>
</properties>
http://git-wip-us.apache.org/repos/asf/marmotta/blob/bb75e2e5/platform/backends/marmotta-backend-accumulograph/pom.xml
----------------------------------------------------------------------
diff --git a/platform/backends/marmotta-backend-accumulograph/pom.xml b/platform/backends/marmotta-backend-accumulograph/pom.xml
index 88bf192..40bb6c2 100644
--- a/platform/backends/marmotta-backend-accumulograph/pom.xml
+++ b/platform/backends/marmotta-backend-accumulograph/pom.xml
@@ -55,8 +55,7 @@
<dependency>
<groupId>com.tinkerpop.blueprints</groupId>
<artifactId>blueprints-graph-sail</artifactId>
- <!-- TODO: create a shared blueprints version in marmotta-parent -->
- <version>2.6.0</version>
+ <version>${blueprints.version}</version>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/marmotta/blob/bb75e2e5/platform/backends/marmotta-backend-titan/pom.xml
----------------------------------------------------------------------
diff --git a/platform/backends/marmotta-backend-titan/pom.xml b/platform/backends/marmotta-backend-titan/pom.xml
index b9e4b19..ea2d48f 100644
--- a/platform/backends/marmotta-backend-titan/pom.xml
+++ b/platform/backends/marmotta-backend-titan/pom.xml
@@ -165,7 +165,7 @@
<dependency>
<groupId>com.tinkerpop.blueprints</groupId>
<artifactId>blueprints-graph-sail</artifactId>
- <version>2.6.0</version>
+ <version>${blueprints.version}</version>
</dependency>
</dependencies>
[2/3] marmotta git commit: pre-release cleanup: remove extra
repositories from ostrich
Posted by ja...@apache.org.
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>
[3/3] marmotta git commit: pre-release cleanup: update (c)-year to
2018
Posted by ja...@apache.org.
pre-release cleanup: update (c)-year to 2018
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/3844ae46
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/3844ae46
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/3844ae46
Branch: refs/heads/develop
Commit: 3844ae46c8713a501f3f81b196071682f411b680
Parents: ffbd964
Author: Jakob Frank <ja...@apache.org>
Authored: Tue Apr 24 17:16:06 2018 +0200
Committer: Jakob Frank <ja...@apache.org>
Committed: Tue Apr 24 17:16:06 2018 +0200
----------------------------------------------------------------------
NOTICE.txt | 2 +-
.../src/main/resources/META-INF/NOTICE | 2 +-
.../src/main/resources/installer/NOTICE.txt | 2 +-
.../splash/systray/SystrayListener.java | 35 ++++++++------------
launchers/marmotta-webapp/src/deb/pkg/copyright | 2 +-
.../src/main/webapp/META-INF/NOTICE | 2 +-
.../ldpath-ldquery-cli/src/main/doc/NOTICE.txt | 2 +-
.../main/resources/config-defaults.properties | 2 +-
8 files changed, 21 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/marmotta/blob/3844ae46/NOTICE.txt
----------------------------------------------------------------------
diff --git a/NOTICE.txt b/NOTICE.txt
index 188c0e2..50e9d5d 100644
--- a/NOTICE.txt
+++ b/NOTICE.txt
@@ -1,5 +1,5 @@
Apache Marmotta
-Copyright 2012-2016 The Apache Software Foundation
+Copyright 2012-2018 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
http://git-wip-us.apache.org/repos/asf/marmotta/blob/3844ae46/commons/marmotta-commons/src/main/resources/META-INF/NOTICE
----------------------------------------------------------------------
diff --git a/commons/marmotta-commons/src/main/resources/META-INF/NOTICE b/commons/marmotta-commons/src/main/resources/META-INF/NOTICE
index 007c014..4b7c22d 100644
--- a/commons/marmotta-commons/src/main/resources/META-INF/NOTICE
+++ b/commons/marmotta-commons/src/main/resources/META-INF/NOTICE
@@ -1,5 +1,5 @@
Apache Marmotta Commons
-Copyright 2012-2016 The Apache Software Foundation
+Copyright 2012-2018 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
http://git-wip-us.apache.org/repos/asf/marmotta/blob/3844ae46/launchers/marmotta-installer/src/main/resources/installer/NOTICE.txt
----------------------------------------------------------------------
diff --git a/launchers/marmotta-installer/src/main/resources/installer/NOTICE.txt b/launchers/marmotta-installer/src/main/resources/installer/NOTICE.txt
index 118134e..4e6bb4b 100644
--- a/launchers/marmotta-installer/src/main/resources/installer/NOTICE.txt
+++ b/launchers/marmotta-installer/src/main/resources/installer/NOTICE.txt
@@ -1,5 +1,5 @@
Apache Marmotta Installer
-Copyright 2012-2016 The Apache Software Foundation
+Copyright 2012-2018 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org).
http://git-wip-us.apache.org/repos/asf/marmotta/blob/3844ae46/launchers/marmotta-splash/src/main/java/org/apache/marmotta/splash/systray/SystrayListener.java
----------------------------------------------------------------------
diff --git a/launchers/marmotta-splash/src/main/java/org/apache/marmotta/splash/systray/SystrayListener.java b/launchers/marmotta-splash/src/main/java/org/apache/marmotta/splash/systray/SystrayListener.java
index b4cb146..a743123 100644
--- a/launchers/marmotta-splash/src/main/java/org/apache/marmotta/splash/systray/SystrayListener.java
+++ b/launchers/marmotta-splash/src/main/java/org/apache/marmotta/splash/systray/SystrayListener.java
@@ -17,16 +17,18 @@
*/
package org.apache.marmotta.splash.systray;
-import static org.apache.marmotta.splash.common.MarmottaStartupHelper.getServerName;
-import static org.apache.marmotta.splash.common.MarmottaStartupHelper.getServerPort;
+import org.apache.catalina.Lifecycle;
+import org.apache.catalina.LifecycleEvent;
+import org.apache.catalina.LifecycleListener;
+import org.apache.juli.logging.Log;
+import org.apache.juli.logging.LogFactory;
+import org.apache.marmotta.splash.common.MarmottaContext;
+import org.apache.marmotta.splash.common.ui.MessageDialog;
-import java.awt.AWTException;
-import java.awt.Desktop;
-import java.awt.Image;
-import java.awt.MenuItem;
-import java.awt.PopupMenu;
-import java.awt.SystemTray;
-import java.awt.TrayIcon;
+import javax.imageio.ImageIO;
+import javax.management.MBeanServer;
+import javax.management.ObjectName;
+import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.io.IOException;
@@ -37,17 +39,8 @@ import java.util.HashSet;
import java.util.Map;
import java.util.Set;
-import javax.imageio.ImageIO;
-import javax.management.MBeanServer;
-import javax.management.ObjectName;
-
-import org.apache.catalina.Lifecycle;
-import org.apache.catalina.LifecycleEvent;
-import org.apache.catalina.LifecycleListener;
-import org.apache.juli.logging.Log;
-import org.apache.juli.logging.LogFactory;
-import org.apache.marmotta.splash.common.MarmottaContext;
-import org.apache.marmotta.splash.common.ui.MessageDialog;
+import static org.apache.marmotta.splash.common.MarmottaStartupHelper.getServerName;
+import static org.apache.marmotta.splash.common.MarmottaStartupHelper.getServerPort;
/**
* Add file description here!
@@ -189,7 +182,7 @@ public class SystrayListener implements LifecycleListener {
public void actionPerformed(ActionEvent e) {
MessageDialog.show("Apache Marmotta",
"About Apache Marmotta \n",
- "(c) 2015 The Apache Software Foundation \n" +
+ "(c) 2018 The Apache Software Foundation \n" +
"Visit http://marmotta.apache.org for further details");
}
});
http://git-wip-us.apache.org/repos/asf/marmotta/blob/3844ae46/launchers/marmotta-webapp/src/deb/pkg/copyright
----------------------------------------------------------------------
diff --git a/launchers/marmotta-webapp/src/deb/pkg/copyright b/launchers/marmotta-webapp/src/deb/pkg/copyright
index bd8af88..f56c66f 100644
--- a/launchers/marmotta-webapp/src/deb/pkg/copyright
+++ b/launchers/marmotta-webapp/src/deb/pkg/copyright
@@ -4,5 +4,5 @@ Upstream-Contact: Sergio Fernández <wi...@apache.org>
Source: http://marmotta.apache.org
Files: *
-Copyright: 2012-2015 The Apache Software Foundation
+Copyright: 2012-2018 The Apache Software Foundation
License: Apache
http://git-wip-us.apache.org/repos/asf/marmotta/blob/3844ae46/launchers/marmotta-webapp/src/main/webapp/META-INF/NOTICE
----------------------------------------------------------------------
diff --git a/launchers/marmotta-webapp/src/main/webapp/META-INF/NOTICE b/launchers/marmotta-webapp/src/main/webapp/META-INF/NOTICE
index 1c8e4a1..c043117 100644
--- a/launchers/marmotta-webapp/src/main/webapp/META-INF/NOTICE
+++ b/launchers/marmotta-webapp/src/main/webapp/META-INF/NOTICE
@@ -1,5 +1,5 @@
Apache Marmotta Webapp
-Copyright 2012-2016 The Apache Software Foundation
+Copyright 2012-2018 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org).
http://git-wip-us.apache.org/repos/asf/marmotta/blob/3844ae46/libraries/ldpath/ldpath-ldquery-cli/src/main/doc/NOTICE.txt
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-ldquery-cli/src/main/doc/NOTICE.txt b/libraries/ldpath/ldpath-ldquery-cli/src/main/doc/NOTICE.txt
index cd873c9..7610793 100644
--- a/libraries/ldpath/ldpath-ldquery-cli/src/main/doc/NOTICE.txt
+++ b/libraries/ldpath/ldpath-ldquery-cli/src/main/doc/NOTICE.txt
@@ -1,5 +1,5 @@
Apache Marmotta LDPath Linked Data Query CLI
-Copyright 2012-2016 The Apache Software Foundation
+Copyright 2012-2018 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org).
http://git-wip-us.apache.org/repos/asf/marmotta/blob/3844ae46/platform/marmotta-core/src/main/resources/config-defaults.properties
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/resources/config-defaults.properties b/platform/marmotta-core/src/main/resources/config-defaults.properties
index 60f7b4c..b6fa7c3 100644
--- a/platform/marmotta-core/src/main/resources/config-defaults.properties
+++ b/platform/marmotta-core/src/main/resources/config-defaults.properties
@@ -48,7 +48,7 @@ kiwi.pages.project = marmotta
kiwi.pages.project.marmotta.logo = core/public/img/logo/marmotta-logo.png
# marmotta footer
-kiwi.pages.project.marmotta.footer = Copyright © 2013-2016 The Apache Software Foundation, Licensed under the <a href\="\#">Apache License, Version 2.0.</a><br>Apache, Marmotta, the Apache feather and Marmotta logos are trademarks of The Apache Software Foundation.
+kiwi.pages.project.marmotta.footer = Copyright © 2013-2018 The Apache Software Foundation, Licensed under the <a href\="\#">Apache License, Version 2.0.</a><br>Apache, Marmotta, the Apache feather and Marmotta logos are trademarks of The Apache Software Foundation.
# custom logo
kiwi.pages.project.custom.logo = core/public/img/logo/custom-logo.png