From 09c5a30a9ed5d63547a92586d42f439e231d9ac7 Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Thu, 20 Sep 2018 13:43:27 -0400 Subject: [PATCH 01/39] Fix Copyright notices (#1174) * add OSGI metadata * more default behavior * add OSGI info * whitespace * Remove (c) from copyright notices --- .../extensions/android/accounts/GoogleAccountManager.java | 2 +- .../googleapis/extensions/android/accounts/package-info.java | 2 +- .../extensions/appengine/auth/oauth2/AppIdentityCredential.java | 2 +- .../extensions/appengine/auth/oauth2/package-info.java | 2 +- .../appengine/notifications/AppEngineNotificationServlet.java | 2 +- .../extensions/appengine/notifications/package-info.java | 2 +- .../appengine/testing/auth/oauth2/MockAppIdentityService.java | 2 +- .../extensions/appengine/testing/auth/oauth2/package-info.java | 2 +- .../appengine/auth/oauth2/AppIdentityCredentialTest.java | 2 +- google-api-client-assembly/dependencies/BSD-LICENSE.txt | 2 +- google-api-client-assembly/dependencies/xpp3_LICENSE.txt | 2 +- .../notifications/json/gson/GsonNotificationCallback.java | 2 +- .../client/googleapis/notifications/json/gson/package-info.java | 2 +- .../json/jackson2/JacksonNotificationCallback.java | 2 +- .../googleapis/notifications/json/jackson2/package-info.java | 2 +- .../extensions/java6/auth/oauth2/GooglePromptReceiver.java | 2 +- .../googleapis/extensions/java6/auth/oauth2/package-info.java | 2 +- .../googleapis/services/protobuf/AbstractGoogleProtoClient.java | 2 +- .../services/protobuf/AbstractGoogleProtoClientRequest.java | 2 +- .../protobuf/CommonGoogleProtoClientRequestInitializer.java | 2 +- .../api/client/googleapis/services/protobuf/package-info.java | 2 +- .../testing/services/protobuf/MockGoogleProtoClient.java | 2 +- .../testing/services/protobuf/MockGoogleProtoClientRequest.java | 2 +- .../googleapis/testing/services/protobuf/package-info.java | 2 +- .../protobuf/CommonGoogleProtoClientRequestInitializerTest.java | 2 +- google-api-client-protobuf/src/test/proto/simple_proto.proto | 2 +- .../extensions/servlet/notifications/NotificationServlet.java | 2 +- .../extensions/servlet/notifications/WebhookHeaders.java | 2 +- .../extensions/servlet/notifications/WebhookUtils.java | 2 +- .../extensions/servlet/notifications/package-info.java | 2 +- .../google/api/client/googleapis/xml/atom/AtomPatchContent.java | 2 +- .../googleapis/xml/atom/AtomPatchRelativeToOriginalContent.java | 2 +- .../com/google/api/client/googleapis/xml/atom/GoogleAtom.java | 2 +- .../api/client/googleapis/xml/atom/MultiKindFeedParser.java | 2 +- .../com/google/api/client/googleapis/xml/atom/package-info.java | 2 +- .../google/api/client/googleapis/xml/atom/GoogleAtomTest.java | 2 +- .../main/java/com/google/api/client/googleapis/GoogleUtils.java | 2 +- .../java/com/google/api/client/googleapis/MethodOverride.java | 2 +- .../api/client/googleapis/apache/GoogleApacheHttpTransport.java | 2 +- .../com/google/api/client/googleapis/apache/package-info.java | 2 +- .../googleapis/auth/oauth2/DefaultCredentialProvider.java | 2 +- .../googleapis/auth/oauth2/GoogleAuthorizationCodeFlow.java | 2 +- .../auth/oauth2/GoogleAuthorizationCodeRequestUrl.java | 2 +- .../auth/oauth2/GoogleAuthorizationCodeTokenRequest.java | 2 +- .../googleapis/auth/oauth2/GoogleBrowserClientRequestUrl.java | 2 +- .../api/client/googleapis/auth/oauth2/GoogleClientSecrets.java | 2 +- .../api/client/googleapis/auth/oauth2/GoogleCredential.java | 2 +- .../google/api/client/googleapis/auth/oauth2/GoogleIdToken.java | 2 +- .../client/googleapis/auth/oauth2/GoogleIdTokenVerifier.java | 2 +- .../api/client/googleapis/auth/oauth2/GoogleOAuthConstants.java | 2 +- .../client/googleapis/auth/oauth2/GooglePublicKeysManager.java | 2 +- .../googleapis/auth/oauth2/GoogleRefreshTokenRequest.java | 2 +- .../api/client/googleapis/auth/oauth2/GoogleTokenResponse.java | 2 +- .../google/api/client/googleapis/auth/oauth2/OAuth2Utils.java | 2 +- .../googleapis/auth/oauth2/SystemEnvironmentProvider.java | 2 +- .../google/api/client/googleapis/auth/oauth2/package-info.java | 2 +- .../com/google/api/client/googleapis/batch/BatchCallback.java | 2 +- .../com/google/api/client/googleapis/batch/BatchRequest.java | 2 +- .../api/client/googleapis/batch/BatchUnparsedResponse.java | 2 +- .../google/api/client/googleapis/batch/HttpRequestContent.java | 2 +- .../api/client/googleapis/batch/json/JsonBatchCallback.java | 2 +- .../google/api/client/googleapis/batch/json/package-info.java | 2 +- .../com/google/api/client/googleapis/batch/package-info.java | 2 +- .../google/api/client/googleapis/compute/ComputeCredential.java | 2 +- .../com/google/api/client/googleapis/compute/package-info.java | 2 +- .../api/client/googleapis/javanet/GoogleNetHttpTransport.java | 2 +- .../com/google/api/client/googleapis/javanet/package-info.java | 2 +- .../com/google/api/client/googleapis/json/GoogleJsonError.java | 2 +- .../api/client/googleapis/json/GoogleJsonErrorContainer.java | 2 +- .../api/client/googleapis/json/GoogleJsonResponseException.java | 2 +- .../com/google/api/client/googleapis/json/package-info.java | 2 +- .../google/api/client/googleapis/media/MediaHttpDownloader.java | 2 +- .../googleapis/media/MediaHttpDownloaderProgressListener.java | 2 +- .../google/api/client/googleapis/media/MediaHttpUploader.java | 2 +- .../googleapis/media/MediaHttpUploaderProgressListener.java | 2 +- .../api/client/googleapis/media/MediaUploadErrorHandler.java | 2 +- .../com/google/api/client/googleapis/media/package-info.java | 2 +- .../client/googleapis/notifications/AbstractNotification.java | 2 +- .../api/client/googleapis/notifications/NotificationUtils.java | 2 +- .../api/client/googleapis/notifications/ResourceStates.java | 2 +- .../api/client/googleapis/notifications/StoredChannel.java | 2 +- .../api/client/googleapis/notifications/TypedNotification.java | 2 +- .../googleapis/notifications/TypedNotificationCallback.java | 2 +- .../client/googleapis/notifications/UnparsedNotification.java | 2 +- .../googleapis/notifications/UnparsedNotificationCallback.java | 2 +- .../googleapis/notifications/json/JsonNotificationCallback.java | 2 +- .../api/client/googleapis/notifications/json/package-info.java | 2 +- .../api/client/googleapis/notifications/package-info.java | 2 +- .../java/com/google/api/client/googleapis/package-info.java | 2 +- .../googleapis/services/json/AbstractGoogleJsonClient.java | 2 +- .../services/json/AbstractGoogleJsonClientRequest.java | 2 +- .../services/json/CommonGoogleJsonClientRequestInitializer.java | 2 +- .../api/client/googleapis/services/json/package-info.java | 2 +- .../com/google/api/client/googleapis/services/package-info.java | 2 +- .../com/google/api/client/googleapis/testing/TestUtils.java | 2 +- .../testing/auth/oauth2/MockTokenServerTransport.java | 2 +- .../api/client/googleapis/testing/auth/oauth2/package-info.java | 2 +- .../googleapis/testing/compute/MockMetadataServerTransport.java | 2 +- .../api/client/googleapis/testing/compute/package-info.java | 2 +- .../testing/json/GoogleJsonResponseExceptionFactoryTesting.java | 2 +- .../google/api/client/googleapis/testing/json/package-info.java | 2 +- .../testing/notifications/MockUnparsedNotificationCallback.java | 2 +- .../client/googleapis/testing/notifications/package-info.java | 2 +- .../com/google/api/client/googleapis/testing/package-info.java | 2 +- .../main/java/com/google/api/client/googleapis/util/Utils.java | 2 +- .../com/google/api/client/googleapis/util/package-info.java | 2 +- .../java/com/google/api/client/googleapis/GoogleUtilsTest.java | 2 +- .../com/google/api/client/googleapis/MethodOverrideTest.java | 2 +- .../googleapis/auth/oauth2/DefaultCredentialProviderTest.java | 2 +- .../googleapis/auth/oauth2/GoogleAuthorizationCodeFlowTest.java | 2 +- .../auth/oauth2/GoogleAuthorizationCodeRequestUrlTest.java | 2 +- .../auth/oauth2/GoogleAuthorizationCodeTokenRequestTest.java | 2 +- .../auth/oauth2/GoogleBrowserClientRequestUrlTest.java | 2 +- .../client/googleapis/auth/oauth2/GoogleClientSecretsTest.java | 2 +- .../api/client/googleapis/auth/oauth2/GoogleCredentialTest.java | 2 +- .../api/client/googleapis/auth/oauth2/GoogleIdTokenTest.java | 2 +- .../googleapis/auth/oauth2/GoogleIdTokenVerifierTest.java | 2 +- .../googleapis/auth/oauth2/GooglePublicKeysManagerTest.java | 2 +- .../api/client/googleapis/compute/ComputeCredentialTest.java | 2 +- .../client/googleapis/json/GoogleJsonErrorContainerTest.java | 2 +- .../google/api/client/googleapis/json/GoogleJsonErrorTest.java | 2 +- .../client/googleapis/json/GoogleJsonResponseExceptionTest.java | 2 +- .../api/client/googleapis/media/MediaHttpDownloaderTest.java | 2 +- .../api/client/googleapis/media/MediaHttpUploaderTest.java | 2 +- .../json/GoogleJsonResponseExceptionFactoryTestingTest.java | 2 +- .../java/com/google/api/client/googleapis/util/UtilsTest.java | 2 +- 126 files changed, 126 insertions(+), 126 deletions(-) diff --git a/google-api-client-android/src/main/java/com/google/api/client/googleapis/extensions/android/accounts/GoogleAccountManager.java b/google-api-client-android/src/main/java/com/google/api/client/googleapis/extensions/android/accounts/GoogleAccountManager.java index 04275f996..beacb23e0 100644 --- a/google-api-client-android/src/main/java/com/google/api/client/googleapis/extensions/android/accounts/GoogleAccountManager.java +++ b/google-api-client-android/src/main/java/com/google/api/client/googleapis/extensions/android/accounts/GoogleAccountManager.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012 Google Inc. + * Copyright 2012 Google Inc. * * 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 diff --git a/google-api-client-android/src/main/java/com/google/api/client/googleapis/extensions/android/accounts/package-info.java b/google-api-client-android/src/main/java/com/google/api/client/googleapis/extensions/android/accounts/package-info.java index 71655b40c..15b986c69 100644 --- a/google-api-client-android/src/main/java/com/google/api/client/googleapis/extensions/android/accounts/package-info.java +++ b/google-api-client-android/src/main/java/com/google/api/client/googleapis/extensions/android/accounts/package-info.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012 Google Inc. + * Copyright 2012 Google Inc. * * 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 diff --git a/google-api-client-appengine/src/main/java/com/google/api/client/googleapis/extensions/appengine/auth/oauth2/AppIdentityCredential.java b/google-api-client-appengine/src/main/java/com/google/api/client/googleapis/extensions/appengine/auth/oauth2/AppIdentityCredential.java index d52846ff9..20674ca8f 100644 --- a/google-api-client-appengine/src/main/java/com/google/api/client/googleapis/extensions/appengine/auth/oauth2/AppIdentityCredential.java +++ b/google-api-client-appengine/src/main/java/com/google/api/client/googleapis/extensions/appengine/auth/oauth2/AppIdentityCredential.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012 Google Inc. + * Copyright 2012 Google Inc. * * 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 diff --git a/google-api-client-appengine/src/main/java/com/google/api/client/googleapis/extensions/appengine/auth/oauth2/package-info.java b/google-api-client-appengine/src/main/java/com/google/api/client/googleapis/extensions/appengine/auth/oauth2/package-info.java index d63ca8d29..8a1ae2e61 100644 --- a/google-api-client-appengine/src/main/java/com/google/api/client/googleapis/extensions/appengine/auth/oauth2/package-info.java +++ b/google-api-client-appengine/src/main/java/com/google/api/client/googleapis/extensions/appengine/auth/oauth2/package-info.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012 Google Inc. + * Copyright 2012 Google Inc. * * 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 diff --git a/google-api-client-appengine/src/main/java/com/google/api/client/googleapis/extensions/appengine/notifications/AppEngineNotificationServlet.java b/google-api-client-appengine/src/main/java/com/google/api/client/googleapis/extensions/appengine/notifications/AppEngineNotificationServlet.java index 68e0da6f8..a27c01188 100644 --- a/google-api-client-appengine/src/main/java/com/google/api/client/googleapis/extensions/appengine/notifications/AppEngineNotificationServlet.java +++ b/google-api-client-appengine/src/main/java/com/google/api/client/googleapis/extensions/appengine/notifications/AppEngineNotificationServlet.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Google Inc. + * Copyright 2013 Google Inc. * * 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 diff --git a/google-api-client-appengine/src/main/java/com/google/api/client/googleapis/extensions/appengine/notifications/package-info.java b/google-api-client-appengine/src/main/java/com/google/api/client/googleapis/extensions/appengine/notifications/package-info.java index bc0e761ea..0fabd69dd 100644 --- a/google-api-client-appengine/src/main/java/com/google/api/client/googleapis/extensions/appengine/notifications/package-info.java +++ b/google-api-client-appengine/src/main/java/com/google/api/client/googleapis/extensions/appengine/notifications/package-info.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Google Inc. + * Copyright 2013 Google Inc. * * 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 diff --git a/google-api-client-appengine/src/main/java/com/google/api/client/googleapis/extensions/appengine/testing/auth/oauth2/MockAppIdentityService.java b/google-api-client-appengine/src/main/java/com/google/api/client/googleapis/extensions/appengine/testing/auth/oauth2/MockAppIdentityService.java index bfb3001fc..aea7cc04a 100644 --- a/google-api-client-appengine/src/main/java/com/google/api/client/googleapis/extensions/appengine/testing/auth/oauth2/MockAppIdentityService.java +++ b/google-api-client-appengine/src/main/java/com/google/api/client/googleapis/extensions/appengine/testing/auth/oauth2/MockAppIdentityService.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014 Google Inc. + * Copyright 2014 Google Inc. * * 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 diff --git a/google-api-client-appengine/src/main/java/com/google/api/client/googleapis/extensions/appengine/testing/auth/oauth2/package-info.java b/google-api-client-appengine/src/main/java/com/google/api/client/googleapis/extensions/appengine/testing/auth/oauth2/package-info.java index 5b79c380b..b06e3d8cf 100644 --- a/google-api-client-appengine/src/main/java/com/google/api/client/googleapis/extensions/appengine/testing/auth/oauth2/package-info.java +++ b/google-api-client-appengine/src/main/java/com/google/api/client/googleapis/extensions/appengine/testing/auth/oauth2/package-info.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014 Google Inc. + * Copyright 2014 Google Inc. * * 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 diff --git a/google-api-client-appengine/src/test/java/com/google/api/client/googleapis/extensions/appengine/auth/oauth2/AppIdentityCredentialTest.java b/google-api-client-appengine/src/test/java/com/google/api/client/googleapis/extensions/appengine/auth/oauth2/AppIdentityCredentialTest.java index e740ae354..7d90fafe7 100644 --- a/google-api-client-appengine/src/test/java/com/google/api/client/googleapis/extensions/appengine/auth/oauth2/AppIdentityCredentialTest.java +++ b/google-api-client-appengine/src/test/java/com/google/api/client/googleapis/extensions/appengine/auth/oauth2/AppIdentityCredentialTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Google Inc. + * Copyright 2013 Google Inc. * * 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 diff --git a/google-api-client-assembly/dependencies/BSD-LICENSE.txt b/google-api-client-assembly/dependencies/BSD-LICENSE.txt index 5ebe92c58..9473fba56 100644 --- a/google-api-client-assembly/dependencies/BSD-LICENSE.txt +++ b/google-api-client-assembly/dependencies/BSD-LICENSE.txt @@ -1,6 +1,6 @@ BSD License -Copyright (c) 2000-2006, www.hamcrest.org +Copyright 2000-2006, www.hamcrest.org All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/google-api-client-assembly/dependencies/xpp3_LICENSE.txt b/google-api-client-assembly/dependencies/xpp3_LICENSE.txt index d84c14b3d..4d7310cd7 100644 --- a/google-api-client-assembly/dependencies/xpp3_LICENSE.txt +++ b/google-api-client-assembly/dependencies/xpp3_LICENSE.txt @@ -2,7 +2,7 @@ Indiana University Extreme! Lab Software License Version 1.1.1 -Copyright (c) 2002 Extreme! Lab, Indiana University. All rights reserved. +Copyright 2002 Extreme! Lab, Indiana University. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions diff --git a/google-api-client-gson/src/main/java/com/google/api/client/googleapis/notifications/json/gson/GsonNotificationCallback.java b/google-api-client-gson/src/main/java/com/google/api/client/googleapis/notifications/json/gson/GsonNotificationCallback.java index 7df0ed25b..76141b1f2 100644 --- a/google-api-client-gson/src/main/java/com/google/api/client/googleapis/notifications/json/gson/GsonNotificationCallback.java +++ b/google-api-client-gson/src/main/java/com/google/api/client/googleapis/notifications/json/gson/GsonNotificationCallback.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Google Inc. + * Copyright 2013 Google Inc. * * 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 diff --git a/google-api-client-gson/src/main/java/com/google/api/client/googleapis/notifications/json/gson/package-info.java b/google-api-client-gson/src/main/java/com/google/api/client/googleapis/notifications/json/gson/package-info.java index 7587ca56b..e5ce05735 100644 --- a/google-api-client-gson/src/main/java/com/google/api/client/googleapis/notifications/json/gson/package-info.java +++ b/google-api-client-gson/src/main/java/com/google/api/client/googleapis/notifications/json/gson/package-info.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Google Inc. + * Copyright 2013 Google Inc. * * 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 diff --git a/google-api-client-jackson2/src/main/java/com/google/api/client/googleapis/notifications/json/jackson2/JacksonNotificationCallback.java b/google-api-client-jackson2/src/main/java/com/google/api/client/googleapis/notifications/json/jackson2/JacksonNotificationCallback.java index 564df173a..7c0065e3b 100644 --- a/google-api-client-jackson2/src/main/java/com/google/api/client/googleapis/notifications/json/jackson2/JacksonNotificationCallback.java +++ b/google-api-client-jackson2/src/main/java/com/google/api/client/googleapis/notifications/json/jackson2/JacksonNotificationCallback.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Google Inc. + * Copyright 2013 Google Inc. * * 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 diff --git a/google-api-client-jackson2/src/main/java/com/google/api/client/googleapis/notifications/json/jackson2/package-info.java b/google-api-client-jackson2/src/main/java/com/google/api/client/googleapis/notifications/json/jackson2/package-info.java index 866f26b93..1de759dbf 100644 --- a/google-api-client-jackson2/src/main/java/com/google/api/client/googleapis/notifications/json/jackson2/package-info.java +++ b/google-api-client-jackson2/src/main/java/com/google/api/client/googleapis/notifications/json/jackson2/package-info.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Google Inc. + * Copyright 2013 Google Inc. * * 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 diff --git a/google-api-client-java6/src/main/java/com/google/api/client/googleapis/extensions/java6/auth/oauth2/GooglePromptReceiver.java b/google-api-client-java6/src/main/java/com/google/api/client/googleapis/extensions/java6/auth/oauth2/GooglePromptReceiver.java index b21785ada..bd14a2905 100644 --- a/google-api-client-java6/src/main/java/com/google/api/client/googleapis/extensions/java6/auth/oauth2/GooglePromptReceiver.java +++ b/google-api-client-java6/src/main/java/com/google/api/client/googleapis/extensions/java6/auth/oauth2/GooglePromptReceiver.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012 Google Inc. + * Copyright 2012 Google Inc. * * 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 diff --git a/google-api-client-java6/src/main/java/com/google/api/client/googleapis/extensions/java6/auth/oauth2/package-info.java b/google-api-client-java6/src/main/java/com/google/api/client/googleapis/extensions/java6/auth/oauth2/package-info.java index 8a57bb907..3990bd6af 100644 --- a/google-api-client-java6/src/main/java/com/google/api/client/googleapis/extensions/java6/auth/oauth2/package-info.java +++ b/google-api-client-java6/src/main/java/com/google/api/client/googleapis/extensions/java6/auth/oauth2/package-info.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012 Google Inc. + * Copyright 2012 Google Inc. * * 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 diff --git a/google-api-client-protobuf/src/main/java/com/google/api/client/googleapis/services/protobuf/AbstractGoogleProtoClient.java b/google-api-client-protobuf/src/main/java/com/google/api/client/googleapis/services/protobuf/AbstractGoogleProtoClient.java index 04fc6c074..e252cfbe3 100644 --- a/google-api-client-protobuf/src/main/java/com/google/api/client/googleapis/services/protobuf/AbstractGoogleProtoClient.java +++ b/google-api-client-protobuf/src/main/java/com/google/api/client/googleapis/services/protobuf/AbstractGoogleProtoClient.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Google Inc. + * Copyright 2013 Google Inc. * * 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 diff --git a/google-api-client-protobuf/src/main/java/com/google/api/client/googleapis/services/protobuf/AbstractGoogleProtoClientRequest.java b/google-api-client-protobuf/src/main/java/com/google/api/client/googleapis/services/protobuf/AbstractGoogleProtoClientRequest.java index 943457d91..ad532be4b 100644 --- a/google-api-client-protobuf/src/main/java/com/google/api/client/googleapis/services/protobuf/AbstractGoogleProtoClientRequest.java +++ b/google-api-client-protobuf/src/main/java/com/google/api/client/googleapis/services/protobuf/AbstractGoogleProtoClientRequest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Google Inc. + * Copyright 2013 Google Inc. * * 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 diff --git a/google-api-client-protobuf/src/main/java/com/google/api/client/googleapis/services/protobuf/CommonGoogleProtoClientRequestInitializer.java b/google-api-client-protobuf/src/main/java/com/google/api/client/googleapis/services/protobuf/CommonGoogleProtoClientRequestInitializer.java index d8a18ccb9..0e6c71eaa 100644 --- a/google-api-client-protobuf/src/main/java/com/google/api/client/googleapis/services/protobuf/CommonGoogleProtoClientRequestInitializer.java +++ b/google-api-client-protobuf/src/main/java/com/google/api/client/googleapis/services/protobuf/CommonGoogleProtoClientRequestInitializer.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Google Inc. + * Copyright 2013 Google Inc. * * 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 diff --git a/google-api-client-protobuf/src/main/java/com/google/api/client/googleapis/services/protobuf/package-info.java b/google-api-client-protobuf/src/main/java/com/google/api/client/googleapis/services/protobuf/package-info.java index 2ee462c90..7d9a6e761 100644 --- a/google-api-client-protobuf/src/main/java/com/google/api/client/googleapis/services/protobuf/package-info.java +++ b/google-api-client-protobuf/src/main/java/com/google/api/client/googleapis/services/protobuf/package-info.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Google Inc. + * Copyright 2013 Google Inc. * * 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 diff --git a/google-api-client-protobuf/src/main/java/com/google/api/client/googleapis/testing/services/protobuf/MockGoogleProtoClient.java b/google-api-client-protobuf/src/main/java/com/google/api/client/googleapis/testing/services/protobuf/MockGoogleProtoClient.java index a1c636285..0fdb4a90c 100644 --- a/google-api-client-protobuf/src/main/java/com/google/api/client/googleapis/testing/services/protobuf/MockGoogleProtoClient.java +++ b/google-api-client-protobuf/src/main/java/com/google/api/client/googleapis/testing/services/protobuf/MockGoogleProtoClient.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Google Inc. + * Copyright 2013 Google Inc. * * 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 diff --git a/google-api-client-protobuf/src/main/java/com/google/api/client/googleapis/testing/services/protobuf/MockGoogleProtoClientRequest.java b/google-api-client-protobuf/src/main/java/com/google/api/client/googleapis/testing/services/protobuf/MockGoogleProtoClientRequest.java index fe89918a2..90207dc8b 100644 --- a/google-api-client-protobuf/src/main/java/com/google/api/client/googleapis/testing/services/protobuf/MockGoogleProtoClientRequest.java +++ b/google-api-client-protobuf/src/main/java/com/google/api/client/googleapis/testing/services/protobuf/MockGoogleProtoClientRequest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Google Inc. + * Copyright 2013 Google Inc. * * 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 diff --git a/google-api-client-protobuf/src/main/java/com/google/api/client/googleapis/testing/services/protobuf/package-info.java b/google-api-client-protobuf/src/main/java/com/google/api/client/googleapis/testing/services/protobuf/package-info.java index 619fe2139..07948310a 100644 --- a/google-api-client-protobuf/src/main/java/com/google/api/client/googleapis/testing/services/protobuf/package-info.java +++ b/google-api-client-protobuf/src/main/java/com/google/api/client/googleapis/testing/services/protobuf/package-info.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Google Inc. + * Copyright 2013 Google Inc. * * 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 diff --git a/google-api-client-protobuf/src/test/java/com/google/api/client/googleapis/services/protobuf/CommonGoogleProtoClientRequestInitializerTest.java b/google-api-client-protobuf/src/test/java/com/google/api/client/googleapis/services/protobuf/CommonGoogleProtoClientRequestInitializerTest.java index 48364377e..06d1909d0 100644 --- a/google-api-client-protobuf/src/test/java/com/google/api/client/googleapis/services/protobuf/CommonGoogleProtoClientRequestInitializerTest.java +++ b/google-api-client-protobuf/src/test/java/com/google/api/client/googleapis/services/protobuf/CommonGoogleProtoClientRequestInitializerTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Google Inc. + * Copyright 2013 Google Inc. * * 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 diff --git a/google-api-client-protobuf/src/test/proto/simple_proto.proto b/google-api-client-protobuf/src/test/proto/simple_proto.proto index aa4ca98ca..e98120fdd 100644 --- a/google-api-client-protobuf/src/test/proto/simple_proto.proto +++ b/google-api-client-protobuf/src/test/proto/simple_proto.proto @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Google Inc. + * Copyright 2013 Google Inc. * * 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 diff --git a/google-api-client-servlet/src/main/java/com/google/api/client/googleapis/extensions/servlet/notifications/NotificationServlet.java b/google-api-client-servlet/src/main/java/com/google/api/client/googleapis/extensions/servlet/notifications/NotificationServlet.java index 85645d772..c27dff1ce 100644 --- a/google-api-client-servlet/src/main/java/com/google/api/client/googleapis/extensions/servlet/notifications/NotificationServlet.java +++ b/google-api-client-servlet/src/main/java/com/google/api/client/googleapis/extensions/servlet/notifications/NotificationServlet.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Google Inc. + * Copyright 2013 Google Inc. * * 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 diff --git a/google-api-client-servlet/src/main/java/com/google/api/client/googleapis/extensions/servlet/notifications/WebhookHeaders.java b/google-api-client-servlet/src/main/java/com/google/api/client/googleapis/extensions/servlet/notifications/WebhookHeaders.java index 66310ac81..ebe36c40e 100644 --- a/google-api-client-servlet/src/main/java/com/google/api/client/googleapis/extensions/servlet/notifications/WebhookHeaders.java +++ b/google-api-client-servlet/src/main/java/com/google/api/client/googleapis/extensions/servlet/notifications/WebhookHeaders.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Google Inc. + * Copyright 2013 Google Inc. * * 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 diff --git a/google-api-client-servlet/src/main/java/com/google/api/client/googleapis/extensions/servlet/notifications/WebhookUtils.java b/google-api-client-servlet/src/main/java/com/google/api/client/googleapis/extensions/servlet/notifications/WebhookUtils.java index 33f25987c..a6f6d7529 100644 --- a/google-api-client-servlet/src/main/java/com/google/api/client/googleapis/extensions/servlet/notifications/WebhookUtils.java +++ b/google-api-client-servlet/src/main/java/com/google/api/client/googleapis/extensions/servlet/notifications/WebhookUtils.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Google Inc. + * Copyright 2013 Google Inc. * * 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 diff --git a/google-api-client-servlet/src/main/java/com/google/api/client/googleapis/extensions/servlet/notifications/package-info.java b/google-api-client-servlet/src/main/java/com/google/api/client/googleapis/extensions/servlet/notifications/package-info.java index b67c30c94..a9314056f 100644 --- a/google-api-client-servlet/src/main/java/com/google/api/client/googleapis/extensions/servlet/notifications/package-info.java +++ b/google-api-client-servlet/src/main/java/com/google/api/client/googleapis/extensions/servlet/notifications/package-info.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Google Inc. + * Copyright 2013 Google Inc. * * 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 diff --git a/google-api-client-xml/src/main/java/com/google/api/client/googleapis/xml/atom/AtomPatchContent.java b/google-api-client-xml/src/main/java/com/google/api/client/googleapis/xml/atom/AtomPatchContent.java index 6755d3fb9..9b2f38d2d 100644 --- a/google-api-client-xml/src/main/java/com/google/api/client/googleapis/xml/atom/AtomPatchContent.java +++ b/google-api-client-xml/src/main/java/com/google/api/client/googleapis/xml/atom/AtomPatchContent.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010 Google Inc. + * Copyright 2010 Google Inc. * * 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 diff --git a/google-api-client-xml/src/main/java/com/google/api/client/googleapis/xml/atom/AtomPatchRelativeToOriginalContent.java b/google-api-client-xml/src/main/java/com/google/api/client/googleapis/xml/atom/AtomPatchRelativeToOriginalContent.java index ce679e290..b6004ab6b 100644 --- a/google-api-client-xml/src/main/java/com/google/api/client/googleapis/xml/atom/AtomPatchRelativeToOriginalContent.java +++ b/google-api-client-xml/src/main/java/com/google/api/client/googleapis/xml/atom/AtomPatchRelativeToOriginalContent.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010 Google Inc. + * Copyright 2010 Google Inc. * * 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 diff --git a/google-api-client-xml/src/main/java/com/google/api/client/googleapis/xml/atom/GoogleAtom.java b/google-api-client-xml/src/main/java/com/google/api/client/googleapis/xml/atom/GoogleAtom.java index e3d435ad3..f9a49bf2b 100644 --- a/google-api-client-xml/src/main/java/com/google/api/client/googleapis/xml/atom/GoogleAtom.java +++ b/google-api-client-xml/src/main/java/com/google/api/client/googleapis/xml/atom/GoogleAtom.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010 Google Inc. + * Copyright 2010 Google Inc. * * 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 diff --git a/google-api-client-xml/src/main/java/com/google/api/client/googleapis/xml/atom/MultiKindFeedParser.java b/google-api-client-xml/src/main/java/com/google/api/client/googleapis/xml/atom/MultiKindFeedParser.java index 95ad51da9..f2b9ca62a 100644 --- a/google-api-client-xml/src/main/java/com/google/api/client/googleapis/xml/atom/MultiKindFeedParser.java +++ b/google-api-client-xml/src/main/java/com/google/api/client/googleapis/xml/atom/MultiKindFeedParser.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010 Google Inc. + * Copyright 2010 Google Inc. * * 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 diff --git a/google-api-client-xml/src/main/java/com/google/api/client/googleapis/xml/atom/package-info.java b/google-api-client-xml/src/main/java/com/google/api/client/googleapis/xml/atom/package-info.java index 2690aa398..6bf6460e0 100644 --- a/google-api-client-xml/src/main/java/com/google/api/client/googleapis/xml/atom/package-info.java +++ b/google-api-client-xml/src/main/java/com/google/api/client/googleapis/xml/atom/package-info.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010 Google Inc. + * Copyright 2010 Google Inc. * * 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 diff --git a/google-api-client-xml/src/test/java/com/google/api/client/googleapis/xml/atom/GoogleAtomTest.java b/google-api-client-xml/src/test/java/com/google/api/client/googleapis/xml/atom/GoogleAtomTest.java index a4aa90b3f..6c1c309f6 100644 --- a/google-api-client-xml/src/test/java/com/google/api/client/googleapis/xml/atom/GoogleAtomTest.java +++ b/google-api-client-xml/src/test/java/com/google/api/client/googleapis/xml/atom/GoogleAtomTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010 Google Inc. + * Copyright 2010 Google Inc. * * 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 diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/GoogleUtils.java b/google-api-client/src/main/java/com/google/api/client/googleapis/GoogleUtils.java index c11fbfcd5..85a6a7bd7 100644 --- a/google-api-client/src/main/java/com/google/api/client/googleapis/GoogleUtils.java +++ b/google-api-client/src/main/java/com/google/api/client/googleapis/GoogleUtils.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Google Inc. + * Copyright 2013 Google Inc. * * 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 diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/MethodOverride.java b/google-api-client/src/main/java/com/google/api/client/googleapis/MethodOverride.java index c13093930..24aa5015d 100644 --- a/google-api-client/src/main/java/com/google/api/client/googleapis/MethodOverride.java +++ b/google-api-client/src/main/java/com/google/api/client/googleapis/MethodOverride.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010 Google Inc. + * Copyright 2010 Google Inc. * * 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 diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/apache/GoogleApacheHttpTransport.java b/google-api-client/src/main/java/com/google/api/client/googleapis/apache/GoogleApacheHttpTransport.java index fbb3e64a2..b1c4163ee 100644 --- a/google-api-client/src/main/java/com/google/api/client/googleapis/apache/GoogleApacheHttpTransport.java +++ b/google-api-client/src/main/java/com/google/api/client/googleapis/apache/GoogleApacheHttpTransport.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Google Inc. + * Copyright 2013 Google Inc. * * 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 diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/apache/package-info.java b/google-api-client/src/main/java/com/google/api/client/googleapis/apache/package-info.java index 5bc406834..7c03ab082 100644 --- a/google-api-client/src/main/java/com/google/api/client/googleapis/apache/package-info.java +++ b/google-api-client/src/main/java/com/google/api/client/googleapis/apache/package-info.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Google Inc. + * Copyright 2013 Google Inc. * * 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 diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/DefaultCredentialProvider.java b/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/DefaultCredentialProvider.java index 47caa74ec..b051c2d85 100644 --- a/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/DefaultCredentialProvider.java +++ b/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/DefaultCredentialProvider.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014 Google Inc. + * Copyright 2014 Google Inc. * * 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 diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleAuthorizationCodeFlow.java b/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleAuthorizationCodeFlow.java index 3ce4cb702..8ef8e6465 100644 --- a/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleAuthorizationCodeFlow.java +++ b/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleAuthorizationCodeFlow.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012 Google Inc. + * Copyright 2012 Google Inc. * * 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 diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleAuthorizationCodeRequestUrl.java b/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleAuthorizationCodeRequestUrl.java index 386c3d7da..21d31efd5 100644 --- a/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleAuthorizationCodeRequestUrl.java +++ b/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleAuthorizationCodeRequestUrl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011 Google Inc. + * Copyright 2011 Google Inc. * * 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 diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleAuthorizationCodeTokenRequest.java b/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleAuthorizationCodeTokenRequest.java index b3d7d77ac..42196820d 100644 --- a/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleAuthorizationCodeTokenRequest.java +++ b/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleAuthorizationCodeTokenRequest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011 Google Inc. + * Copyright 2011 Google Inc. * * 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 diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleBrowserClientRequestUrl.java b/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleBrowserClientRequestUrl.java index a7da93a9c..404ac5d2d 100644 --- a/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleBrowserClientRequestUrl.java +++ b/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleBrowserClientRequestUrl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011 Google Inc. + * Copyright 2011 Google Inc. * * 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 diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleClientSecrets.java b/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleClientSecrets.java index 894cb9ca3..f27e6e560 100644 --- a/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleClientSecrets.java +++ b/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleClientSecrets.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011 Google Inc. + * Copyright 2011 Google Inc. * * 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 diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleCredential.java b/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleCredential.java index c80f50ec3..a92749bca 100644 --- a/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleCredential.java +++ b/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleCredential.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011 Google Inc. + * Copyright 2011 Google Inc. * * 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 diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleIdToken.java b/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleIdToken.java index 66ffe1155..7d666896e 100644 --- a/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleIdToken.java +++ b/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleIdToken.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012 Google Inc. + * Copyright 2012 Google Inc. * * 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 diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleIdTokenVerifier.java b/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleIdTokenVerifier.java index bd0fb8cb1..1cf196b73 100644 --- a/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleIdTokenVerifier.java +++ b/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleIdTokenVerifier.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012 Google Inc. + * Copyright 2012 Google Inc. * * 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 diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleOAuthConstants.java b/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleOAuthConstants.java index 7f4e1e1f2..ff1ef82fb 100644 --- a/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleOAuthConstants.java +++ b/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleOAuthConstants.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011 Google Inc. + * Copyright 2011 Google Inc. * * 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 diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GooglePublicKeysManager.java b/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GooglePublicKeysManager.java index 144b4ba4c..319912311 100644 --- a/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GooglePublicKeysManager.java +++ b/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GooglePublicKeysManager.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Google Inc. + * Copyright 2013 Google Inc. * * 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 diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleRefreshTokenRequest.java b/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleRefreshTokenRequest.java index f71fd85c9..8f679a81f 100644 --- a/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleRefreshTokenRequest.java +++ b/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleRefreshTokenRequest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011 Google Inc. + * Copyright 2011 Google Inc. * * 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 diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleTokenResponse.java b/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleTokenResponse.java index acae998f6..09760d4f2 100644 --- a/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleTokenResponse.java +++ b/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleTokenResponse.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012 Google Inc. + * Copyright 2012 Google Inc. * * 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 diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/OAuth2Utils.java b/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/OAuth2Utils.java index 88be30470..ecf9f19ab 100644 --- a/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/OAuth2Utils.java +++ b/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/OAuth2Utils.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014 Google Inc. + * Copyright 2014 Google Inc. * * 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 diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/SystemEnvironmentProvider.java b/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/SystemEnvironmentProvider.java index 829f8e9b4..fd27421ca 100644 --- a/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/SystemEnvironmentProvider.java +++ b/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/SystemEnvironmentProvider.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015 Google Inc. + * Copyright 2015 Google Inc. * * 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 diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/package-info.java b/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/package-info.java index f92e5ab92..6cffb1d91 100644 --- a/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/package-info.java +++ b/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/package-info.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011 Google Inc. + * Copyright 2011 Google Inc. * * 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 diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/batch/BatchCallback.java b/google-api-client/src/main/java/com/google/api/client/googleapis/batch/BatchCallback.java index f7f31f700..aa63b4a24 100644 --- a/google-api-client/src/main/java/com/google/api/client/googleapis/batch/BatchCallback.java +++ b/google-api-client/src/main/java/com/google/api/client/googleapis/batch/BatchCallback.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012 Google Inc. + * Copyright 2012 Google Inc. * * 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 diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/batch/BatchRequest.java b/google-api-client/src/main/java/com/google/api/client/googleapis/batch/BatchRequest.java index 3958b64e2..8471af831 100644 --- a/google-api-client/src/main/java/com/google/api/client/googleapis/batch/BatchRequest.java +++ b/google-api-client/src/main/java/com/google/api/client/googleapis/batch/BatchRequest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012 Google Inc. + * Copyright 2012 Google Inc. * * 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 diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/batch/BatchUnparsedResponse.java b/google-api-client/src/main/java/com/google/api/client/googleapis/batch/BatchUnparsedResponse.java index 246d7ff26..aad711a1c 100644 --- a/google-api-client/src/main/java/com/google/api/client/googleapis/batch/BatchUnparsedResponse.java +++ b/google-api-client/src/main/java/com/google/api/client/googleapis/batch/BatchUnparsedResponse.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012 Google Inc. + * Copyright 2012 Google Inc. * * 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 diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/batch/HttpRequestContent.java b/google-api-client/src/main/java/com/google/api/client/googleapis/batch/HttpRequestContent.java index 56e05092e..f6b7da4c8 100644 --- a/google-api-client/src/main/java/com/google/api/client/googleapis/batch/HttpRequestContent.java +++ b/google-api-client/src/main/java/com/google/api/client/googleapis/batch/HttpRequestContent.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Google Inc. + * Copyright 2013 Google Inc. * * 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 diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/batch/json/JsonBatchCallback.java b/google-api-client/src/main/java/com/google/api/client/googleapis/batch/json/JsonBatchCallback.java index 65bea34f6..f259075d2 100644 --- a/google-api-client/src/main/java/com/google/api/client/googleapis/batch/json/JsonBatchCallback.java +++ b/google-api-client/src/main/java/com/google/api/client/googleapis/batch/json/JsonBatchCallback.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012 Google Inc. + * Copyright 2012 Google Inc. * * 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 diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/batch/json/package-info.java b/google-api-client/src/main/java/com/google/api/client/googleapis/batch/json/package-info.java index 33566b165..f088358d9 100644 --- a/google-api-client/src/main/java/com/google/api/client/googleapis/batch/json/package-info.java +++ b/google-api-client/src/main/java/com/google/api/client/googleapis/batch/json/package-info.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012 Google Inc. + * Copyright 2012 Google Inc. * * 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 diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/batch/package-info.java b/google-api-client/src/main/java/com/google/api/client/googleapis/batch/package-info.java index 51f4087da..9b5fc8e35 100644 --- a/google-api-client/src/main/java/com/google/api/client/googleapis/batch/package-info.java +++ b/google-api-client/src/main/java/com/google/api/client/googleapis/batch/package-info.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012 Google Inc. + * Copyright 2012 Google Inc. * * 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 diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/compute/ComputeCredential.java b/google-api-client/src/main/java/com/google/api/client/googleapis/compute/ComputeCredential.java index af888d8f6..972eec290 100644 --- a/google-api-client/src/main/java/com/google/api/client/googleapis/compute/ComputeCredential.java +++ b/google-api-client/src/main/java/com/google/api/client/googleapis/compute/ComputeCredential.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Google Inc. + * Copyright 2013 Google Inc. * * 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 diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/compute/package-info.java b/google-api-client/src/main/java/com/google/api/client/googleapis/compute/package-info.java index 7ba6dc9ce..4a6327c60 100644 --- a/google-api-client/src/main/java/com/google/api/client/googleapis/compute/package-info.java +++ b/google-api-client/src/main/java/com/google/api/client/googleapis/compute/package-info.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Google Inc. + * Copyright 2013 Google Inc. * * 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 diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/javanet/GoogleNetHttpTransport.java b/google-api-client/src/main/java/com/google/api/client/googleapis/javanet/GoogleNetHttpTransport.java index 9029ef11f..93e4f03d1 100644 --- a/google-api-client/src/main/java/com/google/api/client/googleapis/javanet/GoogleNetHttpTransport.java +++ b/google-api-client/src/main/java/com/google/api/client/googleapis/javanet/GoogleNetHttpTransport.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Google Inc. + * Copyright 2013 Google Inc. * * 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 diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/javanet/package-info.java b/google-api-client/src/main/java/com/google/api/client/googleapis/javanet/package-info.java index 10669c037..5b5f29d82 100644 --- a/google-api-client/src/main/java/com/google/api/client/googleapis/javanet/package-info.java +++ b/google-api-client/src/main/java/com/google/api/client/googleapis/javanet/package-info.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Google Inc. + * Copyright 2013 Google Inc. * * 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 diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/json/GoogleJsonError.java b/google-api-client/src/main/java/com/google/api/client/googleapis/json/GoogleJsonError.java index 18864c3e2..c77d77ee5 100644 --- a/google-api-client/src/main/java/com/google/api/client/googleapis/json/GoogleJsonError.java +++ b/google-api-client/src/main/java/com/google/api/client/googleapis/json/GoogleJsonError.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011 Google Inc. + * Copyright 2011 Google Inc. * * 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 diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/json/GoogleJsonErrorContainer.java b/google-api-client/src/main/java/com/google/api/client/googleapis/json/GoogleJsonErrorContainer.java index 547eb027f..29fb329d2 100644 --- a/google-api-client/src/main/java/com/google/api/client/googleapis/json/GoogleJsonErrorContainer.java +++ b/google-api-client/src/main/java/com/google/api/client/googleapis/json/GoogleJsonErrorContainer.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012 Google Inc. + * Copyright 2012 Google Inc. * * 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 diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/json/GoogleJsonResponseException.java b/google-api-client/src/main/java/com/google/api/client/googleapis/json/GoogleJsonResponseException.java index c5bd0dab2..bc7e4bcfe 100644 --- a/google-api-client/src/main/java/com/google/api/client/googleapis/json/GoogleJsonResponseException.java +++ b/google-api-client/src/main/java/com/google/api/client/googleapis/json/GoogleJsonResponseException.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011 Google Inc. + * Copyright 2011 Google Inc. * * 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 diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/json/package-info.java b/google-api-client/src/main/java/com/google/api/client/googleapis/json/package-info.java index 96469344e..b46506e4f 100644 --- a/google-api-client/src/main/java/com/google/api/client/googleapis/json/package-info.java +++ b/google-api-client/src/main/java/com/google/api/client/googleapis/json/package-info.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010 Google Inc. + * Copyright 2010 Google Inc. * * 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 diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/media/MediaHttpDownloader.java b/google-api-client/src/main/java/com/google/api/client/googleapis/media/MediaHttpDownloader.java index 38b408747..17d5eab13 100644 --- a/google-api-client/src/main/java/com/google/api/client/googleapis/media/MediaHttpDownloader.java +++ b/google-api-client/src/main/java/com/google/api/client/googleapis/media/MediaHttpDownloader.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012 Google Inc. + * Copyright 2012 Google Inc. * * 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 diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/media/MediaHttpDownloaderProgressListener.java b/google-api-client/src/main/java/com/google/api/client/googleapis/media/MediaHttpDownloaderProgressListener.java index 064b2def4..579ab7a1b 100644 --- a/google-api-client/src/main/java/com/google/api/client/googleapis/media/MediaHttpDownloaderProgressListener.java +++ b/google-api-client/src/main/java/com/google/api/client/googleapis/media/MediaHttpDownloaderProgressListener.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012 Google Inc. + * Copyright 2012 Google Inc. * * 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 diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/media/MediaHttpUploader.java b/google-api-client/src/main/java/com/google/api/client/googleapis/media/MediaHttpUploader.java index 5e54b6d74..5fe874557 100644 --- a/google-api-client/src/main/java/com/google/api/client/googleapis/media/MediaHttpUploader.java +++ b/google-api-client/src/main/java/com/google/api/client/googleapis/media/MediaHttpUploader.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011 Google Inc. + * Copyright 2011 Google Inc. * * 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 diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/media/MediaHttpUploaderProgressListener.java b/google-api-client/src/main/java/com/google/api/client/googleapis/media/MediaHttpUploaderProgressListener.java index 7f6c5f6d0..5254686c8 100644 --- a/google-api-client/src/main/java/com/google/api/client/googleapis/media/MediaHttpUploaderProgressListener.java +++ b/google-api-client/src/main/java/com/google/api/client/googleapis/media/MediaHttpUploaderProgressListener.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011 Google Inc. + * Copyright 2011 Google Inc. * * 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 diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/media/MediaUploadErrorHandler.java b/google-api-client/src/main/java/com/google/api/client/googleapis/media/MediaUploadErrorHandler.java index 3e0a65031..b06b3dd76 100644 --- a/google-api-client/src/main/java/com/google/api/client/googleapis/media/MediaUploadErrorHandler.java +++ b/google-api-client/src/main/java/com/google/api/client/googleapis/media/MediaUploadErrorHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Google Inc. + * Copyright 2013 Google Inc. * * 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 diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/media/package-info.java b/google-api-client/src/main/java/com/google/api/client/googleapis/media/package-info.java index 98dd9023e..2ba9076a8 100644 --- a/google-api-client/src/main/java/com/google/api/client/googleapis/media/package-info.java +++ b/google-api-client/src/main/java/com/google/api/client/googleapis/media/package-info.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010 Google Inc. + * Copyright 2010 Google Inc. * * 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 diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/notifications/AbstractNotification.java b/google-api-client/src/main/java/com/google/api/client/googleapis/notifications/AbstractNotification.java index f53e77cfc..a0b2367f8 100644 --- a/google-api-client/src/main/java/com/google/api/client/googleapis/notifications/AbstractNotification.java +++ b/google-api-client/src/main/java/com/google/api/client/googleapis/notifications/AbstractNotification.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Google Inc. + * Copyright 2013 Google Inc. * * 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 diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/notifications/NotificationUtils.java b/google-api-client/src/main/java/com/google/api/client/googleapis/notifications/NotificationUtils.java index c39cbab2e..bc92ef226 100644 --- a/google-api-client/src/main/java/com/google/api/client/googleapis/notifications/NotificationUtils.java +++ b/google-api-client/src/main/java/com/google/api/client/googleapis/notifications/NotificationUtils.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Google Inc. + * Copyright 2013 Google Inc. * * 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 diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/notifications/ResourceStates.java b/google-api-client/src/main/java/com/google/api/client/googleapis/notifications/ResourceStates.java index 5de4b2049..95555fa05 100644 --- a/google-api-client/src/main/java/com/google/api/client/googleapis/notifications/ResourceStates.java +++ b/google-api-client/src/main/java/com/google/api/client/googleapis/notifications/ResourceStates.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Google Inc. + * Copyright 2013 Google Inc. * * 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 diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/notifications/StoredChannel.java b/google-api-client/src/main/java/com/google/api/client/googleapis/notifications/StoredChannel.java index 36a52cc48..cecb2bcb4 100644 --- a/google-api-client/src/main/java/com/google/api/client/googleapis/notifications/StoredChannel.java +++ b/google-api-client/src/main/java/com/google/api/client/googleapis/notifications/StoredChannel.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Google Inc. + * Copyright 2013 Google Inc. * * 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 diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/notifications/TypedNotification.java b/google-api-client/src/main/java/com/google/api/client/googleapis/notifications/TypedNotification.java index e3da8d0b3..339ba47ec 100644 --- a/google-api-client/src/main/java/com/google/api/client/googleapis/notifications/TypedNotification.java +++ b/google-api-client/src/main/java/com/google/api/client/googleapis/notifications/TypedNotification.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Google Inc. + * Copyright 2013 Google Inc. * * 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 diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/notifications/TypedNotificationCallback.java b/google-api-client/src/main/java/com/google/api/client/googleapis/notifications/TypedNotificationCallback.java index 4c912d1be..7e6cf4903 100644 --- a/google-api-client/src/main/java/com/google/api/client/googleapis/notifications/TypedNotificationCallback.java +++ b/google-api-client/src/main/java/com/google/api/client/googleapis/notifications/TypedNotificationCallback.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Google Inc. + * Copyright 2013 Google Inc. * * 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 diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/notifications/UnparsedNotification.java b/google-api-client/src/main/java/com/google/api/client/googleapis/notifications/UnparsedNotification.java index e9b65951e..6b44d8ed0 100644 --- a/google-api-client/src/main/java/com/google/api/client/googleapis/notifications/UnparsedNotification.java +++ b/google-api-client/src/main/java/com/google/api/client/googleapis/notifications/UnparsedNotification.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Google Inc. + * Copyright 2013 Google Inc. * * 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 diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/notifications/UnparsedNotificationCallback.java b/google-api-client/src/main/java/com/google/api/client/googleapis/notifications/UnparsedNotificationCallback.java index 79fec239d..bdefa0543 100644 --- a/google-api-client/src/main/java/com/google/api/client/googleapis/notifications/UnparsedNotificationCallback.java +++ b/google-api-client/src/main/java/com/google/api/client/googleapis/notifications/UnparsedNotificationCallback.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Google Inc. + * Copyright 2013 Google Inc. * * 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 diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/notifications/json/JsonNotificationCallback.java b/google-api-client/src/main/java/com/google/api/client/googleapis/notifications/json/JsonNotificationCallback.java index b8e9e5bda..438e0148f 100644 --- a/google-api-client/src/main/java/com/google/api/client/googleapis/notifications/json/JsonNotificationCallback.java +++ b/google-api-client/src/main/java/com/google/api/client/googleapis/notifications/json/JsonNotificationCallback.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Google Inc. + * Copyright 2013 Google Inc. * * 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 diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/notifications/json/package-info.java b/google-api-client/src/main/java/com/google/api/client/googleapis/notifications/json/package-info.java index 4252b92e8..eb5ebb604 100644 --- a/google-api-client/src/main/java/com/google/api/client/googleapis/notifications/json/package-info.java +++ b/google-api-client/src/main/java/com/google/api/client/googleapis/notifications/json/package-info.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Google Inc. + * Copyright 2013 Google Inc. * * 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 diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/notifications/package-info.java b/google-api-client/src/main/java/com/google/api/client/googleapis/notifications/package-info.java index 20c069035..195d3e558 100644 --- a/google-api-client/src/main/java/com/google/api/client/googleapis/notifications/package-info.java +++ b/google-api-client/src/main/java/com/google/api/client/googleapis/notifications/package-info.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Google Inc. + * Copyright 2013 Google Inc. * * 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 diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/package-info.java b/google-api-client/src/main/java/com/google/api/client/googleapis/package-info.java index 6057d4811..3849acb42 100644 --- a/google-api-client/src/main/java/com/google/api/client/googleapis/package-info.java +++ b/google-api-client/src/main/java/com/google/api/client/googleapis/package-info.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010 Google Inc. + * Copyright 2010 Google Inc. * * 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 diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/services/json/AbstractGoogleJsonClient.java b/google-api-client/src/main/java/com/google/api/client/googleapis/services/json/AbstractGoogleJsonClient.java index 65faf653c..076a9f9b4 100644 --- a/google-api-client/src/main/java/com/google/api/client/googleapis/services/json/AbstractGoogleJsonClient.java +++ b/google-api-client/src/main/java/com/google/api/client/googleapis/services/json/AbstractGoogleJsonClient.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012 Google Inc. + * Copyright 2012 Google Inc. * * 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 diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/services/json/AbstractGoogleJsonClientRequest.java b/google-api-client/src/main/java/com/google/api/client/googleapis/services/json/AbstractGoogleJsonClientRequest.java index 6a2634546..e1af7c8d5 100644 --- a/google-api-client/src/main/java/com/google/api/client/googleapis/services/json/AbstractGoogleJsonClientRequest.java +++ b/google-api-client/src/main/java/com/google/api/client/googleapis/services/json/AbstractGoogleJsonClientRequest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012 Google Inc. + * Copyright 2012 Google Inc. * * 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 diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/services/json/CommonGoogleJsonClientRequestInitializer.java b/google-api-client/src/main/java/com/google/api/client/googleapis/services/json/CommonGoogleJsonClientRequestInitializer.java index 45784c316..162947b8a 100644 --- a/google-api-client/src/main/java/com/google/api/client/googleapis/services/json/CommonGoogleJsonClientRequestInitializer.java +++ b/google-api-client/src/main/java/com/google/api/client/googleapis/services/json/CommonGoogleJsonClientRequestInitializer.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012 Google Inc. + * Copyright 2012 Google Inc. * * 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 diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/services/json/package-info.java b/google-api-client/src/main/java/com/google/api/client/googleapis/services/json/package-info.java index 14cbf0f61..963372b12 100644 --- a/google-api-client/src/main/java/com/google/api/client/googleapis/services/json/package-info.java +++ b/google-api-client/src/main/java/com/google/api/client/googleapis/services/json/package-info.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012 Google Inc. + * Copyright 2012 Google Inc. * * 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 diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/services/package-info.java b/google-api-client/src/main/java/com/google/api/client/googleapis/services/package-info.java index f35dce213..181687b2c 100644 --- a/google-api-client/src/main/java/com/google/api/client/googleapis/services/package-info.java +++ b/google-api-client/src/main/java/com/google/api/client/googleapis/services/package-info.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010 Google Inc. + * Copyright 2010 Google Inc. * * 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 diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/testing/TestUtils.java b/google-api-client/src/main/java/com/google/api/client/googleapis/testing/TestUtils.java index 4eb84292d..754e55c4c 100644 --- a/google-api-client/src/main/java/com/google/api/client/googleapis/testing/TestUtils.java +++ b/google-api-client/src/main/java/com/google/api/client/googleapis/testing/TestUtils.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014 Google Inc. + * Copyright 2014 Google Inc. * * 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 diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/testing/auth/oauth2/MockTokenServerTransport.java b/google-api-client/src/main/java/com/google/api/client/googleapis/testing/auth/oauth2/MockTokenServerTransport.java index b63eef47f..0dc4710cd 100644 --- a/google-api-client/src/main/java/com/google/api/client/googleapis/testing/auth/oauth2/MockTokenServerTransport.java +++ b/google-api-client/src/main/java/com/google/api/client/googleapis/testing/auth/oauth2/MockTokenServerTransport.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014 Google Inc. + * Copyright 2014 Google Inc. * * 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 diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/testing/auth/oauth2/package-info.java b/google-api-client/src/main/java/com/google/api/client/googleapis/testing/auth/oauth2/package-info.java index ee154a4de..f57cb3817 100644 --- a/google-api-client/src/main/java/com/google/api/client/googleapis/testing/auth/oauth2/package-info.java +++ b/google-api-client/src/main/java/com/google/api/client/googleapis/testing/auth/oauth2/package-info.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014 Google Inc. + * Copyright 2014 Google Inc. * * 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 diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/testing/compute/MockMetadataServerTransport.java b/google-api-client/src/main/java/com/google/api/client/googleapis/testing/compute/MockMetadataServerTransport.java index da055afae..2194da1eb 100644 --- a/google-api-client/src/main/java/com/google/api/client/googleapis/testing/compute/MockMetadataServerTransport.java +++ b/google-api-client/src/main/java/com/google/api/client/googleapis/testing/compute/MockMetadataServerTransport.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014 Google Inc. + * Copyright 2014 Google Inc. * * 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 diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/testing/compute/package-info.java b/google-api-client/src/main/java/com/google/api/client/googleapis/testing/compute/package-info.java index 1ce05ee8c..8d673729a 100644 --- a/google-api-client/src/main/java/com/google/api/client/googleapis/testing/compute/package-info.java +++ b/google-api-client/src/main/java/com/google/api/client/googleapis/testing/compute/package-info.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014 Google Inc. + * Copyright 2014 Google Inc. * * 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 diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/testing/json/GoogleJsonResponseExceptionFactoryTesting.java b/google-api-client/src/main/java/com/google/api/client/googleapis/testing/json/GoogleJsonResponseExceptionFactoryTesting.java index dd8e019dd..5afaaedb1 100644 --- a/google-api-client/src/main/java/com/google/api/client/googleapis/testing/json/GoogleJsonResponseExceptionFactoryTesting.java +++ b/google-api-client/src/main/java/com/google/api/client/googleapis/testing/json/GoogleJsonResponseExceptionFactoryTesting.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Google Inc. + * Copyright 2013 Google Inc. * * 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 diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/testing/json/package-info.java b/google-api-client/src/main/java/com/google/api/client/googleapis/testing/json/package-info.java index 6a04aba13..b239ff7cc 100644 --- a/google-api-client/src/main/java/com/google/api/client/googleapis/testing/json/package-info.java +++ b/google-api-client/src/main/java/com/google/api/client/googleapis/testing/json/package-info.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Google Inc. + * Copyright 2013 Google Inc. * * 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 diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/testing/notifications/MockUnparsedNotificationCallback.java b/google-api-client/src/main/java/com/google/api/client/googleapis/testing/notifications/MockUnparsedNotificationCallback.java index 583afae41..599671e8d 100644 --- a/google-api-client/src/main/java/com/google/api/client/googleapis/testing/notifications/MockUnparsedNotificationCallback.java +++ b/google-api-client/src/main/java/com/google/api/client/googleapis/testing/notifications/MockUnparsedNotificationCallback.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Google Inc. + * Copyright 2013 Google Inc. * * 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 diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/testing/notifications/package-info.java b/google-api-client/src/main/java/com/google/api/client/googleapis/testing/notifications/package-info.java index 0f619e03d..145b08e0a 100644 --- a/google-api-client/src/main/java/com/google/api/client/googleapis/testing/notifications/package-info.java +++ b/google-api-client/src/main/java/com/google/api/client/googleapis/testing/notifications/package-info.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Google Inc. + * Copyright 2013 Google Inc. * * 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 diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/testing/package-info.java b/google-api-client/src/main/java/com/google/api/client/googleapis/testing/package-info.java index d2abd68d9..175bd11c3 100644 --- a/google-api-client/src/main/java/com/google/api/client/googleapis/testing/package-info.java +++ b/google-api-client/src/main/java/com/google/api/client/googleapis/testing/package-info.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014 Google Inc. + * Copyright 2014 Google Inc. * * 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 diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/util/Utils.java b/google-api-client/src/main/java/com/google/api/client/googleapis/util/Utils.java index 8294c0e33..97c27e0e1 100644 --- a/google-api-client/src/main/java/com/google/api/client/googleapis/util/Utils.java +++ b/google-api-client/src/main/java/com/google/api/client/googleapis/util/Utils.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Google Inc. + * Copyright 2013 Google Inc. * * 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 diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/util/package-info.java b/google-api-client/src/main/java/com/google/api/client/googleapis/util/package-info.java index 0269964d3..265dc0327 100644 --- a/google-api-client/src/main/java/com/google/api/client/googleapis/util/package-info.java +++ b/google-api-client/src/main/java/com/google/api/client/googleapis/util/package-info.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014 Google Inc. + * Copyright 2014 Google Inc. * * 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 diff --git a/google-api-client/src/test/java/com/google/api/client/googleapis/GoogleUtilsTest.java b/google-api-client/src/test/java/com/google/api/client/googleapis/GoogleUtilsTest.java index cad543e2a..3dc230bdf 100644 --- a/google-api-client/src/test/java/com/google/api/client/googleapis/GoogleUtilsTest.java +++ b/google-api-client/src/test/java/com/google/api/client/googleapis/GoogleUtilsTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Google Inc. + * Copyright 2013 Google Inc. * * 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 diff --git a/google-api-client/src/test/java/com/google/api/client/googleapis/MethodOverrideTest.java b/google-api-client/src/test/java/com/google/api/client/googleapis/MethodOverrideTest.java index f6f5a9dad..3c346f71b 100644 --- a/google-api-client/src/test/java/com/google/api/client/googleapis/MethodOverrideTest.java +++ b/google-api-client/src/test/java/com/google/api/client/googleapis/MethodOverrideTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010 Google Inc. + * Copyright 2010 Google Inc. * * 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 diff --git a/google-api-client/src/test/java/com/google/api/client/googleapis/auth/oauth2/DefaultCredentialProviderTest.java b/google-api-client/src/test/java/com/google/api/client/googleapis/auth/oauth2/DefaultCredentialProviderTest.java index e3ff493f6..56a98f677 100644 --- a/google-api-client/src/test/java/com/google/api/client/googleapis/auth/oauth2/DefaultCredentialProviderTest.java +++ b/google-api-client/src/test/java/com/google/api/client/googleapis/auth/oauth2/DefaultCredentialProviderTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014 Google Inc. + * Copyright 2014 Google Inc. * * 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 diff --git a/google-api-client/src/test/java/com/google/api/client/googleapis/auth/oauth2/GoogleAuthorizationCodeFlowTest.java b/google-api-client/src/test/java/com/google/api/client/googleapis/auth/oauth2/GoogleAuthorizationCodeFlowTest.java index 76283a3ca..357048e01 100644 --- a/google-api-client/src/test/java/com/google/api/client/googleapis/auth/oauth2/GoogleAuthorizationCodeFlowTest.java +++ b/google-api-client/src/test/java/com/google/api/client/googleapis/auth/oauth2/GoogleAuthorizationCodeFlowTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012 Google Inc. + * Copyright 2012 Google Inc. * * 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 diff --git a/google-api-client/src/test/java/com/google/api/client/googleapis/auth/oauth2/GoogleAuthorizationCodeRequestUrlTest.java b/google-api-client/src/test/java/com/google/api/client/googleapis/auth/oauth2/GoogleAuthorizationCodeRequestUrlTest.java index 9634226ed..b26ebad18 100644 --- a/google-api-client/src/test/java/com/google/api/client/googleapis/auth/oauth2/GoogleAuthorizationCodeRequestUrlTest.java +++ b/google-api-client/src/test/java/com/google/api/client/googleapis/auth/oauth2/GoogleAuthorizationCodeRequestUrlTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011 Google Inc. + * Copyright 2011 Google Inc. * * 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 diff --git a/google-api-client/src/test/java/com/google/api/client/googleapis/auth/oauth2/GoogleAuthorizationCodeTokenRequestTest.java b/google-api-client/src/test/java/com/google/api/client/googleapis/auth/oauth2/GoogleAuthorizationCodeTokenRequestTest.java index 2bddfbcb6..ab4cb2e63 100644 --- a/google-api-client/src/test/java/com/google/api/client/googleapis/auth/oauth2/GoogleAuthorizationCodeTokenRequestTest.java +++ b/google-api-client/src/test/java/com/google/api/client/googleapis/auth/oauth2/GoogleAuthorizationCodeTokenRequestTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011 Google Inc. + * Copyright 2011 Google Inc. * * 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 diff --git a/google-api-client/src/test/java/com/google/api/client/googleapis/auth/oauth2/GoogleBrowserClientRequestUrlTest.java b/google-api-client/src/test/java/com/google/api/client/googleapis/auth/oauth2/GoogleBrowserClientRequestUrlTest.java index 6485107e7..e82c06217 100644 --- a/google-api-client/src/test/java/com/google/api/client/googleapis/auth/oauth2/GoogleBrowserClientRequestUrlTest.java +++ b/google-api-client/src/test/java/com/google/api/client/googleapis/auth/oauth2/GoogleBrowserClientRequestUrlTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011 Google Inc. + * Copyright 2011 Google Inc. * * 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 diff --git a/google-api-client/src/test/java/com/google/api/client/googleapis/auth/oauth2/GoogleClientSecretsTest.java b/google-api-client/src/test/java/com/google/api/client/googleapis/auth/oauth2/GoogleClientSecretsTest.java index f50ec1ce4..1ac5ef97f 100644 --- a/google-api-client/src/test/java/com/google/api/client/googleapis/auth/oauth2/GoogleClientSecretsTest.java +++ b/google-api-client/src/test/java/com/google/api/client/googleapis/auth/oauth2/GoogleClientSecretsTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012 Google Inc. + * Copyright 2012 Google Inc. * * 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 diff --git a/google-api-client/src/test/java/com/google/api/client/googleapis/auth/oauth2/GoogleCredentialTest.java b/google-api-client/src/test/java/com/google/api/client/googleapis/auth/oauth2/GoogleCredentialTest.java index 5c14e0c8d..738fe809e 100644 --- a/google-api-client/src/test/java/com/google/api/client/googleapis/auth/oauth2/GoogleCredentialTest.java +++ b/google-api-client/src/test/java/com/google/api/client/googleapis/auth/oauth2/GoogleCredentialTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Google Inc. + * Copyright 2013 Google Inc. * * 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 diff --git a/google-api-client/src/test/java/com/google/api/client/googleapis/auth/oauth2/GoogleIdTokenTest.java b/google-api-client/src/test/java/com/google/api/client/googleapis/auth/oauth2/GoogleIdTokenTest.java index 013bf0e1c..7e6986b75 100644 --- a/google-api-client/src/test/java/com/google/api/client/googleapis/auth/oauth2/GoogleIdTokenTest.java +++ b/google-api-client/src/test/java/com/google/api/client/googleapis/auth/oauth2/GoogleIdTokenTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Google Inc. + * Copyright 2013 Google Inc. * * 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 diff --git a/google-api-client/src/test/java/com/google/api/client/googleapis/auth/oauth2/GoogleIdTokenVerifierTest.java b/google-api-client/src/test/java/com/google/api/client/googleapis/auth/oauth2/GoogleIdTokenVerifierTest.java index 76aa74c22..0eb4249a4 100644 --- a/google-api-client/src/test/java/com/google/api/client/googleapis/auth/oauth2/GoogleIdTokenVerifierTest.java +++ b/google-api-client/src/test/java/com/google/api/client/googleapis/auth/oauth2/GoogleIdTokenVerifierTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012 Google Inc. + * Copyright 2012 Google Inc. * * 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 diff --git a/google-api-client/src/test/java/com/google/api/client/googleapis/auth/oauth2/GooglePublicKeysManagerTest.java b/google-api-client/src/test/java/com/google/api/client/googleapis/auth/oauth2/GooglePublicKeysManagerTest.java index c6a79fd72..8a31662c4 100644 --- a/google-api-client/src/test/java/com/google/api/client/googleapis/auth/oauth2/GooglePublicKeysManagerTest.java +++ b/google-api-client/src/test/java/com/google/api/client/googleapis/auth/oauth2/GooglePublicKeysManagerTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Google Inc. + * Copyright 2013 Google Inc. * * 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 diff --git a/google-api-client/src/test/java/com/google/api/client/googleapis/compute/ComputeCredentialTest.java b/google-api-client/src/test/java/com/google/api/client/googleapis/compute/ComputeCredentialTest.java index 14a575563..51008c7c4 100644 --- a/google-api-client/src/test/java/com/google/api/client/googleapis/compute/ComputeCredentialTest.java +++ b/google-api-client/src/test/java/com/google/api/client/googleapis/compute/ComputeCredentialTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Google Inc. + * Copyright 2013 Google Inc. * * 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 diff --git a/google-api-client/src/test/java/com/google/api/client/googleapis/json/GoogleJsonErrorContainerTest.java b/google-api-client/src/test/java/com/google/api/client/googleapis/json/GoogleJsonErrorContainerTest.java index 1a2717640..b5df2d8c3 100644 --- a/google-api-client/src/test/java/com/google/api/client/googleapis/json/GoogleJsonErrorContainerTest.java +++ b/google-api-client/src/test/java/com/google/api/client/googleapis/json/GoogleJsonErrorContainerTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012 Google Inc. + * Copyright 2012 Google Inc. * * 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 diff --git a/google-api-client/src/test/java/com/google/api/client/googleapis/json/GoogleJsonErrorTest.java b/google-api-client/src/test/java/com/google/api/client/googleapis/json/GoogleJsonErrorTest.java index 8c2ff1af5..39f2de099 100644 --- a/google-api-client/src/test/java/com/google/api/client/googleapis/json/GoogleJsonErrorTest.java +++ b/google-api-client/src/test/java/com/google/api/client/googleapis/json/GoogleJsonErrorTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011 Google Inc. + * Copyright 2011 Google Inc. * * 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 diff --git a/google-api-client/src/test/java/com/google/api/client/googleapis/json/GoogleJsonResponseExceptionTest.java b/google-api-client/src/test/java/com/google/api/client/googleapis/json/GoogleJsonResponseExceptionTest.java index 3f9670cdb..e61b421fb 100644 --- a/google-api-client/src/test/java/com/google/api/client/googleapis/json/GoogleJsonResponseExceptionTest.java +++ b/google-api-client/src/test/java/com/google/api/client/googleapis/json/GoogleJsonResponseExceptionTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011 Google Inc. + * Copyright 2011 Google Inc. * * 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 diff --git a/google-api-client/src/test/java/com/google/api/client/googleapis/media/MediaHttpDownloaderTest.java b/google-api-client/src/test/java/com/google/api/client/googleapis/media/MediaHttpDownloaderTest.java index cf4861d52..59d4b0d67 100644 --- a/google-api-client/src/test/java/com/google/api/client/googleapis/media/MediaHttpDownloaderTest.java +++ b/google-api-client/src/test/java/com/google/api/client/googleapis/media/MediaHttpDownloaderTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012 Google Inc. + * Copyright 2012 Google Inc. * * 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 diff --git a/google-api-client/src/test/java/com/google/api/client/googleapis/media/MediaHttpUploaderTest.java b/google-api-client/src/test/java/com/google/api/client/googleapis/media/MediaHttpUploaderTest.java index 134685283..aadfe7bae 100644 --- a/google-api-client/src/test/java/com/google/api/client/googleapis/media/MediaHttpUploaderTest.java +++ b/google-api-client/src/test/java/com/google/api/client/googleapis/media/MediaHttpUploaderTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011 Google Inc. + * Copyright 2011 Google Inc. * * 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 diff --git a/google-api-client/src/test/java/com/google/api/client/googleapis/testing/json/GoogleJsonResponseExceptionFactoryTestingTest.java b/google-api-client/src/test/java/com/google/api/client/googleapis/testing/json/GoogleJsonResponseExceptionFactoryTestingTest.java index 5c44a9553..36cbb7cdb 100644 --- a/google-api-client/src/test/java/com/google/api/client/googleapis/testing/json/GoogleJsonResponseExceptionFactoryTestingTest.java +++ b/google-api-client/src/test/java/com/google/api/client/googleapis/testing/json/GoogleJsonResponseExceptionFactoryTestingTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Google Inc. + * Copyright 2013 Google Inc. * * 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 diff --git a/google-api-client/src/test/java/com/google/api/client/googleapis/util/UtilsTest.java b/google-api-client/src/test/java/com/google/api/client/googleapis/util/UtilsTest.java index 9ee8dbcfb..c4326747e 100644 --- a/google-api-client/src/test/java/com/google/api/client/googleapis/util/UtilsTest.java +++ b/google-api-client/src/test/java/com/google/api/client/googleapis/util/UtilsTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Google Inc. + * Copyright 2013 Google Inc. * * 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 From b46175643c1a9a98da693108732eabecf8545528 Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Fri, 21 Sep 2018 12:23:44 -0400 Subject: [PATCH 02/39] Remove obsolete mercurial and google code detritus (#1175) * add OSGI metadata * more default behavior * add OSGI info * whitespace * Remove out of date docs we don't use anymore now that we're on Github and git --- .hgignore | 6 ---- instructions.html | 73 ----------------------------------------------- overview.html | 17 ----------- 3 files changed, 96 deletions(-) delete mode 100644 .hgignore delete mode 100644 instructions.html delete mode 100644 overview.html diff --git a/.hgignore b/.hgignore deleted file mode 100644 index 88774422d..000000000 --- a/.hgignore +++ /dev/null @@ -1,6 +0,0 @@ - -syntax: regexp -^(.*/)?target$ - -syntax: regexp -^(.*/)?bin$ diff --git a/instructions.html b/instructions.html deleted file mode 100644 index 52a65eb12..000000000 --- a/instructions.html +++ /dev/null @@ -1,73 +0,0 @@ - -Setup Instructions for the Google API Client Library for Java - -

Setup Instructions for the Google API Client Library for Java

- -

Browse Online

- - - -

Checkout Instructions

- -

Prerequisites: install Java 6, Mercurial and Maven. You may need to set -your JAVA_HOME.

- -
hg clone https://google-api-java-client.googlecode.com/hg/ google-api-java-client
-cd google-api-java-client
-mvn install
- -There are two named branches: - - -

Setup Project in Eclipse 3.5

- -

Prerequisites: install Eclipse, -the Mercurial plugin, the Maven -plugin, and the Android -plugin.

- - - - - diff --git a/overview.html b/overview.html deleted file mode 100644 index a4274fa2b..000000000 --- a/overview.html +++ /dev/null @@ -1,17 +0,0 @@ - - - Written by Google, the - google-api-java-client library is an easy-to-use and efficient Java client library for - accessing Google APIs using JSON and OAuth 2.0. - -

- This library is built on top of two common libraries, also built by Google, but designed to - work with any HTTP service on the web: the Google HTTP Client Library for Java and the Google - OAuth Client Library for Java. - @see - Google HTTP Java Client Library Javadoc - @see - Google OAuth Java Client Library Javadoc -

- - From 0d2ae05c24d1e309860b0af4ac29bed76862d163 Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Fri, 21 Sep 2018 13:29:55 -0400 Subject: [PATCH 03/39] update appengine SDK (#1178) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6dea60c6c..c439d1291 100644 --- a/pom.xml +++ b/pom.xml @@ -544,7 +544,7 @@ 2.9.6 2.6.1 20.0 - 1.7.7 + 1.9.64 1.1.4c 1.1.1 4.5.5 From a9fffa0cffeaf500b7c692ecc9793a3b2fe1c2b1 Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Fri, 21 Sep 2018 13:45:22 -0400 Subject: [PATCH 04/39] update minimum maven (#1179) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c439d1291..656f6b913 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ 2010 - 2.0.9 + 3.3.9 From a0fe4e909c3223df12800eb262ec7a388d003082 Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Fri, 21 Sep 2018 11:34:09 -0700 Subject: [PATCH 05/39] Fix AppEngine tests (#1184) --- .gitignore | 3 ++- .../appengine/testing/auth/oauth2/MockAppIdentityService.java | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 5fc420eea..62b082961 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,5 @@ bin/ .classpath .settings .project - +*.iml +.idea diff --git a/google-api-client-appengine/src/main/java/com/google/api/client/googleapis/extensions/appengine/testing/auth/oauth2/MockAppIdentityService.java b/google-api-client-appengine/src/main/java/com/google/api/client/googleapis/extensions/appengine/testing/auth/oauth2/MockAppIdentityService.java index aea7cc04a..0a640a811 100644 --- a/google-api-client-appengine/src/main/java/com/google/api/client/googleapis/extensions/appengine/testing/auth/oauth2/MockAppIdentityService.java +++ b/google-api-client-appengine/src/main/java/com/google/api/client/googleapis/extensions/appengine/testing/auth/oauth2/MockAppIdentityService.java @@ -89,4 +89,7 @@ public String getServiceAccountName() { public ParsedAppId parseFullAppId(String fullAppId) { return null; } + + @Override + public String getDefaultGcsBucketName() { return null; } } From 7aa4851e5f7cc7c0463c56117d0e0f6ee470c20d Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Fri, 21 Sep 2018 11:35:43 -0700 Subject: [PATCH 06/39] Add continuous integration Kokoro CI config and badges (#1171) * Add continuous integration Kokoro CI config and badges * Fix indentation and https --- .kokoro/continuous/common.cfg | 24 ++++++++++++++++++++++++ .kokoro/continuous/java10.cfg | 7 +++++++ .kokoro/continuous/java7.cfg | 7 +++++++ .kokoro/continuous/java8.cfg | 7 +++++++ .kokoro/presubmit/common.cfg | 8 ++++---- .kokoro/presubmit/java10.cfg | 4 ++-- .kokoro/presubmit/java7.cfg | 4 ++-- .kokoro/presubmit/java8.cfg | 4 ++-- .kokoro/presubmit/java9.cfg | 4 ++-- README.md | 9 ++++++++- 10 files changed, 65 insertions(+), 13 deletions(-) create mode 100644 .kokoro/continuous/common.cfg create mode 100644 .kokoro/continuous/java10.cfg create mode 100644 .kokoro/continuous/java7.cfg create mode 100644 .kokoro/continuous/java8.cfg diff --git a/.kokoro/continuous/common.cfg b/.kokoro/continuous/common.cfg new file mode 100644 index 000000000..7c562d48d --- /dev/null +++ b/.kokoro/continuous/common.cfg @@ -0,0 +1,24 @@ +# Format: //devtools/kokoro/config/proto/build.proto + +# Build logs will be here +action { + define_artifacts { + regex: "**/*sponge_log.xml" + } +} + +# Download trampoline resources. +gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline" + +# Use the trampoline script to run in docker. +build_file: "google-api-java-client/.kokoro/trampoline.sh" + +env_vars: { + key: "TRAMPOLINE_BUILD_FILE" + value: "github/google-api-java-client/.kokoro/build.sh" +} + +env_vars: { + key: "JOB_TYPE" + value: "test" +} diff --git a/.kokoro/continuous/java10.cfg b/.kokoro/continuous/java10.cfg new file mode 100644 index 000000000..6e2f1f5fa --- /dev/null +++ b/.kokoro/continuous/java10.cfg @@ -0,0 +1,7 @@ +# Format: //devtools/kokoro/config/proto/build.proto + +# Configure the docker image for kokoro-trampoline. +env_vars: { + key: "TRAMPOLINE_IMAGE" + value: "gcr.io/cloud-devrel-kokoro-resources/java10" +} diff --git a/.kokoro/continuous/java7.cfg b/.kokoro/continuous/java7.cfg new file mode 100644 index 000000000..cb24f44ee --- /dev/null +++ b/.kokoro/continuous/java7.cfg @@ -0,0 +1,7 @@ +# Format: //devtools/kokoro/config/proto/build.proto + +# Configure the docker image for kokoro-trampoline. +env_vars: { + key: "TRAMPOLINE_IMAGE" + value: "gcr.io/cloud-devrel-kokoro-resources/java7" +} diff --git a/.kokoro/continuous/java8.cfg b/.kokoro/continuous/java8.cfg new file mode 100644 index 000000000..3b017fc80 --- /dev/null +++ b/.kokoro/continuous/java8.cfg @@ -0,0 +1,7 @@ +# Format: //devtools/kokoro/config/proto/build.proto + +# Configure the docker image for kokoro-trampoline. +env_vars: { + key: "TRAMPOLINE_IMAGE" + value: "gcr.io/cloud-devrel-kokoro-resources/java8" +} diff --git a/.kokoro/presubmit/common.cfg b/.kokoro/presubmit/common.cfg index ac47bad8b..7c562d48d 100644 --- a/.kokoro/presubmit/common.cfg +++ b/.kokoro/presubmit/common.cfg @@ -14,11 +14,11 @@ gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline" build_file: "google-api-java-client/.kokoro/trampoline.sh" env_vars: { - key: "TRAMPOLINE_BUILD_FILE" - value: "github/google-api-java-client/.kokoro/build.sh" + key: "TRAMPOLINE_BUILD_FILE" + value: "github/google-api-java-client/.kokoro/build.sh" } env_vars: { - key: "JOB_TYPE" - value: "test" + key: "JOB_TYPE" + value: "test" } diff --git a/.kokoro/presubmit/java10.cfg b/.kokoro/presubmit/java10.cfg index e560ae22f..6e2f1f5fa 100644 --- a/.kokoro/presubmit/java10.cfg +++ b/.kokoro/presubmit/java10.cfg @@ -2,6 +2,6 @@ # Configure the docker image for kokoro-trampoline. env_vars: { - key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-kokoro-resources/java10" + key: "TRAMPOLINE_IMAGE" + value: "gcr.io/cloud-devrel-kokoro-resources/java10" } diff --git a/.kokoro/presubmit/java7.cfg b/.kokoro/presubmit/java7.cfg index 584e8ea60..cb24f44ee 100644 --- a/.kokoro/presubmit/java7.cfg +++ b/.kokoro/presubmit/java7.cfg @@ -2,6 +2,6 @@ # Configure the docker image for kokoro-trampoline. env_vars: { - key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-kokoro-resources/java7" + key: "TRAMPOLINE_IMAGE" + value: "gcr.io/cloud-devrel-kokoro-resources/java7" } diff --git a/.kokoro/presubmit/java8.cfg b/.kokoro/presubmit/java8.cfg index 34f6c33e5..3b017fc80 100644 --- a/.kokoro/presubmit/java8.cfg +++ b/.kokoro/presubmit/java8.cfg @@ -2,6 +2,6 @@ # Configure the docker image for kokoro-trampoline. env_vars: { - key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-kokoro-resources/java8" + key: "TRAMPOLINE_IMAGE" + value: "gcr.io/cloud-devrel-kokoro-resources/java8" } diff --git a/.kokoro/presubmit/java9.cfg b/.kokoro/presubmit/java9.cfg index 650dfc693..3b9c408d6 100644 --- a/.kokoro/presubmit/java9.cfg +++ b/.kokoro/presubmit/java9.cfg @@ -2,6 +2,6 @@ # Configure the docker image for kokoro-trampoline. env_vars: { - key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-kokoro-resources/java9" + key: "TRAMPOLINE_IMAGE" + value: "gcr.io/cloud-devrel-kokoro-resources/java9" } diff --git a/README.md b/README.md index 872b32bbd..8d31dfb66 100644 --- a/README.md +++ b/README.md @@ -214,6 +214,14 @@ dependencies { } ``` +## CI Status + +Java Version | Status +------------ | ------ +Java 7 | [![Kokoro CI](https://storage.googleapis.com/cloud-devrel-public/java/badges/google-api-java-client/java7.svg)](https://storage.googleapis.com/cloud-devrel-public/java/badges/google-api-java-client/java7.html) +Java 8 | [![Kokoro CI](https://storage.googleapis.com/cloud-devrel-public/java/badges/google-api-java-client/java8.svg)](https://storage.googleapis.com/cloud-devrel-public/java/badges/google-api-java-client/java8.html) +Java 10 | [![Kokoro CI](https://storage.googleapis.com/cloud-devrel-public/java/badges/google-api-java-client/java10.svg)](https://storage.googleapis.com/cloud-devrel-public/java/badges/google-api-java-client/java10.html) + ## Dependencies This library is built on top of two common libraries, also built by Google, and also designed to work with any HTTP service on the web: @@ -245,6 +253,5 @@ might result, and you are not guaranteed a compilation error. ## Links -- [Clients Announcements](http://google-api-java-client.blogspot.com/) - [API Announcements](http://googledevelopers.blogspot.com/) - [Discuss](https://groups.google.com/forum/#!forum/google-api-java-client) From 4c7fe04b90f20528925c63e6a6784645b3269f91 Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Fri, 21 Sep 2018 12:28:25 -0700 Subject: [PATCH 07/39] Add CODEOWNERS and issue/pr templates (#1185) --- .github/CODEOWNERS | 1 + .github/ISSUE_TEMPLATE.md | 31 +++++++++++++++++++++++++++++++ .github/PULL_REQUEST_TEMPLATE.md | 4 ++++ 3 files changed, 36 insertions(+) create mode 100644 .github/CODEOWNERS create mode 100644 .github/ISSUE_TEMPLATE.md create mode 100644 .github/PULL_REQUEST_TEMPLATE.md diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS new file mode 100644 index 000000000..2d3555c91 --- /dev/null +++ b/.github/CODEOWNERS @@ -0,0 +1 @@ +@googleapis/yoshi-java diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md new file mode 100644 index 000000000..7c86b0e47 --- /dev/null +++ b/.github/ISSUE_TEMPLATE.md @@ -0,0 +1,31 @@ +Thanks for stopping by to let us know something could be better! + +Please be sure to include as much information as possible: + +#### Environment details + +- OS: +- Java version: +- google-api-java-client version: + +#### Steps to reproduce + +1. ? +2. ? + +#### Stacktrace + +``` +Any relevant stacktrace here. +``` + +#### External references such as API reference guides used + +- ? + +#### Any additional information below + +Making sure to follow these steps will guarantee the quickest resolution possible. + +Thanks! + diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md new file mode 100644 index 000000000..3af206e9c --- /dev/null +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -0,0 +1,4 @@ +Fixes # (it's a good idea to open an issue first for discussion) + +- [ ] Tests pass +- [ ] Appropriate docs were updated (if necessary) From 25adc3026d6c3cde19c720b24e5a9ddc9a6272d5 Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Mon, 24 Sep 2018 13:11:38 -0400 Subject: [PATCH 08/39] App Engine standard uses Java 7 or Java 8, not 6 and not 9 or later (#1186) * App Engine uses Java 7 or later * App Engine uses Java 8 or earlier --- google-api-client-appengine/pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/google-api-client-appengine/pom.xml b/google-api-client-appengine/pom.xml index d850f596d..96ac3b6bd 100644 --- a/google-api-client-appengine/pom.xml +++ b/google-api-client-appengine/pom.xml @@ -16,7 +16,7 @@ http://download.oracle.com/javase/6/docs/api/ - http://code.google.com/appengine/docs/java/javadoc + https://cloud.google.com/appengine/docs/standard/java/javadoc/ http://javadoc.google-http-java-client.googlecode.com/hg/${project.http.version} http://javadoc.google-oauth-java-client.googlecode.com/hg/${project.oauth.version} @@ -71,14 +71,14 @@ - + org.codehaus.mojo animal-sniffer-maven-plugin org.codehaus.mojo.signature - java16 + java17 1.0 From 87ba6e99ed9c851095920a13130178c7d7763d2f Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Thu, 27 Sep 2018 09:36:21 -0700 Subject: [PATCH 09/39] Add the ending Java 6 support notice to README (#1190) --- README.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/README.md b/README.md index 8d31dfb66..d5d306c77 100644 --- a/README.md +++ b/README.md @@ -255,3 +255,15 @@ might result, and you are not guaranteed a compilation error. - [API Announcements](http://googledevelopers.blogspot.com/) - [Discuss](https://groups.google.com/forum/#!forum/google-api-java-client) + +## Notice: Ending Java 6 Support + +Please note: since Java 6 extended support is being ended this December by Oracle, we will begin +ending Java 6 support in early 2019, with release 1.28.0 as a tentative goal. Users may stay still +use these libraries in Java 6 projects for some time, but going forward we will not ensure that +these libraries work in such an environment. After 1.28.0, our supported versions will include Java +7 and onward. + +For Android users, we will continue our 4.0 support. + +For questions or concerns, please file an issue in the GitHub repository. From c99646468bfe8c6d1c7f731e8d78946806ef8915 Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Thu, 4 Oct 2018 10:30:14 -0700 Subject: [PATCH 10/39] Add Kokoro release scripts (#1188) * Add Kokoro release scripts * Remove unnecessary extra maven-jar compile after upgrading plugins * Add the appengine api * skip tests * Install play services * Install play services only if not installed * Install other dependencies --- .kokoro/install_dependencies.sh | 33 ++++++ .kokoro/release/common.cfg | 56 ++++++++++ .kokoro/release/common.sh | 50 +++++++++ .kokoro/release/drop.cfg | 7 ++ .kokoro/release/drop.sh | 25 +++++ .kokoro/release/promote.cfg | 7 ++ .kokoro/release/promote.sh | 25 +++++ .kokoro/release/stage.cfg | 7 ++ .kokoro/release/stage.sh | 33 ++++++ google-api-client-android/pom.xml | 2 +- google-api-client-appengine/pom.xml | 13 +-- google-api-client-gson/pom.xml | 13 +-- google-api-client-jackson2/pom.xml | 13 +-- google-api-client-java6/pom.xml | 11 +- google-api-client-protobuf/pom.xml | 13 +-- google-api-client-servlet/pom.xml | 40 ++++--- google-api-client-xml/pom.xml | 13 +-- google-api-client/pom.xml | 4 +- pom.xml | 161 ++++++++++++++++------------ 19 files changed, 377 insertions(+), 149 deletions(-) create mode 100755 .kokoro/install_dependencies.sh create mode 100644 .kokoro/release/common.cfg create mode 100644 .kokoro/release/common.sh create mode 100644 .kokoro/release/drop.cfg create mode 100755 .kokoro/release/drop.sh create mode 100644 .kokoro/release/promote.cfg create mode 100755 .kokoro/release/promote.sh create mode 100644 .kokoro/release/stage.cfg create mode 100755 .kokoro/release/stage.sh diff --git a/.kokoro/install_dependencies.sh b/.kokoro/install_dependencies.sh new file mode 100755 index 000000000..a0439dd7d --- /dev/null +++ b/.kokoro/install_dependencies.sh @@ -0,0 +1,33 @@ +#!/bin/bash +# Copyright 2018 Google Inc. +# +# 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. + +set -eo pipefail + +# Install the android SDK +mvn dependency:get -Dartifact=com.google.android:android:4.1.1.4 + +# Install the appengine SDK +mvn dependency:get -Dartifact=com.google.appengine:appengine-api-1.0-sdk:1.9.65 + +# Install play services +mvn dependency:get -Dartifact=com.google.android.google-play-services:google-play-services:1 -o -DremoteRepositories=file:~/.m2 || \ + (wget https://dl.google.com/dl/android/maven2/com/google/android/gms/play-services-basement/8.3.0/play-services-basement-8.3.0.aar && \ + unzip play-services-basement-8.3.0.aar && \ + mvn install:install-file \ + -Dfile=classes.jar \ + -DgroupId=com.google.android.google-play-services \ + -DartifactId=google-play-services \ + -Dversion=1 \ + -Dpackaging=jar) diff --git a/.kokoro/release/common.cfg b/.kokoro/release/common.cfg new file mode 100644 index 000000000..73e295f10 --- /dev/null +++ b/.kokoro/release/common.cfg @@ -0,0 +1,56 @@ +# Format: //devtools/kokoro/config/proto/build.proto + +# Build logs will be here +action { + define_artifacts { + regex: "**/*sponge_log.xml" + } +} + +# Download trampoline resources. +gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline" + +# Use the trampoline script to run in docker. +build_file: "google-api-java-client/.kokoro/trampoline.sh" + +# Configure the docker image for kokoro-trampoline. +env_vars: { + key: "TRAMPOLINE_IMAGE" + value: "gcr.io/cloud-devrel-kokoro-resources/java8" +} + +before_action { + fetch_keystore { + keystore_resource { + keystore_config_id: 70247 + keyname: "maven-gpg-keyring" + } + } +} + +before_action { + fetch_keystore { + keystore_resource { + keystore_config_id: 70247 + keyname: "maven-gpg-passphrase" + } + } +} + +before_action { + fetch_keystore { + keystore_resource { + keystore_config_id: 70247 + keyname: "maven-gpg-pubkeyring" + } + } +} + +before_action { + fetch_keystore { + keystore_resource { + keystore_config_id: 70247 + keyname: "sonatype-credentials" + } + } +} diff --git a/.kokoro/release/common.sh b/.kokoro/release/common.sh new file mode 100644 index 000000000..f7d538b3a --- /dev/null +++ b/.kokoro/release/common.sh @@ -0,0 +1,50 @@ +#!/bin/bash +# Copyright 2018 Google Inc. +# +# 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. + +set -eo pipefail + +# Get secrets from keystore and set and environment variables +setup_environment_secrets() { + export GPG_PASSPHRASE=$(cat ${KOKORO_KEYSTORE_DIR}/70247_maven-gpg-passphrase) + export GPG_TTY=$(tty) + export GPG_HOMEDIR=/gpg + mkdir $GPG_HOMEDIR + mv ${KOKORO_KEYSTORE_DIR}/70247_maven-gpg-pubkeyring $GPG_HOMEDIR/pubring.gpg + mv ${KOKORO_KEYSTORE_DIR}/70247_maven-gpg-keyring $GPG_HOMEDIR/secring.gpg + export SONATYPE_USERNAME=$(cat ${KOKORO_KEYSTORE_DIR}/70247_sonatype-credentials | cut -f1 -d'|') + export SONATYPE_PASSWORD=$(cat ${KOKORO_KEYSTORE_DIR}/70247_sonatype-credentials | cut -f2 -d'|') +} + +create_settings_xml_file() { + echo " + + + ossrh + ${SONATYPE_USERNAME} + ${SONATYPE_PASSWORD} + + + sonatype-nexus-staging + ${SONATYPE_USERNAME} + ${SONATYPE_PASSWORD} + + + sonatype-nexus-snapshots + ${SONATYPE_USERNAME} + ${SONATYPE_PASSWORD} + + +" > $1 +} diff --git a/.kokoro/release/drop.cfg b/.kokoro/release/drop.cfg new file mode 100644 index 000000000..395a94c00 --- /dev/null +++ b/.kokoro/release/drop.cfg @@ -0,0 +1,7 @@ +# Format: //devtools/kokoro/config/proto/build.proto + +# Tell the trampoline which build file to use. +env_vars: { + key: "TRAMPOLINE_BUILD_FILE" + value: "github/google-api-java-client/.kokoro/release/drop.sh" +} diff --git a/.kokoro/release/drop.sh b/.kokoro/release/drop.sh new file mode 100755 index 000000000..abc381e5d --- /dev/null +++ b/.kokoro/release/drop.sh @@ -0,0 +1,25 @@ +#!/bin/bash +# Copyright 2018 Google Inc. +# +# 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. + +set -eo pipefail + +source $(dirname "$0")/common.sh + +pushd $(dirname "$0")/../../ + +setup_environment_secrets +create_settings_xml_file "settings.xml" + +mvn nexus-staging:drop --settings=settings.xml diff --git a/.kokoro/release/promote.cfg b/.kokoro/release/promote.cfg new file mode 100644 index 000000000..8703880cd --- /dev/null +++ b/.kokoro/release/promote.cfg @@ -0,0 +1,7 @@ +# Format: //devtools/kokoro/config/proto/build.proto + +# Tell the trampoline which build file to use. +env_vars: { + key: "TRAMPOLINE_BUILD_FILE" + value: "github/google-api-java-client/.kokoro/release/promote.sh" +} diff --git a/.kokoro/release/promote.sh b/.kokoro/release/promote.sh new file mode 100755 index 000000000..439e0fc3e --- /dev/null +++ b/.kokoro/release/promote.sh @@ -0,0 +1,25 @@ +#!/bin/bash +# Copyright 2018 Google Inc. +# +# 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. + +set -eo pipefail + +source $(dirname "$0")/common.sh + +pushd $(dirname "$0")/../../ + +setup_environment_secrets +create_settings_xml_file "settings.xml" + +mvn nexus-staging:release -DperformRelease=true --settings=settings.xml diff --git a/.kokoro/release/stage.cfg b/.kokoro/release/stage.cfg new file mode 100644 index 000000000..dcf8f7364 --- /dev/null +++ b/.kokoro/release/stage.cfg @@ -0,0 +1,7 @@ +# Format: //devtools/kokoro/config/proto/build.proto + +# Tell the trampoline which build file to use. +env_vars: { + key: "TRAMPOLINE_BUILD_FILE" + value: "github/google-api-java-client/.kokoro/release/stage.sh" +} diff --git a/.kokoro/release/stage.sh b/.kokoro/release/stage.sh new file mode 100755 index 000000000..118c44ccd --- /dev/null +++ b/.kokoro/release/stage.sh @@ -0,0 +1,33 @@ +#!/bin/bash +# Copyright 2018 Google Inc. +# +# 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. + +set -eo pipefail + +source $(dirname "$0")/common.sh +source $(dirname "$0")/../install_dependencies.sh + +pushd $(dirname "$0")/../../ + +setup_environment_secrets +create_settings_xml_file "settings.xml" + +mvn clean install deploy \ + --settings settings.xml \ + -DperformRelease=true \ + -Dgpg.executable=gpg \ + -Dgpg.passphrase=${GPG_PASSPHRASE} \ + -Dgpg.homedir=${GPG_HOMEDIR} + + diff --git a/google-api-client-android/pom.xml b/google-api-client-android/pom.xml index ae08ec9ec..d05fa0c12 100644 --- a/google-api-client-android/pom.xml +++ b/google-api-client-android/pom.xml @@ -16,7 +16,7 @@ maven-javadoc-plugin - http://download.oracle.com/javase/1.5.0/docs/api/ + http://download.oracle.com/javase/6/docs/api/ ${project.name} ${project.version} ${project.artifactId} ${project.version} diff --git a/google-api-client-appengine/pom.xml b/google-api-client-appengine/pom.xml index 96ac3b6bd..f501ea8c6 100644 --- a/google-api-client-appengine/pom.xml +++ b/google-api-client-appengine/pom.xml @@ -17,8 +17,8 @@ http://download.oracle.com/javase/6/docs/api/ https://cloud.google.com/appengine/docs/standard/java/javadoc/ - http://javadoc.google-http-java-client.googlecode.com/hg/${project.http.version} - http://javadoc.google-oauth-java-client.googlecode.com/hg/${project.oauth.version} + https://googleapis.github.io/google-http-java-client/releases/${project.http.version}/javadoc/ + https://googleapis.github.io/google-oauth-java-client/releases/${project.oauth.version}/javadoc/ ${project.name} ${project.version} ${project.artifactId} ${project.version} @@ -33,15 +33,6 @@ - - - jar - compile - - jar - - - maven-source-plugin diff --git a/google-api-client-gson/pom.xml b/google-api-client-gson/pom.xml index fea316f79..b329a5296 100644 --- a/google-api-client-gson/pom.xml +++ b/google-api-client-gson/pom.xml @@ -15,8 +15,8 @@ maven-javadoc-plugin - http://download.oracle.com/javase/1.5.0/docs/api/ - http://javadoc.google-http-java-client.googlecode.com/hg/${project.http.version} + http://download.oracle.com/javase/6/docs/api/ + https://googleapis.github.io/google-http-java-client/releases/${project.http.version}/javadoc/ ${project.name} ${project.version} ${project.artifactId} ${project.version} @@ -31,15 +31,6 @@ - - - jar - compile - - jar - - - maven-source-plugin diff --git a/google-api-client-jackson2/pom.xml b/google-api-client-jackson2/pom.xml index e2be54ecd..495e76285 100644 --- a/google-api-client-jackson2/pom.xml +++ b/google-api-client-jackson2/pom.xml @@ -15,8 +15,8 @@ maven-javadoc-plugin - http://download.oracle.com/javase/1.5.0/docs/api/ - http://javadoc.google-http-java-client.googlecode.com/hg/${project.http.version} + http://download.oracle.com/javase/6/docs/api/ + https://googleapis.github.io/google-http-java-client/releases/${project.http.version}/javadoc/ ${project.name} ${project.version} ${project.artifactId} ${project.version} @@ -31,15 +31,6 @@ - - - jar - compile - - jar - - - org.apache.felix diff --git a/google-api-client-java6/pom.xml b/google-api-client-java6/pom.xml index 1a21db064..a06cf74b3 100644 --- a/google-api-client-java6/pom.xml +++ b/google-api-client-java6/pom.xml @@ -16,7 +16,7 @@ http://download.oracle.com/javase/6/docs/api/ - http://javadoc.google-http-java-client.googlecode.com/hg/${project.http.version} + https://googleapis.github.io/google-http-java-client/releases/${project.http.version}/javadoc/ ${project.name} ${project.version} ${project.artifactId} ${project.version} @@ -31,15 +31,6 @@ - - - jar - compile - - jar - - - maven-source-plugin diff --git a/google-api-client-protobuf/pom.xml b/google-api-client-protobuf/pom.xml index f436b752d..e5c80c677 100644 --- a/google-api-client-protobuf/pom.xml +++ b/google-api-client-protobuf/pom.xml @@ -22,8 +22,8 @@ maven-javadoc-plugin - http://download.oracle.com/javase/1.5.0/docs/api/ - http://javadoc.google-http-java-client.googlecode.com/hg/${project.http.version} + http://download.oracle.com/javase/6/docs/api/ + https://googleapis.github.io/google-http-java-client/releases/${project.http.version}/javadoc/ ${project.name} ${project.version} ${project.artifactId} ${project.version} @@ -38,15 +38,6 @@ - - - jar - compile - - jar - - - maven-source-plugin diff --git a/google-api-client-servlet/pom.xml b/google-api-client-servlet/pom.xml index 51888a642..c504eff58 100644 --- a/google-api-client-servlet/pom.xml +++ b/google-api-client-servlet/pom.xml @@ -15,9 +15,9 @@ maven-javadoc-plugin - http://download.oracle.com/javase/1.5.0/docs/api/ - http://javadoc.google-http-java-client.googlecode.com/hg/${project.http.version} - http://javadoc.google-oauth-java-client.googlecode.com/hg/${project.oauth.version} + http://download.oracle.com/javase/6/docs/api/ + https://googleapis.github.io/google-http-java-client/releases/${project.http.version}/javadoc/ + https://googleapis.github.io/google-oauth-java-client/releases/${project.oauth.version}/javadoc/ ${project.name} ${project.version} ${project.artifactId} ${project.version} @@ -32,15 +32,6 @@ - - - jar - compile - - jar - - - maven-source-plugin @@ -56,11 +47,32 @@ org.datanucleus - maven-datanucleus-plugin - 2.2.1 + datanucleus-maven-plugin + ${project.datanucleus-maven-plugin.version} + JDO true + + + org.datanucleus + datanucleus-core + ${project.datanucleus-core.version} + runtime + + + org.datanucleus + datanucleus-api-jdo + ${project.datanucleus-api-jdo.version} + runtime + + + javax.jdo + jdo2-api + ${project.jdo2-api.version} + runtime + + process-classes diff --git a/google-api-client-xml/pom.xml b/google-api-client-xml/pom.xml index ca0096645..23a48ee9b 100644 --- a/google-api-client-xml/pom.xml +++ b/google-api-client-xml/pom.xml @@ -15,8 +15,8 @@ maven-javadoc-plugin - http://download.oracle.com/javase/1.5.0/docs/api/ - http://javadoc.google-http-java-client.googlecode.com/hg/${project.http.version} + http://download.oracle.com/javase/6/docs/api/ + https://googleapis.github.io/google-http-java-client/releases/${project.http.version}/javadoc/ ${project.name} ${project.version} ${project.artifactId} ${project.version} @@ -31,15 +31,6 @@ - - - jar - compile - - jar - - - maven-source-plugin diff --git a/google-api-client/pom.xml b/google-api-client/pom.xml index 92e0fff68..19def4ed6 100644 --- a/google-api-client/pom.xml +++ b/google-api-client/pom.xml @@ -24,8 +24,8 @@ https://docs.oracle.com/javase/6/docs/api/ https://cloud.google.com/appengine/docs/standard/java/javadoc/ - https://googleapis.github.io/google-http-java-client/releases/1.25.0/javadoc/ - https://googleapis.github.io/google-oauth-java-client/releases/1.25.0/javadoc/ + https://googleapis.github.io/google-http-java-client/releases/${project.http.version}/javadoc/ + https://googleapis.github.io/google-oauth-java-client/releases/${project.oauth.version}/javadoc/ ${project.name} ${project.version} ${project.artifactId} ${project.version} diff --git a/pom.xml b/pom.xml index 656f6b913..d1bd1271b 100644 --- a/pom.xml +++ b/pom.xml @@ -27,9 +27,9 @@ - scm:git:https://github.com/google/google-api-java-client.git - scm:git:ssh:git@github.com:google/google-api-java-client.git - https://github.com/google/google-api-java-client + scm:git:https://github.com/googleapis/google-api-java-client.git + scm:git:ssh:git@github.com:googleapis/google-api-java-client.git + https://github.com/googleapis/google-api-java-client @@ -147,7 +147,7 @@ javax.servlet servlet-api - 2.5 + ${project.servlet-api.version} com.google.http-client @@ -286,12 +286,19 @@ - maven-assembly-plugin - 2.2 + org.sonatype.plugins + nexus-staging-maven-plugin + 1.6.6 + true + + ossrh + https://oss.sonatype.org/ + false + - maven-clean-plugin - 2.4.1 + maven-assembly-plugin + 2.2 maven-compiler-plugin @@ -301,74 +308,53 @@ 1.6 + - maven-dependency-plugin - 2.1 - - - maven-deploy-plugin - 2.5 - - - maven-ear-plugin - 2.4.2 - - - maven-ejb-plugin - 2.3 - - - maven-install-plugin - 2.3.1 - - - maven-jar-plugin - 2.3.1 - - - false - - + org.apache.maven.plugins + maven-source-plugin + 2.2.1 + + + attach-sources + + jar-no-fork + + + + org.apache.maven.plugins maven-javadoc-plugin - 2.7 - - - maven-plugin-plugin - 2.6 + 2.9.1 + + + attach-javadocs + + jar + + + - maven-rar-plugin - 2.2 - - - maven-release-plugin - 2.1 - - - maven-resources-plugin - 2.4.3 - - - maven-site-plugin - 2.1.1 - - - maven-source-plugin - 2.1.2 + org.apache.maven.plugins + maven-jar-plugin + 3.0.2 + + + + test-jar + + + maven-surefire-plugin - 2.12.4 + 2.19.1 -Xmx1024m + sponge_log - - maven-war-plugin - 2.1 - maven-checkstyle-plugin 2.6 @@ -381,7 +367,7 @@ org.codehaus.mojo clirr-maven-plugin - 2.6 + 2.8 org.codehaus.mojo @@ -412,8 +398,8 @@ http://download.oracle.com/javase/6/docs/api/ http://cloud.google.com/appengine/docs/java/javadoc - https://developers.google.com/api-client-library/java/google-http-java-client/reference/${project.http.version} - https://developers.google.com/api-client-library/java/google-http-java-client/reference/${project.oauth.version} + https://googleapis.github.io/google-http-java-client/releases/${project.http.version}/javadoc/ + https://googleapis.github.io/google-oauth-java-client/releases/${project.oauth.version}/javadoc/ Google API Client Library for Java ${project.version} ${basedir}/overview.html @@ -461,6 +447,7 @@ + org.apache.maven.plugins maven-checkstyle-plugin checkstyle.xml @@ -511,7 +498,7 @@ org.codehaus.mojo.signature - java15 + java16 1.0 @@ -550,6 +537,46 @@ 4.5.5 4.4.10 2.3-eb + 3.2.2 + 3.2.1 + 4.0.3 + 2.5 1.1 + + + + release-sign-artifacts + + + performRelease + true + + + + + + org.apache.maven.plugins + maven-gpg-plugin + 1.6 + + + sign-artifacts + verify + + sign + + + + --pinentry-mode + loopback + + + + + + + + + From 94c86aa4effd17a43a7f9154a87fb8f345c62d52 Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Fri, 12 Oct 2018 13:24:16 -0700 Subject: [PATCH 11/39] Fix the BUGFIX_VERSION constant --- .../main/java/com/google/api/client/googleapis/GoogleUtils.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/GoogleUtils.java b/google-api-client/src/main/java/com/google/api/client/googleapis/GoogleUtils.java index 85a6a7bd7..47de5514e 100644 --- a/google-api-client/src/main/java/com/google/api/client/googleapis/GoogleUtils.java +++ b/google-api-client/src/main/java/com/google/api/client/googleapis/GoogleUtils.java @@ -49,7 +49,7 @@ public final class GoogleUtils { * * @since 1.14 */ - public static final Integer BUGFIX_VERSION = 1; + public static final Integer BUGFIX_VERSION = 0; /** Current release version. */ // NOTE: toString() so compiler thinks it isn't a constant, so it won't inline it From 539d3839c72c50a29b85b182725b50a8cf96a066 Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Fri, 12 Oct 2018 13:53:17 -0700 Subject: [PATCH 12/39] Fix CODEOWNERS format --- .github/CODEOWNERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 2d3555c91..54221045c 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1 +1 @@ -@googleapis/yoshi-java +* @googleapis/yoshi-java From fd14d33d5f55b3d44ce533493facfe3fb5fe7145 Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Fri, 12 Oct 2018 14:52:51 -0700 Subject: [PATCH 13/39] Annotate versions for replacement (#1192) --- README.md | 2 ++ google-api-client-android/pom.xml | 2 +- google-api-client-appengine/pom.xml | 2 +- google-api-client-assembly/pom.xml | 2 +- google-api-client-gson/pom.xml | 2 +- google-api-client-jackson2/pom.xml | 2 +- google-api-client-java6/pom.xml | 2 +- google-api-client-protobuf/pom.xml | 2 +- google-api-client-servlet/pom.xml | 2 +- google-api-client-xml/pom.xml | 2 +- google-api-client/pom.xml | 2 +- pom.xml | 6 +++--- versions.txt | 6 ++++++ 13 files changed, 21 insertions(+), 13 deletions(-) create mode 100644 versions.txt diff --git a/README.md b/README.md index d5d306c77..d7e63d826 100644 --- a/README.md +++ b/README.md @@ -190,6 +190,7 @@ directly from the [Downloads page](https://developers.google.com/api-client-libr or you can use Maven or Gradle. To use Maven, add the following lines to your pom.xml file: +[//]: # ({x-version-update-start:google-api-client:released}) ```maven @@ -213,6 +214,7 @@ dependencies { compile 'com.google.api-client:google-api-client:1.25.0' } ``` +[//]: # ({x-version-update-end}) ## CI Status diff --git a/google-api-client-android/pom.xml b/google-api-client-android/pom.xml index d05fa0c12..c65f721be 100644 --- a/google-api-client-android/pom.xml +++ b/google-api-client-android/pom.xml @@ -4,7 +4,7 @@ com.google.api-client google-api-client-parent - 1.26.0-SNAPSHOT + 1.26.0-SNAPSHOT ../pom.xml google-api-client-android diff --git a/google-api-client-appengine/pom.xml b/google-api-client-appengine/pom.xml index f501ea8c6..0fd2495af 100644 --- a/google-api-client-appengine/pom.xml +++ b/google-api-client-appengine/pom.xml @@ -4,7 +4,7 @@ com.google.api-client google-api-client-parent - 1.26.0-SNAPSHOT + 1.26.0-SNAPSHOT ../pom.xml google-api-client-appengine diff --git a/google-api-client-assembly/pom.xml b/google-api-client-assembly/pom.xml index 3b500fe3f..cc041126a 100644 --- a/google-api-client-assembly/pom.xml +++ b/google-api-client-assembly/pom.xml @@ -4,7 +4,7 @@ com.google.api-client google-api-client-parent - 1.26.0-SNAPSHOT + 1.26.0-SNAPSHOT ../pom.xml com.google.api-client diff --git a/google-api-client-gson/pom.xml b/google-api-client-gson/pom.xml index b329a5296..b2c8a0c5b 100644 --- a/google-api-client-gson/pom.xml +++ b/google-api-client-gson/pom.xml @@ -4,7 +4,7 @@ com.google.api-client google-api-client-parent - 1.26.0-SNAPSHOT + 1.26.0-SNAPSHOT ../pom.xml google-api-client-gson diff --git a/google-api-client-jackson2/pom.xml b/google-api-client-jackson2/pom.xml index 495e76285..98599c834 100644 --- a/google-api-client-jackson2/pom.xml +++ b/google-api-client-jackson2/pom.xml @@ -4,7 +4,7 @@ com.google.api-client google-api-client-parent - 1.26.0-SNAPSHOT + 1.26.0-SNAPSHOT ../pom.xml google-api-client-jackson2 diff --git a/google-api-client-java6/pom.xml b/google-api-client-java6/pom.xml index a06cf74b3..10f67e221 100644 --- a/google-api-client-java6/pom.xml +++ b/google-api-client-java6/pom.xml @@ -4,7 +4,7 @@ com.google.api-client google-api-client-parent - 1.26.0-SNAPSHOT + 1.26.0-SNAPSHOT ../pom.xml google-api-client-java6 diff --git a/google-api-client-protobuf/pom.xml b/google-api-client-protobuf/pom.xml index e5c80c677..605b20dad 100644 --- a/google-api-client-protobuf/pom.xml +++ b/google-api-client-protobuf/pom.xml @@ -4,7 +4,7 @@ com.google.api-client google-api-client-parent - 1.26.0-SNAPSHOT + 1.26.0-SNAPSHOT ../pom.xml google-api-client-protobuf diff --git a/google-api-client-servlet/pom.xml b/google-api-client-servlet/pom.xml index c504eff58..1a757267e 100644 --- a/google-api-client-servlet/pom.xml +++ b/google-api-client-servlet/pom.xml @@ -4,7 +4,7 @@ com.google.api-client google-api-client-parent - 1.26.0-SNAPSHOT + 1.26.0-SNAPSHOT ../pom.xml google-api-client-servlet diff --git a/google-api-client-xml/pom.xml b/google-api-client-xml/pom.xml index 23a48ee9b..96c3282ee 100644 --- a/google-api-client-xml/pom.xml +++ b/google-api-client-xml/pom.xml @@ -4,7 +4,7 @@ com.google.api-client google-api-client-parent - 1.26.0-SNAPSHOT + 1.26.0-SNAPSHOT ../pom.xml google-api-client-xml diff --git a/google-api-client/pom.xml b/google-api-client/pom.xml index 19def4ed6..858b01055 100644 --- a/google-api-client/pom.xml +++ b/google-api-client/pom.xml @@ -4,7 +4,7 @@ com.google.api-client google-api-client-parent - 1.26.0-SNAPSHOT + 1.26.0-SNAPSHOT ../pom.xml google-api-client diff --git a/pom.xml b/pom.xml index d1bd1271b..b95e31471 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ com.google.api-client google-api-client-parent - 1.26.0-SNAPSHOT + 1.26.0-SNAPSHOT pom Parent for the Google API Client Library for Java @@ -523,8 +523,8 @@ - Internally, update the default features.json file --> UTF-8 - 1.26.0-SNAPSHOT - 1.26.0-SNAPSHOT + 1.26.0-SNAPSHOT + 1.26.0-SNAPSHOT 3.0.2 2.1 1.9.13 diff --git a/versions.txt b/versions.txt new file mode 100644 index 000000000..24985c58f --- /dev/null +++ b/versions.txt @@ -0,0 +1,6 @@ +# Format: +# module:released-version:current-version + +google-api-client:1.25.0:1.26.0-SNAPSHOT +google-http-client:1.25.0:1.26.0-SNAPSHOT +google-oauth-client:1.25.0:1.26.0-SNAPSHOT From 21a91a3562468df427671e172e7dcba34fef2ac1 Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Thu, 18 Oct 2018 10:29:56 -0700 Subject: [PATCH 14/39] Release v1.26.0 (#1193) * Release v1.26.0 * Actually use the nexus-staging-maven-plugin * Fix leftover snapshot versions in assembly * Fix snapshot version in assembly --- README.md | 4 +- google-api-client-android/pom.xml | 2 +- google-api-client-appengine/pom.xml | 2 +- ...> google-api-client-1.26.0.jar.properties} | 0 ...-api-client-android-1.26.0.jar.properties} | 0 ...gle-api-client-gson-1.26.0.jar.properties} | 0 ...api-client-jackson2-1.26.0.jar.properties} | 0 ...api-client-protobuf-1.26.0.jar.properties} | 0 ...ogle-api-client-xml-1.26.0.jar.properties} | 0 ... google-http-client-1.26.0.jar.properties} | 0 ...http-client-android-1.26.0.jar.properties} | 0 ...le-http-client-gson-1.26.0.jar.properties} | 0 ...http-client-jackson-1.26.0.jar.properties} | 0 ...ttp-client-jackson2-1.26.0.jar.properties} | 0 ...gle-http-client-jdo-1.26.0.jar.properties} | 0 ...ttp-client-protobuf-1.26.0.jar.properties} | 0 ...gle-http-client-xml-1.26.0.jar.properties} | 0 ...google-oauth-client-1.26.0.jar.properties} | 0 ...oogle-api-client-android-dependencies.html | 178 +++++++-------- ...gle-api-client-appengine-dependencies.html | 210 +++++++++--------- .../google-api-client-dependencies.html | 178 +++++++-------- .../google-api-client-gson-dependencies.html | 178 +++++++-------- ...ogle-api-client-jackson2-dependencies.html | 170 +++++++------- .../google-api-client-java6-dependencies.html | 178 +++++++-------- ...ogle-api-client-protobuf-dependencies.html | 178 +++++++-------- ...oogle-api-client-servlet-dependencies.html | 186 ++++++++-------- .../google-api-client-xml-dependencies.html | 178 +++++++-------- ...ogle-http-client-android-dependencies.html | 146 ++++++------ ...le-http-client-appengine-dependencies.html | 154 ++++++------- .../google-http-client-dependencies.html | 138 ++++++------ .../google-http-client-gson-dependencies.html | 154 ++++++------- ...ogle-http-client-jackson-dependencies.html | 154 ++++++------- ...gle-http-client-jackson2-dependencies.html | 154 ++++++------- .../google-http-client-jdo-dependencies.html | 154 ++++++------- ...gle-http-client-protobuf-dependencies.html | 146 ++++++------ .../google-http-client-xml-dependencies.html | 146 ++++++------ ...e-oauth-client-appengine-dependencies.html | 178 +++++++-------- .../google-oauth-client-dependencies.html | 154 ++++++------- ...oogle-oauth-client-java6-dependencies.html | 162 +++++++------- ...oogle-oauth-client-jetty-dependencies.html | 162 +++++++------- ...gle-oauth-client-servlet-dependencies.html | 162 +++++++------- google-api-client-assembly/pom.xml | 2 +- google-api-client-gson/pom.xml | 2 +- google-api-client-jackson2/pom.xml | 2 +- google-api-client-java6/pom.xml | 2 +- google-api-client-protobuf/pom.xml | 2 +- google-api-client-servlet/pom.xml | 2 +- google-api-client-xml/pom.xml | 2 +- google-api-client/pom.xml | 2 +- pom.xml | 10 +- versions.txt | 6 +- 51 files changed, 1921 insertions(+), 1917 deletions(-) rename google-api-client-assembly/android-properties/{google-api-client-1.26.0-SNAPSHOT.jar.properties => google-api-client-1.26.0.jar.properties} (100%) rename google-api-client-assembly/android-properties/{google-api-client-android-1.26.0-SNAPSHOT.jar.properties => google-api-client-android-1.26.0.jar.properties} (100%) rename google-api-client-assembly/android-properties/{google-api-client-gson-1.26.0-SNAPSHOT.jar.properties => google-api-client-gson-1.26.0.jar.properties} (100%) rename google-api-client-assembly/android-properties/{google-api-client-jackson2-1.26.0-SNAPSHOT.jar.properties => google-api-client-jackson2-1.26.0.jar.properties} (100%) rename google-api-client-assembly/android-properties/{google-api-client-protobuf-1.26.0-SNAPSHOT.jar.properties => google-api-client-protobuf-1.26.0.jar.properties} (100%) rename google-api-client-assembly/android-properties/{google-api-client-xml-1.26.0-SNAPSHOT.jar.properties => google-api-client-xml-1.26.0.jar.properties} (100%) rename google-api-client-assembly/android-properties/{google-http-client-1.26.0-SNAPSHOT.jar.properties => google-http-client-1.26.0.jar.properties} (100%) rename google-api-client-assembly/android-properties/{google-http-client-android-1.26.0-SNAPSHOT.jar.properties => google-http-client-android-1.26.0.jar.properties} (100%) rename google-api-client-assembly/android-properties/{google-http-client-gson-1.26.0-SNAPSHOT.jar.properties => google-http-client-gson-1.26.0.jar.properties} (100%) rename google-api-client-assembly/android-properties/{google-http-client-jackson-1.26.0-SNAPSHOT.jar.properties => google-http-client-jackson-1.26.0.jar.properties} (100%) rename google-api-client-assembly/android-properties/{google-http-client-jackson2-1.26.0-SNAPSHOT.jar.properties => google-http-client-jackson2-1.26.0.jar.properties} (100%) rename google-api-client-assembly/android-properties/{google-http-client-jdo-1.26.0-SNAPSHOT.jar.properties => google-http-client-jdo-1.26.0.jar.properties} (100%) rename google-api-client-assembly/android-properties/{google-http-client-protobuf-1.26.0-SNAPSHOT.jar.properties => google-http-client-protobuf-1.26.0.jar.properties} (100%) rename google-api-client-assembly/android-properties/{google-http-client-xml-1.26.0-SNAPSHOT.jar.properties => google-http-client-xml-1.26.0.jar.properties} (100%) rename google-api-client-assembly/android-properties/{google-oauth-client-1.26.0-SNAPSHOT.jar.properties => google-oauth-client-1.26.0.jar.properties} (100%) diff --git a/README.md b/README.md index d7e63d826..db08ae7b6 100644 --- a/README.md +++ b/README.md @@ -198,7 +198,7 @@ To use Maven, add the following lines to your pom.xml file: com.google.api-client google-api-client - 1.25.0 + 1.26.0 @@ -211,7 +211,7 @@ repositories { mavenCentral() } dependencies { - compile 'com.google.api-client:google-api-client:1.25.0' + compile 'com.google.api-client:google-api-client:1.26.0' } ``` [//]: # ({x-version-update-end}) diff --git a/google-api-client-android/pom.xml b/google-api-client-android/pom.xml index c65f721be..cef73c883 100644 --- a/google-api-client-android/pom.xml +++ b/google-api-client-android/pom.xml @@ -4,7 +4,7 @@ com.google.api-client google-api-client-parent - 1.26.0-SNAPSHOT + 1.26.0 ../pom.xml google-api-client-android diff --git a/google-api-client-appengine/pom.xml b/google-api-client-appengine/pom.xml index 0fd2495af..d85c34046 100644 --- a/google-api-client-appengine/pom.xml +++ b/google-api-client-appengine/pom.xml @@ -4,7 +4,7 @@ com.google.api-client google-api-client-parent - 1.26.0-SNAPSHOT + 1.26.0 ../pom.xml google-api-client-appengine diff --git a/google-api-client-assembly/android-properties/google-api-client-1.26.0-SNAPSHOT.jar.properties b/google-api-client-assembly/android-properties/google-api-client-1.26.0.jar.properties similarity index 100% rename from google-api-client-assembly/android-properties/google-api-client-1.26.0-SNAPSHOT.jar.properties rename to google-api-client-assembly/android-properties/google-api-client-1.26.0.jar.properties diff --git a/google-api-client-assembly/android-properties/google-api-client-android-1.26.0-SNAPSHOT.jar.properties b/google-api-client-assembly/android-properties/google-api-client-android-1.26.0.jar.properties similarity index 100% rename from google-api-client-assembly/android-properties/google-api-client-android-1.26.0-SNAPSHOT.jar.properties rename to google-api-client-assembly/android-properties/google-api-client-android-1.26.0.jar.properties diff --git a/google-api-client-assembly/android-properties/google-api-client-gson-1.26.0-SNAPSHOT.jar.properties b/google-api-client-assembly/android-properties/google-api-client-gson-1.26.0.jar.properties similarity index 100% rename from google-api-client-assembly/android-properties/google-api-client-gson-1.26.0-SNAPSHOT.jar.properties rename to google-api-client-assembly/android-properties/google-api-client-gson-1.26.0.jar.properties diff --git a/google-api-client-assembly/android-properties/google-api-client-jackson2-1.26.0-SNAPSHOT.jar.properties b/google-api-client-assembly/android-properties/google-api-client-jackson2-1.26.0.jar.properties similarity index 100% rename from google-api-client-assembly/android-properties/google-api-client-jackson2-1.26.0-SNAPSHOT.jar.properties rename to google-api-client-assembly/android-properties/google-api-client-jackson2-1.26.0.jar.properties diff --git a/google-api-client-assembly/android-properties/google-api-client-protobuf-1.26.0-SNAPSHOT.jar.properties b/google-api-client-assembly/android-properties/google-api-client-protobuf-1.26.0.jar.properties similarity index 100% rename from google-api-client-assembly/android-properties/google-api-client-protobuf-1.26.0-SNAPSHOT.jar.properties rename to google-api-client-assembly/android-properties/google-api-client-protobuf-1.26.0.jar.properties diff --git a/google-api-client-assembly/android-properties/google-api-client-xml-1.26.0-SNAPSHOT.jar.properties b/google-api-client-assembly/android-properties/google-api-client-xml-1.26.0.jar.properties similarity index 100% rename from google-api-client-assembly/android-properties/google-api-client-xml-1.26.0-SNAPSHOT.jar.properties rename to google-api-client-assembly/android-properties/google-api-client-xml-1.26.0.jar.properties diff --git a/google-api-client-assembly/android-properties/google-http-client-1.26.0-SNAPSHOT.jar.properties b/google-api-client-assembly/android-properties/google-http-client-1.26.0.jar.properties similarity index 100% rename from google-api-client-assembly/android-properties/google-http-client-1.26.0-SNAPSHOT.jar.properties rename to google-api-client-assembly/android-properties/google-http-client-1.26.0.jar.properties diff --git a/google-api-client-assembly/android-properties/google-http-client-android-1.26.0-SNAPSHOT.jar.properties b/google-api-client-assembly/android-properties/google-http-client-android-1.26.0.jar.properties similarity index 100% rename from google-api-client-assembly/android-properties/google-http-client-android-1.26.0-SNAPSHOT.jar.properties rename to google-api-client-assembly/android-properties/google-http-client-android-1.26.0.jar.properties diff --git a/google-api-client-assembly/android-properties/google-http-client-gson-1.26.0-SNAPSHOT.jar.properties b/google-api-client-assembly/android-properties/google-http-client-gson-1.26.0.jar.properties similarity index 100% rename from google-api-client-assembly/android-properties/google-http-client-gson-1.26.0-SNAPSHOT.jar.properties rename to google-api-client-assembly/android-properties/google-http-client-gson-1.26.0.jar.properties diff --git a/google-api-client-assembly/android-properties/google-http-client-jackson-1.26.0-SNAPSHOT.jar.properties b/google-api-client-assembly/android-properties/google-http-client-jackson-1.26.0.jar.properties similarity index 100% rename from google-api-client-assembly/android-properties/google-http-client-jackson-1.26.0-SNAPSHOT.jar.properties rename to google-api-client-assembly/android-properties/google-http-client-jackson-1.26.0.jar.properties diff --git a/google-api-client-assembly/android-properties/google-http-client-jackson2-1.26.0-SNAPSHOT.jar.properties b/google-api-client-assembly/android-properties/google-http-client-jackson2-1.26.0.jar.properties similarity index 100% rename from google-api-client-assembly/android-properties/google-http-client-jackson2-1.26.0-SNAPSHOT.jar.properties rename to google-api-client-assembly/android-properties/google-http-client-jackson2-1.26.0.jar.properties diff --git a/google-api-client-assembly/android-properties/google-http-client-jdo-1.26.0-SNAPSHOT.jar.properties b/google-api-client-assembly/android-properties/google-http-client-jdo-1.26.0.jar.properties similarity index 100% rename from google-api-client-assembly/android-properties/google-http-client-jdo-1.26.0-SNAPSHOT.jar.properties rename to google-api-client-assembly/android-properties/google-http-client-jdo-1.26.0.jar.properties diff --git a/google-api-client-assembly/android-properties/google-http-client-protobuf-1.26.0-SNAPSHOT.jar.properties b/google-api-client-assembly/android-properties/google-http-client-protobuf-1.26.0.jar.properties similarity index 100% rename from google-api-client-assembly/android-properties/google-http-client-protobuf-1.26.0-SNAPSHOT.jar.properties rename to google-api-client-assembly/android-properties/google-http-client-protobuf-1.26.0.jar.properties diff --git a/google-api-client-assembly/android-properties/google-http-client-xml-1.26.0-SNAPSHOT.jar.properties b/google-api-client-assembly/android-properties/google-http-client-xml-1.26.0.jar.properties similarity index 100% rename from google-api-client-assembly/android-properties/google-http-client-xml-1.26.0-SNAPSHOT.jar.properties rename to google-api-client-assembly/android-properties/google-http-client-xml-1.26.0.jar.properties diff --git a/google-api-client-assembly/android-properties/google-oauth-client-1.26.0-SNAPSHOT.jar.properties b/google-api-client-assembly/android-properties/google-oauth-client-1.26.0.jar.properties similarity index 100% rename from google-api-client-assembly/android-properties/google-oauth-client-1.26.0-SNAPSHOT.jar.properties rename to google-api-client-assembly/android-properties/google-oauth-client-1.26.0.jar.properties diff --git a/google-api-client-assembly/dependencies/google-api-client-android-dependencies.html b/google-api-client-assembly/dependencies/google-api-client-android-dependencies.html index f42fd1aa9..4da37e376 100644 --- a/google-api-client-assembly/dependencies/google-api-client-android-dependencies.html +++ b/google-api-client-assembly/dependencies/google-api-client-android-dependencies.html @@ -1,52 +1,52 @@ - - - - - - Project Dependencies - - - - - - - - - -
- -
-
-
+ + + + + + Project Dependencies + + + + + + + + + +
+ +
+
+

Project Dependencies

@@ -63,13 +63,13 @@

compile

com.google.api-client google-api-client -1.26.0-SNAPSHOT +1.26.0 jar The Apache Software License, Version 2.0 com.google.http-client google-http-client-android -1.26.0-SNAPSHOT +1.26.0 jar The Apache Software License, Version 2.0
@@ -128,13 +128,13 @@

compile

com.google.http-client google-http-client -1.26.0-SNAPSHOT +1.26.0 jar The Apache Software License, Version 2.0 com.google.http-client google-http-client-jackson2 -1.26.0-SNAPSHOT +1.26.0 jar The Apache Software License, Version 2.0 @@ -146,7 +146,7 @@

compile

com.google.oauth-client google-oauth-client -1.26.0-SNAPSHOT +1.26.0 jar The Apache Software License, Version 2.0 @@ -229,7 +229,7 @@

Project Dependency Graph