Update copyright date, package metadata.

Also remove contributors from each file.
TAXIIProject · Jun 7, 2017 · d9c8e68 · d9c8e68
1 parent 41269c6
commit d9c8e68
Show file tree

Hide file tree

Showing 28 changed files with 52 additions and 100 deletions.
diff --git a/LICENSE.txt b/LICENSE.txt
@@ -1,4 +1,4 @@
-Copyright (c) 2013, The MITRE Corporation
+Copyright (c) 2017, The MITRE Corporation
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -8,7 +8,7 @@ modification, are permitted provided that the following conditions are met:
     * Redistributions in binary form must reproduce the above copyright
       notice, this list of conditions and the following disclaimer in the
       documentation and/or other materials provided with the distribution.
-    * Neither the name of The MITRE Corporation nor the 
+    * Neither the name of The MITRE Corporation nor the
       names of its contributors may be used to endorse or promote products
       derived from this software without specific prior written permission.
 
@@ -21,4 +21,4 @@ ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
 LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
 ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/docs/conf.py b/docs/conf.py
@@ -1,9 +1,12 @@
+# Copyright (c) 2017, The MITRE Corporation
+# For license information, see the LICENSE.txt file
+
 import os
 
 import libtaxii
 
 project = u'libtaxii'
-copyright = u'2014, The MITRE Corporation'
+copyright = u'2017, The MITRE Corporation'
 version = libtaxii.__version__
 release = version
 

diff --git a/libtaxii/__init__.py b/libtaxii/__init__.py
@@ -1,10 +1,6 @@
-# Copyright (C) 2014 - The MITRE Corporation
+# Copyright (c) 2017, The MITRE Corporation
 # For license information, see the LICENSE.txt file
 
-# Contributors:
-# * Alex Ciobanu - calex@cert.europa.eu
-# * Mark Davidson - mdavidson@mitre.org
-
 """
 The main libtaxii module
 """

diff --git a/libtaxii/clients.py b/libtaxii/clients.py
@@ -1,10 +1,6 @@
-# Copyright (C) 2013 - The MITRE Corporation
+# Copyright (c) 2017, The MITRE Corporation
 # For license information, see the LICENSE.txt file
 
-# Contributors:
-# * Alex Ciobanu - calex@cert.europa.eu
-# * Mark Davidson - mdavidson@mitre.org
-
 """
 TAXII Clients
 """

diff --git a/libtaxii/constants.py b/libtaxii/constants.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2014 - The MITRE Corporation
+# Copyright (c) 2017, The MITRE Corporation
 # For license information, see the LICENSE.txt file
 
 #: Namespace map of namespaces libtaxii knows about

