diff --git a/.settings/com.google.appengine.eclipse.core.prefs b/.settings/com.google.appengine.eclipse.core.prefs deleted file mode 100644 index 82c36afe4e35..000000000000 --- a/.settings/com.google.appengine.eclipse.core.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -filesCopiedToWebInfLib= diff --git a/.settings/de.loskutov.anyedit.AnyEditTools.prefs b/.settings/de.loskutov.anyedit.AnyEditTools.prefs deleted file mode 100644 index c9ca2a972d8a..000000000000 --- a/.settings/de.loskutov.anyedit.AnyEditTools.prefs +++ /dev/null @@ -1,18 +0,0 @@ -activeContentFilterList=*.makefile,makefile,*.Makefile,Makefile,Makefile.*,*.mk,MANIFEST.MF,.project -addNewLine=true -convertActionOnSaave=AnyEdit.CnvrtTabToSpaces -eclipse.preferences.version=1 -fixLineDelimiters=false -ignoreBlankLinesWhenTrimming=false -inActiveContentFilterList= -javaTabWidthForJava=true -org.eclipse.jdt.ui.editor.tab.width=2 -projectPropsEnabled=false -removeTrailingSpaces=true -replaceAllSpaces=false -replaceAllTabs=false -saveAndAddLine=false -saveAndConvert=false -saveAndFixLineDelimiters=false -saveAndTrim=true -useModulo4Tabs=false diff --git a/.settings/edu.umd.cs.findbugs.core.prefs b/.settings/edu.umd.cs.findbugs.core.prefs deleted file mode 100644 index f2b5b2f9de9c..000000000000 --- a/.settings/edu.umd.cs.findbugs.core.prefs +++ /dev/null @@ -1,137 +0,0 @@ -#FindBugs User Preferences -#Wed Nov 19 14:11:27 PST 2014 -cloud_id=edu.umd.cs.findbugs.cloud.doNothingCloud -detectorAppendingToAnObjectOutputStream=AppendingToAnObjectOutputStream|true -detectorAtomicityProblem=AtomicityProblem|true -detectorBadAppletConstructor=BadAppletConstructor|false -detectorBadResultSetAccess=BadResultSetAccess|true -detectorBadSyntaxForRegularExpression=BadSyntaxForRegularExpression|true -detectorBadUseOfReturnValue=BadUseOfReturnValue|true -detectorBadlyOverriddenAdapter=BadlyOverriddenAdapter|true -detectorBooleanReturnNull=BooleanReturnNull|true -detectorCallToUnsupportedMethod=CallToUnsupportedMethod|false -detectorCheckExpectedWarnings=CheckExpectedWarnings|false -detectorCheckImmutableAnnotation=CheckImmutableAnnotation|true -detectorCheckRelaxingNullnessAnnotation=CheckRelaxingNullnessAnnotation|true -detectorCheckTypeQualifiers=CheckTypeQualifiers|true -detectorCloneIdiom=CloneIdiom|true -detectorComparatorIdiom=ComparatorIdiom|true -detectorConfusedInheritance=ConfusedInheritance|true -detectorConfusionBetweenInheritedAndOuterMethod=ConfusionBetweenInheritedAndOuterMethod|true -detectorCrossSiteScripting=CrossSiteScripting|true -detectorDefaultEncodingDetector=DefaultEncodingDetector|true -detectorDoInsideDoPrivileged=DoInsideDoPrivileged|true -detectorDontCatchIllegalMonitorStateException=DontCatchIllegalMonitorStateException|true -detectorDontIgnoreResultOfPutIfAbsent=DontIgnoreResultOfPutIfAbsent|true -detectorDontUseEnum=DontUseEnum|true -detectorDroppedException=DroppedException|true -detectorDumbMethodInvocations=DumbMethodInvocations|true -detectorDumbMethods=DumbMethods|true -detectorDuplicateBranches=DuplicateBranches|true -detectorEmptyZipFileEntry=EmptyZipFileEntry|false -detectorEqualsOperandShouldHaveClassCompatibleWithThis=EqualsOperandShouldHaveClassCompatibleWithThis|true -detectorExplicitSerialization=ExplicitSerialization|true -detectorFinalizerNullsFields=FinalizerNullsFields|true -detectorFindBadCast2=FindBadCast2|true -detectorFindBadForLoop=FindBadForLoop|true -detectorFindCircularDependencies=FindCircularDependencies|false -detectorFindDeadLocalStores=FindDeadLocalStores|true -detectorFindDoubleCheck=FindDoubleCheck|true -detectorFindEmptySynchronizedBlock=FindEmptySynchronizedBlock|true -detectorFindFieldSelfAssignment=FindFieldSelfAssignment|true -detectorFindFinalizeInvocations=FindFinalizeInvocations|true -detectorFindFloatEquality=FindFloatEquality|true -detectorFindHEmismatch=FindHEmismatch|true -detectorFindInconsistentSync2=FindInconsistentSync2|true -detectorFindJSR166LockMonitorenter=FindJSR166LockMonitorenter|true -detectorFindLocalSelfAssignment2=FindLocalSelfAssignment2|true -detectorFindMaskedFields=FindMaskedFields|true -detectorFindMismatchedWaitOrNotify=FindMismatchedWaitOrNotify|true -detectorFindNakedNotify=FindNakedNotify|true -detectorFindNonShortCircuit=FindNonShortCircuit|true -detectorFindNullDeref=FindNullDeref|true -detectorFindNullDerefsInvolvingNonShortCircuitEvaluation=FindNullDerefsInvolvingNonShortCircuitEvaluation|true -detectorFindOpenStream=FindOpenStream|true -detectorFindPuzzlers=FindPuzzlers|true -detectorFindRefComparison=FindRefComparison|true -detectorFindReturnRef=FindReturnRef|true -detectorFindRoughConstants=FindRoughConstants|true -detectorFindRunInvocations=FindRunInvocations|true -detectorFindSelfComparison=FindSelfComparison|true -detectorFindSelfComparison2=FindSelfComparison2|true -detectorFindSleepWithLockHeld=FindSleepWithLockHeld|true -detectorFindSpinLoop=FindSpinLoop|true -detectorFindSqlInjection=FindSqlInjection|true -detectorFindTwoLockWait=FindTwoLockWait|true -detectorFindUncalledPrivateMethods=FindUncalledPrivateMethods|true -detectorFindUnconditionalWait=FindUnconditionalWait|true -detectorFindUninitializedGet=FindUninitializedGet|true -detectorFindUnrelatedTypesInGenericContainer=FindUnrelatedTypesInGenericContainer|true -detectorFindUnreleasedLock=FindUnreleasedLock|true -detectorFindUnsatisfiedObligation=FindUnsatisfiedObligation|true -detectorFindUnsyncGet=FindUnsyncGet|true -detectorFindUseOfNonSerializableValue=FindUseOfNonSerializableValue|true -detectorFindUselessControlFlow=FindUselessControlFlow|true -detectorFormatStringChecker=FormatStringChecker|true -detectorHugeSharedStringConstants=HugeSharedStringConstants|true -detectorIDivResultCastToDouble=IDivResultCastToDouble|true -detectorIncompatMask=IncompatMask|true -detectorInconsistentAnnotations=InconsistentAnnotations|true -detectorInefficientIndexOf=InefficientIndexOf|true -detectorInefficientMemberAccess=InefficientMemberAccess|false -detectorInefficientToArray=InefficientToArray|true -detectorInfiniteLoop=InfiniteLoop|true -detectorInfiniteRecursiveLoop=InfiniteRecursiveLoop|true -detectorInheritanceUnsafeGetResource=InheritanceUnsafeGetResource|true -detectorInitializationChain=InitializationChain|true -detectorInitializeNonnullFieldsInConstructor=InitializeNonnullFieldsInConstructor|true -detectorInstantiateStaticClass=InstantiateStaticClass|true -detectorIntCast2LongAsInstant=IntCast2LongAsInstant|true -detectorInvalidJUnitTest=InvalidJUnitTest|true -detectorIteratorIdioms=IteratorIdioms|true -detectorLazyInit=LazyInit|true -detectorLoadOfKnownNullValue=LoadOfKnownNullValue|true -detectorLostLoggerDueToWeakReference=LostLoggerDueToWeakReference|true -detectorMethodReturnCheck=MethodReturnCheck|true -detectorMultithreadedInstanceAccess=MultithreadedInstanceAccess|true -detectorMutableLock=MutableLock|true -detectorMutableStaticFields=MutableStaticFields|true -detectorNaming=Naming|true -detectorNoteUnconditionalParamDerefs=NoteUnconditionalParamDerefs|true -detectorNumberConstructor=NumberConstructor|true -detectorOptionalReturnNull=OptionalReturnNull|true -detectorOverridingEqualsNotSymmetrical=OverridingEqualsNotSymmetrical|true -detectorPreferZeroLengthArrays=PreferZeroLengthArrays|true -detectorPublicSemaphores=PublicSemaphores|false -detectorQuestionableBooleanAssignment=QuestionableBooleanAssignment|true -detectorReadOfInstanceFieldInMethodInvokedByConstructorInSuperclass=ReadOfInstanceFieldInMethodInvokedByConstructorInSuperclass|true -detectorReadReturnShouldBeChecked=ReadReturnShouldBeChecked|true -detectorRedundantInterfaces=RedundantInterfaces|true -detectorRepeatedConditionals=RepeatedConditionals|true -detectorRuntimeExceptionCapture=RuntimeExceptionCapture|true -detectorSerializableIdiom=SerializableIdiom|true -detectorStartInConstructor=StartInConstructor|true -detectorStaticCalendarDetector=StaticCalendarDetector|true -detectorStringConcatenation=StringConcatenation|true -detectorSuperfluousInstanceOf=SuperfluousInstanceOf|true -detectorSuspiciousThreadInterrupted=SuspiciousThreadInterrupted|true -detectorSwitchFallthrough=SwitchFallthrough|true -detectorSynchronizationOnSharedBuiltinConstant=SynchronizationOnSharedBuiltinConstant|true -detectorSynchronizeAndNullCheckField=SynchronizeAndNullCheckField|true -detectorSynchronizeOnClassLiteralNotGetClass=SynchronizeOnClassLiteralNotGetClass|true -detectorSynchronizingOnContentsOfFieldToProtectField=SynchronizingOnContentsOfFieldToProtectField|true -detectorURLProblems=URLProblems|true -detectorUncallableMethodOfAnonymousClass=UncallableMethodOfAnonymousClass|true -detectorUnnecessaryMath=UnnecessaryMath|true -detectorUnreadFields=UnreadFields|true -detectorUselessSubclassMethod=UselessSubclassMethod|false -detectorVarArgsProblems=VarArgsProblems|true -detectorVolatileUsage=VolatileUsage|true -detectorWaitInLoop=WaitInLoop|true -detectorWrongMapIterator=WrongMapIterator|true -detectorXMLFactoryBypass=XMLFactoryBypass|true -detector_threshold=2 -effort=default -filter_settings=Medium|BAD_PRACTICE,CORRECTNESS,EXPERIMENTAL,MT_CORRECTNESS,PERFORMANCE,STYLE|false|15 -filter_settings_neg=MALICIOUS_CODE,SECURITY,NOISE,I18N| -run_at_full_build=true diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 5b781ec6d952..000000000000 --- a/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,3 +0,0 @@ -eclipse.preferences.version=1 -encoding//src/main/java=UTF-8 -encoding//src/test/java=UTF-8 diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 83d343fa7442..000000000000 --- a/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,98 +0,0 @@ -=\=\=\=\=\=\= -<<<<<<<=HEAD ->>>>>>>=ef72daa81c73f99e2156f5bfe8127591fc6358e9 -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled -org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore -org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull -org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault -org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable -org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 -org.eclipse.jdt.core.compiler.compliance=1.7 -org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.autoboxing=ignore -org.eclipse.jdt.core.compiler.problem.comparingIdentical=error -org.eclipse.jdt.core.compiler.problem.deadCode=warning -org.eclipse.jdt.core.compiler.problem.deprecation=warning -org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled -org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled -org.eclipse.jdt.core.compiler.problem.discouragedReference=warning -org.eclipse.jdt.core.compiler.problem.emptyStatement=warning -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning -org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore -org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled -org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore -org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning -org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning -org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning -org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled -org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning -org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning -org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning -org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore -org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning -org.eclipse.jdt.core.compiler.problem.missingDefaultCase=warning -org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning -org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled -org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=warning -org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning -org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled -org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning -org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=warning -org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error -org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=error -org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore -org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning -org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error -org.eclipse.jdt.core.compiler.problem.nullReference=warning -org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error -org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning -org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning -org.eclipse.jdt.core.compiler.problem.parameterAssignment=warning -org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=error -org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore -org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore -org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning -org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning -org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning -org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warning -org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning -org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore -org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore -org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled -org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning -org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled -org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled -org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled -org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore -org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning -org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=disabled -org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning -org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning -org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore -org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning -org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning -org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning -org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled -org.eclipse.jdt.core.compiler.problem.unusedImport=warning -org.eclipse.jdt.core.compiler.problem.unusedLabel=warning -org.eclipse.jdt.core.compiler.problem.unusedLocal=warning -org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=warning -org.eclipse.jdt.core.compiler.problem.unusedParameter=warning -org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled -org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning -org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning -org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning -org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=1.7 diff --git a/.settings/org.eclipse.ltk.core.refactoring.prefs b/.settings/org.eclipse.ltk.core.refactoring.prefs deleted file mode 100644 index b196c64a3418..000000000000 --- a/.settings/org.eclipse.ltk.core.refactoring.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false diff --git a/.settings/org.eclipse.m2e.core.prefs b/.settings/org.eclipse.m2e.core.prefs deleted file mode 100644 index f897a7f1cb23..000000000000 --- a/.settings/org.eclipse.m2e.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -activeProfiles= -eclipse.preferences.version=1 -resolveWorkspaceProjects=true -version=1 diff --git a/google-api-grpc/pom.xml b/google-api-grpc/pom.xml index 3b398f94ab71..37c720b4f4cd 100644 --- a/google-api-grpc/pom.xml +++ b/google-api-grpc/pom.xml @@ -80,7 +80,7 @@ github-pages-site Deployment through GitHub's site deployment plugin - site + site/google-api-grpc diff --git a/google-cloud-clients/pom.xml b/google-cloud-clients/pom.xml index 4f6a41a5420e..4c4d2edd4eaa 100644 --- a/google-cloud-clients/pom.xml +++ b/google-cloud-clients/pom.xml @@ -153,7 +153,7 @@ UTF-8 UTF-8 github - google-cloud + google-cloud-clients 0.47.1-alpha-SNAPSHOT 1.23.0 1.25.0 diff --git a/src/site/resources/css/github.min.css b/google-cloud-clients/src/site/resources/css/github.min.css similarity index 100% rename from src/site/resources/css/github.min.css rename to google-cloud-clients/src/site/resources/css/github.min.css diff --git a/src/site/resources/css/normalize.css b/google-cloud-clients/src/site/resources/css/normalize.css similarity index 100% rename from src/site/resources/css/normalize.css rename to google-cloud-clients/src/site/resources/css/normalize.css diff --git a/src/site/resources/css/site.css b/google-cloud-clients/src/site/resources/css/site.css similarity index 100% rename from src/site/resources/css/site.css rename to google-cloud-clients/src/site/resources/css/site.css diff --git a/src/site/resources/img/icon-arrow-bullet.svg b/google-cloud-clients/src/site/resources/img/icon-arrow-bullet.svg similarity index 98% rename from src/site/resources/img/icon-arrow-bullet.svg rename to google-cloud-clients/src/site/resources/img/icon-arrow-bullet.svg index dd9acb566eb8..cdeb36e55885 100644 --- a/src/site/resources/img/icon-arrow-bullet.svg +++ b/google-cloud-clients/src/site/resources/img/icon-arrow-bullet.svg @@ -1,7 +1,7 @@ - - - - - - + + + + + + diff --git a/src/site/resources/img/icon-dropdown-faq.svg b/google-cloud-clients/src/site/resources/img/icon-dropdown-faq.svg similarity index 98% rename from src/site/resources/img/icon-dropdown-faq.svg rename to google-cloud-clients/src/site/resources/img/icon-dropdown-faq.svg index 786bcdc7d131..16128ef4e132 100644 --- a/src/site/resources/img/icon-dropdown-faq.svg +++ b/google-cloud-clients/src/site/resources/img/icon-dropdown-faq.svg @@ -1,7 +1,7 @@ - - - - - - + + + + + + diff --git a/src/site/resources/img/icon-dropdown.svg b/google-cloud-clients/src/site/resources/img/icon-dropdown.svg similarity index 98% rename from src/site/resources/img/icon-dropdown.svg rename to google-cloud-clients/src/site/resources/img/icon-dropdown.svg index 3642565ff6b5..6c3105889369 100644 --- a/src/site/resources/img/icon-dropdown.svg +++ b/google-cloud-clients/src/site/resources/img/icon-dropdown.svg @@ -1,7 +1,7 @@ - - - - - - + + + + + + diff --git a/src/site/resources/img/icon-lang-dotnet.svg b/google-cloud-clients/src/site/resources/img/icon-lang-dotnet.svg similarity index 100% rename from src/site/resources/img/icon-lang-dotnet.svg rename to google-cloud-clients/src/site/resources/img/icon-lang-dotnet.svg diff --git a/src/site/resources/img/icon-lang-go.svg b/google-cloud-clients/src/site/resources/img/icon-lang-go.svg similarity index 100% rename from src/site/resources/img/icon-lang-go.svg rename to google-cloud-clients/src/site/resources/img/icon-lang-go.svg diff --git a/src/site/resources/img/icon-lang-java-duke-white.svg b/google-cloud-clients/src/site/resources/img/icon-lang-java-duke-white.svg similarity index 100% rename from src/site/resources/img/icon-lang-java-duke-white.svg rename to google-cloud-clients/src/site/resources/img/icon-lang-java-duke-white.svg diff --git a/src/site/resources/img/icon-lang-java-duke.svg b/google-cloud-clients/src/site/resources/img/icon-lang-java-duke.svg similarity index 100% rename from src/site/resources/img/icon-lang-java-duke.svg rename to google-cloud-clients/src/site/resources/img/icon-lang-java-duke.svg diff --git a/src/site/resources/img/icon-lang-nodejs.svg b/google-cloud-clients/src/site/resources/img/icon-lang-nodejs.svg similarity index 98% rename from src/site/resources/img/icon-lang-nodejs.svg rename to google-cloud-clients/src/site/resources/img/icon-lang-nodejs.svg index 24a4addc3c57..e7a2fe475c41 100644 --- a/src/site/resources/img/icon-lang-nodejs.svg +++ b/google-cloud-clients/src/site/resources/img/icon-lang-nodejs.svg @@ -1,16 +1,16 @@ - - - - - - - - - - - - + + + + + + + + + + + + diff --git a/src/site/resources/img/icon-lang-php.svg b/google-cloud-clients/src/site/resources/img/icon-lang-php.svg similarity index 100% rename from src/site/resources/img/icon-lang-php.svg rename to google-cloud-clients/src/site/resources/img/icon-lang-php.svg diff --git a/src/site/resources/img/icon-lang-python.svg b/google-cloud-clients/src/site/resources/img/icon-lang-python.svg similarity index 98% rename from src/site/resources/img/icon-lang-python.svg rename to google-cloud-clients/src/site/resources/img/icon-lang-python.svg index bc4737703c35..d6da4a5d3592 100644 --- a/src/site/resources/img/icon-lang-python.svg +++ b/google-cloud-clients/src/site/resources/img/icon-lang-python.svg @@ -1,21 +1,21 @@ - - - - - - - - - - - + + + + + + + + + + + diff --git a/src/site/resources/img/icon-lang-ruby.svg b/google-cloud-clients/src/site/resources/img/icon-lang-ruby.svg similarity index 100% rename from src/site/resources/img/icon-lang-ruby.svg rename to google-cloud-clients/src/site/resources/img/icon-lang-ruby.svg diff --git a/src/site/resources/img/icon-link-github.svg b/google-cloud-clients/src/site/resources/img/icon-link-github.svg similarity index 99% rename from src/site/resources/img/icon-link-github.svg rename to google-cloud-clients/src/site/resources/img/icon-link-github.svg index 2404f8b0be06..af74605fc6d1 100644 --- a/src/site/resources/img/icon-link-github.svg +++ b/google-cloud-clients/src/site/resources/img/icon-link-github.svg @@ -1,19 +1,19 @@ - - - - - - + + + + + + diff --git a/src/site/resources/img/icon-link-package-manager.svg b/google-cloud-clients/src/site/resources/img/icon-link-package-manager.svg similarity index 97% rename from src/site/resources/img/icon-link-package-manager.svg rename to google-cloud-clients/src/site/resources/img/icon-link-package-manager.svg index 3a12655fe6f9..d9d77111a14b 100644 --- a/src/site/resources/img/icon-link-package-manager.svg +++ b/google-cloud-clients/src/site/resources/img/icon-link-package-manager.svg @@ -1,19 +1,19 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + diff --git a/src/site/resources/img/icon-link-stackoverflow.svg b/google-cloud-clients/src/site/resources/img/icon-link-stackoverflow.svg similarity index 98% rename from src/site/resources/img/icon-link-stackoverflow.svg rename to google-cloud-clients/src/site/resources/img/icon-link-stackoverflow.svg index e1a1f789a897..d59125875d35 100644 --- a/src/site/resources/img/icon-link-stackoverflow.svg +++ b/google-cloud-clients/src/site/resources/img/icon-link-stackoverflow.svg @@ -1,16 +1,16 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + diff --git a/src/site/resources/img/icon-menu.svg b/google-cloud-clients/src/site/resources/img/icon-menu.svg similarity index 98% rename from src/site/resources/img/icon-menu.svg rename to google-cloud-clients/src/site/resources/img/icon-menu.svg index 98d3e7073cde..a184966934d1 100644 --- a/src/site/resources/img/icon-menu.svg +++ b/google-cloud-clients/src/site/resources/img/icon-menu.svg @@ -1,11 +1,11 @@ - - - - - - - - - - + + + + + + + + + + diff --git a/src/site/resources/img/icon-table-check.svg b/google-cloud-clients/src/site/resources/img/icon-table-check.svg similarity index 98% rename from src/site/resources/img/icon-table-check.svg rename to google-cloud-clients/src/site/resources/img/icon-table-check.svg index 7934bef97f06..3ad540204b97 100644 --- a/src/site/resources/img/icon-table-check.svg +++ b/google-cloud-clients/src/site/resources/img/icon-table-check.svg @@ -1,7 +1,7 @@ - - - - - - + + + + + + diff --git a/src/site/resources/img/lang-bg.png b/google-cloud-clients/src/site/resources/img/lang-bg.png similarity index 100% rename from src/site/resources/img/lang-bg.png rename to google-cloud-clients/src/site/resources/img/lang-bg.png diff --git a/src/site/resources/img/logo-full.svg b/google-cloud-clients/src/site/resources/img/logo-full.svg similarity index 99% rename from src/site/resources/img/logo-full.svg rename to google-cloud-clients/src/site/resources/img/logo-full.svg index 3b84037fccc6..b70ddbbddaa0 100644 --- a/src/site/resources/img/logo-full.svg +++ b/google-cloud-clients/src/site/resources/img/logo-full.svg @@ -1,112 +1,112 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/site/resources/img/logo.svg b/google-cloud-clients/src/site/resources/img/logo.svg similarity index 98% rename from src/site/resources/img/logo.svg rename to google-cloud-clients/src/site/resources/img/logo.svg index 6c515095c5ad..385c7ff95349 100644 --- a/src/site/resources/img/logo.svg +++ b/google-cloud-clients/src/site/resources/img/logo.svg @@ -1,25 +1,25 @@ - - - - - - - - - + + + + + + + + + diff --git a/src/site/resources/index.html b/google-cloud-clients/src/site/resources/index.html similarity index 97% rename from src/site/resources/index.html rename to google-cloud-clients/src/site/resources/index.html index 6eebe47daff6..a7be38cfb3dd 100644 --- a/src/site/resources/index.html +++ b/google-cloud-clients/src/site/resources/index.html @@ -77,12 +77,6 @@

