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:42 UTC
[3/3] marmotta git commit: pre-release cleanup: update (c)-year to
2018
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