You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2018/09/01 07:54:32 UTC
[directory-studio] branch master updated: Updated the copyright
dates
This is an automated email from the ASF dual-hosted git repository.
elecharny pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/directory-studio.git
The following commit(s) were added to refs/heads/master by this push:
new 2646bfb Updated the copyright dates
2646bfb is described below
commit 2646bfbd25f5ce310b13d6b03a017a653764dc72
Author: Emmanuel Lécharny <el...@symas.com>
AuthorDate: Sat Sep 1 09:54:24 2018 +0200
Updated the copyright dates
---
NOTICE | 2 +-
features/apacheds.feature/feature.xml | 2 +-
features/ldapbrowser.feature/feature.xml | 2 +-
features/ldifeditor.feature/feature.xml | 2 +-
features/nls.feature/feature.xml | 2 +-
features/openldap.feature/feature.xml | 2 +-
features/schemaeditor.feature/feature.xml | 2 +-
.../ldapbrowser.help/src/main/resources/about.html | 4 +--
plugins/apacheds.configuration/about.ini | 2 +-
plugins/ldapbrowser.core/about.html | 4 +--
plugins/ldapbrowser.ui/about.ini | 2 +-
plugins/ldifeditor/about.ini | 2 +-
plugins/rcp/about.ini | 2 +-
plugins/rcp/plugin.properties | 2 +-
plugins/rcp/plugin_de.properties | 2 +-
plugins/rcp/plugin_fr.properties | 2 +-
plugins/rcp/src/main/resources/about.ini | 2 +-
plugins/schemaeditor/about.ini | 2 +-
product/LICENSE | 33 +++++++++++-----------
product/NOTICE | 2 +-
20 files changed, 37 insertions(+), 38 deletions(-)
diff --git a/NOTICE b/NOTICE
index a726bb1..f0e0673 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,5 +1,5 @@
Apache Directory Studio
-Copyright 2007-2017 The Apache Software Foundation
+Copyright 2007-2018 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
diff --git a/features/apacheds.feature/feature.xml b/features/apacheds.feature/feature.xml
index 905bcf4..f058359 100644
--- a/features/apacheds.feature/feature.xml
+++ b/features/apacheds.feature/feature.xml
@@ -12,7 +12,7 @@
</description>
<copyright>
- Copyright © 2006-2017 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.
+ Copyright © 2006-2018 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.
</copyright>
<license url="http://www.apache.org/licenses/LICENSE-2.0.html">
diff --git a/features/ldapbrowser.feature/feature.xml b/features/ldapbrowser.feature/feature.xml
index de6673b..208ed45 100644
--- a/features/ldapbrowser.feature/feature.xml
+++ b/features/ldapbrowser.feature/feature.xml
@@ -12,7 +12,7 @@
</description>
<copyright>
- Copyright © 2006-2017 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.
+ Copyright © 2006-2018 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.
</copyright>
<license url="http://www.apache.org/licenses/LICENSE-2.0.html">
diff --git a/features/ldifeditor.feature/feature.xml b/features/ldifeditor.feature/feature.xml
index a83b447..99d9eda 100644
--- a/features/ldifeditor.feature/feature.xml
+++ b/features/ldifeditor.feature/feature.xml
@@ -12,7 +12,7 @@
</description>
<copyright>
- Copyright © 2006-2017 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.
+ Copyright © 2006-2018 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.
</copyright>
<license url="http://www.apache.org/licenses/LICENSE-2.0.html">
diff --git a/features/nls.feature/feature.xml b/features/nls.feature/feature.xml
index b8c04d5..daabc2d 100644
--- a/features/nls.feature/feature.xml
+++ b/features/nls.feature/feature.xml
@@ -11,7 +11,7 @@
</description>
<copyright>
- Copyright © 2006-2017 The Apache Software Foundation, Licensed
+ Copyright © 2006-2018 The Apache Software Foundation, Licensed
under the Apache License, Version 2.0.
</copyright>
diff --git a/features/openldap.feature/feature.xml b/features/openldap.feature/feature.xml
index eac7076..5818bfe 100644
--- a/features/openldap.feature/feature.xml
+++ b/features/openldap.feature/feature.xml
@@ -11,7 +11,7 @@
</description>
<copyright>
- Copyright © 2006-2017 The Apache Software Foundation, Licensed
+ Copyright © 2006-2018 The Apache Software Foundation, Licensed
under the Apache License, Version 2.0.
</copyright>
diff --git a/features/schemaeditor.feature/feature.xml b/features/schemaeditor.feature/feature.xml
index 34886d5..5773ce5 100644
--- a/features/schemaeditor.feature/feature.xml
+++ b/features/schemaeditor.feature/feature.xml
@@ -12,7 +12,7 @@
</description>
<copyright>
- Copyright © 2006-2017 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.
+ Copyright © 2006-2018 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.
</copyright>
<license url="http://www.apache.org/licenses/LICENSE-2.0.html">
diff --git a/helps/ldapbrowser.help/src/main/resources/about.html b/helps/ldapbrowser.help/src/main/resources/about.html
index 80846c8..cfa1a68 100644
--- a/helps/ldapbrowser.help/src/main/resources/about.html
+++ b/helps/ldapbrowser.help/src/main/resources/about.html
@@ -9,7 +9,7 @@
<h3>Copyright</h3>
-<p>Copyright (c) 2006-2017 Apache Software Foundation. All rights reserved.</p>
+<p>Copyright (c) 2006-2018 Apache Software Foundation. All rights reserved.</p>
<h3>License</h3>
@@ -32,4 +32,4 @@ and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">htt
The source code for Eclipse is available at <a href="http://www.eclipse.org/">http://www.eclipse.org/</a>.</p>
</body>
-</html>
\ No newline at end of file
+</html>
diff --git a/plugins/apacheds.configuration/about.ini b/plugins/apacheds.configuration/about.ini
index 8ce5f83..eea0215 100644
--- a/plugins/apacheds.configuration/about.ini
+++ b/plugins/apacheds.configuration/about.ini
@@ -1,2 +1,2 @@
featureImage=studio.png
-aboutText=Apache Directory Studio ApacheDS - ApacheDS (Apache Directory Server) specific tools: configuration editor for ApacheDS and a launchable ApacheDS.\n\nVersion: ${unqualifiedVersion}.${buildQualifier}\n\nCopyright \u00A9 2006-2017 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.\nVisit http://directory.apache.org/studio
+aboutText=Apache Directory Studio ApacheDS - ApacheDS (Apache Directory Server) specific tools: configuration editor for ApacheDS and a launchable ApacheDS.\n\nVersion: ${unqualifiedVersion}.${buildQualifier}\n\nCopyright \u00A9 2006-2018 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.\nVisit http://directory.apache.org/studio
diff --git a/plugins/ldapbrowser.core/about.html b/plugins/ldapbrowser.core/about.html
index 7647d64..9dbaa8c 100644
--- a/plugins/ldapbrowser.core/about.html
+++ b/plugins/ldapbrowser.core/about.html
@@ -9,7 +9,7 @@
<h3>Copyright</h3>
-<p>Copyright (c) 2006-2017 Apache Software Foundation. All rights reserved.</p>
+<p>Copyright (c) 2006-2018 Apache Software Foundation. All rights reserved.</p>
<h3>License</h3>
@@ -73,4 +73,4 @@ The source code for OpenLDAP is available at <a href="http://www.openldap.org/">
</body>
-</html>
\ No newline at end of file
+</html>
diff --git a/plugins/ldapbrowser.ui/about.ini b/plugins/ldapbrowser.ui/about.ini
index 26d2128..0f49a4a 100644
--- a/plugins/ldapbrowser.ui/about.ini
+++ b/plugins/ldapbrowser.ui/about.ini
@@ -1,2 +1,2 @@
featureImage=studio.png
-aboutText=Apache Directory Studio LDAP Browser - Tools for browsing and editing LDAP servers.\n\nVersion: ${unqualifiedVersion}.${buildQualifier}\n\nCopyright \u00A9 2006-2017 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.\nVisit http://directory.apache.org/studio
+aboutText=Apache Directory Studio LDAP Browser - Tools for browsing and editing LDAP servers.\n\nVersion: ${unqualifiedVersion}.${buildQualifier}\n\nCopyright \u00A9 2006-2018 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.\nVisit http://directory.apache.org/studio
diff --git a/plugins/ldifeditor/about.ini b/plugins/ldifeditor/about.ini
index c04cd85..3c83e90 100644
--- a/plugins/ldifeditor/about.ini
+++ b/plugins/ldifeditor/about.ini
@@ -1,2 +1,2 @@
featureImage=studio.png
-aboutText=Apache Directory Studio LDIF Editor - Editor for LDIF (LDAP Data Interchange Format) files.\n\nVersion: ${unqualifiedVersion}.${buildQualifier}\n\nCopyright \u00A9 2006-2017 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.\nVisit http://directory.apache.org/studio
+aboutText=Apache Directory Studio LDIF Editor - Editor for LDIF (LDAP Data Interchange Format) files.\n\nVersion: ${unqualifiedVersion}.${buildQualifier}\n\nCopyright \u00A9 2006-2018 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.\nVisit http://directory.apache.org/studio
diff --git a/plugins/rcp/about.ini b/plugins/rcp/about.ini
index 80fbfc0..3bd8721 100644
--- a/plugins/rcp/about.ini
+++ b/plugins/rcp/about.ini
@@ -1,2 +1,2 @@
featureImage=studio.png
-aboutText=Apache Directory Studio - The Eclipse-based LDAP browser and directory client.\n\nVersion: ${unqualifiedVersion}.${buildQualifier}\n\nCopyright \u00A9 2006-2017 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.\nVisit http://directory.apache.org/studio
+aboutText=Apache Directory Studio - The Eclipse-based LDAP browser and directory client.\n\nVersion: ${unqualifiedVersion}.${buildQualifier}\n\nCopyright \u00A9 2006-2018 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.\nVisit http://directory.apache.org/studio
diff --git a/plugins/rcp/plugin.properties b/plugins/rcp/plugin.properties
index 8108b39..f974476 100644
--- a/plugins/rcp/plugin.properties
+++ b/plugins/rcp/plugin.properties
@@ -22,6 +22,6 @@ RCP_Hide_id=org.apache.directory.studio.rcp.hide
#---------------------------------------------------------------------------------------------------
# The I18n Strings
#---------------------------------------------------------------------------------------------------
-aboutText=Apache Directory Studio\n\nVersion: ${unqualifiedVersion}.${buildQualifier}\n\nCopyright \u00A9 2006-2017 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.\nVisit http://directory.apache.org/studio\n\nSome icons from FAMFAMFAM http://www.famfamfam.com/lab/icons/silk
+aboutText=Apache Directory Studio\n\nVersion: ${unqualifiedVersion}.${buildQualifier}\n\nCopyright \u00A9 2006-2018 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.\nVisit http://directory.apache.org/studio\n\nSome icons from FAMFAMFAM http://www.famfamfam.com/lab/icons/silk
PrefPage_ShutdownPreferencesPage_name=Shutdown
diff --git a/plugins/rcp/plugin_de.properties b/plugins/rcp/plugin_de.properties
index 8f46dcb..12059e8 100644
--- a/plugins/rcp/plugin_de.properties
+++ b/plugins/rcp/plugin_de.properties
@@ -14,5 +14,5 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-aboutText=Apache Directory Studio\n\nVersion: ${unqualifiedVersion}.${buildQualifier}\n\nCopyright \u00A9 2006-2017 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.\nBesuchen Sie http://directory.apache.org/studio\n\nEinige Symbole stammen von FAMFAMFAM http://www.famfamfam.com/lab/icons/silk
+aboutText=Apache Directory Studio\n\nVersion: ${unqualifiedVersion}.${buildQualifier}\n\nCopyright \u00A9 2006-2018 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.\nBesuchen Sie http://directory.apache.org/studio\n\nEinige Symbole stammen von FAMFAMFAM http://www.famfamfam.com/lab/icons/silk
PrefPage_ShutdownPreferencesPage_name=Beenden
diff --git a/plugins/rcp/plugin_fr.properties b/plugins/rcp/plugin_fr.properties
index 7efb4bf..62b5997 100644
--- a/plugins/rcp/plugin_fr.properties
+++ b/plugins/rcp/plugin_fr.properties
@@ -14,5 +14,5 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-aboutText=Apache Directory Studio\n\nVersion: ${unqualifiedVersion}.${buildQualifier}\n\nCopyright \u00A9 2006-2017 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.\nVisit http://directory.apache.org/studio\n\nCertaines icones sont de FAMFAMFAM http://www.famfamfam.com/lab/icons/silk
+aboutText=Apache Directory Studio\n\nVersion: ${unqualifiedVersion}.${buildQualifier}\n\nCopyright \u00A9 2006-2018 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.\nVisit http://directory.apache.org/studio\n\nCertaines icones sont de FAMFAMFAM http://www.famfamfam.com/lab/icons/silk
PrefPage_ShutdownPreferencesPage_name=Extinction
diff --git a/plugins/rcp/src/main/resources/about.ini b/plugins/rcp/src/main/resources/about.ini
index 80fbfc0..3bd8721 100644
--- a/plugins/rcp/src/main/resources/about.ini
+++ b/plugins/rcp/src/main/resources/about.ini
@@ -1,2 +1,2 @@
featureImage=studio.png
-aboutText=Apache Directory Studio - The Eclipse-based LDAP browser and directory client.\n\nVersion: ${unqualifiedVersion}.${buildQualifier}\n\nCopyright \u00A9 2006-2017 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.\nVisit http://directory.apache.org/studio
+aboutText=Apache Directory Studio - The Eclipse-based LDAP browser and directory client.\n\nVersion: ${unqualifiedVersion}.${buildQualifier}\n\nCopyright \u00A9 2006-2018 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.\nVisit http://directory.apache.org/studio
diff --git a/plugins/schemaeditor/about.ini b/plugins/schemaeditor/about.ini
index 01f2b1b..2a90fe5 100644
--- a/plugins/schemaeditor/about.ini
+++ b/plugins/schemaeditor/about.ini
@@ -1,2 +1,2 @@
featureImage=studio.png
-aboutText=Apache Directory Studio Schema Editor - Editors for LDAP schema, supports ApacheDS and OpenLDAP format.\n\nVersion: ${unqualifiedVersion}.${buildQualifier}\n\nCopyright \u00A9 2006-2017 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.\nVisit http://directory.apache.org/studio
+aboutText=Apache Directory Studio Schema Editor - Editors for LDAP schema, supports ApacheDS and OpenLDAP format.\n\nVersion: ${unqualifiedVersion}.${buildQualifier}\n\nCopyright \u00A9 2006-2018 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.\nVisit http://directory.apache.org/studio
diff --git a/product/LICENSE b/product/LICENSE
index ccd135b..c1e0521 100644
--- a/product/LICENSE
+++ b/product/LICENSE
@@ -219,27 +219,26 @@ Licensed under the Apache License Version 2.0.
For Bouncy Castle
Licensed under MIT License:
-Copyright (c) 2000 - 2016 The Legion Of The Bouncy Castle (http://www.bouncycastle.org)
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
+Copyright (c) 2000 - 2018 The Legion of the Bouncy Castle Inc. (https://www.bouncycastle.org)
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, m erge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
the following conditions:
-The above copyright notice and this permission notice shall be
+The above copyright notice and this permission notice shall be
included in all copies or substantial portions of the Software.
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
------------------------------------------------------------------------------
diff --git a/product/NOTICE b/product/NOTICE
index a726bb1..f0e0673 100644
--- a/product/NOTICE
+++ b/product/NOTICE
@@ -1,5 +1,5 @@
Apache Directory Studio
-Copyright 2007-2017 The Apache Software Foundation
+Copyright 2007-2018 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).