google-cloud

Google Cloud Client Library for Java - an idiomatic, intuitive, and natural way for Java developers to integrate with Google Cloud Platform services, like Cloud Datastore and Cloud Storage.

-

Quickstart with Maven: add google-cloud to your pom.xml

- 
<dependency>
-  <groupId>com.google.cloud</groupId>
-  <artifactId>google-cloud</artifactId>
-  <version>{{SITE_VERSION}}</version>
-</dependency>
diff --git a/src/site/resources/js/main.js b/google-cloud-clients/src/site/resources/js/main.js similarity index 100% rename from src/site/resources/js/main.js rename to google-cloud-clients/src/site/resources/js/main.js diff --git a/src/site/resources/js/plugins.js b/google-cloud-clients/src/site/resources/js/plugins.js similarity index 100% rename from src/site/resources/js/plugins.js rename to google-cloud-clients/src/site/resources/js/plugins.js diff --git a/src/site/resources/js/vendor/highlight.pack.js b/google-cloud-clients/src/site/resources/js/vendor/highlight.pack.js similarity index 100% rename from src/site/resources/js/vendor/highlight.pack.js rename to google-cloud-clients/src/site/resources/js/vendor/highlight.pack.js diff --git a/src/site/resources/js/vendor/jquery-1.10.2.min.js b/google-cloud-clients/src/site/resources/js/vendor/jquery-1.10.2.min.js similarity index 100% rename from src/site/resources/js/vendor/jquery-1.10.2.min.js rename to google-cloud-clients/src/site/resources/js/vendor/jquery-1.10.2.min.js diff --git a/src/site/resources/js/vendor/modernizr-2.6.2.min.js b/google-cloud-clients/src/site/resources/js/vendor/modernizr-2.6.2.min.js similarity index 100% rename from src/site/resources/js/vendor/modernizr-2.6.2.min.js rename to google-cloud-clients/src/site/resources/js/vendor/modernizr-2.6.2.min.js diff --git a/src/site/resources/js/vendor/prettify.js b/google-cloud-clients/src/site/resources/js/vendor/prettify.js similarity index 100% rename from src/site/resources/js/vendor/prettify.js rename to google-cloud-clients/src/site/resources/js/vendor/prettify.js diff --git a/pom.xml b/pom.xml index f568bb6d57aa..d743fdb89e22 100644 --- a/pom.xml +++ b/pom.xml @@ -1,5 +1,7 @@ - + 4.0.0 com.google.api google-cloud-java diff --git a/src/site/site.xml b/src/site/site.xml deleted file mode 100644 index 13981f041d2b..000000000000 --- a/src/site/site.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - org.apache.maven.skins - maven-fluido-skin - 1.4 - - - - - - - - diff --git a/utilities/create_site.sh b/utilities/create_site.sh deleted file mode 100755 index 980611ff2e3d..000000000000 --- a/utilities/create_site.sh +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/bash - -set -e - -SITE_VERSION=$1 -SITE_VERSION_BASE=$(sed -r 's/([0-9]+\.[0-9]+\.[0-9]+).*/\1/' <<< "$SITE_VERSION") - -echo "Creating site for google-cloud-java $SITE_VERSION_BASE" - -if [ -z "$SITE_VERSION_BASE" ]; then - echo "First arg (version) not provided, so we're exiting." - exit 1 -fi - -git clone --branch gh-pages --single-branch https://github.com/GoogleCloudPlatform/google-cloud-java/ tmp_gh-pages -mkdir -p tmp_gh-pages/$SITE_VERSION_BASE -mvn site -Djava.util.logging.config.file=logging.properties -mvn site:stage --quiet -Djava.util.logging.config.file=logging.properties -DtopSiteURL=https://googlecloudplatform.github.io/google-cloud-java - -rm -rf tmp_gh-pages/latest -mkdir tmp_gh-pages/latest -version_bases=(${SITE_VERSION_BASE} latest) -for version_base in ${version_bases[@]} -do - cd tmp_gh-pages - cp -r ../target/staging/*/* $version_base - sed -i "s/{{SITE_VERSION}}/$SITE_VERSION/g" ${version_base}/index.html # Update "Quickstart with Maven" to reflect version change - git add $version_base - cd .. -done - -cd tmp_gh-pages -echo "" > index.html -git add index.html -echo "" > apidocs/index.html -git add apidocs/index.html - -echo "Site generated under tmp_gh-pages/. The changes must be committed from that directory." diff --git a/utilities/stage_release.sh b/utilities/stage_release.sh deleted file mode 100755 index 2a5193fa0de8..000000000000 --- a/utilities/stage_release.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/bash - -set -e - -SITE_VERSION=$(mvn org.apache.maven.plugins:maven-help-plugin:2.1.1:evaluate -Dexpression=project.version | grep -Ev '(^\[|\w+:)') -echo "Used the maven-help-plugin to determine that the version is $SITE_VERSION" -if [ -z "$SITE_VERSION" ]; then - echo "Could not determine the version, so we're exiting." - exit 1 -fi - -# Deploy the build artifacts to Sonatype -./utilities/deploy.sh "$SITE_VERSION" - -if [ "${SITE_VERSION##*-}" != "SNAPSHOT" ]; then - # Create website - ./utilities/create_site.sh "$SITE_VERSION" - - cd tmp_gh-pages - git commit --quiet -m "Added a new site for version $SITE_VERSION and updated the root directory's redirect. [ci skip]" -fi diff --git a/utilities/stage_sites.py b/utilities/stage_sites.py new file mode 100644 index 000000000000..ef5852926225 --- /dev/null +++ b/utilities/stage_sites.py @@ -0,0 +1,56 @@ +# Copyright 2018 Google LLC +# +# 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. + +# This scripts creates sites for `google-cloud-clients` and `google-api-grpc` +# modules and commits (but does not push) them to gh-pages branch of +# GoogleCloudPlatform/google-cloud-java github repository. + +# Usage: +# python utilities/stage_sites.py + +import subprocess +import sys + + +def stage_sites(sites, gh_pages, git_url, top_site_url): + _run(['git', 'clone', '--branch', 'gh-pages', '--single-branch', git_url, + gh_pages]) + _run(['mkdir', '-p', gh_pages]) + for site in sites: + _create_site(site, gh_pages, top_site_url) + _run(['git', 'add', '.'], gh_pages) + _run(['git', 'commit', '-m', + "Regenerate documentation for %s. [ci skip]" % ', '.join(sites)], + gh_pages) + + +def _create_site(site_name, gh_pages, top_site_url): + _run(['mvn', 'site'], site_name) + _run(['mvn', 'site:stage', '-q', + "-DtopSiteURL=%s/%s" % (top_site_url, site_name)], + site_name) + _run(['rm', '-rf', site_name], gh_pages) + _run(['cp', '-r', "%s/target/staging/site/%s" % (site_name, site_name), + gh_pages]) + + +def _run(command, cwd=None): + print("\033[1;36mExecute command:\033[0m %s" % ' '.join(command)) + subprocess.check_call(command, cwd=cwd, stdout=sys.stdout, stderr=sys.stderr) + + +if __name__ == '__main__': + stage_sites(['google-api-grpc', 'google-cloud-clients'], 'tmp_gh-pages', + 'https://github.com/GoogleCloudPlatform/google-cloud-java', + 'https://googlecloudplatform.github.io/google-cloud-java')