diff --git a/libtaxii/messages.py b/libtaxii/messages.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2014 - The MITRE Corporation
+# Copyright (c) 2017, The MITRE Corporation
 # For license information, see the LICENSE.txt file
 
 """Backwards compatibility for TAXII 1.0.

diff --git a/libtaxii/messages_10.py b/libtaxii/messages_10.py
@@ -1,12 +1,6 @@
-# Copyright (C) 2013 - The MITRE Corporation
+# Copyright (c) 2017, The MITRE Corporation
 # For license information, see the LICENSE.txt file
 
-# Contributors:
-# * Alex Ciobanu - calex@cert.europa.eu
-# * Mark Davidson - mdavidson@mitre.org
-# * Bryan Worrell - bworrell@mitre.org
-# * Benjamin Yates - byates@dtcc.com
-
 """
 Creating, handling, and parsing TAXII 1.0 messages.
 """

diff --git a/libtaxii/messages_11.py b/libtaxii/messages_11.py
@@ -1,12 +1,6 @@
-# Copyright (C) 2013 - The MITRE Corporation
+# Copyright (c) 2017, The MITRE Corporation
 # For license information, see the LICENSE.txt file
 
-# Contributors:
-# * Alex Ciobanu - calex@cert.europa.eu
-# * Mark Davidson - mdavidson@mitre.org
-# * Bryan Worrell - bworrell@mitre.org
-# * Benjamin Yates - byates@dtcc.com
-
 """
 Creating, handling, and parsing TAXII 1.1 messages.
 """

diff --git a/libtaxii/scripts/__init__.py b/libtaxii/scripts/__init__.py
@@ -1,6 +1,4 @@
-
-
-# Copyright (c) 2014, The MITRE Corporation. All rights reserved.
+# Copyright (c) 2017, The MITRE Corporation
 # For license information, see the LICENSE.txt file
 
 import argparse

diff --git a/libtaxii/scripts/collection_information_client.py b/libtaxii/scripts/collection_information_client.py
@@ -1,9 +1,7 @@
 #!/usr/bin/env python
-"""
-# Copyright (c) 2014, The MITRE Corporation. All rights reserved.
-# For license information, see the LICENSE.txt file
-"""
 
+# Copyright (c) 2017, The MITRE Corporation
+# For license information, see the LICENSE.txt file
 
 import libtaxii.messages_11 as tm11
 from libtaxii.scripts import TaxiiScript

diff --git a/libtaxii/scripts/discovery_client.py b/libtaxii/scripts/discovery_client.py
@@ -1,6 +1,6 @@
-
 #!/usr/bin/env python
-# Copyright (c) 2014, The MITRE Corporation. All rights reserved.
+
+# Copyright (c) 2017, The MITRE Corporation
 # For license information, see the LICENSE.txt file
 
 from libtaxii.scripts import TaxiiScript

diff --git a/libtaxii/scripts/discovery_client_10.py b/libtaxii/scripts/discovery_client_10.py
@@ -1,6 +1,6 @@
-
 #!/usr/bin/env python
-# Copyright (c) 2014, The MITRE Corporation. All rights reserved.
+
+# Copyright (c) 2017, The MITRE Corporation
 # For license information, see the LICENSE.txt file
 
 from libtaxii.scripts import TaxiiScript

diff --git a/libtaxii/scripts/feed_information_client_10.py b/libtaxii/scripts/feed_information_client_10.py
@@ -1,9 +1,7 @@
 #!/usr/bin/env python
-"""
-# Copyright (c) 2014, The MITRE Corporation. All rights reserved.
-# For license information, see the LICENSE.txt file
-"""
 
+# Copyright (c) 2017, The MITRE Corporation
+# For license information, see the LICENSE.txt file
 
 import libtaxii.messages_10 as tm10
 from libtaxii.scripts import TaxiiScript

diff --git a/libtaxii/scripts/fulfillment_client.py b/libtaxii/scripts/fulfillment_client.py
@@ -1,7 +1,6 @@
-
-
 #!/usr/bin/env python
-# Copyright (c) 2014, The MITRE Corporation. All rights reserved.
+
+# Copyright (c) 2017, The MITRE Corporation
 # For license information, see the LICENSE.txt file
 
 import libtaxii.messages_11 as tm11

diff --git a/libtaxii/scripts/inbox_client.py b/libtaxii/scripts/inbox_client.py
@@ -1,6 +1,6 @@
-
 #!/usr/bin/env python
-# Copyright (c) 2014, The MITRE Corporation. All rights reserved.
+
+# Copyright (c) 2017, The MITRE Corporation
 # For license information, see the LICENSE.txt file
 
 from libtaxii.scripts import TaxiiScript

diff --git a/libtaxii/scripts/inbox_client_10.py b/libtaxii/scripts/inbox_client_10.py
@@ -1,6 +1,6 @@
-
 #!/usr/bin/env python
-# Copyright (c) 2014, The MITRE Corporation. All rights reserved.
+
+# Copyright (c) 2017, The MITRE Corporation
 # For license information, see the LICENSE.txt file
 
 from libtaxii.scripts import TaxiiScript

diff --git a/libtaxii/scripts/poll_client.py b/libtaxii/scripts/poll_client.py
@@ -1,7 +1,6 @@
-
-
 #!/usr/bin/env python
-# Copyright (c) 2014, The MITRE Corporation. All rights reserved.
+
+# Copyright (c) 2017, The MITRE Corporation
 # For license information, see the LICENSE.txt file
 
 from libtaxii.scripts import TaxiiScript, add_poll_response_args

diff --git a/libtaxii/scripts/poll_client_10.py b/libtaxii/scripts/poll_client_10.py
@@ -1,7 +1,6 @@
-
-
 #!/usr/bin/env python
-# Copyright (c) 2014, The MITRE Corporation. All rights reserved.
+
+# Copyright (c) 2017, The MITRE Corporation
 # For license information, see the LICENSE.txt file
 
 from libtaxii.scripts import TaxiiScript, add_poll_response_args

diff --git a/libtaxii/scripts/query_client.py b/libtaxii/scripts/query_client.py
@@ -1,6 +1,6 @@
-
 #!/usr/bin/env python
-# Copyright (c) 2014, The MITRE Corporation. All rights reserved.
+
+# Copyright (c) 2017, The MITRE Corporation
 # For license information, see the LICENSE.txt file
 
 import libtaxii.taxii_default_query as tdq

diff --git a/libtaxii/taxii_default_query.py b/libtaxii/taxii_default_query.py
@@ -1,9 +1,6 @@
-# Copyright (C) 2013 - The MITRE Corporation
+# Copyright (c) 2017, The MITRE Corporation
 # For license information, see the LICENSE.txt file
 
-# Contributors:
-# * Mark Davidson - mdavidson@mitre.org
-
 """
 Creating, handling, and parsing TAXII Default Queries.
 """

diff --git a/libtaxii/test/clients_test.py b/libtaxii/test/clients_test.py
@@ -1,11 +1,6 @@
-
-
-# Copyright (C) 2013 - The MITRE Corporation
+# Copyright (c) 2017, The MITRE Corporation
 # For license information, see the LICENSE.txt file
 
-# Contributors:
-# * Mark Davidson - mdavidson@mitre.org
-
 import datetime
 
 from dateutil.tz import tzutc

diff --git a/libtaxii/test/messages_10_test.py b/libtaxii/test/messages_10_test.py
@@ -1,15 +1,10 @@
-
-
-# Copyright (C) 2013 - The MITRE Corporation
+# Copyright (c) 2017, The MITRE Corporation
 # For license information, see the LICENSE.txt file
 
 # This file has two purposes:
 # 1. To provide a rough unit test of libtaxii.messages
 # 2. To provide examples of how to use libtaxii.messages
 
-# Contributors:
-# * Mark Davidson - mdavidson@mitre.org
-
 import datetime
 import unittest
 import warnings
@@ -692,7 +687,7 @@ def test_01(self):
         """
         Test all the encodings for TAXII 1.0 XML
         """
-        
+
         for encoding in PYTHON_ENCODINGS:
             if encoding in ('cp720', 'cp858', 'iso8859_11') and (sys.version_info[0] == 2 and sys.version_info[1] == 6):
                 continue  # This encoding is not supported in Python 2.6
@@ -707,7 +702,7 @@ def test_02(self):
         """
         Test all the encodings for TAXII 1.0 JSON
         """
-        
+
         for encoding in PYTHON_ENCODINGS:
             if encoding in ('cp720', 'cp858', 'iso8859_11') and (sys.version_info[0] == 2 and sys.version_info[1] == 6):
                 continue  # This encoding is not supported in Python 2.6

diff --git a/libtaxii/test/messages_11_test.py b/libtaxii/test/messages_11_test.py
@@ -1,15 +1,10 @@
-
-
-# Copyright (C) 2013 - The MITRE Corporation
+# Copyright (c) 2017, The MITRE Corporation
 # For license information, see the LICENSE.txt file
 
 # This file has two purposes:
 # 1. To provide a rough unit test of libtaxii.messages
 # 2. To provide examples of how to use libtaxii.messages
 
-# Contributors:
-# * Mark Davidson - mdavidson@mitre.org
-
 import datetime
 import io
 import sys
@@ -1375,7 +1370,7 @@ def test_01(self):
         for encoding in PYTHON_ENCODINGS:
             if encoding in ('cp720', 'cp858', 'iso8859_11') and (sys.version_info[0] == 2 and sys.version_info[1] == 6):
                 continue  # This encoding is not supported in Python 2.6
-                
+
             encoded_doc = xml_taxii_message_11.encode(encoding, 'strict')
             try:
                 msg = tm11.get_message_from_xml(encoded_doc, encoding)
@@ -1387,7 +1382,7 @@ def test_02(self):
         """
         Test all the encodings for TAXII 1.1 JSON
         """
-        
+
         for encoding in PYTHON_ENCODINGS:
             if encoding in ('cp720', 'cp858', 'iso8859_11') and (sys.version_info[0] == 2 and sys.version_info[1] == 6):
                 continue  # This encoding is not supported in Python 2.6

diff --git a/libtaxii/test/to_text_11_test.py b/libtaxii/test/to_text_11_test.py
@@ -1,6 +1,6 @@
-
 #!/usr/bin/env python
-# Copyright (c) 2015, The MITRE Corporation. All rights reserved.
+
+# Copyright (c) 2017, The MITRE Corporation
 # For license information, see the LICENSE.txt file
 
 import glob

diff --git a/libtaxii/test/validation_test.py b/libtaxii/test/validation_test.py
@@ -1,5 +1,4 @@
-
-# Copyright (C) 2105 - The MITRE Corporation
+# Copyright (c) 2017, The MITRE Corporation
 # For license information, see the LICENSE.txt file
 
 import unittest

diff --git a/libtaxii/validation.py b/libtaxii/validation.py
@@ -1,9 +1,6 @@
-# Copyright (C) 2013 - The MITRE Corporation
+# Copyright (c) 2017, The MITRE Corporation
 # For license information, see the LICENSE.txt file
 
-# Contributors:
-# * Mark Davidson - mdavidson@mitre.org
-
 """
 Common data validation functions used across libtaxii
 """

diff --git a/libtaxii/version.py b/libtaxii/version.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2015, The MITRE Corporation. All rights reserved.
-# See LICENSE.txt for complete terms.
+# Copyright (c) 2017, The MITRE Corporation
+# For license information, see the LICENSE.txt file
 
 __version__ = "1.1.111.dev0"
diff --git a/setup.py b/setup.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-# Copyright (c) 2015 - The MITRE Corporation
+# Copyright (c) 2017, The MITRE Corporation
 # For license information, see the LICENSE.txt file
 
 from os.path import abspath, dirname, join
@@ -42,9 +42,9 @@ def get_version():
 setup(
     name='libtaxii',
     description='TAXII Library.',
-    author='Mark Davidson',
-    author_email='mdavidson@mitre.org',
-    url="http://taxii.mitre.org/",
+    author='The MITRE Corporation',
+    author_email='taxii@mitre.org',
+    url="https://taxiiproject.github.io/",
     version=get_version(),
     packages=find_packages(),
     install_requires=install_requires,