Reverted copyright changes

rozza · rozza · commit dcc3ba719851 · 2018-06-21T13:05:32.000+01:00
JAVA-2857
diff --git a/THIRD-PARTY-NOTICES b/THIRD-PARTY-NOTICES
@@ -54,23 +54,7 @@ https://github.com/mongodb/mongo-java-driver.
     See the License for the specific language governing permissions and
     limitations under the License.
 
-4) The following files: Base64Codec.java
-
-    Copyright 1999,2005 The Apache Software Foundation.
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
-5) The following files: ReadTimeoutHandler.java
+4) The following files: ReadTimeoutHandler.java
 
     Copyright 2008-present MongoDB, Inc.
     Copyright 2012 The Netty Project
@@ -87,7 +71,7 @@ https://github.com/mongodb/mongo-java-driver.
     See the License for the specific language governing permissions and
     limitations under the License.
 
-6) The following files: InstantCodec.java, Jsr310CodecProvider.java, LocalDateCodec.java, LocalDateTimeCodec.java, LocalTimeCodec.java
+5) The following files: InstantCodec.java, Jsr310CodecProvider.java, LocalDateCodec.java, LocalDateTimeCodec.java, LocalTimeCodec.java
 
     Copyright 2008-present MongoDB, Inc.
     Copyright 2018 Cezary Bartosiak
@@ -104,7 +88,7 @@ https://github.com/mongodb/mongo-java-driver.
     See the License for the specific language governing permissions and
     limitations under the License.
 
-7) The following files: SaslPrep.java
+6) The following files: SaslPrep.java
 
      Copyright 2008-present MongoDB, Inc.
      Copyright 2017 Tom Bentley
diff --git a/bson/src/main/org/bson/assertions/Assertions.java b/bson/src/main/org/bson/assertions/Assertions.java
@@ -1,5 +1,6 @@
 /*
  * Copyright 2008-present MongoDB, Inc.
+ * Copyright (c) 2008-2014 Atlassian Pty Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/bson/src/main/org/bson/internal/UnsignedLongs.java b/bson/src/main/org/bson/internal/UnsignedLongs.java
@@ -1,5 +1,7 @@
 /*
  * Copyright 2008-present MongoDB, Inc.
+ * Copyright 2010 The Guava Authors
+ * Copyright 2011 The Guava Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/bson/src/main/org/bson/util/AbstractCopyOnWriteMap.java b/bson/src/main/org/bson/util/AbstractCopyOnWriteMap.java
@@ -1,5 +1,6 @@
 /*
  * Copyright 2008-present MongoDB, Inc.
+ * Copyright (c) 2008-2014 Atlassian Pty Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/bson/src/main/org/bson/util/CopyOnWriteMap.java b/bson/src/main/org/bson/util/CopyOnWriteMap.java
@@ -1,5 +1,6 @@
 /*
  * Copyright 2008-present MongoDB, Inc.
+ * Copyright (c) 2008-2014 Atlassian Pty Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/bson/src/test/unit/org/bson/internal/UnsignedLongsTest.java b/bson/src/test/unit/org/bson/internal/UnsignedLongsTest.java
@@ -1,5 +1,7 @@
 /*
  * Copyright 2008-present MongoDB, Inc.
+ * Copyright 2010 The Guava Authors
+ * Copyright 2011 The Guava Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/driver-core/src/main/com/mongodb/annotations/Beta.java b/driver-core/src/main/com/mongodb/annotations/Beta.java
@@ -1,5 +1,7 @@
 /*
  * Copyright 2008-present MongoDB, Inc.
+ * Copyright 2010 The Guava Authors
+ * Copyright 2011 The Guava Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/driver-core/src/main/com/mongodb/annotations/Immutable.java b/driver-core/src/main/com/mongodb/annotations/Immutable.java
@@ -1,17 +1,11 @@
 /*
- * Copyright 2008-present MongoDB, Inc.
+ * Copyright (c) 2005 Brian Goetz and Tim Peierls
+ * Released under the Creative Commons Attribution License
+ *   (http://creativecommons.org/licenses/by/2.5)
+ * Official home: http://www.jcip.net
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Any republication or derived work distributed in source code form
+ * must include this copyright and license notice.
  */
 
 package com.mongodb.annotations;
diff --git a/driver-core/src/main/com/mongodb/annotations/NotThreadSafe.java b/driver-core/src/main/com/mongodb/annotations/NotThreadSafe.java
@@ -1,17 +1,11 @@
 /*
- * Copyright 2008-present MongoDB, Inc.
+ * Copyright (c) 2005 Brian Goetz and Tim Peierls
+ * Released under the Creative Commons Attribution License
+ *   (http://creativecommons.org/licenses/by/2.5)
+ * Official home: http://www.jcip.net
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Any republication or derived work distributed in source code form
+ * must include this copyright and license notice.
  */
 
 package com.mongodb.annotations;
diff --git a/driver-core/src/main/com/mongodb/annotations/ThreadSafe.java b/driver-core/src/main/com/mongodb/annotations/ThreadSafe.java
@@ -1,17 +1,11 @@
 /*
- * Copyright 2008-present MongoDB, Inc.
+ * Copyright (c) 2005 Brian Goetz and Tim Peierls
+ * Released under the Creative Commons Attribution License
+ *   (http://creativecommons.org/licenses/by/2.5)
+ * Official home: http://www.jcip.net
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Any republication or derived work distributed in source code form
+ * must include this copyright and license notice.
  */
 
 package com.mongodb.annotations;
diff --git a/driver-core/src/main/com/mongodb/assertions/Assertions.java b/driver-core/src/main/com/mongodb/assertions/Assertions.java
@@ -1,5 +1,6 @@
 /*
  * Copyright 2008-present MongoDB, Inc.
+ * Copyright (c) 2008-2014 Atlassian Pty Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/driver-core/src/main/com/mongodb/connection/netty/ReadTimeoutHandler.java b/driver-core/src/main/com/mongodb/connection/netty/ReadTimeoutHandler.java
@@ -1,5 +1,6 @@
 /*
  * Copyright 2008-present MongoDB, Inc.
+ * Copyright 2012 The Netty Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/driver-core/src/main/com/mongodb/internal/authentication/SaslPrep.java b/driver-core/src/main/com/mongodb/internal/authentication/SaslPrep.java
@@ -1,5 +1,6 @@
 /*
  * Copyright 2008-present MongoDB, Inc.
+ * Copyright 2017 Tom Bentley
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`/*`
`2`	`2`	`* Copyright 2008-present MongoDB, Inc.`
	`3`	`+ * Copyright (c) 2008-2014 Atlassian Pty Ltd`
`3`	`4`	`*`
`4`	`5`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`5`	`6`	`* you may not use this file except in compliance with the License.`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,7 @@`
`1`	`1`	`/*`
`2`	`2`	`* Copyright 2008-present MongoDB, Inc.`
	`3`	`+ * Copyright 2010 The Guava Authors`
	`4`	`+ * Copyright 2011 The Guava Authors`
`3`	`5`	`*`
`4`	`6`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`5`	`7`	`* you may not use this file except in compliance with the License.`