From d4109b185897249a62b854248ad449215f0b5676 Mon Sep 17 00:00:00 2001 From: Romain Brenguier Date: Thu, 29 Oct 2026 15:18:07 +0100 Subject: [PATCH] RC-352 Move sonar-server ruling project to the repository root --- .../sonar-server => sonar-server}/COPYING | 0 .../sonar-server => sonar-server}/pom.xml | 2 +- .../src/main/java/org/sonar/ce/CeModule.java | 0 .../java/org/sonar/ce/http/CeHttpClient.java | 0 .../java/org/sonar/ce/http/package-info.java | 0 .../main/java/org/sonar/ce/log/CeLogging.java | 0 .../org/sonar/ce/log/CeProcessLogging.java | 0 .../java/org/sonar/ce/log/package-info.java | 0 .../DefaultOrganizationLoader.java | 0 .../sonar/ce/organization/package-info.java | 0 .../main/java/org/sonar/ce/queue/CeQueue.java | 0 .../java/org/sonar/ce/queue/CeQueueImpl.java | 0 .../main/java/org/sonar/ce/queue/CeTask.java | 0 .../java/org/sonar/ce/queue/CeTaskResult.java | 0 .../java/org/sonar/ce/queue/CeTaskSubmit.java | 0 .../java/org/sonar/ce/queue/package-info.java | 0 .../settings/ProjectConfigurationFactory.java | 0 .../sonar/ce/settings/ProjectSettings.java | 0 .../org/sonar/ce/settings/SettingsLoader.java | 0 .../org/sonar/ce/settings/package-info.java | 0 .../ce/taskprocessor/CeTaskProcessor.java | 0 .../ReportTaskProcessorDeclaration.java | 0 .../sonar/ce/taskprocessor/package-info.java | 0 .../org/sonar/server/app/EmbeddedTomcat.java | 0 .../org/sonar/server/app/NullJarScanner.java | 0 .../server/app/ProcessCommandWrapper.java | 0 .../server/app/ProcessCommandWrapperImpl.java | 0 .../server/app/ProgrammaticLogbackValve.java | 0 .../sonar/server/app/RestartFlagHolder.java | 0 .../server/app/RestartFlagHolderImpl.java | 0 .../server/app/ServerProcessLogging.java | 0 .../org/sonar/server/app/TomcatAccessLog.java | 0 .../sonar/server/app/TomcatConnectors.java | 0 .../org/sonar/server/app/TomcatContexts.java | 0 .../sonar/server/app/TomcatStartupLogs.java | 0 .../java/org/sonar/server/app/WebServer.java | 0 .../server/app/WebServerProcessLogging.java | 0 .../org/sonar/server/app/package-info.java | 0 .../authentication/AuthenticationError.java | 0 .../authentication/AuthenticationFilter.java | 0 .../authentication/AuthenticationModule.java | 0 .../authentication/BaseContextFactory.java | 0 .../authentication/BasicAuthenticator.java | 0 .../sonar/server/authentication/Cookies.java | 0 .../CredentialsAuthenticator.java | 0 .../IdentityProviderRepository.java | 0 .../server/authentication/InitFilter.java | 0 .../authentication/JwtCsrfVerifier.java | 0 .../server/authentication/JwtHttpHandler.java | 0 .../server/authentication/JwtSerializer.java | 0 .../authentication/OAuth2CallbackFilter.java | 0 .../authentication/OAuth2ContextFactory.java | 0 .../authentication/OAuthCsrfVerifier.java | 0 .../authentication/RealmAuthenticator.java | 0 .../authentication/SsoAuthenticator.java | 0 .../UserIdentityAuthenticator.java | 0 .../UserSessionInitializer.java | 0 .../event/AuthenticationEvent.java | 0 .../event/AuthenticationEventImpl.java | 0 .../event/AuthenticationException.java | 0 .../authentication/event/package-info.java | 0 .../server/authentication/package-info.java | 0 .../authentication/ws/AuthenticationWs.java | 0 .../ws/AuthenticationWsAction.java | 0 .../server/authentication/ws/LoginAction.java | 0 .../authentication/ws/LogoutAction.java | 0 .../authentication/ws/ValidateAction.java | 0 .../authentication/ws/package-info.java | 0 .../org/sonar/server/batch/BatchIndex.java | 0 .../java/org/sonar/server/batch/BatchWs.java | 0 .../org/sonar/server/batch/BatchWsAction.java | 0 .../org/sonar/server/batch/BatchWsModule.java | 0 .../org/sonar/server/batch/FileAction.java | 0 .../org/sonar/server/batch/IndexAction.java | 0 .../org/sonar/server/batch/IssuesAction.java | 0 .../java/org/sonar/server/batch/Messages.java | 0 .../org/sonar/server/batch/ProjectAction.java | 0 .../sonar/server/batch/ProjectDataLoader.java | 0 .../sonar/server/batch/ProjectDataQuery.java | 0 .../org/sonar/server/batch/package-info.java | 0 .../sonar/server/ce/ws/ActivityAction.java | 0 .../server/ce/ws/ActivityStatusAction.java | 0 .../org/sonar/server/ce/ws/CancelAction.java | 0 .../sonar/server/ce/ws/CancelAllAction.java | 0 .../java/org/sonar/server/ce/ws/CeWs.java | 0 .../org/sonar/server/ce/ws/CeWsAction.java | 0 .../org/sonar/server/ce/ws/CeWsModule.java | 0 .../sonar/server/ce/ws/ComponentAction.java | 0 .../sonar/server/ce/ws/IsQueueEmptyWs.java | 0 .../org/sonar/server/ce/ws/SubmitAction.java | 0 .../org/sonar/server/ce/ws/TaskAction.java | 0 .../org/sonar/server/ce/ws/TaskFormatter.java | 0 .../sonar/server/ce/ws/TaskTypesAction.java | 0 .../org/sonar/server/ce/ws/package-info.java | 0 .../component/ComponentCleanerService.java | 0 .../server/component/ComponentFinder.java | 0 .../server/component/ComponentService.java | 0 .../server/component/ComponentUpdater.java | 0 .../DefaultRubyComponentService.java | 0 .../sonar/server/component/NewComponent.java | 0 .../server/component/index/ComponentDoc.java | 0 .../server/component/index/ComponentHit.java | 0 .../index/ComponentHitsPerQualifier.java | 0 .../component/index/ComponentIndex.java | 0 .../index/ComponentIndexDefinition.java | 0 .../component/index/ComponentIndexQuery.java | 0 .../index/ComponentIndexResults.java | 0 .../component/index/ComponentIndexer.java | 0 .../server/component/index/package-info.java | 0 .../sonar/server/component/package-info.java | 0 .../sonar/server/component/ws/AppAction.java | 0 .../ws/ComponentDtoToWsComponent.java | 0 .../server/component/ws/ComponentsWs.java | 0 .../component/ws/ComponentsWsAction.java | 0 .../component/ws/ComponentsWsModule.java | 0 .../server/component/ws/FilterParser.java | 0 .../ws/ProjectMeasuresQueryFactory.java | 0 .../ws/ProjectMeasuresQueryValidator.java | 0 .../server/component/ws/ResourcesWs.java | 0 .../server/component/ws/SearchAction.java | 0 .../component/ws/SearchProjectsAction.java | 0 .../sonar/server/component/ws/ShowAction.java | 0 .../component/ws/SuggestionCategory.java | 0 .../component/ws/SuggestionsAction.java | 0 .../sonar/server/component/ws/TreeAction.java | 0 .../server/component/ws/package-info.java | 0 .../dbcleaner/IndexPurgeListener.java | 0 .../computation/dbcleaner/ProjectCleaner.java | 0 .../computation/dbcleaner/package-info.java | 0 .../server/computation/package-info.java | 0 .../computation/queue/ReportSubmitter.java | 0 .../computation/queue/package-info.java | 0 .../task/container/EagerStart.java | 0 .../task/container/TaskContainer.java | 0 .../task/container/TaskContainerImpl.java | 0 .../task/container/package-info.java | 0 .../ProjectAnalysisTaskModule.java | 0 .../projectanalysis/analysis/Analysis.java | 0 .../analysis/AnalysisMetadataHolder.java | 0 .../analysis/AnalysisMetadataHolderImpl.java | 0 .../MutableAnalysisMetadataHolder.java | 0 .../analysis/Organization.java | 0 .../analysis/package-info.java | 0 .../developer/PersistDevelopersDelegate.java | 0 .../api/developer/package-info.java | 0 .../api/measurecomputer/ComponentImpl.java | 0 .../MeasureComputerContextImpl.java | 0 .../MeasureComputerDefinitionImpl.java | 0 .../MeasureComputerWrapper.java | 0 .../api/measurecomputer/MeasureImpl.java | 0 .../api/measurecomputer/package-info.java | 0 .../api/posttask/CeTaskImpl.java | 0 .../api/posttask/ConditionImpl.java | 0 .../api/posttask/ConditionToCondition.java | 0 .../PostProjectAnalysisTasksExecutor.java | 0 .../api/posttask/ProjectImpl.java | 0 .../api/posttask/QualityGateImpl.java | 0 .../api/posttask/ScannerContextImpl.java | 0 .../api/posttask/package-info.java | 0 .../batch/BatchReportDirectoryHolder.java | 0 .../batch/BatchReportDirectoryHolderImpl.java | 0 .../batch/BatchReportReader.java | 0 .../batch/BatchReportReaderImpl.java | 0 .../MutableBatchReportDirectoryHolder.java | 0 .../projectanalysis/batch/package-info.java | 0 .../projectanalysis/component/Component.java | 0 .../component/ComponentCrawler.java | 0 .../component/ComponentFunctions.java | 0 .../component/ComponentImpl.java | 0 .../component/ComponentRootBuilder.java | 0 .../component/ComponentVisitor.java | 0 .../component/ConfigurationRepository.java | 0 .../ConfigurationRepositoryImpl.java | 0 .../component/CrawlerDepthLimit.java | 0 .../component/DbIdsRepository.java | 0 .../component/DbIdsRepositoryImpl.java | 0 .../DepthTraversalTypeAwareCrawler.java | 0 .../component/DequeBasedPath.java | 0 .../projectanalysis/component/Developer.java | 0 .../component/DisabledComponentsHolder.java | 0 .../DisabledComponentsHolderImpl.java | 0 .../component/FileAttributes.java | 0 .../component/MapBasedDbIdsRepository.java | 0 .../component/MutableDbIdsRepository.java | 0 .../MutableDisabledComponentsHolder.java | 0 .../component/MutableTreeRootHolder.java | 0 .../component/PathAwareCrawler.java | 0 .../component/PathAwareVisitor.java | 0 .../component/PathAwareVisitorAdapter.java | 0 .../component/PathAwareVisitorWrapper.java | 0 .../component/PathElementImpl.java | 0 .../component/ProjectViewAttributes.java | 0 .../component/ReportAttributes.java | 0 .../component/SubViewAttributes.java | 0 .../component/TreeRootHolder.java | 0 .../component/TreeRootHolderImpl.java | 0 .../component/TypeAwareVisitor.java | 0 .../component/TypeAwareVisitorAdapter.java | 0 .../component/TypeAwareVisitorWrapper.java | 0 .../component/UuidFactory.java | 0 .../component/VisitException.java | 0 .../component/VisitorWrapper.java | 0 .../component/VisitorsCrawler.java | 0 .../component/package-info.java | 0 .../container/ContainerFactory.java | 0 .../container/ContainerFactoryImpl.java | 0 ...ProjectAnalysisTaskContainerPopulator.java | 0 .../container/package-info.java | 0 .../duplication/AbstractDuplicate.java | 0 .../duplication/CrossProjectDuplicate.java | 0 .../CrossProjectDuplicationStatusHolder.java | 0 ...ossProjectDuplicationStatusHolderImpl.java | 0 .../duplication/DetailedTextBlock.java | 0 .../duplication/Duplicate.java | 0 .../duplication/Duplication.java | 0 .../duplication/DuplicationRepository.java | 0 .../DuplicationRepositoryImpl.java | 0 .../duplication/InProjectDuplicate.java | 0 .../duplication/InnerDuplicate.java | 0 .../IntegrateCrossProjectDuplications.java | 0 .../duplication/TextBlock.java | 0 .../duplication/package-info.java | 0 .../task/projectanalysis/event/Event.java | 0 .../event/EventRepository.java | 0 .../event/EventRepositoryImpl.java | 0 .../projectanalysis/event/package-info.java | 0 .../filemove/FileMoveDetectionStep.java | 0 .../filemove/FileSimilarity.java | 0 .../filemove/FileSimilarityImpl.java | 0 .../task/projectanalysis/filemove/Match.java | 0 .../filemove/MatchesByScore.java | 0 .../filemove/MovedFilesRepository.java | 0 .../filemove/MutableMovedFilesRepository.java | 0 .../MutableMovedFilesRepositoryImpl.java | 0 .../projectanalysis/filemove/ScoreMatrix.java | 0 .../filemove/SourceSimilarity.java | 0 .../filemove/SourceSimilarityImpl.java | 0 .../filemove/package-info.java | 0 .../ComputationTempFolderProvider.java | 0 .../filesystem/package-info.java | 0 .../formula/AverageFormula.java | 0 .../task/projectanalysis/formula/Counter.java | 0 .../formula/CounterInitializationContext.java | 0 .../formula/CreateMeasureContext.java | 0 .../formula/DistributionFormula.java | 0 .../task/projectanalysis/formula/Formula.java | 0 .../FormulaExecutorComponentVisitor.java | 0 .../projectanalysis/formula/SumFormula.java | 0 .../formula/VariationSumFormula.java | 0 .../formula/counter/DoubleValue.java | 0 .../formula/counter/IntSumCounter.java | 0 .../formula/counter/IntValue.java | 0 .../formula/counter/LongSumCounter.java | 0 .../formula/counter/LongValue.java | 0 .../formula/counter/RatingValue.java | 0 .../formula/counter/SumCounter.java | 0 .../formula/counter/package-info.java | 0 .../formula/coverage/CoverageFormula.java | 0 .../formula/coverage/CoverageUtils.java | 0 .../coverage/CoverageVariationFormula.java | 0 .../ElementsAndCoveredElementsCounter.java | 0 ...ntsAndCoveredElementsVariationCounter.java | 0 ...inesAndConditionsWithUncoveredCounter.java | 0 ...inesAndConditionsWithUncoveredFormula.java | 0 ...sAndConditionsWithUncoveredMetricKeys.java | 0 ...nditionsWithUncoveredVariationCounter.java | 0 ...nditionsWithUncoveredVariationFormula.java | 0 .../coverage/SingleWithUncoveredCounter.java | 0 .../coverage/SingleWithUncoveredFormula.java | 0 .../SingleWithUncoveredMetricKeys.java | 0 .../SingleWithUncoveredVariationCounter.java | 0 .../SingleWithUncoveredVariationFormula.java | 0 .../formula/coverage/package-info.java | 0 .../projectanalysis/formula/package-info.java | 0 .../issue/BaseIssuesLoader.java | 0 ...CloseIssuesOnRemovedComponentsVisitor.java | 0 .../issue/ComponentIssuesRepository.java | 0 .../issue/ComponentIssuesRepositoryImpl.java | 0 .../ComponentsWithUnprocessedIssues.java | 0 .../projectanalysis/issue/DebtCalculator.java | 0 .../issue/DefaultAssignee.java | 0 .../issue/EffortAggregator.java | 0 .../issue/IntegrateIssuesVisitor.java | 0 .../projectanalysis/issue/IssueAssigner.java | 0 .../projectanalysis/issue/IssueCache.java | 0 .../projectanalysis/issue/IssueCounter.java | 0 .../issue/IssueCreationDateCalculator.java | 0 .../projectanalysis/issue/IssueLifecycle.java | 0 .../projectanalysis/issue/IssueVisitor.java | 0 .../projectanalysis/issue/IssueVisitors.java | 0 ...ComponentUuidsHavingOpenIssuesVisitor.java | 0 .../issue/MovedIssueVisitor.java | 0 .../MutableComponentIssuesRepository.java | 0 .../issue/NewEffortAggregator.java | 0 .../issue/NewEffortCalculator.java | 0 .../task/projectanalysis/issue/Rule.java | 0 .../task/projectanalysis/issue/RuleImpl.java | 0 .../projectanalysis/issue/RuleRepository.java | 0 .../issue/RuleRepositoryImpl.java | 0 .../projectanalysis/issue/RuleTagsCopier.java | 0 .../projectanalysis/issue/RuleTypeCopier.java | 0 .../issue/ScmAccountToUser.java | 0 .../issue/ScmAccountToUserLoader.java | 0 .../issue/TrackerBaseInputFactory.java | 0 .../issue/TrackerExecution.java | 0 .../issue/TrackerRawInputFactory.java | 0 .../issue/UpdateConflictResolver.java | 0 .../commonrule/AbstractCoverageRule.java | 0 .../issue/commonrule/BranchCoverageRule.java | 0 .../issue/commonrule/CommentDensityRule.java | 0 .../issue/commonrule/CommonRule.java | 0 .../issue/commonrule/CommonRuleEngine.java | 0 .../commonrule/CommonRuleEngineImpl.java | 0 .../issue/commonrule/DuplicatedBlockRule.java | 0 .../issue/commonrule/LineCoverageRule.java | 0 .../issue/commonrule/SkippedTestRule.java | 0 .../issue/commonrule/TestErrorRule.java | 0 .../issue/commonrule/package-info.java | 0 .../issue/filter/IssueFilter.java | 0 .../issue/filter/IssuePattern.java | 0 .../issue/filter/package-info.java | 0 .../projectanalysis/issue/package-info.java | 0 .../language/LanguageRepository.java | 0 .../language/LanguageRepositoryImpl.java | 0 .../language/package-info.java | 0 .../measure/BatchMeasureToMeasure.java | 0 .../measure/BestValueOptimization.java | 0 .../measure/MapBasedRawMeasureRepository.java | 0 .../task/projectanalysis/measure/Measure.java | 0 .../measure/MeasureComputersHolder.java | 0 .../measure/MeasureComputersHolderImpl.java | 0 .../measure/MeasureComputersVisitor.java | 0 .../measure/MeasureDtoToMeasure.java | 0 .../projectanalysis/measure/MeasureKey.java | 0 .../measure/MeasureRepository.java | 0 .../measure/MeasureRepositoryImpl.java | 0 .../measure/MeasureToMeasureDto.java | 0 .../MutableMeasureComputersHolder.java | 0 .../measure/QualityGateStatus.java | 0 .../projectanalysis/measure/package-info.java | 0 .../EvaluatedCondition.java | 0 .../QualityGateDetailsData.java | 0 .../qualitygatedetails/package-info.java | 0 .../task/projectanalysis/metric/Metric.java | 0 .../metric/MetricDtoToMetric.java | 0 .../projectanalysis/metric/MetricImpl.java | 0 .../projectanalysis/metric/MetricModule.java | 0 .../metric/MetricRepository.java | 0 .../metric/MetricRepositoryImpl.java | 0 .../metric/ReportMetricValidator.java | 0 .../metric/ReportMetricValidatorImpl.java | 0 .../projectanalysis/metric/package-info.java | 0 .../task/projectanalysis/package-info.java | 0 .../task/projectanalysis/period/Period.java | 0 .../projectanalysis/period/PeriodHolder.java | 0 .../period/PeriodHolderImpl.java | 0 .../projectanalysis/period/package-info.java | 0 .../qualitygate/Condition.java | 0 .../qualitygate/ConditionEvaluator.java | 0 .../qualitygate/ConditionStatus.java | 0 .../qualitygate/EvaluationResult.java | 0 .../EvaluationResultTextConverter.java | 0 .../EvaluationResultTextConverterImpl.java | 0 .../qualitygate/MutableQualityGateHolder.java | 0 .../MutableQualityGateStatusHolder.java | 0 .../qualitygate/QualityGate.java | 0 .../qualitygate/QualityGateHolder.java | 0 .../qualitygate/QualityGateHolderImpl.java | 0 .../qualitygate/QualityGateService.java | 0 .../qualitygate/QualityGateServiceImpl.java | 0 .../qualitygate/QualityGateStatus.java | 0 .../qualitygate/QualityGateStatusHolder.java | 0 .../QualityGateStatusHolderImpl.java | 0 .../qualitygate/package-info.java | 0 .../MaintainabilityMeasuresVisitor.java | 0 .../NewMaintainabilityMeasuresVisitor.java | 0 ...ilityAndSecurityRatingMeasuresVisitor.java | 0 .../qualitymodel/RatingGrid.java | 0 .../qualitymodel/RatingSettings.java | 0 ...ilityAndSecurityRatingMeasuresVisitor.java | 0 .../qualitymodel/package-info.java | 0 .../qualityprofile/ActiveRule.java | 0 .../qualityprofile/ActiveRulesHolder.java | 0 .../qualityprofile/ActiveRulesHolderImpl.java | 0 .../qualityprofile/package-info.java | 0 .../task/projectanalysis/scm/Changeset.java | 0 .../task/projectanalysis/scm/DbScmInfo.java | 0 .../projectanalysis/scm/ReportScmInfo.java | 0 .../task/projectanalysis/scm/ScmInfo.java | 0 .../task/projectanalysis/scm/ScmInfoImpl.java | 0 .../scm/ScmInfoRepository.java | 0 .../scm/ScmInfoRepositoryImpl.java | 0 .../projectanalysis/scm/package-info.java | 0 .../source/ComputeFileSourceData.java | 0 .../source/CoverageLineReader.java | 0 .../source/DuplicationLineReader.java | 0 .../source/HighlightingLineReader.java | 0 .../source/LastCommitVisitor.java | 0 .../projectanalysis/source/LineReader.java | 0 .../source/RangeOffsetConverter.java | 0 .../source/ReportIterator.java | 0 .../projectanalysis/source/ScmLineReader.java | 0 .../source/SourceHashRepository.java | 0 .../source/SourceHashRepositoryImpl.java | 0 .../source/SourceLinesRepository.java | 0 .../source/SourceLinesRepositoryImpl.java | 0 .../source/SymbolsLineReader.java | 0 .../projectanalysis/source/package-info.java | 0 .../step/AbstractComputationSteps.java | 0 .../step/BuildComponentTreeStep.java | 0 .../step/CommentMeasuresStep.java | 0 .../step/ComplexityMeasuresStep.java | 0 .../step/ComputeMeasureVariationsStep.java | 0 .../step/ComputeQProfileMeasureStep.java | 0 .../step/CoverageMeasuresStep.java | 0 .../step/CustomMeasuresCopyStep.java | 0 .../step/DuplicationDataMeasuresStep.java | 0 .../step/DuplicationMeasuresStep.java | 0 .../step/EnableAnalysisStep.java | 0 .../step/ExecuteVisitorsStep.java | 0 .../step/ExtractReportStep.java | 0 .../step/GenerateAnalysisUuid.java | 0 .../step/IndexAnalysisStep.java | 0 .../LanguageDistributionMeasuresStep.java | 0 ...rossProjectDuplicationsRepositoryStep.java | 0 .../step/LoadDuplicationsFromReportStep.java | 0 .../step/LoadMeasureComputersStep.java | 0 .../projectanalysis/step/LoadPeriodsStep.java | 0 .../step/LoadQualityGateStep.java | 0 .../step/LoadQualityProfilesStep.java | 0 .../LoadReportAnalysisMetadataHolderStep.java | 0 .../step/NewCoverageMeasuresStep.java | 0 .../step/NewSizeMeasuresStep.java | 0 .../projectanalysis/step/PeriodResolver.java | 0 .../step/PersistAnalysisStep.java | 0 .../step/PersistComponentsStep.java | 0 ...rsistCrossProjectDuplicationIndexStep.java | 0 .../step/PersistDevelopersStep.java | 0 .../step/PersistEventsStep.java | 0 .../step/PersistFileSourcesStep.java | 0 .../step/PersistIssuesStep.java | 0 .../step/PersistMeasuresStep.java | 0 .../step/PersistProjectLinksStep.java | 0 .../step/PersistScannerContextStep.java | 0 .../step/PersistTestsStep.java | 0 .../step/PublishTaskResultStep.java | 0 .../step/PurgeDatastoresStep.java | 0 .../step/QualityGateEventsStep.java | 0 .../step/QualityGateMeasuresStep.java | 0 .../step/QualityProfileEventsStep.java | 0 .../step/ReportComputationSteps.java | 0 .../step/SendIssueNotificationsStep.java | 0 .../step/SizeMeasuresStep.java | 0 .../step/UnitTestMeasuresStep.java | 0 ...UpdateQualityProfilesLastUsedDateStep.java | 0 .../step/ValidateProjectStep.java | 0 .../projectanalysis/step/package-info.java | 0 .../taskprocessor/ReportTaskProcessor.java | 0 .../taskprocessor/package-info.java | 0 .../webhook/TestWebhookPayloadFactory.java | 0 .../task/projectanalysis/webhook/Webhook.java | 0 .../webhook/WebhookCaller.java | 0 .../webhook/WebhookCallerImpl.java | 0 .../webhook/WebhookDelivery.java | 0 .../webhook/WebhookDeliveryStorage.java | 0 .../webhook/WebhookModule.java | 0 .../webhook/WebhookPayload.java | 0 .../webhook/WebhookPayloadFactory.java | 0 .../webhook/WebhookPayloadFactoryImpl.java | 0 .../webhook/WebhookPostTask.java | 0 .../projectanalysis/webhook/package-info.java | 0 .../task/step/ComputationStep.java | 0 .../task/step/ComputationStepExecutor.java | 0 .../task/step/ComputationSteps.java | 0 .../computation/task/step/package-info.java | 0 .../MutableTaskResultHolder.java | 0 .../MutableTaskResultHolderImpl.java | 0 .../taskprocessor/TaskResultHolder.java | 0 .../computation/util/InitializedProperty.java | 0 .../server/computation/util/package-info.java | 0 .../debt/DebtModelPluginRepository.java | 0 .../server/debt/DebtModelXMLExporter.java | 0 .../server/debt/DebtRulesXMLImporter.java | 0 .../org/sonar/server/debt/package-info.java | 0 .../duplication/ws/DuplicationsParser.java | 0 .../server/duplication/ws/DuplicationsWs.java | 0 .../duplication/ws/DuplicationsWsAction.java | 0 .../server/duplication/ws/ShowAction.java | 0 .../duplication/ws/ShowResponseBuilder.java | 0 .../server/duplication/ws/package-info.java | 0 .../org/sonar/server/email/ws/EmailsWs.java | 0 .../sonar/server/email/ws/EmailsWsAction.java | 0 .../sonar/server/email/ws/EmailsWsModule.java | 0 .../org/sonar/server/email/ws/SendAction.java | 0 .../sonar/server/email/ws/package-info.java | 0 .../java/org/sonar/server/es/BaseDoc.java | 0 .../java/org/sonar/server/es/BulkIndexer.java | 0 .../sonar/server/es/DefaultIndexSettings.java | 0 .../es/DefaultIndexSettingsElement.java | 0 .../java/org/sonar/server/es/EsClient.java | 0 .../org/sonar/server/es/EsClientProvider.java | 0 .../org/sonar/server/es/EsClientStopper.java | 0 .../java/org/sonar/server/es/EsUtils.java | 0 .../main/java/org/sonar/server/es/Facets.java | 0 .../org/sonar/server/es/IndexCreator.java | 0 .../org/sonar/server/es/IndexDefinition.java | 0 .../sonar/server/es/IndexDefinitionHash.java | 0 .../org/sonar/server/es/IndexDefinitions.java | 0 .../java/org/sonar/server/es/IndexType.java | 0 .../sonar/server/es/IndexerStartupTask.java | 0 .../org/sonar/server/es/IndexingListener.java | 0 .../org/sonar/server/es/IndexingResult.java | 0 .../java/org/sonar/server/es/NewIndex.java | 0 .../org/sonar/server/es/ProjectIndexer.java | 0 .../org/sonar/server/es/RecoveryIndexer.java | 0 .../server/es/ResiliencyIndexingListener.java | 0 .../org/sonar/server/es/ResilientIndexer.java | 0 .../org/sonar/server/es/SearchIdResult.java | 0 .../org/sonar/server/es/SearchOptions.java | 0 .../org/sonar/server/es/SearchResult.java | 0 .../java/org/sonar/server/es/Sorting.java | 0 .../org/sonar/server/es/StartupIndexer.java | 0 .../sonar/server/es/StickyFacetBuilder.java | 0 .../org/sonar/server/es/package-info.java | 0 .../es/request/ProxyBulkRequestBuilder.java | 0 .../ProxyClearCacheRequestBuilder.java | 0 .../ProxyClusterHealthRequestBuilder.java | 0 .../ProxyClusterStateRequestBuilder.java | 0 .../ProxyClusterStatsRequestBuilder.java | 0 .../ProxyCreateIndexRequestBuilder.java | 0 .../es/request/ProxyDeleteRequestBuilder.java | 0 .../es/request/ProxyFlushRequestBuilder.java | 0 .../es/request/ProxyGetRequestBuilder.java | 0 .../es/request/ProxyIndexRequestBuilder.java | 0 .../ProxyIndicesExistsRequestBuilder.java | 0 .../ProxyIndicesStatsRequestBuilder.java | 0 .../request/ProxyMultiGetRequestBuilder.java | 0 .../ProxyNodesStatsRequestBuilder.java | 0 .../ProxyPutMappingRequestBuilder.java | 0 .../request/ProxyRefreshRequestBuilder.java | 0 .../es/request/ProxySearchRequestBuilder.java | 0 .../ProxySearchScrollRequestBuilder.java | 0 .../sonar/server/es/request/package-info.java | 0 .../ComponentTextSearchFeature.java | 0 .../ComponentTextSearchFeatureRepertoire.java | 0 .../ComponentTextSearchQueryFactory.java | 0 .../server/es/textsearch/package-info.java | 0 .../org/sonar/server/event/NewAlerts.java | 0 .../org/sonar/server/event/package-info.java | 0 .../exceptions/BadRequestException.java | 0 .../server/exceptions/ForbiddenException.java | 0 .../org/sonar/server/exceptions/Message.java | 0 .../server/exceptions/NotFoundException.java | 0 .../server/exceptions/ServerException.java | 0 .../exceptions/UnauthorizedException.java | 0 .../sonar/server/exceptions/package-info.java | 0 .../sonar/server/favorite/FavoriteFinder.java | 0 .../sonar/server/favorite/FavoriteModule.java | 0 .../server/favorite/FavoriteUpdater.java | 0 .../sonar/server/favorite/package-info.java | 0 .../sonar/server/favorite/ws/AddAction.java | 0 .../sonar/server/favorite/ws/FavoritesWs.java | 0 .../server/favorite/ws/FavoritesWsAction.java | 0 .../server/favorite/ws/FavouritesWs.java | 0 .../server/favorite/ws/RemoveAction.java | 0 .../server/favorite/ws/SearchAction.java | 0 .../server/favorite/ws/package-info.java | 0 .../issue/AbstractChangeTagsAction.java | 0 .../java/org/sonar/server/issue/Action.java | 0 .../org/sonar/server/issue/ActionFinder.java | 0 .../org/sonar/server/issue/AddTagsAction.java | 0 .../org/sonar/server/issue/AssignAction.java | 0 .../org/sonar/server/issue/CommentAction.java | 0 .../sonar/server/issue/IssueFieldsSetter.java | 0 .../org/sonar/server/issue/IssueFinder.java | 0 .../org/sonar/server/issue/IssueQuery.java | 0 .../sonar/server/issue/IssueQueryFactory.java | 0 .../org/sonar/server/issue/IssueService.java | 0 .../org/sonar/server/issue/IssueStorage.java | 0 .../org/sonar/server/issue/IssueUpdater.java | 0 .../sonar/server/issue/IssuesFinderSort.java | 0 .../sonar/server/issue/RemoveTagsAction.java | 0 .../java/org/sonar/server/issue/Result.java | 0 .../server/issue/ServerIssueStorage.java | 0 .../sonar/server/issue/SetSeverityAction.java | 0 .../org/sonar/server/issue/SetTypeAction.java | 0 .../sonar/server/issue/TransitionAction.java | 0 .../sonar/server/issue/TransitionService.java | 0 .../sonar/server/issue/index/IssueDoc.java | 0 .../sonar/server/issue/index/IssueIndex.java | 0 .../issue/index/IssueIndexDefinition.java | 0 .../server/issue/index/IssueIndexer.java | 0 .../server/issue/index/IssueIterator.java | 0 .../issue/index/IssueIteratorFactory.java | 0 .../index/IssueIteratorForMultipleChunks.java | 0 .../index/IssueIteratorForSingleChunk.java | 0 .../server/issue/index/package-info.java | 0 .../AbstractNewIssuesEmailTemplate.java | 0 ...hangesOnMyIssueNotificationDispatcher.java | 0 .../DoNotFixNotificationDispatcher.java | 0 .../notification/IssueChangeNotification.java | 0 .../IssueChangesEmailTemplate.java | 0 .../MyNewIssuesEmailTemplate.java | 0 .../notification/MyNewIssuesNotification.java | 0 .../MyNewIssuesNotificationDispatcher.java | 0 .../notification/NewIssuesEmailTemplate.java | 0 .../notification/NewIssuesNotification.java | 0 .../NewIssuesNotificationDispatcher.java | 0 .../NewIssuesNotificationFactory.java | 0 .../notification/NewIssuesStatistics.java | 0 .../issue/notification/package-info.java | 0 .../org/sonar/server/issue/package-info.java | 0 .../sonar/server/issue/workflow/Function.java | 0 .../issue/workflow/FunctionExecutor.java | 0 .../server/issue/workflow/IsBeingClosed.java | 0 .../server/issue/workflow/IssueWorkflow.java | 0 .../server/issue/workflow/SetCloseDate.java | 0 .../server/issue/workflow/SetClosed.java | 0 .../server/issue/workflow/SetResolution.java | 0 .../sonar/server/issue/workflow/State.java | 0 .../server/issue/workflow/StateMachine.java | 0 .../server/issue/workflow/Transition.java | 0 .../server/issue/workflow/UnsetAssignee.java | 0 .../server/issue/workflow/package-info.java | 0 .../server/issue/ws/AddCommentAction.java | 0 .../sonar/server/issue/ws/AssignAction.java | 0 .../sonar/server/issue/ws/AuthorsAction.java | 0 .../sonar/server/issue/ws/AvatarResolver.java | 0 .../server/issue/ws/AvatarResolverImpl.java | 0 .../server/issue/ws/BulkChangeAction.java | 0 .../server/issue/ws/ChangelogAction.java | 0 .../server/issue/ws/ComponentTagsAction.java | 0 .../server/issue/ws/DeleteCommentAction.java | 0 .../server/issue/ws/DoTransitionAction.java | 0 .../server/issue/ws/EditCommentAction.java | 0 .../sonar/server/issue/ws/IssueWsModule.java | 0 .../org/sonar/server/issue/ws/IssuesWs.java | 0 .../sonar/server/issue/ws/IssuesWsAction.java | 0 .../issue/ws/OperationResponseWriter.java | 0 .../sonar/server/issue/ws/SearchAction.java | 0 .../issue/ws/SearchAdditionalField.java | 0 .../server/issue/ws/SearchResponseData.java | 0 .../server/issue/ws/SearchResponseFormat.java | 0 .../server/issue/ws/SearchResponseLoader.java | 0 .../server/issue/ws/SetSeverityAction.java | 0 .../sonar/server/issue/ws/SetTagsAction.java | 0 .../sonar/server/issue/ws/SetTypeAction.java | 0 .../org/sonar/server/issue/ws/TagsAction.java | 0 .../sonar/server/issue/ws/package-info.java | 0 .../sonar/server/language/ws/LanguageWs.java | 0 .../sonar/server/language/ws/ListAction.java | 0 .../server/language/ws/package-info.java | 0 .../sonar/server/license/ws/LicensesWs.java | 0 .../server/license/ws/LicensesWsModule.java | 0 .../sonar/server/license/ws/ListAction.java | 0 .../sonar/server/license/ws/package-info.java | 0 .../measure/custom/ws/CreateAction.java | 0 .../custom/ws/CustomMeasureJsonWriter.java | 0 .../custom/ws/CustomMeasureValidator.java | 0 .../ws/CustomMeasureValueDescription.java | 0 .../measure/custom/ws/CustomMeasuresWs.java | 0 .../custom/ws/CustomMeasuresWsAction.java | 0 .../custom/ws/CustomMeasuresWsModule.java | 0 .../measure/custom/ws/DeleteAction.java | 0 .../measure/custom/ws/MetricsAction.java | 0 .../measure/custom/ws/SearchAction.java | 0 .../measure/custom/ws/UpdateAction.java | 0 .../measure/custom/ws/package-info.java | 0 .../measure/index/ProjectMeasuresDoc.java | 0 .../measure/index/ProjectMeasuresIndex.java | 0 .../index/ProjectMeasuresIndexDefinition.java | 0 .../measure/index/ProjectMeasuresIndexer.java | 0 .../measure/index/ProjectMeasuresQuery.java | 0 .../measure/index/ProjectsEsModule.java | 0 .../index/ProjectsTextSearchQueryFactory.java | 0 .../server/measure/index/package-info.java | 0 .../server/measure/ws/ComponentAction.java | 0 .../measure/ws/ComponentDtoToWsComponent.java | 0 .../measure/ws/ComponentTreeAction.java | 0 .../server/measure/ws/ComponentTreeData.java | 0 .../measure/ws/ComponentTreeDataLoader.java | 0 .../server/measure/ws/ComponentTreeSort.java | 0 .../sonar/server/measure/ws/HasMeasure.java | 0 .../measure/ws/MeasureDtoToWsMeasure.java | 0 .../measure/ws/MeasureValueFormatter.java | 0 .../sonar/server/measure/ws/MeasuresWs.java | 0 .../server/measure/ws/MeasuresWsAction.java | 0 .../server/measure/ws/MeasuresWsModule.java | 0 .../ws/MeasuresWsParametersBuilder.java | 0 .../measure/ws/MetricDtoToWsMetric.java | 0 .../measure/ws/MetricDtoWithBestValue.java | 0 .../sonar/server/measure/ws/SearchAction.java | 0 .../measure/ws/SearchHistoryAction.java | 0 .../ws/SearchHistoryResponseFactory.java | 0 .../measure/ws/SearchHistoryResult.java | 0 .../measure/ws/SnapshotDtoToWsPeriods.java | 0 .../server/measure/ws/TimeMachineWs.java | 0 .../sonar/server/measure/ws/package-info.java | 0 .../server/metric/CoreCustomMetrics.java | 0 .../server/metric/DefaultMetricFinder.java | 0 .../org/sonar/server/metric/package-info.java | 0 .../sonar/server/metric/ws/CreateAction.java | 0 .../sonar/server/metric/ws/DeleteAction.java | 0 .../sonar/server/metric/ws/DomainsAction.java | 0 .../server/metric/ws/MetricJsonWriter.java | 0 .../org/sonar/server/metric/ws/MetricsWs.java | 0 .../server/metric/ws/MetricsWsAction.java | 0 .../server/metric/ws/MetricsWsModule.java | 0 .../sonar/server/metric/ws/SearchAction.java | 0 .../sonar/server/metric/ws/TypesAction.java | 0 .../sonar/server/metric/ws/UpdateAction.java | 0 .../sonar/server/metric/ws/package-info.java | 0 .../DefaultNotificationManager.java | 0 .../notification/NotificationCenter.java | 0 .../notification/NotificationDaemon.java | 0 .../notification/NotificationDispatcher.java | 0 .../NotificationDispatcherMetadata.java | 0 .../notification/NotificationManager.java | 0 .../notification/NotificationModule.java | 0 .../notification/NotificationService.java | 0 .../notification/NotificationUpdater.java | 0 .../email/AlertsEmailTemplate.java | 0 .../email/EmailNotificationChannel.java | 0 .../notification/email/package-info.java | 0 .../server/notification/package-info.java | 0 .../server/notification/ws/AddAction.java | 0 .../server/notification/ws/ListAction.java | 0 .../notification/ws/NotificationWsModule.java | 0 .../notification/ws/NotificationsWs.java | 0 .../ws/NotificationsWsAction.java | 0 .../server/notification/ws/RemoveAction.java | 0 .../server/notification/ws/package-info.java | 0 .../organization/BillingValidations.java | 0 .../BillingValidationsExtension.java | 0 .../organization/BillingValidationsProxy.java | 0 .../BillingValidationsProxyImpl.java | 0 .../organization/DefaultOrganization.java | 0 .../DefaultOrganizationCache.java | 0 .../DefaultOrganizationEnforcer.java | 0 .../DefaultOrganizationProvider.java | 0 .../DefaultOrganizationProviderImpl.java | 0 .../NoopDefaultOrganizationCache.java | 0 .../organization/OrganizationCreation.java | 0 .../OrganizationCreationImpl.java | 0 .../organization/OrganizationFlags.java | 0 .../organization/OrganizationFlagsImpl.java | 0 .../organization/OrganizationValidation.java | 0 .../OrganizationValidationImpl.java | 0 .../server/organization/package-info.java | 0 .../organization/ws/AddMemberAction.java | 0 .../server/organization/ws/CreateAction.java | 0 .../server/organization/ws/DeleteAction.java | 0 .../organization/ws/EnableSupportAction.java | 0 .../organization/ws/OrganizationsWs.java | 0 .../ws/OrganizationsWsAction.java | 0 .../ws/OrganizationsWsModule.java | 0 .../ws/OrganizationsWsSupport.java | 0 .../organization/ws/RemoveMemberAction.java | 0 .../server/organization/ws/SearchAction.java | 0 .../organization/ws/SearchMembersAction.java | 0 .../ws/SearchMyOrganizationsAction.java | 0 .../server/organization/ws/UpdateAction.java | 0 .../ws/UpdateProjectVisibilityAction.java | 0 .../server/organization/ws/package-info.java | 0 .../ApplyPermissionTemplateQuery.java | 0 .../permission/GroupPermissionChange.java | 0 .../permission/GroupPermissionChanger.java | 0 .../server/permission/PermissionChange.java | 0 .../PermissionPrivilegeChecker.java | 0 .../permission/PermissionTemplateService.java | 0 .../server/permission/PermissionUpdater.java | 0 .../sonar/server/permission/ProjectId.java | 0 .../org/sonar/server/permission/UserId.java | 0 .../permission/UserPermissionChange.java | 0 .../permission/UserPermissionChanger.java | 0 .../permission/index/AuthorizationScope.java | 0 .../index/AuthorizationTypeSupport.java | 0 .../index/NeedAuthorizationIndexer.java | 0 .../permission/index/PermissionIndexer.java | 0 .../index/PermissionIndexerDao.java | 0 .../server/permission/index/package-info.java | 0 .../sonar/server/permission/package-info.java | 0 .../server/permission/ws/AddGroupAction.java | 0 .../server/permission/ws/AddUserAction.java | 0 .../server/permission/ws/GroupsAction.java | 0 .../ws/PermissionRequestValidator.java | 0 .../permission/ws/PermissionWsSupport.java | 0 .../server/permission/ws/PermissionsWs.java | 0 .../permission/ws/PermissionsWsAction.java | 0 .../permission/ws/PermissionsWsModule.java | 0 .../ws/PermissionsWsParametersBuilder.java | 0 .../server/permission/ws/ProjectWsRef.java | 0 .../permission/ws/RemoveGroupAction.java | 0 .../permission/ws/RemoveUserAction.java | 0 .../ws/SearchGlobalPermissionsAction.java | 0 .../ws/SearchProjectPermissionsAction.java | 0 .../ws/SearchProjectPermissionsData.java | 0 .../SearchProjectPermissionsDataLoader.java | 0 .../server/permission/ws/UsersAction.java | 0 .../server/permission/ws/package-info.java | 0 .../ws/template/AddGroupToTemplateAction.java | 0 .../AddProjectCreatorToTemplateAction.java | 0 .../ws/template/AddUserToTemplateAction.java | 0 .../ws/template/ApplyTemplateAction.java | 0 .../ws/template/BulkApplyTemplateAction.java | 0 .../ws/template/CreateTemplateAction.java | 0 .../ws/template/DefaultTemplatesResolver.java | 0 .../DefaultTemplatesResolverImpl.java | 0 .../ws/template/DeleteTemplateAction.java | 0 ...mplateDtoToPermissionTemplateResponse.java | 0 .../RemoveGroupFromTemplateAction.java | 0 ...emoveProjectCreatorFromTemplateAction.java | 0 .../RemoveUserFromTemplateAction.java | 0 .../ws/template/SearchTemplatesAction.java | 0 .../ws/template/SearchTemplatesData.java | 0 .../template/SearchTemplatesDataLoader.java | 0 .../ws/template/SetDefaultTemplateAction.java | 0 .../ws/template/TemplateGroupsAction.java | 0 .../ws/template/TemplateUsersAction.java | 0 .../ws/template/UpdateTemplateAction.java | 0 .../permission/ws/template/WsTemplateRef.java | 0 .../permission/ws/template/package-info.java | 0 .../sonar/server/platform/BackendCleanup.java | 0 .../platform/DatabaseServerCompatibility.java | 0 .../platform/DefaultServerUpgradeStatus.java | 0 .../server/platform/LogServerVersion.java | 0 .../server/platform/PersistentSettings.java | 0 .../org/sonar/server/platform/Platform.java | 0 .../server/platform/ServerFileSystem.java | 0 .../server/platform/ServerFileSystemImpl.java | 0 .../org/sonar/server/platform/ServerId.java | 0 .../server/platform/ServerIdGenerator.java | 0 .../sonar/server/platform/ServerIdLoader.java | 0 .../server/platform/ServerIdManager.java | 0 .../org/sonar/server/platform/ServerImpl.java | 0 .../platform/ServerLifecycleNotifier.java | 0 .../sonar/server/platform/ServerLogging.java | 0 .../platform/SettingsChangeNotifier.java | 0 .../server/platform/StartupMetadata.java | 0 .../platform/StartupMetadataPersister.java | 0 .../platform/StartupMetadataProvider.java | 0 .../server/platform/TempFolderProvider.java | 0 .../sonar/server/platform/UrlSettings.java | 0 .../server/platform/cluster/Cluster.java | 0 .../server/platform/cluster/ClusterImpl.java | 0 .../server/platform/cluster/package-info.java | 0 .../db/CheckDatabaseCharsetAtStartup.java | 0 .../server/platform/db/EmbeddedDatabase.java | 0 .../platform/db/EmbeddedDatabaseFactory.java | 0 .../db/migration/AutoDbMigration.java | 0 .../DatabaseMigrationExecutorService.java | 0 .../DatabaseMigrationExecutorServiceImpl.java | 0 .../db/migration/DatabaseMigrationImpl.java | 0 .../platform/db/migration/package-info.java | 0 .../server/platform/db/package-info.java | 0 .../platform/monitoring/BaseMonitorMBean.java | 0 .../platform/monitoring/DatabaseMonitor.java | 0 .../monitoring/DatabaseMonitorMBean.java | 0 .../server/platform/monitoring/EsMonitor.java | 0 .../platform/monitoring/EsMonitorMBean.java | 0 .../platform/monitoring/JvmPropsMonitor.java | 0 .../server/platform/monitoring/Monitor.java | 0 .../platform/monitoring/PluginsMonitor.java | 0 .../platform/monitoring/SettingsMonitor.java | 0 .../platform/monitoring/SonarQubeMonitor.java | 0 .../monitoring/SonarQubeMonitorMBean.java | 0 .../platform/monitoring/SystemMonitor.java | 0 .../platform/monitoring/package-info.java | 0 .../sonar/server/platform/package-info.java | 0 .../platform/platformlevel/PlatformLevel.java | 0 .../platformlevel/PlatformLevel1.java | 0 .../platformlevel/PlatformLevel2.java | 0 .../platformlevel/PlatformLevel3.java | 0 .../platformlevel/PlatformLevel4.java | 0 .../platformlevel/PlatformLevelSafeMode.java | 0 .../platformlevel/PlatformLevelStartup.java | 0 .../platform/platformlevel/package-info.java | 0 .../web/AbortTomcatStartException.java | 0 .../platform/web/MasterServletFilter.java | 0 .../web/PlatformServletContextListener.java | 0 .../server/platform/web/RedirectFilter.java | 0 .../platform/web/RegisterServletFilters.java | 0 .../sonar/server/platform/web/RootFilter.java | 0 .../platform/web/SecurityServletFilter.java | 0 .../server/platform/web/WebPagesFilter.java | 0 .../server/platform/web/package-info.java | 0 .../web/requestid/HttpRequestIdModule.java | 0 .../web/requestid/RequestIdConfiguration.java | 0 .../web/requestid/RequestIdFilter.java | 0 .../web/requestid/RequestIdGenerator.java | 0 .../web/requestid/RequestIdGeneratorBase.java | 0 .../requestid/RequestIdGeneratorBaseImpl.java | 0 .../web/requestid/RequestIdGeneratorImpl.java | 0 .../web/requestid/RequestIdMDCStorage.java | 0 .../platform/web/requestid/package-info.java | 0 .../platform/ws/ChangeLogLevelAction.java | 0 .../platform/ws/DbMigrationJsonWriter.java | 0 .../platform/ws/DbMigrationStatusAction.java | 0 .../sonar/server/platform/ws/IndexAction.java | 0 .../sonar/server/platform/ws/InfoAction.java | 0 .../org/sonar/server/platform/ws/L10nWs.java | 0 .../sonar/server/platform/ws/LogsAction.java | 0 .../server/platform/ws/MigrateDbAction.java | 0 .../sonar/server/platform/ws/PingAction.java | 0 .../server/platform/ws/RestartAction.java | 0 .../sonar/server/platform/ws/ServerWs.java | 0 .../server/platform/ws/StatusAction.java | 0 .../sonar/server/platform/ws/SystemWs.java | 0 .../server/platform/ws/SystemWsAction.java | 0 .../server/platform/ws/UpgradesAction.java | 0 .../server/platform/ws/package-info.java | 0 .../InstalledPluginReferentialFactory.java | 0 .../server/plugins/PluginDownloader.java | 0 .../PluginReferentialMetadataConverter.java | 0 .../plugins/ServerExtensionInstaller.java | 0 .../plugins/ServerPluginJarExploder.java | 0 .../plugins/ServerPluginRepository.java | 0 .../plugins/StaticResourcesServlet.java | 0 .../server/plugins/UpdateCenterClient.java | 0 .../plugins/UpdateCenterMatrixFactory.java | 0 .../plugins/WebServerExtensionInstaller.java | 0 .../sonar/server/plugins/package-info.java | 0 .../PrivilegedPluginsBootstraper.java | 0 .../privileged/PrivilegedPluginsStopper.java | 0 .../plugins/privileged/package-info.java | 0 .../server/plugins/ws/AvailableAction.java | 0 .../server/plugins/ws/CancelAllAction.java | 0 .../server/plugins/ws/InstallAction.java | 0 .../server/plugins/ws/InstalledAction.java | 0 .../server/plugins/ws/PendingAction.java | 0 .../plugins/ws/PluginUpdateAggregator.java | 0 .../server/plugins/ws/PluginWSCommons.java | 0 .../sonar/server/plugins/ws/PluginsWs.java | 0 .../server/plugins/ws/PluginsWsAction.java | 0 .../server/plugins/ws/UninstallAction.java | 0 .../sonar/server/plugins/ws/UpdateAction.java | 0 .../server/plugins/ws/UpdatesAction.java | 0 .../sonar/server/plugins/ws/package-info.java | 0 .../org/sonar/server/project/Visibility.java | 0 .../sonar/server/project/package-info.java | 0 .../server/project/ws/BulkDeleteAction.java | 0 .../project/ws/BulkUpdateKeyAction.java | 0 .../sonar/server/project/ws/CreateAction.java | 0 .../sonar/server/project/ws/DeleteAction.java | 0 .../sonar/server/project/ws/GhostsAction.java | 0 .../sonar/server/project/ws/IndexAction.java | 0 .../sonar/server/project/ws/ProjectsWs.java | 0 .../server/project/ws/ProjectsWsAction.java | 0 .../server/project/ws/ProjectsWsModule.java | 0 .../server/project/ws/ProjectsWsSupport.java | 0 .../server/project/ws/ProvisionedAction.java | 0 .../sonar/server/project/ws/SearchAction.java | 0 .../project/ws/SearchMyProjectsAction.java | 0 .../project/ws/SearchMyProjectsData.java | 0 .../ws/SearchMyProjectsDataLoader.java | 0 .../server/project/ws/UpdateKeyAction.java | 0 .../project/ws/UpdateVisibilityAction.java | 0 .../sonar/server/project/ws/package-info.java | 0 .../ProjectAnalysisModule.java | 0 .../server/projectanalysis/package-info.java | 0 .../projectanalysis/ws/CreateEventAction.java | 0 .../projectanalysis/ws/DeleteAction.java | 0 .../projectanalysis/ws/DeleteEventAction.java | 0 .../projectanalysis/ws/EventValidator.java | 0 .../projectanalysis/ws/ProjectAnalysesWs.java | 0 .../ws/ProjectAnalysesWsAction.java | 0 .../projectanalysis/ws/SearchAction.java | 0 .../server/projectanalysis/ws/SearchData.java | 0 .../ws/SearchResponseBuilder.java | 0 .../projectanalysis/ws/UpdateEventAction.java | 0 .../projectanalysis/ws/package-info.java | 0 .../server/projectlink/ws/CreateAction.java | 0 .../server/projectlink/ws/DeleteAction.java | 0 .../projectlink/ws/ProjectLinksModule.java | 0 .../server/projectlink/ws/ProjectLinksWs.java | 0 .../projectlink/ws/ProjectLinksWsAction.java | 0 .../server/projectlink/ws/SearchAction.java | 0 .../server/projectlink/ws/package-info.java | 0 .../server/projecttag/ws/ProjectTagsWs.java | 0 .../projecttag/ws/ProjectTagsWsAction.java | 0 .../projecttag/ws/ProjectTagsWsModule.java | 0 .../server/projecttag/ws/SearchAction.java | 0 .../sonar/server/projecttag/ws/SetAction.java | 0 .../server/projecttag/ws/package-info.java | 0 .../server/property/InternalProperties.java | 0 .../property/InternalPropertiesImpl.java | 0 .../sonar/server/property/package-info.java | 0 .../sonar/server/property/ws/IndexAction.java | 0 .../server/property/ws/PropertiesWs.java | 0 .../server/property/ws/package-info.java | 0 .../qualitygate/QgateProjectFinder.java | 0 .../QualityGateConditionsUpdater.java | 0 .../server/qualitygate/QualityGateFinder.java | 0 .../server/qualitygate/QualityGateModule.java | 0 .../qualitygate/QualityGateUpdater.java | 0 .../server/qualitygate/QualityGates.java | 0 .../qualitygate/RegisterQualityGates.java | 0 .../qualitygate/ValidRatingMetrics.java | 0 .../server/qualitygate/package-info.java | 0 .../server/qualitygate/ws/AppAction.java | 0 .../server/qualitygate/ws/CopyAction.java | 0 .../server/qualitygate/ws/CreateAction.java | 0 .../qualitygate/ws/CreateConditionAction.java | 0 .../qualitygate/ws/DeleteConditionAction.java | 0 .../server/qualitygate/ws/DeselectAction.java | 0 .../server/qualitygate/ws/DestroyAction.java | 0 .../qualitygate/ws/GetByProjectAction.java | 0 .../server/qualitygate/ws/ListAction.java | 0 .../qualitygate/ws/ProjectStatusAction.java | 0 .../ws/QualityGateDetailsFormatter.java | 0 .../server/qualitygate/ws/QualityGatesWs.java | 0 .../qualitygate/ws/QualityGatesWsAction.java | 0 .../server/qualitygate/ws/RenameAction.java | 0 .../server/qualitygate/ws/SearchAction.java | 0 .../server/qualitygate/ws/SelectAction.java | 0 .../qualitygate/ws/SetAsDefaultAction.java | 0 .../server/qualitygate/ws/ShowAction.java | 0 .../qualitygate/ws/UnsetDefaultAction.java | 0 .../qualitygate/ws/UpdateConditionAction.java | 0 .../server/qualitygate/ws/package-info.java | 0 .../server/qualityprofile/ActiveRule.java | 0 .../qualityprofile/ActiveRuleChange.java | 0 .../qualityprofile/BuiltInQProfile.java | 0 .../qualityprofile/BuiltInQProfileInsert.java | 0 .../BuiltInQProfileInsertImpl.java | 0 .../qualityprofile/BuiltInQProfileLoader.java | 0 .../BuiltInQProfileRepository.java | 0 .../BuiltInQProfileRepositoryImpl.java | 0 .../qualityprofile/BuiltInQProfileUpdate.java | 0 .../BuiltInQProfileUpdateImpl.java | 0 .../BuiltInQualityProfilesNotification.java | 0 ...QualityProfilesNotificationDispatcher.java | 0 ...InQualityProfilesNotificationTemplate.java | 0 .../BuiltInQualityProfilesUpdateListener.java | 0 .../qualityprofile/BulkChangeResult.java | 0 .../server/qualityprofile/QPMeasureData.java | 0 .../qualityprofile/QProfileBackuper.java | 0 .../qualityprofile/QProfileBackuperImpl.java | 0 .../qualityprofile/QProfileComparison.java | 0 .../server/qualityprofile/QProfileCopier.java | 0 .../qualityprofile/QProfileExporters.java | 0 .../qualityprofile/QProfileFactory.java | 0 .../qualityprofile/QProfileFactoryImpl.java | 0 .../server/qualityprofile/QProfileName.java | 0 .../server/qualityprofile/QProfileReset.java | 0 .../qualityprofile/QProfileResetImpl.java | 0 .../QProfileRestoreSummary.java | 0 .../server/qualityprofile/QProfileResult.java | 0 .../server/qualityprofile/QualityProfile.java | 0 .../RegisterQualityProfiles.java | 0 .../server/qualityprofile/RuleActivation.java | 0 .../server/qualityprofile/RuleActivator.java | 0 .../qualityprofile/RuleActivatorContext.java | 0 .../RuleActivatorContextFactory.java | 0 .../qualityprofile/index/ActiveRuleDoc.java | 0 .../index/ActiveRuleIndexer.java | 0 .../qualityprofile/index/package-info.java | 0 .../server/qualityprofile/package-info.java | 0 .../qualityprofile/ws/ActivateRuleAction.java | 0 .../ws/ActivateRulesAction.java | 0 .../qualityprofile/ws/AddProjectAction.java | 0 .../qualityprofile/ws/BackupAction.java | 0 .../ws/BulkChangeWsResponse.java | 0 .../qualityprofile/ws/ChangeParentAction.java | 0 .../qualityprofile/ws/ChangelogAction.java | 0 .../qualityprofile/ws/ChangelogLoader.java | 0 .../qualityprofile/ws/CompareAction.java | 0 .../server/qualityprofile/ws/CopyAction.java | 0 .../qualityprofile/ws/CreateAction.java | 0 .../ws/DeactivateRuleAction.java | 0 .../ws/DeactivateRulesAction.java | 0 .../qualityprofile/ws/DeleteAction.java | 0 .../qualityprofile/ws/ExportAction.java | 0 .../qualityprofile/ws/ExportersAction.java | 0 .../qualityprofile/ws/ImportersAction.java | 0 .../qualityprofile/ws/InheritanceAction.java | 0 .../qualityprofile/ws/OldRestoreAction.java | 0 .../server/qualityprofile/ws/ProfilesWs.java | 0 .../qualityprofile/ws/ProjectsAction.java | 0 .../qualityprofile/ws/QProfileReference.java | 0 .../qualityprofile/ws/QProfileWsAction.java | 0 .../qualityprofile/ws/QProfileWsSupport.java | 0 .../server/qualityprofile/ws/QProfilesWs.java | 0 .../qualityprofile/ws/QProfilesWsModule.java | 0 .../ws/RemoveProjectAction.java | 0 .../qualityprofile/ws/RenameAction.java | 0 .../qualityprofile/ws/RestoreAction.java | 0 .../ws/RestoreBuiltInAction.java | 0 .../qualityprofile/ws/SearchAction.java | 0 .../server/qualityprofile/ws/SearchData.java | 0 .../qualityprofile/ws/SetDefaultAction.java | 0 .../server/qualityprofile/ws/ShowAction.java | 0 .../qualityprofile/ws/package-info.java | 0 .../sonar/server/root/ws/RootWsModule.java | 0 .../org/sonar/server/root/ws/RootsWs.java | 0 .../sonar/server/root/ws/RootsWsAction.java | 0 .../sonar/server/root/ws/SearchAction.java | 0 .../sonar/server/root/ws/SetRootAction.java | 0 .../sonar/server/root/ws/UnsetRootAction.java | 0 .../sonar/server/root/ws/package-info.java | 0 .../sonar/server/rule/CachingRuleFinder.java | 0 .../server/rule/CommonRuleDefinitions.java | 0 .../rule/CommonRuleDefinitionsImpl.java | 0 .../org/sonar/server/rule/CommonRuleKeys.java | 0 .../sonar/server/rule/DefaultRuleFinder.java | 0 .../rule/DeprecatedRulesDefinitionLoader.java | 0 .../org/sonar/server/rule/NewCustomRule.java | 0 .../server/rule/ReactivationException.java | 0 .../org/sonar/server/rule/RegisterRules.java | 0 .../main/java/org/sonar/server/rule/Rule.java | 0 .../org/sonar/server/rule/RuleCreator.java | 0 .../server/rule/RuleDefinitionsLoader.java | 0 .../java/org/sonar/server/rule/RuleParam.java | 0 .../org/sonar/server/rule/RuleTagHelper.java | 0 .../org/sonar/server/rule/RuleUpdate.java | 0 .../org/sonar/server/rule/RuleUpdater.java | 0 .../server/rule/WebServerRuleFinder.java | 0 .../server/rule/WebServerRuleFinderImpl.java | 0 .../org/sonar/server/rule/index/RuleDoc.java | 0 .../server/rule/index/RuleExtensionDoc.java | 0 .../server/rule/index/RuleExtensionScope.java | 0 .../sonar/server/rule/index/RuleIndex.java | 0 .../rule/index/RuleIndexDefinition.java | 0 .../sonar/server/rule/index/RuleIndexer.java | 0 .../sonar/server/rule/index/RuleQuery.java | 0 .../sonar/server/rule/index/package-info.java | 0 .../org/sonar/server/rule/package-info.java | 0 .../server/rule/ws/ActiveRuleCompleter.java | 0 .../org/sonar/server/rule/ws/AppAction.java | 0 .../sonar/server/rule/ws/CreateAction.java | 0 .../sonar/server/rule/ws/DeleteAction.java | 0 .../org/sonar/server/rule/ws/ListAction.java | 0 .../server/rule/ws/RepositoriesAction.java | 0 .../org/sonar/server/rule/ws/RuleMapper.java | 0 .../server/rule/ws/RuleQueryFactory.java | 0 .../sonar/server/rule/ws/RuleWsSupport.java | 0 .../org/sonar/server/rule/ws/RulesWs.java | 0 .../sonar/server/rule/ws/RulesWsAction.java | 0 .../sonar/server/rule/ws/SearchAction.java | 0 .../org/sonar/server/rule/ws/ShowAction.java | 0 .../org/sonar/server/rule/ws/TagsAction.java | 0 .../sonar/server/rule/ws/UpdateAction.java | 0 .../sonar/server/rule/ws/package-info.java | 0 .../sonar/server/search/EsSearchModule.java | 0 .../org/sonar/server/search/FacetValue.java | 0 .../org/sonar/server/search/package-info.java | 0 .../server/serverid/ws/GenerateAction.java | 0 .../sonar/server/serverid/ws/ServerIdWs.java | 0 .../server/serverid/ws/ServerIdWsAction.java | 0 .../server/serverid/ws/ServerIdWsModule.java | 0 .../sonar/server/serverid/ws/ShowAction.java | 0 .../server/serverid/ws/package-info.java | 0 .../server/setting/DatabaseSettingLoader.java | 0 .../setting/DatabaseSettingsEnabler.java | 0 .../server/setting/NopSettingLoader.java | 0 .../sonar/server/setting/SettingLoader.java | 0 .../server/setting/ThreadLocalSettings.java | 0 .../sonar/server/setting/package-info.java | 0 .../setting/ws/CheckSecretKeyAction.java | 0 .../server/setting/ws/EncryptAction.java | 0 .../setting/ws/GenerateSecretKeyAction.java | 0 .../setting/ws/ListDefinitionsAction.java | 0 .../setting/ws/PropertySetExtractor.java | 0 .../sonar/server/setting/ws/ResetAction.java | 0 .../server/setting/ws/ScannerSettings.java | 0 .../sonar/server/setting/ws/SetAction.java | 0 .../org/sonar/server/setting/ws/Setting.java | 0 .../server/setting/ws/SettingValidations.java | 0 .../server/setting/ws/SettingsFinder.java | 0 .../server/setting/ws/SettingsUpdater.java | 0 .../sonar/server/setting/ws/SettingsWs.java | 0 .../server/setting/ws/SettingsWsAction.java | 0 .../server/setting/ws/SettingsWsModule.java | 0 .../server/setting/ws/SettingsWsSupport.java | 0 .../sonar/server/setting/ws/ValuesAction.java | 0 .../sonar/server/setting/ws/package-info.java | 0 .../sonar/server/source/CharactersReader.java | 0 .../server/source/DecorationDataHolder.java | 0 .../server/source/HtmlSourceDecorator.java | 0 .../server/source/HtmlTextDecorator.java | 0 .../sonar/server/source/OpeningHtmlTag.java | 0 .../sonar/server/source/SourceService.java | 0 .../index/FileSourcesUpdaterHelper.java | 0 .../server/source/index/package-info.java | 0 .../org/sonar/server/source/package-info.java | 0 .../sonar/server/source/ws/HashAction.java | 0 .../sonar/server/source/ws/IndexAction.java | 0 .../sonar/server/source/ws/LinesAction.java | 0 .../org/sonar/server/source/ws/RawAction.java | 0 .../org/sonar/server/source/ws/ScmAction.java | 0 .../sonar/server/source/ws/ShowAction.java | 0 .../org/sonar/server/source/ws/SourcesWs.java | 0 .../server/source/ws/SourcesWsAction.java | 0 .../sonar/server/source/ws/package-info.java | 0 .../DeleteOldAnalysisReportsFromFs.java | 0 .../DisplayLogOnDeprecatedProjects.java | 0 .../server/startup/GeneratePluginIndex.java | 0 .../org/sonar/server/startup/LogServerId.java | 0 .../sonar/server/startup/RegisterMetrics.java | 0 .../startup/RegisterPermissionTemplates.java | 0 .../startup/RenameDeprecatedPropertyKeys.java | 0 .../sonar/server/startup/package-info.java | 0 .../server/test/index/CoveredFileDoc.java | 0 .../org/sonar/server/test/index/TestDoc.java | 0 .../sonar/server/test/index/TestIndex.java | 0 .../test/index/TestIndexDefinition.java | 0 .../sonar/server/test/index/TestIndexer.java | 0 .../test/index/TestResultSetIterator.java | 0 .../sonar/server/test/index/package-info.java | 0 .../server/test/ws/CoveredFilesAction.java | 0 .../org/sonar/server/test/ws/ListAction.java | 0 .../org/sonar/server/test/ws/TestsWs.java | 0 .../sonar/server/test/ws/TestsWsAction.java | 0 .../sonar/server/test/ws/package-info.java | 0 .../java/org/sonar/server/text/Macro.java | 0 .../sonar/server/text/MacroInterpreter.java | 0 .../java/org/sonar/server/text/RuleMacro.java | 0 .../org/sonar/server/ui/DeprecatedViews.java | 0 .../org/sonar/server/ui/PageDecorations.java | 0 .../org/sonar/server/ui/PageRepository.java | 0 .../org/sonar/server/ui/VersionFormatter.java | 0 .../org/sonar/server/ui/package-info.java | 0 .../sonar/server/ui/ws/ComponentAction.java | 0 .../org/sonar/server/ui/ws/GlobalAction.java | 0 .../org/sonar/server/ui/ws/NavigationWs.java | 0 .../server/ui/ws/NavigationWsAction.java | 0 .../server/ui/ws/NavigationWsModule.java | 0 .../server/ui/ws/OrganizationAction.java | 0 .../sonar/server/ui/ws/SettingsAction.java | 0 .../org/sonar/server/ui/ws/package-info.java | 0 .../updatecenter/UpdateCenterModule.java | 0 .../server/updatecenter/package-info.java | 0 .../ws/InstalledPluginsAction.java | 0 .../updatecenter/ws/UpdateCenterWs.java | 0 .../updatecenter/ws/UpdateCenterWsAction.java | 0 .../server/updatecenter/ws/UploadAction.java | 0 .../server/updatecenter/ws/package-info.java | 0 .../server/user/AbstractUserSession.java | 0 .../sonar/server/user/CompatibilityRealm.java | 0 .../sonar/server/user/DefaultUserFinder.java | 0 .../server/user/DeprecatedUserFinder.java | 0 .../org/sonar/server/user/DoPrivileged.java | 0 .../sonar/server/user/ExternalIdentity.java | 0 .../java/org/sonar/server/user/NewUser.java | 0 .../sonar/server/user/NewUserNotifier.java | 0 .../server/user/SecurityRealmFactory.java | 0 .../sonar/server/user/ServerUserSession.java | 0 .../server/user/ThreadLocalUserSession.java | 0 .../org/sonar/server/user/UpdateUser.java | 0 .../org/sonar/server/user/UserSession.java | 0 .../sonar/server/user/UserSessionFactory.java | 0 .../server/user/UserSessionFactoryImpl.java | 0 .../sonar/server/user/UserSessionFilter.java | 0 .../org/sonar/server/user/UserUpdater.java | 0 .../org/sonar/server/user/index/UserDoc.java | 0 .../sonar/server/user/index/UserIndex.java | 0 .../user/index/UserIndexDefinition.java | 0 .../sonar/server/user/index/UserIndexer.java | 0 .../sonar/server/user/index/UserQuery.java | 0 .../sonar/server/user/index/package-info.java | 0 .../org/sonar/server/user/package-info.java | 0 .../server/user/ws/ChangePasswordAction.java | 0 .../sonar/server/user/ws/CreateAction.java | 0 .../sonar/server/user/ws/CurrentAction.java | 0 .../server/user/ws/DeactivateAction.java | 0 .../sonar/server/user/ws/GroupsAction.java | 0 .../user/ws/IdentityProvidersAction.java | 0 .../sonar/server/user/ws/SearchAction.java | 0 .../user/ws/SkipOnboardingTutorialAction.java | 0 .../sonar/server/user/ws/UpdateAction.java | 0 .../sonar/server/user/ws/UserJsonWriter.java | 0 .../server/user/ws/UserPropertiesWs.java | 0 .../org/sonar/server/user/ws/UsersWs.java | 0 .../sonar/server/user/ws/UsersWsAction.java | 0 .../sonar/server/user/ws/UsersWsModule.java | 0 .../sonar/server/user/ws/package-info.java | 0 .../usergroups/DefaultGroupCreator.java | 0 .../usergroups/DefaultGroupCreatorImpl.java | 0 .../server/usergroups/DefaultGroupFinder.java | 0 .../sonar/server/usergroups/package-info.java | 0 .../server/usergroups/ws/AddUserAction.java | 0 .../server/usergroups/ws/CreateAction.java | 0 .../server/usergroups/ws/DeleteAction.java | 0 .../sonar/server/usergroups/ws/GroupId.java | 0 .../server/usergroups/ws/GroupIdOrAnyone.java | 0 .../server/usergroups/ws/GroupWsRef.java | 0 .../server/usergroups/ws/GroupWsSupport.java | 0 .../usergroups/ws/RemoveUserAction.java | 0 .../server/usergroups/ws/SearchAction.java | 0 .../server/usergroups/ws/UpdateAction.java | 0 .../usergroups/ws/UserGroupsModule.java | 0 .../server/usergroups/ws/UserGroupsWs.java | 0 .../usergroups/ws/UserGroupsWsAction.java | 0 .../server/usergroups/ws/UsersAction.java | 0 .../server/usergroups/ws/package-info.java | 0 .../server/usertoken/TokenGenerator.java | 0 .../server/usertoken/TokenGeneratorImpl.java | 0 .../usertoken/UserTokenAuthenticator.java | 0 .../server/usertoken/UserTokenModule.java | 0 .../sonar/server/usertoken/package-info.java | 0 .../server/usertoken/ws/GenerateAction.java | 0 .../server/usertoken/ws/RevokeAction.java | 0 .../server/usertoken/ws/SearchAction.java | 0 .../ws/TokenPermissionsValidator.java | 0 .../server/usertoken/ws/UserTokensWs.java | 0 .../usertoken/ws/UserTokensWsAction.java | 0 .../server/usertoken/ws/package-info.java | 0 .../AbstractStoppableExecutorService.java | 0 ...StoppableScheduledExecutorServiceImpl.java | 0 .../server/util/BooleanTypeValidation.java | 0 .../sonar/server/util/ClassLoaderUtils.java | 0 .../org/sonar/server/util/DateCollector.java | 0 .../java/org/sonar/server/util/EnumUtils.java | 0 .../server/util/FloatTypeValidation.java | 0 .../server/util/IntegerTypeValidation.java | 0 .../sonar/server/util/LanguageParamUtils.java | 0 .../sonar/server/util/LongTypeValidation.java | 0 .../sonar/server/util/MetricKeyValidator.java | 0 .../util/MetricLevelTypeValidation.java | 0 .../util/ObjectInputStreamIterator.java | 0 .../server/util/OkHttpClientProvider.java | 0 .../java/org/sonar/server/util/RubyUtils.java | 0 .../server/util/StoppableExecutorService.java | 0 .../StoppableScheduledExecutorService.java | 0 .../server/util/StringListTypeValidation.java | 0 .../server/util/StringTypeValidation.java | 0 .../sonar/server/util/TextTypeValidation.java | 0 .../org/sonar/server/util/TypeValidation.java | 0 .../server/util/TypeValidationModule.java | 0 .../sonar/server/util/TypeValidations.java | 0 .../org/sonar/server/util/Validation.java | 0 .../sonar/server/util/cache/CacheLoader.java | 0 .../sonar/server/util/cache/DiskCache.java | 0 .../sonar/server/util/cache/MemoryCache.java | 0 .../sonar/server/util/cache/package-info.java | 0 .../org/sonar/server/util/package-info.java | 0 .../org/sonar/server/view/index/ViewDoc.java | 0 .../sonar/server/view/index/ViewIndex.java | 0 .../view/index/ViewIndexDefinition.java | 0 .../sonar/server/view/index/ViewIndexer.java | 0 .../sonar/server/view/index/package-info.java | 0 .../webhook/ws/WebhookDeliveriesAction.java | 0 .../webhook/ws/WebhookDeliveryAction.java | 0 .../server/webhook/ws/WebhookWsSupport.java | 0 .../sonar/server/webhook/ws/WebhooksWs.java | 0 .../server/webhook/ws/WebhooksWsAction.java | 0 .../server/webhook/ws/WebhooksWsModule.java | 0 .../sonar/server/webhook/ws/package-info.java | 0 .../sonar/server/ws/DefaultLocalResponse.java | 0 .../ws/DeprecatedPropertiesWsFilter.java | 0 .../org/sonar/server/ws/JsonWriterUtils.java | 0 .../java/org/sonar/server/ws/KeyExamples.java | 0 .../sonar/server/ws/LocalRequestAdapter.java | 0 .../server/ws/RemovedWebServiceHandler.java | 0 .../org/sonar/server/ws/RequestVerifier.java | 0 .../sonar/server/ws/ServletFilterHandler.java | 0 .../org/sonar/server/ws/ServletRequest.java | 0 .../org/sonar/server/ws/ServletResponse.java | 0 .../org/sonar/server/ws/WebServiceEngine.java | 0 .../org/sonar/server/ws/WebServiceFilter.java | 0 .../server/ws/WebServiceReroutingFilter.java | 0 .../java/org/sonar/server/ws/WsAction.java | 0 .../sonar/server/ws/WsParameterBuilder.java | 0 .../server/ws/WsResponseCommonFormat.java | 0 .../java/org/sonar/server/ws/WsUtils.java | 0 .../org/sonar/server/ws/package-info.java | 0 .../org/sonar/server/ws/ws/ListAction.java | 0 .../server/ws/ws/ResponseExampleAction.java | 0 .../org/sonar/server/ws/ws/WebServicesWs.java | 0 .../server/ws/ws/WebServicesWsAction.java | 0 .../server/ws/ws/WebServicesWsModule.java | 0 .../org/sonar/server/ws/ws/package-info.java | 0 .../src/main/resources/build.properties | 0 .../com/sonar/sqale/technical-debt-model.xml | 0 .../authentication/ws/example-validate.json | 0 .../sonar/server/batch/batch-file-example.txt | 0 .../sonar/server/batch/global-example.json | 0 .../org/sonar/server/batch/index-example.txt | 0 .../sonar/server/batch/issues-example.proto | 0 .../sonar/server/batch/project-example.json | 0 .../sonar/server/ce/ws/activity-example.json | 0 .../server/ce/ws/activity_status-example.json | 0 .../sonar/server/ce/ws/component-example.json | 0 .../server/ce/ws/is_queue_empty-example.txt | 0 .../sonar/server/ce/ws/submit-example.json | 0 .../org/sonar/server/ce/ws/task-example.json | 0 .../server/ce/ws/task_types-example.json | 0 .../server/component/ws/app-example.json | 0 .../ws/components-example-suggestions.json | 0 .../component/ws/events-index-example.json | 0 .../component/ws/resources-example-index.json | 0 .../ws/search-components-example.json | 0 .../component/ws/search_projects-example.json | 0 .../server/component/ws/show-example.json | 0 .../server/component/ws/tree-example.json | 0 .../server/duplication/ws/show-example.json | 0 .../server/favorite/ws/search-example.json | 0 .../server/issue/ws/add_comment-example.json | 0 .../sonar/server/issue/ws/assign-example.json | 0 .../server/issue/ws/authors-example.json | 0 .../server/issue/ws/bulk_change-example.json | 0 .../server/issue/ws/changelog-example.json | 0 .../issue/ws/component-tags-example.json | 0 .../issue/ws/delete_comment-example.json | 0 .../issue/ws/do_transition-example.json | 0 .../server/issue/ws/edit_comment-example.json | 0 .../sonar/server/issue/ws/search-example.json | 0 .../server/issue/ws/set_severity-example.json | 0 .../server/issue/ws/set_tags-example.json | 0 .../server/issue/ws/set_type-example.json | 0 .../sonar/server/issue/ws/tags-example.json | 0 .../server/language/ws/example-list.json | 0 .../sonar/server/license/ws/list-example.json | 0 .../measure/custom/ws/example-metrics.json | 0 .../measure/custom/ws/example-search.json | 0 .../server/measure/ws/component-example.json | 0 .../measure/ws/component_tree-example.json | 0 .../server/measure/ws/search-example.json | 0 .../measure/ws/search_history-example.json | 0 .../server/metric/ws/example-domains.json | 0 .../server/metric/ws/example-search.json | 0 .../sonar/server/metric/ws/example-types.json | 0 .../server/notification/ws/list-example.json | 0 .../organization/ws/add_member-example.json | 0 .../organization/ws/create-example.json | 0 .../organization/ws/search-example.json | 0 .../ws/search_members-example.json | 0 .../ws/search_my_organization-example.json | 0 .../server/permission/ws/groups-example.json | 0 .../ws/search_global_permissions-example.json | 0 .../search_project_permissions-example.json | 0 .../ws/template/create_template-example.json | 0 .../ws/template/search_templates-example.json | 0 .../ws/template/template_groups-example.json | 0 .../ws/template/template_users-example.json | 0 .../ws/template/update_template-example.json | 0 .../server/permission/ws/users-example.json | 0 .../platform/ws/example-migrate_db.json | 0 .../platform/ws/example-server-version.txt | 0 .../server/platform/ws/example-status.json | 0 .../platform/ws/example-system-info.json | 0 .../platform/ws/example-upgrades_plugins.json | 0 .../platform/ws/l10n-index-example.json | 0 .../sonar/server/platform/ws/logs-example.log | 0 .../sonar/server/platform/ws/ping-example.txt | 0 .../plugins/ws/example-available_plugins.json | 0 .../plugins/ws/example-installed_plugins.json | 0 .../plugins/ws/example-pending_plugins.json | 0 .../plugins/ws/example-updates_plugins.json | 0 .../project/ws/bulk_update_key-example.json | 0 .../server/project/ws/create-example.json | 0 .../server/project/ws/index-example.json | 0 .../project/ws/projects-example-ghosts.json | 0 .../ws/projects-example-provisioned.json | 0 .../server/project/ws/search-example.json | 0 .../ws/search_my_projects-example.json | 0 .../ws/create_event-example.json | 0 .../projectanalysis/ws/search-example.json | 0 .../ws/update_event-example.json | 0 .../server/projectlink/ws/create-example.json | 0 .../server/projectlink/ws/list-example.json | 0 .../server/projecttag/ws/search-example.json | 0 .../server/property/ws/index-example.json | 0 .../server/qualitygate/ws/app-example.json | 0 .../server/qualitygate/ws/example-list.json | 0 .../server/qualitygate/ws/example-search.json | 0 .../server/qualitygate/ws/example-show.json | 0 .../ws/get_by_project-example.json | 0 .../ws/project_status-example.json | 0 .../qualityprofile/ws/backup-example.xml | 0 .../qualityprofile/ws/changelog-example.json | 0 .../qualityprofile/ws/compare-example.json | 0 .../qualityprofile/ws/create-example.json | 0 .../qualityprofile/ws/export-example.xml | 0 .../qualityprofile/ws/exporters-example.json | 0 .../qualityprofile/ws/importers-example.json | 0 .../ws/inheritance-example.json | 0 .../qualityprofile/ws/projects-example.json | 0 .../qualityprofile/ws/search-example.json | 0 .../qualityprofile/ws/show-example.json | 0 .../sonar/server/root/ws/search-example.json | 0 .../org/sonar/server/rule/ws/app-example.json | 0 .../server/rule/ws/example-repositories.json | 0 .../sonar/server/rule/ws/example-show.json | 0 .../sonar/server/rule/ws/example-tags.json | 0 .../org/sonar/server/rule/ws/list-example.txt | 0 .../sonar/server/rule/ws/search-example.json | 0 .../server/serverid/ws/generate-example.json | 0 .../server/serverid/ws/show-example.json | 0 .../setting/ws/check_secret_key-example.json | 0 .../server/setting/ws/encrypt-example.json | 0 .../ws/generate_secret_key-example.json | 0 .../setting/ws/list_definitions-example.json | 0 .../server/setting/ws/values-example.json | 0 .../sonar/server/source/ws/example-hash.txt | 0 .../sonar/server/source/ws/example-index.json | 0 .../sonar/server/source/ws/example-lines.json | 0 .../sonar/server/source/ws/example-raw.txt | 0 .../sonar/server/source/ws/example-scm.json | 0 .../sonar/server/source/ws/example-show.json | 0 .../test/ws/tests-example-covered-files.json | 0 .../server/test/ws/tests-example-list.json | 0 .../sonar/server/ui/ws/component-example.json | 0 .../sonar/server/ui/ws/global-example.json | 0 .../server/ui/ws/organization-example.json | 0 .../sonar/server/ui/ws/settings-example.json | 0 .../ws/installed_plugins-example.json | 0 .../sonar/server/user/ws/current-example.json | 0 .../server/user/ws/deactivate-example.json | 0 .../sonar/server/user/ws/groups-example.json | 0 .../user/ws/identity_providers-example.json | 0 .../sonar/server/user/ws/search-example.json | 0 .../sonar/server/user/ws/update-example.json | 0 .../server/usergroups/ws/create-example.json | 0 .../server/usergroups/ws/search-example.json | 0 .../server/usergroups/ws/update-example.json | 0 .../server/usergroups/ws/users-example.json | 0 .../server/usertoken/ws/generate-example.json | 0 .../server/usertoken/ws/search-example.json | 0 .../server/webhook/ws/example-deliveries.json | 0 .../server/webhook/ws/example-delivery.json | 0 .../sonar/server/ws/removed-ws-example.json | 0 .../org/sonar/server/ws/ws/list-example.json | 0 .../ws/ws/response_example-example.json | 0 .../org/sonar/ce/http/CeHttpClientTest.java | 0 .../java/org/sonar/ce/log/CeLoggingTest.java | 0 .../sonar/ce/log/CeProcessLoggingTest.java | 0 .../DefaultOrganizationLoaderTest.java | 0 .../org/sonar/ce/queue/CeQueueImplTest.java | 0 .../java/org/sonar/ce/queue/CeTaskTest.java | 0 .../sonar/ce/settings/SettingsLoaderTest.java | 0 .../ReportTaskProcessorDeclarationTest.java | 0 .../sonar/server/app/EmbeddedTomcatTest.java | 0 .../sonar/server/app/NullJarScannerTest.java | 0 .../app/ProcessCommandWrapperImplTest.java | 0 .../app/ProgrammaticLogbackValveTest.java | 0 .../org/sonar/server/app/StartupLogsTest.java | 0 .../sonar/server/app/TomcatAccessLogTest.java | 0 .../server/app/TomcatConnectorsTest.java | 0 .../sonar/server/app/TomcatContextsTest.java | 0 .../app/WebServerProcessLoggingTest.java | 0 .../AuthenticationModuleTest.java | 0 .../BaseContextFactoryTest.java | 0 .../BasicAuthenticatorTest.java | 0 .../server/authentication/CookiesTest.java | 0 .../CredentialsAuthenticatorTest.java | 0 .../FakeBasicIdentityProvider.java | 0 .../FakeOAuth2IdentityProvider.java | 0 .../IdentityProviderRepositoryRule.java | 0 .../IdentityProviderRepositoryTest.java | 0 .../server/authentication/InitFilterTest.java | 0 .../authentication/JwtCsrfVerifierTest.java | 0 .../authentication/JwtHttpHandlerTest.java | 0 .../authentication/JwtSerializerTest.java | 0 .../OAuth2CallbackFilterTest.java | 0 .../OAuth2ContextFactoryTest.java | 0 .../authentication/OAuthCsrfVerifierTest.java | 0 .../RealmAuthenticatorTest.java | 0 .../authentication/SsoAuthenticatorTest.java | 0 .../authentication/TestIdentityProvider.java | 0 .../UserIdentityAuthenticatorTest.java | 0 .../UserSessionInitializerTest.java | 0 .../event/AuthenticationEventImplTest.java | 0 .../event/AuthenticationEventSourceTest.java | 0 .../event/AuthenticationExceptionMatcher.java | 0 .../event/AuthenticationExceptionTest.java | 0 .../ws/AuthenticationWsTest.java | 0 .../authentication/ws/LoginActionTest.java | 0 .../authentication/ws/LogoutActionTest.java | 0 .../authentication/ws/ValidateActionTest.java | 0 .../sonar/server/batch/BatchIndexTest.java | 0 .../sonar/server/batch/BatchWsModuleTest.java | 0 .../sonar/server/batch/FileActionTest.java | 0 .../sonar/server/batch/IndexActionTest.java | 0 .../sonar/server/batch/IssuesActionTest.java | 0 .../sonar/server/batch/ProjectActionTest.java | 0 .../batch/ProjectDataLoaderMediumTest.java | 0 .../server/batch/ProjectDataLoaderTest.java | 0 .../server/ce/ws/ActivityActionTest.java | 0 .../ce/ws/ActivityStatusActionTest.java | 0 .../sonar/server/ce/ws/CancelActionTest.java | 0 .../server/ce/ws/CancelAllActionTest.java | 0 .../sonar/server/ce/ws/CeWsModuleTest.java | 0 .../java/org/sonar/server/ce/ws/CeWsTest.java | 0 .../server/ce/ws/ComponentActionTest.java | 0 .../sonar/server/ce/ws/SubmitActionTest.java | 0 .../sonar/server/ce/ws/TaskActionTest.java | 0 .../sonar/server/ce/ws/TaskFormatterTest.java | 0 .../server/ce/ws/TaskTypesActionTest.java | 0 .../ComponentCleanerServiceTest.java | 0 .../server/component/ComponentFinderTest.java | 0 .../component/ComponentServiceTest.java | 0 .../ComponentServiceUpdateKeyTest.java | 0 .../component/ComponentUpdaterTest.java | 0 .../server/component/NewComponentTest.java | 0 .../server/component/TestComponentFinder.java | 0 .../index/ComponentIndexCombinationTest.java | 0 .../index/ComponentIndexFeatureExactTest.java | 0 .../ComponentIndexFeatureFavoriteTest.java | 0 .../index/ComponentIndexFeatureKeyTest.java | 0 .../ComponentIndexFeaturePartialTest.java | 0 .../ComponentIndexFeaturePrefixTest.java | 0 ...ponentIndexFeatureRecentlyBrowsedTest.java | 0 .../index/ComponentIndexHighlightTest.java | 0 .../index/ComponentIndexLoginTest.java | 0 .../ComponentIndexMultipleWordsTest.java | 0 .../index/ComponentIndexQueryTest.java | 0 .../index/ComponentIndexScoreTest.java | 0 .../component/index/ComponentIndexTest.java | 0 .../component/index/ComponentIndexerTest.java | 0 .../server/component/ws/AppActionTest.java | 0 .../ws/ComponentDtoToWsComponentTest.java | 0 .../component/ws/ComponentsWsModuleTest.java | 0 .../server/component/ws/ComponentsWsTest.java | 0 .../server/component/ws/FilterParserTest.java | 0 .../ws/ProjectMeasuresQueryFactoryTest.java | 0 .../ws/ProjectMeasuresQueryValidatorTest.java | 0 .../server/component/ws/ResourcesWsTest.java | 0 .../server/component/ws/SearchActionTest.java | 0 .../ws/SearchProjectsActionTest.java | 0 .../server/component/ws/ShowActionTest.java | 0 .../component/ws/SuggestionsActionTest.java | 0 .../server/component/ws/TreeActionTest.java | 0 .../dbcleaner/IndexPurgeListenerTest.java | 0 .../dbcleaner/ProjectCleanerTest.java | 0 .../queue/ReportSubmitterTest.java | 0 .../computation/task/ChangeLogLevel.java | 0 .../task/container/TaskContainerImplTest.java | 0 .../analysis/AnalysisImplTest.java | 0 .../AnalysisMetadataHolderImplTest.java | 0 .../analysis/AnalysisMetadataHolderRule.java | 0 .../MutableAnalysisMetadataHolderRule.java | 0 .../analysis/OrganizationTest.java | 0 .../measurecomputer/ComponentImplTest.java | 0 .../MeasureComputerContextImplTest.java | 0 .../MeasureComputerDefinitionImplTest.java | 0 .../api/measurecomputer/MeasureImplTest.java | 0 .../api/posttask/CeTaskImplTest.java | 0 .../api/posttask/ConditionImplTest.java | 0 .../posttask/ConditionToConditionTest.java | 0 .../PostProjectAnalysisTasksExecutorTest.java | 0 .../api/posttask/ProjectImplTest.java | 0 .../api/posttask/QualityGateImplTest.java | 0 .../BatchReportDirectoryHolderImplTest.java | 0 .../batch/BatchReportReaderImplTest.java | 0 .../batch/BatchReportReaderRule.java | 0 .../ImmutableBatchReportDirectoryHolder.java | 0 .../component/AbstractComponentProvider.java | 0 .../projectanalysis/component/CallRecord.java | 0 .../CallRecorderPathAwareVisitor.java | 0 .../CallRecorderTypeAwareVisitor.java | 0 .../component/ComponentFunctionsTest.java | 0 .../component/ComponentImplTest.java | 0 .../component/ComponentProvider.java | 0 .../component/ComponentRootBuilderTest.java | 0 .../component/ComponentTest.java | 0 .../ConfigurationRepositoryTest.java | 0 .../component/CrawlerDepthLimitTest.java | 0 .../component/DbIdsRepositoryImplTest.java | 0 .../DisabledComponentsHolderImplTest.java | 0 .../component/DumbDeveloper.java | 0 .../component/FileAttributesTest.java | 0 .../component/MutableDbIdsRepositoryRule.java | 0 .../component/MutableTreeRootHolderRule.java | 0 .../component/NoComponentProvider.java | 0 .../component/PathAwareCallRecord.java | 0 .../component/ReportComponent.java | 0 .../component/ReportPathAwareVisitorTest.java | 0 ...derDepthTraversalTypeAwareCrawlerTest.java | 0 ...derDepthTraversalTypeAwareCrawlerTest.java | 0 .../component/ReportVisitorsCrawlerTest.java | 0 ...sitorsCrawlerWithPathAwareVisitorTest.java | 0 ...wlerWithPostOrderTypeAwareVisitorTest.java | 0 ...awlerWithPreOrderTypeAwareVisitorTest.java | 0 .../component/TestSettingsRepository.java | 0 .../component/TreeComponentProvider.java | 0 .../TreeRootHolderComponentProvider.java | 0 .../component/TreeRootHolderImplTest.java | 0 .../component/TreeRootHolderRule.java | 0 .../TypeAwareVisitorAdapterTest.java | 0 .../component/ViewsComponent.java | 0 .../component/ViewsPathAwareVisitorTest.java | 0 ...derDepthTraversalTypeAwareCrawlerTest.java | 0 ...derDepthTraversalTypeAwareCrawlerTest.java | 0 .../component/ViewsVisitorsCrawlerTest.java | 0 ...sitorsCrawlerWithPathAwareVisitorTest.java | 0 ...wlerWithPostOrderTypeAwareVisitorTest.java | 0 ...awlerWithPreOrderTypeAwareVisitorTest.java | 0 ...ectAnalysisTaskContainerPopulatorTest.java | 0 .../CrossProjectDuplicateTest.java | 0 ...rojectDuplicationStatusHolderImplTest.java | 0 .../duplication/DuplicateTest.java | 0 .../DuplicationRepositoryImplTest.java | 0 .../DuplicationRepositoryRule.java | 0 .../duplication/DuplicationTest.java | 0 .../duplication/InProjectDuplicateTest.java | 0 .../duplication/InnerDuplicateTest.java | 0 ...IntegrateCrossProjectDuplicationsTest.java | 0 .../duplication/TextBlockTest.java | 0 .../event/EventRepositoryImplTest.java | 0 .../task/projectanalysis/event/EventTest.java | 0 .../filemove/FileMoveDetectionStepTest.java | 0 .../projectanalysis/filemove/MatchTest.java | 0 .../filemove/MatchesByScoreTest.java | 0 .../MutableMovedFilesRepositoryImplTest.java | 0 .../MutableMovedFilesRepositoryRule.java | 0 .../filemove/SourceSimilarityImplTest.java | 0 .../formula/AverageFormulaExecutionTest.java | 0 .../formula/AverageFormulaTest.java | 0 .../DistributionFormulaExecutionTest.java | 0 .../formula/DistributionFormulaTest.java | 0 .../formula/DumbCreateMeasureContext.java | 0 .../formula/IntSumFormulaTest.java | 0 .../formula/LongSumFormulaTest.java | 0 ...rtFormulaExecutorComponentVisitorTest.java | 0 .../formula/SumFormulaExecutionTest.java | 0 ...wsFormulaExecutorComponentVisitorTest.java | 0 .../formula/counter/DoubleValueTest.java | 0 .../formula/counter/IntSumCounterTest.java | 0 .../formula/counter/IntValueTest.java | 0 .../formula/counter/LongSumCounterTest.java | 0 .../formula/counter/LongValueTest.java | 0 .../formula/counter/RatingValueTest.java | 0 .../formula/coverage/CoverageUtilsTest.java | 0 ...eIssuesOnRemovedComponentsVisitorTest.java | 0 .../ComponentIssuesRepositoryImplTest.java | 0 .../issue/ComponentIssuesRepositoryRule.java | 0 .../ComponentsWithUnprocessedIssuesTest.java | 0 .../issue/DebtCalculatorTest.java | 0 .../issue/DefaultAssigneeTest.java | 0 .../task/projectanalysis/issue/DumbRule.java | 0 .../issue/EffortAggregatorTest.java | 0 .../issue/FillComponentIssuesVisitorRule.java | 0 .../issue/IntegrateIssuesVisitorTest.java | 0 .../issue/IssueAssignerTest.java | 0 .../issue/IssueCounterTest.java | 0 .../IssueCreationDateCalculatorTest.java | 0 .../issue/IssueLifecycleTest.java | 0 ...onentUuidsHavingOpenIssuesVisitorTest.java | 0 .../issue/MovedIssueVisitorTest.java | 0 .../issue/NewEffortAggregatorTest.java | 0 .../issue/NewEffortCalculatorTest.java | 0 .../issue/RuleRepositoryImplTest.java | 0 .../issue/RuleRepositoryRule.java | 0 .../issue/RuleTagsCopierTest.java | 0 .../issue/RuleTypeCopierTest.java | 0 .../issue/ScmAccountToUserLoaderTest.java | 0 .../issue/TrackerBaseInputFactoryTest.java | 0 .../issue/TrackerRawInputFactoryTest.java | 0 .../issue/UpdateConflictResolverTest.java | 0 .../commonrule/BranchCoverageRuleTest.java | 0 .../commonrule/CommentDensityRuleTest.java | 0 .../commonrule/CommonRuleEngineImplTest.java | 0 .../issue/commonrule/CommonRuleTest.java | 0 .../issue/commonrule/CoverageRuleTest.java | 0 .../commonrule/DuplicatedBlockRuleTest.java | 0 .../commonrule/LineCoverageRuleTest.java | 0 .../issue/commonrule/SkippedTestRuleTest.java | 0 .../issue/commonrule/TestErrorRuleTest.java | 0 .../issue/filter/IssueFilterTest.java | 0 .../issue/filter/IssuePatternTest.java | 0 .../language/LanguageRepositoryImplTest.java | 0 .../measure/BatchMeasureToMeasureTest.java | 0 .../measure/BestValueOptimizationTest.java | 0 .../MapBasedRawMeasureRepositoryTest.java | 0 .../measure/MeasureAssert.java | 0 .../MeasureComputersHolderImplTest.java | 0 .../measure/MeasureComputersHolderRule.java | 0 .../measure/MeasureDtoToMeasureTest.java | 0 .../measure/MeasureKeyTest.java | 0 .../measure/MeasureLevelTest.java | 0 .../measure/MeasureRepoEntry.java | 0 .../measure/MeasureRepositoryImplTest.java | 0 .../measure/MeasureRepositoryRule.java | 0 .../projectanalysis/measure/MeasureTest.java | 0 .../measure/MeasureToMeasureDtoTest.java | 0 .../measure/QualityGateStatusTest.java | 0 .../ReportMeasureComputersVisitorTest.java | 0 .../ViewsMeasureComputersVisitorTest.java | 0 .../EvaluatedConditionTest.java | 0 .../QualityGateDetailsDataTest.java | 0 .../metric/MetricDtoToMetricTest.java | 0 .../metric/MetricImplTest.java | 0 .../metric/MetricRepositoryImplTest.java | 0 .../metric/MetricRepositoryRule.java | 0 .../metric/ReportMetricValidatorImplTest.java | 0 .../period/PeriodHolderImplTest.java | 0 .../period/PeriodHolderRule.java | 0 .../projectanalysis/period/PeriodTest.java | 0 .../qualitygate/ConditionEvaluatorTest.java | 0 .../qualitygate/ConditionStatusTest.java | 0 .../qualitygate/ConditionTest.java | 0 .../qualitygate/EvaluationResultAssert.java | 0 .../qualitygate/EvaluationResultTest.java | 0 .../EvaluationResultTextConverterTest.java | 0 .../MutableQualityGateHolderRule.java | 0 .../MutableQualityGateStatusHolderRule.java | 0 .../QualityGateHolderImplTest.java | 0 .../qualitygate/QualityGateHolderRule.java | 0 .../QualityGateServiceImplTest.java | 0 .../QualityGateStatusHolderImplTest.java | 0 .../MaintainabilityMeasuresVisitorTest.java | 0 ...NewMaintainabilityMeasuresVisitorTest.java | 0 ...yAndSecurityRatingMeasuresVisitorTest.java | 0 .../qualitymodel/RatingGridTest.java | 0 .../qualitymodel/RatingSettingsTest.java | 0 ...yAndSecurityRatingMeasuresVisitorTest.java | 0 .../ActiveRulesHolderImplTest.java | 0 .../qualityprofile/ActiveRulesHolderRule.java | 0 .../projectanalysis/scm/ChangesetTest.java | 0 .../projectanalysis/scm/DbScmInfoTest.java | 0 .../scm/ReportScmInfoTest.java | 0 .../projectanalysis/scm/ScmInfoImplTest.java | 0 .../scm/ScmInfoRepositoryImplTest.java | 0 .../scm/ScmInfoRepositoryRule.java | 0 .../source/ComputeFileSourceDataTest.java | 0 .../source/CoverageLineReaderTest.java | 0 .../source/DuplicationLineReaderTest.java | 0 .../source/HighlightingLineReaderTest.java | 0 .../source/LastCommitVisitorTest.java | 0 .../source/RangeOffsetConverterTest.java | 0 .../source/ReportIteratorTest.java | 0 .../source/ScmLineReaderTest.java | 0 .../source/SourceHashRepositoryImplTest.java | 0 .../source/SourceLinesRepositoryImplTest.java | 0 .../source/SourceLinesRepositoryRule.java | 0 .../source/SymbolsLineReaderTest.java | 0 .../projectanalysis/step/BaseStepTest.java | 0 .../step/BuildComponentTreeStepTest.java | 0 .../step/ComputeQProfileMeasureStepTest.java | 0 .../step/CustomMeasuresCopyStepTest.java | 0 .../step/DuplicationDataMeasuresStepTest.java | 0 .../step/EnableAnalysisStepTest.java | 0 .../step/ExecuteVisitorsStepTest.java | 0 .../step/ExtractReportStepTest.java | 0 .../step/IndexAnalysisStepTest.java | 0 ...ProjectDuplicationsRepositoryStepTest.java | 0 .../LoadDuplicationsFromReportStepTest.java | 0 .../step/LoadMeasureComputersStepTest.java | 0 .../step/LoadPeriodsStepTest.java | 0 .../step/LoadQualityProfilesStepTest.java | 0 ...dReportAnalysisMetadataHolderStepTest.java | 0 .../step/NewSizeMeasuresStepTest.java | 0 .../step/PersistComponentsStepTest.java | 0 ...tCrossProjectDuplicationIndexStepTest.java | 0 .../step/PersistDevelopersStepTest.java | 0 .../step/PersistEventsStepTest.java | 0 .../step/PersistFileSourcesStepTest.java | 0 .../step/PersistIssuesStepTest.java | 0 .../step/PersistMeasuresStepTest.java | 0 .../step/PersistProjectLinksStepTest.java | 0 .../step/PersistScannerContextStepTest.java | 0 .../step/PersistTestsStepTest.java | 0 .../step/PublishTaskResultStepTest.java | 0 .../step/PurgeDatastoresStepTest.java | 0 .../step/QualityGateEventsStepTest.java | 0 .../step/QualityGateLoadingStepTest.java | 0 .../step/QualityGateMeasuresStepTest.java | 0 .../step/QualityProfileEventsStepTest.java | 0 .../step/ReportCommentMeasuresStepTest.java | 0 .../ReportComplexityMeasuresStepTest.java | 0 .../step/ReportComputationStepsTest.java | 0 ...eportComputeMeasureVariationsStepTest.java | 0 .../step/ReportCoverageMeasuresStepTest.java | 0 .../ReportDuplicationMeasuresStepTest.java | 0 ...tLanguageDistributionMeasuresStepTest.java | 0 .../ReportNewCoverageMeasuresStepTest.java | 0 .../step/ReportPersistAnalysisStepTest.java | 0 .../step/ReportPersistComponentsStepTest.java | 0 .../step/ReportSizeMeasuresStepTest.java | 0 .../step/ReportUnitTestMeasuresStepTest.java | 0 .../step/SendIssueNotificationsStepTest.java | 0 ...teQualityProfilesLastUsedDateStepTest.java | 0 .../step/ValidateProjectStepTest.java | 0 .../step/ViewsCommentMeasuresStepTest.java | 0 .../step/ViewsComplexityMeasuresStepTest.java | 0 ...ViewsComputeMeasureVariationsStepTest.java | 0 .../step/ViewsCoverageMeasuresStepTest.java | 0 .../ViewsDuplicationMeasuresStepTest.java | 0 ...sLanguageDistributionMeasuresStepTest.java | 0 .../ViewsNewCoverageMeasuresStepTest.java | 0 .../step/ViewsPersistAnalysisStepTest.java | 0 .../step/ViewsPersistComponentsStepTest.java | 0 .../step/ViewsSizeMeasuresStepTest.java | 0 .../step/ViewsUnitTestMeasuresStepTest.java | 0 .../webhook/TestWebhookCaller.java | 0 .../webhook/WebhookCallerImplTest.java | 0 .../webhook/WebhookDeliveryStorageTest.java | 0 .../webhook/WebhookDeliveryTest.java | 0 .../webhook/WebhookModuleTest.java | 0 .../WebhookPayloadFactoryImplTest.java | 0 .../webhook/WebhookPostTaskTest.java | 0 .../step/ComputationStepExecutorTest.java | 0 .../computation/task/step/StepsExplorer.java | 0 .../MutableTaskResultHolderImplTest.java | 0 .../debt/DebtModelPluginRepositoryTest.java | 0 .../server/debt/DebtModelXMLExporterTest.java | 0 .../server/debt/DebtRulesXMLImporterTest.java | 0 .../ws/DuplicationsParserTest.java | 0 .../duplication/ws/DuplicationsWsTest.java | 0 .../server/duplication/ws/ShowActionTest.java | 0 .../ws/ShowResponseBuilderTest.java | 0 .../server/email/ws/EmailsWsModuleTest.java | 0 .../sonar/server/email/ws/SendActionTest.java | 0 ...dexerConcurrentRequestCalculationTest.java | 0 .../org/sonar/server/es/BulkIndexerTest.java | 0 .../server/es/DefaultIndexSettingsTest.java | 0 .../sonar/server/es/EsClientProviderTest.java | 0 .../sonar/server/es/EsClientStopperTest.java | 0 .../org/sonar/server/es/EsClientTest.java | 0 .../org/sonar/server/es/EsServerHolder.java | 0 .../java/org/sonar/server/es/EsTester.java | 0 .../java/org/sonar/server/es/EsUtilsTest.java | 0 .../java/org/sonar/server/es/FakeDoc.java | 0 .../sonar/server/es/FakeIndexDefinition.java | 0 .../org/sonar/server/es/IndexCreatorTest.java | 0 .../server/es/IndexDefinitionContextTest.java | 0 .../server/es/IndexDefinitionHashTest.java | 0 .../server/es/IndexerStartupTaskTest.java | 0 .../sonar/server/es/IndexingResultTest.java | 0 .../org/sonar/server/es/NewIndexTest.java | 0 .../sonar/server/es/RecoveryIndexerTest.java | 0 .../sonar/server/es/SearchOptionsTest.java | 0 .../java/org/sonar/server/es/SortingTest.java | 0 .../request/ProxyBulkRequestBuilderTest.java | 0 .../ProxyClearCacheRequestBuilderTest.java | 0 .../ProxyClusterHealthRequestBuilderTest.java | 0 .../ProxyClusterStateRequestBuilderTest.java | 0 .../ProxyClusterStatsRequestBuilderTest.java | 0 .../ProxyCreateIndexRequestBuilderTest.java | 0 .../ProxyDeleteRequestBuilderTest.java | 0 .../request/ProxyFlushRequestBuilderTest.java | 0 .../request/ProxyGetRequestBuilderTest.java | 0 .../request/ProxyIndexRequestBuilderTest.java | 0 .../ProxyIndicesExistsRequestBuilderTest.java | 0 .../ProxyIndicesStatsRequestBuilderTest.java | 0 .../ProxyMultiGetRequestBuilderTest.java | 0 .../ProxyNodesStatsRequestBuilderTest.java | 0 .../ProxyPutMappingRequestBuilderTest.java | 0 .../ProxyRefreshRequestBuilderTest.java | 0 .../ProxySearchRequestBuilderTest.java | 0 .../ProxySearchScrollRequestBuilderTest.java | 0 .../ComponentTextSearchFeatureRule.java | 0 .../ComponentTextSearchQueryFactoryTest.java | 0 .../org/sonar/server/event/NewAlertsTest.java | 0 .../exceptions/BadRequestExceptionTest.java | 0 .../sonar/server/exceptions/MessageTest.java | 0 .../exceptions/ServerExceptionTest.java | 0 .../server/favorite/FavoriteModuleTest.java | 0 .../server/favorite/FavoriteUpdaterTest.java | 0 .../server/favorite/ws/AddActionTest.java | 0 .../server/favorite/ws/FavoritesWsTest.java | 0 .../server/favorite/ws/RemoveActionTest.java | 0 .../server/favorite/ws/SearchActionTest.java | 0 .../java/org/sonar/server/i18n/I18nRule.java | 0 .../org/sonar/server/i18n/package-info.java | 0 .../sonar/server/issue/ActionFinderTest.java | 0 .../org/sonar/server/issue/ActionTest.java | 0 .../sonar/server/issue/AddTagsActionTest.java | 0 .../sonar/server/issue/AssignActionTest.java | 0 .../sonar/server/issue/CommentActionTest.java | 0 .../sonar/server/issue/IssueDocTesting.java | 0 .../server/issue/IssueFieldsSetterTest.java | 0 .../sonar/server/issue/IssueFinderTest.java | 0 .../server/issue/IssueQueryFactoryTest.java | 0 .../sonar/server/issue/IssueQueryTest.java | 0 .../server/issue/IssueServiceMediumTest.java | 0 .../sonar/server/issue/IssueStorageTest.java | 0 .../sonar/server/issue/IssueUpdaterTest.java | 0 .../server/issue/IssuesFinderSortTest.java | 0 .../server/issue/RemoveTagsActionTest.java | 0 .../org/sonar/server/issue/ResultTest.java | 0 .../sonar/server/issue/RulesAggregation.java | 0 .../server/issue/RulesAggregationTest.java | 0 .../server/issue/ServerIssueStorageTest.java | 0 .../server/issue/SetSeverityActionTest.java | 0 .../sonar/server/issue/SetTypeActionTest.java | 0 .../server/issue/TransitionActionTest.java | 0 .../server/issue/TransitionServiceTest.java | 0 .../issue/index/IssueIndexDebtTest.java | 0 .../issue/index/IssueIndexDefinitionTest.java | 0 .../server/issue/index/IssueIndexTest.java | 0 .../server/issue/index/IssueIndexerTest.java | 0 .../issue/index/IssueIteratorFactoryTest.java | 0 ...esOnMyIssueNotificationDispatcherTest.java | 0 .../DoNotFixNotificationDispatcherTest.java | 0 .../IssueChangeNotificationTest.java | 0 .../IssueChangesEmailTemplateTest.java | 0 .../MyNewIssuesEmailTemplateTest.java | 0 ...MyNewIssuesNotificationDispatcherTest.java | 0 .../MyNewIssuesNotificationTest.java | 0 .../NewIssuesEmailTemplateTest.java | 0 .../NewIssuesNotificationDispatcherTest.java | 0 .../NewIssuesNotificationTest.java | 0 .../notification/NewIssuesStatisticsTest.java | 0 .../issue/workflow/IsBeingClosedTest.java | 0 .../issue/workflow/IssueWorkflowTest.java | 0 .../issue/workflow/SetCloseDateTest.java | 0 .../server/issue/workflow/SetClosedTest.java | 0 .../issue/workflow/SetResolutionTest.java | 0 .../issue/workflow/StateMachineTest.java | 0 .../server/issue/workflow/StateTest.java | 0 .../server/issue/workflow/TransitionTest.java | 0 .../issue/workflow/UnsetAssigneeTest.java | 0 .../server/issue/ws/AddCommentActionTest.java | 0 .../server/issue/ws/AssignActionTest.java | 0 .../server/issue/ws/AuthorsActionTest.java | 0 .../issue/ws/AvatarResolverImplTest.java | 0 .../server/issue/ws/BulkChangeActionTest.java | 0 .../server/issue/ws/ChangelogActionTest.java | 0 .../issue/ws/ComponentTagsActionTest.java | 0 .../issue/ws/DeleteCommentActionTest.java | 0 .../issue/ws/DoTransitionActionTest.java | 0 .../issue/ws/EditCommentActionTest.java | 0 .../server/issue/ws/IssueWsModuleTest.java | 0 .../ws/SearchActionComponentsMediumTest.java | 0 .../issue/ws/SearchActionMediumTest.java | 0 .../server/issue/ws/SearchActionTest.java | 0 .../issue/ws/SetSeverityActionTest.java | 0 .../server/issue/ws/SetTagsActionTest.java | 0 .../server/issue/ws/SetTypeActionTest.java | 0 .../sonar/server/issue/ws/TagsActionTest.java | 0 .../server/language/LanguageTesting.java | 0 .../server/language/ws/LanguageWsTest.java | 0 .../license/ws/LicensesWsModuleTest.java | 0 .../server/license/ws/ListActionTest.java | 0 .../measure/custom/ws/CreateActionTest.java | 0 .../custom/ws/CustomMeasureValidatorTest.java | 0 .../custom/ws/CustomMeasuresWsModuleTest.java | 0 .../custom/ws/CustomMeasuresWsTest.java | 0 .../measure/custom/ws/DeleteActionTest.java | 0 .../measure/custom/ws/MetricsActionTest.java | 0 .../measure/custom/ws/SearchActionTest.java | 0 .../measure/custom/ws/UpdateActionTest.java | 0 .../index/ProjectMeasuresIndexTest.java | 0 .../ProjectMeasuresIndexTextSearchTest.java | 0 .../index/ProjectMeasuresIndexerTest.java | 0 .../index/ProjectMeasuresQueryTest.java | 0 .../measure/index/ProjectsEsModuleTest.java | 0 .../measure/ws/ComponentActionTest.java | 0 .../measure/ws/ComponentTreeActionTest.java | 0 .../measure/ws/ComponentTreeSortTest.java | 0 .../measure/ws/MeasureValueFormatterTest.java | 0 .../measure/ws/MeasuresWsModuleTest.java | 0 .../server/measure/ws/MeasuresWsTest.java | 0 .../server/measure/ws/SearchActionTest.java | 0 .../measure/ws/SearchHistoryActionTest.java | 0 .../server/measure/ws/TimeMachineWsTest.java | 0 .../server/metric/CoreCustomMetricsTest.java | 0 .../metric/DefaultMetricFinderTest.java | 0 .../server/metric/ws/CreateActionTest.java | 0 .../server/metric/ws/DeleteActionTest.java | 0 .../server/metric/ws/DomainsActionTest.java | 0 .../server/metric/ws/MetricsWsModuleTest.java | 0 .../sonar/server/metric/ws/MetricsWsTest.java | 0 .../server/metric/ws/SearchActionTest.java | 0 .../server/metric/ws/TypesActionTest.java | 0 .../server/metric/ws/UpdateActionTest.java | 0 .../DefaultNotificationManagerTest.java | 0 .../notification/NotificationCenterTest.java | 0 .../notification/NotificationChannelTest.java | 0 .../notification/NotificationDaemonTest.java | 0 .../NotificationDispatcherMetadataTest.java | 0 .../NotificationDispatcherTest.java | 0 .../notification/NotificationModuleTest.java | 0 .../server/notification/NotificationTest.java | 0 .../email/AlertsEmailTemplateTest.java | 0 .../email/EmailNotificationChannelTest.java | 0 .../server/notification/ws/AddActionTest.java | 0 .../notification/ws/ListActionTest.java | 0 .../ws/NotificationWsModuleTest.java | 0 .../notification/ws/NotificationsWsTest.java | 0 .../notification/ws/RemoveActionTest.java | 0 .../BillingValidationsProxyImplTest.java | 0 .../DefaultOrganizationEnforcerTest.java | 0 .../DefaultOrganizationProviderImplTest.java | 0 .../organization/DefaultOrganizationTest.java | 0 .../OrganizationCreationImplTest.java | 0 .../OrganizationFlagsImplTest.java | 0 .../OrganizationValidationImplTest.java | 0 .../TestDefaultOrganizationProvider.java | 0 .../organization/TestOrganizationFlags.java | 0 .../organization/ws/AddMemberActionTest.java | 0 .../organization/ws/CreateActionTest.java | 0 .../organization/ws/DeleteActionTest.java | 0 .../ws/EnableSupportActionTest.java | 0 .../ws/OrganizationsWsModuleTest.java | 0 .../ws/OrganizationsWsTestSupport.java | 0 .../ws/RemoveMemberActionTest.java | 0 .../organization/ws/SearchActionTest.java | 0 .../ws/SearchMembersActionTest.java | 0 .../ws/SearchMyOrganizationsActionTest.java | 0 .../organization/ws/UpdateActionTest.java | 0 .../ws/UpdateProjectVisibilityActionTest.java | 0 .../ApplyPermissionTemplateQueryTest.java | 0 .../GroupPermissionChangerTest.java | 0 .../PermissionTemplateServiceTest.java | 0 .../permission/UserPermissionChangerTest.java | 0 .../index/AuthorizationTypeSupportTest.java | 0 .../server/permission/index/FooIndex.java | 0 .../permission/index/FooIndexDefinition.java | 0 .../server/permission/index/FooIndexer.java | 0 .../index/PermissionIndexerDaoTest.java | 0 .../index/PermissionIndexerTest.java | 0 .../index/PermissionIndexerTester.java | 0 .../permission/ws/AddGroupActionTest.java | 0 .../permission/ws/AddUserActionTest.java | 0 .../permission/ws/BasePermissionWsTest.java | 0 .../permission/ws/GroupsActionTest.java | 0 .../ws/PermissionsWsModuleTest.java | 0 .../permission/ws/PermissionsWsTest.java | 0 .../permission/ws/RemoveGroupActionTest.java | 0 .../permission/ws/RemoveUserActionTest.java | 0 .../ws/SearchGlobalPermissionsActionTest.java | 0 .../SearchProjectPermissionsActionTest.java | 0 .../ws/SearchProjectPermissionsDataTest.java | 0 .../server/permission/ws/UsersActionTest.java | 0 .../AddGroupToTemplateActionTest.java | 0 ...AddProjectCreatorToTemplateActionTest.java | 0 .../template/AddUserToTemplateActionTest.java | 0 .../ws/template/ApplyTemplateActionTest.java | 0 .../template/BulkApplyTemplateActionTest.java | 0 .../ws/template/CreateTemplateActionTest.java | 0 .../DefaultTemplatesResolverImplTest.java | 0 .../DefaultTemplatesResolverRule.java | 0 .../ws/template/DeleteTemplateActionTest.java | 0 ...teDtoToPermissionTemplateResponseTest.java | 0 .../RemoveGroupFromTemplateActionTest.java | 0 ...eProjectCreatorFromTemplateActionTest.java | 0 .../RemoveUserFromTemplateActionTest.java | 0 .../template/SearchTemplatesActionTest.java | 0 .../ws/template/SearchTemplatesDataTest.java | 0 .../SetDefaultTemplateActionTest.java | 0 .../ws/template/TemplateGroupsActionTest.java | 0 .../ws/template/TemplateUsersActionTest.java | 0 .../ws/template/UpdateTemplateActionTest.java | 0 .../server/platform/BackendCleanupTest.java | 0 .../server/platform/ClassLoaderUtilsTest.java | 0 .../DatabaseServerCompatibilityTest.java | 0 .../DefaultServerUpgradeStatusTest.java | 0 .../platform/PersistentSettingsTest.java | 0 .../platform/ServerIdGeneratorTest.java | 0 .../server/platform/ServerIdLoaderTest.java | 0 .../server/platform/ServerIdManagerTest.java | 0 .../sonar/server/platform/ServerImplTest.java | 0 .../platform/ServerLifecycleNotifierTest.java | 0 .../server/platform/ServerLoggingTest.java | 0 .../server/platform/ServerTesterPlatform.java | 0 .../platform/SettingsChangeNotifierTest.java | 0 .../StartupMetadataPersisterTest.java | 0 .../platform/StartupMetadataProviderTest.java | 0 .../platform/TempFolderProviderTest.java | 0 .../server/platform/UrlSettingsTest.java | 0 .../platform/cluster/ClusterImplTest.java | 0 .../server/platform/cluster/ClusterMock.java | 0 .../db/CheckDatabaseCharsetAtStartupTest.java | 0 .../db/EmbeddedDatabaseFactoryTest.java | 0 .../platform/db/EmbeddedDatabaseTest.java | 0 .../db/migration/AutoDbMigrationTest.java | 0 ...tabaseMigrationExecutorServiceAdaptor.java | 0 ...DatabaseMigrationImplAsynchronousTest.java | 0 ...baseMigrationImplConcurrentAccessTest.java | 0 .../migration/DatabaseMigrationImplTest.java | 0 .../monitoring/BaseMonitorMBeanTest.java | 0 .../monitoring/DatabaseMonitorTest.java | 0 .../platform/monitoring/EsMonitorTest.java | 0 .../platform/monitoring/FakeMonitor.java | 0 .../platform/monitoring/FakeMonitorMBean.java | 0 .../monitoring/JvmPropsMonitorTest.java | 0 .../monitoring/PluginsMonitorTest.java | 0 .../monitoring/SettingsMonitorTest.java | 0 .../monitoring/SonarQubeMonitorTest.java | 0 .../monitoring/SystemMonitorTest.java | 0 .../platformlevel/PlatformLevel1Test.java | 0 .../platformlevel/PlatformLevel2Test.java | 0 .../platform/web/MasterServletFilterTest.java | 0 .../platform/web/RedirectFilterTest.java | 0 .../server/platform/web/RootFilterTest.java | 0 .../web/SecurityServletFilterTest.java | 0 .../platform/web/WebPagesFilterTest.java | 0 .../requestid/HttpRequestIdModuleTest.java | 0 .../requestid/RequestIdConfigurationTest.java | 0 .../web/requestid/RequestIdFilterTest.java | 0 .../requestid/RequestIdGeneratorImplTest.java | 0 .../platform/ws/ChangeLogLevelActionTest.java | 0 .../ws/DbMigrationStatusActionTest.java | 0 .../server/platform/ws/IndexActionTest.java | 0 .../server/platform/ws/InfoActionTest.java | 0 .../server/platform/ws/LogsActionTest.java | 0 .../platform/ws/MigrateDbActionTest.java | 0 .../server/platform/ws/PingActionTest.java | 0 .../server/platform/ws/RestartActionTest.java | 0 .../server/platform/ws/ServerWsTest.java | 0 .../server/platform/ws/StatusActionTest.java | 0 .../server/platform/ws/SystemWsTest.java | 0 .../platform/ws/UpgradesActionTest.java | 0 ...InstalledPluginReferentialFactoryTest.java | 0 .../server/plugins/PluginDownloaderTest.java | 0 ...luginReferentialMetadataConverterTest.java | 0 .../plugins/ServerPluginJarExploderTest.java | 0 .../plugins/ServerPluginRepositoryTest.java | 0 .../plugins/StaticResourcesServletTest.java | 0 .../org/sonar/server/plugins/TestPluginA.java | 0 .../server/plugins/TestProjectUtils.java | 0 .../plugins/UpdateCenterClientTest.java | 0 .../UpdateCenterMatrixFactoryTest.java | 0 .../server/plugins/UpdateCenterServlet.java | 0 .../PrivilegedPluginsBootstraperTest.java | 0 .../PrivilegedPluginsStopperTest.java | 0 ...tUpdateCenterBasedPluginsWsActionTest.java | 0 .../plugins/ws/AvailableActionTest.java | 0 .../plugins/ws/CancelAllActionTest.java | 0 .../server/plugins/ws/InstallActionTest.java | 0 .../plugins/ws/InstalledActionTest.java | 0 .../server/plugins/ws/PendingActionTest.java | 0 .../ws/PluginUpdateAggregateBuilderTest.java | 0 .../ws/PluginUpdateAggregatorTest.java | 0 .../plugins/ws/PluginWSCommonsTest.java | 0 .../server/plugins/ws/PluginsWsTest.java | 0 .../plugins/ws/UninstallActionTest.java | 0 .../server/plugins/ws/UpdateActionTest.java | 0 .../server/plugins/ws/UpdatesActionTest.java | 0 .../project/ws/BulkDeleteActionTest.java | 0 .../project/ws/BulkUpdateKeyActionTest.java | 0 .../server/project/ws/CreateActionTest.java | 0 .../server/project/ws/DeleteActionTest.java | 0 .../server/project/ws/GhostsActionTest.java | 0 .../server/project/ws/IndexActionTest.java | 0 .../project/ws/ProjectsWsModuleTest.java | 0 .../project/ws/ProvisionedActionTest.java | 0 .../server/project/ws/SearchActionTest.java | 0 .../ws/SearchMyProjectsActionTest.java | 0 .../ws/SearchMyProjectsDataLoaderTest.java | 0 .../project/ws/SearchMyProjectsDataTest.java | 0 .../project/ws/UpdateKeyActionTest.java | 0 .../ws/UpdateVisibilityActionTest.java | 0 .../ProjectAnalysisModuleTest.java | 0 .../ws/CreateEventActionTest.java | 0 .../projectanalysis/ws/DeleteActionTest.java | 0 .../ws/DeleteEventActionTest.java | 0 .../ws/EventValidatorTest.java | 0 .../projectanalysis/ws/SearchActionTest.java | 0 .../ws/UpdateEventActionTest.java | 0 .../projectlink/ws/CreateActionTest.java | 0 .../projectlink/ws/DeleteActionTest.java | 0 .../ws/ProjectLinksWsModuleTest.java | 0 .../projectlink/ws/ProjectLinksWsTest.java | 0 .../projectlink/ws/SearchActionTest.java | 0 .../ws/ProjectTagsWsModuleTest.java | 0 .../projecttag/ws/ProjectTagsWsTest.java | 0 .../projecttag/ws/SearchActionTest.java | 0 .../server/projecttag/ws/SetActionTest.java | 0 .../property/InternalPropertiesImplTest.java | 0 .../server/property/ws/IndexActionTest.java | 0 .../qualitygate/QgateProjectFinderTest.java | 0 .../QualityGateConditionsUpdaterTest.java | 0 .../qualitygate/QualityGateFinderTest.java | 0 .../qualitygate/QualityGateModuleTest.java | 0 .../qualitygate/QualityGateUpdaterTest.java | 0 .../server/qualitygate/QualityGatesTest.java | 0 .../qualitygate/RegisterQualityGatesTest.java | 0 .../server/qualitygate/ws/AppActionTest.java | 0 .../qualitygate/ws/CreateActionTest.java | 0 .../ws/CreateConditionActionTest.java | 0 .../qualitygate/ws/DeselectActionTest.java | 0 .../ws/GetByProjectActionTest.java | 0 .../ws/ProjectStatusActionTest.java | 0 .../ws/QualityGateDetailsFormatterTest.java | 0 .../qualitygate/ws/QualityGatesWsTest.java | 0 .../qualitygate/ws/SelectActionTest.java | 0 .../ws/UpdateConditionActionTest.java | 0 .../qualityprofile/ActiveRuleChangeTest.java | 0 .../BuiltInQProfileInsertImplTest.java | 0 .../BuiltInQProfileLoaderTest.java | 0 .../BuiltInQProfileRepositoryImplTest.java | 0 .../BuiltInQProfileRepositoryRule.java | 0 .../BuiltInQProfileUpdateImplTest.java | 0 ...ityProfilesNotificationDispatcherTest.java | 0 ...alityProfilesNotificationTemplateTest.java | 0 ...uiltInQualityProfilesNotificationTest.java | 0 ...ltInQualityProfilesUpdateListenerTest.java | 0 .../QProfileBackuperImplTest.java | 0 .../QProfileComparisonMediumTest.java | 0 .../qualityprofile/QProfileCopierTest.java | 0 .../qualityprofile/QProfileExportersTest.java | 0 .../QProfileFactoryImplTest.java | 0 .../qualityprofile/QProfileTesting.java | 0 .../qualityprofile/QualityProfileTest.java | 0 .../RegisterQualityProfilesMediumTest.java | 0 ...gisterQualityProfilesNotificationTest.java | 0 .../RegisterQualityProfilesTest.java | 0 .../qualityprofile/RuleActivatorTest.java | 0 .../index/ActiveRuleIndexerTest.java | 0 .../ws/ActivateRuleActionTest.java | 0 .../ws/ActivateRulesActionTest.java | 0 .../ws/AddProjectActionTest.java | 0 .../qualityprofile/ws/BackupActionTest.java | 0 .../ws/ChangeParentActionTest.java | 0 .../ws/ChangelogActionDatabaseTest.java | 0 .../ws/ChangelogActionMockTest.java | 0 .../ws/ChangelogLoaderTest.java | 0 .../ws/CompareActionMediumTest.java | 0 .../qualityprofile/ws/CompareActionTest.java | 0 .../qualityprofile/ws/CopyActionTest.java | 0 .../qualityprofile/ws/CreateActionTest.java | 0 .../ws/DeactivateRuleActionTest.java | 0 .../ws/DeactivateRulesActionTest.java | 0 .../qualityprofile/ws/DeleteActionTest.java | 0 .../qualityprofile/ws/ExportActionTest.java | 0 .../ws/ExportersActionTest.java | 0 .../ws/ImportersActionTest.java | 0 .../ws/InheritanceActionTest.java | 0 .../qualityprofile/ws/ProfilesWsTest.java | 0 .../qualityprofile/ws/ProjectsActionTest.java | 0 .../ws/QProfileReferenceTest.java | 0 .../ws/QProfileWsSupportTest.java | 0 .../ws/QProfilesWsMediumTest.java | 0 .../ws/QProfilesWsModuleTest.java | 0 .../qualityprofile/ws/QProfilesWsTest.java | 0 .../ws/RemoveProjectActionTest.java | 0 .../qualityprofile/ws/RenameActionTest.java | 0 .../qualityprofile/ws/RestoreActionTest.java | 0 .../ws/RestoreBuiltInActionTest.java | 0 .../qualityprofile/ws/SearchActionTest.java | 0 .../ws/SetDefaultActionTest.java | 0 .../qualityprofile/ws/ShowActionTest.java | 0 .../server/root/ws/RootsWsModuleTest.java | 0 .../org/sonar/server/root/ws/RootsWsTest.java | 0 .../server/root/ws/SearchActionTest.java | 0 .../server/root/ws/SetRootActionTest.java | 0 .../server/root/ws/UnsetRootActionTest.java | 0 .../server/rule/CachingRuleFinderTest.java | 0 .../sonar/server/rule/CommonRuleKeysTest.java | 0 .../server/rule/DefaultRuleFinderTest.java | 0 .../DeprecatedRulesDefinitionLoaderTest.java | 0 .../server/rule/RegisterRulesMediumTest.java | 0 .../sonar/server/rule/RegisterRulesTest.java | 0 .../sonar/server/rule/RuleCreatorTest.java | 0 .../rule/RuleDefinitionsLoaderTest.java | 0 .../sonar/server/rule/RuleTagHelperTest.java | 0 .../sonar/server/rule/RuleUpdaterTest.java | 0 .../rule/WebServerRuleFinderImplTest.java | 0 .../rule/index/RuleIndexDefinitionTest.java | 0 .../server/rule/index/RuleIndexTest.java | 0 .../server/rule/index/RuleIndexerTest.java | 0 .../rule/ws/ActiveRuleCompleterTest.java | 0 .../sonar/server/rule/ws/AppActionTest.java | 0 .../server/rule/ws/CreateActionTest.java | 0 .../server/rule/ws/DeleteActionTest.java | 0 .../sonar/server/rule/ws/ListActionTest.java | 0 .../rule/ws/RepositoriesActionTest.java | 0 .../server/rule/ws/RuleQueryFactoryTest.java | 0 .../rule/ws/SearchActionMediumTest.java | 0 .../server/rule/ws/SearchActionTest.java | 0 .../server/rule/ws/ShowActionMediumTest.java | 0 .../sonar/server/rule/ws/ShowActionTest.java | 0 .../sonar/server/rule/ws/TagsActionTest.java | 0 .../server/rule/ws/UpdateActionTest.java | 0 .../org/sonar/server/search/BaseDocTest.java | 0 .../server/search/EsSearchModuleTest.java | 0 .../sonar/server/search/FacetValueTest.java | 0 .../serverid/ws/GenerateActionTest.java | 0 .../serverid/ws/ServerIdWsModuleTest.java | 0 .../server/serverid/ws/ServerIdWsTest.java | 0 .../server/serverid/ws/ShowActionTest.java | 0 .../setting/DatabaseSettingLoaderTest.java | 0 .../setting/DatabaseSettingsEnablerTest.java | 0 .../server/setting/NopSettingLoaderTest.java | 0 .../setting/ProjectSettingsFactoryTest.java | 0 .../setting/ThreadLocalSettingsTest.java | 0 .../setting/ws/CheckSecretKeyActionTest.java | 0 .../server/setting/ws/EncryptActionTest.java | 0 .../ws/GenerateSecretKeyActionTest.java | 0 .../setting/ws/ListDefinitionsActionTest.java | 0 .../server/setting/ws/ResetActionTest.java | 0 .../setting/ws/ScannerSettingsTest.java | 0 .../server/setting/ws/SetActionTest.java | 0 .../server/setting/ws/SettingsFinderTest.java | 0 .../setting/ws/SettingsUpdaterTest.java | 0 .../setting/ws/SettingsWsModuleTest.java | 0 .../server/setting/ws/ValuesActionTest.java | 0 .../source/DecorationDataHolderTest.java | 0 .../source/HtmlSourceDecoratorTest.java | 0 .../server/source/HtmlTextDecoratorTest.java | 0 .../server/source/OpeningHtmlTagTest.java | 0 .../server/source/SourceServiceTest.java | 0 .../source/index/FileSourceTesting.java | 0 .../server/source/ws/HashActionTest.java | 0 .../server/source/ws/IndexActionTest.java | 0 .../server/source/ws/LinesActionTest.java | 0 .../sonar/server/source/ws/RawActionTest.java | 0 .../sonar/server/source/ws/ScmActionTest.java | 0 .../server/source/ws/ShowActionTest.java | 0 .../sonar/server/source/ws/SourcesWsTest.java | 0 .../DeleteOldAnalysisReportsFromFsTest.java | 0 .../DisplayLogOnDeprecatedProjectsTest.java | 0 .../startup/GeneratePluginIndexTest.java | 0 .../sonar/server/startup/LogServerIdTest.java | 0 .../server/startup/RegisterMetricsTest.java | 0 .../RegisterPermissionTemplatesTest.java | 0 .../startup/RegisterServletFiltersTest.java | 0 .../RenameDeprecatedPropertyKeysTest.java | 0 .../org/sonar/server/test/db/TestTesting.java | 0 .../server/test/index/TestIndexTest.java | 0 .../server/test/index/TestIndexerTest.java | 0 .../test/index/TestResultSetIteratorTest.java | 0 .../test/ws/CoveredFilesActionTest.java | 0 .../sonar/server/test/ws/ListActionTest.java | 0 .../org/sonar/server/test/ws/TestsWsTest.java | 0 .../tester/AbstractMockUserSession.java | 0 .../tester/AnonymousMockUserSession.java | 0 .../tester/AttributeHolderServletContext.java | 0 .../AttributeHolderServletContextTest.java | 0 .../sonar/server/tester/MockUserSession.java | 0 .../server/tester/MockUserSessionTest.java | 0 .../org/sonar/server/tester/ServerTester.java | 0 .../sonar/server/tester/UserSessionRule.java | 0 .../org/sonar/server/tester/package-info.java | 0 .../server/text/MacroInterpreterTest.java | 0 .../sonar/server/ui/DeprecatedViewsTest.java | 0 .../sonar/server/ui/PageDecorationsTest.java | 0 .../sonar/server/ui/PageRepositoryTest.java | 0 .../sonar/server/ui/VersionFormatterTest.java | 0 .../server/ui/ws/ComponentActionTest.java | 0 .../sonar/server/ui/ws/GlobalActionTest.java | 0 .../server/ui/ws/NavigationWsModuleTest.java | 0 .../server/ui/ws/OrganizationActionTest.java | 0 .../server/ui/ws/SettingsActionTest.java | 0 .../updatecenter/UpdateCenterModuleTest.java | 0 .../ws/InstalledPluginsActionTest.java | 0 .../updatecenter/ws/UpdateCenterWsTest.java | 0 .../updatecenter/ws/UploadActionTest.java | 0 .../server/user/CompatibilityRealmTest.java | 0 .../sonar/server/user/DefaultUserTest.java | 0 .../server/user/DeprecatedUserFinderTest.java | 0 .../sonar/server/user/DoPrivilegedTest.java | 0 .../server/user/ExternalIdentityTest.java | 0 .../server/user/NewUserNotifierTest.java | 0 .../org/sonar/server/user/NewUserTest.java | 0 .../server/user/SecurityRealmFactoryTest.java | 0 .../server/user/ServerUserSessionTest.java | 0 .../server/user/TestUserSessionFactory.java | 0 .../user/ThreadLocalUserSessionTest.java | 0 .../server/user/UserSessionFilterTest.java | 0 .../sonar/server/user/UserUpdaterTest.java | 0 .../user/index/UserIndexDefinitionTest.java | 0 .../server/user/index/UserIndexTest.java | 0 .../server/user/index/UserIndexerTest.java | 0 .../user/ws/ChangePasswordActionTest.java | 0 .../server/user/ws/CreateActionTest.java | 0 .../server/user/ws/CurrentActionTest.java | 0 .../server/user/ws/DeactivateActionTest.java | 0 .../server/user/ws/GroupsActionTest.java | 0 .../user/ws/IdentityProvidersActionTest.java | 0 .../server/user/ws/SearchActionTest.java | 0 .../ws/SkipOnboardingTutorialActionTest.java | 0 .../server/user/ws/UpdateActionTest.java | 0 .../server/user/ws/UserPropertiesWsTest.java | 0 .../server/user/ws/UsersWsModuleTest.java | 0 .../org/sonar/server/user/ws/UsersWsTest.java | 0 .../DefaultGroupCreatorImplTest.java | 0 .../usergroups/DefaultGroupFinderTest.java | 0 .../usergroups/ws/AddUserActionTest.java | 0 .../usergroups/ws/CreateActionTest.java | 0 .../usergroups/ws/DeleteActionTest.java | 0 .../server/usergroups/ws/GroupWsRefTest.java | 0 .../usergroups/ws/RemoveUserActionTest.java | 0 .../usergroups/ws/SearchActionTest.java | 0 .../usergroups/ws/UpdateActionTest.java | 0 .../usergroups/ws/UserGroupsModuleTest.java | 0 .../usergroups/ws/UserGroupsWsTest.java | 0 .../server/usergroups/ws/UsersActionTest.java | 0 .../usertoken/TokenGeneratorImplTest.java | 0 .../usertoken/UserTokenAuthenticatorTest.java | 0 .../server/usertoken/UserTokenModuleTest.java | 0 .../usertoken/ws/GenerateActionTest.java | 0 .../server/usertoken/ws/RevokeActionTest.java | 0 .../server/usertoken/ws/SearchActionTest.java | 0 .../server/usertoken/ws/UserTokensWsTest.java | 0 .../AbstractStoppableExecutorServiceTest.java | 0 .../util/BooleanTypeValidationTest.java | 0 .../sonar/server/util/DateCollectorTest.java | 0 .../server/util/FloatTypeValidationTest.java | 0 .../util/IntegerTypeValidationTest.java | 0 .../server/util/LongTypeValidationTest.java | 0 .../server/util/MetricKeyValidatorTest.java | 0 .../util/ObjectInputStreamIteratorTest.java | 0 .../server/util/OkHttpClientProviderTest.java | 0 .../org/sonar/server/util/RubyUtilsTest.java | 0 .../util/StringListTypeValidationTest.java | 0 .../server/util/StringTypeValidationTest.java | 0 .../server/util/TextTypeValidationTest.java | 0 .../server/util/TypeValidationModuleTest.java | 0 .../server/util/TypeValidationsTest.java | 0 .../server/util/TypeValidationsTesting.java | 0 .../server/util/WrapInSingleElementArray.java | 0 .../server/util/cache/DiskCacheTest.java | 0 .../server/util/cache/MemoryCacheTest.java | 0 .../view/index/ViewIndexDefinitionTest.java | 0 .../server/view/index/ViewIndexTest.java | 0 .../server/view/index/ViewIndexerTest.java | 0 .../ws/WebhookDeliveriesActionTest.java | 0 .../webhook/ws/WebhookDeliveryActionTest.java | 0 .../webhook/ws/WebhooksWsModuleTest.java | 0 .../server/webhook/ws/WebhooksWsTest.java | 0 .../ws/DeprecatedPropertiesWsFilterTest.java | 0 .../org/sonar/server/ws/DumbResponse.java | 0 .../ws/RemovedWebServiceHandlerTest.java | 0 .../sonar/server/ws/ServletRequestTest.java | 0 .../sonar/server/ws/ServletResponseTest.java | 0 .../java/org/sonar/server/ws/TestRequest.java | 0 .../org/sonar/server/ws/TestResponse.java | 0 .../sonar/server/ws/WebServiceEngineTest.java | 0 .../sonar/server/ws/WebServiceFilterTest.java | 0 .../ws/WebServiceReroutingFilterTest.java | 0 .../org/sonar/server/ws/WsActionTester.java | 0 .../java/org/sonar/server/ws/WsTester.java | 0 .../java/org/sonar/server/ws/WsUtilsTest.java | 0 .../server/ws/ws/WebServicesWsModuleTest.java | 0 .../sonar/server/ws/ws/WebServicesWsTest.java | 0 .../src/test/projects/.gitignore | 0 .../src/test/projects/README.txt | 0 .../test/projects/fake-report-plugin/pom.xml | 0 .../fake-report-plugin/src/BasePlugin.java | 0 .../sonar/plugins/testbase/api/BaseApi.java | 0 .../fake-report-plugin-0.1-SNAPSHOT.jar | Bin .../test/projects/fake-sqale-plugin/pom.xml | 0 .../fake-sqale-plugin/src/BasePlugin.java | 0 .../sonar/plugins/testbase/api/BaseApi.java | 0 .../target/fake-sqale-plugin-0.1-SNAPSHOT.jar | Bin .../test/projects/fake-views-plugin/pom.xml | 0 .../fake-views-plugin/src/BasePlugin.java | 0 .../sonar/plugins/testbase/api/BaseApi.java | 0 .../target/fake-views-plugin-0.1-SNAPSHOT.jar | Bin .../src/test/projects/pom.xml | 0 .../test/projects/test-base-plugin-v2/pom.xml | 0 .../test-base-plugin-v2/src/BasePlugin.java | 0 .../sonar/plugins/testbase/api/BaseApi.java | 0 .../target/test-base-plugin-0.2-SNAPSHOT.jar | Bin .../test/projects/test-base-plugin/pom.xml | 0 .../test-base-plugin/src/BasePlugin.java | 0 .../sonar/plugins/testbase/api/BaseApi.java | 0 .../target/test-base-plugin-0.1-SNAPSHOT.jar | Bin .../test/projects/test-core-plugin/pom.xml | 0 .../test-core-plugin/src/CorePlugin.java | 0 .../target/test-core-plugin-0.1-SNAPSHOT.jar | Bin .../test/projects/test-extend-plugin/pom.xml | 0 .../test-extend-plugin/src/ExtendPlugin.java | 0 .../test-extend-plugin-0.1-SNAPSHOT.jar | Bin .../test/projects/test-libs-plugin/pom.xml | 0 .../test-libs-plugin/src/LibsPlugin.java | 0 .../target/test-libs-plugin-0.1-SNAPSHOT.jar | Bin .../test/projects/test-require-plugin/pom.xml | 0 .../src/RequirePlugin.java | 0 .../test-require-plugin-0.1-SNAPSHOT.jar | Bin .../projects/test-requirenew-plugin/pom.xml | 0 .../src/RequirePlugin.java | 0 .../test-requirenew-plugin-0.1-SNAPSHOT.jar | Bin .../project_referentials.json | 0 .../component/ws/AppActionTest/app.json | 0 .../ws/AppActionTest/app_with_it_measure.json | 0 .../ws/AppActionTest/app_with_measures.json | 0 .../app_with_overall_measure.json | 0 .../ws/AppActionTest/app_with_ut_measure.json | 0 ...dd_component_uuid_to_duplications_index.rb | 0 ...te_component_uuid_of_duplications_index.rb | 0 ...ent_uuid_not_null_on_duplications_index.rb | 0 ...add_analysis_uuid_to_duplications_index.rb | 0 ...ate_analysis_uuid_of_duplications_index.rb | 0 ...sis_uuid_not_null_on_duplications_index.rb | 0 ...AnalysisUuidColumnToDuplicationsIndex.java | 0 ...omponentUuidColumnToDuplicationsIndex.java | 0 ...DuplicationsIndexRowsWithoutComponent.java | 0 ...mponentUuidNotNullOnDuplicationsIndex.java | 0 .../ScmAccountToUserLoaderTest/charlie.json | 0 .../charlie_conflict.json | 0 .../issue/SourceLinesCacheTest/load_data.xml | 0 .../MeasureRepositoryImplTest/shared.xml | 0 .../measure/MetricCacheTest/metrics.xml | 0 .../MetricRepositoryImplTest/shared.xml | 0 .../report-custom-measures.xml | 0 .../view-custom-measures.xml | 0 .../IndexSourceLinesStepTest/index_source.xml | 0 .../step/IndexTestsStepTest/index_source.xml | 0 .../step/LoadPeriodsStepTest/empty.xml | 0 .../no_previous_version.xml | 0 .../previous_version_deleted.xml | 0 .../previous_version_is_last_one.xml | 0 .../step/LoadPeriodsStepTest/shared.xml | 0 .../unprocessed_snapshots.xml | 0 ...ersist_duplication_on_same_file-result.xml | 0 .../persist_duplication_on_same_file.xml | 0 .../add_events-result.xml | 0 .../add_version_event-result.xml | 0 .../step/PersistEventsStepTest/empty.xml | 0 .../keep_one_event_by_version-result.xml | 0 .../keep_one_event_by_version.xml | 0 ...nothing_to_do_when_no_events_in_report.xml | 0 ..._events_with_component_children-result.xml | 0 .../add_change-result.xml | 0 .../add_comment-result.xml | 0 .../close_issue-result.xml | 0 .../insert_new_issue.xml | 0 .../step/PersistIssuesStepTest/shared.xml | 0 .../step/PersistMeasuresStepTest/shared.xml | 0 .../empty.xml | 0 .../insert-from-index-result.xml | 0 .../insert-from-report-result.xml | 0 ...add_links_on_project_and_module-result.xml | 0 .../delete_link.xml | 0 .../PersistProjectLinksStepTest/empty.xml | 0 .../not_delete_custom_link.xml | 0 ...nothing_to_do_when_link_already_exists.xml | 0 .../update_link-result.xml | 0 .../update_link.xml | 0 .../step/ReportExtractionStepTest/demozip.zip | Bin .../step/SwitchSnapshotStepTest/empty.xml | 0 .../snapshots-result.xml | 0 .../step/SwitchSnapshotStepTest/snapshots.xml | 0 .../webhook/WebhookPayloadTest/failed.json | 0 .../gate_condition_without_value.json | 0 .../webhook/WebhookPayloadTest/success.json | 0 .../with_analysis_properties.json | 0 .../convert_network_use_key.xml | 0 .../fail_on_bad_xml.xml | 0 .../import_badly_formatted_xml.xml | 0 .../import_characteristics.xml | 0 .../csharp-model.xml | 0 .../java-model.xml | 0 .../DebtModelXMLExporterTest/export_xml.xml | 0 ...ient_by_constant_per_issue_with_offset.xml | 0 ..._threshold_function_by_linear_function.xml | 0 .../convert_network_use_key.xml | 0 .../fail_on_bad_xml.xml | 0 ..._deprecated_constant_per_file_function.xml | 0 .../ignore_invalid_value.xml | 0 ...ore_remediation_cost_having_zero_value.xml | 0 .../ignore_rule_on_root_characteristics.xml | 0 .../import_badly_formatted_xml.xml | 0 .../import_constant_issue.xml | 0 .../import_linear.xml | 0 .../import_linear_having_offset_to_zero.xml | 0 .../import_linear_with_offset.xml | 0 .../DebtRulesXMLImporterTest/import_rules.xml | 0 ...s_with_deprecated_quality_model_format.xml | 0 .../DebtRulesXMLImporterTest/read_integer.xml | 0 .../replace_mn_by_min.xml | 0 .../use_default_unit_when_no_unit.xml | 0 .../complex_duplication.xml | 0 .../duplication_on_removed_file.xml | 0 .../duplication_on_same_file.xml | 0 .../duplication_on_same_project.xml | 0 .../duplications_on_different_project.xml | 0 .../duplications_on_many_blocks.xml | 0 .../should_insert_new_issues-result.xml | 0 ...ld_resolve_conflicts_on_updates-result.xml | 0 .../should_resolve_conflicts_on_updates.xml | 0 .../should_update_issues-result.xml | 0 .../IssueStorageTest/should_update_issues.xml | 0 .../issue/ServerIssueStorageTest/empty.xml | 0 .../load_component_id_from_db.xml | 0 .../load_project_id_from_db.xml | 0 .../should_insert_new_issues-result.xml | 0 .../should_insert_new_issues.xml | 0 .../should_update_issues-result.xml | 0 .../should_update_issues.xml | 0 .../issue/index/IssueIndexerTest/index.xml | 0 .../index/IssueIndexerTest/index_project.xml | 0 .../extract_directory_path.xml | 0 .../extract_file_path.xml | 0 .../many_projects.xml | 0 .../IssueIteratorFactoryTest/one_issue.xml | 0 .../index/IssueIteratorFactoryTest/shared.xml | 0 ...lay_component_key_if_no_component_name.txt | 0 ...email_should_display_resolution_change.txt | 0 .../email_with_action_plan_change.txt | 0 .../email_with_assignee_change.txt | 0 .../email_with_multiple_changes.txt | 0 .../email_with_all_details.txt | 0 ...email_with_no_assignee_tags_components.txt | 0 .../email_with_all_details.txt | 0 .../email_with_partial_details.txt | 0 .../component-tags.json | 0 .../display_directory_facet.json | 0 .../display_file_facet.json | 0 .../display_module_facet.json | 0 .../display_non_sticky_project_facet.json | 0 .../display_sticky_project_facet.json | 0 .../issues_on_different_projects.json | 0 .../no_issue.json | 0 .../search_by_authors.json | 0 .../search_by_developer.json | 0 .../search_by_directory_uuid.json | 0 .../search_by_file_key.json | 0 .../search_by_file_uuid.json | 0 .../search_by_project_uuid.json | 0 .../search_by_test_key.json | 0 .../search_by_view_uuid.json | 0 .../search_since_leak_period.json | 0 ...apply_paging_with_multiple_components.json | 0 .../apply_paging_with_one_component.json | 0 ...st_escape_login_of_authenticated_user.json | 0 .../assigned_to_me_facet_sticky.json | 0 .../components_contains_sub_projects.json | 0 .../default_page_size_is_100.json | 0 .../deprecated_paging.json | 0 .../display_deprecated_debt_fields.json | 0 .../display_facets.json | 0 .../display_facets_effort.json | 0 .../display_zero_facets.json | 0 .../SearchActionMediumTest/empty_result.json | 0 .../filter_by_assigned_to_me.json | 0 .../ws/SearchActionMediumTest/hide_rules.json | 0 .../ignore_paging_with_one_component.json | 0 .../issue_on_removed_file.json | 0 .../issue_with_comment_hidden.json | 0 .../issue_with_comments.json | 0 .../load_additional_fields.json | 0 ...al_fields_with_issue_admin_permission.json | 0 .../ws/SearchActionMediumTest/no_issue.json | 0 .../ws/SearchActionMediumTest/paging.json | 0 .../paging_with_page_size_to_minus_one.json | 0 ...s_all_fields_except_additional_fields.json | 0 .../sort_by_updated_at.json | 0 .../language/ws/LanguageWsTest/list.json | 0 .../ws/LanguageWsTest/list_filtered_key.json | 0 .../ws/LanguageWsTest/list_filtered_name.json | 0 .../ws/LanguageWsTest/list_limited.json | 0 .../ws/CreateActionTest/custom-measure.json | 0 .../custom/ws/MetricsActionTest/metrics.json | 0 .../ws/SearchActionTest/custom-measures.json | 0 .../custom/ws/SearchActionTest/empty.json | 0 .../ws/UpdateActionTest/custom-measure.json | 0 .../metric/DefaultMetricFinderTest/shared.xml | 0 .../metric/ws/CreateActionTest/metric.json | 0 .../ws/SearchActionTest/search_metrics.json | 0 .../metric/ws/UpdateActionTest/metric.json | 0 .../ws/GroupsActionTest/groups.json | 0 .../display_all_project_permissions.json | 0 .../empty.json | 0 .../search_for_users_is_paginated.json | 0 .../permission/ws/UsersActionTest/users.json | 0 .../display_all_project_permissions.json | 0 .../SearchTemplatesActionTest/empty.json | 0 .../platform/BackendCleanupTest/shared.xml | 0 .../ClassLoaderUtilsTest.jar | Bin .../platform/ServerImplTest/build.properties | 0 .../platform/ServerImplTest/empty-version.txt | 0 .../platform/ServerImplTest/version.txt | 0 .../web/WebPagesFilterTest/index.html | 0 .../properties_per_plugin.json | 0 .../plugins/ws/InstalledActionTest/some.jar | 0 .../project/ws/IndexActionTest/empty.json | 0 ...urn_only_projects_authorized_for_user.json | 0 .../IndexActionTest/search_project_by_id.json | 0 .../search_project_by_key.json | 0 .../ws/IndexActionTest/search_projects.json | 0 .../search_projects_by_name.json | 0 .../search_projects_with_modules.json | 0 .../search_projects_with_modules_by_name.json | 0 ...ser_has_not_project_browse_permission.json | 0 ...n_property_set_when_not_authenticated.json | 0 ...cense_settings_when_not_authenticated.json | 0 .../property/ws/IndexActionTest/empty.json | 0 ...ct_settings_when_component_and_no_key.json | 0 ...settings_when_no_component_and_no_key.json | 0 .../return_default_values.json | 0 .../IndexActionTest/return_global_values.json | 0 ...rn_inherited_values_on_global_setting.json | 0 .../return_inherited_values_on_module.json | 0 ...ings_when_authenticated_but_not_admin.json | 0 .../IndexActionTest/return_module_values.json | 0 .../return_multi_value_with_coma.json | 0 .../IndexActionTest/return_multi_values.json | 0 ...only_one_setting_when_key_is_provided.json | 0 .../return_project_values.json | 0 .../IndexActionTest/return_property_set.json | 0 ...ngs_in_property_set_when_system_admin.json | 0 ...d_license_settings_when_project_admin.json | 0 ...nd_license_settings_when_system_admin.json | 0 .../IndexActionTest/return_simple_value.json | 0 ...values_even_if_no_property_definition.json | 0 .../ProjectStatusActionTest/measure_data.json | 0 .../non_leak_period.json | 0 .../quality_gate_details.json | 0 .../duplicates-xml-backup.xml | 0 .../active_rule25.json | 0 .../active_rule391.json | 0 .../rule_A.json | 0 .../rule_C.json | 0 .../rule_b.json | 0 .../active_rule_ace.json | 0 .../active_rule_empty.json | 0 .../find_inactive_rules_with_tags/tags_a.json | 0 .../tags_ab.json | 0 .../tags_ace.json | 0 .../tags_bc.json | 0 .../tags_empty.json | 0 .../shared/active_rule25.json | 0 .../shared/active_rule2702.json | 0 .../shared/active_rule391.json | 0 .../shared/active_rule523.json | 0 .../shared/rule1482.json | 0 .../QProfileRuleLookupTest/shared/rule25.json | 0 .../shared/rule719.json | 0 .../shared/rule759.json | 0 .../shared/rule860.json | 0 .../shared/rule944.json | 0 .../changelog_empty.json | 0 .../changelog_full.json | 0 .../changelog_nominal.json | 0 .../compare_nominal.json | 0 .../compare_param_on_left.json | 0 .../compare_param_on_right.json | 0 .../create-with-messages.json | 0 .../ws/CreateActionTest/test_json.json | 0 .../inheritance-buWide.json | 0 .../inheritance-simple.json | 0 .../ws/ProjectsActionTest/all.json | 0 .../ws/ProjectsActionTest/all_filtered.json | 0 .../authorized_selected.json | 0 .../ws/ProjectsActionTest/deselected.json | 0 .../ws/ProjectsActionTest/empty.json | 0 .../return_deprecated_uuid_field.json | 0 .../ws/ProjectsActionTest/selected_page1.json | 0 .../ws/ProjectsActionTest/selected_page2.json | 0 .../selected_ps3_page1.json | 0 .../selected_ps3_page2.json | 0 .../bulk_activate_rule.json | 0 .../bulk_activate_rule_not_all.json | 0 .../ws/RestoreActionTest/restore_profile.json | 0 .../RuleRegistryTest/shared/removed_rule.json | 0 .../rule/RuleRegistryTest/shared/rule1.json | 0 .../rule/RuleRegistryTest/shared/rule2.json | 0 .../rule/RuleRegistryTest/shared/rule3.json | 0 .../RepositoriesActionTest/repositories.json | 0 .../repositories_common.json | 0 .../repositories_sonar.json | 0 .../repositories_squid.json | 0 .../repositories_ws.json | 0 .../repositories_xoo.json | 0 .../RuleSearchWsHandlerTest/search_rules.json | 0 .../show_manuel_rule.json | 0 .../ws/RuleShowWsHandlerTest/show_rule.json | 0 .../show_rule_with_dates.json | 0 .../show_rule_with_note.json | 0 .../show_rule_with_tags.json | 0 .../filter_by_tags.json | 0 .../get_note_as_markdown_and_html.json | 0 ...tory_fields_even_when_setting_f_param.json | 0 .../search_2_rules.json | 0 .../search_2_rules_fields.json | 0 .../search_active_rules.json | 0 .../search_active_rules_params.json | 0 ...th_default_and_overridden_debt_values.json | 0 ...r_offset_and_overridden_constant_debt.json | 0 ...ear_offset_and_overridden_linear_debt.json | 0 .../search_no_rules.json | 0 .../search_profile_active_rules.json | 0 ...arch_profile_active_rules_inheritance.json | 0 .../search_rules_from_template_key.json | 0 .../search_rules_with_deprecated_fields.json | 0 .../search_template_rules.json | 0 .../severities_facet.json | 0 .../statuses_facet.json | 0 .../statuses_facet_sticky.json | 0 ...ncode_html_description_of_custom_rule.json | 0 ...w_deprecated_rule_rem_function_fields.json | 0 .../ws/ShowActionMediumTest/show_rule.json | 0 .../show_rule_when_activated.json | 0 ...ith_default_and_overridden_debt_infos.json | 0 .../show_rule_with_default_debt_infos.json | 0 ...ith_no_default_and_no_overridden_debt.json | 0 .../show_rule_with_overridden_debt_infos.json | 0 .../deprecated_remediation_function.json | 0 .../update_custom_rule.json | 0 .../source/ws/HashActionTest/no_source.xml | 0 .../source/ws/HashActionTest/shared.xml | 0 .../show_hashes_on_test_file.xml | 0 .../convert_deprecated_data.json | 0 .../display_deprecated_fields.json | 0 .../LinesActionTest/show_paginated_lines.json | 0 .../ws/LinesActionTest/show_source.json | 0 .../show_source_by_file_key.json | 0 ...cept_negative_value_in_from_parameter.json | 0 .../ScmActionTest/group_lines_by_commit.json | 0 .../not_group_lines_by_commit.json | 0 .../return_empty_value_when_no_scm.json | 0 .../source/ws/ScmActionTest/show_scm.json | 0 .../show_scm_from_given_range_lines.json | 0 .../source/ws/ShowActionTest/show_source.json | 0 .../show_source_with_params_from_and_to.json | 0 .../disable_undefined_metrics-result.xml | 0 .../disable_undefined_metrics.xml | 0 .../enable_disabled_metric-result.xml | 0 .../enable_disabled_metric.xml | 0 .../insert_new_metrics-result.xml | 0 .../insert_new_metrics.xml | 0 .../update_non_custom_metrics-result.xml | 0 .../update_non_custom_metrics.xml | 0 .../test/index/TestIndexerTest/P1_F1_T1.json | 0 .../test/index/TestIndexerTest/P1_F1_T2.json | 0 .../test/index/TestIndexerTest/P1_F2_T1.json | 0 .../test/index/TestIndexerTest/P2_F3_T1.json | 0 .../server/test/index/TestIndexerTest/db.xml | 0 .../filter_by_project.xml | 0 .../filter_by_project_and_date.xml | 0 .../TestResultSetIteratorTest/schema.sql | 0 .../TestResultSetIteratorTest/shared.xml | 0 .../tests-covered-files.json | 0 .../ws/ListActionTest/list-main-file.json | 0 .../ws/ListActionTest/list-test-uuid.json | 0 ...return_bread_crumbs_on_several_levels.json | 0 .../return_breadcrumbs_on_module.json | 0 ...onent_info_when_anonymous_no_snapshot.json | 0 .../return_component_info_when_snapshot.json | 0 .../return_component_info_with_favourite.json | 0 .../return_configuration_for_admin.json | 0 ..._configuration_for_quality_gate_admin.json | 0 ...nfiguration_for_quality_profile_admin.json | 0 ...urn_configuration_with_all_properties.json | 0 .../return_default_quality_gate.json | 0 ...mpty_quality_profiles_when_no_measure.json | 0 .../return_extensions.json | 0 .../return_extensions_for_admin.json | 0 .../return_quality_gate.json | 0 .../return_quality_profiles.json | 0 .../deprecated_logo_settings.json | 0 .../server/ui/ws/GlobalActionTest/empty.json | 0 .../ui/ws/GlobalActionTest/global_pages.json | 0 .../organization_support.json | 0 .../GlobalActionTest/production_database.json | 0 .../ui/ws/GlobalActionTest/qualifiers.json | 0 .../ui/ws/GlobalActionTest/settings.json | 0 .../ui/ws/GlobalActionTest/version.json | 0 .../ui/ws/SettingsActionTest/empty.json | 0 .../ui/ws/SettingsActionTest/with_pages.json | 0 .../with_update_center.json | 0 .../ws/UploadActionTest/anotherPlugin.jar | Bin .../ws/UploadActionTest/plugin.jar | Bin .../user/DeprecatedUserFinderTest/fixture.xml | 0 .../user/ws/CreateActionTest/create_user.json | 0 .../ws/CreateActionTest/reactivate_user.json | 0 .../user/ws/SearchActionTest/five_users.json | 0 .../user/ws/SearchActionTest/page_one.json | 0 .../user/ws/SearchActionTest/page_two.json | 0 .../user/ws/SearchActionTest/user_one.json | 0 .../ws/SearchActionTest/user_with_groups.json | 0 .../blank_email_is_updated_to_null.json | 0 .../ws/UpdateActionTest/update_email.json | 0 .../user/ws/UpdateActionTest/update_name.json | 0 .../UpdateActionTest/update_scm_accounts.json | 0 .../user/ws/UpdateActionTest/update_user.json | 0 .../view/index/ViewIndexerTest/index.xml | 0 .../list_including_internals.json | 0 .../ws/WebServicesWsTest/metrics_example.json | 0 .../WebServicesWsTest/response_example.json | 0 .../server/ws/ws/web-service-engine-test.txt | 0 .../server/ws/ws/web-services-ws-test.txt | 0 .../src/test/resources/static/foo.txt | 0 sonarqube-6.5/.gitignore | 43 - sonarqube-6.5/README.md | 17 - sonarqube-6.5/pom.xml | 1402 ----------------- sonarqube-6.5/server/pom.xml | 60 - 2964 files changed, 1 insertion(+), 1523 deletions(-) rename {sonarqube-6.5/server/sonar-server => sonar-server}/COPYING (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/pom.xml (99%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/ce/CeModule.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/ce/http/CeHttpClient.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/ce/http/package-info.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/ce/log/CeLogging.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/ce/log/CeProcessLogging.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/ce/log/package-info.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/ce/organization/DefaultOrganizationLoader.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/ce/organization/package-info.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/ce/queue/CeQueue.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/ce/queue/CeQueueImpl.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/ce/queue/CeTask.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/ce/queue/CeTaskResult.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/ce/queue/CeTaskSubmit.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/ce/queue/package-info.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/ce/settings/ProjectConfigurationFactory.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/ce/settings/ProjectSettings.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/ce/settings/SettingsLoader.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/ce/settings/package-info.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/ce/taskprocessor/CeTaskProcessor.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/ce/taskprocessor/ReportTaskProcessorDeclaration.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/ce/taskprocessor/package-info.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/app/EmbeddedTomcat.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/app/NullJarScanner.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/app/ProcessCommandWrapper.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/app/ProcessCommandWrapperImpl.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/app/ProgrammaticLogbackValve.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/app/RestartFlagHolder.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/app/RestartFlagHolderImpl.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/app/ServerProcessLogging.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/app/TomcatAccessLog.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/app/TomcatConnectors.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/app/TomcatContexts.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/app/TomcatStartupLogs.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/app/WebServer.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/app/WebServerProcessLogging.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/app/package-info.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/authentication/AuthenticationError.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/authentication/AuthenticationFilter.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/authentication/AuthenticationModule.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/authentication/BaseContextFactory.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/authentication/BasicAuthenticator.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/authentication/Cookies.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/authentication/CredentialsAuthenticator.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/authentication/IdentityProviderRepository.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/authentication/InitFilter.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/authentication/JwtCsrfVerifier.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/authentication/JwtHttpHandler.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/authentication/JwtSerializer.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/authentication/OAuth2CallbackFilter.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/authentication/OAuth2ContextFactory.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/authentication/OAuthCsrfVerifier.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/authentication/RealmAuthenticator.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/authentication/SsoAuthenticator.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/authentication/UserIdentityAuthenticator.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/authentication/UserSessionInitializer.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/authentication/event/AuthenticationEvent.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/authentication/event/AuthenticationEventImpl.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/authentication/event/AuthenticationException.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/authentication/event/package-info.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/authentication/package-info.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/authentication/ws/AuthenticationWs.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/authentication/ws/AuthenticationWsAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/authentication/ws/LoginAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/authentication/ws/LogoutAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/authentication/ws/ValidateAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/authentication/ws/package-info.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/batch/BatchIndex.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/batch/BatchWs.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/batch/BatchWsAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/batch/BatchWsModule.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/batch/FileAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/batch/IndexAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/batch/IssuesAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/batch/Messages.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/batch/ProjectAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/batch/ProjectDataLoader.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/batch/ProjectDataQuery.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/batch/package-info.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/ce/ws/ActivityAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/ce/ws/ActivityStatusAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/ce/ws/CancelAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/ce/ws/CancelAllAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/ce/ws/CeWs.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/ce/ws/CeWsAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/ce/ws/CeWsModule.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/ce/ws/ComponentAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/ce/ws/IsQueueEmptyWs.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/ce/ws/SubmitAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/ce/ws/TaskAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/ce/ws/TaskFormatter.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/ce/ws/TaskTypesAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/ce/ws/package-info.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/component/ComponentCleanerService.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/component/ComponentFinder.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/component/ComponentService.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/component/ComponentUpdater.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/component/DefaultRubyComponentService.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/component/NewComponent.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/component/index/ComponentDoc.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/component/index/ComponentHit.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/component/index/ComponentHitsPerQualifier.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/component/index/ComponentIndex.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/component/index/ComponentIndexDefinition.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/component/index/ComponentIndexQuery.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/component/index/ComponentIndexResults.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/component/index/ComponentIndexer.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/component/index/package-info.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/component/package-info.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/component/ws/AppAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/component/ws/ComponentDtoToWsComponent.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/component/ws/ComponentsWs.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/component/ws/ComponentsWsAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/component/ws/ComponentsWsModule.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/component/ws/FilterParser.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/component/ws/ProjectMeasuresQueryFactory.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/component/ws/ProjectMeasuresQueryValidator.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/component/ws/ResourcesWs.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/component/ws/SearchAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/component/ws/SearchProjectsAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/component/ws/ShowAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/component/ws/SuggestionCategory.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/component/ws/SuggestionsAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/component/ws/TreeAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/component/ws/package-info.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/dbcleaner/IndexPurgeListener.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/dbcleaner/ProjectCleaner.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/dbcleaner/package-info.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/package-info.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/queue/ReportSubmitter.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/queue/package-info.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/container/EagerStart.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/container/TaskContainer.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/container/TaskContainerImpl.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/container/package-info.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/ProjectAnalysisTaskModule.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/analysis/Analysis.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/analysis/AnalysisMetadataHolder.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/analysis/AnalysisMetadataHolderImpl.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/analysis/MutableAnalysisMetadataHolder.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/analysis/Organization.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/analysis/package-info.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/api/developer/PersistDevelopersDelegate.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/api/developer/package-info.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/api/measurecomputer/ComponentImpl.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/api/measurecomputer/MeasureComputerContextImpl.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/api/measurecomputer/MeasureComputerDefinitionImpl.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/api/measurecomputer/MeasureComputerWrapper.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/api/measurecomputer/MeasureImpl.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/api/measurecomputer/package-info.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/api/posttask/CeTaskImpl.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/api/posttask/ConditionImpl.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/api/posttask/ConditionToCondition.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/api/posttask/PostProjectAnalysisTasksExecutor.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/api/posttask/ProjectImpl.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/api/posttask/QualityGateImpl.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/api/posttask/ScannerContextImpl.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/api/posttask/package-info.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/batch/BatchReportDirectoryHolder.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/batch/BatchReportDirectoryHolderImpl.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/batch/BatchReportReader.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/batch/BatchReportReaderImpl.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/batch/MutableBatchReportDirectoryHolder.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/batch/package-info.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/component/Component.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/component/ComponentCrawler.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/component/ComponentFunctions.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/component/ComponentImpl.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/component/ComponentRootBuilder.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/component/ComponentVisitor.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/component/ConfigurationRepository.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/component/ConfigurationRepositoryImpl.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/component/CrawlerDepthLimit.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/component/DbIdsRepository.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/component/DbIdsRepositoryImpl.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/component/DepthTraversalTypeAwareCrawler.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/component/DequeBasedPath.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/component/Developer.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/component/DisabledComponentsHolder.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/component/DisabledComponentsHolderImpl.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/component/FileAttributes.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/component/MapBasedDbIdsRepository.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/component/MutableDbIdsRepository.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/component/MutableDisabledComponentsHolder.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/component/MutableTreeRootHolder.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/component/PathAwareCrawler.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/component/PathAwareVisitor.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/component/PathAwareVisitorAdapter.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/component/PathAwareVisitorWrapper.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/component/PathElementImpl.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/component/ProjectViewAttributes.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/component/ReportAttributes.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/component/SubViewAttributes.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/component/TreeRootHolder.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/component/TreeRootHolderImpl.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/component/TypeAwareVisitor.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/component/TypeAwareVisitorAdapter.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/component/TypeAwareVisitorWrapper.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/component/UuidFactory.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/component/VisitException.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/component/VisitorWrapper.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/component/VisitorsCrawler.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/component/package-info.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/container/ContainerFactory.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/container/ContainerFactoryImpl.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/container/ProjectAnalysisTaskContainerPopulator.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/container/package-info.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/AbstractDuplicate.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/CrossProjectDuplicate.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/CrossProjectDuplicationStatusHolder.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/CrossProjectDuplicationStatusHolderImpl.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/DetailedTextBlock.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/Duplicate.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/Duplication.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/DuplicationRepository.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/DuplicationRepositoryImpl.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/InProjectDuplicate.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/InnerDuplicate.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/IntegrateCrossProjectDuplications.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/TextBlock.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/package-info.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/event/Event.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/event/EventRepository.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/event/EventRepositoryImpl.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/event/package-info.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStep.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/filemove/FileSimilarity.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/filemove/FileSimilarityImpl.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/filemove/Match.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/filemove/MatchesByScore.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/filemove/MovedFilesRepository.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/filemove/MutableMovedFilesRepository.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/filemove/MutableMovedFilesRepositoryImpl.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/filemove/ScoreMatrix.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/filemove/SourceSimilarity.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/filemove/SourceSimilarityImpl.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/filemove/package-info.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/filesystem/ComputationTempFolderProvider.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/filesystem/package-info.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/AverageFormula.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/Counter.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/CounterInitializationContext.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/CreateMeasureContext.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/DistributionFormula.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/Formula.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/FormulaExecutorComponentVisitor.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/SumFormula.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/VariationSumFormula.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/counter/DoubleValue.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/counter/IntSumCounter.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/counter/IntValue.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/counter/LongSumCounter.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/counter/LongValue.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/counter/RatingValue.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/counter/SumCounter.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/counter/package-info.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/CoverageFormula.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/CoverageUtils.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/CoverageVariationFormula.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/ElementsAndCoveredElementsCounter.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/ElementsAndCoveredElementsVariationCounter.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/LinesAndConditionsWithUncoveredCounter.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/LinesAndConditionsWithUncoveredFormula.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/LinesAndConditionsWithUncoveredMetricKeys.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/LinesAndConditionsWithUncoveredVariationCounter.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/LinesAndConditionsWithUncoveredVariationFormula.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/SingleWithUncoveredCounter.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/SingleWithUncoveredFormula.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/SingleWithUncoveredMetricKeys.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/SingleWithUncoveredVariationCounter.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/SingleWithUncoveredVariationFormula.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/package-info.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/package-info.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/BaseIssuesLoader.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/CloseIssuesOnRemovedComponentsVisitor.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/ComponentIssuesRepository.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/ComponentIssuesRepositoryImpl.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/ComponentsWithUnprocessedIssues.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/DebtCalculator.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/DefaultAssignee.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/EffortAggregator.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/IntegrateIssuesVisitor.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/IssueAssigner.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/IssueCache.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/IssueCounter.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/IssueCreationDateCalculator.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/IssueLifecycle.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/IssueVisitor.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/IssueVisitors.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/LoadComponentUuidsHavingOpenIssuesVisitor.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/MovedIssueVisitor.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/MutableComponentIssuesRepository.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/NewEffortAggregator.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/NewEffortCalculator.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/Rule.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/RuleImpl.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/RuleRepository.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/RuleRepositoryImpl.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/RuleTagsCopier.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/RuleTypeCopier.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/ScmAccountToUser.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/ScmAccountToUserLoader.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/TrackerBaseInputFactory.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/TrackerExecution.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/TrackerRawInputFactory.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/UpdateConflictResolver.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/AbstractCoverageRule.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/BranchCoverageRule.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/CommentDensityRule.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/CommonRule.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/CommonRuleEngine.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/CommonRuleEngineImpl.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/DuplicatedBlockRule.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/LineCoverageRule.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/SkippedTestRule.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/TestErrorRule.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/package-info.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/filter/IssueFilter.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/filter/IssuePattern.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/filter/package-info.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/package-info.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/language/LanguageRepository.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/language/LanguageRepositoryImpl.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/language/package-info.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/BatchMeasureToMeasure.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/BestValueOptimization.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/MapBasedRawMeasureRepository.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/Measure.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureComputersHolder.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureComputersHolderImpl.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureComputersVisitor.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureDtoToMeasure.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureKey.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureRepository.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureRepositoryImpl.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureToMeasureDto.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/MutableMeasureComputersHolder.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/QualityGateStatus.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/package-info.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/qualitygatedetails/EvaluatedCondition.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/qualitygatedetails/QualityGateDetailsData.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/qualitygatedetails/package-info.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/metric/Metric.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/metric/MetricDtoToMetric.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/metric/MetricImpl.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/metric/MetricModule.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/metric/MetricRepository.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/metric/MetricRepositoryImpl.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/metric/ReportMetricValidator.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/metric/ReportMetricValidatorImpl.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/metric/package-info.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/package-info.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/period/Period.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/period/PeriodHolder.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/period/PeriodHolderImpl.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/period/package-info.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/Condition.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/ConditionEvaluator.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/ConditionStatus.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/EvaluationResult.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/EvaluationResultTextConverter.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/EvaluationResultTextConverterImpl.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/MutableQualityGateHolder.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/MutableQualityGateStatusHolder.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/QualityGate.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/QualityGateHolder.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/QualityGateHolderImpl.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/QualityGateService.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/QualityGateServiceImpl.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/QualityGateStatus.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/QualityGateStatusHolder.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/QualityGateStatusHolderImpl.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/package-info.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitymodel/MaintainabilityMeasuresVisitor.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitymodel/NewMaintainabilityMeasuresVisitor.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitymodel/NewReliabilityAndSecurityRatingMeasuresVisitor.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitymodel/RatingGrid.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitymodel/RatingSettings.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitymodel/ReliabilityAndSecurityRatingMeasuresVisitor.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitymodel/package-info.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/qualityprofile/ActiveRule.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/qualityprofile/ActiveRulesHolder.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/qualityprofile/ActiveRulesHolderImpl.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/qualityprofile/package-info.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/scm/Changeset.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/scm/DbScmInfo.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/scm/ReportScmInfo.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/scm/ScmInfo.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/scm/ScmInfoImpl.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/scm/ScmInfoRepository.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/scm/ScmInfoRepositoryImpl.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/scm/package-info.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/source/ComputeFileSourceData.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/source/CoverageLineReader.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/source/DuplicationLineReader.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/source/HighlightingLineReader.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/source/LastCommitVisitor.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/source/LineReader.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/source/RangeOffsetConverter.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/source/ReportIterator.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/source/ScmLineReader.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/source/SourceHashRepository.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/source/SourceHashRepositoryImpl.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/source/SourceLinesRepository.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/source/SourceLinesRepositoryImpl.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/source/SymbolsLineReader.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/source/package-info.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/step/AbstractComputationSteps.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/step/BuildComponentTreeStep.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/step/CommentMeasuresStep.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/step/ComplexityMeasuresStep.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/step/ComputeMeasureVariationsStep.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/step/ComputeQProfileMeasureStep.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/step/CoverageMeasuresStep.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/step/CustomMeasuresCopyStep.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/step/DuplicationDataMeasuresStep.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/step/DuplicationMeasuresStep.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/step/EnableAnalysisStep.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/step/ExecuteVisitorsStep.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/step/ExtractReportStep.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/step/GenerateAnalysisUuid.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/step/IndexAnalysisStep.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/step/LanguageDistributionMeasuresStep.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/step/LoadCrossProjectDuplicationsRepositoryStep.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/step/LoadDuplicationsFromReportStep.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/step/LoadMeasureComputersStep.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/step/LoadPeriodsStep.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/step/LoadQualityGateStep.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/step/LoadQualityProfilesStep.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/step/LoadReportAnalysisMetadataHolderStep.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/step/NewCoverageMeasuresStep.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/step/NewSizeMeasuresStep.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PeriodResolver.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PersistAnalysisStep.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PersistComponentsStep.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PersistCrossProjectDuplicationIndexStep.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PersistDevelopersStep.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PersistEventsStep.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PersistFileSourcesStep.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PersistIssuesStep.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PersistMeasuresStep.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PersistProjectLinksStep.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PersistScannerContextStep.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PersistTestsStep.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PublishTaskResultStep.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PurgeDatastoresStep.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/step/QualityGateEventsStep.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/step/QualityGateMeasuresStep.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/step/QualityProfileEventsStep.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/step/ReportComputationSteps.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/step/SendIssueNotificationsStep.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/step/SizeMeasuresStep.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/step/UnitTestMeasuresStep.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/step/UpdateQualityProfilesLastUsedDateStep.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/step/ValidateProjectStep.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/step/package-info.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/taskprocessor/ReportTaskProcessor.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/taskprocessor/package-info.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/webhook/TestWebhookPayloadFactory.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/webhook/Webhook.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/webhook/WebhookCaller.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/webhook/WebhookCallerImpl.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/webhook/WebhookDelivery.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/webhook/WebhookDeliveryStorage.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/webhook/WebhookModule.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/webhook/WebhookPayload.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/webhook/WebhookPayloadFactory.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/webhook/WebhookPayloadFactoryImpl.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/webhook/WebhookPostTask.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/projectanalysis/webhook/package-info.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/step/ComputationStep.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/step/ComputationStepExecutor.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/step/ComputationSteps.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/task/step/package-info.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/taskprocessor/MutableTaskResultHolder.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/taskprocessor/MutableTaskResultHolderImpl.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/taskprocessor/TaskResultHolder.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/util/InitializedProperty.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/computation/util/package-info.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/debt/DebtModelPluginRepository.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/debt/DebtModelXMLExporter.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/debt/DebtRulesXMLImporter.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/debt/package-info.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/duplication/ws/DuplicationsParser.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/duplication/ws/DuplicationsWs.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/duplication/ws/DuplicationsWsAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/duplication/ws/ShowAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/duplication/ws/ShowResponseBuilder.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/duplication/ws/package-info.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/email/ws/EmailsWs.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/email/ws/EmailsWsAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/email/ws/EmailsWsModule.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/email/ws/SendAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/email/ws/package-info.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/es/BaseDoc.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/es/BulkIndexer.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/es/DefaultIndexSettings.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/es/DefaultIndexSettingsElement.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/es/EsClient.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/es/EsClientProvider.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/es/EsClientStopper.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/es/EsUtils.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/es/Facets.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/es/IndexCreator.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/es/IndexDefinition.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/es/IndexDefinitionHash.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/es/IndexDefinitions.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/es/IndexType.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/es/IndexerStartupTask.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/es/IndexingListener.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/es/IndexingResult.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/es/NewIndex.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/es/ProjectIndexer.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/es/RecoveryIndexer.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/es/ResiliencyIndexingListener.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/es/ResilientIndexer.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/es/SearchIdResult.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/es/SearchOptions.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/es/SearchResult.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/es/Sorting.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/es/StartupIndexer.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/es/StickyFacetBuilder.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/es/package-info.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/es/request/ProxyBulkRequestBuilder.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/es/request/ProxyClearCacheRequestBuilder.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/es/request/ProxyClusterHealthRequestBuilder.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/es/request/ProxyClusterStateRequestBuilder.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/es/request/ProxyClusterStatsRequestBuilder.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/es/request/ProxyCreateIndexRequestBuilder.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/es/request/ProxyDeleteRequestBuilder.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/es/request/ProxyFlushRequestBuilder.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/es/request/ProxyGetRequestBuilder.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/es/request/ProxyIndexRequestBuilder.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/es/request/ProxyIndicesExistsRequestBuilder.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/es/request/ProxyIndicesStatsRequestBuilder.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/es/request/ProxyMultiGetRequestBuilder.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/es/request/ProxyNodesStatsRequestBuilder.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/es/request/ProxyPutMappingRequestBuilder.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/es/request/ProxyRefreshRequestBuilder.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/es/request/ProxySearchRequestBuilder.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/es/request/ProxySearchScrollRequestBuilder.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/es/request/package-info.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/es/textsearch/ComponentTextSearchFeature.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/es/textsearch/ComponentTextSearchFeatureRepertoire.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/es/textsearch/ComponentTextSearchQueryFactory.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/es/textsearch/package-info.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/event/NewAlerts.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/event/package-info.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/exceptions/BadRequestException.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/exceptions/ForbiddenException.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/exceptions/Message.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/exceptions/NotFoundException.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/exceptions/ServerException.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/exceptions/UnauthorizedException.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/exceptions/package-info.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/favorite/FavoriteFinder.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/favorite/FavoriteModule.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/favorite/FavoriteUpdater.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/favorite/package-info.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/favorite/ws/AddAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/favorite/ws/FavoritesWs.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/favorite/ws/FavoritesWsAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/favorite/ws/FavouritesWs.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/favorite/ws/RemoveAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/favorite/ws/SearchAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/favorite/ws/package-info.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/issue/AbstractChangeTagsAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/issue/Action.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/issue/ActionFinder.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/issue/AddTagsAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/issue/AssignAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/issue/CommentAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/issue/IssueFieldsSetter.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/issue/IssueFinder.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/issue/IssueQuery.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/issue/IssueQueryFactory.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/issue/IssueService.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/issue/IssueStorage.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/issue/IssueUpdater.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/issue/IssuesFinderSort.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/issue/RemoveTagsAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/issue/Result.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/issue/ServerIssueStorage.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/issue/SetSeverityAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/issue/SetTypeAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/issue/TransitionAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/issue/TransitionService.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/issue/index/IssueDoc.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/issue/index/IssueIndex.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/issue/index/IssueIndexDefinition.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/issue/index/IssueIndexer.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/issue/index/IssueIterator.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/issue/index/IssueIteratorFactory.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/issue/index/IssueIteratorForMultipleChunks.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/issue/index/IssueIteratorForSingleChunk.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/issue/index/package-info.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/issue/notification/AbstractNewIssuesEmailTemplate.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/issue/notification/ChangesOnMyIssueNotificationDispatcher.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/issue/notification/DoNotFixNotificationDispatcher.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/issue/notification/IssueChangeNotification.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/issue/notification/IssueChangesEmailTemplate.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/issue/notification/MyNewIssuesEmailTemplate.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/issue/notification/MyNewIssuesNotification.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/issue/notification/MyNewIssuesNotificationDispatcher.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/issue/notification/NewIssuesEmailTemplate.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/issue/notification/NewIssuesNotification.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/issue/notification/NewIssuesNotificationDispatcher.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/issue/notification/NewIssuesNotificationFactory.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/issue/notification/NewIssuesStatistics.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/issue/notification/package-info.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/issue/package-info.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/issue/workflow/Function.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/issue/workflow/FunctionExecutor.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/issue/workflow/IsBeingClosed.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/issue/workflow/IssueWorkflow.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/issue/workflow/SetCloseDate.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/issue/workflow/SetClosed.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/issue/workflow/SetResolution.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/issue/workflow/State.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/issue/workflow/StateMachine.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/issue/workflow/Transition.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/issue/workflow/UnsetAssignee.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/issue/workflow/package-info.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/issue/ws/AddCommentAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/issue/ws/AssignAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/issue/ws/AuthorsAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/issue/ws/AvatarResolver.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/issue/ws/AvatarResolverImpl.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/issue/ws/BulkChangeAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/issue/ws/ChangelogAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/issue/ws/ComponentTagsAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/issue/ws/DeleteCommentAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/issue/ws/DoTransitionAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/issue/ws/EditCommentAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/issue/ws/IssueWsModule.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/issue/ws/IssuesWs.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/issue/ws/IssuesWsAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/issue/ws/OperationResponseWriter.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/issue/ws/SearchAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/issue/ws/SearchAdditionalField.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/issue/ws/SearchResponseData.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/issue/ws/SearchResponseFormat.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/issue/ws/SearchResponseLoader.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/issue/ws/SetSeverityAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/issue/ws/SetTagsAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/issue/ws/SetTypeAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/issue/ws/TagsAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/issue/ws/package-info.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/language/ws/LanguageWs.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/language/ws/ListAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/language/ws/package-info.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/license/ws/LicensesWs.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/license/ws/LicensesWsModule.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/license/ws/ListAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/license/ws/package-info.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/measure/custom/ws/CreateAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/measure/custom/ws/CustomMeasureJsonWriter.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/measure/custom/ws/CustomMeasureValidator.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/measure/custom/ws/CustomMeasureValueDescription.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/measure/custom/ws/CustomMeasuresWs.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/measure/custom/ws/CustomMeasuresWsAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/measure/custom/ws/CustomMeasuresWsModule.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/measure/custom/ws/DeleteAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/measure/custom/ws/MetricsAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/measure/custom/ws/SearchAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/measure/custom/ws/UpdateAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/measure/custom/ws/package-info.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/measure/index/ProjectMeasuresDoc.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/measure/index/ProjectMeasuresIndex.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/measure/index/ProjectMeasuresIndexDefinition.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/measure/index/ProjectMeasuresIndexer.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/measure/index/ProjectMeasuresQuery.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/measure/index/ProjectsEsModule.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/measure/index/ProjectsTextSearchQueryFactory.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/measure/index/package-info.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/measure/ws/ComponentAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/measure/ws/ComponentDtoToWsComponent.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/measure/ws/ComponentTreeAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/measure/ws/ComponentTreeData.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/measure/ws/ComponentTreeDataLoader.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/measure/ws/ComponentTreeSort.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/measure/ws/HasMeasure.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/measure/ws/MeasureDtoToWsMeasure.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/measure/ws/MeasureValueFormatter.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/measure/ws/MeasuresWs.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/measure/ws/MeasuresWsAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/measure/ws/MeasuresWsModule.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/measure/ws/MeasuresWsParametersBuilder.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/measure/ws/MetricDtoToWsMetric.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/measure/ws/MetricDtoWithBestValue.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/measure/ws/SearchAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/measure/ws/SearchHistoryAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/measure/ws/SearchHistoryResponseFactory.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/measure/ws/SearchHistoryResult.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/measure/ws/SnapshotDtoToWsPeriods.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/measure/ws/TimeMachineWs.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/measure/ws/package-info.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/metric/CoreCustomMetrics.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/metric/DefaultMetricFinder.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/metric/package-info.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/metric/ws/CreateAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/metric/ws/DeleteAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/metric/ws/DomainsAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/metric/ws/MetricJsonWriter.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/metric/ws/MetricsWs.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/metric/ws/MetricsWsAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/metric/ws/MetricsWsModule.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/metric/ws/SearchAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/metric/ws/TypesAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/metric/ws/UpdateAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/metric/ws/package-info.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/notification/DefaultNotificationManager.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/notification/NotificationCenter.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/notification/NotificationDaemon.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/notification/NotificationDispatcher.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/notification/NotificationDispatcherMetadata.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/notification/NotificationManager.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/notification/NotificationModule.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/notification/NotificationService.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/notification/NotificationUpdater.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/notification/email/AlertsEmailTemplate.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/notification/email/EmailNotificationChannel.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/notification/email/package-info.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/notification/package-info.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/notification/ws/AddAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/notification/ws/ListAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/notification/ws/NotificationWsModule.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/notification/ws/NotificationsWs.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/notification/ws/NotificationsWsAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/notification/ws/RemoveAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/notification/ws/package-info.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/organization/BillingValidations.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/organization/BillingValidationsExtension.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/organization/BillingValidationsProxy.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/organization/BillingValidationsProxyImpl.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/organization/DefaultOrganization.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/organization/DefaultOrganizationCache.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/organization/DefaultOrganizationEnforcer.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/organization/DefaultOrganizationProvider.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/organization/DefaultOrganizationProviderImpl.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/organization/NoopDefaultOrganizationCache.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/organization/OrganizationCreation.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/organization/OrganizationCreationImpl.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/organization/OrganizationFlags.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/organization/OrganizationFlagsImpl.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/organization/OrganizationValidation.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/organization/OrganizationValidationImpl.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/organization/package-info.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/organization/ws/AddMemberAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/organization/ws/CreateAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/organization/ws/DeleteAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/organization/ws/EnableSupportAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/organization/ws/OrganizationsWs.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/organization/ws/OrganizationsWsAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/organization/ws/OrganizationsWsModule.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/organization/ws/OrganizationsWsSupport.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/organization/ws/RemoveMemberAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/organization/ws/SearchAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/organization/ws/SearchMembersAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/organization/ws/SearchMyOrganizationsAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/organization/ws/UpdateAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/organization/ws/UpdateProjectVisibilityAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/organization/ws/package-info.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/permission/ApplyPermissionTemplateQuery.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/permission/GroupPermissionChange.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/permission/GroupPermissionChanger.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/permission/PermissionChange.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/permission/PermissionPrivilegeChecker.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/permission/PermissionTemplateService.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/permission/PermissionUpdater.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/permission/ProjectId.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/permission/UserId.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/permission/UserPermissionChange.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/permission/UserPermissionChanger.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/permission/index/AuthorizationScope.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/permission/index/AuthorizationTypeSupport.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/permission/index/NeedAuthorizationIndexer.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/permission/index/PermissionIndexer.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/permission/index/PermissionIndexerDao.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/permission/index/package-info.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/permission/package-info.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/permission/ws/AddGroupAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/permission/ws/AddUserAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/permission/ws/GroupsAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/permission/ws/PermissionRequestValidator.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/permission/ws/PermissionWsSupport.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/permission/ws/PermissionsWs.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/permission/ws/PermissionsWsAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/permission/ws/PermissionsWsModule.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/permission/ws/PermissionsWsParametersBuilder.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/permission/ws/ProjectWsRef.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/permission/ws/RemoveGroupAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/permission/ws/RemoveUserAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/permission/ws/SearchGlobalPermissionsAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/permission/ws/SearchProjectPermissionsAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/permission/ws/SearchProjectPermissionsData.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/permission/ws/SearchProjectPermissionsDataLoader.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/permission/ws/UsersAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/permission/ws/package-info.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/permission/ws/template/AddGroupToTemplateAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/permission/ws/template/AddProjectCreatorToTemplateAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/permission/ws/template/AddUserToTemplateAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/permission/ws/template/ApplyTemplateAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/permission/ws/template/BulkApplyTemplateAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/permission/ws/template/CreateTemplateAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/permission/ws/template/DefaultTemplatesResolver.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/permission/ws/template/DefaultTemplatesResolverImpl.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/permission/ws/template/DeleteTemplateAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/permission/ws/template/PermissionTemplateDtoToPermissionTemplateResponse.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/permission/ws/template/RemoveGroupFromTemplateAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/permission/ws/template/RemoveProjectCreatorFromTemplateAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/permission/ws/template/RemoveUserFromTemplateAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/permission/ws/template/SearchTemplatesAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/permission/ws/template/SearchTemplatesData.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/permission/ws/template/SearchTemplatesDataLoader.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/permission/ws/template/SetDefaultTemplateAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/permission/ws/template/TemplateGroupsAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/permission/ws/template/TemplateUsersAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/permission/ws/template/UpdateTemplateAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/permission/ws/template/WsTemplateRef.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/permission/ws/template/package-info.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/platform/BackendCleanup.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/platform/DatabaseServerCompatibility.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/platform/DefaultServerUpgradeStatus.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/platform/LogServerVersion.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/platform/PersistentSettings.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/platform/Platform.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/platform/ServerFileSystem.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/platform/ServerFileSystemImpl.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/platform/ServerId.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/platform/ServerIdGenerator.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/platform/ServerIdLoader.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/platform/ServerIdManager.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/platform/ServerImpl.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/platform/ServerLifecycleNotifier.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/platform/ServerLogging.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/platform/SettingsChangeNotifier.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/platform/StartupMetadata.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/platform/StartupMetadataPersister.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/platform/StartupMetadataProvider.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/platform/TempFolderProvider.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/platform/UrlSettings.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/platform/cluster/Cluster.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/platform/cluster/ClusterImpl.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/platform/cluster/package-info.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/platform/db/CheckDatabaseCharsetAtStartup.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/platform/db/EmbeddedDatabase.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/platform/db/EmbeddedDatabaseFactory.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/platform/db/migration/AutoDbMigration.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/platform/db/migration/DatabaseMigrationExecutorService.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/platform/db/migration/DatabaseMigrationExecutorServiceImpl.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/platform/db/migration/DatabaseMigrationImpl.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/platform/db/migration/package-info.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/platform/db/package-info.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/platform/monitoring/BaseMonitorMBean.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/platform/monitoring/DatabaseMonitor.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/platform/monitoring/DatabaseMonitorMBean.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/platform/monitoring/EsMonitor.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/platform/monitoring/EsMonitorMBean.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/platform/monitoring/JvmPropsMonitor.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/platform/monitoring/Monitor.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/platform/monitoring/PluginsMonitor.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/platform/monitoring/SettingsMonitor.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/platform/monitoring/SonarQubeMonitor.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/platform/monitoring/SonarQubeMonitorMBean.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/platform/monitoring/SystemMonitor.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/platform/monitoring/package-info.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/platform/package-info.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel1.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel2.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel3.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel4.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevelSafeMode.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevelStartup.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/platform/platformlevel/package-info.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/platform/web/AbortTomcatStartException.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/platform/web/MasterServletFilter.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/platform/web/PlatformServletContextListener.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/platform/web/RedirectFilter.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/platform/web/RegisterServletFilters.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/platform/web/RootFilter.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/platform/web/SecurityServletFilter.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/platform/web/WebPagesFilter.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/platform/web/package-info.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/platform/web/requestid/HttpRequestIdModule.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/platform/web/requestid/RequestIdConfiguration.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/platform/web/requestid/RequestIdFilter.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/platform/web/requestid/RequestIdGenerator.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/platform/web/requestid/RequestIdGeneratorBase.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/platform/web/requestid/RequestIdGeneratorBaseImpl.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/platform/web/requestid/RequestIdGeneratorImpl.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/platform/web/requestid/RequestIdMDCStorage.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/platform/web/requestid/package-info.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/platform/ws/ChangeLogLevelAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/platform/ws/DbMigrationJsonWriter.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/platform/ws/DbMigrationStatusAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/platform/ws/IndexAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/platform/ws/InfoAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/platform/ws/L10nWs.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/platform/ws/LogsAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/platform/ws/MigrateDbAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/platform/ws/PingAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/platform/ws/RestartAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/platform/ws/ServerWs.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/platform/ws/StatusAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/platform/ws/SystemWs.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/platform/ws/SystemWsAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/platform/ws/UpgradesAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/platform/ws/package-info.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/plugins/InstalledPluginReferentialFactory.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/plugins/PluginDownloader.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/plugins/PluginReferentialMetadataConverter.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/plugins/ServerExtensionInstaller.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/plugins/ServerPluginJarExploder.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/plugins/ServerPluginRepository.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/plugins/StaticResourcesServlet.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/plugins/UpdateCenterClient.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/plugins/UpdateCenterMatrixFactory.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/plugins/WebServerExtensionInstaller.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/plugins/package-info.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/plugins/privileged/PrivilegedPluginsBootstraper.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/plugins/privileged/PrivilegedPluginsStopper.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/plugins/privileged/package-info.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/plugins/ws/AvailableAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/plugins/ws/CancelAllAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/plugins/ws/InstallAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/plugins/ws/InstalledAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/plugins/ws/PendingAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/plugins/ws/PluginUpdateAggregator.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/plugins/ws/PluginWSCommons.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/plugins/ws/PluginsWs.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/plugins/ws/PluginsWsAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/plugins/ws/UninstallAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/plugins/ws/UpdateAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/plugins/ws/UpdatesAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/plugins/ws/package-info.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/project/Visibility.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/project/package-info.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/project/ws/BulkDeleteAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/project/ws/BulkUpdateKeyAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/project/ws/CreateAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/project/ws/DeleteAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/project/ws/GhostsAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/project/ws/IndexAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/project/ws/ProjectsWs.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/project/ws/ProjectsWsAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/project/ws/ProjectsWsModule.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/project/ws/ProjectsWsSupport.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/project/ws/ProvisionedAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/project/ws/SearchAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/project/ws/SearchMyProjectsAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/project/ws/SearchMyProjectsData.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/project/ws/SearchMyProjectsDataLoader.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/project/ws/UpdateKeyAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/project/ws/UpdateVisibilityAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/project/ws/package-info.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/projectanalysis/ProjectAnalysisModule.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/projectanalysis/package-info.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/projectanalysis/ws/CreateEventAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/projectanalysis/ws/DeleteAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/projectanalysis/ws/DeleteEventAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/projectanalysis/ws/EventValidator.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/projectanalysis/ws/ProjectAnalysesWs.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/projectanalysis/ws/ProjectAnalysesWsAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/projectanalysis/ws/SearchAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/projectanalysis/ws/SearchData.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/projectanalysis/ws/SearchResponseBuilder.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/projectanalysis/ws/UpdateEventAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/projectanalysis/ws/package-info.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/projectlink/ws/CreateAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/projectlink/ws/DeleteAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/projectlink/ws/ProjectLinksModule.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/projectlink/ws/ProjectLinksWs.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/projectlink/ws/ProjectLinksWsAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/projectlink/ws/SearchAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/projectlink/ws/package-info.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/projecttag/ws/ProjectTagsWs.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/projecttag/ws/ProjectTagsWsAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/projecttag/ws/ProjectTagsWsModule.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/projecttag/ws/SearchAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/projecttag/ws/SetAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/projecttag/ws/package-info.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/property/InternalProperties.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/property/InternalPropertiesImpl.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/property/package-info.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/property/ws/IndexAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/property/ws/PropertiesWs.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/property/ws/package-info.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/qualitygate/QgateProjectFinder.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/qualitygate/QualityGateConditionsUpdater.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/qualitygate/QualityGateFinder.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/qualitygate/QualityGateModule.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/qualitygate/QualityGateUpdater.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/qualitygate/QualityGates.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/qualitygate/RegisterQualityGates.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/qualitygate/ValidRatingMetrics.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/qualitygate/package-info.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/qualitygate/ws/AppAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/qualitygate/ws/CopyAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/qualitygate/ws/CreateAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/qualitygate/ws/CreateConditionAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/qualitygate/ws/DeleteConditionAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/qualitygate/ws/DeselectAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/qualitygate/ws/DestroyAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/qualitygate/ws/GetByProjectAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/qualitygate/ws/ListAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/qualitygate/ws/ProjectStatusAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/qualitygate/ws/QualityGateDetailsFormatter.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/qualitygate/ws/QualityGatesWs.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/qualitygate/ws/QualityGatesWsAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/qualitygate/ws/RenameAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/qualitygate/ws/SearchAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/qualitygate/ws/SelectAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/qualitygate/ws/SetAsDefaultAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/qualitygate/ws/ShowAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/qualitygate/ws/UnsetDefaultAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/qualitygate/ws/UpdateConditionAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/qualitygate/ws/package-info.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/qualityprofile/ActiveRule.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/qualityprofile/ActiveRuleChange.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/qualityprofile/BuiltInQProfile.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/qualityprofile/BuiltInQProfileInsert.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/qualityprofile/BuiltInQProfileInsertImpl.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/qualityprofile/BuiltInQProfileLoader.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/qualityprofile/BuiltInQProfileRepository.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/qualityprofile/BuiltInQProfileRepositoryImpl.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/qualityprofile/BuiltInQProfileUpdate.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/qualityprofile/BuiltInQProfileUpdateImpl.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/qualityprofile/BuiltInQualityProfilesNotification.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/qualityprofile/BuiltInQualityProfilesNotificationDispatcher.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/qualityprofile/BuiltInQualityProfilesNotificationTemplate.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/qualityprofile/BuiltInQualityProfilesUpdateListener.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/qualityprofile/BulkChangeResult.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/qualityprofile/QPMeasureData.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/qualityprofile/QProfileBackuper.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/qualityprofile/QProfileBackuperImpl.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/qualityprofile/QProfileComparison.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/qualityprofile/QProfileCopier.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/qualityprofile/QProfileExporters.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/qualityprofile/QProfileFactory.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/qualityprofile/QProfileFactoryImpl.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/qualityprofile/QProfileName.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/qualityprofile/QProfileReset.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/qualityprofile/QProfileResetImpl.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/qualityprofile/QProfileRestoreSummary.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/qualityprofile/QProfileResult.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/qualityprofile/QualityProfile.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/qualityprofile/RegisterQualityProfiles.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/qualityprofile/RuleActivation.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/qualityprofile/RuleActivator.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/qualityprofile/RuleActivatorContext.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/qualityprofile/RuleActivatorContextFactory.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/qualityprofile/index/ActiveRuleDoc.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/qualityprofile/index/ActiveRuleIndexer.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/qualityprofile/index/package-info.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/qualityprofile/package-info.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/qualityprofile/ws/ActivateRuleAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/qualityprofile/ws/ActivateRulesAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/qualityprofile/ws/AddProjectAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/qualityprofile/ws/BackupAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/qualityprofile/ws/BulkChangeWsResponse.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/qualityprofile/ws/ChangeParentAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/qualityprofile/ws/ChangelogAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/qualityprofile/ws/ChangelogLoader.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/qualityprofile/ws/CompareAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/qualityprofile/ws/CopyAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/qualityprofile/ws/CreateAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/qualityprofile/ws/DeactivateRuleAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/qualityprofile/ws/DeactivateRulesAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/qualityprofile/ws/DeleteAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/qualityprofile/ws/ExportAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/qualityprofile/ws/ExportersAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/qualityprofile/ws/ImportersAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/qualityprofile/ws/InheritanceAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/qualityprofile/ws/OldRestoreAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/qualityprofile/ws/ProfilesWs.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/qualityprofile/ws/ProjectsAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/qualityprofile/ws/QProfileReference.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/qualityprofile/ws/QProfileWsAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/qualityprofile/ws/QProfileWsSupport.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/qualityprofile/ws/QProfilesWs.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/qualityprofile/ws/QProfilesWsModule.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/qualityprofile/ws/RemoveProjectAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/qualityprofile/ws/RenameAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/qualityprofile/ws/RestoreAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/qualityprofile/ws/RestoreBuiltInAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/qualityprofile/ws/SearchAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/qualityprofile/ws/SearchData.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/qualityprofile/ws/SetDefaultAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/qualityprofile/ws/ShowAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/qualityprofile/ws/package-info.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/root/ws/RootWsModule.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/root/ws/RootsWs.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/root/ws/RootsWsAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/root/ws/SearchAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/root/ws/SetRootAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/root/ws/UnsetRootAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/root/ws/package-info.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/rule/CachingRuleFinder.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/rule/CommonRuleDefinitions.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/rule/CommonRuleDefinitionsImpl.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/rule/CommonRuleKeys.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/rule/DefaultRuleFinder.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/rule/DeprecatedRulesDefinitionLoader.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/rule/NewCustomRule.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/rule/ReactivationException.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/rule/RegisterRules.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/rule/Rule.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/rule/RuleCreator.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/rule/RuleDefinitionsLoader.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/rule/RuleParam.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/rule/RuleTagHelper.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/rule/RuleUpdate.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/rule/RuleUpdater.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/rule/WebServerRuleFinder.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/rule/WebServerRuleFinderImpl.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/rule/index/RuleDoc.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/rule/index/RuleExtensionDoc.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/rule/index/RuleExtensionScope.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/rule/index/RuleIndex.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/rule/index/RuleIndexDefinition.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/rule/index/RuleIndexer.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/rule/index/RuleQuery.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/rule/index/package-info.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/rule/package-info.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/rule/ws/ActiveRuleCompleter.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/rule/ws/AppAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/rule/ws/CreateAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/rule/ws/DeleteAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/rule/ws/ListAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/rule/ws/RepositoriesAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/rule/ws/RuleMapper.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/rule/ws/RuleQueryFactory.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/rule/ws/RuleWsSupport.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/rule/ws/RulesWs.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/rule/ws/RulesWsAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/rule/ws/SearchAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/rule/ws/ShowAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/rule/ws/TagsAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/rule/ws/UpdateAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/rule/ws/package-info.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/search/EsSearchModule.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/search/FacetValue.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/search/package-info.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/serverid/ws/GenerateAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/serverid/ws/ServerIdWs.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/serverid/ws/ServerIdWsAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/serverid/ws/ServerIdWsModule.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/serverid/ws/ShowAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/serverid/ws/package-info.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/setting/DatabaseSettingLoader.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/setting/DatabaseSettingsEnabler.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/setting/NopSettingLoader.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/setting/SettingLoader.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/setting/ThreadLocalSettings.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/setting/package-info.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/setting/ws/CheckSecretKeyAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/setting/ws/EncryptAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/setting/ws/GenerateSecretKeyAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/setting/ws/ListDefinitionsAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/setting/ws/PropertySetExtractor.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/setting/ws/ResetAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/setting/ws/ScannerSettings.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/setting/ws/SetAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/setting/ws/Setting.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/setting/ws/SettingValidations.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/setting/ws/SettingsFinder.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/setting/ws/SettingsUpdater.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/setting/ws/SettingsWs.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/setting/ws/SettingsWsAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/setting/ws/SettingsWsModule.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/setting/ws/SettingsWsSupport.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/setting/ws/ValuesAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/setting/ws/package-info.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/source/CharactersReader.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/source/DecorationDataHolder.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/source/HtmlSourceDecorator.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/source/HtmlTextDecorator.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/source/OpeningHtmlTag.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/source/SourceService.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/source/index/FileSourcesUpdaterHelper.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/source/index/package-info.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/source/package-info.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/source/ws/HashAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/source/ws/IndexAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/source/ws/LinesAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/source/ws/RawAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/source/ws/ScmAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/source/ws/ShowAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/source/ws/SourcesWs.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/source/ws/SourcesWsAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/source/ws/package-info.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/startup/DeleteOldAnalysisReportsFromFs.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/startup/DisplayLogOnDeprecatedProjects.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/startup/GeneratePluginIndex.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/startup/LogServerId.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/startup/RegisterMetrics.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/startup/RegisterPermissionTemplates.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/startup/RenameDeprecatedPropertyKeys.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/startup/package-info.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/test/index/CoveredFileDoc.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/test/index/TestDoc.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/test/index/TestIndex.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/test/index/TestIndexDefinition.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/test/index/TestIndexer.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/test/index/TestResultSetIterator.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/test/index/package-info.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/test/ws/CoveredFilesAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/test/ws/ListAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/test/ws/TestsWs.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/test/ws/TestsWsAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/test/ws/package-info.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/text/Macro.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/text/MacroInterpreter.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/text/RuleMacro.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/ui/DeprecatedViews.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/ui/PageDecorations.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/ui/PageRepository.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/ui/VersionFormatter.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/ui/package-info.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/ui/ws/ComponentAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/ui/ws/GlobalAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/ui/ws/NavigationWs.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/ui/ws/NavigationWsAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/ui/ws/NavigationWsModule.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/ui/ws/OrganizationAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/ui/ws/SettingsAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/ui/ws/package-info.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/updatecenter/UpdateCenterModule.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/updatecenter/package-info.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/updatecenter/ws/InstalledPluginsAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/updatecenter/ws/UpdateCenterWs.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/updatecenter/ws/UpdateCenterWsAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/updatecenter/ws/UploadAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/updatecenter/ws/package-info.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/user/AbstractUserSession.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/user/CompatibilityRealm.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/user/DefaultUserFinder.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/user/DeprecatedUserFinder.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/user/DoPrivileged.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/user/ExternalIdentity.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/user/NewUser.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/user/NewUserNotifier.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/user/SecurityRealmFactory.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/user/ServerUserSession.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/user/ThreadLocalUserSession.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/user/UpdateUser.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/user/UserSession.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/user/UserSessionFactory.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/user/UserSessionFactoryImpl.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/user/UserSessionFilter.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/user/UserUpdater.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/user/index/UserDoc.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/user/index/UserIndex.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/user/index/UserIndexDefinition.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/user/index/UserIndexer.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/user/index/UserQuery.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/user/index/package-info.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/user/package-info.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/user/ws/ChangePasswordAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/user/ws/CreateAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/user/ws/CurrentAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/user/ws/DeactivateAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/user/ws/GroupsAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/user/ws/IdentityProvidersAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/user/ws/SearchAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/user/ws/SkipOnboardingTutorialAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/user/ws/UpdateAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/user/ws/UserJsonWriter.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/user/ws/UserPropertiesWs.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/user/ws/UsersWs.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/user/ws/UsersWsAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/user/ws/UsersWsModule.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/user/ws/package-info.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/usergroups/DefaultGroupCreator.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/usergroups/DefaultGroupCreatorImpl.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/usergroups/DefaultGroupFinder.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/usergroups/package-info.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/usergroups/ws/AddUserAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/usergroups/ws/CreateAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/usergroups/ws/DeleteAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/usergroups/ws/GroupId.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/usergroups/ws/GroupIdOrAnyone.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/usergroups/ws/GroupWsRef.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/usergroups/ws/GroupWsSupport.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/usergroups/ws/RemoveUserAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/usergroups/ws/SearchAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/usergroups/ws/UpdateAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/usergroups/ws/UserGroupsModule.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/usergroups/ws/UserGroupsWs.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/usergroups/ws/UserGroupsWsAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/usergroups/ws/UsersAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/usergroups/ws/package-info.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/usertoken/TokenGenerator.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/usertoken/TokenGeneratorImpl.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/usertoken/UserTokenAuthenticator.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/usertoken/UserTokenModule.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/usertoken/package-info.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/usertoken/ws/GenerateAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/usertoken/ws/RevokeAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/usertoken/ws/SearchAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/usertoken/ws/TokenPermissionsValidator.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/usertoken/ws/UserTokensWs.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/usertoken/ws/UserTokensWsAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/usertoken/ws/package-info.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/util/AbstractStoppableExecutorService.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/util/AbstractStoppableScheduledExecutorServiceImpl.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/util/BooleanTypeValidation.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/util/ClassLoaderUtils.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/util/DateCollector.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/util/EnumUtils.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/util/FloatTypeValidation.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/util/IntegerTypeValidation.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/util/LanguageParamUtils.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/util/LongTypeValidation.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/util/MetricKeyValidator.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/util/MetricLevelTypeValidation.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/util/ObjectInputStreamIterator.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/util/OkHttpClientProvider.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/util/RubyUtils.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/util/StoppableExecutorService.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/util/StoppableScheduledExecutorService.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/util/StringListTypeValidation.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/util/StringTypeValidation.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/util/TextTypeValidation.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/util/TypeValidation.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/util/TypeValidationModule.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/util/TypeValidations.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/util/Validation.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/util/cache/CacheLoader.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/util/cache/DiskCache.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/util/cache/MemoryCache.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/util/cache/package-info.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/util/package-info.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/view/index/ViewDoc.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/view/index/ViewIndex.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/view/index/ViewIndexDefinition.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/view/index/ViewIndexer.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/view/index/package-info.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/webhook/ws/WebhookDeliveriesAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/webhook/ws/WebhookDeliveryAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/webhook/ws/WebhookWsSupport.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/webhook/ws/WebhooksWs.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/webhook/ws/WebhooksWsAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/webhook/ws/WebhooksWsModule.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/webhook/ws/package-info.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/ws/DefaultLocalResponse.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/ws/DeprecatedPropertiesWsFilter.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/ws/JsonWriterUtils.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/ws/KeyExamples.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/ws/LocalRequestAdapter.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/ws/RemovedWebServiceHandler.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/ws/RequestVerifier.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/ws/ServletFilterHandler.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/ws/ServletRequest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/ws/ServletResponse.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/ws/WebServiceEngine.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/ws/WebServiceFilter.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/ws/WebServiceReroutingFilter.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/ws/WsAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/ws/WsParameterBuilder.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/ws/WsResponseCommonFormat.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/ws/WsUtils.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/ws/package-info.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/ws/ws/ListAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/ws/ws/ResponseExampleAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/ws/ws/WebServicesWs.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/ws/ws/WebServicesWsAction.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/ws/ws/WebServicesWsModule.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/java/org/sonar/server/ws/ws/package-info.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/resources/build.properties (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/resources/com/sonar/sqale/technical-debt-model.xml (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/resources/org/sonar/server/authentication/ws/example-validate.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/resources/org/sonar/server/batch/batch-file-example.txt (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/resources/org/sonar/server/batch/global-example.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/resources/org/sonar/server/batch/index-example.txt (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/resources/org/sonar/server/batch/issues-example.proto (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/resources/org/sonar/server/batch/project-example.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/resources/org/sonar/server/ce/ws/activity-example.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/resources/org/sonar/server/ce/ws/activity_status-example.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/resources/org/sonar/server/ce/ws/component-example.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/resources/org/sonar/server/ce/ws/is_queue_empty-example.txt (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/resources/org/sonar/server/ce/ws/submit-example.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/resources/org/sonar/server/ce/ws/task-example.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/resources/org/sonar/server/ce/ws/task_types-example.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/resources/org/sonar/server/component/ws/app-example.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/resources/org/sonar/server/component/ws/components-example-suggestions.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/resources/org/sonar/server/component/ws/events-index-example.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/resources/org/sonar/server/component/ws/resources-example-index.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/resources/org/sonar/server/component/ws/search-components-example.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/resources/org/sonar/server/component/ws/search_projects-example.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/resources/org/sonar/server/component/ws/show-example.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/resources/org/sonar/server/component/ws/tree-example.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/resources/org/sonar/server/duplication/ws/show-example.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/resources/org/sonar/server/favorite/ws/search-example.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/resources/org/sonar/server/issue/ws/add_comment-example.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/resources/org/sonar/server/issue/ws/assign-example.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/resources/org/sonar/server/issue/ws/authors-example.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/resources/org/sonar/server/issue/ws/bulk_change-example.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/resources/org/sonar/server/issue/ws/changelog-example.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/resources/org/sonar/server/issue/ws/component-tags-example.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/resources/org/sonar/server/issue/ws/delete_comment-example.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/resources/org/sonar/server/issue/ws/do_transition-example.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/resources/org/sonar/server/issue/ws/edit_comment-example.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/resources/org/sonar/server/issue/ws/search-example.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/resources/org/sonar/server/issue/ws/set_severity-example.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/resources/org/sonar/server/issue/ws/set_tags-example.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/resources/org/sonar/server/issue/ws/set_type-example.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/resources/org/sonar/server/issue/ws/tags-example.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/resources/org/sonar/server/language/ws/example-list.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/resources/org/sonar/server/license/ws/list-example.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/resources/org/sonar/server/measure/custom/ws/example-metrics.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/resources/org/sonar/server/measure/custom/ws/example-search.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/resources/org/sonar/server/measure/ws/component-example.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/resources/org/sonar/server/measure/ws/component_tree-example.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/resources/org/sonar/server/measure/ws/search-example.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/resources/org/sonar/server/measure/ws/search_history-example.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/resources/org/sonar/server/metric/ws/example-domains.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/resources/org/sonar/server/metric/ws/example-search.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/resources/org/sonar/server/metric/ws/example-types.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/resources/org/sonar/server/notification/ws/list-example.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/resources/org/sonar/server/organization/ws/add_member-example.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/resources/org/sonar/server/organization/ws/create-example.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/resources/org/sonar/server/organization/ws/search-example.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/resources/org/sonar/server/organization/ws/search_members-example.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/resources/org/sonar/server/organization/ws/search_my_organization-example.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/resources/org/sonar/server/permission/ws/groups-example.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/resources/org/sonar/server/permission/ws/search_global_permissions-example.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/resources/org/sonar/server/permission/ws/search_project_permissions-example.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/resources/org/sonar/server/permission/ws/template/create_template-example.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/resources/org/sonar/server/permission/ws/template/search_templates-example.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/resources/org/sonar/server/permission/ws/template/template_groups-example.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/resources/org/sonar/server/permission/ws/template/template_users-example.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/resources/org/sonar/server/permission/ws/template/update_template-example.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/resources/org/sonar/server/permission/ws/users-example.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/resources/org/sonar/server/platform/ws/example-migrate_db.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/resources/org/sonar/server/platform/ws/example-server-version.txt (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/resources/org/sonar/server/platform/ws/example-status.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/resources/org/sonar/server/platform/ws/example-system-info.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/resources/org/sonar/server/platform/ws/example-upgrades_plugins.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/resources/org/sonar/server/platform/ws/l10n-index-example.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/resources/org/sonar/server/platform/ws/logs-example.log (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/resources/org/sonar/server/platform/ws/ping-example.txt (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/resources/org/sonar/server/plugins/ws/example-available_plugins.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/resources/org/sonar/server/plugins/ws/example-installed_plugins.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/resources/org/sonar/server/plugins/ws/example-pending_plugins.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/resources/org/sonar/server/plugins/ws/example-updates_plugins.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/resources/org/sonar/server/project/ws/bulk_update_key-example.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/resources/org/sonar/server/project/ws/create-example.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/resources/org/sonar/server/project/ws/index-example.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/resources/org/sonar/server/project/ws/projects-example-ghosts.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/resources/org/sonar/server/project/ws/projects-example-provisioned.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/resources/org/sonar/server/project/ws/search-example.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/resources/org/sonar/server/project/ws/search_my_projects-example.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/resources/org/sonar/server/projectanalysis/ws/create_event-example.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/resources/org/sonar/server/projectanalysis/ws/search-example.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/resources/org/sonar/server/projectanalysis/ws/update_event-example.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/resources/org/sonar/server/projectlink/ws/create-example.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/resources/org/sonar/server/projectlink/ws/list-example.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/resources/org/sonar/server/projecttag/ws/search-example.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/resources/org/sonar/server/property/ws/index-example.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/resources/org/sonar/server/qualitygate/ws/app-example.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/resources/org/sonar/server/qualitygate/ws/example-list.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/resources/org/sonar/server/qualitygate/ws/example-search.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/resources/org/sonar/server/qualitygate/ws/example-show.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/resources/org/sonar/server/qualitygate/ws/get_by_project-example.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/resources/org/sonar/server/qualitygate/ws/project_status-example.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/resources/org/sonar/server/qualityprofile/ws/backup-example.xml (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/resources/org/sonar/server/qualityprofile/ws/changelog-example.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/resources/org/sonar/server/qualityprofile/ws/compare-example.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/resources/org/sonar/server/qualityprofile/ws/create-example.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/resources/org/sonar/server/qualityprofile/ws/export-example.xml (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/resources/org/sonar/server/qualityprofile/ws/exporters-example.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/resources/org/sonar/server/qualityprofile/ws/importers-example.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/resources/org/sonar/server/qualityprofile/ws/inheritance-example.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/resources/org/sonar/server/qualityprofile/ws/projects-example.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/resources/org/sonar/server/qualityprofile/ws/search-example.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/resources/org/sonar/server/qualityprofile/ws/show-example.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/resources/org/sonar/server/root/ws/search-example.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/resources/org/sonar/server/rule/ws/app-example.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/resources/org/sonar/server/rule/ws/example-repositories.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/resources/org/sonar/server/rule/ws/example-show.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/resources/org/sonar/server/rule/ws/example-tags.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/resources/org/sonar/server/rule/ws/list-example.txt (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/resources/org/sonar/server/rule/ws/search-example.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/resources/org/sonar/server/serverid/ws/generate-example.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/resources/org/sonar/server/serverid/ws/show-example.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/resources/org/sonar/server/setting/ws/check_secret_key-example.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/resources/org/sonar/server/setting/ws/encrypt-example.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/resources/org/sonar/server/setting/ws/generate_secret_key-example.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/resources/org/sonar/server/setting/ws/list_definitions-example.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/resources/org/sonar/server/setting/ws/values-example.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/resources/org/sonar/server/source/ws/example-hash.txt (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/resources/org/sonar/server/source/ws/example-index.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/resources/org/sonar/server/source/ws/example-lines.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/resources/org/sonar/server/source/ws/example-raw.txt (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/resources/org/sonar/server/source/ws/example-scm.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/resources/org/sonar/server/source/ws/example-show.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/resources/org/sonar/server/test/ws/tests-example-covered-files.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/resources/org/sonar/server/test/ws/tests-example-list.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/resources/org/sonar/server/ui/ws/component-example.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/resources/org/sonar/server/ui/ws/global-example.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/resources/org/sonar/server/ui/ws/organization-example.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/resources/org/sonar/server/ui/ws/settings-example.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/resources/org/sonar/server/updatecenter/ws/installed_plugins-example.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/resources/org/sonar/server/user/ws/current-example.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/resources/org/sonar/server/user/ws/deactivate-example.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/resources/org/sonar/server/user/ws/groups-example.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/resources/org/sonar/server/user/ws/identity_providers-example.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/resources/org/sonar/server/user/ws/search-example.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/resources/org/sonar/server/user/ws/update-example.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/resources/org/sonar/server/usergroups/ws/create-example.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/resources/org/sonar/server/usergroups/ws/search-example.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/resources/org/sonar/server/usergroups/ws/update-example.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/resources/org/sonar/server/usergroups/ws/users-example.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/resources/org/sonar/server/usertoken/ws/generate-example.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/resources/org/sonar/server/usertoken/ws/search-example.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/resources/org/sonar/server/webhook/ws/example-deliveries.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/resources/org/sonar/server/webhook/ws/example-delivery.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/resources/org/sonar/server/ws/removed-ws-example.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/resources/org/sonar/server/ws/ws/list-example.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/main/resources/org/sonar/server/ws/ws/response_example-example.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/ce/http/CeHttpClientTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/ce/log/CeLoggingTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/ce/log/CeProcessLoggingTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/ce/organization/DefaultOrganizationLoaderTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/ce/queue/CeQueueImplTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/ce/queue/CeTaskTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/ce/settings/SettingsLoaderTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/ce/taskprocessor/ReportTaskProcessorDeclarationTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/app/EmbeddedTomcatTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/app/NullJarScannerTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/app/ProcessCommandWrapperImplTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/app/ProgrammaticLogbackValveTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/app/StartupLogsTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/app/TomcatAccessLogTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/app/TomcatConnectorsTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/app/TomcatContextsTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/app/WebServerProcessLoggingTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/authentication/AuthenticationModuleTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/authentication/BaseContextFactoryTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/authentication/BasicAuthenticatorTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/authentication/CookiesTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/authentication/CredentialsAuthenticatorTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/authentication/FakeBasicIdentityProvider.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/authentication/FakeOAuth2IdentityProvider.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/authentication/IdentityProviderRepositoryRule.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/authentication/IdentityProviderRepositoryTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/authentication/InitFilterTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/authentication/JwtCsrfVerifierTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/authentication/JwtHttpHandlerTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/authentication/JwtSerializerTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/authentication/OAuth2CallbackFilterTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/authentication/OAuth2ContextFactoryTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/authentication/OAuthCsrfVerifierTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/authentication/RealmAuthenticatorTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/authentication/SsoAuthenticatorTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/authentication/TestIdentityProvider.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/authentication/UserIdentityAuthenticatorTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/authentication/UserSessionInitializerTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/authentication/event/AuthenticationEventImplTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/authentication/event/AuthenticationEventSourceTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/authentication/event/AuthenticationExceptionMatcher.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/authentication/event/AuthenticationExceptionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/authentication/ws/AuthenticationWsTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/authentication/ws/LoginActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/authentication/ws/LogoutActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/authentication/ws/ValidateActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/batch/BatchIndexTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/batch/BatchWsModuleTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/batch/FileActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/batch/IndexActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/batch/IssuesActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/batch/ProjectActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/batch/ProjectDataLoaderMediumTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/batch/ProjectDataLoaderTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/ce/ws/ActivityActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/ce/ws/ActivityStatusActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/ce/ws/CancelActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/ce/ws/CancelAllActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/ce/ws/CeWsModuleTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/ce/ws/CeWsTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/ce/ws/ComponentActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/ce/ws/SubmitActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/ce/ws/TaskActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/ce/ws/TaskFormatterTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/ce/ws/TaskTypesActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/component/ComponentCleanerServiceTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/component/ComponentFinderTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/component/ComponentServiceTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/component/ComponentServiceUpdateKeyTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/component/ComponentUpdaterTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/component/NewComponentTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/component/TestComponentFinder.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/component/index/ComponentIndexCombinationTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/component/index/ComponentIndexFeatureExactTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/component/index/ComponentIndexFeatureFavoriteTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/component/index/ComponentIndexFeatureKeyTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/component/index/ComponentIndexFeaturePartialTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/component/index/ComponentIndexFeaturePrefixTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/component/index/ComponentIndexFeatureRecentlyBrowsedTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/component/index/ComponentIndexHighlightTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/component/index/ComponentIndexLoginTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/component/index/ComponentIndexMultipleWordsTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/component/index/ComponentIndexQueryTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/component/index/ComponentIndexScoreTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/component/index/ComponentIndexTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/component/index/ComponentIndexerTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/component/ws/AppActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/component/ws/ComponentDtoToWsComponentTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/component/ws/ComponentsWsModuleTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/component/ws/ComponentsWsTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/component/ws/FilterParserTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/component/ws/ProjectMeasuresQueryFactoryTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/component/ws/ProjectMeasuresQueryValidatorTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/component/ws/ResourcesWsTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/component/ws/SearchActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/component/ws/SearchProjectsActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/component/ws/ShowActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/component/ws/SuggestionsActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/component/ws/TreeActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/dbcleaner/IndexPurgeListenerTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/dbcleaner/ProjectCleanerTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/queue/ReportSubmitterTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/ChangeLogLevel.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/container/TaskContainerImplTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/analysis/AnalysisImplTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/analysis/AnalysisMetadataHolderImplTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/analysis/AnalysisMetadataHolderRule.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/analysis/MutableAnalysisMetadataHolderRule.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/analysis/OrganizationTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/api/measurecomputer/ComponentImplTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/api/measurecomputer/MeasureComputerContextImplTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/api/measurecomputer/MeasureComputerDefinitionImplTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/api/measurecomputer/MeasureImplTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/api/posttask/CeTaskImplTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/api/posttask/ConditionImplTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/api/posttask/ConditionToConditionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/api/posttask/PostProjectAnalysisTasksExecutorTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/api/posttask/ProjectImplTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/api/posttask/QualityGateImplTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/batch/BatchReportDirectoryHolderImplTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/batch/BatchReportReaderImplTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/batch/BatchReportReaderRule.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/batch/ImmutableBatchReportDirectoryHolder.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/component/AbstractComponentProvider.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/component/CallRecord.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/component/CallRecorderPathAwareVisitor.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/component/CallRecorderTypeAwareVisitor.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ComponentFunctionsTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ComponentImplTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ComponentProvider.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ComponentRootBuilderTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ComponentTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ConfigurationRepositoryTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/component/CrawlerDepthLimitTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/component/DbIdsRepositoryImplTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/component/DisabledComponentsHolderImplTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/component/DumbDeveloper.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/component/FileAttributesTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/component/MutableDbIdsRepositoryRule.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/component/MutableTreeRootHolderRule.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/component/NoComponentProvider.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/component/PathAwareCallRecord.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ReportComponent.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ReportPathAwareVisitorTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ReportPostOrderDepthTraversalTypeAwareCrawlerTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ReportPreOrderDepthTraversalTypeAwareCrawlerTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ReportVisitorsCrawlerTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ReportVisitorsCrawlerWithPathAwareVisitorTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ReportVisitorsCrawlerWithPostOrderTypeAwareVisitorTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ReportVisitorsCrawlerWithPreOrderTypeAwareVisitorTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/component/TestSettingsRepository.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/component/TreeComponentProvider.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/component/TreeRootHolderComponentProvider.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/component/TreeRootHolderImplTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/component/TreeRootHolderRule.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/component/TypeAwareVisitorAdapterTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ViewsComponent.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ViewsPathAwareVisitorTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ViewsPostOrderDepthTraversalTypeAwareCrawlerTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ViewsPreOrderDepthTraversalTypeAwareCrawlerTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ViewsVisitorsCrawlerTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ViewsVisitorsCrawlerWithPathAwareVisitorTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ViewsVisitorsCrawlerWithPostOrderTypeAwareVisitorTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ViewsVisitorsCrawlerWithPreOrderTypeAwareVisitorTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/container/ProjectAnalysisTaskContainerPopulatorTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/duplication/CrossProjectDuplicateTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/duplication/CrossProjectDuplicationStatusHolderImplTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/duplication/DuplicateTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/duplication/DuplicationRepositoryImplTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/duplication/DuplicationRepositoryRule.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/duplication/DuplicationTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/duplication/InProjectDuplicateTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/duplication/InnerDuplicateTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/duplication/IntegrateCrossProjectDuplicationsTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/duplication/TextBlockTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/event/EventRepositoryImplTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/event/EventTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/filemove/MatchTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/filemove/MatchesByScoreTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/filemove/MutableMovedFilesRepositoryImplTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/filemove/MutableMovedFilesRepositoryRule.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/filemove/SourceSimilarityImplTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/AverageFormulaExecutionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/AverageFormulaTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/DistributionFormulaExecutionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/DistributionFormulaTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/DumbCreateMeasureContext.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/IntSumFormulaTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/LongSumFormulaTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/ReportFormulaExecutorComponentVisitorTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/SumFormulaExecutionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/ViewsFormulaExecutorComponentVisitorTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/counter/DoubleValueTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/counter/IntSumCounterTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/counter/IntValueTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/counter/LongSumCounterTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/counter/LongValueTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/counter/RatingValueTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/CoverageUtilsTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/CloseIssuesOnRemovedComponentsVisitorTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/ComponentIssuesRepositoryImplTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/ComponentIssuesRepositoryRule.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/ComponentsWithUnprocessedIssuesTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/DebtCalculatorTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/DefaultAssigneeTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/DumbRule.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/EffortAggregatorTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/FillComponentIssuesVisitorRule.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/IntegrateIssuesVisitorTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/IssueAssignerTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/IssueCounterTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/IssueCreationDateCalculatorTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/IssueLifecycleTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/LoadComponentUuidsHavingOpenIssuesVisitorTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/MovedIssueVisitorTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/NewEffortAggregatorTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/NewEffortCalculatorTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/RuleRepositoryImplTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/RuleRepositoryRule.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/RuleTagsCopierTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/RuleTypeCopierTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/ScmAccountToUserLoaderTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/TrackerBaseInputFactoryTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/TrackerRawInputFactoryTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/UpdateConflictResolverTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/BranchCoverageRuleTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/CommentDensityRuleTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/CommonRuleEngineImplTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/CommonRuleTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/CoverageRuleTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/DuplicatedBlockRuleTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/LineCoverageRuleTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/SkippedTestRuleTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/TestErrorRuleTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/filter/IssueFilterTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/filter/IssuePatternTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/language/LanguageRepositoryImplTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/BatchMeasureToMeasureTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/BestValueOptimizationTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MapBasedRawMeasureRepositoryTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureAssert.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureComputersHolderImplTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureComputersHolderRule.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureDtoToMeasureTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureKeyTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureLevelTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureRepoEntry.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureRepositoryImplTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureRepositoryRule.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureToMeasureDtoTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/QualityGateStatusTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/ReportMeasureComputersVisitorTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/ViewsMeasureComputersVisitorTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/qualitygatedetails/EvaluatedConditionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/qualitygatedetails/QualityGateDetailsDataTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/metric/MetricDtoToMetricTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/metric/MetricImplTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/metric/MetricRepositoryImplTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/metric/MetricRepositoryRule.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/metric/ReportMetricValidatorImplTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/period/PeriodHolderImplTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/period/PeriodHolderRule.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/period/PeriodTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitygate/ConditionEvaluatorTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitygate/ConditionStatusTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitygate/ConditionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitygate/EvaluationResultAssert.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitygate/EvaluationResultTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitygate/EvaluationResultTextConverterTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitygate/MutableQualityGateHolderRule.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitygate/MutableQualityGateStatusHolderRule.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitygate/QualityGateHolderImplTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitygate/QualityGateHolderRule.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitygate/QualityGateServiceImplTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitygate/QualityGateStatusHolderImplTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitymodel/MaintainabilityMeasuresVisitorTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitymodel/NewMaintainabilityMeasuresVisitorTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitymodel/NewReliabilityAndSecurityRatingMeasuresVisitorTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitymodel/RatingGridTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitymodel/RatingSettingsTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitymodel/ReliabilityAndSecurityRatingMeasuresVisitorTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/qualityprofile/ActiveRulesHolderImplTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/qualityprofile/ActiveRulesHolderRule.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/scm/ChangesetTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/scm/DbScmInfoTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/scm/ReportScmInfoTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/scm/ScmInfoImplTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/scm/ScmInfoRepositoryImplTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/scm/ScmInfoRepositoryRule.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/source/ComputeFileSourceDataTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/source/CoverageLineReaderTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/source/DuplicationLineReaderTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/source/HighlightingLineReaderTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/source/LastCommitVisitorTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/source/RangeOffsetConverterTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/source/ReportIteratorTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/source/ScmLineReaderTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/source/SourceHashRepositoryImplTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/source/SourceLinesRepositoryImplTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/source/SourceLinesRepositoryRule.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/source/SymbolsLineReaderTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/step/BaseStepTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/step/BuildComponentTreeStepTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ComputeQProfileMeasureStepTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/step/CustomMeasuresCopyStepTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/step/DuplicationDataMeasuresStepTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/step/EnableAnalysisStepTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ExecuteVisitorsStepTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ExtractReportStepTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/step/IndexAnalysisStepTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/step/LoadCrossProjectDuplicationsRepositoryStepTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/step/LoadDuplicationsFromReportStepTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/step/LoadMeasureComputersStepTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/step/LoadPeriodsStepTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/step/LoadQualityProfilesStepTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/step/LoadReportAnalysisMetadataHolderStepTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/step/NewSizeMeasuresStepTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/step/PersistComponentsStepTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/step/PersistCrossProjectDuplicationIndexStepTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/step/PersistDevelopersStepTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/step/PersistEventsStepTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/step/PersistFileSourcesStepTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/step/PersistIssuesStepTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/step/PersistMeasuresStepTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/step/PersistProjectLinksStepTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/step/PersistScannerContextStepTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/step/PersistTestsStepTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/step/PublishTaskResultStepTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/step/PurgeDatastoresStepTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/step/QualityGateEventsStepTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/step/QualityGateLoadingStepTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/step/QualityGateMeasuresStepTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/step/QualityProfileEventsStepTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportCommentMeasuresStepTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportComplexityMeasuresStepTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportComputationStepsTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportComputeMeasureVariationsStepTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportCoverageMeasuresStepTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportDuplicationMeasuresStepTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportLanguageDistributionMeasuresStepTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportNewCoverageMeasuresStepTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportPersistAnalysisStepTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportPersistComponentsStepTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportSizeMeasuresStepTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportUnitTestMeasuresStepTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/step/SendIssueNotificationsStepTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/step/UpdateQualityProfilesLastUsedDateStepTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ValidateProjectStepTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ViewsCommentMeasuresStepTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ViewsComplexityMeasuresStepTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ViewsComputeMeasureVariationsStepTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ViewsCoverageMeasuresStepTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ViewsDuplicationMeasuresStepTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ViewsLanguageDistributionMeasuresStepTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ViewsNewCoverageMeasuresStepTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ViewsPersistAnalysisStepTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ViewsPersistComponentsStepTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ViewsSizeMeasuresStepTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ViewsUnitTestMeasuresStepTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/webhook/TestWebhookCaller.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/webhook/WebhookCallerImplTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/webhook/WebhookDeliveryStorageTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/webhook/WebhookDeliveryTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/webhook/WebhookModuleTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/webhook/WebhookPayloadFactoryImplTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/projectanalysis/webhook/WebhookPostTaskTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/step/ComputationStepExecutorTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/task/step/StepsExplorer.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/computation/taskprocessor/MutableTaskResultHolderImplTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/debt/DebtModelPluginRepositoryTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/debt/DebtModelXMLExporterTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/debt/DebtRulesXMLImporterTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/duplication/ws/DuplicationsParserTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/duplication/ws/DuplicationsWsTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/duplication/ws/ShowActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/duplication/ws/ShowResponseBuilderTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/email/ws/EmailsWsModuleTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/email/ws/SendActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/es/BulkIndexerConcurrentRequestCalculationTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/es/BulkIndexerTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/es/DefaultIndexSettingsTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/es/EsClientProviderTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/es/EsClientStopperTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/es/EsClientTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/es/EsServerHolder.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/es/EsTester.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/es/EsUtilsTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/es/FakeDoc.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/es/FakeIndexDefinition.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/es/IndexCreatorTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/es/IndexDefinitionContextTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/es/IndexDefinitionHashTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/es/IndexerStartupTaskTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/es/IndexingResultTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/es/NewIndexTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/es/RecoveryIndexerTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/es/SearchOptionsTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/es/SortingTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/es/request/ProxyBulkRequestBuilderTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/es/request/ProxyClearCacheRequestBuilderTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/es/request/ProxyClusterHealthRequestBuilderTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/es/request/ProxyClusterStateRequestBuilderTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/es/request/ProxyClusterStatsRequestBuilderTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/es/request/ProxyCreateIndexRequestBuilderTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/es/request/ProxyDeleteRequestBuilderTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/es/request/ProxyFlushRequestBuilderTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/es/request/ProxyGetRequestBuilderTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/es/request/ProxyIndexRequestBuilderTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/es/request/ProxyIndicesExistsRequestBuilderTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/es/request/ProxyIndicesStatsRequestBuilderTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/es/request/ProxyMultiGetRequestBuilderTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/es/request/ProxyNodesStatsRequestBuilderTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/es/request/ProxyPutMappingRequestBuilderTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/es/request/ProxyRefreshRequestBuilderTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/es/request/ProxySearchRequestBuilderTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/es/request/ProxySearchScrollRequestBuilderTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/es/textsearch/ComponentTextSearchFeatureRule.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/es/textsearch/ComponentTextSearchQueryFactoryTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/event/NewAlertsTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/exceptions/BadRequestExceptionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/exceptions/MessageTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/exceptions/ServerExceptionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/favorite/FavoriteModuleTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/favorite/FavoriteUpdaterTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/favorite/ws/AddActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/favorite/ws/FavoritesWsTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/favorite/ws/RemoveActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/favorite/ws/SearchActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/i18n/I18nRule.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/i18n/package-info.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/issue/ActionFinderTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/issue/ActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/issue/AddTagsActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/issue/AssignActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/issue/CommentActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/issue/IssueDocTesting.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/issue/IssueFieldsSetterTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/issue/IssueFinderTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/issue/IssueQueryFactoryTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/issue/IssueQueryTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/issue/IssueServiceMediumTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/issue/IssueStorageTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/issue/IssueUpdaterTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/issue/IssuesFinderSortTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/issue/RemoveTagsActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/issue/ResultTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/issue/RulesAggregation.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/issue/RulesAggregationTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/issue/ServerIssueStorageTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/issue/SetSeverityActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/issue/SetTypeActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/issue/TransitionActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/issue/TransitionServiceTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/issue/index/IssueIndexDebtTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/issue/index/IssueIndexDefinitionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/issue/index/IssueIndexTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/issue/index/IssueIndexerTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/issue/index/IssueIteratorFactoryTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/issue/notification/ChangesOnMyIssueNotificationDispatcherTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/issue/notification/DoNotFixNotificationDispatcherTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/issue/notification/IssueChangeNotificationTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/issue/notification/IssueChangesEmailTemplateTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/issue/notification/MyNewIssuesEmailTemplateTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/issue/notification/MyNewIssuesNotificationDispatcherTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/issue/notification/MyNewIssuesNotificationTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/issue/notification/NewIssuesEmailTemplateTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/issue/notification/NewIssuesNotificationDispatcherTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/issue/notification/NewIssuesNotificationTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/issue/notification/NewIssuesStatisticsTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/issue/workflow/IsBeingClosedTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/issue/workflow/IssueWorkflowTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/issue/workflow/SetCloseDateTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/issue/workflow/SetClosedTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/issue/workflow/SetResolutionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/issue/workflow/StateMachineTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/issue/workflow/StateTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/issue/workflow/TransitionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/issue/workflow/UnsetAssigneeTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/issue/ws/AddCommentActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/issue/ws/AssignActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/issue/ws/AuthorsActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/issue/ws/AvatarResolverImplTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/issue/ws/BulkChangeActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/issue/ws/ChangelogActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/issue/ws/ComponentTagsActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/issue/ws/DeleteCommentActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/issue/ws/DoTransitionActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/issue/ws/EditCommentActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/issue/ws/IssueWsModuleTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/issue/ws/SearchActionComponentsMediumTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/issue/ws/SearchActionMediumTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/issue/ws/SearchActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/issue/ws/SetSeverityActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/issue/ws/SetTagsActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/issue/ws/SetTypeActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/issue/ws/TagsActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/language/LanguageTesting.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/language/ws/LanguageWsTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/license/ws/LicensesWsModuleTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/license/ws/ListActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/measure/custom/ws/CreateActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/measure/custom/ws/CustomMeasureValidatorTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/measure/custom/ws/CustomMeasuresWsModuleTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/measure/custom/ws/CustomMeasuresWsTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/measure/custom/ws/DeleteActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/measure/custom/ws/MetricsActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/measure/custom/ws/SearchActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/measure/custom/ws/UpdateActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/measure/index/ProjectMeasuresIndexTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/measure/index/ProjectMeasuresIndexTextSearchTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/measure/index/ProjectMeasuresIndexerTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/measure/index/ProjectMeasuresQueryTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/measure/index/ProjectsEsModuleTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/measure/ws/ComponentActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/measure/ws/ComponentTreeActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/measure/ws/ComponentTreeSortTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/measure/ws/MeasureValueFormatterTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/measure/ws/MeasuresWsModuleTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/measure/ws/MeasuresWsTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/measure/ws/SearchActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/measure/ws/SearchHistoryActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/measure/ws/TimeMachineWsTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/metric/CoreCustomMetricsTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/metric/DefaultMetricFinderTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/metric/ws/CreateActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/metric/ws/DeleteActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/metric/ws/DomainsActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/metric/ws/MetricsWsModuleTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/metric/ws/MetricsWsTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/metric/ws/SearchActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/metric/ws/TypesActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/metric/ws/UpdateActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/notification/DefaultNotificationManagerTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/notification/NotificationCenterTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/notification/NotificationChannelTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/notification/NotificationDaemonTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/notification/NotificationDispatcherMetadataTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/notification/NotificationDispatcherTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/notification/NotificationModuleTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/notification/NotificationTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/notification/email/AlertsEmailTemplateTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/notification/email/EmailNotificationChannelTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/notification/ws/AddActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/notification/ws/ListActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/notification/ws/NotificationWsModuleTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/notification/ws/NotificationsWsTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/notification/ws/RemoveActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/organization/BillingValidationsProxyImplTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/organization/DefaultOrganizationEnforcerTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/organization/DefaultOrganizationProviderImplTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/organization/DefaultOrganizationTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/organization/OrganizationCreationImplTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/organization/OrganizationFlagsImplTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/organization/OrganizationValidationImplTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/organization/TestDefaultOrganizationProvider.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/organization/TestOrganizationFlags.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/organization/ws/AddMemberActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/organization/ws/CreateActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/organization/ws/DeleteActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/organization/ws/EnableSupportActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/organization/ws/OrganizationsWsModuleTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/organization/ws/OrganizationsWsTestSupport.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/organization/ws/RemoveMemberActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/organization/ws/SearchActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/organization/ws/SearchMembersActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/organization/ws/SearchMyOrganizationsActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/organization/ws/UpdateActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/organization/ws/UpdateProjectVisibilityActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/permission/ApplyPermissionTemplateQueryTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/permission/GroupPermissionChangerTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/permission/PermissionTemplateServiceTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/permission/UserPermissionChangerTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/permission/index/AuthorizationTypeSupportTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/permission/index/FooIndex.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/permission/index/FooIndexDefinition.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/permission/index/FooIndexer.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/permission/index/PermissionIndexerDaoTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/permission/index/PermissionIndexerTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/permission/index/PermissionIndexerTester.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/permission/ws/AddGroupActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/permission/ws/AddUserActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/permission/ws/BasePermissionWsTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/permission/ws/GroupsActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/permission/ws/PermissionsWsModuleTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/permission/ws/PermissionsWsTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/permission/ws/RemoveGroupActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/permission/ws/RemoveUserActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/permission/ws/SearchGlobalPermissionsActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/permission/ws/SearchProjectPermissionsActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/permission/ws/SearchProjectPermissionsDataTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/permission/ws/UsersActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/permission/ws/template/AddGroupToTemplateActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/permission/ws/template/AddProjectCreatorToTemplateActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/permission/ws/template/AddUserToTemplateActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/permission/ws/template/ApplyTemplateActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/permission/ws/template/BulkApplyTemplateActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/permission/ws/template/CreateTemplateActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/permission/ws/template/DefaultTemplatesResolverImplTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/permission/ws/template/DefaultTemplatesResolverRule.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/permission/ws/template/DeleteTemplateActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/permission/ws/template/PermissionTemplateDtoToPermissionTemplateResponseTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/permission/ws/template/RemoveGroupFromTemplateActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/permission/ws/template/RemoveProjectCreatorFromTemplateActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/permission/ws/template/RemoveUserFromTemplateActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/permission/ws/template/SearchTemplatesActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/permission/ws/template/SearchTemplatesDataTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/permission/ws/template/SetDefaultTemplateActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/permission/ws/template/TemplateGroupsActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/permission/ws/template/TemplateUsersActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/permission/ws/template/UpdateTemplateActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/platform/BackendCleanupTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/platform/ClassLoaderUtilsTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/platform/DatabaseServerCompatibilityTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/platform/DefaultServerUpgradeStatusTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/platform/PersistentSettingsTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/platform/ServerIdGeneratorTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/platform/ServerIdLoaderTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/platform/ServerIdManagerTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/platform/ServerImplTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/platform/ServerLifecycleNotifierTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/platform/ServerLoggingTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/platform/ServerTesterPlatform.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/platform/SettingsChangeNotifierTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/platform/StartupMetadataPersisterTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/platform/StartupMetadataProviderTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/platform/TempFolderProviderTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/platform/UrlSettingsTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/platform/cluster/ClusterImplTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/platform/cluster/ClusterMock.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/platform/db/CheckDatabaseCharsetAtStartupTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/platform/db/EmbeddedDatabaseFactoryTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/platform/db/EmbeddedDatabaseTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/platform/db/migration/AutoDbMigrationTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/platform/db/migration/DatabaseMigrationExecutorServiceAdaptor.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/platform/db/migration/DatabaseMigrationImplAsynchronousTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/platform/db/migration/DatabaseMigrationImplConcurrentAccessTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/platform/db/migration/DatabaseMigrationImplTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/platform/monitoring/BaseMonitorMBeanTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/platform/monitoring/DatabaseMonitorTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/platform/monitoring/EsMonitorTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/platform/monitoring/FakeMonitor.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/platform/monitoring/FakeMonitorMBean.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/platform/monitoring/JvmPropsMonitorTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/platform/monitoring/PluginsMonitorTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/platform/monitoring/SettingsMonitorTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/platform/monitoring/SonarQubeMonitorTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/platform/monitoring/SystemMonitorTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/platform/platformlevel/PlatformLevel1Test.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/platform/platformlevel/PlatformLevel2Test.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/platform/web/MasterServletFilterTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/platform/web/RedirectFilterTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/platform/web/RootFilterTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/platform/web/SecurityServletFilterTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/platform/web/WebPagesFilterTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/platform/web/requestid/HttpRequestIdModuleTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/platform/web/requestid/RequestIdConfigurationTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/platform/web/requestid/RequestIdFilterTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/platform/web/requestid/RequestIdGeneratorImplTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/platform/ws/ChangeLogLevelActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/platform/ws/DbMigrationStatusActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/platform/ws/IndexActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/platform/ws/InfoActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/platform/ws/LogsActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/platform/ws/MigrateDbActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/platform/ws/PingActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/platform/ws/RestartActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/platform/ws/ServerWsTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/platform/ws/StatusActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/platform/ws/SystemWsTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/platform/ws/UpgradesActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/plugins/InstalledPluginReferentialFactoryTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/plugins/PluginDownloaderTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/plugins/PluginReferentialMetadataConverterTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/plugins/ServerPluginJarExploderTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/plugins/ServerPluginRepositoryTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/plugins/StaticResourcesServletTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/plugins/TestPluginA.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/plugins/TestProjectUtils.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/plugins/UpdateCenterClientTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/plugins/UpdateCenterMatrixFactoryTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/plugins/UpdateCenterServlet.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/plugins/privileged/PrivilegedPluginsBootstraperTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/plugins/privileged/PrivilegedPluginsStopperTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/plugins/ws/AbstractUpdateCenterBasedPluginsWsActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/plugins/ws/AvailableActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/plugins/ws/CancelAllActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/plugins/ws/InstallActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/plugins/ws/InstalledActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/plugins/ws/PendingActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/plugins/ws/PluginUpdateAggregateBuilderTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/plugins/ws/PluginUpdateAggregatorTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/plugins/ws/PluginWSCommonsTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/plugins/ws/PluginsWsTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/plugins/ws/UninstallActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/plugins/ws/UpdateActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/plugins/ws/UpdatesActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/project/ws/BulkDeleteActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/project/ws/BulkUpdateKeyActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/project/ws/CreateActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/project/ws/DeleteActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/project/ws/GhostsActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/project/ws/IndexActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/project/ws/ProjectsWsModuleTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/project/ws/ProvisionedActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/project/ws/SearchActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/project/ws/SearchMyProjectsActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/project/ws/SearchMyProjectsDataLoaderTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/project/ws/SearchMyProjectsDataTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/project/ws/UpdateKeyActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/project/ws/UpdateVisibilityActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/projectanalysis/ProjectAnalysisModuleTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/projectanalysis/ws/CreateEventActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/projectanalysis/ws/DeleteActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/projectanalysis/ws/DeleteEventActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/projectanalysis/ws/EventValidatorTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/projectanalysis/ws/SearchActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/projectanalysis/ws/UpdateEventActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/projectlink/ws/CreateActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/projectlink/ws/DeleteActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/projectlink/ws/ProjectLinksWsModuleTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/projectlink/ws/ProjectLinksWsTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/projectlink/ws/SearchActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/projecttag/ws/ProjectTagsWsModuleTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/projecttag/ws/ProjectTagsWsTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/projecttag/ws/SearchActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/projecttag/ws/SetActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/property/InternalPropertiesImplTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/property/ws/IndexActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/qualitygate/QgateProjectFinderTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/qualitygate/QualityGateConditionsUpdaterTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/qualitygate/QualityGateFinderTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/qualitygate/QualityGateModuleTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/qualitygate/QualityGateUpdaterTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/qualitygate/QualityGatesTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/qualitygate/RegisterQualityGatesTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/qualitygate/ws/AppActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/qualitygate/ws/CreateActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/qualitygate/ws/CreateConditionActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/qualitygate/ws/DeselectActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/qualitygate/ws/GetByProjectActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/qualitygate/ws/ProjectStatusActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/qualitygate/ws/QualityGateDetailsFormatterTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/qualitygate/ws/QualityGatesWsTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/qualitygate/ws/SelectActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/qualitygate/ws/UpdateConditionActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/qualityprofile/ActiveRuleChangeTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/qualityprofile/BuiltInQProfileInsertImplTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/qualityprofile/BuiltInQProfileLoaderTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/qualityprofile/BuiltInQProfileRepositoryImplTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/qualityprofile/BuiltInQProfileRepositoryRule.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/qualityprofile/BuiltInQProfileUpdateImplTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/qualityprofile/BuiltInQualityProfilesNotificationDispatcherTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/qualityprofile/BuiltInQualityProfilesNotificationTemplateTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/qualityprofile/BuiltInQualityProfilesNotificationTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/qualityprofile/BuiltInQualityProfilesUpdateListenerTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/qualityprofile/QProfileBackuperImplTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/qualityprofile/QProfileComparisonMediumTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/qualityprofile/QProfileCopierTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/qualityprofile/QProfileExportersTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/qualityprofile/QProfileFactoryImplTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/qualityprofile/QProfileTesting.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/qualityprofile/QualityProfileTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/qualityprofile/RegisterQualityProfilesMediumTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/qualityprofile/RegisterQualityProfilesNotificationTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/qualityprofile/RegisterQualityProfilesTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/qualityprofile/RuleActivatorTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/qualityprofile/index/ActiveRuleIndexerTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/qualityprofile/ws/ActivateRuleActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/qualityprofile/ws/ActivateRulesActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/qualityprofile/ws/AddProjectActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/qualityprofile/ws/BackupActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/qualityprofile/ws/ChangeParentActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/qualityprofile/ws/ChangelogActionDatabaseTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/qualityprofile/ws/ChangelogActionMockTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/qualityprofile/ws/ChangelogLoaderTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/qualityprofile/ws/CompareActionMediumTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/qualityprofile/ws/CompareActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/qualityprofile/ws/CopyActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/qualityprofile/ws/CreateActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/qualityprofile/ws/DeactivateRuleActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/qualityprofile/ws/DeactivateRulesActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/qualityprofile/ws/DeleteActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/qualityprofile/ws/ExportActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/qualityprofile/ws/ExportersActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/qualityprofile/ws/ImportersActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/qualityprofile/ws/InheritanceActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/qualityprofile/ws/ProfilesWsTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/qualityprofile/ws/ProjectsActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/qualityprofile/ws/QProfileReferenceTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/qualityprofile/ws/QProfileWsSupportTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/qualityprofile/ws/QProfilesWsMediumTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/qualityprofile/ws/QProfilesWsModuleTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/qualityprofile/ws/QProfilesWsTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/qualityprofile/ws/RemoveProjectActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/qualityprofile/ws/RenameActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/qualityprofile/ws/RestoreActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/qualityprofile/ws/RestoreBuiltInActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/qualityprofile/ws/SearchActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/qualityprofile/ws/SetDefaultActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/qualityprofile/ws/ShowActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/root/ws/RootsWsModuleTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/root/ws/RootsWsTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/root/ws/SearchActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/root/ws/SetRootActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/root/ws/UnsetRootActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/rule/CachingRuleFinderTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/rule/CommonRuleKeysTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/rule/DefaultRuleFinderTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/rule/DeprecatedRulesDefinitionLoaderTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/rule/RegisterRulesMediumTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/rule/RegisterRulesTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/rule/RuleCreatorTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/rule/RuleDefinitionsLoaderTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/rule/RuleTagHelperTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/rule/RuleUpdaterTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/rule/WebServerRuleFinderImplTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/rule/index/RuleIndexDefinitionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/rule/index/RuleIndexTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/rule/index/RuleIndexerTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/rule/ws/ActiveRuleCompleterTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/rule/ws/AppActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/rule/ws/CreateActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/rule/ws/DeleteActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/rule/ws/ListActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/rule/ws/RepositoriesActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/rule/ws/RuleQueryFactoryTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/rule/ws/SearchActionMediumTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/rule/ws/SearchActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/rule/ws/ShowActionMediumTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/rule/ws/ShowActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/rule/ws/TagsActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/rule/ws/UpdateActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/search/BaseDocTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/search/EsSearchModuleTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/search/FacetValueTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/serverid/ws/GenerateActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/serverid/ws/ServerIdWsModuleTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/serverid/ws/ServerIdWsTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/serverid/ws/ShowActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/setting/DatabaseSettingLoaderTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/setting/DatabaseSettingsEnablerTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/setting/NopSettingLoaderTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/setting/ProjectSettingsFactoryTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/setting/ThreadLocalSettingsTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/setting/ws/CheckSecretKeyActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/setting/ws/EncryptActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/setting/ws/GenerateSecretKeyActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/setting/ws/ListDefinitionsActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/setting/ws/ResetActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/setting/ws/ScannerSettingsTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/setting/ws/SetActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/setting/ws/SettingsFinderTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/setting/ws/SettingsUpdaterTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/setting/ws/SettingsWsModuleTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/setting/ws/ValuesActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/source/DecorationDataHolderTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/source/HtmlSourceDecoratorTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/source/HtmlTextDecoratorTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/source/OpeningHtmlTagTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/source/SourceServiceTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/source/index/FileSourceTesting.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/source/ws/HashActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/source/ws/IndexActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/source/ws/LinesActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/source/ws/RawActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/source/ws/ScmActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/source/ws/ShowActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/source/ws/SourcesWsTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/startup/DeleteOldAnalysisReportsFromFsTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/startup/DisplayLogOnDeprecatedProjectsTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/startup/GeneratePluginIndexTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/startup/LogServerIdTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/startup/RegisterMetricsTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/startup/RegisterPermissionTemplatesTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/startup/RegisterServletFiltersTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/startup/RenameDeprecatedPropertyKeysTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/test/db/TestTesting.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/test/index/TestIndexTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/test/index/TestIndexerTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/test/index/TestResultSetIteratorTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/test/ws/CoveredFilesActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/test/ws/ListActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/test/ws/TestsWsTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/tester/AbstractMockUserSession.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/tester/AnonymousMockUserSession.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/tester/AttributeHolderServletContext.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/tester/AttributeHolderServletContextTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/tester/MockUserSession.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/tester/MockUserSessionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/tester/ServerTester.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/tester/UserSessionRule.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/tester/package-info.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/text/MacroInterpreterTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/ui/DeprecatedViewsTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/ui/PageDecorationsTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/ui/PageRepositoryTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/ui/VersionFormatterTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/ui/ws/ComponentActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/ui/ws/GlobalActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/ui/ws/NavigationWsModuleTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/ui/ws/OrganizationActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/ui/ws/SettingsActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/updatecenter/UpdateCenterModuleTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/updatecenter/ws/InstalledPluginsActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/updatecenter/ws/UpdateCenterWsTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/updatecenter/ws/UploadActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/user/CompatibilityRealmTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/user/DefaultUserTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/user/DeprecatedUserFinderTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/user/DoPrivilegedTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/user/ExternalIdentityTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/user/NewUserNotifierTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/user/NewUserTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/user/SecurityRealmFactoryTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/user/ServerUserSessionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/user/TestUserSessionFactory.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/user/ThreadLocalUserSessionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/user/UserSessionFilterTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/user/UserUpdaterTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/user/index/UserIndexDefinitionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/user/index/UserIndexTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/user/index/UserIndexerTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/user/ws/ChangePasswordActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/user/ws/CreateActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/user/ws/CurrentActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/user/ws/DeactivateActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/user/ws/GroupsActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/user/ws/IdentityProvidersActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/user/ws/SearchActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/user/ws/SkipOnboardingTutorialActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/user/ws/UpdateActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/user/ws/UserPropertiesWsTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/user/ws/UsersWsModuleTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/user/ws/UsersWsTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/usergroups/DefaultGroupCreatorImplTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/usergroups/DefaultGroupFinderTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/usergroups/ws/AddUserActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/usergroups/ws/CreateActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/usergroups/ws/DeleteActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/usergroups/ws/GroupWsRefTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/usergroups/ws/RemoveUserActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/usergroups/ws/SearchActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/usergroups/ws/UpdateActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/usergroups/ws/UserGroupsModuleTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/usergroups/ws/UserGroupsWsTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/usergroups/ws/UsersActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/usertoken/TokenGeneratorImplTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/usertoken/UserTokenAuthenticatorTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/usertoken/UserTokenModuleTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/usertoken/ws/GenerateActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/usertoken/ws/RevokeActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/usertoken/ws/SearchActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/usertoken/ws/UserTokensWsTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/util/AbstractStoppableExecutorServiceTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/util/BooleanTypeValidationTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/util/DateCollectorTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/util/FloatTypeValidationTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/util/IntegerTypeValidationTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/util/LongTypeValidationTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/util/MetricKeyValidatorTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/util/ObjectInputStreamIteratorTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/util/OkHttpClientProviderTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/util/RubyUtilsTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/util/StringListTypeValidationTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/util/StringTypeValidationTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/util/TextTypeValidationTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/util/TypeValidationModuleTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/util/TypeValidationsTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/util/TypeValidationsTesting.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/util/WrapInSingleElementArray.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/util/cache/DiskCacheTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/util/cache/MemoryCacheTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/view/index/ViewIndexDefinitionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/view/index/ViewIndexTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/view/index/ViewIndexerTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/webhook/ws/WebhookDeliveriesActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/webhook/ws/WebhookDeliveryActionTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/webhook/ws/WebhooksWsModuleTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/webhook/ws/WebhooksWsTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/ws/DeprecatedPropertiesWsFilterTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/ws/DumbResponse.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/ws/RemovedWebServiceHandlerTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/ws/ServletRequestTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/ws/ServletResponseTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/ws/TestRequest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/ws/TestResponse.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/ws/WebServiceEngineTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/ws/WebServiceFilterTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/ws/WebServiceReroutingFilterTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/ws/WsActionTester.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/ws/WsTester.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/ws/WsUtilsTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/ws/ws/WebServicesWsModuleTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/java/org/sonar/server/ws/ws/WebServicesWsTest.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/projects/.gitignore (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/projects/README.txt (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/projects/fake-report-plugin/pom.xml (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/projects/fake-report-plugin/src/BasePlugin.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/projects/fake-report-plugin/src/org/sonar/plugins/testbase/api/BaseApi.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/projects/fake-report-plugin/target/fake-report-plugin-0.1-SNAPSHOT.jar (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/projects/fake-sqale-plugin/pom.xml (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/projects/fake-sqale-plugin/src/BasePlugin.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/projects/fake-sqale-plugin/src/org/sonar/plugins/testbase/api/BaseApi.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/projects/fake-sqale-plugin/target/fake-sqale-plugin-0.1-SNAPSHOT.jar (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/projects/fake-views-plugin/pom.xml (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/projects/fake-views-plugin/src/BasePlugin.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/projects/fake-views-plugin/src/org/sonar/plugins/testbase/api/BaseApi.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/projects/fake-views-plugin/target/fake-views-plugin-0.1-SNAPSHOT.jar (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/projects/pom.xml (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/projects/test-base-plugin-v2/pom.xml (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/projects/test-base-plugin-v2/src/BasePlugin.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/projects/test-base-plugin-v2/src/org/sonar/plugins/testbase/api/BaseApi.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/projects/test-base-plugin-v2/target/test-base-plugin-0.2-SNAPSHOT.jar (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/projects/test-base-plugin/pom.xml (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/projects/test-base-plugin/src/BasePlugin.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/projects/test-base-plugin/src/org/sonar/plugins/testbase/api/BaseApi.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/projects/test-base-plugin/target/test-base-plugin-0.1-SNAPSHOT.jar (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/projects/test-core-plugin/pom.xml (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/projects/test-core-plugin/src/CorePlugin.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/projects/test-core-plugin/target/test-core-plugin-0.1-SNAPSHOT.jar (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/projects/test-extend-plugin/pom.xml (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/projects/test-extend-plugin/src/ExtendPlugin.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/projects/test-extend-plugin/target/test-extend-plugin-0.1-SNAPSHOT.jar (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/projects/test-libs-plugin/pom.xml (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/projects/test-libs-plugin/src/LibsPlugin.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/projects/test-libs-plugin/target/test-libs-plugin-0.1-SNAPSHOT.jar (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/projects/test-require-plugin/pom.xml (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/projects/test-require-plugin/src/RequirePlugin.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/projects/test-require-plugin/target/test-require-plugin-0.1-SNAPSHOT.jar (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/projects/test-requirenew-plugin/pom.xml (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/projects/test-requirenew-plugin/src/RequirePlugin.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/projects/test-requirenew-plugin/target/test-requirenew-plugin-0.1-SNAPSHOT.jar (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/batch/ProjectActionTest/project_referentials.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/component/ws/AppActionTest/app.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/component/ws/AppActionTest/app_with_it_measure.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/component/ws/AppActionTest/app_with_measures.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/component/ws/AppActionTest/app_with_overall_measure.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/component/ws/AppActionTest/app_with_ut_measure.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest/v1/1235_add_component_uuid_to_duplications_index.rb (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest/v1/1236_populate_component_uuid_of_duplications_index.rb (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest/v1/1238_make_component_uuid_not_null_on_duplications_index.rb (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest/v1/1239_add_analysis_uuid_to_duplications_index.rb (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest/v1/1240_populate_analysis_uuid_of_duplications_index.rb (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest/v1/1242_make_analysis_uuid_not_null_on_duplications_index.rb (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest/v1/AddAnalysisUuidColumnToDuplicationsIndex.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest/v1/AddComponentUuidColumnToDuplicationsIndex.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest/v1/DeleteOrphanDuplicationsIndexRowsWithoutComponent.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest/v1/MakeComponentUuidNotNullOnDuplicationsIndex.java (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/computation/task/projectanalysis/issue/ScmAccountToUserLoaderTest/charlie.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/computation/task/projectanalysis/issue/ScmAccountToUserLoaderTest/charlie_conflict.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/computation/task/projectanalysis/issue/SourceLinesCacheTest/load_data.xml (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/computation/task/projectanalysis/measure/MeasureRepositoryImplTest/shared.xml (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/computation/task/projectanalysis/measure/MetricCacheTest/metrics.xml (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/computation/task/projectanalysis/metric/MetricRepositoryImplTest/shared.xml (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/CustomMeasuresCopyStepTest/report-custom-measures.xml (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/CustomMeasuresCopyStepTest/view-custom-measures.xml (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/IndexSourceLinesStepTest/index_source.xml (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/IndexTestsStepTest/index_source.xml (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/LoadPeriodsStepTest/empty.xml (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/LoadPeriodsStepTest/no_previous_version.xml (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/LoadPeriodsStepTest/previous_version_deleted.xml (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/LoadPeriodsStepTest/previous_version_is_last_one.xml (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/LoadPeriodsStepTest/shared.xml (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/LoadPeriodsStepTest/unprocessed_snapshots.xml (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistDuplicationMeasuresStepTest/persist_duplication_on_same_file-result.xml (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistDuplicationMeasuresStepTest/persist_duplication_on_same_file.xml (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistEventsStepTest/add_events-result.xml (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistEventsStepTest/add_version_event-result.xml (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistEventsStepTest/empty.xml (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistEventsStepTest/keep_one_event_by_version-result.xml (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistEventsStepTest/keep_one_event_by_version.xml (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistEventsStepTest/nothing_to_do_when_no_events_in_report.xml (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistEventsStepTest/persist_report_events_with_component_children-result.xml (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistIssuesStepTest/add_change-result.xml (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistIssuesStepTest/add_comment-result.xml (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistIssuesStepTest/close_issue-result.xml (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistIssuesStepTest/insert_new_issue.xml (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistIssuesStepTest/shared.xml (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistMeasuresStepTest/shared.xml (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistNumberOfDaysSinceLastCommitStepTest/empty.xml (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistNumberOfDaysSinceLastCommitStepTest/insert-from-index-result.xml (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistNumberOfDaysSinceLastCommitStepTest/insert-from-report-result.xml (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistProjectLinksStepTest/add_links_on_project_and_module-result.xml (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistProjectLinksStepTest/delete_link.xml (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistProjectLinksStepTest/empty.xml (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistProjectLinksStepTest/not_delete_custom_link.xml (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistProjectLinksStepTest/nothing_to_do_when_link_already_exists.xml (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistProjectLinksStepTest/update_link-result.xml (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistProjectLinksStepTest/update_link.xml (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/ReportExtractionStepTest/demozip.zip (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/SwitchSnapshotStepTest/empty.xml (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/SwitchSnapshotStepTest/snapshots-result.xml (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/SwitchSnapshotStepTest/snapshots.xml (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/computation/task/projectanalysis/webhook/WebhookPayloadTest/failed.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/computation/task/projectanalysis/webhook/WebhookPayloadTest/gate_condition_without_value.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/computation/task/projectanalysis/webhook/WebhookPayloadTest/success.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/computation/task/projectanalysis/webhook/WebhookPayloadTest/with_analysis_properties.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/debt/DebtCharacteristicsXMLImporterTest/convert_network_use_key.xml (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/debt/DebtCharacteristicsXMLImporterTest/fail_on_bad_xml.xml (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/debt/DebtCharacteristicsXMLImporterTest/import_badly_formatted_xml.xml (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/debt/DebtCharacteristicsXMLImporterTest/import_characteristics.xml (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/debt/DebtModelPluginRepositoryTest/csharp-model.xml (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/debt/DebtModelPluginRepositoryTest/java-model.xml (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/debt/DebtModelXMLExporterTest/export_xml.xml (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/convert_constant_per_issue_with_coefficient_by_constant_per_issue_with_offset.xml (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/convert_deprecated_linear_with_threshold_function_by_linear_function.xml (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/convert_network_use_key.xml (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/fail_on_bad_xml.xml (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/ignore_deprecated_constant_per_file_function.xml (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/ignore_invalid_value.xml (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/ignore_remediation_cost_having_zero_value.xml (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/ignore_rule_on_root_characteristics.xml (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/import_badly_formatted_xml.xml (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/import_constant_issue.xml (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/import_linear.xml (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/import_linear_having_offset_to_zero.xml (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/import_linear_with_offset.xml (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/import_rules.xml (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/import_rules_with_deprecated_quality_model_format.xml (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/read_integer.xml (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/replace_mn_by_min.xml (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/use_default_unit_when_no_unit.xml (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/duplication/ws/DuplicationsParserTest/complex_duplication.xml (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/duplication/ws/DuplicationsParserTest/duplication_on_removed_file.xml (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/duplication/ws/DuplicationsParserTest/duplication_on_same_file.xml (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/duplication/ws/DuplicationsParserTest/duplication_on_same_project.xml (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/duplication/ws/DuplicationsParserTest/duplications_on_different_project.xml (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/duplication/ws/DuplicationsParserTest/duplications_on_many_blocks.xml (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/issue/IssueStorageTest/should_insert_new_issues-result.xml (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/issue/IssueStorageTest/should_resolve_conflicts_on_updates-result.xml (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/issue/IssueStorageTest/should_resolve_conflicts_on_updates.xml (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/issue/IssueStorageTest/should_update_issues-result.xml (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/issue/IssueStorageTest/should_update_issues.xml (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/issue/ServerIssueStorageTest/empty.xml (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/issue/ServerIssueStorageTest/load_component_id_from_db.xml (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/issue/ServerIssueStorageTest/load_project_id_from_db.xml (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/issue/ServerIssueStorageTest/should_insert_new_issues-result.xml (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/issue/ServerIssueStorageTest/should_insert_new_issues.xml (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/issue/ServerIssueStorageTest/should_update_issues-result.xml (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/issue/ServerIssueStorageTest/should_update_issues.xml (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/issue/index/IssueIndexerTest/index.xml (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/issue/index/IssueIndexerTest/index_project.xml (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/issue/index/IssueIteratorFactoryTest/extract_directory_path.xml (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/issue/index/IssueIteratorFactoryTest/extract_file_path.xml (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/issue/index/IssueIteratorFactoryTest/many_projects.xml (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/issue/index/IssueIteratorFactoryTest/one_issue.xml (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/issue/index/IssueIteratorFactoryTest/shared.xml (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/issue/notification/IssueChangesEmailTemplateTest/display_component_key_if_no_component_name.txt (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/issue/notification/IssueChangesEmailTemplateTest/email_should_display_resolution_change.txt (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/issue/notification/IssueChangesEmailTemplateTest/email_with_action_plan_change.txt (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/issue/notification/IssueChangesEmailTemplateTest/email_with_assignee_change.txt (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/issue/notification/IssueChangesEmailTemplateTest/email_with_multiple_changes.txt (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/issue/notification/MyNewIssuesEmailTemplateTest/email_with_all_details.txt (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/issue/notification/MyNewIssuesEmailTemplateTest/email_with_no_assignee_tags_components.txt (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/issue/notification/NewIssuesEmailTemplateTest/email_with_all_details.txt (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/issue/notification/NewIssuesEmailTemplateTest/email_with_partial_details.txt (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/issue/ws/ComponentTagsActionTest/component-tags.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/issue/ws/SearchActionComponentsMediumTest/display_directory_facet.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/issue/ws/SearchActionComponentsMediumTest/display_file_facet.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/issue/ws/SearchActionComponentsMediumTest/display_module_facet.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/issue/ws/SearchActionComponentsMediumTest/display_non_sticky_project_facet.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/issue/ws/SearchActionComponentsMediumTest/display_sticky_project_facet.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/issue/ws/SearchActionComponentsMediumTest/issues_on_different_projects.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/issue/ws/SearchActionComponentsMediumTest/no_issue.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/issue/ws/SearchActionComponentsMediumTest/search_by_authors.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/issue/ws/SearchActionComponentsMediumTest/search_by_developer.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/issue/ws/SearchActionComponentsMediumTest/search_by_directory_uuid.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/issue/ws/SearchActionComponentsMediumTest/search_by_file_key.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/issue/ws/SearchActionComponentsMediumTest/search_by_file_uuid.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/issue/ws/SearchActionComponentsMediumTest/search_by_project_uuid.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/issue/ws/SearchActionComponentsMediumTest/search_by_test_key.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/issue/ws/SearchActionComponentsMediumTest/search_by_view_uuid.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/issue/ws/SearchActionComponentsMediumTest/search_since_leak_period.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/issue/ws/SearchActionMediumTest/apply_paging_with_multiple_components.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/issue/ws/SearchActionMediumTest/apply_paging_with_one_component.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/issue/ws/SearchActionMediumTest/assignedToMe_facet_must_escape_login_of_authenticated_user.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/issue/ws/SearchActionMediumTest/assigned_to_me_facet_sticky.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/issue/ws/SearchActionMediumTest/components_contains_sub_projects.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/issue/ws/SearchActionMediumTest/default_page_size_is_100.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/issue/ws/SearchActionMediumTest/deprecated_paging.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/issue/ws/SearchActionMediumTest/display_deprecated_debt_fields.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/issue/ws/SearchActionMediumTest/display_facets.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/issue/ws/SearchActionMediumTest/display_facets_effort.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/issue/ws/SearchActionMediumTest/display_zero_facets.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/issue/ws/SearchActionMediumTest/empty_result.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/issue/ws/SearchActionMediumTest/filter_by_assigned_to_me.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/issue/ws/SearchActionMediumTest/hide_rules.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/issue/ws/SearchActionMediumTest/ignore_paging_with_one_component.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/issue/ws/SearchActionMediumTest/issue_on_removed_file.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/issue/ws/SearchActionMediumTest/issue_with_comment_hidden.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/issue/ws/SearchActionMediumTest/issue_with_comments.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/issue/ws/SearchActionMediumTest/load_additional_fields.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/issue/ws/SearchActionMediumTest/load_additional_fields_with_issue_admin_permission.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/issue/ws/SearchActionMediumTest/no_issue.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/issue/ws/SearchActionMediumTest/paging.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/issue/ws/SearchActionMediumTest/paging_with_page_size_to_minus_one.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/issue/ws/SearchActionMediumTest/response_contains_all_fields_except_additional_fields.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/issue/ws/SearchActionMediumTest/sort_by_updated_at.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/language/ws/LanguageWsTest/list.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/language/ws/LanguageWsTest/list_filtered_key.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/language/ws/LanguageWsTest/list_filtered_name.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/language/ws/LanguageWsTest/list_limited.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/measure/custom/ws/CreateActionTest/custom-measure.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/measure/custom/ws/MetricsActionTest/metrics.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/measure/custom/ws/SearchActionTest/custom-measures.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/measure/custom/ws/SearchActionTest/empty.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/measure/custom/ws/UpdateActionTest/custom-measure.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/metric/DefaultMetricFinderTest/shared.xml (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/metric/ws/CreateActionTest/metric.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/metric/ws/SearchActionTest/search_metrics.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/metric/ws/UpdateActionTest/metric.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/permission/ws/GroupsActionTest/groups.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/permission/ws/SearchProjectPermissionsActionTest/display_all_project_permissions.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/permission/ws/SearchProjectPermissionsActionTest/empty.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/permission/ws/UsersActionTest/search_for_users_is_paginated.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/permission/ws/UsersActionTest/users.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/permission/ws/template/SearchTemplatesActionTest/display_all_project_permissions.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/permission/ws/template/SearchTemplatesActionTest/empty.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/platform/BackendCleanupTest/shared.xml (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/platform/ClassLoaderUtilsTest/ClassLoaderUtilsTest.jar (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/platform/ServerImplTest/build.properties (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/platform/ServerImplTest/empty-version.txt (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/platform/ServerImplTest/version.txt (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/platform/web/WebPagesFilterTest/index.html (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/plugins/ws/AvailableActionTest/properties_per_plugin.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/plugins/ws/InstalledActionTest/some.jar (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/project/ws/IndexActionTest/empty.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/project/ws/IndexActionTest/return_only_projects_authorized_for_user.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/project/ws/IndexActionTest/search_project_by_id.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/project/ws/IndexActionTest/search_project_by_key.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/project/ws/IndexActionTest/search_projects.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/project/ws/IndexActionTest/search_projects_by_name.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/project/ws/IndexActionTest/search_projects_with_modules.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/project/ws/IndexActionTest/search_projects_with_modules_by_name.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/property/ws/IndexActionTest/does_not_fail_when_user_has_not_project_browse_permission.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/property/ws/IndexActionTest/does_not_returned_secured_and_license_settings_in_property_set_when_not_authenticated.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/property/ws/IndexActionTest/does_not_returned_secured_and_license_settings_when_not_authenticated.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/property/ws/IndexActionTest/empty.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_all_project_settings_when_component_and_no_key.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_all_settings_when_no_component_and_no_key.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_default_values.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_global_values.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_inherited_values_on_global_setting.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_inherited_values_on_module.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_license_with_hash_settings_when_authenticated_but_not_admin.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_module_values.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_multi_value_with_coma.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_multi_values.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_only_one_setting_when_key_is_provided.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_project_values.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_property_set.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_secured_and_license_settings_in_property_set_when_system_admin.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_secured_and_license_settings_when_project_admin.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_secured_and_license_settings_when_system_admin.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_simple_value.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_values_even_if_no_property_definition.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/qualitygate/ws/ProjectStatusActionTest/measure_data.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/qualitygate/ws/QualityGateDetailsFormatterTest/non_leak_period.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/qualitygate/ws/QualityGateDetailsFormatterTest/quality_gate_details.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/qualityprofile/QProfileBackuperMediumTest/duplicates-xml-backup.xml (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_active_rules_with_inheritance/active_rule25.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_active_rules_with_inheritance/active_rule391.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_inactive_rules_sorted_ignoring_case/rule_A.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_inactive_rules_sorted_ignoring_case/rule_C.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_inactive_rules_sorted_ignoring_case/rule_b.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_inactive_rules_with_tags/active_rule_ace.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_inactive_rules_with_tags/active_rule_empty.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_inactive_rules_with_tags/tags_a.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_inactive_rules_with_tags/tags_ab.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_inactive_rules_with_tags/tags_ace.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_inactive_rules_with_tags/tags_bc.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_inactive_rules_with_tags/tags_empty.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/shared/active_rule25.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/shared/active_rule2702.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/shared/active_rule391.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/shared/active_rule523.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/shared/rule1482.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/shared/rule25.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/shared/rule719.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/shared/rule759.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/shared/rule860.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/shared/rule944.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/qualityprofile/ws/ChangelogActionMockTest/changelog_empty.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/qualityprofile/ws/ChangelogActionMockTest/changelog_full.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/qualityprofile/ws/ChangelogActionMockTest/changelog_nominal.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/qualityprofile/ws/CompareActionMediumTest/compare_nominal.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/qualityprofile/ws/CompareActionMediumTest/compare_param_on_left.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/qualityprofile/ws/CompareActionMediumTest/compare_param_on_right.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/qualityprofile/ws/CreateActionMediumTest/create-with-messages.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/qualityprofile/ws/CreateActionTest/test_json.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/qualityprofile/ws/InheritanceActionTest/inheritance-buWide.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/qualityprofile/ws/InheritanceActionTest/inheritance-simple.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/qualityprofile/ws/ProjectsActionTest/all.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/qualityprofile/ws/ProjectsActionTest/all_filtered.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/qualityprofile/ws/ProjectsActionTest/authorized_selected.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/qualityprofile/ws/ProjectsActionTest/deselected.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/qualityprofile/ws/ProjectsActionTest/empty.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/qualityprofile/ws/ProjectsActionTest/return_deprecated_uuid_field.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/qualityprofile/ws/ProjectsActionTest/selected_page1.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/qualityprofile/ws/ProjectsActionTest/selected_page2.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/qualityprofile/ws/ProjectsActionTest/selected_ps3_page1.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/qualityprofile/ws/ProjectsActionTest/selected_ps3_page2.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/qualityprofile/ws/QProfilesWsMediumTest/bulk_activate_rule.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/qualityprofile/ws/QProfilesWsMediumTest/bulk_activate_rule_not_all.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/qualityprofile/ws/RestoreActionTest/restore_profile.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/rule/RuleRegistryTest/shared/removed_rule.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/rule/RuleRegistryTest/shared/rule1.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/rule/RuleRegistryTest/shared/rule2.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/rule/RuleRegistryTest/shared/rule3.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/rule/ws/RepositoriesActionTest/repositories.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/rule/ws/RepositoriesActionTest/repositories_common.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/rule/ws/RepositoriesActionTest/repositories_sonar.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/rule/ws/RepositoriesActionTest/repositories_squid.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/rule/ws/RepositoriesActionTest/repositories_ws.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/rule/ws/RepositoriesActionTest/repositories_xoo.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/rule/ws/RuleSearchWsHandlerTest/search_rules.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/rule/ws/RuleShowWsHandlerTest/show_manuel_rule.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/rule/ws/RuleShowWsHandlerTest/show_rule.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/rule/ws/RuleShowWsHandlerTest/show_rule_with_dates.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/rule/ws/RuleShowWsHandlerTest/show_rule_with_note.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/rule/ws/RuleShowWsHandlerTest/show_rule_with_tags.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/filter_by_tags.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/get_note_as_markdown_and_html.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/return_mandatory_fields_even_when_setting_f_param.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/search_2_rules.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/search_2_rules_fields.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/search_active_rules.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/search_active_rules_params.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/search_debt_rules_with_default_and_overridden_debt_values.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/search_debt_rules_with_default_linear_offset_and_overridden_constant_debt.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/search_debt_rules_with_default_linear_offset_and_overridden_linear_debt.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/search_no_rules.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/search_profile_active_rules.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/search_profile_active_rules_inheritance.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/search_rules_from_template_key.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/search_rules_with_deprecated_fields.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/search_template_rules.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/severities_facet.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/statuses_facet.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/statuses_facet_sticky.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/rule/ws/ShowActionMediumTest/encode_html_description_of_custom_rule.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/rule/ws/ShowActionMediumTest/show_deprecated_rule_rem_function_fields.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/rule/ws/ShowActionMediumTest/show_rule.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/rule/ws/ShowActionMediumTest/show_rule_when_activated.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/rule/ws/ShowActionMediumTest/show_rule_with_default_and_overridden_debt_infos.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/rule/ws/ShowActionMediumTest/show_rule_with_default_debt_infos.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/rule/ws/ShowActionMediumTest/show_rule_with_no_default_and_no_overridden_debt.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/rule/ws/ShowActionMediumTest/show_rule_with_overridden_debt_infos.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/rule/ws/UpdateActionMediumTest/deprecated_remediation_function.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/rule/ws/UpdateActionMediumTest/update_custom_rule.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/source/ws/HashActionTest/no_source.xml (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/source/ws/HashActionTest/shared.xml (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/source/ws/HashActionTest/show_hashes_on_test_file.xml (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/source/ws/LinesActionTest/convert_deprecated_data.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/source/ws/LinesActionTest/display_deprecated_fields.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/source/ws/LinesActionTest/show_paginated_lines.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/source/ws/LinesActionTest/show_source.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/source/ws/LinesActionTest/show_source_by_file_key.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/source/ws/ScmActionTest/accept_negative_value_in_from_parameter.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/source/ws/ScmActionTest/group_lines_by_commit.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/source/ws/ScmActionTest/not_group_lines_by_commit.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/source/ws/ScmActionTest/return_empty_value_when_no_scm.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/source/ws/ScmActionTest/show_scm.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/source/ws/ScmActionTest/show_scm_from_given_range_lines.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/source/ws/ShowActionTest/show_source.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/source/ws/ShowActionTest/show_source_with_params_from_and_to.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/startup/RegisterMetricsTest/disable_undefined_metrics-result.xml (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/startup/RegisterMetricsTest/disable_undefined_metrics.xml (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/startup/RegisterMetricsTest/enable_disabled_metric-result.xml (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/startup/RegisterMetricsTest/enable_disabled_metric.xml (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/startup/RegisterMetricsTest/insert_new_metrics-result.xml (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/startup/RegisterMetricsTest/insert_new_metrics.xml (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/startup/RegisterMetricsTest/update_non_custom_metrics-result.xml (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/startup/RegisterMetricsTest/update_non_custom_metrics.xml (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/test/index/TestIndexerTest/P1_F1_T1.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/test/index/TestIndexerTest/P1_F1_T2.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/test/index/TestIndexerTest/P1_F2_T1.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/test/index/TestIndexerTest/P2_F3_T1.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/test/index/TestIndexerTest/db.xml (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/test/index/TestResultSetIteratorTest/filter_by_project.xml (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/test/index/TestResultSetIteratorTest/filter_by_project_and_date.xml (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/test/index/TestResultSetIteratorTest/schema.sql (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/test/index/TestResultSetIteratorTest/shared.xml (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/test/ws/CoveredFilesActionTest/tests-covered-files.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/test/ws/ListActionTest/list-main-file.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/test/ws/ListActionTest/list-test-uuid.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_bread_crumbs_on_several_levels.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_breadcrumbs_on_module.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_component_info_when_anonymous_no_snapshot.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_component_info_when_snapshot.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_component_info_with_favourite.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_configuration_for_admin.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_configuration_for_quality_gate_admin.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_configuration_for_quality_profile_admin.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_configuration_with_all_properties.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_default_quality_gate.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_empty_quality_profiles_when_no_measure.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_extensions.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_extensions_for_admin.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_quality_gate.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_quality_profiles.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/ui/ws/GlobalActionTest/deprecated_logo_settings.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/ui/ws/GlobalActionTest/empty.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/ui/ws/GlobalActionTest/global_pages.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/ui/ws/GlobalActionTest/organization_support.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/ui/ws/GlobalActionTest/production_database.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/ui/ws/GlobalActionTest/qualifiers.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/ui/ws/GlobalActionTest/settings.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/ui/ws/GlobalActionTest/version.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/ui/ws/SettingsActionTest/empty.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/ui/ws/SettingsActionTest/with_pages.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/ui/ws/SettingsActionTest/with_update_center.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/updatecenter/ws/UploadActionTest/anotherPlugin.jar (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/updatecenter/ws/UploadActionTest/plugin.jar (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/user/DeprecatedUserFinderTest/fixture.xml (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/user/ws/CreateActionTest/create_user.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/user/ws/CreateActionTest/reactivate_user.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/user/ws/SearchActionTest/five_users.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/user/ws/SearchActionTest/page_one.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/user/ws/SearchActionTest/page_two.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/user/ws/SearchActionTest/user_one.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/user/ws/SearchActionTest/user_with_groups.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/user/ws/UpdateActionTest/blank_email_is_updated_to_null.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/user/ws/UpdateActionTest/update_email.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/user/ws/UpdateActionTest/update_name.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/user/ws/UpdateActionTest/update_scm_accounts.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/user/ws/UpdateActionTest/update_user.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/view/index/ViewIndexerTest/index.xml (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/ws/ws/WebServicesWsTest/list_including_internals.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/ws/ws/WebServicesWsTest/metrics_example.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/ws/ws/WebServicesWsTest/response_example.json (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/ws/ws/web-service-engine-test.txt (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/org/sonar/server/ws/ws/web-services-ws-test.txt (100%) rename {sonarqube-6.5/server/sonar-server => sonar-server}/src/test/resources/static/foo.txt (100%) delete mode 100644 sonarqube-6.5/.gitignore delete mode 100644 sonarqube-6.5/README.md delete mode 100644 sonarqube-6.5/pom.xml delete mode 100644 sonarqube-6.5/server/pom.xml diff --git a/sonarqube-6.5/server/sonar-server/COPYING b/sonar-server/COPYING similarity index 100% rename from sonarqube-6.5/server/sonar-server/COPYING rename to sonar-server/COPYING diff --git a/sonarqube-6.5/server/sonar-server/pom.xml b/sonar-server/pom.xml similarity index 99% rename from sonarqube-6.5/server/sonar-server/pom.xml rename to sonar-server/pom.xml index 12161c004..debc9e324 100644 --- a/sonarqube-6.5/server/sonar-server/pom.xml +++ b/sonar-server/pom.xml @@ -5,7 +5,7 @@ org.sonarsource.sonarqube server 6.5 - .. + sonar-server SonarQube :: Server diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/ce/CeModule.java b/sonar-server/src/main/java/org/sonar/ce/CeModule.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/ce/CeModule.java rename to sonar-server/src/main/java/org/sonar/ce/CeModule.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/ce/http/CeHttpClient.java b/sonar-server/src/main/java/org/sonar/ce/http/CeHttpClient.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/ce/http/CeHttpClient.java rename to sonar-server/src/main/java/org/sonar/ce/http/CeHttpClient.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/ce/http/package-info.java b/sonar-server/src/main/java/org/sonar/ce/http/package-info.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/ce/http/package-info.java rename to sonar-server/src/main/java/org/sonar/ce/http/package-info.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/ce/log/CeLogging.java b/sonar-server/src/main/java/org/sonar/ce/log/CeLogging.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/ce/log/CeLogging.java rename to sonar-server/src/main/java/org/sonar/ce/log/CeLogging.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/ce/log/CeProcessLogging.java b/sonar-server/src/main/java/org/sonar/ce/log/CeProcessLogging.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/ce/log/CeProcessLogging.java rename to sonar-server/src/main/java/org/sonar/ce/log/CeProcessLogging.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/ce/log/package-info.java b/sonar-server/src/main/java/org/sonar/ce/log/package-info.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/ce/log/package-info.java rename to sonar-server/src/main/java/org/sonar/ce/log/package-info.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/ce/organization/DefaultOrganizationLoader.java b/sonar-server/src/main/java/org/sonar/ce/organization/DefaultOrganizationLoader.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/ce/organization/DefaultOrganizationLoader.java rename to sonar-server/src/main/java/org/sonar/ce/organization/DefaultOrganizationLoader.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/ce/organization/package-info.java b/sonar-server/src/main/java/org/sonar/ce/organization/package-info.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/ce/organization/package-info.java rename to sonar-server/src/main/java/org/sonar/ce/organization/package-info.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/ce/queue/CeQueue.java b/sonar-server/src/main/java/org/sonar/ce/queue/CeQueue.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/ce/queue/CeQueue.java rename to sonar-server/src/main/java/org/sonar/ce/queue/CeQueue.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/ce/queue/CeQueueImpl.java b/sonar-server/src/main/java/org/sonar/ce/queue/CeQueueImpl.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/ce/queue/CeQueueImpl.java rename to sonar-server/src/main/java/org/sonar/ce/queue/CeQueueImpl.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/ce/queue/CeTask.java b/sonar-server/src/main/java/org/sonar/ce/queue/CeTask.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/ce/queue/CeTask.java rename to sonar-server/src/main/java/org/sonar/ce/queue/CeTask.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/ce/queue/CeTaskResult.java b/sonar-server/src/main/java/org/sonar/ce/queue/CeTaskResult.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/ce/queue/CeTaskResult.java rename to sonar-server/src/main/java/org/sonar/ce/queue/CeTaskResult.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/ce/queue/CeTaskSubmit.java b/sonar-server/src/main/java/org/sonar/ce/queue/CeTaskSubmit.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/ce/queue/CeTaskSubmit.java rename to sonar-server/src/main/java/org/sonar/ce/queue/CeTaskSubmit.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/ce/queue/package-info.java b/sonar-server/src/main/java/org/sonar/ce/queue/package-info.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/ce/queue/package-info.java rename to sonar-server/src/main/java/org/sonar/ce/queue/package-info.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/ce/settings/ProjectConfigurationFactory.java b/sonar-server/src/main/java/org/sonar/ce/settings/ProjectConfigurationFactory.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/ce/settings/ProjectConfigurationFactory.java rename to sonar-server/src/main/java/org/sonar/ce/settings/ProjectConfigurationFactory.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/ce/settings/ProjectSettings.java b/sonar-server/src/main/java/org/sonar/ce/settings/ProjectSettings.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/ce/settings/ProjectSettings.java rename to sonar-server/src/main/java/org/sonar/ce/settings/ProjectSettings.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/ce/settings/SettingsLoader.java b/sonar-server/src/main/java/org/sonar/ce/settings/SettingsLoader.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/ce/settings/SettingsLoader.java rename to sonar-server/src/main/java/org/sonar/ce/settings/SettingsLoader.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/ce/settings/package-info.java b/sonar-server/src/main/java/org/sonar/ce/settings/package-info.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/ce/settings/package-info.java rename to sonar-server/src/main/java/org/sonar/ce/settings/package-info.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/ce/taskprocessor/CeTaskProcessor.java b/sonar-server/src/main/java/org/sonar/ce/taskprocessor/CeTaskProcessor.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/ce/taskprocessor/CeTaskProcessor.java rename to sonar-server/src/main/java/org/sonar/ce/taskprocessor/CeTaskProcessor.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/ce/taskprocessor/ReportTaskProcessorDeclaration.java b/sonar-server/src/main/java/org/sonar/ce/taskprocessor/ReportTaskProcessorDeclaration.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/ce/taskprocessor/ReportTaskProcessorDeclaration.java rename to sonar-server/src/main/java/org/sonar/ce/taskprocessor/ReportTaskProcessorDeclaration.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/ce/taskprocessor/package-info.java b/sonar-server/src/main/java/org/sonar/ce/taskprocessor/package-info.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/ce/taskprocessor/package-info.java rename to sonar-server/src/main/java/org/sonar/ce/taskprocessor/package-info.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/app/EmbeddedTomcat.java b/sonar-server/src/main/java/org/sonar/server/app/EmbeddedTomcat.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/app/EmbeddedTomcat.java rename to sonar-server/src/main/java/org/sonar/server/app/EmbeddedTomcat.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/app/NullJarScanner.java b/sonar-server/src/main/java/org/sonar/server/app/NullJarScanner.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/app/NullJarScanner.java rename to sonar-server/src/main/java/org/sonar/server/app/NullJarScanner.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/app/ProcessCommandWrapper.java b/sonar-server/src/main/java/org/sonar/server/app/ProcessCommandWrapper.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/app/ProcessCommandWrapper.java rename to sonar-server/src/main/java/org/sonar/server/app/ProcessCommandWrapper.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/app/ProcessCommandWrapperImpl.java b/sonar-server/src/main/java/org/sonar/server/app/ProcessCommandWrapperImpl.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/app/ProcessCommandWrapperImpl.java rename to sonar-server/src/main/java/org/sonar/server/app/ProcessCommandWrapperImpl.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/app/ProgrammaticLogbackValve.java b/sonar-server/src/main/java/org/sonar/server/app/ProgrammaticLogbackValve.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/app/ProgrammaticLogbackValve.java rename to sonar-server/src/main/java/org/sonar/server/app/ProgrammaticLogbackValve.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/app/RestartFlagHolder.java b/sonar-server/src/main/java/org/sonar/server/app/RestartFlagHolder.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/app/RestartFlagHolder.java rename to sonar-server/src/main/java/org/sonar/server/app/RestartFlagHolder.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/app/RestartFlagHolderImpl.java b/sonar-server/src/main/java/org/sonar/server/app/RestartFlagHolderImpl.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/app/RestartFlagHolderImpl.java rename to sonar-server/src/main/java/org/sonar/server/app/RestartFlagHolderImpl.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/app/ServerProcessLogging.java b/sonar-server/src/main/java/org/sonar/server/app/ServerProcessLogging.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/app/ServerProcessLogging.java rename to sonar-server/src/main/java/org/sonar/server/app/ServerProcessLogging.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/app/TomcatAccessLog.java b/sonar-server/src/main/java/org/sonar/server/app/TomcatAccessLog.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/app/TomcatAccessLog.java rename to sonar-server/src/main/java/org/sonar/server/app/TomcatAccessLog.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/app/TomcatConnectors.java b/sonar-server/src/main/java/org/sonar/server/app/TomcatConnectors.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/app/TomcatConnectors.java rename to sonar-server/src/main/java/org/sonar/server/app/TomcatConnectors.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/app/TomcatContexts.java b/sonar-server/src/main/java/org/sonar/server/app/TomcatContexts.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/app/TomcatContexts.java rename to sonar-server/src/main/java/org/sonar/server/app/TomcatContexts.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/app/TomcatStartupLogs.java b/sonar-server/src/main/java/org/sonar/server/app/TomcatStartupLogs.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/app/TomcatStartupLogs.java rename to sonar-server/src/main/java/org/sonar/server/app/TomcatStartupLogs.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/app/WebServer.java b/sonar-server/src/main/java/org/sonar/server/app/WebServer.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/app/WebServer.java rename to sonar-server/src/main/java/org/sonar/server/app/WebServer.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/app/WebServerProcessLogging.java b/sonar-server/src/main/java/org/sonar/server/app/WebServerProcessLogging.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/app/WebServerProcessLogging.java rename to sonar-server/src/main/java/org/sonar/server/app/WebServerProcessLogging.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/app/package-info.java b/sonar-server/src/main/java/org/sonar/server/app/package-info.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/app/package-info.java rename to sonar-server/src/main/java/org/sonar/server/app/package-info.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/authentication/AuthenticationError.java b/sonar-server/src/main/java/org/sonar/server/authentication/AuthenticationError.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/authentication/AuthenticationError.java rename to sonar-server/src/main/java/org/sonar/server/authentication/AuthenticationError.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/authentication/AuthenticationFilter.java b/sonar-server/src/main/java/org/sonar/server/authentication/AuthenticationFilter.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/authentication/AuthenticationFilter.java rename to sonar-server/src/main/java/org/sonar/server/authentication/AuthenticationFilter.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/authentication/AuthenticationModule.java b/sonar-server/src/main/java/org/sonar/server/authentication/AuthenticationModule.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/authentication/AuthenticationModule.java rename to sonar-server/src/main/java/org/sonar/server/authentication/AuthenticationModule.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/authentication/BaseContextFactory.java b/sonar-server/src/main/java/org/sonar/server/authentication/BaseContextFactory.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/authentication/BaseContextFactory.java rename to sonar-server/src/main/java/org/sonar/server/authentication/BaseContextFactory.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/authentication/BasicAuthenticator.java b/sonar-server/src/main/java/org/sonar/server/authentication/BasicAuthenticator.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/authentication/BasicAuthenticator.java rename to sonar-server/src/main/java/org/sonar/server/authentication/BasicAuthenticator.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/authentication/Cookies.java b/sonar-server/src/main/java/org/sonar/server/authentication/Cookies.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/authentication/Cookies.java rename to sonar-server/src/main/java/org/sonar/server/authentication/Cookies.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/authentication/CredentialsAuthenticator.java b/sonar-server/src/main/java/org/sonar/server/authentication/CredentialsAuthenticator.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/authentication/CredentialsAuthenticator.java rename to sonar-server/src/main/java/org/sonar/server/authentication/CredentialsAuthenticator.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/authentication/IdentityProviderRepository.java b/sonar-server/src/main/java/org/sonar/server/authentication/IdentityProviderRepository.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/authentication/IdentityProviderRepository.java rename to sonar-server/src/main/java/org/sonar/server/authentication/IdentityProviderRepository.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/authentication/InitFilter.java b/sonar-server/src/main/java/org/sonar/server/authentication/InitFilter.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/authentication/InitFilter.java rename to sonar-server/src/main/java/org/sonar/server/authentication/InitFilter.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/authentication/JwtCsrfVerifier.java b/sonar-server/src/main/java/org/sonar/server/authentication/JwtCsrfVerifier.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/authentication/JwtCsrfVerifier.java rename to sonar-server/src/main/java/org/sonar/server/authentication/JwtCsrfVerifier.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/authentication/JwtHttpHandler.java b/sonar-server/src/main/java/org/sonar/server/authentication/JwtHttpHandler.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/authentication/JwtHttpHandler.java rename to sonar-server/src/main/java/org/sonar/server/authentication/JwtHttpHandler.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/authentication/JwtSerializer.java b/sonar-server/src/main/java/org/sonar/server/authentication/JwtSerializer.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/authentication/JwtSerializer.java rename to sonar-server/src/main/java/org/sonar/server/authentication/JwtSerializer.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/authentication/OAuth2CallbackFilter.java b/sonar-server/src/main/java/org/sonar/server/authentication/OAuth2CallbackFilter.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/authentication/OAuth2CallbackFilter.java rename to sonar-server/src/main/java/org/sonar/server/authentication/OAuth2CallbackFilter.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/authentication/OAuth2ContextFactory.java b/sonar-server/src/main/java/org/sonar/server/authentication/OAuth2ContextFactory.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/authentication/OAuth2ContextFactory.java rename to sonar-server/src/main/java/org/sonar/server/authentication/OAuth2ContextFactory.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/authentication/OAuthCsrfVerifier.java b/sonar-server/src/main/java/org/sonar/server/authentication/OAuthCsrfVerifier.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/authentication/OAuthCsrfVerifier.java rename to sonar-server/src/main/java/org/sonar/server/authentication/OAuthCsrfVerifier.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/authentication/RealmAuthenticator.java b/sonar-server/src/main/java/org/sonar/server/authentication/RealmAuthenticator.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/authentication/RealmAuthenticator.java rename to sonar-server/src/main/java/org/sonar/server/authentication/RealmAuthenticator.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/authentication/SsoAuthenticator.java b/sonar-server/src/main/java/org/sonar/server/authentication/SsoAuthenticator.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/authentication/SsoAuthenticator.java rename to sonar-server/src/main/java/org/sonar/server/authentication/SsoAuthenticator.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/authentication/UserIdentityAuthenticator.java b/sonar-server/src/main/java/org/sonar/server/authentication/UserIdentityAuthenticator.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/authentication/UserIdentityAuthenticator.java rename to sonar-server/src/main/java/org/sonar/server/authentication/UserIdentityAuthenticator.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/authentication/UserSessionInitializer.java b/sonar-server/src/main/java/org/sonar/server/authentication/UserSessionInitializer.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/authentication/UserSessionInitializer.java rename to sonar-server/src/main/java/org/sonar/server/authentication/UserSessionInitializer.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/authentication/event/AuthenticationEvent.java b/sonar-server/src/main/java/org/sonar/server/authentication/event/AuthenticationEvent.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/authentication/event/AuthenticationEvent.java rename to sonar-server/src/main/java/org/sonar/server/authentication/event/AuthenticationEvent.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/authentication/event/AuthenticationEventImpl.java b/sonar-server/src/main/java/org/sonar/server/authentication/event/AuthenticationEventImpl.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/authentication/event/AuthenticationEventImpl.java rename to sonar-server/src/main/java/org/sonar/server/authentication/event/AuthenticationEventImpl.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/authentication/event/AuthenticationException.java b/sonar-server/src/main/java/org/sonar/server/authentication/event/AuthenticationException.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/authentication/event/AuthenticationException.java rename to sonar-server/src/main/java/org/sonar/server/authentication/event/AuthenticationException.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/authentication/event/package-info.java b/sonar-server/src/main/java/org/sonar/server/authentication/event/package-info.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/authentication/event/package-info.java rename to sonar-server/src/main/java/org/sonar/server/authentication/event/package-info.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/authentication/package-info.java b/sonar-server/src/main/java/org/sonar/server/authentication/package-info.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/authentication/package-info.java rename to sonar-server/src/main/java/org/sonar/server/authentication/package-info.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/authentication/ws/AuthenticationWs.java b/sonar-server/src/main/java/org/sonar/server/authentication/ws/AuthenticationWs.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/authentication/ws/AuthenticationWs.java rename to sonar-server/src/main/java/org/sonar/server/authentication/ws/AuthenticationWs.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/authentication/ws/AuthenticationWsAction.java b/sonar-server/src/main/java/org/sonar/server/authentication/ws/AuthenticationWsAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/authentication/ws/AuthenticationWsAction.java rename to sonar-server/src/main/java/org/sonar/server/authentication/ws/AuthenticationWsAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/authentication/ws/LoginAction.java b/sonar-server/src/main/java/org/sonar/server/authentication/ws/LoginAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/authentication/ws/LoginAction.java rename to sonar-server/src/main/java/org/sonar/server/authentication/ws/LoginAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/authentication/ws/LogoutAction.java b/sonar-server/src/main/java/org/sonar/server/authentication/ws/LogoutAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/authentication/ws/LogoutAction.java rename to sonar-server/src/main/java/org/sonar/server/authentication/ws/LogoutAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/authentication/ws/ValidateAction.java b/sonar-server/src/main/java/org/sonar/server/authentication/ws/ValidateAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/authentication/ws/ValidateAction.java rename to sonar-server/src/main/java/org/sonar/server/authentication/ws/ValidateAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/authentication/ws/package-info.java b/sonar-server/src/main/java/org/sonar/server/authentication/ws/package-info.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/authentication/ws/package-info.java rename to sonar-server/src/main/java/org/sonar/server/authentication/ws/package-info.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/batch/BatchIndex.java b/sonar-server/src/main/java/org/sonar/server/batch/BatchIndex.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/batch/BatchIndex.java rename to sonar-server/src/main/java/org/sonar/server/batch/BatchIndex.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/batch/BatchWs.java b/sonar-server/src/main/java/org/sonar/server/batch/BatchWs.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/batch/BatchWs.java rename to sonar-server/src/main/java/org/sonar/server/batch/BatchWs.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/batch/BatchWsAction.java b/sonar-server/src/main/java/org/sonar/server/batch/BatchWsAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/batch/BatchWsAction.java rename to sonar-server/src/main/java/org/sonar/server/batch/BatchWsAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/batch/BatchWsModule.java b/sonar-server/src/main/java/org/sonar/server/batch/BatchWsModule.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/batch/BatchWsModule.java rename to sonar-server/src/main/java/org/sonar/server/batch/BatchWsModule.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/batch/FileAction.java b/sonar-server/src/main/java/org/sonar/server/batch/FileAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/batch/FileAction.java rename to sonar-server/src/main/java/org/sonar/server/batch/FileAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/batch/IndexAction.java b/sonar-server/src/main/java/org/sonar/server/batch/IndexAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/batch/IndexAction.java rename to sonar-server/src/main/java/org/sonar/server/batch/IndexAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/batch/IssuesAction.java b/sonar-server/src/main/java/org/sonar/server/batch/IssuesAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/batch/IssuesAction.java rename to sonar-server/src/main/java/org/sonar/server/batch/IssuesAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/batch/Messages.java b/sonar-server/src/main/java/org/sonar/server/batch/Messages.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/batch/Messages.java rename to sonar-server/src/main/java/org/sonar/server/batch/Messages.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/batch/ProjectAction.java b/sonar-server/src/main/java/org/sonar/server/batch/ProjectAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/batch/ProjectAction.java rename to sonar-server/src/main/java/org/sonar/server/batch/ProjectAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/batch/ProjectDataLoader.java b/sonar-server/src/main/java/org/sonar/server/batch/ProjectDataLoader.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/batch/ProjectDataLoader.java rename to sonar-server/src/main/java/org/sonar/server/batch/ProjectDataLoader.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/batch/ProjectDataQuery.java b/sonar-server/src/main/java/org/sonar/server/batch/ProjectDataQuery.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/batch/ProjectDataQuery.java rename to sonar-server/src/main/java/org/sonar/server/batch/ProjectDataQuery.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/batch/package-info.java b/sonar-server/src/main/java/org/sonar/server/batch/package-info.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/batch/package-info.java rename to sonar-server/src/main/java/org/sonar/server/batch/package-info.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/ce/ws/ActivityAction.java b/sonar-server/src/main/java/org/sonar/server/ce/ws/ActivityAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/ce/ws/ActivityAction.java rename to sonar-server/src/main/java/org/sonar/server/ce/ws/ActivityAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/ce/ws/ActivityStatusAction.java b/sonar-server/src/main/java/org/sonar/server/ce/ws/ActivityStatusAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/ce/ws/ActivityStatusAction.java rename to sonar-server/src/main/java/org/sonar/server/ce/ws/ActivityStatusAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/ce/ws/CancelAction.java b/sonar-server/src/main/java/org/sonar/server/ce/ws/CancelAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/ce/ws/CancelAction.java rename to sonar-server/src/main/java/org/sonar/server/ce/ws/CancelAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/ce/ws/CancelAllAction.java b/sonar-server/src/main/java/org/sonar/server/ce/ws/CancelAllAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/ce/ws/CancelAllAction.java rename to sonar-server/src/main/java/org/sonar/server/ce/ws/CancelAllAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/ce/ws/CeWs.java b/sonar-server/src/main/java/org/sonar/server/ce/ws/CeWs.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/ce/ws/CeWs.java rename to sonar-server/src/main/java/org/sonar/server/ce/ws/CeWs.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/ce/ws/CeWsAction.java b/sonar-server/src/main/java/org/sonar/server/ce/ws/CeWsAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/ce/ws/CeWsAction.java rename to sonar-server/src/main/java/org/sonar/server/ce/ws/CeWsAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/ce/ws/CeWsModule.java b/sonar-server/src/main/java/org/sonar/server/ce/ws/CeWsModule.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/ce/ws/CeWsModule.java rename to sonar-server/src/main/java/org/sonar/server/ce/ws/CeWsModule.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/ce/ws/ComponentAction.java b/sonar-server/src/main/java/org/sonar/server/ce/ws/ComponentAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/ce/ws/ComponentAction.java rename to sonar-server/src/main/java/org/sonar/server/ce/ws/ComponentAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/ce/ws/IsQueueEmptyWs.java b/sonar-server/src/main/java/org/sonar/server/ce/ws/IsQueueEmptyWs.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/ce/ws/IsQueueEmptyWs.java rename to sonar-server/src/main/java/org/sonar/server/ce/ws/IsQueueEmptyWs.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/ce/ws/SubmitAction.java b/sonar-server/src/main/java/org/sonar/server/ce/ws/SubmitAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/ce/ws/SubmitAction.java rename to sonar-server/src/main/java/org/sonar/server/ce/ws/SubmitAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/ce/ws/TaskAction.java b/sonar-server/src/main/java/org/sonar/server/ce/ws/TaskAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/ce/ws/TaskAction.java rename to sonar-server/src/main/java/org/sonar/server/ce/ws/TaskAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/ce/ws/TaskFormatter.java b/sonar-server/src/main/java/org/sonar/server/ce/ws/TaskFormatter.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/ce/ws/TaskFormatter.java rename to sonar-server/src/main/java/org/sonar/server/ce/ws/TaskFormatter.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/ce/ws/TaskTypesAction.java b/sonar-server/src/main/java/org/sonar/server/ce/ws/TaskTypesAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/ce/ws/TaskTypesAction.java rename to sonar-server/src/main/java/org/sonar/server/ce/ws/TaskTypesAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/ce/ws/package-info.java b/sonar-server/src/main/java/org/sonar/server/ce/ws/package-info.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/ce/ws/package-info.java rename to sonar-server/src/main/java/org/sonar/server/ce/ws/package-info.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/component/ComponentCleanerService.java b/sonar-server/src/main/java/org/sonar/server/component/ComponentCleanerService.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/component/ComponentCleanerService.java rename to sonar-server/src/main/java/org/sonar/server/component/ComponentCleanerService.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/component/ComponentFinder.java b/sonar-server/src/main/java/org/sonar/server/component/ComponentFinder.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/component/ComponentFinder.java rename to sonar-server/src/main/java/org/sonar/server/component/ComponentFinder.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/component/ComponentService.java b/sonar-server/src/main/java/org/sonar/server/component/ComponentService.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/component/ComponentService.java rename to sonar-server/src/main/java/org/sonar/server/component/ComponentService.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/component/ComponentUpdater.java b/sonar-server/src/main/java/org/sonar/server/component/ComponentUpdater.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/component/ComponentUpdater.java rename to sonar-server/src/main/java/org/sonar/server/component/ComponentUpdater.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/component/DefaultRubyComponentService.java b/sonar-server/src/main/java/org/sonar/server/component/DefaultRubyComponentService.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/component/DefaultRubyComponentService.java rename to sonar-server/src/main/java/org/sonar/server/component/DefaultRubyComponentService.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/component/NewComponent.java b/sonar-server/src/main/java/org/sonar/server/component/NewComponent.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/component/NewComponent.java rename to sonar-server/src/main/java/org/sonar/server/component/NewComponent.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/component/index/ComponentDoc.java b/sonar-server/src/main/java/org/sonar/server/component/index/ComponentDoc.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/component/index/ComponentDoc.java rename to sonar-server/src/main/java/org/sonar/server/component/index/ComponentDoc.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/component/index/ComponentHit.java b/sonar-server/src/main/java/org/sonar/server/component/index/ComponentHit.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/component/index/ComponentHit.java rename to sonar-server/src/main/java/org/sonar/server/component/index/ComponentHit.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/component/index/ComponentHitsPerQualifier.java b/sonar-server/src/main/java/org/sonar/server/component/index/ComponentHitsPerQualifier.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/component/index/ComponentHitsPerQualifier.java rename to sonar-server/src/main/java/org/sonar/server/component/index/ComponentHitsPerQualifier.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/component/index/ComponentIndex.java b/sonar-server/src/main/java/org/sonar/server/component/index/ComponentIndex.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/component/index/ComponentIndex.java rename to sonar-server/src/main/java/org/sonar/server/component/index/ComponentIndex.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/component/index/ComponentIndexDefinition.java b/sonar-server/src/main/java/org/sonar/server/component/index/ComponentIndexDefinition.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/component/index/ComponentIndexDefinition.java rename to sonar-server/src/main/java/org/sonar/server/component/index/ComponentIndexDefinition.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/component/index/ComponentIndexQuery.java b/sonar-server/src/main/java/org/sonar/server/component/index/ComponentIndexQuery.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/component/index/ComponentIndexQuery.java rename to sonar-server/src/main/java/org/sonar/server/component/index/ComponentIndexQuery.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/component/index/ComponentIndexResults.java b/sonar-server/src/main/java/org/sonar/server/component/index/ComponentIndexResults.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/component/index/ComponentIndexResults.java rename to sonar-server/src/main/java/org/sonar/server/component/index/ComponentIndexResults.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/component/index/ComponentIndexer.java b/sonar-server/src/main/java/org/sonar/server/component/index/ComponentIndexer.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/component/index/ComponentIndexer.java rename to sonar-server/src/main/java/org/sonar/server/component/index/ComponentIndexer.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/component/index/package-info.java b/sonar-server/src/main/java/org/sonar/server/component/index/package-info.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/component/index/package-info.java rename to sonar-server/src/main/java/org/sonar/server/component/index/package-info.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/component/package-info.java b/sonar-server/src/main/java/org/sonar/server/component/package-info.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/component/package-info.java rename to sonar-server/src/main/java/org/sonar/server/component/package-info.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/component/ws/AppAction.java b/sonar-server/src/main/java/org/sonar/server/component/ws/AppAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/component/ws/AppAction.java rename to sonar-server/src/main/java/org/sonar/server/component/ws/AppAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/component/ws/ComponentDtoToWsComponent.java b/sonar-server/src/main/java/org/sonar/server/component/ws/ComponentDtoToWsComponent.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/component/ws/ComponentDtoToWsComponent.java rename to sonar-server/src/main/java/org/sonar/server/component/ws/ComponentDtoToWsComponent.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/component/ws/ComponentsWs.java b/sonar-server/src/main/java/org/sonar/server/component/ws/ComponentsWs.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/component/ws/ComponentsWs.java rename to sonar-server/src/main/java/org/sonar/server/component/ws/ComponentsWs.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/component/ws/ComponentsWsAction.java b/sonar-server/src/main/java/org/sonar/server/component/ws/ComponentsWsAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/component/ws/ComponentsWsAction.java rename to sonar-server/src/main/java/org/sonar/server/component/ws/ComponentsWsAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/component/ws/ComponentsWsModule.java b/sonar-server/src/main/java/org/sonar/server/component/ws/ComponentsWsModule.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/component/ws/ComponentsWsModule.java rename to sonar-server/src/main/java/org/sonar/server/component/ws/ComponentsWsModule.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/component/ws/FilterParser.java b/sonar-server/src/main/java/org/sonar/server/component/ws/FilterParser.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/component/ws/FilterParser.java rename to sonar-server/src/main/java/org/sonar/server/component/ws/FilterParser.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/component/ws/ProjectMeasuresQueryFactory.java b/sonar-server/src/main/java/org/sonar/server/component/ws/ProjectMeasuresQueryFactory.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/component/ws/ProjectMeasuresQueryFactory.java rename to sonar-server/src/main/java/org/sonar/server/component/ws/ProjectMeasuresQueryFactory.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/component/ws/ProjectMeasuresQueryValidator.java b/sonar-server/src/main/java/org/sonar/server/component/ws/ProjectMeasuresQueryValidator.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/component/ws/ProjectMeasuresQueryValidator.java rename to sonar-server/src/main/java/org/sonar/server/component/ws/ProjectMeasuresQueryValidator.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/component/ws/ResourcesWs.java b/sonar-server/src/main/java/org/sonar/server/component/ws/ResourcesWs.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/component/ws/ResourcesWs.java rename to sonar-server/src/main/java/org/sonar/server/component/ws/ResourcesWs.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/component/ws/SearchAction.java b/sonar-server/src/main/java/org/sonar/server/component/ws/SearchAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/component/ws/SearchAction.java rename to sonar-server/src/main/java/org/sonar/server/component/ws/SearchAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/component/ws/SearchProjectsAction.java b/sonar-server/src/main/java/org/sonar/server/component/ws/SearchProjectsAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/component/ws/SearchProjectsAction.java rename to sonar-server/src/main/java/org/sonar/server/component/ws/SearchProjectsAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/component/ws/ShowAction.java b/sonar-server/src/main/java/org/sonar/server/component/ws/ShowAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/component/ws/ShowAction.java rename to sonar-server/src/main/java/org/sonar/server/component/ws/ShowAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/component/ws/SuggestionCategory.java b/sonar-server/src/main/java/org/sonar/server/component/ws/SuggestionCategory.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/component/ws/SuggestionCategory.java rename to sonar-server/src/main/java/org/sonar/server/component/ws/SuggestionCategory.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/component/ws/SuggestionsAction.java b/sonar-server/src/main/java/org/sonar/server/component/ws/SuggestionsAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/component/ws/SuggestionsAction.java rename to sonar-server/src/main/java/org/sonar/server/component/ws/SuggestionsAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/component/ws/TreeAction.java b/sonar-server/src/main/java/org/sonar/server/component/ws/TreeAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/component/ws/TreeAction.java rename to sonar-server/src/main/java/org/sonar/server/component/ws/TreeAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/component/ws/package-info.java b/sonar-server/src/main/java/org/sonar/server/component/ws/package-info.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/component/ws/package-info.java rename to sonar-server/src/main/java/org/sonar/server/component/ws/package-info.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/dbcleaner/IndexPurgeListener.java b/sonar-server/src/main/java/org/sonar/server/computation/dbcleaner/IndexPurgeListener.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/dbcleaner/IndexPurgeListener.java rename to sonar-server/src/main/java/org/sonar/server/computation/dbcleaner/IndexPurgeListener.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/dbcleaner/ProjectCleaner.java b/sonar-server/src/main/java/org/sonar/server/computation/dbcleaner/ProjectCleaner.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/dbcleaner/ProjectCleaner.java rename to sonar-server/src/main/java/org/sonar/server/computation/dbcleaner/ProjectCleaner.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/dbcleaner/package-info.java b/sonar-server/src/main/java/org/sonar/server/computation/dbcleaner/package-info.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/dbcleaner/package-info.java rename to sonar-server/src/main/java/org/sonar/server/computation/dbcleaner/package-info.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/package-info.java b/sonar-server/src/main/java/org/sonar/server/computation/package-info.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/package-info.java rename to sonar-server/src/main/java/org/sonar/server/computation/package-info.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/queue/ReportSubmitter.java b/sonar-server/src/main/java/org/sonar/server/computation/queue/ReportSubmitter.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/queue/ReportSubmitter.java rename to sonar-server/src/main/java/org/sonar/server/computation/queue/ReportSubmitter.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/queue/package-info.java b/sonar-server/src/main/java/org/sonar/server/computation/queue/package-info.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/queue/package-info.java rename to sonar-server/src/main/java/org/sonar/server/computation/queue/package-info.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/container/EagerStart.java b/sonar-server/src/main/java/org/sonar/server/computation/task/container/EagerStart.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/container/EagerStart.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/container/EagerStart.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/container/TaskContainer.java b/sonar-server/src/main/java/org/sonar/server/computation/task/container/TaskContainer.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/container/TaskContainer.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/container/TaskContainer.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/container/TaskContainerImpl.java b/sonar-server/src/main/java/org/sonar/server/computation/task/container/TaskContainerImpl.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/container/TaskContainerImpl.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/container/TaskContainerImpl.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/container/package-info.java b/sonar-server/src/main/java/org/sonar/server/computation/task/container/package-info.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/container/package-info.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/container/package-info.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/ProjectAnalysisTaskModule.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/ProjectAnalysisTaskModule.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/ProjectAnalysisTaskModule.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/ProjectAnalysisTaskModule.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/analysis/Analysis.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/analysis/Analysis.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/analysis/Analysis.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/analysis/Analysis.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/analysis/AnalysisMetadataHolder.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/analysis/AnalysisMetadataHolder.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/analysis/AnalysisMetadataHolder.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/analysis/AnalysisMetadataHolder.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/analysis/AnalysisMetadataHolderImpl.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/analysis/AnalysisMetadataHolderImpl.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/analysis/AnalysisMetadataHolderImpl.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/analysis/AnalysisMetadataHolderImpl.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/analysis/MutableAnalysisMetadataHolder.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/analysis/MutableAnalysisMetadataHolder.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/analysis/MutableAnalysisMetadataHolder.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/analysis/MutableAnalysisMetadataHolder.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/analysis/Organization.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/analysis/Organization.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/analysis/Organization.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/analysis/Organization.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/analysis/package-info.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/analysis/package-info.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/analysis/package-info.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/analysis/package-info.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/api/developer/PersistDevelopersDelegate.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/api/developer/PersistDevelopersDelegate.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/api/developer/PersistDevelopersDelegate.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/api/developer/PersistDevelopersDelegate.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/api/developer/package-info.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/api/developer/package-info.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/api/developer/package-info.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/api/developer/package-info.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/api/measurecomputer/ComponentImpl.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/api/measurecomputer/ComponentImpl.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/api/measurecomputer/ComponentImpl.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/api/measurecomputer/ComponentImpl.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/api/measurecomputer/MeasureComputerContextImpl.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/api/measurecomputer/MeasureComputerContextImpl.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/api/measurecomputer/MeasureComputerContextImpl.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/api/measurecomputer/MeasureComputerContextImpl.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/api/measurecomputer/MeasureComputerDefinitionImpl.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/api/measurecomputer/MeasureComputerDefinitionImpl.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/api/measurecomputer/MeasureComputerDefinitionImpl.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/api/measurecomputer/MeasureComputerDefinitionImpl.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/api/measurecomputer/MeasureComputerWrapper.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/api/measurecomputer/MeasureComputerWrapper.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/api/measurecomputer/MeasureComputerWrapper.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/api/measurecomputer/MeasureComputerWrapper.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/api/measurecomputer/MeasureImpl.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/api/measurecomputer/MeasureImpl.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/api/measurecomputer/MeasureImpl.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/api/measurecomputer/MeasureImpl.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/api/measurecomputer/package-info.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/api/measurecomputer/package-info.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/api/measurecomputer/package-info.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/api/measurecomputer/package-info.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/api/posttask/CeTaskImpl.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/api/posttask/CeTaskImpl.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/api/posttask/CeTaskImpl.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/api/posttask/CeTaskImpl.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/api/posttask/ConditionImpl.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/api/posttask/ConditionImpl.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/api/posttask/ConditionImpl.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/api/posttask/ConditionImpl.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/api/posttask/ConditionToCondition.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/api/posttask/ConditionToCondition.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/api/posttask/ConditionToCondition.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/api/posttask/ConditionToCondition.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/api/posttask/PostProjectAnalysisTasksExecutor.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/api/posttask/PostProjectAnalysisTasksExecutor.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/api/posttask/PostProjectAnalysisTasksExecutor.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/api/posttask/PostProjectAnalysisTasksExecutor.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/api/posttask/ProjectImpl.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/api/posttask/ProjectImpl.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/api/posttask/ProjectImpl.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/api/posttask/ProjectImpl.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/api/posttask/QualityGateImpl.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/api/posttask/QualityGateImpl.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/api/posttask/QualityGateImpl.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/api/posttask/QualityGateImpl.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/api/posttask/ScannerContextImpl.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/api/posttask/ScannerContextImpl.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/api/posttask/ScannerContextImpl.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/api/posttask/ScannerContextImpl.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/api/posttask/package-info.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/api/posttask/package-info.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/api/posttask/package-info.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/api/posttask/package-info.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/batch/BatchReportDirectoryHolder.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/batch/BatchReportDirectoryHolder.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/batch/BatchReportDirectoryHolder.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/batch/BatchReportDirectoryHolder.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/batch/BatchReportDirectoryHolderImpl.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/batch/BatchReportDirectoryHolderImpl.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/batch/BatchReportDirectoryHolderImpl.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/batch/BatchReportDirectoryHolderImpl.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/batch/BatchReportReader.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/batch/BatchReportReader.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/batch/BatchReportReader.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/batch/BatchReportReader.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/batch/BatchReportReaderImpl.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/batch/BatchReportReaderImpl.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/batch/BatchReportReaderImpl.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/batch/BatchReportReaderImpl.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/batch/MutableBatchReportDirectoryHolder.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/batch/MutableBatchReportDirectoryHolder.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/batch/MutableBatchReportDirectoryHolder.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/batch/MutableBatchReportDirectoryHolder.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/batch/package-info.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/batch/package-info.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/batch/package-info.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/batch/package-info.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/Component.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/Component.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/Component.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/Component.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/ComponentCrawler.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/ComponentCrawler.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/ComponentCrawler.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/ComponentCrawler.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/ComponentFunctions.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/ComponentFunctions.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/ComponentFunctions.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/ComponentFunctions.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/ComponentImpl.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/ComponentImpl.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/ComponentImpl.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/ComponentImpl.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/ComponentRootBuilder.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/ComponentRootBuilder.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/ComponentRootBuilder.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/ComponentRootBuilder.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/ComponentVisitor.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/ComponentVisitor.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/ComponentVisitor.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/ComponentVisitor.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/ConfigurationRepository.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/ConfigurationRepository.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/ConfigurationRepository.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/ConfigurationRepository.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/ConfigurationRepositoryImpl.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/ConfigurationRepositoryImpl.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/ConfigurationRepositoryImpl.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/ConfigurationRepositoryImpl.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/CrawlerDepthLimit.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/CrawlerDepthLimit.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/CrawlerDepthLimit.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/CrawlerDepthLimit.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/DbIdsRepository.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/DbIdsRepository.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/DbIdsRepository.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/DbIdsRepository.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/DbIdsRepositoryImpl.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/DbIdsRepositoryImpl.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/DbIdsRepositoryImpl.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/DbIdsRepositoryImpl.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/DepthTraversalTypeAwareCrawler.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/DepthTraversalTypeAwareCrawler.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/DepthTraversalTypeAwareCrawler.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/DepthTraversalTypeAwareCrawler.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/DequeBasedPath.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/DequeBasedPath.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/DequeBasedPath.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/DequeBasedPath.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/Developer.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/Developer.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/Developer.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/Developer.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/DisabledComponentsHolder.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/DisabledComponentsHolder.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/DisabledComponentsHolder.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/DisabledComponentsHolder.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/DisabledComponentsHolderImpl.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/DisabledComponentsHolderImpl.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/DisabledComponentsHolderImpl.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/DisabledComponentsHolderImpl.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/FileAttributes.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/FileAttributes.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/FileAttributes.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/FileAttributes.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/MapBasedDbIdsRepository.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/MapBasedDbIdsRepository.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/MapBasedDbIdsRepository.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/MapBasedDbIdsRepository.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/MutableDbIdsRepository.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/MutableDbIdsRepository.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/MutableDbIdsRepository.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/MutableDbIdsRepository.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/MutableDisabledComponentsHolder.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/MutableDisabledComponentsHolder.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/MutableDisabledComponentsHolder.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/MutableDisabledComponentsHolder.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/MutableTreeRootHolder.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/MutableTreeRootHolder.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/MutableTreeRootHolder.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/MutableTreeRootHolder.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/PathAwareCrawler.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/PathAwareCrawler.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/PathAwareCrawler.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/PathAwareCrawler.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/PathAwareVisitor.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/PathAwareVisitor.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/PathAwareVisitor.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/PathAwareVisitor.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/PathAwareVisitorAdapter.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/PathAwareVisitorAdapter.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/PathAwareVisitorAdapter.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/PathAwareVisitorAdapter.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/PathAwareVisitorWrapper.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/PathAwareVisitorWrapper.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/PathAwareVisitorWrapper.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/PathAwareVisitorWrapper.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/PathElementImpl.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/PathElementImpl.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/PathElementImpl.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/PathElementImpl.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/ProjectViewAttributes.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/ProjectViewAttributes.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/ProjectViewAttributes.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/ProjectViewAttributes.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/ReportAttributes.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/ReportAttributes.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/ReportAttributes.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/ReportAttributes.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/SubViewAttributes.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/SubViewAttributes.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/SubViewAttributes.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/SubViewAttributes.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/TreeRootHolder.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/TreeRootHolder.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/TreeRootHolder.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/TreeRootHolder.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/TreeRootHolderImpl.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/TreeRootHolderImpl.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/TreeRootHolderImpl.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/TreeRootHolderImpl.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/TypeAwareVisitor.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/TypeAwareVisitor.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/TypeAwareVisitor.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/TypeAwareVisitor.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/TypeAwareVisitorAdapter.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/TypeAwareVisitorAdapter.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/TypeAwareVisitorAdapter.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/TypeAwareVisitorAdapter.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/TypeAwareVisitorWrapper.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/TypeAwareVisitorWrapper.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/TypeAwareVisitorWrapper.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/TypeAwareVisitorWrapper.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/UuidFactory.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/UuidFactory.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/UuidFactory.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/UuidFactory.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/VisitException.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/VisitException.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/VisitException.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/VisitException.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/VisitorWrapper.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/VisitorWrapper.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/VisitorWrapper.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/VisitorWrapper.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/VisitorsCrawler.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/VisitorsCrawler.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/VisitorsCrawler.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/VisitorsCrawler.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/package-info.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/package-info.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/package-info.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/package-info.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/container/ContainerFactory.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/container/ContainerFactory.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/container/ContainerFactory.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/container/ContainerFactory.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/container/ContainerFactoryImpl.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/container/ContainerFactoryImpl.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/container/ContainerFactoryImpl.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/container/ContainerFactoryImpl.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/container/ProjectAnalysisTaskContainerPopulator.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/container/ProjectAnalysisTaskContainerPopulator.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/container/ProjectAnalysisTaskContainerPopulator.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/container/ProjectAnalysisTaskContainerPopulator.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/container/package-info.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/container/package-info.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/container/package-info.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/container/package-info.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/AbstractDuplicate.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/AbstractDuplicate.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/AbstractDuplicate.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/AbstractDuplicate.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/CrossProjectDuplicate.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/CrossProjectDuplicate.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/CrossProjectDuplicate.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/CrossProjectDuplicate.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/CrossProjectDuplicationStatusHolder.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/CrossProjectDuplicationStatusHolder.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/CrossProjectDuplicationStatusHolder.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/CrossProjectDuplicationStatusHolder.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/CrossProjectDuplicationStatusHolderImpl.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/CrossProjectDuplicationStatusHolderImpl.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/CrossProjectDuplicationStatusHolderImpl.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/CrossProjectDuplicationStatusHolderImpl.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/DetailedTextBlock.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/DetailedTextBlock.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/DetailedTextBlock.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/DetailedTextBlock.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/Duplicate.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/Duplicate.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/Duplicate.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/Duplicate.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/Duplication.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/Duplication.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/Duplication.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/Duplication.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/DuplicationRepository.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/DuplicationRepository.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/DuplicationRepository.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/DuplicationRepository.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/DuplicationRepositoryImpl.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/DuplicationRepositoryImpl.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/DuplicationRepositoryImpl.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/DuplicationRepositoryImpl.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/InProjectDuplicate.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/InProjectDuplicate.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/InProjectDuplicate.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/InProjectDuplicate.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/InnerDuplicate.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/InnerDuplicate.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/InnerDuplicate.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/InnerDuplicate.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/IntegrateCrossProjectDuplications.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/IntegrateCrossProjectDuplications.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/IntegrateCrossProjectDuplications.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/IntegrateCrossProjectDuplications.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/TextBlock.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/TextBlock.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/TextBlock.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/TextBlock.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/package-info.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/package-info.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/package-info.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/package-info.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/event/Event.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/event/Event.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/event/Event.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/event/Event.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/event/EventRepository.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/event/EventRepository.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/event/EventRepository.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/event/EventRepository.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/event/EventRepositoryImpl.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/event/EventRepositoryImpl.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/event/EventRepositoryImpl.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/event/EventRepositoryImpl.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/event/package-info.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/event/package-info.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/event/package-info.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/event/package-info.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStep.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStep.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStep.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStep.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/filemove/FileSimilarity.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/filemove/FileSimilarity.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/filemove/FileSimilarity.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/filemove/FileSimilarity.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/filemove/FileSimilarityImpl.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/filemove/FileSimilarityImpl.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/filemove/FileSimilarityImpl.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/filemove/FileSimilarityImpl.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/filemove/Match.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/filemove/Match.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/filemove/Match.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/filemove/Match.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/filemove/MatchesByScore.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/filemove/MatchesByScore.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/filemove/MatchesByScore.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/filemove/MatchesByScore.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/filemove/MovedFilesRepository.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/filemove/MovedFilesRepository.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/filemove/MovedFilesRepository.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/filemove/MovedFilesRepository.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/filemove/MutableMovedFilesRepository.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/filemove/MutableMovedFilesRepository.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/filemove/MutableMovedFilesRepository.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/filemove/MutableMovedFilesRepository.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/filemove/MutableMovedFilesRepositoryImpl.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/filemove/MutableMovedFilesRepositoryImpl.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/filemove/MutableMovedFilesRepositoryImpl.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/filemove/MutableMovedFilesRepositoryImpl.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/filemove/ScoreMatrix.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/filemove/ScoreMatrix.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/filemove/ScoreMatrix.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/filemove/ScoreMatrix.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/filemove/SourceSimilarity.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/filemove/SourceSimilarity.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/filemove/SourceSimilarity.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/filemove/SourceSimilarity.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/filemove/SourceSimilarityImpl.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/filemove/SourceSimilarityImpl.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/filemove/SourceSimilarityImpl.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/filemove/SourceSimilarityImpl.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/filemove/package-info.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/filemove/package-info.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/filemove/package-info.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/filemove/package-info.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/filesystem/ComputationTempFolderProvider.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/filesystem/ComputationTempFolderProvider.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/filesystem/ComputationTempFolderProvider.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/filesystem/ComputationTempFolderProvider.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/filesystem/package-info.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/filesystem/package-info.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/filesystem/package-info.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/filesystem/package-info.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/AverageFormula.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/AverageFormula.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/AverageFormula.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/AverageFormula.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/Counter.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/Counter.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/Counter.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/Counter.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/CounterInitializationContext.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/CounterInitializationContext.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/CounterInitializationContext.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/CounterInitializationContext.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/CreateMeasureContext.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/CreateMeasureContext.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/CreateMeasureContext.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/CreateMeasureContext.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/DistributionFormula.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/DistributionFormula.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/DistributionFormula.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/DistributionFormula.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/Formula.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/Formula.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/Formula.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/Formula.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/FormulaExecutorComponentVisitor.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/FormulaExecutorComponentVisitor.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/FormulaExecutorComponentVisitor.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/FormulaExecutorComponentVisitor.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/SumFormula.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/SumFormula.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/SumFormula.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/SumFormula.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/VariationSumFormula.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/VariationSumFormula.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/VariationSumFormula.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/VariationSumFormula.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/counter/DoubleValue.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/counter/DoubleValue.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/counter/DoubleValue.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/counter/DoubleValue.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/counter/IntSumCounter.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/counter/IntSumCounter.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/counter/IntSumCounter.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/counter/IntSumCounter.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/counter/IntValue.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/counter/IntValue.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/counter/IntValue.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/counter/IntValue.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/counter/LongSumCounter.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/counter/LongSumCounter.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/counter/LongSumCounter.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/counter/LongSumCounter.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/counter/LongValue.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/counter/LongValue.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/counter/LongValue.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/counter/LongValue.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/counter/RatingValue.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/counter/RatingValue.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/counter/RatingValue.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/counter/RatingValue.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/counter/SumCounter.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/counter/SumCounter.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/counter/SumCounter.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/counter/SumCounter.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/counter/package-info.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/counter/package-info.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/counter/package-info.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/counter/package-info.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/CoverageFormula.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/CoverageFormula.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/CoverageFormula.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/CoverageFormula.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/CoverageUtils.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/CoverageUtils.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/CoverageUtils.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/CoverageUtils.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/CoverageVariationFormula.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/CoverageVariationFormula.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/CoverageVariationFormula.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/CoverageVariationFormula.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/ElementsAndCoveredElementsCounter.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/ElementsAndCoveredElementsCounter.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/ElementsAndCoveredElementsCounter.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/ElementsAndCoveredElementsCounter.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/ElementsAndCoveredElementsVariationCounter.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/ElementsAndCoveredElementsVariationCounter.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/ElementsAndCoveredElementsVariationCounter.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/ElementsAndCoveredElementsVariationCounter.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/LinesAndConditionsWithUncoveredCounter.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/LinesAndConditionsWithUncoveredCounter.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/LinesAndConditionsWithUncoveredCounter.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/LinesAndConditionsWithUncoveredCounter.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/LinesAndConditionsWithUncoveredFormula.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/LinesAndConditionsWithUncoveredFormula.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/LinesAndConditionsWithUncoveredFormula.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/LinesAndConditionsWithUncoveredFormula.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/LinesAndConditionsWithUncoveredMetricKeys.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/LinesAndConditionsWithUncoveredMetricKeys.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/LinesAndConditionsWithUncoveredMetricKeys.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/LinesAndConditionsWithUncoveredMetricKeys.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/LinesAndConditionsWithUncoveredVariationCounter.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/LinesAndConditionsWithUncoveredVariationCounter.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/LinesAndConditionsWithUncoveredVariationCounter.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/LinesAndConditionsWithUncoveredVariationCounter.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/LinesAndConditionsWithUncoveredVariationFormula.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/LinesAndConditionsWithUncoveredVariationFormula.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/LinesAndConditionsWithUncoveredVariationFormula.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/LinesAndConditionsWithUncoveredVariationFormula.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/SingleWithUncoveredCounter.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/SingleWithUncoveredCounter.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/SingleWithUncoveredCounter.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/SingleWithUncoveredCounter.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/SingleWithUncoveredFormula.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/SingleWithUncoveredFormula.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/SingleWithUncoveredFormula.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/SingleWithUncoveredFormula.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/SingleWithUncoveredMetricKeys.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/SingleWithUncoveredMetricKeys.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/SingleWithUncoveredMetricKeys.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/SingleWithUncoveredMetricKeys.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/SingleWithUncoveredVariationCounter.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/SingleWithUncoveredVariationCounter.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/SingleWithUncoveredVariationCounter.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/SingleWithUncoveredVariationCounter.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/SingleWithUncoveredVariationFormula.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/SingleWithUncoveredVariationFormula.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/SingleWithUncoveredVariationFormula.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/SingleWithUncoveredVariationFormula.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/package-info.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/package-info.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/package-info.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/package-info.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/package-info.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/package-info.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/package-info.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/package-info.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/BaseIssuesLoader.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/BaseIssuesLoader.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/BaseIssuesLoader.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/BaseIssuesLoader.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/CloseIssuesOnRemovedComponentsVisitor.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/CloseIssuesOnRemovedComponentsVisitor.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/CloseIssuesOnRemovedComponentsVisitor.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/CloseIssuesOnRemovedComponentsVisitor.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/ComponentIssuesRepository.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/ComponentIssuesRepository.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/ComponentIssuesRepository.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/ComponentIssuesRepository.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/ComponentIssuesRepositoryImpl.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/ComponentIssuesRepositoryImpl.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/ComponentIssuesRepositoryImpl.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/ComponentIssuesRepositoryImpl.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/ComponentsWithUnprocessedIssues.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/ComponentsWithUnprocessedIssues.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/ComponentsWithUnprocessedIssues.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/ComponentsWithUnprocessedIssues.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/DebtCalculator.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/DebtCalculator.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/DebtCalculator.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/DebtCalculator.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/DefaultAssignee.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/DefaultAssignee.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/DefaultAssignee.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/DefaultAssignee.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/EffortAggregator.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/EffortAggregator.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/EffortAggregator.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/EffortAggregator.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/IntegrateIssuesVisitor.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/IntegrateIssuesVisitor.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/IntegrateIssuesVisitor.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/IntegrateIssuesVisitor.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/IssueAssigner.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/IssueAssigner.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/IssueAssigner.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/IssueAssigner.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/IssueCache.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/IssueCache.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/IssueCache.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/IssueCache.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/IssueCounter.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/IssueCounter.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/IssueCounter.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/IssueCounter.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/IssueCreationDateCalculator.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/IssueCreationDateCalculator.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/IssueCreationDateCalculator.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/IssueCreationDateCalculator.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/IssueLifecycle.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/IssueLifecycle.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/IssueLifecycle.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/IssueLifecycle.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/IssueVisitor.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/IssueVisitor.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/IssueVisitor.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/IssueVisitor.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/IssueVisitors.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/IssueVisitors.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/IssueVisitors.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/IssueVisitors.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/LoadComponentUuidsHavingOpenIssuesVisitor.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/LoadComponentUuidsHavingOpenIssuesVisitor.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/LoadComponentUuidsHavingOpenIssuesVisitor.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/LoadComponentUuidsHavingOpenIssuesVisitor.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/MovedIssueVisitor.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/MovedIssueVisitor.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/MovedIssueVisitor.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/MovedIssueVisitor.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/MutableComponentIssuesRepository.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/MutableComponentIssuesRepository.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/MutableComponentIssuesRepository.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/MutableComponentIssuesRepository.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/NewEffortAggregator.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/NewEffortAggregator.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/NewEffortAggregator.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/NewEffortAggregator.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/NewEffortCalculator.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/NewEffortCalculator.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/NewEffortCalculator.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/NewEffortCalculator.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/Rule.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/Rule.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/Rule.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/Rule.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/RuleImpl.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/RuleImpl.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/RuleImpl.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/RuleImpl.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/RuleRepository.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/RuleRepository.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/RuleRepository.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/RuleRepository.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/RuleRepositoryImpl.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/RuleRepositoryImpl.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/RuleRepositoryImpl.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/RuleRepositoryImpl.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/RuleTagsCopier.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/RuleTagsCopier.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/RuleTagsCopier.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/RuleTagsCopier.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/RuleTypeCopier.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/RuleTypeCopier.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/RuleTypeCopier.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/RuleTypeCopier.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/ScmAccountToUser.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/ScmAccountToUser.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/ScmAccountToUser.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/ScmAccountToUser.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/ScmAccountToUserLoader.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/ScmAccountToUserLoader.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/ScmAccountToUserLoader.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/ScmAccountToUserLoader.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/TrackerBaseInputFactory.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/TrackerBaseInputFactory.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/TrackerBaseInputFactory.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/TrackerBaseInputFactory.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/TrackerExecution.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/TrackerExecution.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/TrackerExecution.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/TrackerExecution.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/TrackerRawInputFactory.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/TrackerRawInputFactory.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/TrackerRawInputFactory.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/TrackerRawInputFactory.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/UpdateConflictResolver.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/UpdateConflictResolver.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/UpdateConflictResolver.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/UpdateConflictResolver.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/AbstractCoverageRule.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/AbstractCoverageRule.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/AbstractCoverageRule.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/AbstractCoverageRule.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/BranchCoverageRule.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/BranchCoverageRule.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/BranchCoverageRule.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/BranchCoverageRule.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/CommentDensityRule.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/CommentDensityRule.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/CommentDensityRule.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/CommentDensityRule.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/CommonRule.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/CommonRule.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/CommonRule.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/CommonRule.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/CommonRuleEngine.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/CommonRuleEngine.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/CommonRuleEngine.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/CommonRuleEngine.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/CommonRuleEngineImpl.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/CommonRuleEngineImpl.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/CommonRuleEngineImpl.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/CommonRuleEngineImpl.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/DuplicatedBlockRule.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/DuplicatedBlockRule.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/DuplicatedBlockRule.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/DuplicatedBlockRule.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/LineCoverageRule.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/LineCoverageRule.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/LineCoverageRule.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/LineCoverageRule.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/SkippedTestRule.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/SkippedTestRule.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/SkippedTestRule.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/SkippedTestRule.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/TestErrorRule.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/TestErrorRule.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/TestErrorRule.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/TestErrorRule.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/package-info.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/package-info.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/package-info.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/package-info.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/filter/IssueFilter.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/filter/IssueFilter.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/filter/IssueFilter.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/filter/IssueFilter.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/filter/IssuePattern.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/filter/IssuePattern.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/filter/IssuePattern.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/filter/IssuePattern.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/filter/package-info.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/filter/package-info.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/filter/package-info.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/filter/package-info.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/package-info.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/package-info.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/package-info.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/package-info.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/language/LanguageRepository.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/language/LanguageRepository.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/language/LanguageRepository.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/language/LanguageRepository.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/language/LanguageRepositoryImpl.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/language/LanguageRepositoryImpl.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/language/LanguageRepositoryImpl.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/language/LanguageRepositoryImpl.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/language/package-info.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/language/package-info.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/language/package-info.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/language/package-info.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/BatchMeasureToMeasure.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/BatchMeasureToMeasure.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/BatchMeasureToMeasure.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/BatchMeasureToMeasure.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/BestValueOptimization.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/BestValueOptimization.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/BestValueOptimization.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/BestValueOptimization.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/MapBasedRawMeasureRepository.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/MapBasedRawMeasureRepository.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/MapBasedRawMeasureRepository.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/MapBasedRawMeasureRepository.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/Measure.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/Measure.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/Measure.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/Measure.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureComputersHolder.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureComputersHolder.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureComputersHolder.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureComputersHolder.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureComputersHolderImpl.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureComputersHolderImpl.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureComputersHolderImpl.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureComputersHolderImpl.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureComputersVisitor.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureComputersVisitor.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureComputersVisitor.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureComputersVisitor.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureDtoToMeasure.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureDtoToMeasure.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureDtoToMeasure.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureDtoToMeasure.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureKey.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureKey.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureKey.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureKey.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureRepository.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureRepository.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureRepository.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureRepository.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureRepositoryImpl.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureRepositoryImpl.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureRepositoryImpl.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureRepositoryImpl.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureToMeasureDto.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureToMeasureDto.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureToMeasureDto.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureToMeasureDto.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/MutableMeasureComputersHolder.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/MutableMeasureComputersHolder.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/MutableMeasureComputersHolder.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/MutableMeasureComputersHolder.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/QualityGateStatus.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/QualityGateStatus.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/QualityGateStatus.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/QualityGateStatus.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/package-info.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/package-info.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/package-info.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/package-info.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/qualitygatedetails/EvaluatedCondition.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/qualitygatedetails/EvaluatedCondition.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/qualitygatedetails/EvaluatedCondition.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/qualitygatedetails/EvaluatedCondition.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/qualitygatedetails/QualityGateDetailsData.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/qualitygatedetails/QualityGateDetailsData.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/qualitygatedetails/QualityGateDetailsData.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/qualitygatedetails/QualityGateDetailsData.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/qualitygatedetails/package-info.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/qualitygatedetails/package-info.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/qualitygatedetails/package-info.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/qualitygatedetails/package-info.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/metric/Metric.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/metric/Metric.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/metric/Metric.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/metric/Metric.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/metric/MetricDtoToMetric.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/metric/MetricDtoToMetric.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/metric/MetricDtoToMetric.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/metric/MetricDtoToMetric.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/metric/MetricImpl.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/metric/MetricImpl.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/metric/MetricImpl.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/metric/MetricImpl.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/metric/MetricModule.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/metric/MetricModule.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/metric/MetricModule.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/metric/MetricModule.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/metric/MetricRepository.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/metric/MetricRepository.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/metric/MetricRepository.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/metric/MetricRepository.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/metric/MetricRepositoryImpl.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/metric/MetricRepositoryImpl.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/metric/MetricRepositoryImpl.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/metric/MetricRepositoryImpl.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/metric/ReportMetricValidator.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/metric/ReportMetricValidator.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/metric/ReportMetricValidator.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/metric/ReportMetricValidator.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/metric/ReportMetricValidatorImpl.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/metric/ReportMetricValidatorImpl.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/metric/ReportMetricValidatorImpl.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/metric/ReportMetricValidatorImpl.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/metric/package-info.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/metric/package-info.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/metric/package-info.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/metric/package-info.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/package-info.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/package-info.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/package-info.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/package-info.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/period/Period.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/period/Period.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/period/Period.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/period/Period.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/period/PeriodHolder.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/period/PeriodHolder.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/period/PeriodHolder.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/period/PeriodHolder.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/period/PeriodHolderImpl.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/period/PeriodHolderImpl.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/period/PeriodHolderImpl.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/period/PeriodHolderImpl.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/period/package-info.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/period/package-info.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/period/package-info.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/period/package-info.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/Condition.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/Condition.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/Condition.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/Condition.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/ConditionEvaluator.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/ConditionEvaluator.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/ConditionEvaluator.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/ConditionEvaluator.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/ConditionStatus.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/ConditionStatus.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/ConditionStatus.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/ConditionStatus.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/EvaluationResult.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/EvaluationResult.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/EvaluationResult.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/EvaluationResult.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/EvaluationResultTextConverter.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/EvaluationResultTextConverter.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/EvaluationResultTextConverter.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/EvaluationResultTextConverter.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/EvaluationResultTextConverterImpl.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/EvaluationResultTextConverterImpl.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/EvaluationResultTextConverterImpl.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/EvaluationResultTextConverterImpl.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/MutableQualityGateHolder.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/MutableQualityGateHolder.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/MutableQualityGateHolder.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/MutableQualityGateHolder.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/MutableQualityGateStatusHolder.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/MutableQualityGateStatusHolder.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/MutableQualityGateStatusHolder.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/MutableQualityGateStatusHolder.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/QualityGate.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/QualityGate.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/QualityGate.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/QualityGate.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/QualityGateHolder.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/QualityGateHolder.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/QualityGateHolder.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/QualityGateHolder.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/QualityGateHolderImpl.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/QualityGateHolderImpl.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/QualityGateHolderImpl.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/QualityGateHolderImpl.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/QualityGateService.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/QualityGateService.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/QualityGateService.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/QualityGateService.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/QualityGateServiceImpl.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/QualityGateServiceImpl.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/QualityGateServiceImpl.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/QualityGateServiceImpl.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/QualityGateStatus.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/QualityGateStatus.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/QualityGateStatus.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/QualityGateStatus.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/QualityGateStatusHolder.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/QualityGateStatusHolder.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/QualityGateStatusHolder.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/QualityGateStatusHolder.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/QualityGateStatusHolderImpl.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/QualityGateStatusHolderImpl.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/QualityGateStatusHolderImpl.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/QualityGateStatusHolderImpl.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/package-info.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/package-info.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/package-info.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/package-info.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitymodel/MaintainabilityMeasuresVisitor.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitymodel/MaintainabilityMeasuresVisitor.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitymodel/MaintainabilityMeasuresVisitor.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitymodel/MaintainabilityMeasuresVisitor.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitymodel/NewMaintainabilityMeasuresVisitor.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitymodel/NewMaintainabilityMeasuresVisitor.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitymodel/NewMaintainabilityMeasuresVisitor.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitymodel/NewMaintainabilityMeasuresVisitor.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitymodel/NewReliabilityAndSecurityRatingMeasuresVisitor.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitymodel/NewReliabilityAndSecurityRatingMeasuresVisitor.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitymodel/NewReliabilityAndSecurityRatingMeasuresVisitor.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitymodel/NewReliabilityAndSecurityRatingMeasuresVisitor.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitymodel/RatingGrid.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitymodel/RatingGrid.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitymodel/RatingGrid.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitymodel/RatingGrid.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitymodel/RatingSettings.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitymodel/RatingSettings.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitymodel/RatingSettings.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitymodel/RatingSettings.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitymodel/ReliabilityAndSecurityRatingMeasuresVisitor.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitymodel/ReliabilityAndSecurityRatingMeasuresVisitor.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitymodel/ReliabilityAndSecurityRatingMeasuresVisitor.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitymodel/ReliabilityAndSecurityRatingMeasuresVisitor.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitymodel/package-info.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitymodel/package-info.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitymodel/package-info.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitymodel/package-info.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualityprofile/ActiveRule.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualityprofile/ActiveRule.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualityprofile/ActiveRule.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualityprofile/ActiveRule.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualityprofile/ActiveRulesHolder.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualityprofile/ActiveRulesHolder.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualityprofile/ActiveRulesHolder.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualityprofile/ActiveRulesHolder.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualityprofile/ActiveRulesHolderImpl.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualityprofile/ActiveRulesHolderImpl.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualityprofile/ActiveRulesHolderImpl.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualityprofile/ActiveRulesHolderImpl.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualityprofile/package-info.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualityprofile/package-info.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualityprofile/package-info.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualityprofile/package-info.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/scm/Changeset.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/scm/Changeset.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/scm/Changeset.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/scm/Changeset.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/scm/DbScmInfo.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/scm/DbScmInfo.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/scm/DbScmInfo.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/scm/DbScmInfo.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/scm/ReportScmInfo.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/scm/ReportScmInfo.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/scm/ReportScmInfo.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/scm/ReportScmInfo.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/scm/ScmInfo.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/scm/ScmInfo.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/scm/ScmInfo.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/scm/ScmInfo.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/scm/ScmInfoImpl.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/scm/ScmInfoImpl.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/scm/ScmInfoImpl.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/scm/ScmInfoImpl.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/scm/ScmInfoRepository.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/scm/ScmInfoRepository.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/scm/ScmInfoRepository.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/scm/ScmInfoRepository.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/scm/ScmInfoRepositoryImpl.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/scm/ScmInfoRepositoryImpl.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/scm/ScmInfoRepositoryImpl.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/scm/ScmInfoRepositoryImpl.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/scm/package-info.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/scm/package-info.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/scm/package-info.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/scm/package-info.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/source/ComputeFileSourceData.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/source/ComputeFileSourceData.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/source/ComputeFileSourceData.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/source/ComputeFileSourceData.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/source/CoverageLineReader.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/source/CoverageLineReader.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/source/CoverageLineReader.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/source/CoverageLineReader.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/source/DuplicationLineReader.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/source/DuplicationLineReader.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/source/DuplicationLineReader.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/source/DuplicationLineReader.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/source/HighlightingLineReader.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/source/HighlightingLineReader.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/source/HighlightingLineReader.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/source/HighlightingLineReader.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/source/LastCommitVisitor.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/source/LastCommitVisitor.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/source/LastCommitVisitor.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/source/LastCommitVisitor.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/source/LineReader.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/source/LineReader.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/source/LineReader.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/source/LineReader.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/source/RangeOffsetConverter.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/source/RangeOffsetConverter.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/source/RangeOffsetConverter.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/source/RangeOffsetConverter.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/source/ReportIterator.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/source/ReportIterator.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/source/ReportIterator.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/source/ReportIterator.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/source/ScmLineReader.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/source/ScmLineReader.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/source/ScmLineReader.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/source/ScmLineReader.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/source/SourceHashRepository.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/source/SourceHashRepository.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/source/SourceHashRepository.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/source/SourceHashRepository.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/source/SourceHashRepositoryImpl.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/source/SourceHashRepositoryImpl.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/source/SourceHashRepositoryImpl.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/source/SourceHashRepositoryImpl.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/source/SourceLinesRepository.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/source/SourceLinesRepository.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/source/SourceLinesRepository.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/source/SourceLinesRepository.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/source/SourceLinesRepositoryImpl.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/source/SourceLinesRepositoryImpl.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/source/SourceLinesRepositoryImpl.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/source/SourceLinesRepositoryImpl.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/source/SymbolsLineReader.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/source/SymbolsLineReader.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/source/SymbolsLineReader.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/source/SymbolsLineReader.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/source/package-info.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/source/package-info.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/source/package-info.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/source/package-info.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/AbstractComputationSteps.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/AbstractComputationSteps.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/AbstractComputationSteps.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/AbstractComputationSteps.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/BuildComponentTreeStep.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/BuildComponentTreeStep.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/BuildComponentTreeStep.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/BuildComponentTreeStep.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/CommentMeasuresStep.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/CommentMeasuresStep.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/CommentMeasuresStep.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/CommentMeasuresStep.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/ComplexityMeasuresStep.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/ComplexityMeasuresStep.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/ComplexityMeasuresStep.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/ComplexityMeasuresStep.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/ComputeMeasureVariationsStep.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/ComputeMeasureVariationsStep.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/ComputeMeasureVariationsStep.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/ComputeMeasureVariationsStep.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/ComputeQProfileMeasureStep.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/ComputeQProfileMeasureStep.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/ComputeQProfileMeasureStep.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/ComputeQProfileMeasureStep.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/CoverageMeasuresStep.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/CoverageMeasuresStep.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/CoverageMeasuresStep.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/CoverageMeasuresStep.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/CustomMeasuresCopyStep.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/CustomMeasuresCopyStep.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/CustomMeasuresCopyStep.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/CustomMeasuresCopyStep.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/DuplicationDataMeasuresStep.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/DuplicationDataMeasuresStep.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/DuplicationDataMeasuresStep.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/DuplicationDataMeasuresStep.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/DuplicationMeasuresStep.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/DuplicationMeasuresStep.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/DuplicationMeasuresStep.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/DuplicationMeasuresStep.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/EnableAnalysisStep.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/EnableAnalysisStep.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/EnableAnalysisStep.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/EnableAnalysisStep.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/ExecuteVisitorsStep.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/ExecuteVisitorsStep.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/ExecuteVisitorsStep.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/ExecuteVisitorsStep.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/ExtractReportStep.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/ExtractReportStep.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/ExtractReportStep.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/ExtractReportStep.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/GenerateAnalysisUuid.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/GenerateAnalysisUuid.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/GenerateAnalysisUuid.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/GenerateAnalysisUuid.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/IndexAnalysisStep.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/IndexAnalysisStep.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/IndexAnalysisStep.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/IndexAnalysisStep.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/LanguageDistributionMeasuresStep.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/LanguageDistributionMeasuresStep.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/LanguageDistributionMeasuresStep.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/LanguageDistributionMeasuresStep.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/LoadCrossProjectDuplicationsRepositoryStep.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/LoadCrossProjectDuplicationsRepositoryStep.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/LoadCrossProjectDuplicationsRepositoryStep.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/LoadCrossProjectDuplicationsRepositoryStep.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/LoadDuplicationsFromReportStep.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/LoadDuplicationsFromReportStep.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/LoadDuplicationsFromReportStep.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/LoadDuplicationsFromReportStep.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/LoadMeasureComputersStep.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/LoadMeasureComputersStep.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/LoadMeasureComputersStep.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/LoadMeasureComputersStep.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/LoadPeriodsStep.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/LoadPeriodsStep.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/LoadPeriodsStep.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/LoadPeriodsStep.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/LoadQualityGateStep.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/LoadQualityGateStep.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/LoadQualityGateStep.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/LoadQualityGateStep.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/LoadQualityProfilesStep.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/LoadQualityProfilesStep.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/LoadQualityProfilesStep.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/LoadQualityProfilesStep.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/LoadReportAnalysisMetadataHolderStep.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/LoadReportAnalysisMetadataHolderStep.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/LoadReportAnalysisMetadataHolderStep.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/LoadReportAnalysisMetadataHolderStep.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/NewCoverageMeasuresStep.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/NewCoverageMeasuresStep.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/NewCoverageMeasuresStep.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/NewCoverageMeasuresStep.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/NewSizeMeasuresStep.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/NewSizeMeasuresStep.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/NewSizeMeasuresStep.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/NewSizeMeasuresStep.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PeriodResolver.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PeriodResolver.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PeriodResolver.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PeriodResolver.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PersistAnalysisStep.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PersistAnalysisStep.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PersistAnalysisStep.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PersistAnalysisStep.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PersistComponentsStep.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PersistComponentsStep.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PersistComponentsStep.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PersistComponentsStep.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PersistCrossProjectDuplicationIndexStep.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PersistCrossProjectDuplicationIndexStep.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PersistCrossProjectDuplicationIndexStep.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PersistCrossProjectDuplicationIndexStep.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PersistDevelopersStep.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PersistDevelopersStep.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PersistDevelopersStep.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PersistDevelopersStep.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PersistEventsStep.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PersistEventsStep.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PersistEventsStep.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PersistEventsStep.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PersistFileSourcesStep.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PersistFileSourcesStep.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PersistFileSourcesStep.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PersistFileSourcesStep.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PersistIssuesStep.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PersistIssuesStep.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PersistIssuesStep.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PersistIssuesStep.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PersistMeasuresStep.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PersistMeasuresStep.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PersistMeasuresStep.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PersistMeasuresStep.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PersistProjectLinksStep.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PersistProjectLinksStep.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PersistProjectLinksStep.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PersistProjectLinksStep.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PersistScannerContextStep.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PersistScannerContextStep.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PersistScannerContextStep.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PersistScannerContextStep.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PersistTestsStep.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PersistTestsStep.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PersistTestsStep.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PersistTestsStep.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PublishTaskResultStep.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PublishTaskResultStep.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PublishTaskResultStep.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PublishTaskResultStep.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PurgeDatastoresStep.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PurgeDatastoresStep.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PurgeDatastoresStep.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PurgeDatastoresStep.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/QualityGateEventsStep.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/QualityGateEventsStep.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/QualityGateEventsStep.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/QualityGateEventsStep.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/QualityGateMeasuresStep.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/QualityGateMeasuresStep.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/QualityGateMeasuresStep.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/QualityGateMeasuresStep.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/QualityProfileEventsStep.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/QualityProfileEventsStep.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/QualityProfileEventsStep.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/QualityProfileEventsStep.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/ReportComputationSteps.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/ReportComputationSteps.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/ReportComputationSteps.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/ReportComputationSteps.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/SendIssueNotificationsStep.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/SendIssueNotificationsStep.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/SendIssueNotificationsStep.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/SendIssueNotificationsStep.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/SizeMeasuresStep.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/SizeMeasuresStep.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/SizeMeasuresStep.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/SizeMeasuresStep.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/UnitTestMeasuresStep.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/UnitTestMeasuresStep.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/UnitTestMeasuresStep.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/UnitTestMeasuresStep.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/UpdateQualityProfilesLastUsedDateStep.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/UpdateQualityProfilesLastUsedDateStep.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/UpdateQualityProfilesLastUsedDateStep.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/UpdateQualityProfilesLastUsedDateStep.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/ValidateProjectStep.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/ValidateProjectStep.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/ValidateProjectStep.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/ValidateProjectStep.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/package-info.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/package-info.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/package-info.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/package-info.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/taskprocessor/ReportTaskProcessor.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/taskprocessor/ReportTaskProcessor.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/taskprocessor/ReportTaskProcessor.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/taskprocessor/ReportTaskProcessor.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/taskprocessor/package-info.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/taskprocessor/package-info.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/taskprocessor/package-info.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/taskprocessor/package-info.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/webhook/TestWebhookPayloadFactory.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/webhook/TestWebhookPayloadFactory.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/webhook/TestWebhookPayloadFactory.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/webhook/TestWebhookPayloadFactory.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/webhook/Webhook.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/webhook/Webhook.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/webhook/Webhook.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/webhook/Webhook.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/webhook/WebhookCaller.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/webhook/WebhookCaller.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/webhook/WebhookCaller.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/webhook/WebhookCaller.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/webhook/WebhookCallerImpl.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/webhook/WebhookCallerImpl.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/webhook/WebhookCallerImpl.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/webhook/WebhookCallerImpl.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/webhook/WebhookDelivery.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/webhook/WebhookDelivery.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/webhook/WebhookDelivery.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/webhook/WebhookDelivery.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/webhook/WebhookDeliveryStorage.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/webhook/WebhookDeliveryStorage.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/webhook/WebhookDeliveryStorage.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/webhook/WebhookDeliveryStorage.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/webhook/WebhookModule.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/webhook/WebhookModule.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/webhook/WebhookModule.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/webhook/WebhookModule.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/webhook/WebhookPayload.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/webhook/WebhookPayload.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/webhook/WebhookPayload.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/webhook/WebhookPayload.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/webhook/WebhookPayloadFactory.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/webhook/WebhookPayloadFactory.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/webhook/WebhookPayloadFactory.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/webhook/WebhookPayloadFactory.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/webhook/WebhookPayloadFactoryImpl.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/webhook/WebhookPayloadFactoryImpl.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/webhook/WebhookPayloadFactoryImpl.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/webhook/WebhookPayloadFactoryImpl.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/webhook/WebhookPostTask.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/webhook/WebhookPostTask.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/webhook/WebhookPostTask.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/webhook/WebhookPostTask.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/webhook/package-info.java b/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/webhook/package-info.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/webhook/package-info.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/webhook/package-info.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/step/ComputationStep.java b/sonar-server/src/main/java/org/sonar/server/computation/task/step/ComputationStep.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/step/ComputationStep.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/step/ComputationStep.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/step/ComputationStepExecutor.java b/sonar-server/src/main/java/org/sonar/server/computation/task/step/ComputationStepExecutor.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/step/ComputationStepExecutor.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/step/ComputationStepExecutor.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/step/ComputationSteps.java b/sonar-server/src/main/java/org/sonar/server/computation/task/step/ComputationSteps.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/step/ComputationSteps.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/step/ComputationSteps.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/step/package-info.java b/sonar-server/src/main/java/org/sonar/server/computation/task/step/package-info.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/task/step/package-info.java rename to sonar-server/src/main/java/org/sonar/server/computation/task/step/package-info.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/taskprocessor/MutableTaskResultHolder.java b/sonar-server/src/main/java/org/sonar/server/computation/taskprocessor/MutableTaskResultHolder.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/taskprocessor/MutableTaskResultHolder.java rename to sonar-server/src/main/java/org/sonar/server/computation/taskprocessor/MutableTaskResultHolder.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/taskprocessor/MutableTaskResultHolderImpl.java b/sonar-server/src/main/java/org/sonar/server/computation/taskprocessor/MutableTaskResultHolderImpl.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/taskprocessor/MutableTaskResultHolderImpl.java rename to sonar-server/src/main/java/org/sonar/server/computation/taskprocessor/MutableTaskResultHolderImpl.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/taskprocessor/TaskResultHolder.java b/sonar-server/src/main/java/org/sonar/server/computation/taskprocessor/TaskResultHolder.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/taskprocessor/TaskResultHolder.java rename to sonar-server/src/main/java/org/sonar/server/computation/taskprocessor/TaskResultHolder.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/util/InitializedProperty.java b/sonar-server/src/main/java/org/sonar/server/computation/util/InitializedProperty.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/util/InitializedProperty.java rename to sonar-server/src/main/java/org/sonar/server/computation/util/InitializedProperty.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/util/package-info.java b/sonar-server/src/main/java/org/sonar/server/computation/util/package-info.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/computation/util/package-info.java rename to sonar-server/src/main/java/org/sonar/server/computation/util/package-info.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/debt/DebtModelPluginRepository.java b/sonar-server/src/main/java/org/sonar/server/debt/DebtModelPluginRepository.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/debt/DebtModelPluginRepository.java rename to sonar-server/src/main/java/org/sonar/server/debt/DebtModelPluginRepository.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/debt/DebtModelXMLExporter.java b/sonar-server/src/main/java/org/sonar/server/debt/DebtModelXMLExporter.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/debt/DebtModelXMLExporter.java rename to sonar-server/src/main/java/org/sonar/server/debt/DebtModelXMLExporter.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/debt/DebtRulesXMLImporter.java b/sonar-server/src/main/java/org/sonar/server/debt/DebtRulesXMLImporter.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/debt/DebtRulesXMLImporter.java rename to sonar-server/src/main/java/org/sonar/server/debt/DebtRulesXMLImporter.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/debt/package-info.java b/sonar-server/src/main/java/org/sonar/server/debt/package-info.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/debt/package-info.java rename to sonar-server/src/main/java/org/sonar/server/debt/package-info.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/duplication/ws/DuplicationsParser.java b/sonar-server/src/main/java/org/sonar/server/duplication/ws/DuplicationsParser.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/duplication/ws/DuplicationsParser.java rename to sonar-server/src/main/java/org/sonar/server/duplication/ws/DuplicationsParser.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/duplication/ws/DuplicationsWs.java b/sonar-server/src/main/java/org/sonar/server/duplication/ws/DuplicationsWs.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/duplication/ws/DuplicationsWs.java rename to sonar-server/src/main/java/org/sonar/server/duplication/ws/DuplicationsWs.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/duplication/ws/DuplicationsWsAction.java b/sonar-server/src/main/java/org/sonar/server/duplication/ws/DuplicationsWsAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/duplication/ws/DuplicationsWsAction.java rename to sonar-server/src/main/java/org/sonar/server/duplication/ws/DuplicationsWsAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/duplication/ws/ShowAction.java b/sonar-server/src/main/java/org/sonar/server/duplication/ws/ShowAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/duplication/ws/ShowAction.java rename to sonar-server/src/main/java/org/sonar/server/duplication/ws/ShowAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/duplication/ws/ShowResponseBuilder.java b/sonar-server/src/main/java/org/sonar/server/duplication/ws/ShowResponseBuilder.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/duplication/ws/ShowResponseBuilder.java rename to sonar-server/src/main/java/org/sonar/server/duplication/ws/ShowResponseBuilder.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/duplication/ws/package-info.java b/sonar-server/src/main/java/org/sonar/server/duplication/ws/package-info.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/duplication/ws/package-info.java rename to sonar-server/src/main/java/org/sonar/server/duplication/ws/package-info.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/email/ws/EmailsWs.java b/sonar-server/src/main/java/org/sonar/server/email/ws/EmailsWs.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/email/ws/EmailsWs.java rename to sonar-server/src/main/java/org/sonar/server/email/ws/EmailsWs.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/email/ws/EmailsWsAction.java b/sonar-server/src/main/java/org/sonar/server/email/ws/EmailsWsAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/email/ws/EmailsWsAction.java rename to sonar-server/src/main/java/org/sonar/server/email/ws/EmailsWsAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/email/ws/EmailsWsModule.java b/sonar-server/src/main/java/org/sonar/server/email/ws/EmailsWsModule.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/email/ws/EmailsWsModule.java rename to sonar-server/src/main/java/org/sonar/server/email/ws/EmailsWsModule.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/email/ws/SendAction.java b/sonar-server/src/main/java/org/sonar/server/email/ws/SendAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/email/ws/SendAction.java rename to sonar-server/src/main/java/org/sonar/server/email/ws/SendAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/email/ws/package-info.java b/sonar-server/src/main/java/org/sonar/server/email/ws/package-info.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/email/ws/package-info.java rename to sonar-server/src/main/java/org/sonar/server/email/ws/package-info.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/es/BaseDoc.java b/sonar-server/src/main/java/org/sonar/server/es/BaseDoc.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/es/BaseDoc.java rename to sonar-server/src/main/java/org/sonar/server/es/BaseDoc.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/es/BulkIndexer.java b/sonar-server/src/main/java/org/sonar/server/es/BulkIndexer.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/es/BulkIndexer.java rename to sonar-server/src/main/java/org/sonar/server/es/BulkIndexer.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/es/DefaultIndexSettings.java b/sonar-server/src/main/java/org/sonar/server/es/DefaultIndexSettings.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/es/DefaultIndexSettings.java rename to sonar-server/src/main/java/org/sonar/server/es/DefaultIndexSettings.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/es/DefaultIndexSettingsElement.java b/sonar-server/src/main/java/org/sonar/server/es/DefaultIndexSettingsElement.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/es/DefaultIndexSettingsElement.java rename to sonar-server/src/main/java/org/sonar/server/es/DefaultIndexSettingsElement.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/es/EsClient.java b/sonar-server/src/main/java/org/sonar/server/es/EsClient.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/es/EsClient.java rename to sonar-server/src/main/java/org/sonar/server/es/EsClient.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/es/EsClientProvider.java b/sonar-server/src/main/java/org/sonar/server/es/EsClientProvider.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/es/EsClientProvider.java rename to sonar-server/src/main/java/org/sonar/server/es/EsClientProvider.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/es/EsClientStopper.java b/sonar-server/src/main/java/org/sonar/server/es/EsClientStopper.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/es/EsClientStopper.java rename to sonar-server/src/main/java/org/sonar/server/es/EsClientStopper.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/es/EsUtils.java b/sonar-server/src/main/java/org/sonar/server/es/EsUtils.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/es/EsUtils.java rename to sonar-server/src/main/java/org/sonar/server/es/EsUtils.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/es/Facets.java b/sonar-server/src/main/java/org/sonar/server/es/Facets.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/es/Facets.java rename to sonar-server/src/main/java/org/sonar/server/es/Facets.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/es/IndexCreator.java b/sonar-server/src/main/java/org/sonar/server/es/IndexCreator.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/es/IndexCreator.java rename to sonar-server/src/main/java/org/sonar/server/es/IndexCreator.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/es/IndexDefinition.java b/sonar-server/src/main/java/org/sonar/server/es/IndexDefinition.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/es/IndexDefinition.java rename to sonar-server/src/main/java/org/sonar/server/es/IndexDefinition.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/es/IndexDefinitionHash.java b/sonar-server/src/main/java/org/sonar/server/es/IndexDefinitionHash.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/es/IndexDefinitionHash.java rename to sonar-server/src/main/java/org/sonar/server/es/IndexDefinitionHash.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/es/IndexDefinitions.java b/sonar-server/src/main/java/org/sonar/server/es/IndexDefinitions.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/es/IndexDefinitions.java rename to sonar-server/src/main/java/org/sonar/server/es/IndexDefinitions.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/es/IndexType.java b/sonar-server/src/main/java/org/sonar/server/es/IndexType.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/es/IndexType.java rename to sonar-server/src/main/java/org/sonar/server/es/IndexType.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/es/IndexerStartupTask.java b/sonar-server/src/main/java/org/sonar/server/es/IndexerStartupTask.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/es/IndexerStartupTask.java rename to sonar-server/src/main/java/org/sonar/server/es/IndexerStartupTask.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/es/IndexingListener.java b/sonar-server/src/main/java/org/sonar/server/es/IndexingListener.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/es/IndexingListener.java rename to sonar-server/src/main/java/org/sonar/server/es/IndexingListener.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/es/IndexingResult.java b/sonar-server/src/main/java/org/sonar/server/es/IndexingResult.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/es/IndexingResult.java rename to sonar-server/src/main/java/org/sonar/server/es/IndexingResult.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/es/NewIndex.java b/sonar-server/src/main/java/org/sonar/server/es/NewIndex.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/es/NewIndex.java rename to sonar-server/src/main/java/org/sonar/server/es/NewIndex.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/es/ProjectIndexer.java b/sonar-server/src/main/java/org/sonar/server/es/ProjectIndexer.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/es/ProjectIndexer.java rename to sonar-server/src/main/java/org/sonar/server/es/ProjectIndexer.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/es/RecoveryIndexer.java b/sonar-server/src/main/java/org/sonar/server/es/RecoveryIndexer.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/es/RecoveryIndexer.java rename to sonar-server/src/main/java/org/sonar/server/es/RecoveryIndexer.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/es/ResiliencyIndexingListener.java b/sonar-server/src/main/java/org/sonar/server/es/ResiliencyIndexingListener.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/es/ResiliencyIndexingListener.java rename to sonar-server/src/main/java/org/sonar/server/es/ResiliencyIndexingListener.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/es/ResilientIndexer.java b/sonar-server/src/main/java/org/sonar/server/es/ResilientIndexer.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/es/ResilientIndexer.java rename to sonar-server/src/main/java/org/sonar/server/es/ResilientIndexer.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/es/SearchIdResult.java b/sonar-server/src/main/java/org/sonar/server/es/SearchIdResult.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/es/SearchIdResult.java rename to sonar-server/src/main/java/org/sonar/server/es/SearchIdResult.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/es/SearchOptions.java b/sonar-server/src/main/java/org/sonar/server/es/SearchOptions.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/es/SearchOptions.java rename to sonar-server/src/main/java/org/sonar/server/es/SearchOptions.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/es/SearchResult.java b/sonar-server/src/main/java/org/sonar/server/es/SearchResult.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/es/SearchResult.java rename to sonar-server/src/main/java/org/sonar/server/es/SearchResult.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/es/Sorting.java b/sonar-server/src/main/java/org/sonar/server/es/Sorting.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/es/Sorting.java rename to sonar-server/src/main/java/org/sonar/server/es/Sorting.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/es/StartupIndexer.java b/sonar-server/src/main/java/org/sonar/server/es/StartupIndexer.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/es/StartupIndexer.java rename to sonar-server/src/main/java/org/sonar/server/es/StartupIndexer.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/es/StickyFacetBuilder.java b/sonar-server/src/main/java/org/sonar/server/es/StickyFacetBuilder.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/es/StickyFacetBuilder.java rename to sonar-server/src/main/java/org/sonar/server/es/StickyFacetBuilder.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/es/package-info.java b/sonar-server/src/main/java/org/sonar/server/es/package-info.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/es/package-info.java rename to sonar-server/src/main/java/org/sonar/server/es/package-info.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/es/request/ProxyBulkRequestBuilder.java b/sonar-server/src/main/java/org/sonar/server/es/request/ProxyBulkRequestBuilder.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/es/request/ProxyBulkRequestBuilder.java rename to sonar-server/src/main/java/org/sonar/server/es/request/ProxyBulkRequestBuilder.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/es/request/ProxyClearCacheRequestBuilder.java b/sonar-server/src/main/java/org/sonar/server/es/request/ProxyClearCacheRequestBuilder.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/es/request/ProxyClearCacheRequestBuilder.java rename to sonar-server/src/main/java/org/sonar/server/es/request/ProxyClearCacheRequestBuilder.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/es/request/ProxyClusterHealthRequestBuilder.java b/sonar-server/src/main/java/org/sonar/server/es/request/ProxyClusterHealthRequestBuilder.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/es/request/ProxyClusterHealthRequestBuilder.java rename to sonar-server/src/main/java/org/sonar/server/es/request/ProxyClusterHealthRequestBuilder.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/es/request/ProxyClusterStateRequestBuilder.java b/sonar-server/src/main/java/org/sonar/server/es/request/ProxyClusterStateRequestBuilder.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/es/request/ProxyClusterStateRequestBuilder.java rename to sonar-server/src/main/java/org/sonar/server/es/request/ProxyClusterStateRequestBuilder.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/es/request/ProxyClusterStatsRequestBuilder.java b/sonar-server/src/main/java/org/sonar/server/es/request/ProxyClusterStatsRequestBuilder.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/es/request/ProxyClusterStatsRequestBuilder.java rename to sonar-server/src/main/java/org/sonar/server/es/request/ProxyClusterStatsRequestBuilder.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/es/request/ProxyCreateIndexRequestBuilder.java b/sonar-server/src/main/java/org/sonar/server/es/request/ProxyCreateIndexRequestBuilder.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/es/request/ProxyCreateIndexRequestBuilder.java rename to sonar-server/src/main/java/org/sonar/server/es/request/ProxyCreateIndexRequestBuilder.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/es/request/ProxyDeleteRequestBuilder.java b/sonar-server/src/main/java/org/sonar/server/es/request/ProxyDeleteRequestBuilder.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/es/request/ProxyDeleteRequestBuilder.java rename to sonar-server/src/main/java/org/sonar/server/es/request/ProxyDeleteRequestBuilder.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/es/request/ProxyFlushRequestBuilder.java b/sonar-server/src/main/java/org/sonar/server/es/request/ProxyFlushRequestBuilder.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/es/request/ProxyFlushRequestBuilder.java rename to sonar-server/src/main/java/org/sonar/server/es/request/ProxyFlushRequestBuilder.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/es/request/ProxyGetRequestBuilder.java b/sonar-server/src/main/java/org/sonar/server/es/request/ProxyGetRequestBuilder.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/es/request/ProxyGetRequestBuilder.java rename to sonar-server/src/main/java/org/sonar/server/es/request/ProxyGetRequestBuilder.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/es/request/ProxyIndexRequestBuilder.java b/sonar-server/src/main/java/org/sonar/server/es/request/ProxyIndexRequestBuilder.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/es/request/ProxyIndexRequestBuilder.java rename to sonar-server/src/main/java/org/sonar/server/es/request/ProxyIndexRequestBuilder.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/es/request/ProxyIndicesExistsRequestBuilder.java b/sonar-server/src/main/java/org/sonar/server/es/request/ProxyIndicesExistsRequestBuilder.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/es/request/ProxyIndicesExistsRequestBuilder.java rename to sonar-server/src/main/java/org/sonar/server/es/request/ProxyIndicesExistsRequestBuilder.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/es/request/ProxyIndicesStatsRequestBuilder.java b/sonar-server/src/main/java/org/sonar/server/es/request/ProxyIndicesStatsRequestBuilder.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/es/request/ProxyIndicesStatsRequestBuilder.java rename to sonar-server/src/main/java/org/sonar/server/es/request/ProxyIndicesStatsRequestBuilder.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/es/request/ProxyMultiGetRequestBuilder.java b/sonar-server/src/main/java/org/sonar/server/es/request/ProxyMultiGetRequestBuilder.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/es/request/ProxyMultiGetRequestBuilder.java rename to sonar-server/src/main/java/org/sonar/server/es/request/ProxyMultiGetRequestBuilder.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/es/request/ProxyNodesStatsRequestBuilder.java b/sonar-server/src/main/java/org/sonar/server/es/request/ProxyNodesStatsRequestBuilder.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/es/request/ProxyNodesStatsRequestBuilder.java rename to sonar-server/src/main/java/org/sonar/server/es/request/ProxyNodesStatsRequestBuilder.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/es/request/ProxyPutMappingRequestBuilder.java b/sonar-server/src/main/java/org/sonar/server/es/request/ProxyPutMappingRequestBuilder.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/es/request/ProxyPutMappingRequestBuilder.java rename to sonar-server/src/main/java/org/sonar/server/es/request/ProxyPutMappingRequestBuilder.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/es/request/ProxyRefreshRequestBuilder.java b/sonar-server/src/main/java/org/sonar/server/es/request/ProxyRefreshRequestBuilder.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/es/request/ProxyRefreshRequestBuilder.java rename to sonar-server/src/main/java/org/sonar/server/es/request/ProxyRefreshRequestBuilder.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/es/request/ProxySearchRequestBuilder.java b/sonar-server/src/main/java/org/sonar/server/es/request/ProxySearchRequestBuilder.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/es/request/ProxySearchRequestBuilder.java rename to sonar-server/src/main/java/org/sonar/server/es/request/ProxySearchRequestBuilder.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/es/request/ProxySearchScrollRequestBuilder.java b/sonar-server/src/main/java/org/sonar/server/es/request/ProxySearchScrollRequestBuilder.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/es/request/ProxySearchScrollRequestBuilder.java rename to sonar-server/src/main/java/org/sonar/server/es/request/ProxySearchScrollRequestBuilder.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/es/request/package-info.java b/sonar-server/src/main/java/org/sonar/server/es/request/package-info.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/es/request/package-info.java rename to sonar-server/src/main/java/org/sonar/server/es/request/package-info.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/es/textsearch/ComponentTextSearchFeature.java b/sonar-server/src/main/java/org/sonar/server/es/textsearch/ComponentTextSearchFeature.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/es/textsearch/ComponentTextSearchFeature.java rename to sonar-server/src/main/java/org/sonar/server/es/textsearch/ComponentTextSearchFeature.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/es/textsearch/ComponentTextSearchFeatureRepertoire.java b/sonar-server/src/main/java/org/sonar/server/es/textsearch/ComponentTextSearchFeatureRepertoire.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/es/textsearch/ComponentTextSearchFeatureRepertoire.java rename to sonar-server/src/main/java/org/sonar/server/es/textsearch/ComponentTextSearchFeatureRepertoire.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/es/textsearch/ComponentTextSearchQueryFactory.java b/sonar-server/src/main/java/org/sonar/server/es/textsearch/ComponentTextSearchQueryFactory.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/es/textsearch/ComponentTextSearchQueryFactory.java rename to sonar-server/src/main/java/org/sonar/server/es/textsearch/ComponentTextSearchQueryFactory.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/es/textsearch/package-info.java b/sonar-server/src/main/java/org/sonar/server/es/textsearch/package-info.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/es/textsearch/package-info.java rename to sonar-server/src/main/java/org/sonar/server/es/textsearch/package-info.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/event/NewAlerts.java b/sonar-server/src/main/java/org/sonar/server/event/NewAlerts.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/event/NewAlerts.java rename to sonar-server/src/main/java/org/sonar/server/event/NewAlerts.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/event/package-info.java b/sonar-server/src/main/java/org/sonar/server/event/package-info.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/event/package-info.java rename to sonar-server/src/main/java/org/sonar/server/event/package-info.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/exceptions/BadRequestException.java b/sonar-server/src/main/java/org/sonar/server/exceptions/BadRequestException.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/exceptions/BadRequestException.java rename to sonar-server/src/main/java/org/sonar/server/exceptions/BadRequestException.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/exceptions/ForbiddenException.java b/sonar-server/src/main/java/org/sonar/server/exceptions/ForbiddenException.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/exceptions/ForbiddenException.java rename to sonar-server/src/main/java/org/sonar/server/exceptions/ForbiddenException.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/exceptions/Message.java b/sonar-server/src/main/java/org/sonar/server/exceptions/Message.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/exceptions/Message.java rename to sonar-server/src/main/java/org/sonar/server/exceptions/Message.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/exceptions/NotFoundException.java b/sonar-server/src/main/java/org/sonar/server/exceptions/NotFoundException.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/exceptions/NotFoundException.java rename to sonar-server/src/main/java/org/sonar/server/exceptions/NotFoundException.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/exceptions/ServerException.java b/sonar-server/src/main/java/org/sonar/server/exceptions/ServerException.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/exceptions/ServerException.java rename to sonar-server/src/main/java/org/sonar/server/exceptions/ServerException.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/exceptions/UnauthorizedException.java b/sonar-server/src/main/java/org/sonar/server/exceptions/UnauthorizedException.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/exceptions/UnauthorizedException.java rename to sonar-server/src/main/java/org/sonar/server/exceptions/UnauthorizedException.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/exceptions/package-info.java b/sonar-server/src/main/java/org/sonar/server/exceptions/package-info.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/exceptions/package-info.java rename to sonar-server/src/main/java/org/sonar/server/exceptions/package-info.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/favorite/FavoriteFinder.java b/sonar-server/src/main/java/org/sonar/server/favorite/FavoriteFinder.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/favorite/FavoriteFinder.java rename to sonar-server/src/main/java/org/sonar/server/favorite/FavoriteFinder.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/favorite/FavoriteModule.java b/sonar-server/src/main/java/org/sonar/server/favorite/FavoriteModule.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/favorite/FavoriteModule.java rename to sonar-server/src/main/java/org/sonar/server/favorite/FavoriteModule.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/favorite/FavoriteUpdater.java b/sonar-server/src/main/java/org/sonar/server/favorite/FavoriteUpdater.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/favorite/FavoriteUpdater.java rename to sonar-server/src/main/java/org/sonar/server/favorite/FavoriteUpdater.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/favorite/package-info.java b/sonar-server/src/main/java/org/sonar/server/favorite/package-info.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/favorite/package-info.java rename to sonar-server/src/main/java/org/sonar/server/favorite/package-info.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/favorite/ws/AddAction.java b/sonar-server/src/main/java/org/sonar/server/favorite/ws/AddAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/favorite/ws/AddAction.java rename to sonar-server/src/main/java/org/sonar/server/favorite/ws/AddAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/favorite/ws/FavoritesWs.java b/sonar-server/src/main/java/org/sonar/server/favorite/ws/FavoritesWs.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/favorite/ws/FavoritesWs.java rename to sonar-server/src/main/java/org/sonar/server/favorite/ws/FavoritesWs.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/favorite/ws/FavoritesWsAction.java b/sonar-server/src/main/java/org/sonar/server/favorite/ws/FavoritesWsAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/favorite/ws/FavoritesWsAction.java rename to sonar-server/src/main/java/org/sonar/server/favorite/ws/FavoritesWsAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/favorite/ws/FavouritesWs.java b/sonar-server/src/main/java/org/sonar/server/favorite/ws/FavouritesWs.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/favorite/ws/FavouritesWs.java rename to sonar-server/src/main/java/org/sonar/server/favorite/ws/FavouritesWs.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/favorite/ws/RemoveAction.java b/sonar-server/src/main/java/org/sonar/server/favorite/ws/RemoveAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/favorite/ws/RemoveAction.java rename to sonar-server/src/main/java/org/sonar/server/favorite/ws/RemoveAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/favorite/ws/SearchAction.java b/sonar-server/src/main/java/org/sonar/server/favorite/ws/SearchAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/favorite/ws/SearchAction.java rename to sonar-server/src/main/java/org/sonar/server/favorite/ws/SearchAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/favorite/ws/package-info.java b/sonar-server/src/main/java/org/sonar/server/favorite/ws/package-info.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/favorite/ws/package-info.java rename to sonar-server/src/main/java/org/sonar/server/favorite/ws/package-info.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/AbstractChangeTagsAction.java b/sonar-server/src/main/java/org/sonar/server/issue/AbstractChangeTagsAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/AbstractChangeTagsAction.java rename to sonar-server/src/main/java/org/sonar/server/issue/AbstractChangeTagsAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/Action.java b/sonar-server/src/main/java/org/sonar/server/issue/Action.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/Action.java rename to sonar-server/src/main/java/org/sonar/server/issue/Action.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/ActionFinder.java b/sonar-server/src/main/java/org/sonar/server/issue/ActionFinder.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/ActionFinder.java rename to sonar-server/src/main/java/org/sonar/server/issue/ActionFinder.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/AddTagsAction.java b/sonar-server/src/main/java/org/sonar/server/issue/AddTagsAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/AddTagsAction.java rename to sonar-server/src/main/java/org/sonar/server/issue/AddTagsAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/AssignAction.java b/sonar-server/src/main/java/org/sonar/server/issue/AssignAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/AssignAction.java rename to sonar-server/src/main/java/org/sonar/server/issue/AssignAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/CommentAction.java b/sonar-server/src/main/java/org/sonar/server/issue/CommentAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/CommentAction.java rename to sonar-server/src/main/java/org/sonar/server/issue/CommentAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/IssueFieldsSetter.java b/sonar-server/src/main/java/org/sonar/server/issue/IssueFieldsSetter.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/IssueFieldsSetter.java rename to sonar-server/src/main/java/org/sonar/server/issue/IssueFieldsSetter.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/IssueFinder.java b/sonar-server/src/main/java/org/sonar/server/issue/IssueFinder.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/IssueFinder.java rename to sonar-server/src/main/java/org/sonar/server/issue/IssueFinder.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/IssueQuery.java b/sonar-server/src/main/java/org/sonar/server/issue/IssueQuery.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/IssueQuery.java rename to sonar-server/src/main/java/org/sonar/server/issue/IssueQuery.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/IssueQueryFactory.java b/sonar-server/src/main/java/org/sonar/server/issue/IssueQueryFactory.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/IssueQueryFactory.java rename to sonar-server/src/main/java/org/sonar/server/issue/IssueQueryFactory.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/IssueService.java b/sonar-server/src/main/java/org/sonar/server/issue/IssueService.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/IssueService.java rename to sonar-server/src/main/java/org/sonar/server/issue/IssueService.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/IssueStorage.java b/sonar-server/src/main/java/org/sonar/server/issue/IssueStorage.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/IssueStorage.java rename to sonar-server/src/main/java/org/sonar/server/issue/IssueStorage.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/IssueUpdater.java b/sonar-server/src/main/java/org/sonar/server/issue/IssueUpdater.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/IssueUpdater.java rename to sonar-server/src/main/java/org/sonar/server/issue/IssueUpdater.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/IssuesFinderSort.java b/sonar-server/src/main/java/org/sonar/server/issue/IssuesFinderSort.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/IssuesFinderSort.java rename to sonar-server/src/main/java/org/sonar/server/issue/IssuesFinderSort.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/RemoveTagsAction.java b/sonar-server/src/main/java/org/sonar/server/issue/RemoveTagsAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/RemoveTagsAction.java rename to sonar-server/src/main/java/org/sonar/server/issue/RemoveTagsAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/Result.java b/sonar-server/src/main/java/org/sonar/server/issue/Result.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/Result.java rename to sonar-server/src/main/java/org/sonar/server/issue/Result.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/ServerIssueStorage.java b/sonar-server/src/main/java/org/sonar/server/issue/ServerIssueStorage.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/ServerIssueStorage.java rename to sonar-server/src/main/java/org/sonar/server/issue/ServerIssueStorage.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/SetSeverityAction.java b/sonar-server/src/main/java/org/sonar/server/issue/SetSeverityAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/SetSeverityAction.java rename to sonar-server/src/main/java/org/sonar/server/issue/SetSeverityAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/SetTypeAction.java b/sonar-server/src/main/java/org/sonar/server/issue/SetTypeAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/SetTypeAction.java rename to sonar-server/src/main/java/org/sonar/server/issue/SetTypeAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/TransitionAction.java b/sonar-server/src/main/java/org/sonar/server/issue/TransitionAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/TransitionAction.java rename to sonar-server/src/main/java/org/sonar/server/issue/TransitionAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/TransitionService.java b/sonar-server/src/main/java/org/sonar/server/issue/TransitionService.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/TransitionService.java rename to sonar-server/src/main/java/org/sonar/server/issue/TransitionService.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/index/IssueDoc.java b/sonar-server/src/main/java/org/sonar/server/issue/index/IssueDoc.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/index/IssueDoc.java rename to sonar-server/src/main/java/org/sonar/server/issue/index/IssueDoc.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/index/IssueIndex.java b/sonar-server/src/main/java/org/sonar/server/issue/index/IssueIndex.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/index/IssueIndex.java rename to sonar-server/src/main/java/org/sonar/server/issue/index/IssueIndex.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/index/IssueIndexDefinition.java b/sonar-server/src/main/java/org/sonar/server/issue/index/IssueIndexDefinition.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/index/IssueIndexDefinition.java rename to sonar-server/src/main/java/org/sonar/server/issue/index/IssueIndexDefinition.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/index/IssueIndexer.java b/sonar-server/src/main/java/org/sonar/server/issue/index/IssueIndexer.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/index/IssueIndexer.java rename to sonar-server/src/main/java/org/sonar/server/issue/index/IssueIndexer.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/index/IssueIterator.java b/sonar-server/src/main/java/org/sonar/server/issue/index/IssueIterator.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/index/IssueIterator.java rename to sonar-server/src/main/java/org/sonar/server/issue/index/IssueIterator.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/index/IssueIteratorFactory.java b/sonar-server/src/main/java/org/sonar/server/issue/index/IssueIteratorFactory.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/index/IssueIteratorFactory.java rename to sonar-server/src/main/java/org/sonar/server/issue/index/IssueIteratorFactory.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/index/IssueIteratorForMultipleChunks.java b/sonar-server/src/main/java/org/sonar/server/issue/index/IssueIteratorForMultipleChunks.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/index/IssueIteratorForMultipleChunks.java rename to sonar-server/src/main/java/org/sonar/server/issue/index/IssueIteratorForMultipleChunks.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/index/IssueIteratorForSingleChunk.java b/sonar-server/src/main/java/org/sonar/server/issue/index/IssueIteratorForSingleChunk.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/index/IssueIteratorForSingleChunk.java rename to sonar-server/src/main/java/org/sonar/server/issue/index/IssueIteratorForSingleChunk.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/index/package-info.java b/sonar-server/src/main/java/org/sonar/server/issue/index/package-info.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/index/package-info.java rename to sonar-server/src/main/java/org/sonar/server/issue/index/package-info.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/notification/AbstractNewIssuesEmailTemplate.java b/sonar-server/src/main/java/org/sonar/server/issue/notification/AbstractNewIssuesEmailTemplate.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/notification/AbstractNewIssuesEmailTemplate.java rename to sonar-server/src/main/java/org/sonar/server/issue/notification/AbstractNewIssuesEmailTemplate.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/notification/ChangesOnMyIssueNotificationDispatcher.java b/sonar-server/src/main/java/org/sonar/server/issue/notification/ChangesOnMyIssueNotificationDispatcher.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/notification/ChangesOnMyIssueNotificationDispatcher.java rename to sonar-server/src/main/java/org/sonar/server/issue/notification/ChangesOnMyIssueNotificationDispatcher.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/notification/DoNotFixNotificationDispatcher.java b/sonar-server/src/main/java/org/sonar/server/issue/notification/DoNotFixNotificationDispatcher.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/notification/DoNotFixNotificationDispatcher.java rename to sonar-server/src/main/java/org/sonar/server/issue/notification/DoNotFixNotificationDispatcher.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/notification/IssueChangeNotification.java b/sonar-server/src/main/java/org/sonar/server/issue/notification/IssueChangeNotification.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/notification/IssueChangeNotification.java rename to sonar-server/src/main/java/org/sonar/server/issue/notification/IssueChangeNotification.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/notification/IssueChangesEmailTemplate.java b/sonar-server/src/main/java/org/sonar/server/issue/notification/IssueChangesEmailTemplate.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/notification/IssueChangesEmailTemplate.java rename to sonar-server/src/main/java/org/sonar/server/issue/notification/IssueChangesEmailTemplate.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/notification/MyNewIssuesEmailTemplate.java b/sonar-server/src/main/java/org/sonar/server/issue/notification/MyNewIssuesEmailTemplate.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/notification/MyNewIssuesEmailTemplate.java rename to sonar-server/src/main/java/org/sonar/server/issue/notification/MyNewIssuesEmailTemplate.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/notification/MyNewIssuesNotification.java b/sonar-server/src/main/java/org/sonar/server/issue/notification/MyNewIssuesNotification.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/notification/MyNewIssuesNotification.java rename to sonar-server/src/main/java/org/sonar/server/issue/notification/MyNewIssuesNotification.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/notification/MyNewIssuesNotificationDispatcher.java b/sonar-server/src/main/java/org/sonar/server/issue/notification/MyNewIssuesNotificationDispatcher.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/notification/MyNewIssuesNotificationDispatcher.java rename to sonar-server/src/main/java/org/sonar/server/issue/notification/MyNewIssuesNotificationDispatcher.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/notification/NewIssuesEmailTemplate.java b/sonar-server/src/main/java/org/sonar/server/issue/notification/NewIssuesEmailTemplate.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/notification/NewIssuesEmailTemplate.java rename to sonar-server/src/main/java/org/sonar/server/issue/notification/NewIssuesEmailTemplate.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/notification/NewIssuesNotification.java b/sonar-server/src/main/java/org/sonar/server/issue/notification/NewIssuesNotification.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/notification/NewIssuesNotification.java rename to sonar-server/src/main/java/org/sonar/server/issue/notification/NewIssuesNotification.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/notification/NewIssuesNotificationDispatcher.java b/sonar-server/src/main/java/org/sonar/server/issue/notification/NewIssuesNotificationDispatcher.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/notification/NewIssuesNotificationDispatcher.java rename to sonar-server/src/main/java/org/sonar/server/issue/notification/NewIssuesNotificationDispatcher.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/notification/NewIssuesNotificationFactory.java b/sonar-server/src/main/java/org/sonar/server/issue/notification/NewIssuesNotificationFactory.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/notification/NewIssuesNotificationFactory.java rename to sonar-server/src/main/java/org/sonar/server/issue/notification/NewIssuesNotificationFactory.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/notification/NewIssuesStatistics.java b/sonar-server/src/main/java/org/sonar/server/issue/notification/NewIssuesStatistics.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/notification/NewIssuesStatistics.java rename to sonar-server/src/main/java/org/sonar/server/issue/notification/NewIssuesStatistics.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/notification/package-info.java b/sonar-server/src/main/java/org/sonar/server/issue/notification/package-info.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/notification/package-info.java rename to sonar-server/src/main/java/org/sonar/server/issue/notification/package-info.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/package-info.java b/sonar-server/src/main/java/org/sonar/server/issue/package-info.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/package-info.java rename to sonar-server/src/main/java/org/sonar/server/issue/package-info.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/workflow/Function.java b/sonar-server/src/main/java/org/sonar/server/issue/workflow/Function.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/workflow/Function.java rename to sonar-server/src/main/java/org/sonar/server/issue/workflow/Function.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/workflow/FunctionExecutor.java b/sonar-server/src/main/java/org/sonar/server/issue/workflow/FunctionExecutor.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/workflow/FunctionExecutor.java rename to sonar-server/src/main/java/org/sonar/server/issue/workflow/FunctionExecutor.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/workflow/IsBeingClosed.java b/sonar-server/src/main/java/org/sonar/server/issue/workflow/IsBeingClosed.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/workflow/IsBeingClosed.java rename to sonar-server/src/main/java/org/sonar/server/issue/workflow/IsBeingClosed.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/workflow/IssueWorkflow.java b/sonar-server/src/main/java/org/sonar/server/issue/workflow/IssueWorkflow.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/workflow/IssueWorkflow.java rename to sonar-server/src/main/java/org/sonar/server/issue/workflow/IssueWorkflow.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/workflow/SetCloseDate.java b/sonar-server/src/main/java/org/sonar/server/issue/workflow/SetCloseDate.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/workflow/SetCloseDate.java rename to sonar-server/src/main/java/org/sonar/server/issue/workflow/SetCloseDate.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/workflow/SetClosed.java b/sonar-server/src/main/java/org/sonar/server/issue/workflow/SetClosed.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/workflow/SetClosed.java rename to sonar-server/src/main/java/org/sonar/server/issue/workflow/SetClosed.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/workflow/SetResolution.java b/sonar-server/src/main/java/org/sonar/server/issue/workflow/SetResolution.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/workflow/SetResolution.java rename to sonar-server/src/main/java/org/sonar/server/issue/workflow/SetResolution.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/workflow/State.java b/sonar-server/src/main/java/org/sonar/server/issue/workflow/State.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/workflow/State.java rename to sonar-server/src/main/java/org/sonar/server/issue/workflow/State.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/workflow/StateMachine.java b/sonar-server/src/main/java/org/sonar/server/issue/workflow/StateMachine.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/workflow/StateMachine.java rename to sonar-server/src/main/java/org/sonar/server/issue/workflow/StateMachine.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/workflow/Transition.java b/sonar-server/src/main/java/org/sonar/server/issue/workflow/Transition.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/workflow/Transition.java rename to sonar-server/src/main/java/org/sonar/server/issue/workflow/Transition.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/workflow/UnsetAssignee.java b/sonar-server/src/main/java/org/sonar/server/issue/workflow/UnsetAssignee.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/workflow/UnsetAssignee.java rename to sonar-server/src/main/java/org/sonar/server/issue/workflow/UnsetAssignee.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/workflow/package-info.java b/sonar-server/src/main/java/org/sonar/server/issue/workflow/package-info.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/workflow/package-info.java rename to sonar-server/src/main/java/org/sonar/server/issue/workflow/package-info.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/ws/AddCommentAction.java b/sonar-server/src/main/java/org/sonar/server/issue/ws/AddCommentAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/ws/AddCommentAction.java rename to sonar-server/src/main/java/org/sonar/server/issue/ws/AddCommentAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/ws/AssignAction.java b/sonar-server/src/main/java/org/sonar/server/issue/ws/AssignAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/ws/AssignAction.java rename to sonar-server/src/main/java/org/sonar/server/issue/ws/AssignAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/ws/AuthorsAction.java b/sonar-server/src/main/java/org/sonar/server/issue/ws/AuthorsAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/ws/AuthorsAction.java rename to sonar-server/src/main/java/org/sonar/server/issue/ws/AuthorsAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/ws/AvatarResolver.java b/sonar-server/src/main/java/org/sonar/server/issue/ws/AvatarResolver.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/ws/AvatarResolver.java rename to sonar-server/src/main/java/org/sonar/server/issue/ws/AvatarResolver.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/ws/AvatarResolverImpl.java b/sonar-server/src/main/java/org/sonar/server/issue/ws/AvatarResolverImpl.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/ws/AvatarResolverImpl.java rename to sonar-server/src/main/java/org/sonar/server/issue/ws/AvatarResolverImpl.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/ws/BulkChangeAction.java b/sonar-server/src/main/java/org/sonar/server/issue/ws/BulkChangeAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/ws/BulkChangeAction.java rename to sonar-server/src/main/java/org/sonar/server/issue/ws/BulkChangeAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/ws/ChangelogAction.java b/sonar-server/src/main/java/org/sonar/server/issue/ws/ChangelogAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/ws/ChangelogAction.java rename to sonar-server/src/main/java/org/sonar/server/issue/ws/ChangelogAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/ws/ComponentTagsAction.java b/sonar-server/src/main/java/org/sonar/server/issue/ws/ComponentTagsAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/ws/ComponentTagsAction.java rename to sonar-server/src/main/java/org/sonar/server/issue/ws/ComponentTagsAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/ws/DeleteCommentAction.java b/sonar-server/src/main/java/org/sonar/server/issue/ws/DeleteCommentAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/ws/DeleteCommentAction.java rename to sonar-server/src/main/java/org/sonar/server/issue/ws/DeleteCommentAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/ws/DoTransitionAction.java b/sonar-server/src/main/java/org/sonar/server/issue/ws/DoTransitionAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/ws/DoTransitionAction.java rename to sonar-server/src/main/java/org/sonar/server/issue/ws/DoTransitionAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/ws/EditCommentAction.java b/sonar-server/src/main/java/org/sonar/server/issue/ws/EditCommentAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/ws/EditCommentAction.java rename to sonar-server/src/main/java/org/sonar/server/issue/ws/EditCommentAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/ws/IssueWsModule.java b/sonar-server/src/main/java/org/sonar/server/issue/ws/IssueWsModule.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/ws/IssueWsModule.java rename to sonar-server/src/main/java/org/sonar/server/issue/ws/IssueWsModule.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/ws/IssuesWs.java b/sonar-server/src/main/java/org/sonar/server/issue/ws/IssuesWs.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/ws/IssuesWs.java rename to sonar-server/src/main/java/org/sonar/server/issue/ws/IssuesWs.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/ws/IssuesWsAction.java b/sonar-server/src/main/java/org/sonar/server/issue/ws/IssuesWsAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/ws/IssuesWsAction.java rename to sonar-server/src/main/java/org/sonar/server/issue/ws/IssuesWsAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/ws/OperationResponseWriter.java b/sonar-server/src/main/java/org/sonar/server/issue/ws/OperationResponseWriter.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/ws/OperationResponseWriter.java rename to sonar-server/src/main/java/org/sonar/server/issue/ws/OperationResponseWriter.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/ws/SearchAction.java b/sonar-server/src/main/java/org/sonar/server/issue/ws/SearchAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/ws/SearchAction.java rename to sonar-server/src/main/java/org/sonar/server/issue/ws/SearchAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/ws/SearchAdditionalField.java b/sonar-server/src/main/java/org/sonar/server/issue/ws/SearchAdditionalField.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/ws/SearchAdditionalField.java rename to sonar-server/src/main/java/org/sonar/server/issue/ws/SearchAdditionalField.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/ws/SearchResponseData.java b/sonar-server/src/main/java/org/sonar/server/issue/ws/SearchResponseData.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/ws/SearchResponseData.java rename to sonar-server/src/main/java/org/sonar/server/issue/ws/SearchResponseData.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/ws/SearchResponseFormat.java b/sonar-server/src/main/java/org/sonar/server/issue/ws/SearchResponseFormat.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/ws/SearchResponseFormat.java rename to sonar-server/src/main/java/org/sonar/server/issue/ws/SearchResponseFormat.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/ws/SearchResponseLoader.java b/sonar-server/src/main/java/org/sonar/server/issue/ws/SearchResponseLoader.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/ws/SearchResponseLoader.java rename to sonar-server/src/main/java/org/sonar/server/issue/ws/SearchResponseLoader.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/ws/SetSeverityAction.java b/sonar-server/src/main/java/org/sonar/server/issue/ws/SetSeverityAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/ws/SetSeverityAction.java rename to sonar-server/src/main/java/org/sonar/server/issue/ws/SetSeverityAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/ws/SetTagsAction.java b/sonar-server/src/main/java/org/sonar/server/issue/ws/SetTagsAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/ws/SetTagsAction.java rename to sonar-server/src/main/java/org/sonar/server/issue/ws/SetTagsAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/ws/SetTypeAction.java b/sonar-server/src/main/java/org/sonar/server/issue/ws/SetTypeAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/ws/SetTypeAction.java rename to sonar-server/src/main/java/org/sonar/server/issue/ws/SetTypeAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/ws/TagsAction.java b/sonar-server/src/main/java/org/sonar/server/issue/ws/TagsAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/ws/TagsAction.java rename to sonar-server/src/main/java/org/sonar/server/issue/ws/TagsAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/ws/package-info.java b/sonar-server/src/main/java/org/sonar/server/issue/ws/package-info.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/issue/ws/package-info.java rename to sonar-server/src/main/java/org/sonar/server/issue/ws/package-info.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/language/ws/LanguageWs.java b/sonar-server/src/main/java/org/sonar/server/language/ws/LanguageWs.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/language/ws/LanguageWs.java rename to sonar-server/src/main/java/org/sonar/server/language/ws/LanguageWs.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/language/ws/ListAction.java b/sonar-server/src/main/java/org/sonar/server/language/ws/ListAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/language/ws/ListAction.java rename to sonar-server/src/main/java/org/sonar/server/language/ws/ListAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/language/ws/package-info.java b/sonar-server/src/main/java/org/sonar/server/language/ws/package-info.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/language/ws/package-info.java rename to sonar-server/src/main/java/org/sonar/server/language/ws/package-info.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/license/ws/LicensesWs.java b/sonar-server/src/main/java/org/sonar/server/license/ws/LicensesWs.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/license/ws/LicensesWs.java rename to sonar-server/src/main/java/org/sonar/server/license/ws/LicensesWs.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/license/ws/LicensesWsModule.java b/sonar-server/src/main/java/org/sonar/server/license/ws/LicensesWsModule.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/license/ws/LicensesWsModule.java rename to sonar-server/src/main/java/org/sonar/server/license/ws/LicensesWsModule.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/license/ws/ListAction.java b/sonar-server/src/main/java/org/sonar/server/license/ws/ListAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/license/ws/ListAction.java rename to sonar-server/src/main/java/org/sonar/server/license/ws/ListAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/license/ws/package-info.java b/sonar-server/src/main/java/org/sonar/server/license/ws/package-info.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/license/ws/package-info.java rename to sonar-server/src/main/java/org/sonar/server/license/ws/package-info.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/measure/custom/ws/CreateAction.java b/sonar-server/src/main/java/org/sonar/server/measure/custom/ws/CreateAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/measure/custom/ws/CreateAction.java rename to sonar-server/src/main/java/org/sonar/server/measure/custom/ws/CreateAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/measure/custom/ws/CustomMeasureJsonWriter.java b/sonar-server/src/main/java/org/sonar/server/measure/custom/ws/CustomMeasureJsonWriter.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/measure/custom/ws/CustomMeasureJsonWriter.java rename to sonar-server/src/main/java/org/sonar/server/measure/custom/ws/CustomMeasureJsonWriter.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/measure/custom/ws/CustomMeasureValidator.java b/sonar-server/src/main/java/org/sonar/server/measure/custom/ws/CustomMeasureValidator.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/measure/custom/ws/CustomMeasureValidator.java rename to sonar-server/src/main/java/org/sonar/server/measure/custom/ws/CustomMeasureValidator.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/measure/custom/ws/CustomMeasureValueDescription.java b/sonar-server/src/main/java/org/sonar/server/measure/custom/ws/CustomMeasureValueDescription.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/measure/custom/ws/CustomMeasureValueDescription.java rename to sonar-server/src/main/java/org/sonar/server/measure/custom/ws/CustomMeasureValueDescription.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/measure/custom/ws/CustomMeasuresWs.java b/sonar-server/src/main/java/org/sonar/server/measure/custom/ws/CustomMeasuresWs.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/measure/custom/ws/CustomMeasuresWs.java rename to sonar-server/src/main/java/org/sonar/server/measure/custom/ws/CustomMeasuresWs.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/measure/custom/ws/CustomMeasuresWsAction.java b/sonar-server/src/main/java/org/sonar/server/measure/custom/ws/CustomMeasuresWsAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/measure/custom/ws/CustomMeasuresWsAction.java rename to sonar-server/src/main/java/org/sonar/server/measure/custom/ws/CustomMeasuresWsAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/measure/custom/ws/CustomMeasuresWsModule.java b/sonar-server/src/main/java/org/sonar/server/measure/custom/ws/CustomMeasuresWsModule.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/measure/custom/ws/CustomMeasuresWsModule.java rename to sonar-server/src/main/java/org/sonar/server/measure/custom/ws/CustomMeasuresWsModule.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/measure/custom/ws/DeleteAction.java b/sonar-server/src/main/java/org/sonar/server/measure/custom/ws/DeleteAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/measure/custom/ws/DeleteAction.java rename to sonar-server/src/main/java/org/sonar/server/measure/custom/ws/DeleteAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/measure/custom/ws/MetricsAction.java b/sonar-server/src/main/java/org/sonar/server/measure/custom/ws/MetricsAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/measure/custom/ws/MetricsAction.java rename to sonar-server/src/main/java/org/sonar/server/measure/custom/ws/MetricsAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/measure/custom/ws/SearchAction.java b/sonar-server/src/main/java/org/sonar/server/measure/custom/ws/SearchAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/measure/custom/ws/SearchAction.java rename to sonar-server/src/main/java/org/sonar/server/measure/custom/ws/SearchAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/measure/custom/ws/UpdateAction.java b/sonar-server/src/main/java/org/sonar/server/measure/custom/ws/UpdateAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/measure/custom/ws/UpdateAction.java rename to sonar-server/src/main/java/org/sonar/server/measure/custom/ws/UpdateAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/measure/custom/ws/package-info.java b/sonar-server/src/main/java/org/sonar/server/measure/custom/ws/package-info.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/measure/custom/ws/package-info.java rename to sonar-server/src/main/java/org/sonar/server/measure/custom/ws/package-info.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/measure/index/ProjectMeasuresDoc.java b/sonar-server/src/main/java/org/sonar/server/measure/index/ProjectMeasuresDoc.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/measure/index/ProjectMeasuresDoc.java rename to sonar-server/src/main/java/org/sonar/server/measure/index/ProjectMeasuresDoc.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/measure/index/ProjectMeasuresIndex.java b/sonar-server/src/main/java/org/sonar/server/measure/index/ProjectMeasuresIndex.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/measure/index/ProjectMeasuresIndex.java rename to sonar-server/src/main/java/org/sonar/server/measure/index/ProjectMeasuresIndex.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/measure/index/ProjectMeasuresIndexDefinition.java b/sonar-server/src/main/java/org/sonar/server/measure/index/ProjectMeasuresIndexDefinition.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/measure/index/ProjectMeasuresIndexDefinition.java rename to sonar-server/src/main/java/org/sonar/server/measure/index/ProjectMeasuresIndexDefinition.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/measure/index/ProjectMeasuresIndexer.java b/sonar-server/src/main/java/org/sonar/server/measure/index/ProjectMeasuresIndexer.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/measure/index/ProjectMeasuresIndexer.java rename to sonar-server/src/main/java/org/sonar/server/measure/index/ProjectMeasuresIndexer.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/measure/index/ProjectMeasuresQuery.java b/sonar-server/src/main/java/org/sonar/server/measure/index/ProjectMeasuresQuery.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/measure/index/ProjectMeasuresQuery.java rename to sonar-server/src/main/java/org/sonar/server/measure/index/ProjectMeasuresQuery.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/measure/index/ProjectsEsModule.java b/sonar-server/src/main/java/org/sonar/server/measure/index/ProjectsEsModule.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/measure/index/ProjectsEsModule.java rename to sonar-server/src/main/java/org/sonar/server/measure/index/ProjectsEsModule.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/measure/index/ProjectsTextSearchQueryFactory.java b/sonar-server/src/main/java/org/sonar/server/measure/index/ProjectsTextSearchQueryFactory.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/measure/index/ProjectsTextSearchQueryFactory.java rename to sonar-server/src/main/java/org/sonar/server/measure/index/ProjectsTextSearchQueryFactory.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/measure/index/package-info.java b/sonar-server/src/main/java/org/sonar/server/measure/index/package-info.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/measure/index/package-info.java rename to sonar-server/src/main/java/org/sonar/server/measure/index/package-info.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/measure/ws/ComponentAction.java b/sonar-server/src/main/java/org/sonar/server/measure/ws/ComponentAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/measure/ws/ComponentAction.java rename to sonar-server/src/main/java/org/sonar/server/measure/ws/ComponentAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/measure/ws/ComponentDtoToWsComponent.java b/sonar-server/src/main/java/org/sonar/server/measure/ws/ComponentDtoToWsComponent.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/measure/ws/ComponentDtoToWsComponent.java rename to sonar-server/src/main/java/org/sonar/server/measure/ws/ComponentDtoToWsComponent.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/measure/ws/ComponentTreeAction.java b/sonar-server/src/main/java/org/sonar/server/measure/ws/ComponentTreeAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/measure/ws/ComponentTreeAction.java rename to sonar-server/src/main/java/org/sonar/server/measure/ws/ComponentTreeAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/measure/ws/ComponentTreeData.java b/sonar-server/src/main/java/org/sonar/server/measure/ws/ComponentTreeData.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/measure/ws/ComponentTreeData.java rename to sonar-server/src/main/java/org/sonar/server/measure/ws/ComponentTreeData.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/measure/ws/ComponentTreeDataLoader.java b/sonar-server/src/main/java/org/sonar/server/measure/ws/ComponentTreeDataLoader.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/measure/ws/ComponentTreeDataLoader.java rename to sonar-server/src/main/java/org/sonar/server/measure/ws/ComponentTreeDataLoader.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/measure/ws/ComponentTreeSort.java b/sonar-server/src/main/java/org/sonar/server/measure/ws/ComponentTreeSort.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/measure/ws/ComponentTreeSort.java rename to sonar-server/src/main/java/org/sonar/server/measure/ws/ComponentTreeSort.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/measure/ws/HasMeasure.java b/sonar-server/src/main/java/org/sonar/server/measure/ws/HasMeasure.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/measure/ws/HasMeasure.java rename to sonar-server/src/main/java/org/sonar/server/measure/ws/HasMeasure.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/measure/ws/MeasureDtoToWsMeasure.java b/sonar-server/src/main/java/org/sonar/server/measure/ws/MeasureDtoToWsMeasure.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/measure/ws/MeasureDtoToWsMeasure.java rename to sonar-server/src/main/java/org/sonar/server/measure/ws/MeasureDtoToWsMeasure.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/measure/ws/MeasureValueFormatter.java b/sonar-server/src/main/java/org/sonar/server/measure/ws/MeasureValueFormatter.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/measure/ws/MeasureValueFormatter.java rename to sonar-server/src/main/java/org/sonar/server/measure/ws/MeasureValueFormatter.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/measure/ws/MeasuresWs.java b/sonar-server/src/main/java/org/sonar/server/measure/ws/MeasuresWs.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/measure/ws/MeasuresWs.java rename to sonar-server/src/main/java/org/sonar/server/measure/ws/MeasuresWs.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/measure/ws/MeasuresWsAction.java b/sonar-server/src/main/java/org/sonar/server/measure/ws/MeasuresWsAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/measure/ws/MeasuresWsAction.java rename to sonar-server/src/main/java/org/sonar/server/measure/ws/MeasuresWsAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/measure/ws/MeasuresWsModule.java b/sonar-server/src/main/java/org/sonar/server/measure/ws/MeasuresWsModule.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/measure/ws/MeasuresWsModule.java rename to sonar-server/src/main/java/org/sonar/server/measure/ws/MeasuresWsModule.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/measure/ws/MeasuresWsParametersBuilder.java b/sonar-server/src/main/java/org/sonar/server/measure/ws/MeasuresWsParametersBuilder.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/measure/ws/MeasuresWsParametersBuilder.java rename to sonar-server/src/main/java/org/sonar/server/measure/ws/MeasuresWsParametersBuilder.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/measure/ws/MetricDtoToWsMetric.java b/sonar-server/src/main/java/org/sonar/server/measure/ws/MetricDtoToWsMetric.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/measure/ws/MetricDtoToWsMetric.java rename to sonar-server/src/main/java/org/sonar/server/measure/ws/MetricDtoToWsMetric.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/measure/ws/MetricDtoWithBestValue.java b/sonar-server/src/main/java/org/sonar/server/measure/ws/MetricDtoWithBestValue.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/measure/ws/MetricDtoWithBestValue.java rename to sonar-server/src/main/java/org/sonar/server/measure/ws/MetricDtoWithBestValue.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/measure/ws/SearchAction.java b/sonar-server/src/main/java/org/sonar/server/measure/ws/SearchAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/measure/ws/SearchAction.java rename to sonar-server/src/main/java/org/sonar/server/measure/ws/SearchAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/measure/ws/SearchHistoryAction.java b/sonar-server/src/main/java/org/sonar/server/measure/ws/SearchHistoryAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/measure/ws/SearchHistoryAction.java rename to sonar-server/src/main/java/org/sonar/server/measure/ws/SearchHistoryAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/measure/ws/SearchHistoryResponseFactory.java b/sonar-server/src/main/java/org/sonar/server/measure/ws/SearchHistoryResponseFactory.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/measure/ws/SearchHistoryResponseFactory.java rename to sonar-server/src/main/java/org/sonar/server/measure/ws/SearchHistoryResponseFactory.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/measure/ws/SearchHistoryResult.java b/sonar-server/src/main/java/org/sonar/server/measure/ws/SearchHistoryResult.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/measure/ws/SearchHistoryResult.java rename to sonar-server/src/main/java/org/sonar/server/measure/ws/SearchHistoryResult.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/measure/ws/SnapshotDtoToWsPeriods.java b/sonar-server/src/main/java/org/sonar/server/measure/ws/SnapshotDtoToWsPeriods.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/measure/ws/SnapshotDtoToWsPeriods.java rename to sonar-server/src/main/java/org/sonar/server/measure/ws/SnapshotDtoToWsPeriods.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/measure/ws/TimeMachineWs.java b/sonar-server/src/main/java/org/sonar/server/measure/ws/TimeMachineWs.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/measure/ws/TimeMachineWs.java rename to sonar-server/src/main/java/org/sonar/server/measure/ws/TimeMachineWs.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/measure/ws/package-info.java b/sonar-server/src/main/java/org/sonar/server/measure/ws/package-info.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/measure/ws/package-info.java rename to sonar-server/src/main/java/org/sonar/server/measure/ws/package-info.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/metric/CoreCustomMetrics.java b/sonar-server/src/main/java/org/sonar/server/metric/CoreCustomMetrics.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/metric/CoreCustomMetrics.java rename to sonar-server/src/main/java/org/sonar/server/metric/CoreCustomMetrics.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/metric/DefaultMetricFinder.java b/sonar-server/src/main/java/org/sonar/server/metric/DefaultMetricFinder.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/metric/DefaultMetricFinder.java rename to sonar-server/src/main/java/org/sonar/server/metric/DefaultMetricFinder.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/metric/package-info.java b/sonar-server/src/main/java/org/sonar/server/metric/package-info.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/metric/package-info.java rename to sonar-server/src/main/java/org/sonar/server/metric/package-info.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/metric/ws/CreateAction.java b/sonar-server/src/main/java/org/sonar/server/metric/ws/CreateAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/metric/ws/CreateAction.java rename to sonar-server/src/main/java/org/sonar/server/metric/ws/CreateAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/metric/ws/DeleteAction.java b/sonar-server/src/main/java/org/sonar/server/metric/ws/DeleteAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/metric/ws/DeleteAction.java rename to sonar-server/src/main/java/org/sonar/server/metric/ws/DeleteAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/metric/ws/DomainsAction.java b/sonar-server/src/main/java/org/sonar/server/metric/ws/DomainsAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/metric/ws/DomainsAction.java rename to sonar-server/src/main/java/org/sonar/server/metric/ws/DomainsAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/metric/ws/MetricJsonWriter.java b/sonar-server/src/main/java/org/sonar/server/metric/ws/MetricJsonWriter.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/metric/ws/MetricJsonWriter.java rename to sonar-server/src/main/java/org/sonar/server/metric/ws/MetricJsonWriter.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/metric/ws/MetricsWs.java b/sonar-server/src/main/java/org/sonar/server/metric/ws/MetricsWs.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/metric/ws/MetricsWs.java rename to sonar-server/src/main/java/org/sonar/server/metric/ws/MetricsWs.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/metric/ws/MetricsWsAction.java b/sonar-server/src/main/java/org/sonar/server/metric/ws/MetricsWsAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/metric/ws/MetricsWsAction.java rename to sonar-server/src/main/java/org/sonar/server/metric/ws/MetricsWsAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/metric/ws/MetricsWsModule.java b/sonar-server/src/main/java/org/sonar/server/metric/ws/MetricsWsModule.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/metric/ws/MetricsWsModule.java rename to sonar-server/src/main/java/org/sonar/server/metric/ws/MetricsWsModule.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/metric/ws/SearchAction.java b/sonar-server/src/main/java/org/sonar/server/metric/ws/SearchAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/metric/ws/SearchAction.java rename to sonar-server/src/main/java/org/sonar/server/metric/ws/SearchAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/metric/ws/TypesAction.java b/sonar-server/src/main/java/org/sonar/server/metric/ws/TypesAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/metric/ws/TypesAction.java rename to sonar-server/src/main/java/org/sonar/server/metric/ws/TypesAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/metric/ws/UpdateAction.java b/sonar-server/src/main/java/org/sonar/server/metric/ws/UpdateAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/metric/ws/UpdateAction.java rename to sonar-server/src/main/java/org/sonar/server/metric/ws/UpdateAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/metric/ws/package-info.java b/sonar-server/src/main/java/org/sonar/server/metric/ws/package-info.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/metric/ws/package-info.java rename to sonar-server/src/main/java/org/sonar/server/metric/ws/package-info.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/notification/DefaultNotificationManager.java b/sonar-server/src/main/java/org/sonar/server/notification/DefaultNotificationManager.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/notification/DefaultNotificationManager.java rename to sonar-server/src/main/java/org/sonar/server/notification/DefaultNotificationManager.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/notification/NotificationCenter.java b/sonar-server/src/main/java/org/sonar/server/notification/NotificationCenter.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/notification/NotificationCenter.java rename to sonar-server/src/main/java/org/sonar/server/notification/NotificationCenter.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/notification/NotificationDaemon.java b/sonar-server/src/main/java/org/sonar/server/notification/NotificationDaemon.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/notification/NotificationDaemon.java rename to sonar-server/src/main/java/org/sonar/server/notification/NotificationDaemon.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/notification/NotificationDispatcher.java b/sonar-server/src/main/java/org/sonar/server/notification/NotificationDispatcher.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/notification/NotificationDispatcher.java rename to sonar-server/src/main/java/org/sonar/server/notification/NotificationDispatcher.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/notification/NotificationDispatcherMetadata.java b/sonar-server/src/main/java/org/sonar/server/notification/NotificationDispatcherMetadata.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/notification/NotificationDispatcherMetadata.java rename to sonar-server/src/main/java/org/sonar/server/notification/NotificationDispatcherMetadata.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/notification/NotificationManager.java b/sonar-server/src/main/java/org/sonar/server/notification/NotificationManager.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/notification/NotificationManager.java rename to sonar-server/src/main/java/org/sonar/server/notification/NotificationManager.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/notification/NotificationModule.java b/sonar-server/src/main/java/org/sonar/server/notification/NotificationModule.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/notification/NotificationModule.java rename to sonar-server/src/main/java/org/sonar/server/notification/NotificationModule.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/notification/NotificationService.java b/sonar-server/src/main/java/org/sonar/server/notification/NotificationService.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/notification/NotificationService.java rename to sonar-server/src/main/java/org/sonar/server/notification/NotificationService.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/notification/NotificationUpdater.java b/sonar-server/src/main/java/org/sonar/server/notification/NotificationUpdater.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/notification/NotificationUpdater.java rename to sonar-server/src/main/java/org/sonar/server/notification/NotificationUpdater.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/notification/email/AlertsEmailTemplate.java b/sonar-server/src/main/java/org/sonar/server/notification/email/AlertsEmailTemplate.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/notification/email/AlertsEmailTemplate.java rename to sonar-server/src/main/java/org/sonar/server/notification/email/AlertsEmailTemplate.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/notification/email/EmailNotificationChannel.java b/sonar-server/src/main/java/org/sonar/server/notification/email/EmailNotificationChannel.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/notification/email/EmailNotificationChannel.java rename to sonar-server/src/main/java/org/sonar/server/notification/email/EmailNotificationChannel.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/notification/email/package-info.java b/sonar-server/src/main/java/org/sonar/server/notification/email/package-info.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/notification/email/package-info.java rename to sonar-server/src/main/java/org/sonar/server/notification/email/package-info.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/notification/package-info.java b/sonar-server/src/main/java/org/sonar/server/notification/package-info.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/notification/package-info.java rename to sonar-server/src/main/java/org/sonar/server/notification/package-info.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/notification/ws/AddAction.java b/sonar-server/src/main/java/org/sonar/server/notification/ws/AddAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/notification/ws/AddAction.java rename to sonar-server/src/main/java/org/sonar/server/notification/ws/AddAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/notification/ws/ListAction.java b/sonar-server/src/main/java/org/sonar/server/notification/ws/ListAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/notification/ws/ListAction.java rename to sonar-server/src/main/java/org/sonar/server/notification/ws/ListAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/notification/ws/NotificationWsModule.java b/sonar-server/src/main/java/org/sonar/server/notification/ws/NotificationWsModule.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/notification/ws/NotificationWsModule.java rename to sonar-server/src/main/java/org/sonar/server/notification/ws/NotificationWsModule.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/notification/ws/NotificationsWs.java b/sonar-server/src/main/java/org/sonar/server/notification/ws/NotificationsWs.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/notification/ws/NotificationsWs.java rename to sonar-server/src/main/java/org/sonar/server/notification/ws/NotificationsWs.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/notification/ws/NotificationsWsAction.java b/sonar-server/src/main/java/org/sonar/server/notification/ws/NotificationsWsAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/notification/ws/NotificationsWsAction.java rename to sonar-server/src/main/java/org/sonar/server/notification/ws/NotificationsWsAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/notification/ws/RemoveAction.java b/sonar-server/src/main/java/org/sonar/server/notification/ws/RemoveAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/notification/ws/RemoveAction.java rename to sonar-server/src/main/java/org/sonar/server/notification/ws/RemoveAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/notification/ws/package-info.java b/sonar-server/src/main/java/org/sonar/server/notification/ws/package-info.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/notification/ws/package-info.java rename to sonar-server/src/main/java/org/sonar/server/notification/ws/package-info.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/organization/BillingValidations.java b/sonar-server/src/main/java/org/sonar/server/organization/BillingValidations.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/organization/BillingValidations.java rename to sonar-server/src/main/java/org/sonar/server/organization/BillingValidations.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/organization/BillingValidationsExtension.java b/sonar-server/src/main/java/org/sonar/server/organization/BillingValidationsExtension.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/organization/BillingValidationsExtension.java rename to sonar-server/src/main/java/org/sonar/server/organization/BillingValidationsExtension.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/organization/BillingValidationsProxy.java b/sonar-server/src/main/java/org/sonar/server/organization/BillingValidationsProxy.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/organization/BillingValidationsProxy.java rename to sonar-server/src/main/java/org/sonar/server/organization/BillingValidationsProxy.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/organization/BillingValidationsProxyImpl.java b/sonar-server/src/main/java/org/sonar/server/organization/BillingValidationsProxyImpl.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/organization/BillingValidationsProxyImpl.java rename to sonar-server/src/main/java/org/sonar/server/organization/BillingValidationsProxyImpl.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/organization/DefaultOrganization.java b/sonar-server/src/main/java/org/sonar/server/organization/DefaultOrganization.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/organization/DefaultOrganization.java rename to sonar-server/src/main/java/org/sonar/server/organization/DefaultOrganization.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/organization/DefaultOrganizationCache.java b/sonar-server/src/main/java/org/sonar/server/organization/DefaultOrganizationCache.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/organization/DefaultOrganizationCache.java rename to sonar-server/src/main/java/org/sonar/server/organization/DefaultOrganizationCache.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/organization/DefaultOrganizationEnforcer.java b/sonar-server/src/main/java/org/sonar/server/organization/DefaultOrganizationEnforcer.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/organization/DefaultOrganizationEnforcer.java rename to sonar-server/src/main/java/org/sonar/server/organization/DefaultOrganizationEnforcer.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/organization/DefaultOrganizationProvider.java b/sonar-server/src/main/java/org/sonar/server/organization/DefaultOrganizationProvider.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/organization/DefaultOrganizationProvider.java rename to sonar-server/src/main/java/org/sonar/server/organization/DefaultOrganizationProvider.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/organization/DefaultOrganizationProviderImpl.java b/sonar-server/src/main/java/org/sonar/server/organization/DefaultOrganizationProviderImpl.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/organization/DefaultOrganizationProviderImpl.java rename to sonar-server/src/main/java/org/sonar/server/organization/DefaultOrganizationProviderImpl.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/organization/NoopDefaultOrganizationCache.java b/sonar-server/src/main/java/org/sonar/server/organization/NoopDefaultOrganizationCache.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/organization/NoopDefaultOrganizationCache.java rename to sonar-server/src/main/java/org/sonar/server/organization/NoopDefaultOrganizationCache.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/organization/OrganizationCreation.java b/sonar-server/src/main/java/org/sonar/server/organization/OrganizationCreation.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/organization/OrganizationCreation.java rename to sonar-server/src/main/java/org/sonar/server/organization/OrganizationCreation.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/organization/OrganizationCreationImpl.java b/sonar-server/src/main/java/org/sonar/server/organization/OrganizationCreationImpl.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/organization/OrganizationCreationImpl.java rename to sonar-server/src/main/java/org/sonar/server/organization/OrganizationCreationImpl.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/organization/OrganizationFlags.java b/sonar-server/src/main/java/org/sonar/server/organization/OrganizationFlags.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/organization/OrganizationFlags.java rename to sonar-server/src/main/java/org/sonar/server/organization/OrganizationFlags.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/organization/OrganizationFlagsImpl.java b/sonar-server/src/main/java/org/sonar/server/organization/OrganizationFlagsImpl.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/organization/OrganizationFlagsImpl.java rename to sonar-server/src/main/java/org/sonar/server/organization/OrganizationFlagsImpl.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/organization/OrganizationValidation.java b/sonar-server/src/main/java/org/sonar/server/organization/OrganizationValidation.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/organization/OrganizationValidation.java rename to sonar-server/src/main/java/org/sonar/server/organization/OrganizationValidation.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/organization/OrganizationValidationImpl.java b/sonar-server/src/main/java/org/sonar/server/organization/OrganizationValidationImpl.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/organization/OrganizationValidationImpl.java rename to sonar-server/src/main/java/org/sonar/server/organization/OrganizationValidationImpl.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/organization/package-info.java b/sonar-server/src/main/java/org/sonar/server/organization/package-info.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/organization/package-info.java rename to sonar-server/src/main/java/org/sonar/server/organization/package-info.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/organization/ws/AddMemberAction.java b/sonar-server/src/main/java/org/sonar/server/organization/ws/AddMemberAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/organization/ws/AddMemberAction.java rename to sonar-server/src/main/java/org/sonar/server/organization/ws/AddMemberAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/organization/ws/CreateAction.java b/sonar-server/src/main/java/org/sonar/server/organization/ws/CreateAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/organization/ws/CreateAction.java rename to sonar-server/src/main/java/org/sonar/server/organization/ws/CreateAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/organization/ws/DeleteAction.java b/sonar-server/src/main/java/org/sonar/server/organization/ws/DeleteAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/organization/ws/DeleteAction.java rename to sonar-server/src/main/java/org/sonar/server/organization/ws/DeleteAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/organization/ws/EnableSupportAction.java b/sonar-server/src/main/java/org/sonar/server/organization/ws/EnableSupportAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/organization/ws/EnableSupportAction.java rename to sonar-server/src/main/java/org/sonar/server/organization/ws/EnableSupportAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/organization/ws/OrganizationsWs.java b/sonar-server/src/main/java/org/sonar/server/organization/ws/OrganizationsWs.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/organization/ws/OrganizationsWs.java rename to sonar-server/src/main/java/org/sonar/server/organization/ws/OrganizationsWs.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/organization/ws/OrganizationsWsAction.java b/sonar-server/src/main/java/org/sonar/server/organization/ws/OrganizationsWsAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/organization/ws/OrganizationsWsAction.java rename to sonar-server/src/main/java/org/sonar/server/organization/ws/OrganizationsWsAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/organization/ws/OrganizationsWsModule.java b/sonar-server/src/main/java/org/sonar/server/organization/ws/OrganizationsWsModule.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/organization/ws/OrganizationsWsModule.java rename to sonar-server/src/main/java/org/sonar/server/organization/ws/OrganizationsWsModule.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/organization/ws/OrganizationsWsSupport.java b/sonar-server/src/main/java/org/sonar/server/organization/ws/OrganizationsWsSupport.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/organization/ws/OrganizationsWsSupport.java rename to sonar-server/src/main/java/org/sonar/server/organization/ws/OrganizationsWsSupport.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/organization/ws/RemoveMemberAction.java b/sonar-server/src/main/java/org/sonar/server/organization/ws/RemoveMemberAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/organization/ws/RemoveMemberAction.java rename to sonar-server/src/main/java/org/sonar/server/organization/ws/RemoveMemberAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/organization/ws/SearchAction.java b/sonar-server/src/main/java/org/sonar/server/organization/ws/SearchAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/organization/ws/SearchAction.java rename to sonar-server/src/main/java/org/sonar/server/organization/ws/SearchAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/organization/ws/SearchMembersAction.java b/sonar-server/src/main/java/org/sonar/server/organization/ws/SearchMembersAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/organization/ws/SearchMembersAction.java rename to sonar-server/src/main/java/org/sonar/server/organization/ws/SearchMembersAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/organization/ws/SearchMyOrganizationsAction.java b/sonar-server/src/main/java/org/sonar/server/organization/ws/SearchMyOrganizationsAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/organization/ws/SearchMyOrganizationsAction.java rename to sonar-server/src/main/java/org/sonar/server/organization/ws/SearchMyOrganizationsAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/organization/ws/UpdateAction.java b/sonar-server/src/main/java/org/sonar/server/organization/ws/UpdateAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/organization/ws/UpdateAction.java rename to sonar-server/src/main/java/org/sonar/server/organization/ws/UpdateAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/organization/ws/UpdateProjectVisibilityAction.java b/sonar-server/src/main/java/org/sonar/server/organization/ws/UpdateProjectVisibilityAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/organization/ws/UpdateProjectVisibilityAction.java rename to sonar-server/src/main/java/org/sonar/server/organization/ws/UpdateProjectVisibilityAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/organization/ws/package-info.java b/sonar-server/src/main/java/org/sonar/server/organization/ws/package-info.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/organization/ws/package-info.java rename to sonar-server/src/main/java/org/sonar/server/organization/ws/package-info.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/permission/ApplyPermissionTemplateQuery.java b/sonar-server/src/main/java/org/sonar/server/permission/ApplyPermissionTemplateQuery.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/permission/ApplyPermissionTemplateQuery.java rename to sonar-server/src/main/java/org/sonar/server/permission/ApplyPermissionTemplateQuery.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/permission/GroupPermissionChange.java b/sonar-server/src/main/java/org/sonar/server/permission/GroupPermissionChange.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/permission/GroupPermissionChange.java rename to sonar-server/src/main/java/org/sonar/server/permission/GroupPermissionChange.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/permission/GroupPermissionChanger.java b/sonar-server/src/main/java/org/sonar/server/permission/GroupPermissionChanger.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/permission/GroupPermissionChanger.java rename to sonar-server/src/main/java/org/sonar/server/permission/GroupPermissionChanger.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/permission/PermissionChange.java b/sonar-server/src/main/java/org/sonar/server/permission/PermissionChange.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/permission/PermissionChange.java rename to sonar-server/src/main/java/org/sonar/server/permission/PermissionChange.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/permission/PermissionPrivilegeChecker.java b/sonar-server/src/main/java/org/sonar/server/permission/PermissionPrivilegeChecker.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/permission/PermissionPrivilegeChecker.java rename to sonar-server/src/main/java/org/sonar/server/permission/PermissionPrivilegeChecker.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/permission/PermissionTemplateService.java b/sonar-server/src/main/java/org/sonar/server/permission/PermissionTemplateService.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/permission/PermissionTemplateService.java rename to sonar-server/src/main/java/org/sonar/server/permission/PermissionTemplateService.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/permission/PermissionUpdater.java b/sonar-server/src/main/java/org/sonar/server/permission/PermissionUpdater.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/permission/PermissionUpdater.java rename to sonar-server/src/main/java/org/sonar/server/permission/PermissionUpdater.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/permission/ProjectId.java b/sonar-server/src/main/java/org/sonar/server/permission/ProjectId.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/permission/ProjectId.java rename to sonar-server/src/main/java/org/sonar/server/permission/ProjectId.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/permission/UserId.java b/sonar-server/src/main/java/org/sonar/server/permission/UserId.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/permission/UserId.java rename to sonar-server/src/main/java/org/sonar/server/permission/UserId.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/permission/UserPermissionChange.java b/sonar-server/src/main/java/org/sonar/server/permission/UserPermissionChange.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/permission/UserPermissionChange.java rename to sonar-server/src/main/java/org/sonar/server/permission/UserPermissionChange.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/permission/UserPermissionChanger.java b/sonar-server/src/main/java/org/sonar/server/permission/UserPermissionChanger.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/permission/UserPermissionChanger.java rename to sonar-server/src/main/java/org/sonar/server/permission/UserPermissionChanger.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/permission/index/AuthorizationScope.java b/sonar-server/src/main/java/org/sonar/server/permission/index/AuthorizationScope.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/permission/index/AuthorizationScope.java rename to sonar-server/src/main/java/org/sonar/server/permission/index/AuthorizationScope.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/permission/index/AuthorizationTypeSupport.java b/sonar-server/src/main/java/org/sonar/server/permission/index/AuthorizationTypeSupport.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/permission/index/AuthorizationTypeSupport.java rename to sonar-server/src/main/java/org/sonar/server/permission/index/AuthorizationTypeSupport.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/permission/index/NeedAuthorizationIndexer.java b/sonar-server/src/main/java/org/sonar/server/permission/index/NeedAuthorizationIndexer.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/permission/index/NeedAuthorizationIndexer.java rename to sonar-server/src/main/java/org/sonar/server/permission/index/NeedAuthorizationIndexer.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/permission/index/PermissionIndexer.java b/sonar-server/src/main/java/org/sonar/server/permission/index/PermissionIndexer.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/permission/index/PermissionIndexer.java rename to sonar-server/src/main/java/org/sonar/server/permission/index/PermissionIndexer.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/permission/index/PermissionIndexerDao.java b/sonar-server/src/main/java/org/sonar/server/permission/index/PermissionIndexerDao.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/permission/index/PermissionIndexerDao.java rename to sonar-server/src/main/java/org/sonar/server/permission/index/PermissionIndexerDao.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/permission/index/package-info.java b/sonar-server/src/main/java/org/sonar/server/permission/index/package-info.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/permission/index/package-info.java rename to sonar-server/src/main/java/org/sonar/server/permission/index/package-info.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/permission/package-info.java b/sonar-server/src/main/java/org/sonar/server/permission/package-info.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/permission/package-info.java rename to sonar-server/src/main/java/org/sonar/server/permission/package-info.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/permission/ws/AddGroupAction.java b/sonar-server/src/main/java/org/sonar/server/permission/ws/AddGroupAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/permission/ws/AddGroupAction.java rename to sonar-server/src/main/java/org/sonar/server/permission/ws/AddGroupAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/permission/ws/AddUserAction.java b/sonar-server/src/main/java/org/sonar/server/permission/ws/AddUserAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/permission/ws/AddUserAction.java rename to sonar-server/src/main/java/org/sonar/server/permission/ws/AddUserAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/permission/ws/GroupsAction.java b/sonar-server/src/main/java/org/sonar/server/permission/ws/GroupsAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/permission/ws/GroupsAction.java rename to sonar-server/src/main/java/org/sonar/server/permission/ws/GroupsAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/permission/ws/PermissionRequestValidator.java b/sonar-server/src/main/java/org/sonar/server/permission/ws/PermissionRequestValidator.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/permission/ws/PermissionRequestValidator.java rename to sonar-server/src/main/java/org/sonar/server/permission/ws/PermissionRequestValidator.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/permission/ws/PermissionWsSupport.java b/sonar-server/src/main/java/org/sonar/server/permission/ws/PermissionWsSupport.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/permission/ws/PermissionWsSupport.java rename to sonar-server/src/main/java/org/sonar/server/permission/ws/PermissionWsSupport.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/permission/ws/PermissionsWs.java b/sonar-server/src/main/java/org/sonar/server/permission/ws/PermissionsWs.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/permission/ws/PermissionsWs.java rename to sonar-server/src/main/java/org/sonar/server/permission/ws/PermissionsWs.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/permission/ws/PermissionsWsAction.java b/sonar-server/src/main/java/org/sonar/server/permission/ws/PermissionsWsAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/permission/ws/PermissionsWsAction.java rename to sonar-server/src/main/java/org/sonar/server/permission/ws/PermissionsWsAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/permission/ws/PermissionsWsModule.java b/sonar-server/src/main/java/org/sonar/server/permission/ws/PermissionsWsModule.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/permission/ws/PermissionsWsModule.java rename to sonar-server/src/main/java/org/sonar/server/permission/ws/PermissionsWsModule.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/permission/ws/PermissionsWsParametersBuilder.java b/sonar-server/src/main/java/org/sonar/server/permission/ws/PermissionsWsParametersBuilder.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/permission/ws/PermissionsWsParametersBuilder.java rename to sonar-server/src/main/java/org/sonar/server/permission/ws/PermissionsWsParametersBuilder.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/permission/ws/ProjectWsRef.java b/sonar-server/src/main/java/org/sonar/server/permission/ws/ProjectWsRef.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/permission/ws/ProjectWsRef.java rename to sonar-server/src/main/java/org/sonar/server/permission/ws/ProjectWsRef.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/permission/ws/RemoveGroupAction.java b/sonar-server/src/main/java/org/sonar/server/permission/ws/RemoveGroupAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/permission/ws/RemoveGroupAction.java rename to sonar-server/src/main/java/org/sonar/server/permission/ws/RemoveGroupAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/permission/ws/RemoveUserAction.java b/sonar-server/src/main/java/org/sonar/server/permission/ws/RemoveUserAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/permission/ws/RemoveUserAction.java rename to sonar-server/src/main/java/org/sonar/server/permission/ws/RemoveUserAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/permission/ws/SearchGlobalPermissionsAction.java b/sonar-server/src/main/java/org/sonar/server/permission/ws/SearchGlobalPermissionsAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/permission/ws/SearchGlobalPermissionsAction.java rename to sonar-server/src/main/java/org/sonar/server/permission/ws/SearchGlobalPermissionsAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/permission/ws/SearchProjectPermissionsAction.java b/sonar-server/src/main/java/org/sonar/server/permission/ws/SearchProjectPermissionsAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/permission/ws/SearchProjectPermissionsAction.java rename to sonar-server/src/main/java/org/sonar/server/permission/ws/SearchProjectPermissionsAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/permission/ws/SearchProjectPermissionsData.java b/sonar-server/src/main/java/org/sonar/server/permission/ws/SearchProjectPermissionsData.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/permission/ws/SearchProjectPermissionsData.java rename to sonar-server/src/main/java/org/sonar/server/permission/ws/SearchProjectPermissionsData.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/permission/ws/SearchProjectPermissionsDataLoader.java b/sonar-server/src/main/java/org/sonar/server/permission/ws/SearchProjectPermissionsDataLoader.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/permission/ws/SearchProjectPermissionsDataLoader.java rename to sonar-server/src/main/java/org/sonar/server/permission/ws/SearchProjectPermissionsDataLoader.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/permission/ws/UsersAction.java b/sonar-server/src/main/java/org/sonar/server/permission/ws/UsersAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/permission/ws/UsersAction.java rename to sonar-server/src/main/java/org/sonar/server/permission/ws/UsersAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/permission/ws/package-info.java b/sonar-server/src/main/java/org/sonar/server/permission/ws/package-info.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/permission/ws/package-info.java rename to sonar-server/src/main/java/org/sonar/server/permission/ws/package-info.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/permission/ws/template/AddGroupToTemplateAction.java b/sonar-server/src/main/java/org/sonar/server/permission/ws/template/AddGroupToTemplateAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/permission/ws/template/AddGroupToTemplateAction.java rename to sonar-server/src/main/java/org/sonar/server/permission/ws/template/AddGroupToTemplateAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/permission/ws/template/AddProjectCreatorToTemplateAction.java b/sonar-server/src/main/java/org/sonar/server/permission/ws/template/AddProjectCreatorToTemplateAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/permission/ws/template/AddProjectCreatorToTemplateAction.java rename to sonar-server/src/main/java/org/sonar/server/permission/ws/template/AddProjectCreatorToTemplateAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/permission/ws/template/AddUserToTemplateAction.java b/sonar-server/src/main/java/org/sonar/server/permission/ws/template/AddUserToTemplateAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/permission/ws/template/AddUserToTemplateAction.java rename to sonar-server/src/main/java/org/sonar/server/permission/ws/template/AddUserToTemplateAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/permission/ws/template/ApplyTemplateAction.java b/sonar-server/src/main/java/org/sonar/server/permission/ws/template/ApplyTemplateAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/permission/ws/template/ApplyTemplateAction.java rename to sonar-server/src/main/java/org/sonar/server/permission/ws/template/ApplyTemplateAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/permission/ws/template/BulkApplyTemplateAction.java b/sonar-server/src/main/java/org/sonar/server/permission/ws/template/BulkApplyTemplateAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/permission/ws/template/BulkApplyTemplateAction.java rename to sonar-server/src/main/java/org/sonar/server/permission/ws/template/BulkApplyTemplateAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/permission/ws/template/CreateTemplateAction.java b/sonar-server/src/main/java/org/sonar/server/permission/ws/template/CreateTemplateAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/permission/ws/template/CreateTemplateAction.java rename to sonar-server/src/main/java/org/sonar/server/permission/ws/template/CreateTemplateAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/permission/ws/template/DefaultTemplatesResolver.java b/sonar-server/src/main/java/org/sonar/server/permission/ws/template/DefaultTemplatesResolver.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/permission/ws/template/DefaultTemplatesResolver.java rename to sonar-server/src/main/java/org/sonar/server/permission/ws/template/DefaultTemplatesResolver.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/permission/ws/template/DefaultTemplatesResolverImpl.java b/sonar-server/src/main/java/org/sonar/server/permission/ws/template/DefaultTemplatesResolverImpl.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/permission/ws/template/DefaultTemplatesResolverImpl.java rename to sonar-server/src/main/java/org/sonar/server/permission/ws/template/DefaultTemplatesResolverImpl.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/permission/ws/template/DeleteTemplateAction.java b/sonar-server/src/main/java/org/sonar/server/permission/ws/template/DeleteTemplateAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/permission/ws/template/DeleteTemplateAction.java rename to sonar-server/src/main/java/org/sonar/server/permission/ws/template/DeleteTemplateAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/permission/ws/template/PermissionTemplateDtoToPermissionTemplateResponse.java b/sonar-server/src/main/java/org/sonar/server/permission/ws/template/PermissionTemplateDtoToPermissionTemplateResponse.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/permission/ws/template/PermissionTemplateDtoToPermissionTemplateResponse.java rename to sonar-server/src/main/java/org/sonar/server/permission/ws/template/PermissionTemplateDtoToPermissionTemplateResponse.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/permission/ws/template/RemoveGroupFromTemplateAction.java b/sonar-server/src/main/java/org/sonar/server/permission/ws/template/RemoveGroupFromTemplateAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/permission/ws/template/RemoveGroupFromTemplateAction.java rename to sonar-server/src/main/java/org/sonar/server/permission/ws/template/RemoveGroupFromTemplateAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/permission/ws/template/RemoveProjectCreatorFromTemplateAction.java b/sonar-server/src/main/java/org/sonar/server/permission/ws/template/RemoveProjectCreatorFromTemplateAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/permission/ws/template/RemoveProjectCreatorFromTemplateAction.java rename to sonar-server/src/main/java/org/sonar/server/permission/ws/template/RemoveProjectCreatorFromTemplateAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/permission/ws/template/RemoveUserFromTemplateAction.java b/sonar-server/src/main/java/org/sonar/server/permission/ws/template/RemoveUserFromTemplateAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/permission/ws/template/RemoveUserFromTemplateAction.java rename to sonar-server/src/main/java/org/sonar/server/permission/ws/template/RemoveUserFromTemplateAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/permission/ws/template/SearchTemplatesAction.java b/sonar-server/src/main/java/org/sonar/server/permission/ws/template/SearchTemplatesAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/permission/ws/template/SearchTemplatesAction.java rename to sonar-server/src/main/java/org/sonar/server/permission/ws/template/SearchTemplatesAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/permission/ws/template/SearchTemplatesData.java b/sonar-server/src/main/java/org/sonar/server/permission/ws/template/SearchTemplatesData.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/permission/ws/template/SearchTemplatesData.java rename to sonar-server/src/main/java/org/sonar/server/permission/ws/template/SearchTemplatesData.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/permission/ws/template/SearchTemplatesDataLoader.java b/sonar-server/src/main/java/org/sonar/server/permission/ws/template/SearchTemplatesDataLoader.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/permission/ws/template/SearchTemplatesDataLoader.java rename to sonar-server/src/main/java/org/sonar/server/permission/ws/template/SearchTemplatesDataLoader.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/permission/ws/template/SetDefaultTemplateAction.java b/sonar-server/src/main/java/org/sonar/server/permission/ws/template/SetDefaultTemplateAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/permission/ws/template/SetDefaultTemplateAction.java rename to sonar-server/src/main/java/org/sonar/server/permission/ws/template/SetDefaultTemplateAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/permission/ws/template/TemplateGroupsAction.java b/sonar-server/src/main/java/org/sonar/server/permission/ws/template/TemplateGroupsAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/permission/ws/template/TemplateGroupsAction.java rename to sonar-server/src/main/java/org/sonar/server/permission/ws/template/TemplateGroupsAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/permission/ws/template/TemplateUsersAction.java b/sonar-server/src/main/java/org/sonar/server/permission/ws/template/TemplateUsersAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/permission/ws/template/TemplateUsersAction.java rename to sonar-server/src/main/java/org/sonar/server/permission/ws/template/TemplateUsersAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/permission/ws/template/UpdateTemplateAction.java b/sonar-server/src/main/java/org/sonar/server/permission/ws/template/UpdateTemplateAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/permission/ws/template/UpdateTemplateAction.java rename to sonar-server/src/main/java/org/sonar/server/permission/ws/template/UpdateTemplateAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/permission/ws/template/WsTemplateRef.java b/sonar-server/src/main/java/org/sonar/server/permission/ws/template/WsTemplateRef.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/permission/ws/template/WsTemplateRef.java rename to sonar-server/src/main/java/org/sonar/server/permission/ws/template/WsTemplateRef.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/permission/ws/template/package-info.java b/sonar-server/src/main/java/org/sonar/server/permission/ws/template/package-info.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/permission/ws/template/package-info.java rename to sonar-server/src/main/java/org/sonar/server/permission/ws/template/package-info.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/BackendCleanup.java b/sonar-server/src/main/java/org/sonar/server/platform/BackendCleanup.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/BackendCleanup.java rename to sonar-server/src/main/java/org/sonar/server/platform/BackendCleanup.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/DatabaseServerCompatibility.java b/sonar-server/src/main/java/org/sonar/server/platform/DatabaseServerCompatibility.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/DatabaseServerCompatibility.java rename to sonar-server/src/main/java/org/sonar/server/platform/DatabaseServerCompatibility.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/DefaultServerUpgradeStatus.java b/sonar-server/src/main/java/org/sonar/server/platform/DefaultServerUpgradeStatus.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/DefaultServerUpgradeStatus.java rename to sonar-server/src/main/java/org/sonar/server/platform/DefaultServerUpgradeStatus.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/LogServerVersion.java b/sonar-server/src/main/java/org/sonar/server/platform/LogServerVersion.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/LogServerVersion.java rename to sonar-server/src/main/java/org/sonar/server/platform/LogServerVersion.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/PersistentSettings.java b/sonar-server/src/main/java/org/sonar/server/platform/PersistentSettings.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/PersistentSettings.java rename to sonar-server/src/main/java/org/sonar/server/platform/PersistentSettings.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/Platform.java b/sonar-server/src/main/java/org/sonar/server/platform/Platform.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/Platform.java rename to sonar-server/src/main/java/org/sonar/server/platform/Platform.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/ServerFileSystem.java b/sonar-server/src/main/java/org/sonar/server/platform/ServerFileSystem.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/ServerFileSystem.java rename to sonar-server/src/main/java/org/sonar/server/platform/ServerFileSystem.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/ServerFileSystemImpl.java b/sonar-server/src/main/java/org/sonar/server/platform/ServerFileSystemImpl.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/ServerFileSystemImpl.java rename to sonar-server/src/main/java/org/sonar/server/platform/ServerFileSystemImpl.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/ServerId.java b/sonar-server/src/main/java/org/sonar/server/platform/ServerId.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/ServerId.java rename to sonar-server/src/main/java/org/sonar/server/platform/ServerId.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/ServerIdGenerator.java b/sonar-server/src/main/java/org/sonar/server/platform/ServerIdGenerator.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/ServerIdGenerator.java rename to sonar-server/src/main/java/org/sonar/server/platform/ServerIdGenerator.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/ServerIdLoader.java b/sonar-server/src/main/java/org/sonar/server/platform/ServerIdLoader.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/ServerIdLoader.java rename to sonar-server/src/main/java/org/sonar/server/platform/ServerIdLoader.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/ServerIdManager.java b/sonar-server/src/main/java/org/sonar/server/platform/ServerIdManager.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/ServerIdManager.java rename to sonar-server/src/main/java/org/sonar/server/platform/ServerIdManager.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/ServerImpl.java b/sonar-server/src/main/java/org/sonar/server/platform/ServerImpl.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/ServerImpl.java rename to sonar-server/src/main/java/org/sonar/server/platform/ServerImpl.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/ServerLifecycleNotifier.java b/sonar-server/src/main/java/org/sonar/server/platform/ServerLifecycleNotifier.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/ServerLifecycleNotifier.java rename to sonar-server/src/main/java/org/sonar/server/platform/ServerLifecycleNotifier.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/ServerLogging.java b/sonar-server/src/main/java/org/sonar/server/platform/ServerLogging.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/ServerLogging.java rename to sonar-server/src/main/java/org/sonar/server/platform/ServerLogging.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/SettingsChangeNotifier.java b/sonar-server/src/main/java/org/sonar/server/platform/SettingsChangeNotifier.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/SettingsChangeNotifier.java rename to sonar-server/src/main/java/org/sonar/server/platform/SettingsChangeNotifier.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/StartupMetadata.java b/sonar-server/src/main/java/org/sonar/server/platform/StartupMetadata.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/StartupMetadata.java rename to sonar-server/src/main/java/org/sonar/server/platform/StartupMetadata.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/StartupMetadataPersister.java b/sonar-server/src/main/java/org/sonar/server/platform/StartupMetadataPersister.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/StartupMetadataPersister.java rename to sonar-server/src/main/java/org/sonar/server/platform/StartupMetadataPersister.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/StartupMetadataProvider.java b/sonar-server/src/main/java/org/sonar/server/platform/StartupMetadataProvider.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/StartupMetadataProvider.java rename to sonar-server/src/main/java/org/sonar/server/platform/StartupMetadataProvider.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/TempFolderProvider.java b/sonar-server/src/main/java/org/sonar/server/platform/TempFolderProvider.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/TempFolderProvider.java rename to sonar-server/src/main/java/org/sonar/server/platform/TempFolderProvider.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/UrlSettings.java b/sonar-server/src/main/java/org/sonar/server/platform/UrlSettings.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/UrlSettings.java rename to sonar-server/src/main/java/org/sonar/server/platform/UrlSettings.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/cluster/Cluster.java b/sonar-server/src/main/java/org/sonar/server/platform/cluster/Cluster.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/cluster/Cluster.java rename to sonar-server/src/main/java/org/sonar/server/platform/cluster/Cluster.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/cluster/ClusterImpl.java b/sonar-server/src/main/java/org/sonar/server/platform/cluster/ClusterImpl.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/cluster/ClusterImpl.java rename to sonar-server/src/main/java/org/sonar/server/platform/cluster/ClusterImpl.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/cluster/package-info.java b/sonar-server/src/main/java/org/sonar/server/platform/cluster/package-info.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/cluster/package-info.java rename to sonar-server/src/main/java/org/sonar/server/platform/cluster/package-info.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/db/CheckDatabaseCharsetAtStartup.java b/sonar-server/src/main/java/org/sonar/server/platform/db/CheckDatabaseCharsetAtStartup.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/db/CheckDatabaseCharsetAtStartup.java rename to sonar-server/src/main/java/org/sonar/server/platform/db/CheckDatabaseCharsetAtStartup.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/db/EmbeddedDatabase.java b/sonar-server/src/main/java/org/sonar/server/platform/db/EmbeddedDatabase.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/db/EmbeddedDatabase.java rename to sonar-server/src/main/java/org/sonar/server/platform/db/EmbeddedDatabase.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/db/EmbeddedDatabaseFactory.java b/sonar-server/src/main/java/org/sonar/server/platform/db/EmbeddedDatabaseFactory.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/db/EmbeddedDatabaseFactory.java rename to sonar-server/src/main/java/org/sonar/server/platform/db/EmbeddedDatabaseFactory.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/db/migration/AutoDbMigration.java b/sonar-server/src/main/java/org/sonar/server/platform/db/migration/AutoDbMigration.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/db/migration/AutoDbMigration.java rename to sonar-server/src/main/java/org/sonar/server/platform/db/migration/AutoDbMigration.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/db/migration/DatabaseMigrationExecutorService.java b/sonar-server/src/main/java/org/sonar/server/platform/db/migration/DatabaseMigrationExecutorService.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/db/migration/DatabaseMigrationExecutorService.java rename to sonar-server/src/main/java/org/sonar/server/platform/db/migration/DatabaseMigrationExecutorService.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/db/migration/DatabaseMigrationExecutorServiceImpl.java b/sonar-server/src/main/java/org/sonar/server/platform/db/migration/DatabaseMigrationExecutorServiceImpl.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/db/migration/DatabaseMigrationExecutorServiceImpl.java rename to sonar-server/src/main/java/org/sonar/server/platform/db/migration/DatabaseMigrationExecutorServiceImpl.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/db/migration/DatabaseMigrationImpl.java b/sonar-server/src/main/java/org/sonar/server/platform/db/migration/DatabaseMigrationImpl.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/db/migration/DatabaseMigrationImpl.java rename to sonar-server/src/main/java/org/sonar/server/platform/db/migration/DatabaseMigrationImpl.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/db/migration/package-info.java b/sonar-server/src/main/java/org/sonar/server/platform/db/migration/package-info.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/db/migration/package-info.java rename to sonar-server/src/main/java/org/sonar/server/platform/db/migration/package-info.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/db/package-info.java b/sonar-server/src/main/java/org/sonar/server/platform/db/package-info.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/db/package-info.java rename to sonar-server/src/main/java/org/sonar/server/platform/db/package-info.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/monitoring/BaseMonitorMBean.java b/sonar-server/src/main/java/org/sonar/server/platform/monitoring/BaseMonitorMBean.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/monitoring/BaseMonitorMBean.java rename to sonar-server/src/main/java/org/sonar/server/platform/monitoring/BaseMonitorMBean.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/monitoring/DatabaseMonitor.java b/sonar-server/src/main/java/org/sonar/server/platform/monitoring/DatabaseMonitor.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/monitoring/DatabaseMonitor.java rename to sonar-server/src/main/java/org/sonar/server/platform/monitoring/DatabaseMonitor.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/monitoring/DatabaseMonitorMBean.java b/sonar-server/src/main/java/org/sonar/server/platform/monitoring/DatabaseMonitorMBean.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/monitoring/DatabaseMonitorMBean.java rename to sonar-server/src/main/java/org/sonar/server/platform/monitoring/DatabaseMonitorMBean.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/monitoring/EsMonitor.java b/sonar-server/src/main/java/org/sonar/server/platform/monitoring/EsMonitor.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/monitoring/EsMonitor.java rename to sonar-server/src/main/java/org/sonar/server/platform/monitoring/EsMonitor.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/monitoring/EsMonitorMBean.java b/sonar-server/src/main/java/org/sonar/server/platform/monitoring/EsMonitorMBean.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/monitoring/EsMonitorMBean.java rename to sonar-server/src/main/java/org/sonar/server/platform/monitoring/EsMonitorMBean.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/monitoring/JvmPropsMonitor.java b/sonar-server/src/main/java/org/sonar/server/platform/monitoring/JvmPropsMonitor.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/monitoring/JvmPropsMonitor.java rename to sonar-server/src/main/java/org/sonar/server/platform/monitoring/JvmPropsMonitor.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/monitoring/Monitor.java b/sonar-server/src/main/java/org/sonar/server/platform/monitoring/Monitor.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/monitoring/Monitor.java rename to sonar-server/src/main/java/org/sonar/server/platform/monitoring/Monitor.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/monitoring/PluginsMonitor.java b/sonar-server/src/main/java/org/sonar/server/platform/monitoring/PluginsMonitor.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/monitoring/PluginsMonitor.java rename to sonar-server/src/main/java/org/sonar/server/platform/monitoring/PluginsMonitor.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/monitoring/SettingsMonitor.java b/sonar-server/src/main/java/org/sonar/server/platform/monitoring/SettingsMonitor.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/monitoring/SettingsMonitor.java rename to sonar-server/src/main/java/org/sonar/server/platform/monitoring/SettingsMonitor.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/monitoring/SonarQubeMonitor.java b/sonar-server/src/main/java/org/sonar/server/platform/monitoring/SonarQubeMonitor.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/monitoring/SonarQubeMonitor.java rename to sonar-server/src/main/java/org/sonar/server/platform/monitoring/SonarQubeMonitor.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/monitoring/SonarQubeMonitorMBean.java b/sonar-server/src/main/java/org/sonar/server/platform/monitoring/SonarQubeMonitorMBean.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/monitoring/SonarQubeMonitorMBean.java rename to sonar-server/src/main/java/org/sonar/server/platform/monitoring/SonarQubeMonitorMBean.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/monitoring/SystemMonitor.java b/sonar-server/src/main/java/org/sonar/server/platform/monitoring/SystemMonitor.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/monitoring/SystemMonitor.java rename to sonar-server/src/main/java/org/sonar/server/platform/monitoring/SystemMonitor.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/monitoring/package-info.java b/sonar-server/src/main/java/org/sonar/server/platform/monitoring/package-info.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/monitoring/package-info.java rename to sonar-server/src/main/java/org/sonar/server/platform/monitoring/package-info.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/package-info.java b/sonar-server/src/main/java/org/sonar/server/platform/package-info.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/package-info.java rename to sonar-server/src/main/java/org/sonar/server/platform/package-info.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel.java b/sonar-server/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel.java rename to sonar-server/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel1.java b/sonar-server/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel1.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel1.java rename to sonar-server/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel1.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel2.java b/sonar-server/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel2.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel2.java rename to sonar-server/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel2.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel3.java b/sonar-server/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel3.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel3.java rename to sonar-server/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel3.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel4.java b/sonar-server/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel4.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel4.java rename to sonar-server/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel4.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevelSafeMode.java b/sonar-server/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevelSafeMode.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevelSafeMode.java rename to sonar-server/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevelSafeMode.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevelStartup.java b/sonar-server/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevelStartup.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevelStartup.java rename to sonar-server/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevelStartup.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/platformlevel/package-info.java b/sonar-server/src/main/java/org/sonar/server/platform/platformlevel/package-info.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/platformlevel/package-info.java rename to sonar-server/src/main/java/org/sonar/server/platform/platformlevel/package-info.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/web/AbortTomcatStartException.java b/sonar-server/src/main/java/org/sonar/server/platform/web/AbortTomcatStartException.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/web/AbortTomcatStartException.java rename to sonar-server/src/main/java/org/sonar/server/platform/web/AbortTomcatStartException.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/web/MasterServletFilter.java b/sonar-server/src/main/java/org/sonar/server/platform/web/MasterServletFilter.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/web/MasterServletFilter.java rename to sonar-server/src/main/java/org/sonar/server/platform/web/MasterServletFilter.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/web/PlatformServletContextListener.java b/sonar-server/src/main/java/org/sonar/server/platform/web/PlatformServletContextListener.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/web/PlatformServletContextListener.java rename to sonar-server/src/main/java/org/sonar/server/platform/web/PlatformServletContextListener.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/web/RedirectFilter.java b/sonar-server/src/main/java/org/sonar/server/platform/web/RedirectFilter.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/web/RedirectFilter.java rename to sonar-server/src/main/java/org/sonar/server/platform/web/RedirectFilter.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/web/RegisterServletFilters.java b/sonar-server/src/main/java/org/sonar/server/platform/web/RegisterServletFilters.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/web/RegisterServletFilters.java rename to sonar-server/src/main/java/org/sonar/server/platform/web/RegisterServletFilters.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/web/RootFilter.java b/sonar-server/src/main/java/org/sonar/server/platform/web/RootFilter.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/web/RootFilter.java rename to sonar-server/src/main/java/org/sonar/server/platform/web/RootFilter.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/web/SecurityServletFilter.java b/sonar-server/src/main/java/org/sonar/server/platform/web/SecurityServletFilter.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/web/SecurityServletFilter.java rename to sonar-server/src/main/java/org/sonar/server/platform/web/SecurityServletFilter.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/web/WebPagesFilter.java b/sonar-server/src/main/java/org/sonar/server/platform/web/WebPagesFilter.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/web/WebPagesFilter.java rename to sonar-server/src/main/java/org/sonar/server/platform/web/WebPagesFilter.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/web/package-info.java b/sonar-server/src/main/java/org/sonar/server/platform/web/package-info.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/web/package-info.java rename to sonar-server/src/main/java/org/sonar/server/platform/web/package-info.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/web/requestid/HttpRequestIdModule.java b/sonar-server/src/main/java/org/sonar/server/platform/web/requestid/HttpRequestIdModule.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/web/requestid/HttpRequestIdModule.java rename to sonar-server/src/main/java/org/sonar/server/platform/web/requestid/HttpRequestIdModule.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/web/requestid/RequestIdConfiguration.java b/sonar-server/src/main/java/org/sonar/server/platform/web/requestid/RequestIdConfiguration.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/web/requestid/RequestIdConfiguration.java rename to sonar-server/src/main/java/org/sonar/server/platform/web/requestid/RequestIdConfiguration.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/web/requestid/RequestIdFilter.java b/sonar-server/src/main/java/org/sonar/server/platform/web/requestid/RequestIdFilter.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/web/requestid/RequestIdFilter.java rename to sonar-server/src/main/java/org/sonar/server/platform/web/requestid/RequestIdFilter.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/web/requestid/RequestIdGenerator.java b/sonar-server/src/main/java/org/sonar/server/platform/web/requestid/RequestIdGenerator.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/web/requestid/RequestIdGenerator.java rename to sonar-server/src/main/java/org/sonar/server/platform/web/requestid/RequestIdGenerator.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/web/requestid/RequestIdGeneratorBase.java b/sonar-server/src/main/java/org/sonar/server/platform/web/requestid/RequestIdGeneratorBase.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/web/requestid/RequestIdGeneratorBase.java rename to sonar-server/src/main/java/org/sonar/server/platform/web/requestid/RequestIdGeneratorBase.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/web/requestid/RequestIdGeneratorBaseImpl.java b/sonar-server/src/main/java/org/sonar/server/platform/web/requestid/RequestIdGeneratorBaseImpl.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/web/requestid/RequestIdGeneratorBaseImpl.java rename to sonar-server/src/main/java/org/sonar/server/platform/web/requestid/RequestIdGeneratorBaseImpl.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/web/requestid/RequestIdGeneratorImpl.java b/sonar-server/src/main/java/org/sonar/server/platform/web/requestid/RequestIdGeneratorImpl.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/web/requestid/RequestIdGeneratorImpl.java rename to sonar-server/src/main/java/org/sonar/server/platform/web/requestid/RequestIdGeneratorImpl.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/web/requestid/RequestIdMDCStorage.java b/sonar-server/src/main/java/org/sonar/server/platform/web/requestid/RequestIdMDCStorage.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/web/requestid/RequestIdMDCStorage.java rename to sonar-server/src/main/java/org/sonar/server/platform/web/requestid/RequestIdMDCStorage.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/web/requestid/package-info.java b/sonar-server/src/main/java/org/sonar/server/platform/web/requestid/package-info.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/web/requestid/package-info.java rename to sonar-server/src/main/java/org/sonar/server/platform/web/requestid/package-info.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/ws/ChangeLogLevelAction.java b/sonar-server/src/main/java/org/sonar/server/platform/ws/ChangeLogLevelAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/ws/ChangeLogLevelAction.java rename to sonar-server/src/main/java/org/sonar/server/platform/ws/ChangeLogLevelAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/ws/DbMigrationJsonWriter.java b/sonar-server/src/main/java/org/sonar/server/platform/ws/DbMigrationJsonWriter.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/ws/DbMigrationJsonWriter.java rename to sonar-server/src/main/java/org/sonar/server/platform/ws/DbMigrationJsonWriter.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/ws/DbMigrationStatusAction.java b/sonar-server/src/main/java/org/sonar/server/platform/ws/DbMigrationStatusAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/ws/DbMigrationStatusAction.java rename to sonar-server/src/main/java/org/sonar/server/platform/ws/DbMigrationStatusAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/ws/IndexAction.java b/sonar-server/src/main/java/org/sonar/server/platform/ws/IndexAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/ws/IndexAction.java rename to sonar-server/src/main/java/org/sonar/server/platform/ws/IndexAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/ws/InfoAction.java b/sonar-server/src/main/java/org/sonar/server/platform/ws/InfoAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/ws/InfoAction.java rename to sonar-server/src/main/java/org/sonar/server/platform/ws/InfoAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/ws/L10nWs.java b/sonar-server/src/main/java/org/sonar/server/platform/ws/L10nWs.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/ws/L10nWs.java rename to sonar-server/src/main/java/org/sonar/server/platform/ws/L10nWs.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/ws/LogsAction.java b/sonar-server/src/main/java/org/sonar/server/platform/ws/LogsAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/ws/LogsAction.java rename to sonar-server/src/main/java/org/sonar/server/platform/ws/LogsAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/ws/MigrateDbAction.java b/sonar-server/src/main/java/org/sonar/server/platform/ws/MigrateDbAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/ws/MigrateDbAction.java rename to sonar-server/src/main/java/org/sonar/server/platform/ws/MigrateDbAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/ws/PingAction.java b/sonar-server/src/main/java/org/sonar/server/platform/ws/PingAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/ws/PingAction.java rename to sonar-server/src/main/java/org/sonar/server/platform/ws/PingAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/ws/RestartAction.java b/sonar-server/src/main/java/org/sonar/server/platform/ws/RestartAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/ws/RestartAction.java rename to sonar-server/src/main/java/org/sonar/server/platform/ws/RestartAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/ws/ServerWs.java b/sonar-server/src/main/java/org/sonar/server/platform/ws/ServerWs.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/ws/ServerWs.java rename to sonar-server/src/main/java/org/sonar/server/platform/ws/ServerWs.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/ws/StatusAction.java b/sonar-server/src/main/java/org/sonar/server/platform/ws/StatusAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/ws/StatusAction.java rename to sonar-server/src/main/java/org/sonar/server/platform/ws/StatusAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/ws/SystemWs.java b/sonar-server/src/main/java/org/sonar/server/platform/ws/SystemWs.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/ws/SystemWs.java rename to sonar-server/src/main/java/org/sonar/server/platform/ws/SystemWs.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/ws/SystemWsAction.java b/sonar-server/src/main/java/org/sonar/server/platform/ws/SystemWsAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/ws/SystemWsAction.java rename to sonar-server/src/main/java/org/sonar/server/platform/ws/SystemWsAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/ws/UpgradesAction.java b/sonar-server/src/main/java/org/sonar/server/platform/ws/UpgradesAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/ws/UpgradesAction.java rename to sonar-server/src/main/java/org/sonar/server/platform/ws/UpgradesAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/ws/package-info.java b/sonar-server/src/main/java/org/sonar/server/platform/ws/package-info.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/platform/ws/package-info.java rename to sonar-server/src/main/java/org/sonar/server/platform/ws/package-info.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/plugins/InstalledPluginReferentialFactory.java b/sonar-server/src/main/java/org/sonar/server/plugins/InstalledPluginReferentialFactory.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/plugins/InstalledPluginReferentialFactory.java rename to sonar-server/src/main/java/org/sonar/server/plugins/InstalledPluginReferentialFactory.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/plugins/PluginDownloader.java b/sonar-server/src/main/java/org/sonar/server/plugins/PluginDownloader.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/plugins/PluginDownloader.java rename to sonar-server/src/main/java/org/sonar/server/plugins/PluginDownloader.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/plugins/PluginReferentialMetadataConverter.java b/sonar-server/src/main/java/org/sonar/server/plugins/PluginReferentialMetadataConverter.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/plugins/PluginReferentialMetadataConverter.java rename to sonar-server/src/main/java/org/sonar/server/plugins/PluginReferentialMetadataConverter.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/plugins/ServerExtensionInstaller.java b/sonar-server/src/main/java/org/sonar/server/plugins/ServerExtensionInstaller.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/plugins/ServerExtensionInstaller.java rename to sonar-server/src/main/java/org/sonar/server/plugins/ServerExtensionInstaller.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/plugins/ServerPluginJarExploder.java b/sonar-server/src/main/java/org/sonar/server/plugins/ServerPluginJarExploder.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/plugins/ServerPluginJarExploder.java rename to sonar-server/src/main/java/org/sonar/server/plugins/ServerPluginJarExploder.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/plugins/ServerPluginRepository.java b/sonar-server/src/main/java/org/sonar/server/plugins/ServerPluginRepository.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/plugins/ServerPluginRepository.java rename to sonar-server/src/main/java/org/sonar/server/plugins/ServerPluginRepository.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/plugins/StaticResourcesServlet.java b/sonar-server/src/main/java/org/sonar/server/plugins/StaticResourcesServlet.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/plugins/StaticResourcesServlet.java rename to sonar-server/src/main/java/org/sonar/server/plugins/StaticResourcesServlet.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/plugins/UpdateCenterClient.java b/sonar-server/src/main/java/org/sonar/server/plugins/UpdateCenterClient.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/plugins/UpdateCenterClient.java rename to sonar-server/src/main/java/org/sonar/server/plugins/UpdateCenterClient.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/plugins/UpdateCenterMatrixFactory.java b/sonar-server/src/main/java/org/sonar/server/plugins/UpdateCenterMatrixFactory.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/plugins/UpdateCenterMatrixFactory.java rename to sonar-server/src/main/java/org/sonar/server/plugins/UpdateCenterMatrixFactory.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/plugins/WebServerExtensionInstaller.java b/sonar-server/src/main/java/org/sonar/server/plugins/WebServerExtensionInstaller.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/plugins/WebServerExtensionInstaller.java rename to sonar-server/src/main/java/org/sonar/server/plugins/WebServerExtensionInstaller.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/plugins/package-info.java b/sonar-server/src/main/java/org/sonar/server/plugins/package-info.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/plugins/package-info.java rename to sonar-server/src/main/java/org/sonar/server/plugins/package-info.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/plugins/privileged/PrivilegedPluginsBootstraper.java b/sonar-server/src/main/java/org/sonar/server/plugins/privileged/PrivilegedPluginsBootstraper.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/plugins/privileged/PrivilegedPluginsBootstraper.java rename to sonar-server/src/main/java/org/sonar/server/plugins/privileged/PrivilegedPluginsBootstraper.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/plugins/privileged/PrivilegedPluginsStopper.java b/sonar-server/src/main/java/org/sonar/server/plugins/privileged/PrivilegedPluginsStopper.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/plugins/privileged/PrivilegedPluginsStopper.java rename to sonar-server/src/main/java/org/sonar/server/plugins/privileged/PrivilegedPluginsStopper.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/plugins/privileged/package-info.java b/sonar-server/src/main/java/org/sonar/server/plugins/privileged/package-info.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/plugins/privileged/package-info.java rename to sonar-server/src/main/java/org/sonar/server/plugins/privileged/package-info.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/plugins/ws/AvailableAction.java b/sonar-server/src/main/java/org/sonar/server/plugins/ws/AvailableAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/plugins/ws/AvailableAction.java rename to sonar-server/src/main/java/org/sonar/server/plugins/ws/AvailableAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/plugins/ws/CancelAllAction.java b/sonar-server/src/main/java/org/sonar/server/plugins/ws/CancelAllAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/plugins/ws/CancelAllAction.java rename to sonar-server/src/main/java/org/sonar/server/plugins/ws/CancelAllAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/plugins/ws/InstallAction.java b/sonar-server/src/main/java/org/sonar/server/plugins/ws/InstallAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/plugins/ws/InstallAction.java rename to sonar-server/src/main/java/org/sonar/server/plugins/ws/InstallAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/plugins/ws/InstalledAction.java b/sonar-server/src/main/java/org/sonar/server/plugins/ws/InstalledAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/plugins/ws/InstalledAction.java rename to sonar-server/src/main/java/org/sonar/server/plugins/ws/InstalledAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/plugins/ws/PendingAction.java b/sonar-server/src/main/java/org/sonar/server/plugins/ws/PendingAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/plugins/ws/PendingAction.java rename to sonar-server/src/main/java/org/sonar/server/plugins/ws/PendingAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/plugins/ws/PluginUpdateAggregator.java b/sonar-server/src/main/java/org/sonar/server/plugins/ws/PluginUpdateAggregator.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/plugins/ws/PluginUpdateAggregator.java rename to sonar-server/src/main/java/org/sonar/server/plugins/ws/PluginUpdateAggregator.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/plugins/ws/PluginWSCommons.java b/sonar-server/src/main/java/org/sonar/server/plugins/ws/PluginWSCommons.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/plugins/ws/PluginWSCommons.java rename to sonar-server/src/main/java/org/sonar/server/plugins/ws/PluginWSCommons.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/plugins/ws/PluginsWs.java b/sonar-server/src/main/java/org/sonar/server/plugins/ws/PluginsWs.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/plugins/ws/PluginsWs.java rename to sonar-server/src/main/java/org/sonar/server/plugins/ws/PluginsWs.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/plugins/ws/PluginsWsAction.java b/sonar-server/src/main/java/org/sonar/server/plugins/ws/PluginsWsAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/plugins/ws/PluginsWsAction.java rename to sonar-server/src/main/java/org/sonar/server/plugins/ws/PluginsWsAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/plugins/ws/UninstallAction.java b/sonar-server/src/main/java/org/sonar/server/plugins/ws/UninstallAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/plugins/ws/UninstallAction.java rename to sonar-server/src/main/java/org/sonar/server/plugins/ws/UninstallAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/plugins/ws/UpdateAction.java b/sonar-server/src/main/java/org/sonar/server/plugins/ws/UpdateAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/plugins/ws/UpdateAction.java rename to sonar-server/src/main/java/org/sonar/server/plugins/ws/UpdateAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/plugins/ws/UpdatesAction.java b/sonar-server/src/main/java/org/sonar/server/plugins/ws/UpdatesAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/plugins/ws/UpdatesAction.java rename to sonar-server/src/main/java/org/sonar/server/plugins/ws/UpdatesAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/plugins/ws/package-info.java b/sonar-server/src/main/java/org/sonar/server/plugins/ws/package-info.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/plugins/ws/package-info.java rename to sonar-server/src/main/java/org/sonar/server/plugins/ws/package-info.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/project/Visibility.java b/sonar-server/src/main/java/org/sonar/server/project/Visibility.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/project/Visibility.java rename to sonar-server/src/main/java/org/sonar/server/project/Visibility.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/project/package-info.java b/sonar-server/src/main/java/org/sonar/server/project/package-info.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/project/package-info.java rename to sonar-server/src/main/java/org/sonar/server/project/package-info.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/project/ws/BulkDeleteAction.java b/sonar-server/src/main/java/org/sonar/server/project/ws/BulkDeleteAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/project/ws/BulkDeleteAction.java rename to sonar-server/src/main/java/org/sonar/server/project/ws/BulkDeleteAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/project/ws/BulkUpdateKeyAction.java b/sonar-server/src/main/java/org/sonar/server/project/ws/BulkUpdateKeyAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/project/ws/BulkUpdateKeyAction.java rename to sonar-server/src/main/java/org/sonar/server/project/ws/BulkUpdateKeyAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/project/ws/CreateAction.java b/sonar-server/src/main/java/org/sonar/server/project/ws/CreateAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/project/ws/CreateAction.java rename to sonar-server/src/main/java/org/sonar/server/project/ws/CreateAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/project/ws/DeleteAction.java b/sonar-server/src/main/java/org/sonar/server/project/ws/DeleteAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/project/ws/DeleteAction.java rename to sonar-server/src/main/java/org/sonar/server/project/ws/DeleteAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/project/ws/GhostsAction.java b/sonar-server/src/main/java/org/sonar/server/project/ws/GhostsAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/project/ws/GhostsAction.java rename to sonar-server/src/main/java/org/sonar/server/project/ws/GhostsAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/project/ws/IndexAction.java b/sonar-server/src/main/java/org/sonar/server/project/ws/IndexAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/project/ws/IndexAction.java rename to sonar-server/src/main/java/org/sonar/server/project/ws/IndexAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/project/ws/ProjectsWs.java b/sonar-server/src/main/java/org/sonar/server/project/ws/ProjectsWs.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/project/ws/ProjectsWs.java rename to sonar-server/src/main/java/org/sonar/server/project/ws/ProjectsWs.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/project/ws/ProjectsWsAction.java b/sonar-server/src/main/java/org/sonar/server/project/ws/ProjectsWsAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/project/ws/ProjectsWsAction.java rename to sonar-server/src/main/java/org/sonar/server/project/ws/ProjectsWsAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/project/ws/ProjectsWsModule.java b/sonar-server/src/main/java/org/sonar/server/project/ws/ProjectsWsModule.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/project/ws/ProjectsWsModule.java rename to sonar-server/src/main/java/org/sonar/server/project/ws/ProjectsWsModule.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/project/ws/ProjectsWsSupport.java b/sonar-server/src/main/java/org/sonar/server/project/ws/ProjectsWsSupport.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/project/ws/ProjectsWsSupport.java rename to sonar-server/src/main/java/org/sonar/server/project/ws/ProjectsWsSupport.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/project/ws/ProvisionedAction.java b/sonar-server/src/main/java/org/sonar/server/project/ws/ProvisionedAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/project/ws/ProvisionedAction.java rename to sonar-server/src/main/java/org/sonar/server/project/ws/ProvisionedAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/project/ws/SearchAction.java b/sonar-server/src/main/java/org/sonar/server/project/ws/SearchAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/project/ws/SearchAction.java rename to sonar-server/src/main/java/org/sonar/server/project/ws/SearchAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/project/ws/SearchMyProjectsAction.java b/sonar-server/src/main/java/org/sonar/server/project/ws/SearchMyProjectsAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/project/ws/SearchMyProjectsAction.java rename to sonar-server/src/main/java/org/sonar/server/project/ws/SearchMyProjectsAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/project/ws/SearchMyProjectsData.java b/sonar-server/src/main/java/org/sonar/server/project/ws/SearchMyProjectsData.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/project/ws/SearchMyProjectsData.java rename to sonar-server/src/main/java/org/sonar/server/project/ws/SearchMyProjectsData.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/project/ws/SearchMyProjectsDataLoader.java b/sonar-server/src/main/java/org/sonar/server/project/ws/SearchMyProjectsDataLoader.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/project/ws/SearchMyProjectsDataLoader.java rename to sonar-server/src/main/java/org/sonar/server/project/ws/SearchMyProjectsDataLoader.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/project/ws/UpdateKeyAction.java b/sonar-server/src/main/java/org/sonar/server/project/ws/UpdateKeyAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/project/ws/UpdateKeyAction.java rename to sonar-server/src/main/java/org/sonar/server/project/ws/UpdateKeyAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/project/ws/UpdateVisibilityAction.java b/sonar-server/src/main/java/org/sonar/server/project/ws/UpdateVisibilityAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/project/ws/UpdateVisibilityAction.java rename to sonar-server/src/main/java/org/sonar/server/project/ws/UpdateVisibilityAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/project/ws/package-info.java b/sonar-server/src/main/java/org/sonar/server/project/ws/package-info.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/project/ws/package-info.java rename to sonar-server/src/main/java/org/sonar/server/project/ws/package-info.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/projectanalysis/ProjectAnalysisModule.java b/sonar-server/src/main/java/org/sonar/server/projectanalysis/ProjectAnalysisModule.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/projectanalysis/ProjectAnalysisModule.java rename to sonar-server/src/main/java/org/sonar/server/projectanalysis/ProjectAnalysisModule.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/projectanalysis/package-info.java b/sonar-server/src/main/java/org/sonar/server/projectanalysis/package-info.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/projectanalysis/package-info.java rename to sonar-server/src/main/java/org/sonar/server/projectanalysis/package-info.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/projectanalysis/ws/CreateEventAction.java b/sonar-server/src/main/java/org/sonar/server/projectanalysis/ws/CreateEventAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/projectanalysis/ws/CreateEventAction.java rename to sonar-server/src/main/java/org/sonar/server/projectanalysis/ws/CreateEventAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/projectanalysis/ws/DeleteAction.java b/sonar-server/src/main/java/org/sonar/server/projectanalysis/ws/DeleteAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/projectanalysis/ws/DeleteAction.java rename to sonar-server/src/main/java/org/sonar/server/projectanalysis/ws/DeleteAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/projectanalysis/ws/DeleteEventAction.java b/sonar-server/src/main/java/org/sonar/server/projectanalysis/ws/DeleteEventAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/projectanalysis/ws/DeleteEventAction.java rename to sonar-server/src/main/java/org/sonar/server/projectanalysis/ws/DeleteEventAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/projectanalysis/ws/EventValidator.java b/sonar-server/src/main/java/org/sonar/server/projectanalysis/ws/EventValidator.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/projectanalysis/ws/EventValidator.java rename to sonar-server/src/main/java/org/sonar/server/projectanalysis/ws/EventValidator.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/projectanalysis/ws/ProjectAnalysesWs.java b/sonar-server/src/main/java/org/sonar/server/projectanalysis/ws/ProjectAnalysesWs.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/projectanalysis/ws/ProjectAnalysesWs.java rename to sonar-server/src/main/java/org/sonar/server/projectanalysis/ws/ProjectAnalysesWs.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/projectanalysis/ws/ProjectAnalysesWsAction.java b/sonar-server/src/main/java/org/sonar/server/projectanalysis/ws/ProjectAnalysesWsAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/projectanalysis/ws/ProjectAnalysesWsAction.java rename to sonar-server/src/main/java/org/sonar/server/projectanalysis/ws/ProjectAnalysesWsAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/projectanalysis/ws/SearchAction.java b/sonar-server/src/main/java/org/sonar/server/projectanalysis/ws/SearchAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/projectanalysis/ws/SearchAction.java rename to sonar-server/src/main/java/org/sonar/server/projectanalysis/ws/SearchAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/projectanalysis/ws/SearchData.java b/sonar-server/src/main/java/org/sonar/server/projectanalysis/ws/SearchData.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/projectanalysis/ws/SearchData.java rename to sonar-server/src/main/java/org/sonar/server/projectanalysis/ws/SearchData.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/projectanalysis/ws/SearchResponseBuilder.java b/sonar-server/src/main/java/org/sonar/server/projectanalysis/ws/SearchResponseBuilder.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/projectanalysis/ws/SearchResponseBuilder.java rename to sonar-server/src/main/java/org/sonar/server/projectanalysis/ws/SearchResponseBuilder.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/projectanalysis/ws/UpdateEventAction.java b/sonar-server/src/main/java/org/sonar/server/projectanalysis/ws/UpdateEventAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/projectanalysis/ws/UpdateEventAction.java rename to sonar-server/src/main/java/org/sonar/server/projectanalysis/ws/UpdateEventAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/projectanalysis/ws/package-info.java b/sonar-server/src/main/java/org/sonar/server/projectanalysis/ws/package-info.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/projectanalysis/ws/package-info.java rename to sonar-server/src/main/java/org/sonar/server/projectanalysis/ws/package-info.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/projectlink/ws/CreateAction.java b/sonar-server/src/main/java/org/sonar/server/projectlink/ws/CreateAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/projectlink/ws/CreateAction.java rename to sonar-server/src/main/java/org/sonar/server/projectlink/ws/CreateAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/projectlink/ws/DeleteAction.java b/sonar-server/src/main/java/org/sonar/server/projectlink/ws/DeleteAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/projectlink/ws/DeleteAction.java rename to sonar-server/src/main/java/org/sonar/server/projectlink/ws/DeleteAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/projectlink/ws/ProjectLinksModule.java b/sonar-server/src/main/java/org/sonar/server/projectlink/ws/ProjectLinksModule.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/projectlink/ws/ProjectLinksModule.java rename to sonar-server/src/main/java/org/sonar/server/projectlink/ws/ProjectLinksModule.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/projectlink/ws/ProjectLinksWs.java b/sonar-server/src/main/java/org/sonar/server/projectlink/ws/ProjectLinksWs.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/projectlink/ws/ProjectLinksWs.java rename to sonar-server/src/main/java/org/sonar/server/projectlink/ws/ProjectLinksWs.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/projectlink/ws/ProjectLinksWsAction.java b/sonar-server/src/main/java/org/sonar/server/projectlink/ws/ProjectLinksWsAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/projectlink/ws/ProjectLinksWsAction.java rename to sonar-server/src/main/java/org/sonar/server/projectlink/ws/ProjectLinksWsAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/projectlink/ws/SearchAction.java b/sonar-server/src/main/java/org/sonar/server/projectlink/ws/SearchAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/projectlink/ws/SearchAction.java rename to sonar-server/src/main/java/org/sonar/server/projectlink/ws/SearchAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/projectlink/ws/package-info.java b/sonar-server/src/main/java/org/sonar/server/projectlink/ws/package-info.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/projectlink/ws/package-info.java rename to sonar-server/src/main/java/org/sonar/server/projectlink/ws/package-info.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/projecttag/ws/ProjectTagsWs.java b/sonar-server/src/main/java/org/sonar/server/projecttag/ws/ProjectTagsWs.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/projecttag/ws/ProjectTagsWs.java rename to sonar-server/src/main/java/org/sonar/server/projecttag/ws/ProjectTagsWs.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/projecttag/ws/ProjectTagsWsAction.java b/sonar-server/src/main/java/org/sonar/server/projecttag/ws/ProjectTagsWsAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/projecttag/ws/ProjectTagsWsAction.java rename to sonar-server/src/main/java/org/sonar/server/projecttag/ws/ProjectTagsWsAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/projecttag/ws/ProjectTagsWsModule.java b/sonar-server/src/main/java/org/sonar/server/projecttag/ws/ProjectTagsWsModule.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/projecttag/ws/ProjectTagsWsModule.java rename to sonar-server/src/main/java/org/sonar/server/projecttag/ws/ProjectTagsWsModule.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/projecttag/ws/SearchAction.java b/sonar-server/src/main/java/org/sonar/server/projecttag/ws/SearchAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/projecttag/ws/SearchAction.java rename to sonar-server/src/main/java/org/sonar/server/projecttag/ws/SearchAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/projecttag/ws/SetAction.java b/sonar-server/src/main/java/org/sonar/server/projecttag/ws/SetAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/projecttag/ws/SetAction.java rename to sonar-server/src/main/java/org/sonar/server/projecttag/ws/SetAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/projecttag/ws/package-info.java b/sonar-server/src/main/java/org/sonar/server/projecttag/ws/package-info.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/projecttag/ws/package-info.java rename to sonar-server/src/main/java/org/sonar/server/projecttag/ws/package-info.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/property/InternalProperties.java b/sonar-server/src/main/java/org/sonar/server/property/InternalProperties.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/property/InternalProperties.java rename to sonar-server/src/main/java/org/sonar/server/property/InternalProperties.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/property/InternalPropertiesImpl.java b/sonar-server/src/main/java/org/sonar/server/property/InternalPropertiesImpl.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/property/InternalPropertiesImpl.java rename to sonar-server/src/main/java/org/sonar/server/property/InternalPropertiesImpl.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/property/package-info.java b/sonar-server/src/main/java/org/sonar/server/property/package-info.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/property/package-info.java rename to sonar-server/src/main/java/org/sonar/server/property/package-info.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/property/ws/IndexAction.java b/sonar-server/src/main/java/org/sonar/server/property/ws/IndexAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/property/ws/IndexAction.java rename to sonar-server/src/main/java/org/sonar/server/property/ws/IndexAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/property/ws/PropertiesWs.java b/sonar-server/src/main/java/org/sonar/server/property/ws/PropertiesWs.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/property/ws/PropertiesWs.java rename to sonar-server/src/main/java/org/sonar/server/property/ws/PropertiesWs.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/property/ws/package-info.java b/sonar-server/src/main/java/org/sonar/server/property/ws/package-info.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/property/ws/package-info.java rename to sonar-server/src/main/java/org/sonar/server/property/ws/package-info.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualitygate/QgateProjectFinder.java b/sonar-server/src/main/java/org/sonar/server/qualitygate/QgateProjectFinder.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualitygate/QgateProjectFinder.java rename to sonar-server/src/main/java/org/sonar/server/qualitygate/QgateProjectFinder.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualitygate/QualityGateConditionsUpdater.java b/sonar-server/src/main/java/org/sonar/server/qualitygate/QualityGateConditionsUpdater.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualitygate/QualityGateConditionsUpdater.java rename to sonar-server/src/main/java/org/sonar/server/qualitygate/QualityGateConditionsUpdater.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualitygate/QualityGateFinder.java b/sonar-server/src/main/java/org/sonar/server/qualitygate/QualityGateFinder.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualitygate/QualityGateFinder.java rename to sonar-server/src/main/java/org/sonar/server/qualitygate/QualityGateFinder.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualitygate/QualityGateModule.java b/sonar-server/src/main/java/org/sonar/server/qualitygate/QualityGateModule.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualitygate/QualityGateModule.java rename to sonar-server/src/main/java/org/sonar/server/qualitygate/QualityGateModule.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualitygate/QualityGateUpdater.java b/sonar-server/src/main/java/org/sonar/server/qualitygate/QualityGateUpdater.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualitygate/QualityGateUpdater.java rename to sonar-server/src/main/java/org/sonar/server/qualitygate/QualityGateUpdater.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualitygate/QualityGates.java b/sonar-server/src/main/java/org/sonar/server/qualitygate/QualityGates.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualitygate/QualityGates.java rename to sonar-server/src/main/java/org/sonar/server/qualitygate/QualityGates.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualitygate/RegisterQualityGates.java b/sonar-server/src/main/java/org/sonar/server/qualitygate/RegisterQualityGates.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualitygate/RegisterQualityGates.java rename to sonar-server/src/main/java/org/sonar/server/qualitygate/RegisterQualityGates.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ValidRatingMetrics.java b/sonar-server/src/main/java/org/sonar/server/qualitygate/ValidRatingMetrics.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ValidRatingMetrics.java rename to sonar-server/src/main/java/org/sonar/server/qualitygate/ValidRatingMetrics.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualitygate/package-info.java b/sonar-server/src/main/java/org/sonar/server/qualitygate/package-info.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualitygate/package-info.java rename to sonar-server/src/main/java/org/sonar/server/qualitygate/package-info.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/AppAction.java b/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/AppAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/AppAction.java rename to sonar-server/src/main/java/org/sonar/server/qualitygate/ws/AppAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/CopyAction.java b/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/CopyAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/CopyAction.java rename to sonar-server/src/main/java/org/sonar/server/qualitygate/ws/CopyAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/CreateAction.java b/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/CreateAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/CreateAction.java rename to sonar-server/src/main/java/org/sonar/server/qualitygate/ws/CreateAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/CreateConditionAction.java b/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/CreateConditionAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/CreateConditionAction.java rename to sonar-server/src/main/java/org/sonar/server/qualitygate/ws/CreateConditionAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/DeleteConditionAction.java b/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/DeleteConditionAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/DeleteConditionAction.java rename to sonar-server/src/main/java/org/sonar/server/qualitygate/ws/DeleteConditionAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/DeselectAction.java b/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/DeselectAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/DeselectAction.java rename to sonar-server/src/main/java/org/sonar/server/qualitygate/ws/DeselectAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/DestroyAction.java b/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/DestroyAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/DestroyAction.java rename to sonar-server/src/main/java/org/sonar/server/qualitygate/ws/DestroyAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/GetByProjectAction.java b/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/GetByProjectAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/GetByProjectAction.java rename to sonar-server/src/main/java/org/sonar/server/qualitygate/ws/GetByProjectAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/ListAction.java b/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/ListAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/ListAction.java rename to sonar-server/src/main/java/org/sonar/server/qualitygate/ws/ListAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/ProjectStatusAction.java b/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/ProjectStatusAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/ProjectStatusAction.java rename to sonar-server/src/main/java/org/sonar/server/qualitygate/ws/ProjectStatusAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QualityGateDetailsFormatter.java b/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QualityGateDetailsFormatter.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QualityGateDetailsFormatter.java rename to sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QualityGateDetailsFormatter.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QualityGatesWs.java b/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QualityGatesWs.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QualityGatesWs.java rename to sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QualityGatesWs.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QualityGatesWsAction.java b/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QualityGatesWsAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QualityGatesWsAction.java rename to sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QualityGatesWsAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/RenameAction.java b/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/RenameAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/RenameAction.java rename to sonar-server/src/main/java/org/sonar/server/qualitygate/ws/RenameAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/SearchAction.java b/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/SearchAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/SearchAction.java rename to sonar-server/src/main/java/org/sonar/server/qualitygate/ws/SearchAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/SelectAction.java b/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/SelectAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/SelectAction.java rename to sonar-server/src/main/java/org/sonar/server/qualitygate/ws/SelectAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/SetAsDefaultAction.java b/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/SetAsDefaultAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/SetAsDefaultAction.java rename to sonar-server/src/main/java/org/sonar/server/qualitygate/ws/SetAsDefaultAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/ShowAction.java b/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/ShowAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/ShowAction.java rename to sonar-server/src/main/java/org/sonar/server/qualitygate/ws/ShowAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/UnsetDefaultAction.java b/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/UnsetDefaultAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/UnsetDefaultAction.java rename to sonar-server/src/main/java/org/sonar/server/qualitygate/ws/UnsetDefaultAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/UpdateConditionAction.java b/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/UpdateConditionAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/UpdateConditionAction.java rename to sonar-server/src/main/java/org/sonar/server/qualitygate/ws/UpdateConditionAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/package-info.java b/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/package-info.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/package-info.java rename to sonar-server/src/main/java/org/sonar/server/qualitygate/ws/package-info.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ActiveRule.java b/sonar-server/src/main/java/org/sonar/server/qualityprofile/ActiveRule.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ActiveRule.java rename to sonar-server/src/main/java/org/sonar/server/qualityprofile/ActiveRule.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ActiveRuleChange.java b/sonar-server/src/main/java/org/sonar/server/qualityprofile/ActiveRuleChange.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ActiveRuleChange.java rename to sonar-server/src/main/java/org/sonar/server/qualityprofile/ActiveRuleChange.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/BuiltInQProfile.java b/sonar-server/src/main/java/org/sonar/server/qualityprofile/BuiltInQProfile.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/BuiltInQProfile.java rename to sonar-server/src/main/java/org/sonar/server/qualityprofile/BuiltInQProfile.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/BuiltInQProfileInsert.java b/sonar-server/src/main/java/org/sonar/server/qualityprofile/BuiltInQProfileInsert.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/BuiltInQProfileInsert.java rename to sonar-server/src/main/java/org/sonar/server/qualityprofile/BuiltInQProfileInsert.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/BuiltInQProfileInsertImpl.java b/sonar-server/src/main/java/org/sonar/server/qualityprofile/BuiltInQProfileInsertImpl.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/BuiltInQProfileInsertImpl.java rename to sonar-server/src/main/java/org/sonar/server/qualityprofile/BuiltInQProfileInsertImpl.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/BuiltInQProfileLoader.java b/sonar-server/src/main/java/org/sonar/server/qualityprofile/BuiltInQProfileLoader.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/BuiltInQProfileLoader.java rename to sonar-server/src/main/java/org/sonar/server/qualityprofile/BuiltInQProfileLoader.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/BuiltInQProfileRepository.java b/sonar-server/src/main/java/org/sonar/server/qualityprofile/BuiltInQProfileRepository.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/BuiltInQProfileRepository.java rename to sonar-server/src/main/java/org/sonar/server/qualityprofile/BuiltInQProfileRepository.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/BuiltInQProfileRepositoryImpl.java b/sonar-server/src/main/java/org/sonar/server/qualityprofile/BuiltInQProfileRepositoryImpl.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/BuiltInQProfileRepositoryImpl.java rename to sonar-server/src/main/java/org/sonar/server/qualityprofile/BuiltInQProfileRepositoryImpl.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/BuiltInQProfileUpdate.java b/sonar-server/src/main/java/org/sonar/server/qualityprofile/BuiltInQProfileUpdate.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/BuiltInQProfileUpdate.java rename to sonar-server/src/main/java/org/sonar/server/qualityprofile/BuiltInQProfileUpdate.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/BuiltInQProfileUpdateImpl.java b/sonar-server/src/main/java/org/sonar/server/qualityprofile/BuiltInQProfileUpdateImpl.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/BuiltInQProfileUpdateImpl.java rename to sonar-server/src/main/java/org/sonar/server/qualityprofile/BuiltInQProfileUpdateImpl.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/BuiltInQualityProfilesNotification.java b/sonar-server/src/main/java/org/sonar/server/qualityprofile/BuiltInQualityProfilesNotification.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/BuiltInQualityProfilesNotification.java rename to sonar-server/src/main/java/org/sonar/server/qualityprofile/BuiltInQualityProfilesNotification.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/BuiltInQualityProfilesNotificationDispatcher.java b/sonar-server/src/main/java/org/sonar/server/qualityprofile/BuiltInQualityProfilesNotificationDispatcher.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/BuiltInQualityProfilesNotificationDispatcher.java rename to sonar-server/src/main/java/org/sonar/server/qualityprofile/BuiltInQualityProfilesNotificationDispatcher.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/BuiltInQualityProfilesNotificationTemplate.java b/sonar-server/src/main/java/org/sonar/server/qualityprofile/BuiltInQualityProfilesNotificationTemplate.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/BuiltInQualityProfilesNotificationTemplate.java rename to sonar-server/src/main/java/org/sonar/server/qualityprofile/BuiltInQualityProfilesNotificationTemplate.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/BuiltInQualityProfilesUpdateListener.java b/sonar-server/src/main/java/org/sonar/server/qualityprofile/BuiltInQualityProfilesUpdateListener.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/BuiltInQualityProfilesUpdateListener.java rename to sonar-server/src/main/java/org/sonar/server/qualityprofile/BuiltInQualityProfilesUpdateListener.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/BulkChangeResult.java b/sonar-server/src/main/java/org/sonar/server/qualityprofile/BulkChangeResult.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/BulkChangeResult.java rename to sonar-server/src/main/java/org/sonar/server/qualityprofile/BulkChangeResult.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QPMeasureData.java b/sonar-server/src/main/java/org/sonar/server/qualityprofile/QPMeasureData.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QPMeasureData.java rename to sonar-server/src/main/java/org/sonar/server/qualityprofile/QPMeasureData.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileBackuper.java b/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileBackuper.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileBackuper.java rename to sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileBackuper.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileBackuperImpl.java b/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileBackuperImpl.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileBackuperImpl.java rename to sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileBackuperImpl.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileComparison.java b/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileComparison.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileComparison.java rename to sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileComparison.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileCopier.java b/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileCopier.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileCopier.java rename to sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileCopier.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileExporters.java b/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileExporters.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileExporters.java rename to sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileExporters.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileFactory.java b/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileFactory.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileFactory.java rename to sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileFactory.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileFactoryImpl.java b/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileFactoryImpl.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileFactoryImpl.java rename to sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileFactoryImpl.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileName.java b/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileName.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileName.java rename to sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileName.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileReset.java b/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileReset.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileReset.java rename to sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileReset.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileResetImpl.java b/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileResetImpl.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileResetImpl.java rename to sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileResetImpl.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileRestoreSummary.java b/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileRestoreSummary.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileRestoreSummary.java rename to sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileRestoreSummary.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileResult.java b/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileResult.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileResult.java rename to sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileResult.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QualityProfile.java b/sonar-server/src/main/java/org/sonar/server/qualityprofile/QualityProfile.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QualityProfile.java rename to sonar-server/src/main/java/org/sonar/server/qualityprofile/QualityProfile.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/RegisterQualityProfiles.java b/sonar-server/src/main/java/org/sonar/server/qualityprofile/RegisterQualityProfiles.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/RegisterQualityProfiles.java rename to sonar-server/src/main/java/org/sonar/server/qualityprofile/RegisterQualityProfiles.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/RuleActivation.java b/sonar-server/src/main/java/org/sonar/server/qualityprofile/RuleActivation.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/RuleActivation.java rename to sonar-server/src/main/java/org/sonar/server/qualityprofile/RuleActivation.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/RuleActivator.java b/sonar-server/src/main/java/org/sonar/server/qualityprofile/RuleActivator.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/RuleActivator.java rename to sonar-server/src/main/java/org/sonar/server/qualityprofile/RuleActivator.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/RuleActivatorContext.java b/sonar-server/src/main/java/org/sonar/server/qualityprofile/RuleActivatorContext.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/RuleActivatorContext.java rename to sonar-server/src/main/java/org/sonar/server/qualityprofile/RuleActivatorContext.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/RuleActivatorContextFactory.java b/sonar-server/src/main/java/org/sonar/server/qualityprofile/RuleActivatorContextFactory.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/RuleActivatorContextFactory.java rename to sonar-server/src/main/java/org/sonar/server/qualityprofile/RuleActivatorContextFactory.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/index/ActiveRuleDoc.java b/sonar-server/src/main/java/org/sonar/server/qualityprofile/index/ActiveRuleDoc.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/index/ActiveRuleDoc.java rename to sonar-server/src/main/java/org/sonar/server/qualityprofile/index/ActiveRuleDoc.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/index/ActiveRuleIndexer.java b/sonar-server/src/main/java/org/sonar/server/qualityprofile/index/ActiveRuleIndexer.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/index/ActiveRuleIndexer.java rename to sonar-server/src/main/java/org/sonar/server/qualityprofile/index/ActiveRuleIndexer.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/index/package-info.java b/sonar-server/src/main/java/org/sonar/server/qualityprofile/index/package-info.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/index/package-info.java rename to sonar-server/src/main/java/org/sonar/server/qualityprofile/index/package-info.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/package-info.java b/sonar-server/src/main/java/org/sonar/server/qualityprofile/package-info.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/package-info.java rename to sonar-server/src/main/java/org/sonar/server/qualityprofile/package-info.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/ActivateRuleAction.java b/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/ActivateRuleAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/ActivateRuleAction.java rename to sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/ActivateRuleAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/ActivateRulesAction.java b/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/ActivateRulesAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/ActivateRulesAction.java rename to sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/ActivateRulesAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/AddProjectAction.java b/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/AddProjectAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/AddProjectAction.java rename to sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/AddProjectAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/BackupAction.java b/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/BackupAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/BackupAction.java rename to sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/BackupAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/BulkChangeWsResponse.java b/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/BulkChangeWsResponse.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/BulkChangeWsResponse.java rename to sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/BulkChangeWsResponse.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/ChangeParentAction.java b/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/ChangeParentAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/ChangeParentAction.java rename to sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/ChangeParentAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/ChangelogAction.java b/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/ChangelogAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/ChangelogAction.java rename to sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/ChangelogAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/ChangelogLoader.java b/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/ChangelogLoader.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/ChangelogLoader.java rename to sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/ChangelogLoader.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/CompareAction.java b/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/CompareAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/CompareAction.java rename to sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/CompareAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/CopyAction.java b/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/CopyAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/CopyAction.java rename to sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/CopyAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/CreateAction.java b/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/CreateAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/CreateAction.java rename to sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/CreateAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/DeactivateRuleAction.java b/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/DeactivateRuleAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/DeactivateRuleAction.java rename to sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/DeactivateRuleAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/DeactivateRulesAction.java b/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/DeactivateRulesAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/DeactivateRulesAction.java rename to sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/DeactivateRulesAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/DeleteAction.java b/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/DeleteAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/DeleteAction.java rename to sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/DeleteAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/ExportAction.java b/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/ExportAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/ExportAction.java rename to sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/ExportAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/ExportersAction.java b/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/ExportersAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/ExportersAction.java rename to sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/ExportersAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/ImportersAction.java b/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/ImportersAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/ImportersAction.java rename to sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/ImportersAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/InheritanceAction.java b/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/InheritanceAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/InheritanceAction.java rename to sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/InheritanceAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/OldRestoreAction.java b/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/OldRestoreAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/OldRestoreAction.java rename to sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/OldRestoreAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/ProfilesWs.java b/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/ProfilesWs.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/ProfilesWs.java rename to sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/ProfilesWs.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/ProjectsAction.java b/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/ProjectsAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/ProjectsAction.java rename to sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/ProjectsAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfileReference.java b/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfileReference.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfileReference.java rename to sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfileReference.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfileWsAction.java b/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfileWsAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfileWsAction.java rename to sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfileWsAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfileWsSupport.java b/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfileWsSupport.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfileWsSupport.java rename to sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfileWsSupport.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfilesWs.java b/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfilesWs.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfilesWs.java rename to sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfilesWs.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfilesWsModule.java b/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfilesWsModule.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfilesWsModule.java rename to sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfilesWsModule.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/RemoveProjectAction.java b/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/RemoveProjectAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/RemoveProjectAction.java rename to sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/RemoveProjectAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/RenameAction.java b/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/RenameAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/RenameAction.java rename to sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/RenameAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/RestoreAction.java b/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/RestoreAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/RestoreAction.java rename to sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/RestoreAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/RestoreBuiltInAction.java b/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/RestoreBuiltInAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/RestoreBuiltInAction.java rename to sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/RestoreBuiltInAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/SearchAction.java b/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/SearchAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/SearchAction.java rename to sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/SearchAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/SearchData.java b/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/SearchData.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/SearchData.java rename to sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/SearchData.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/SetDefaultAction.java b/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/SetDefaultAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/SetDefaultAction.java rename to sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/SetDefaultAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/ShowAction.java b/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/ShowAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/ShowAction.java rename to sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/ShowAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/package-info.java b/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/package-info.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/package-info.java rename to sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/package-info.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/root/ws/RootWsModule.java b/sonar-server/src/main/java/org/sonar/server/root/ws/RootWsModule.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/root/ws/RootWsModule.java rename to sonar-server/src/main/java/org/sonar/server/root/ws/RootWsModule.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/root/ws/RootsWs.java b/sonar-server/src/main/java/org/sonar/server/root/ws/RootsWs.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/root/ws/RootsWs.java rename to sonar-server/src/main/java/org/sonar/server/root/ws/RootsWs.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/root/ws/RootsWsAction.java b/sonar-server/src/main/java/org/sonar/server/root/ws/RootsWsAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/root/ws/RootsWsAction.java rename to sonar-server/src/main/java/org/sonar/server/root/ws/RootsWsAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/root/ws/SearchAction.java b/sonar-server/src/main/java/org/sonar/server/root/ws/SearchAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/root/ws/SearchAction.java rename to sonar-server/src/main/java/org/sonar/server/root/ws/SearchAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/root/ws/SetRootAction.java b/sonar-server/src/main/java/org/sonar/server/root/ws/SetRootAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/root/ws/SetRootAction.java rename to sonar-server/src/main/java/org/sonar/server/root/ws/SetRootAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/root/ws/UnsetRootAction.java b/sonar-server/src/main/java/org/sonar/server/root/ws/UnsetRootAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/root/ws/UnsetRootAction.java rename to sonar-server/src/main/java/org/sonar/server/root/ws/UnsetRootAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/root/ws/package-info.java b/sonar-server/src/main/java/org/sonar/server/root/ws/package-info.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/root/ws/package-info.java rename to sonar-server/src/main/java/org/sonar/server/root/ws/package-info.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/rule/CachingRuleFinder.java b/sonar-server/src/main/java/org/sonar/server/rule/CachingRuleFinder.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/rule/CachingRuleFinder.java rename to sonar-server/src/main/java/org/sonar/server/rule/CachingRuleFinder.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/rule/CommonRuleDefinitions.java b/sonar-server/src/main/java/org/sonar/server/rule/CommonRuleDefinitions.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/rule/CommonRuleDefinitions.java rename to sonar-server/src/main/java/org/sonar/server/rule/CommonRuleDefinitions.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/rule/CommonRuleDefinitionsImpl.java b/sonar-server/src/main/java/org/sonar/server/rule/CommonRuleDefinitionsImpl.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/rule/CommonRuleDefinitionsImpl.java rename to sonar-server/src/main/java/org/sonar/server/rule/CommonRuleDefinitionsImpl.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/rule/CommonRuleKeys.java b/sonar-server/src/main/java/org/sonar/server/rule/CommonRuleKeys.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/rule/CommonRuleKeys.java rename to sonar-server/src/main/java/org/sonar/server/rule/CommonRuleKeys.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/rule/DefaultRuleFinder.java b/sonar-server/src/main/java/org/sonar/server/rule/DefaultRuleFinder.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/rule/DefaultRuleFinder.java rename to sonar-server/src/main/java/org/sonar/server/rule/DefaultRuleFinder.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/rule/DeprecatedRulesDefinitionLoader.java b/sonar-server/src/main/java/org/sonar/server/rule/DeprecatedRulesDefinitionLoader.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/rule/DeprecatedRulesDefinitionLoader.java rename to sonar-server/src/main/java/org/sonar/server/rule/DeprecatedRulesDefinitionLoader.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/rule/NewCustomRule.java b/sonar-server/src/main/java/org/sonar/server/rule/NewCustomRule.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/rule/NewCustomRule.java rename to sonar-server/src/main/java/org/sonar/server/rule/NewCustomRule.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/rule/ReactivationException.java b/sonar-server/src/main/java/org/sonar/server/rule/ReactivationException.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/rule/ReactivationException.java rename to sonar-server/src/main/java/org/sonar/server/rule/ReactivationException.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/rule/RegisterRules.java b/sonar-server/src/main/java/org/sonar/server/rule/RegisterRules.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/rule/RegisterRules.java rename to sonar-server/src/main/java/org/sonar/server/rule/RegisterRules.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/rule/Rule.java b/sonar-server/src/main/java/org/sonar/server/rule/Rule.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/rule/Rule.java rename to sonar-server/src/main/java/org/sonar/server/rule/Rule.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/rule/RuleCreator.java b/sonar-server/src/main/java/org/sonar/server/rule/RuleCreator.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/rule/RuleCreator.java rename to sonar-server/src/main/java/org/sonar/server/rule/RuleCreator.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/rule/RuleDefinitionsLoader.java b/sonar-server/src/main/java/org/sonar/server/rule/RuleDefinitionsLoader.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/rule/RuleDefinitionsLoader.java rename to sonar-server/src/main/java/org/sonar/server/rule/RuleDefinitionsLoader.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/rule/RuleParam.java b/sonar-server/src/main/java/org/sonar/server/rule/RuleParam.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/rule/RuleParam.java rename to sonar-server/src/main/java/org/sonar/server/rule/RuleParam.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/rule/RuleTagHelper.java b/sonar-server/src/main/java/org/sonar/server/rule/RuleTagHelper.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/rule/RuleTagHelper.java rename to sonar-server/src/main/java/org/sonar/server/rule/RuleTagHelper.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/rule/RuleUpdate.java b/sonar-server/src/main/java/org/sonar/server/rule/RuleUpdate.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/rule/RuleUpdate.java rename to sonar-server/src/main/java/org/sonar/server/rule/RuleUpdate.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/rule/RuleUpdater.java b/sonar-server/src/main/java/org/sonar/server/rule/RuleUpdater.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/rule/RuleUpdater.java rename to sonar-server/src/main/java/org/sonar/server/rule/RuleUpdater.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/rule/WebServerRuleFinder.java b/sonar-server/src/main/java/org/sonar/server/rule/WebServerRuleFinder.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/rule/WebServerRuleFinder.java rename to sonar-server/src/main/java/org/sonar/server/rule/WebServerRuleFinder.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/rule/WebServerRuleFinderImpl.java b/sonar-server/src/main/java/org/sonar/server/rule/WebServerRuleFinderImpl.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/rule/WebServerRuleFinderImpl.java rename to sonar-server/src/main/java/org/sonar/server/rule/WebServerRuleFinderImpl.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/rule/index/RuleDoc.java b/sonar-server/src/main/java/org/sonar/server/rule/index/RuleDoc.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/rule/index/RuleDoc.java rename to sonar-server/src/main/java/org/sonar/server/rule/index/RuleDoc.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/rule/index/RuleExtensionDoc.java b/sonar-server/src/main/java/org/sonar/server/rule/index/RuleExtensionDoc.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/rule/index/RuleExtensionDoc.java rename to sonar-server/src/main/java/org/sonar/server/rule/index/RuleExtensionDoc.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/rule/index/RuleExtensionScope.java b/sonar-server/src/main/java/org/sonar/server/rule/index/RuleExtensionScope.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/rule/index/RuleExtensionScope.java rename to sonar-server/src/main/java/org/sonar/server/rule/index/RuleExtensionScope.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/rule/index/RuleIndex.java b/sonar-server/src/main/java/org/sonar/server/rule/index/RuleIndex.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/rule/index/RuleIndex.java rename to sonar-server/src/main/java/org/sonar/server/rule/index/RuleIndex.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/rule/index/RuleIndexDefinition.java b/sonar-server/src/main/java/org/sonar/server/rule/index/RuleIndexDefinition.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/rule/index/RuleIndexDefinition.java rename to sonar-server/src/main/java/org/sonar/server/rule/index/RuleIndexDefinition.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/rule/index/RuleIndexer.java b/sonar-server/src/main/java/org/sonar/server/rule/index/RuleIndexer.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/rule/index/RuleIndexer.java rename to sonar-server/src/main/java/org/sonar/server/rule/index/RuleIndexer.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/rule/index/RuleQuery.java b/sonar-server/src/main/java/org/sonar/server/rule/index/RuleQuery.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/rule/index/RuleQuery.java rename to sonar-server/src/main/java/org/sonar/server/rule/index/RuleQuery.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/rule/index/package-info.java b/sonar-server/src/main/java/org/sonar/server/rule/index/package-info.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/rule/index/package-info.java rename to sonar-server/src/main/java/org/sonar/server/rule/index/package-info.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/rule/package-info.java b/sonar-server/src/main/java/org/sonar/server/rule/package-info.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/rule/package-info.java rename to sonar-server/src/main/java/org/sonar/server/rule/package-info.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/rule/ws/ActiveRuleCompleter.java b/sonar-server/src/main/java/org/sonar/server/rule/ws/ActiveRuleCompleter.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/rule/ws/ActiveRuleCompleter.java rename to sonar-server/src/main/java/org/sonar/server/rule/ws/ActiveRuleCompleter.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/rule/ws/AppAction.java b/sonar-server/src/main/java/org/sonar/server/rule/ws/AppAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/rule/ws/AppAction.java rename to sonar-server/src/main/java/org/sonar/server/rule/ws/AppAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/rule/ws/CreateAction.java b/sonar-server/src/main/java/org/sonar/server/rule/ws/CreateAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/rule/ws/CreateAction.java rename to sonar-server/src/main/java/org/sonar/server/rule/ws/CreateAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/rule/ws/DeleteAction.java b/sonar-server/src/main/java/org/sonar/server/rule/ws/DeleteAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/rule/ws/DeleteAction.java rename to sonar-server/src/main/java/org/sonar/server/rule/ws/DeleteAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/rule/ws/ListAction.java b/sonar-server/src/main/java/org/sonar/server/rule/ws/ListAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/rule/ws/ListAction.java rename to sonar-server/src/main/java/org/sonar/server/rule/ws/ListAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/rule/ws/RepositoriesAction.java b/sonar-server/src/main/java/org/sonar/server/rule/ws/RepositoriesAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/rule/ws/RepositoriesAction.java rename to sonar-server/src/main/java/org/sonar/server/rule/ws/RepositoriesAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/rule/ws/RuleMapper.java b/sonar-server/src/main/java/org/sonar/server/rule/ws/RuleMapper.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/rule/ws/RuleMapper.java rename to sonar-server/src/main/java/org/sonar/server/rule/ws/RuleMapper.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/rule/ws/RuleQueryFactory.java b/sonar-server/src/main/java/org/sonar/server/rule/ws/RuleQueryFactory.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/rule/ws/RuleQueryFactory.java rename to sonar-server/src/main/java/org/sonar/server/rule/ws/RuleQueryFactory.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/rule/ws/RuleWsSupport.java b/sonar-server/src/main/java/org/sonar/server/rule/ws/RuleWsSupport.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/rule/ws/RuleWsSupport.java rename to sonar-server/src/main/java/org/sonar/server/rule/ws/RuleWsSupport.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/rule/ws/RulesWs.java b/sonar-server/src/main/java/org/sonar/server/rule/ws/RulesWs.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/rule/ws/RulesWs.java rename to sonar-server/src/main/java/org/sonar/server/rule/ws/RulesWs.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/rule/ws/RulesWsAction.java b/sonar-server/src/main/java/org/sonar/server/rule/ws/RulesWsAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/rule/ws/RulesWsAction.java rename to sonar-server/src/main/java/org/sonar/server/rule/ws/RulesWsAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/rule/ws/SearchAction.java b/sonar-server/src/main/java/org/sonar/server/rule/ws/SearchAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/rule/ws/SearchAction.java rename to sonar-server/src/main/java/org/sonar/server/rule/ws/SearchAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/rule/ws/ShowAction.java b/sonar-server/src/main/java/org/sonar/server/rule/ws/ShowAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/rule/ws/ShowAction.java rename to sonar-server/src/main/java/org/sonar/server/rule/ws/ShowAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/rule/ws/TagsAction.java b/sonar-server/src/main/java/org/sonar/server/rule/ws/TagsAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/rule/ws/TagsAction.java rename to sonar-server/src/main/java/org/sonar/server/rule/ws/TagsAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/rule/ws/UpdateAction.java b/sonar-server/src/main/java/org/sonar/server/rule/ws/UpdateAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/rule/ws/UpdateAction.java rename to sonar-server/src/main/java/org/sonar/server/rule/ws/UpdateAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/rule/ws/package-info.java b/sonar-server/src/main/java/org/sonar/server/rule/ws/package-info.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/rule/ws/package-info.java rename to sonar-server/src/main/java/org/sonar/server/rule/ws/package-info.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/search/EsSearchModule.java b/sonar-server/src/main/java/org/sonar/server/search/EsSearchModule.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/search/EsSearchModule.java rename to sonar-server/src/main/java/org/sonar/server/search/EsSearchModule.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/search/FacetValue.java b/sonar-server/src/main/java/org/sonar/server/search/FacetValue.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/search/FacetValue.java rename to sonar-server/src/main/java/org/sonar/server/search/FacetValue.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/search/package-info.java b/sonar-server/src/main/java/org/sonar/server/search/package-info.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/search/package-info.java rename to sonar-server/src/main/java/org/sonar/server/search/package-info.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/serverid/ws/GenerateAction.java b/sonar-server/src/main/java/org/sonar/server/serverid/ws/GenerateAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/serverid/ws/GenerateAction.java rename to sonar-server/src/main/java/org/sonar/server/serverid/ws/GenerateAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/serverid/ws/ServerIdWs.java b/sonar-server/src/main/java/org/sonar/server/serverid/ws/ServerIdWs.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/serverid/ws/ServerIdWs.java rename to sonar-server/src/main/java/org/sonar/server/serverid/ws/ServerIdWs.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/serverid/ws/ServerIdWsAction.java b/sonar-server/src/main/java/org/sonar/server/serverid/ws/ServerIdWsAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/serverid/ws/ServerIdWsAction.java rename to sonar-server/src/main/java/org/sonar/server/serverid/ws/ServerIdWsAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/serverid/ws/ServerIdWsModule.java b/sonar-server/src/main/java/org/sonar/server/serverid/ws/ServerIdWsModule.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/serverid/ws/ServerIdWsModule.java rename to sonar-server/src/main/java/org/sonar/server/serverid/ws/ServerIdWsModule.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/serverid/ws/ShowAction.java b/sonar-server/src/main/java/org/sonar/server/serverid/ws/ShowAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/serverid/ws/ShowAction.java rename to sonar-server/src/main/java/org/sonar/server/serverid/ws/ShowAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/serverid/ws/package-info.java b/sonar-server/src/main/java/org/sonar/server/serverid/ws/package-info.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/serverid/ws/package-info.java rename to sonar-server/src/main/java/org/sonar/server/serverid/ws/package-info.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/setting/DatabaseSettingLoader.java b/sonar-server/src/main/java/org/sonar/server/setting/DatabaseSettingLoader.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/setting/DatabaseSettingLoader.java rename to sonar-server/src/main/java/org/sonar/server/setting/DatabaseSettingLoader.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/setting/DatabaseSettingsEnabler.java b/sonar-server/src/main/java/org/sonar/server/setting/DatabaseSettingsEnabler.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/setting/DatabaseSettingsEnabler.java rename to sonar-server/src/main/java/org/sonar/server/setting/DatabaseSettingsEnabler.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/setting/NopSettingLoader.java b/sonar-server/src/main/java/org/sonar/server/setting/NopSettingLoader.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/setting/NopSettingLoader.java rename to sonar-server/src/main/java/org/sonar/server/setting/NopSettingLoader.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/setting/SettingLoader.java b/sonar-server/src/main/java/org/sonar/server/setting/SettingLoader.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/setting/SettingLoader.java rename to sonar-server/src/main/java/org/sonar/server/setting/SettingLoader.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/setting/ThreadLocalSettings.java b/sonar-server/src/main/java/org/sonar/server/setting/ThreadLocalSettings.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/setting/ThreadLocalSettings.java rename to sonar-server/src/main/java/org/sonar/server/setting/ThreadLocalSettings.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/setting/package-info.java b/sonar-server/src/main/java/org/sonar/server/setting/package-info.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/setting/package-info.java rename to sonar-server/src/main/java/org/sonar/server/setting/package-info.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/setting/ws/CheckSecretKeyAction.java b/sonar-server/src/main/java/org/sonar/server/setting/ws/CheckSecretKeyAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/setting/ws/CheckSecretKeyAction.java rename to sonar-server/src/main/java/org/sonar/server/setting/ws/CheckSecretKeyAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/setting/ws/EncryptAction.java b/sonar-server/src/main/java/org/sonar/server/setting/ws/EncryptAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/setting/ws/EncryptAction.java rename to sonar-server/src/main/java/org/sonar/server/setting/ws/EncryptAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/setting/ws/GenerateSecretKeyAction.java b/sonar-server/src/main/java/org/sonar/server/setting/ws/GenerateSecretKeyAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/setting/ws/GenerateSecretKeyAction.java rename to sonar-server/src/main/java/org/sonar/server/setting/ws/GenerateSecretKeyAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/setting/ws/ListDefinitionsAction.java b/sonar-server/src/main/java/org/sonar/server/setting/ws/ListDefinitionsAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/setting/ws/ListDefinitionsAction.java rename to sonar-server/src/main/java/org/sonar/server/setting/ws/ListDefinitionsAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/setting/ws/PropertySetExtractor.java b/sonar-server/src/main/java/org/sonar/server/setting/ws/PropertySetExtractor.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/setting/ws/PropertySetExtractor.java rename to sonar-server/src/main/java/org/sonar/server/setting/ws/PropertySetExtractor.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/setting/ws/ResetAction.java b/sonar-server/src/main/java/org/sonar/server/setting/ws/ResetAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/setting/ws/ResetAction.java rename to sonar-server/src/main/java/org/sonar/server/setting/ws/ResetAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/setting/ws/ScannerSettings.java b/sonar-server/src/main/java/org/sonar/server/setting/ws/ScannerSettings.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/setting/ws/ScannerSettings.java rename to sonar-server/src/main/java/org/sonar/server/setting/ws/ScannerSettings.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/setting/ws/SetAction.java b/sonar-server/src/main/java/org/sonar/server/setting/ws/SetAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/setting/ws/SetAction.java rename to sonar-server/src/main/java/org/sonar/server/setting/ws/SetAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/setting/ws/Setting.java b/sonar-server/src/main/java/org/sonar/server/setting/ws/Setting.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/setting/ws/Setting.java rename to sonar-server/src/main/java/org/sonar/server/setting/ws/Setting.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/setting/ws/SettingValidations.java b/sonar-server/src/main/java/org/sonar/server/setting/ws/SettingValidations.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/setting/ws/SettingValidations.java rename to sonar-server/src/main/java/org/sonar/server/setting/ws/SettingValidations.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/setting/ws/SettingsFinder.java b/sonar-server/src/main/java/org/sonar/server/setting/ws/SettingsFinder.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/setting/ws/SettingsFinder.java rename to sonar-server/src/main/java/org/sonar/server/setting/ws/SettingsFinder.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/setting/ws/SettingsUpdater.java b/sonar-server/src/main/java/org/sonar/server/setting/ws/SettingsUpdater.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/setting/ws/SettingsUpdater.java rename to sonar-server/src/main/java/org/sonar/server/setting/ws/SettingsUpdater.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/setting/ws/SettingsWs.java b/sonar-server/src/main/java/org/sonar/server/setting/ws/SettingsWs.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/setting/ws/SettingsWs.java rename to sonar-server/src/main/java/org/sonar/server/setting/ws/SettingsWs.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/setting/ws/SettingsWsAction.java b/sonar-server/src/main/java/org/sonar/server/setting/ws/SettingsWsAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/setting/ws/SettingsWsAction.java rename to sonar-server/src/main/java/org/sonar/server/setting/ws/SettingsWsAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/setting/ws/SettingsWsModule.java b/sonar-server/src/main/java/org/sonar/server/setting/ws/SettingsWsModule.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/setting/ws/SettingsWsModule.java rename to sonar-server/src/main/java/org/sonar/server/setting/ws/SettingsWsModule.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/setting/ws/SettingsWsSupport.java b/sonar-server/src/main/java/org/sonar/server/setting/ws/SettingsWsSupport.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/setting/ws/SettingsWsSupport.java rename to sonar-server/src/main/java/org/sonar/server/setting/ws/SettingsWsSupport.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/setting/ws/ValuesAction.java b/sonar-server/src/main/java/org/sonar/server/setting/ws/ValuesAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/setting/ws/ValuesAction.java rename to sonar-server/src/main/java/org/sonar/server/setting/ws/ValuesAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/setting/ws/package-info.java b/sonar-server/src/main/java/org/sonar/server/setting/ws/package-info.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/setting/ws/package-info.java rename to sonar-server/src/main/java/org/sonar/server/setting/ws/package-info.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/source/CharactersReader.java b/sonar-server/src/main/java/org/sonar/server/source/CharactersReader.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/source/CharactersReader.java rename to sonar-server/src/main/java/org/sonar/server/source/CharactersReader.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/source/DecorationDataHolder.java b/sonar-server/src/main/java/org/sonar/server/source/DecorationDataHolder.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/source/DecorationDataHolder.java rename to sonar-server/src/main/java/org/sonar/server/source/DecorationDataHolder.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/source/HtmlSourceDecorator.java b/sonar-server/src/main/java/org/sonar/server/source/HtmlSourceDecorator.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/source/HtmlSourceDecorator.java rename to sonar-server/src/main/java/org/sonar/server/source/HtmlSourceDecorator.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/source/HtmlTextDecorator.java b/sonar-server/src/main/java/org/sonar/server/source/HtmlTextDecorator.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/source/HtmlTextDecorator.java rename to sonar-server/src/main/java/org/sonar/server/source/HtmlTextDecorator.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/source/OpeningHtmlTag.java b/sonar-server/src/main/java/org/sonar/server/source/OpeningHtmlTag.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/source/OpeningHtmlTag.java rename to sonar-server/src/main/java/org/sonar/server/source/OpeningHtmlTag.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/source/SourceService.java b/sonar-server/src/main/java/org/sonar/server/source/SourceService.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/source/SourceService.java rename to sonar-server/src/main/java/org/sonar/server/source/SourceService.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/source/index/FileSourcesUpdaterHelper.java b/sonar-server/src/main/java/org/sonar/server/source/index/FileSourcesUpdaterHelper.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/source/index/FileSourcesUpdaterHelper.java rename to sonar-server/src/main/java/org/sonar/server/source/index/FileSourcesUpdaterHelper.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/source/index/package-info.java b/sonar-server/src/main/java/org/sonar/server/source/index/package-info.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/source/index/package-info.java rename to sonar-server/src/main/java/org/sonar/server/source/index/package-info.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/source/package-info.java b/sonar-server/src/main/java/org/sonar/server/source/package-info.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/source/package-info.java rename to sonar-server/src/main/java/org/sonar/server/source/package-info.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/source/ws/HashAction.java b/sonar-server/src/main/java/org/sonar/server/source/ws/HashAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/source/ws/HashAction.java rename to sonar-server/src/main/java/org/sonar/server/source/ws/HashAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/source/ws/IndexAction.java b/sonar-server/src/main/java/org/sonar/server/source/ws/IndexAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/source/ws/IndexAction.java rename to sonar-server/src/main/java/org/sonar/server/source/ws/IndexAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/source/ws/LinesAction.java b/sonar-server/src/main/java/org/sonar/server/source/ws/LinesAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/source/ws/LinesAction.java rename to sonar-server/src/main/java/org/sonar/server/source/ws/LinesAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/source/ws/RawAction.java b/sonar-server/src/main/java/org/sonar/server/source/ws/RawAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/source/ws/RawAction.java rename to sonar-server/src/main/java/org/sonar/server/source/ws/RawAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/source/ws/ScmAction.java b/sonar-server/src/main/java/org/sonar/server/source/ws/ScmAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/source/ws/ScmAction.java rename to sonar-server/src/main/java/org/sonar/server/source/ws/ScmAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/source/ws/ShowAction.java b/sonar-server/src/main/java/org/sonar/server/source/ws/ShowAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/source/ws/ShowAction.java rename to sonar-server/src/main/java/org/sonar/server/source/ws/ShowAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/source/ws/SourcesWs.java b/sonar-server/src/main/java/org/sonar/server/source/ws/SourcesWs.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/source/ws/SourcesWs.java rename to sonar-server/src/main/java/org/sonar/server/source/ws/SourcesWs.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/source/ws/SourcesWsAction.java b/sonar-server/src/main/java/org/sonar/server/source/ws/SourcesWsAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/source/ws/SourcesWsAction.java rename to sonar-server/src/main/java/org/sonar/server/source/ws/SourcesWsAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/source/ws/package-info.java b/sonar-server/src/main/java/org/sonar/server/source/ws/package-info.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/source/ws/package-info.java rename to sonar-server/src/main/java/org/sonar/server/source/ws/package-info.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/startup/DeleteOldAnalysisReportsFromFs.java b/sonar-server/src/main/java/org/sonar/server/startup/DeleteOldAnalysisReportsFromFs.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/startup/DeleteOldAnalysisReportsFromFs.java rename to sonar-server/src/main/java/org/sonar/server/startup/DeleteOldAnalysisReportsFromFs.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/startup/DisplayLogOnDeprecatedProjects.java b/sonar-server/src/main/java/org/sonar/server/startup/DisplayLogOnDeprecatedProjects.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/startup/DisplayLogOnDeprecatedProjects.java rename to sonar-server/src/main/java/org/sonar/server/startup/DisplayLogOnDeprecatedProjects.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/startup/GeneratePluginIndex.java b/sonar-server/src/main/java/org/sonar/server/startup/GeneratePluginIndex.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/startup/GeneratePluginIndex.java rename to sonar-server/src/main/java/org/sonar/server/startup/GeneratePluginIndex.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/startup/LogServerId.java b/sonar-server/src/main/java/org/sonar/server/startup/LogServerId.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/startup/LogServerId.java rename to sonar-server/src/main/java/org/sonar/server/startup/LogServerId.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/startup/RegisterMetrics.java b/sonar-server/src/main/java/org/sonar/server/startup/RegisterMetrics.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/startup/RegisterMetrics.java rename to sonar-server/src/main/java/org/sonar/server/startup/RegisterMetrics.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/startup/RegisterPermissionTemplates.java b/sonar-server/src/main/java/org/sonar/server/startup/RegisterPermissionTemplates.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/startup/RegisterPermissionTemplates.java rename to sonar-server/src/main/java/org/sonar/server/startup/RegisterPermissionTemplates.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/startup/RenameDeprecatedPropertyKeys.java b/sonar-server/src/main/java/org/sonar/server/startup/RenameDeprecatedPropertyKeys.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/startup/RenameDeprecatedPropertyKeys.java rename to sonar-server/src/main/java/org/sonar/server/startup/RenameDeprecatedPropertyKeys.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/startup/package-info.java b/sonar-server/src/main/java/org/sonar/server/startup/package-info.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/startup/package-info.java rename to sonar-server/src/main/java/org/sonar/server/startup/package-info.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/test/index/CoveredFileDoc.java b/sonar-server/src/main/java/org/sonar/server/test/index/CoveredFileDoc.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/test/index/CoveredFileDoc.java rename to sonar-server/src/main/java/org/sonar/server/test/index/CoveredFileDoc.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/test/index/TestDoc.java b/sonar-server/src/main/java/org/sonar/server/test/index/TestDoc.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/test/index/TestDoc.java rename to sonar-server/src/main/java/org/sonar/server/test/index/TestDoc.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/test/index/TestIndex.java b/sonar-server/src/main/java/org/sonar/server/test/index/TestIndex.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/test/index/TestIndex.java rename to sonar-server/src/main/java/org/sonar/server/test/index/TestIndex.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/test/index/TestIndexDefinition.java b/sonar-server/src/main/java/org/sonar/server/test/index/TestIndexDefinition.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/test/index/TestIndexDefinition.java rename to sonar-server/src/main/java/org/sonar/server/test/index/TestIndexDefinition.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/test/index/TestIndexer.java b/sonar-server/src/main/java/org/sonar/server/test/index/TestIndexer.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/test/index/TestIndexer.java rename to sonar-server/src/main/java/org/sonar/server/test/index/TestIndexer.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/test/index/TestResultSetIterator.java b/sonar-server/src/main/java/org/sonar/server/test/index/TestResultSetIterator.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/test/index/TestResultSetIterator.java rename to sonar-server/src/main/java/org/sonar/server/test/index/TestResultSetIterator.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/test/index/package-info.java b/sonar-server/src/main/java/org/sonar/server/test/index/package-info.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/test/index/package-info.java rename to sonar-server/src/main/java/org/sonar/server/test/index/package-info.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/test/ws/CoveredFilesAction.java b/sonar-server/src/main/java/org/sonar/server/test/ws/CoveredFilesAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/test/ws/CoveredFilesAction.java rename to sonar-server/src/main/java/org/sonar/server/test/ws/CoveredFilesAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/test/ws/ListAction.java b/sonar-server/src/main/java/org/sonar/server/test/ws/ListAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/test/ws/ListAction.java rename to sonar-server/src/main/java/org/sonar/server/test/ws/ListAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/test/ws/TestsWs.java b/sonar-server/src/main/java/org/sonar/server/test/ws/TestsWs.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/test/ws/TestsWs.java rename to sonar-server/src/main/java/org/sonar/server/test/ws/TestsWs.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/test/ws/TestsWsAction.java b/sonar-server/src/main/java/org/sonar/server/test/ws/TestsWsAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/test/ws/TestsWsAction.java rename to sonar-server/src/main/java/org/sonar/server/test/ws/TestsWsAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/test/ws/package-info.java b/sonar-server/src/main/java/org/sonar/server/test/ws/package-info.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/test/ws/package-info.java rename to sonar-server/src/main/java/org/sonar/server/test/ws/package-info.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/text/Macro.java b/sonar-server/src/main/java/org/sonar/server/text/Macro.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/text/Macro.java rename to sonar-server/src/main/java/org/sonar/server/text/Macro.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/text/MacroInterpreter.java b/sonar-server/src/main/java/org/sonar/server/text/MacroInterpreter.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/text/MacroInterpreter.java rename to sonar-server/src/main/java/org/sonar/server/text/MacroInterpreter.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/text/RuleMacro.java b/sonar-server/src/main/java/org/sonar/server/text/RuleMacro.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/text/RuleMacro.java rename to sonar-server/src/main/java/org/sonar/server/text/RuleMacro.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/ui/DeprecatedViews.java b/sonar-server/src/main/java/org/sonar/server/ui/DeprecatedViews.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/ui/DeprecatedViews.java rename to sonar-server/src/main/java/org/sonar/server/ui/DeprecatedViews.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/ui/PageDecorations.java b/sonar-server/src/main/java/org/sonar/server/ui/PageDecorations.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/ui/PageDecorations.java rename to sonar-server/src/main/java/org/sonar/server/ui/PageDecorations.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/ui/PageRepository.java b/sonar-server/src/main/java/org/sonar/server/ui/PageRepository.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/ui/PageRepository.java rename to sonar-server/src/main/java/org/sonar/server/ui/PageRepository.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/ui/VersionFormatter.java b/sonar-server/src/main/java/org/sonar/server/ui/VersionFormatter.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/ui/VersionFormatter.java rename to sonar-server/src/main/java/org/sonar/server/ui/VersionFormatter.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/ui/package-info.java b/sonar-server/src/main/java/org/sonar/server/ui/package-info.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/ui/package-info.java rename to sonar-server/src/main/java/org/sonar/server/ui/package-info.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/ui/ws/ComponentAction.java b/sonar-server/src/main/java/org/sonar/server/ui/ws/ComponentAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/ui/ws/ComponentAction.java rename to sonar-server/src/main/java/org/sonar/server/ui/ws/ComponentAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/ui/ws/GlobalAction.java b/sonar-server/src/main/java/org/sonar/server/ui/ws/GlobalAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/ui/ws/GlobalAction.java rename to sonar-server/src/main/java/org/sonar/server/ui/ws/GlobalAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/ui/ws/NavigationWs.java b/sonar-server/src/main/java/org/sonar/server/ui/ws/NavigationWs.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/ui/ws/NavigationWs.java rename to sonar-server/src/main/java/org/sonar/server/ui/ws/NavigationWs.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/ui/ws/NavigationWsAction.java b/sonar-server/src/main/java/org/sonar/server/ui/ws/NavigationWsAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/ui/ws/NavigationWsAction.java rename to sonar-server/src/main/java/org/sonar/server/ui/ws/NavigationWsAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/ui/ws/NavigationWsModule.java b/sonar-server/src/main/java/org/sonar/server/ui/ws/NavigationWsModule.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/ui/ws/NavigationWsModule.java rename to sonar-server/src/main/java/org/sonar/server/ui/ws/NavigationWsModule.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/ui/ws/OrganizationAction.java b/sonar-server/src/main/java/org/sonar/server/ui/ws/OrganizationAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/ui/ws/OrganizationAction.java rename to sonar-server/src/main/java/org/sonar/server/ui/ws/OrganizationAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/ui/ws/SettingsAction.java b/sonar-server/src/main/java/org/sonar/server/ui/ws/SettingsAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/ui/ws/SettingsAction.java rename to sonar-server/src/main/java/org/sonar/server/ui/ws/SettingsAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/ui/ws/package-info.java b/sonar-server/src/main/java/org/sonar/server/ui/ws/package-info.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/ui/ws/package-info.java rename to sonar-server/src/main/java/org/sonar/server/ui/ws/package-info.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/updatecenter/UpdateCenterModule.java b/sonar-server/src/main/java/org/sonar/server/updatecenter/UpdateCenterModule.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/updatecenter/UpdateCenterModule.java rename to sonar-server/src/main/java/org/sonar/server/updatecenter/UpdateCenterModule.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/updatecenter/package-info.java b/sonar-server/src/main/java/org/sonar/server/updatecenter/package-info.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/updatecenter/package-info.java rename to sonar-server/src/main/java/org/sonar/server/updatecenter/package-info.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/updatecenter/ws/InstalledPluginsAction.java b/sonar-server/src/main/java/org/sonar/server/updatecenter/ws/InstalledPluginsAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/updatecenter/ws/InstalledPluginsAction.java rename to sonar-server/src/main/java/org/sonar/server/updatecenter/ws/InstalledPluginsAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/updatecenter/ws/UpdateCenterWs.java b/sonar-server/src/main/java/org/sonar/server/updatecenter/ws/UpdateCenterWs.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/updatecenter/ws/UpdateCenterWs.java rename to sonar-server/src/main/java/org/sonar/server/updatecenter/ws/UpdateCenterWs.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/updatecenter/ws/UpdateCenterWsAction.java b/sonar-server/src/main/java/org/sonar/server/updatecenter/ws/UpdateCenterWsAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/updatecenter/ws/UpdateCenterWsAction.java rename to sonar-server/src/main/java/org/sonar/server/updatecenter/ws/UpdateCenterWsAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/updatecenter/ws/UploadAction.java b/sonar-server/src/main/java/org/sonar/server/updatecenter/ws/UploadAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/updatecenter/ws/UploadAction.java rename to sonar-server/src/main/java/org/sonar/server/updatecenter/ws/UploadAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/updatecenter/ws/package-info.java b/sonar-server/src/main/java/org/sonar/server/updatecenter/ws/package-info.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/updatecenter/ws/package-info.java rename to sonar-server/src/main/java/org/sonar/server/updatecenter/ws/package-info.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/user/AbstractUserSession.java b/sonar-server/src/main/java/org/sonar/server/user/AbstractUserSession.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/user/AbstractUserSession.java rename to sonar-server/src/main/java/org/sonar/server/user/AbstractUserSession.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/user/CompatibilityRealm.java b/sonar-server/src/main/java/org/sonar/server/user/CompatibilityRealm.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/user/CompatibilityRealm.java rename to sonar-server/src/main/java/org/sonar/server/user/CompatibilityRealm.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/user/DefaultUserFinder.java b/sonar-server/src/main/java/org/sonar/server/user/DefaultUserFinder.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/user/DefaultUserFinder.java rename to sonar-server/src/main/java/org/sonar/server/user/DefaultUserFinder.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/user/DeprecatedUserFinder.java b/sonar-server/src/main/java/org/sonar/server/user/DeprecatedUserFinder.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/user/DeprecatedUserFinder.java rename to sonar-server/src/main/java/org/sonar/server/user/DeprecatedUserFinder.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/user/DoPrivileged.java b/sonar-server/src/main/java/org/sonar/server/user/DoPrivileged.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/user/DoPrivileged.java rename to sonar-server/src/main/java/org/sonar/server/user/DoPrivileged.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/user/ExternalIdentity.java b/sonar-server/src/main/java/org/sonar/server/user/ExternalIdentity.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/user/ExternalIdentity.java rename to sonar-server/src/main/java/org/sonar/server/user/ExternalIdentity.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/user/NewUser.java b/sonar-server/src/main/java/org/sonar/server/user/NewUser.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/user/NewUser.java rename to sonar-server/src/main/java/org/sonar/server/user/NewUser.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/user/NewUserNotifier.java b/sonar-server/src/main/java/org/sonar/server/user/NewUserNotifier.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/user/NewUserNotifier.java rename to sonar-server/src/main/java/org/sonar/server/user/NewUserNotifier.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/user/SecurityRealmFactory.java b/sonar-server/src/main/java/org/sonar/server/user/SecurityRealmFactory.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/user/SecurityRealmFactory.java rename to sonar-server/src/main/java/org/sonar/server/user/SecurityRealmFactory.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/user/ServerUserSession.java b/sonar-server/src/main/java/org/sonar/server/user/ServerUserSession.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/user/ServerUserSession.java rename to sonar-server/src/main/java/org/sonar/server/user/ServerUserSession.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/user/ThreadLocalUserSession.java b/sonar-server/src/main/java/org/sonar/server/user/ThreadLocalUserSession.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/user/ThreadLocalUserSession.java rename to sonar-server/src/main/java/org/sonar/server/user/ThreadLocalUserSession.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/user/UpdateUser.java b/sonar-server/src/main/java/org/sonar/server/user/UpdateUser.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/user/UpdateUser.java rename to sonar-server/src/main/java/org/sonar/server/user/UpdateUser.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/user/UserSession.java b/sonar-server/src/main/java/org/sonar/server/user/UserSession.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/user/UserSession.java rename to sonar-server/src/main/java/org/sonar/server/user/UserSession.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/user/UserSessionFactory.java b/sonar-server/src/main/java/org/sonar/server/user/UserSessionFactory.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/user/UserSessionFactory.java rename to sonar-server/src/main/java/org/sonar/server/user/UserSessionFactory.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/user/UserSessionFactoryImpl.java b/sonar-server/src/main/java/org/sonar/server/user/UserSessionFactoryImpl.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/user/UserSessionFactoryImpl.java rename to sonar-server/src/main/java/org/sonar/server/user/UserSessionFactoryImpl.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/user/UserSessionFilter.java b/sonar-server/src/main/java/org/sonar/server/user/UserSessionFilter.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/user/UserSessionFilter.java rename to sonar-server/src/main/java/org/sonar/server/user/UserSessionFilter.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/user/UserUpdater.java b/sonar-server/src/main/java/org/sonar/server/user/UserUpdater.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/user/UserUpdater.java rename to sonar-server/src/main/java/org/sonar/server/user/UserUpdater.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/user/index/UserDoc.java b/sonar-server/src/main/java/org/sonar/server/user/index/UserDoc.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/user/index/UserDoc.java rename to sonar-server/src/main/java/org/sonar/server/user/index/UserDoc.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/user/index/UserIndex.java b/sonar-server/src/main/java/org/sonar/server/user/index/UserIndex.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/user/index/UserIndex.java rename to sonar-server/src/main/java/org/sonar/server/user/index/UserIndex.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/user/index/UserIndexDefinition.java b/sonar-server/src/main/java/org/sonar/server/user/index/UserIndexDefinition.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/user/index/UserIndexDefinition.java rename to sonar-server/src/main/java/org/sonar/server/user/index/UserIndexDefinition.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/user/index/UserIndexer.java b/sonar-server/src/main/java/org/sonar/server/user/index/UserIndexer.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/user/index/UserIndexer.java rename to sonar-server/src/main/java/org/sonar/server/user/index/UserIndexer.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/user/index/UserQuery.java b/sonar-server/src/main/java/org/sonar/server/user/index/UserQuery.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/user/index/UserQuery.java rename to sonar-server/src/main/java/org/sonar/server/user/index/UserQuery.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/user/index/package-info.java b/sonar-server/src/main/java/org/sonar/server/user/index/package-info.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/user/index/package-info.java rename to sonar-server/src/main/java/org/sonar/server/user/index/package-info.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/user/package-info.java b/sonar-server/src/main/java/org/sonar/server/user/package-info.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/user/package-info.java rename to sonar-server/src/main/java/org/sonar/server/user/package-info.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/user/ws/ChangePasswordAction.java b/sonar-server/src/main/java/org/sonar/server/user/ws/ChangePasswordAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/user/ws/ChangePasswordAction.java rename to sonar-server/src/main/java/org/sonar/server/user/ws/ChangePasswordAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/user/ws/CreateAction.java b/sonar-server/src/main/java/org/sonar/server/user/ws/CreateAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/user/ws/CreateAction.java rename to sonar-server/src/main/java/org/sonar/server/user/ws/CreateAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/user/ws/CurrentAction.java b/sonar-server/src/main/java/org/sonar/server/user/ws/CurrentAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/user/ws/CurrentAction.java rename to sonar-server/src/main/java/org/sonar/server/user/ws/CurrentAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/user/ws/DeactivateAction.java b/sonar-server/src/main/java/org/sonar/server/user/ws/DeactivateAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/user/ws/DeactivateAction.java rename to sonar-server/src/main/java/org/sonar/server/user/ws/DeactivateAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/user/ws/GroupsAction.java b/sonar-server/src/main/java/org/sonar/server/user/ws/GroupsAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/user/ws/GroupsAction.java rename to sonar-server/src/main/java/org/sonar/server/user/ws/GroupsAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/user/ws/IdentityProvidersAction.java b/sonar-server/src/main/java/org/sonar/server/user/ws/IdentityProvidersAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/user/ws/IdentityProvidersAction.java rename to sonar-server/src/main/java/org/sonar/server/user/ws/IdentityProvidersAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/user/ws/SearchAction.java b/sonar-server/src/main/java/org/sonar/server/user/ws/SearchAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/user/ws/SearchAction.java rename to sonar-server/src/main/java/org/sonar/server/user/ws/SearchAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/user/ws/SkipOnboardingTutorialAction.java b/sonar-server/src/main/java/org/sonar/server/user/ws/SkipOnboardingTutorialAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/user/ws/SkipOnboardingTutorialAction.java rename to sonar-server/src/main/java/org/sonar/server/user/ws/SkipOnboardingTutorialAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/user/ws/UpdateAction.java b/sonar-server/src/main/java/org/sonar/server/user/ws/UpdateAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/user/ws/UpdateAction.java rename to sonar-server/src/main/java/org/sonar/server/user/ws/UpdateAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/user/ws/UserJsonWriter.java b/sonar-server/src/main/java/org/sonar/server/user/ws/UserJsonWriter.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/user/ws/UserJsonWriter.java rename to sonar-server/src/main/java/org/sonar/server/user/ws/UserJsonWriter.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/user/ws/UserPropertiesWs.java b/sonar-server/src/main/java/org/sonar/server/user/ws/UserPropertiesWs.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/user/ws/UserPropertiesWs.java rename to sonar-server/src/main/java/org/sonar/server/user/ws/UserPropertiesWs.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/user/ws/UsersWs.java b/sonar-server/src/main/java/org/sonar/server/user/ws/UsersWs.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/user/ws/UsersWs.java rename to sonar-server/src/main/java/org/sonar/server/user/ws/UsersWs.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/user/ws/UsersWsAction.java b/sonar-server/src/main/java/org/sonar/server/user/ws/UsersWsAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/user/ws/UsersWsAction.java rename to sonar-server/src/main/java/org/sonar/server/user/ws/UsersWsAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/user/ws/UsersWsModule.java b/sonar-server/src/main/java/org/sonar/server/user/ws/UsersWsModule.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/user/ws/UsersWsModule.java rename to sonar-server/src/main/java/org/sonar/server/user/ws/UsersWsModule.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/user/ws/package-info.java b/sonar-server/src/main/java/org/sonar/server/user/ws/package-info.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/user/ws/package-info.java rename to sonar-server/src/main/java/org/sonar/server/user/ws/package-info.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/usergroups/DefaultGroupCreator.java b/sonar-server/src/main/java/org/sonar/server/usergroups/DefaultGroupCreator.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/usergroups/DefaultGroupCreator.java rename to sonar-server/src/main/java/org/sonar/server/usergroups/DefaultGroupCreator.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/usergroups/DefaultGroupCreatorImpl.java b/sonar-server/src/main/java/org/sonar/server/usergroups/DefaultGroupCreatorImpl.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/usergroups/DefaultGroupCreatorImpl.java rename to sonar-server/src/main/java/org/sonar/server/usergroups/DefaultGroupCreatorImpl.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/usergroups/DefaultGroupFinder.java b/sonar-server/src/main/java/org/sonar/server/usergroups/DefaultGroupFinder.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/usergroups/DefaultGroupFinder.java rename to sonar-server/src/main/java/org/sonar/server/usergroups/DefaultGroupFinder.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/usergroups/package-info.java b/sonar-server/src/main/java/org/sonar/server/usergroups/package-info.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/usergroups/package-info.java rename to sonar-server/src/main/java/org/sonar/server/usergroups/package-info.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/usergroups/ws/AddUserAction.java b/sonar-server/src/main/java/org/sonar/server/usergroups/ws/AddUserAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/usergroups/ws/AddUserAction.java rename to sonar-server/src/main/java/org/sonar/server/usergroups/ws/AddUserAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/usergroups/ws/CreateAction.java b/sonar-server/src/main/java/org/sonar/server/usergroups/ws/CreateAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/usergroups/ws/CreateAction.java rename to sonar-server/src/main/java/org/sonar/server/usergroups/ws/CreateAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/usergroups/ws/DeleteAction.java b/sonar-server/src/main/java/org/sonar/server/usergroups/ws/DeleteAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/usergroups/ws/DeleteAction.java rename to sonar-server/src/main/java/org/sonar/server/usergroups/ws/DeleteAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/usergroups/ws/GroupId.java b/sonar-server/src/main/java/org/sonar/server/usergroups/ws/GroupId.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/usergroups/ws/GroupId.java rename to sonar-server/src/main/java/org/sonar/server/usergroups/ws/GroupId.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/usergroups/ws/GroupIdOrAnyone.java b/sonar-server/src/main/java/org/sonar/server/usergroups/ws/GroupIdOrAnyone.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/usergroups/ws/GroupIdOrAnyone.java rename to sonar-server/src/main/java/org/sonar/server/usergroups/ws/GroupIdOrAnyone.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/usergroups/ws/GroupWsRef.java b/sonar-server/src/main/java/org/sonar/server/usergroups/ws/GroupWsRef.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/usergroups/ws/GroupWsRef.java rename to sonar-server/src/main/java/org/sonar/server/usergroups/ws/GroupWsRef.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/usergroups/ws/GroupWsSupport.java b/sonar-server/src/main/java/org/sonar/server/usergroups/ws/GroupWsSupport.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/usergroups/ws/GroupWsSupport.java rename to sonar-server/src/main/java/org/sonar/server/usergroups/ws/GroupWsSupport.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/usergroups/ws/RemoveUserAction.java b/sonar-server/src/main/java/org/sonar/server/usergroups/ws/RemoveUserAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/usergroups/ws/RemoveUserAction.java rename to sonar-server/src/main/java/org/sonar/server/usergroups/ws/RemoveUserAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/usergroups/ws/SearchAction.java b/sonar-server/src/main/java/org/sonar/server/usergroups/ws/SearchAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/usergroups/ws/SearchAction.java rename to sonar-server/src/main/java/org/sonar/server/usergroups/ws/SearchAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/usergroups/ws/UpdateAction.java b/sonar-server/src/main/java/org/sonar/server/usergroups/ws/UpdateAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/usergroups/ws/UpdateAction.java rename to sonar-server/src/main/java/org/sonar/server/usergroups/ws/UpdateAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/usergroups/ws/UserGroupsModule.java b/sonar-server/src/main/java/org/sonar/server/usergroups/ws/UserGroupsModule.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/usergroups/ws/UserGroupsModule.java rename to sonar-server/src/main/java/org/sonar/server/usergroups/ws/UserGroupsModule.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/usergroups/ws/UserGroupsWs.java b/sonar-server/src/main/java/org/sonar/server/usergroups/ws/UserGroupsWs.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/usergroups/ws/UserGroupsWs.java rename to sonar-server/src/main/java/org/sonar/server/usergroups/ws/UserGroupsWs.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/usergroups/ws/UserGroupsWsAction.java b/sonar-server/src/main/java/org/sonar/server/usergroups/ws/UserGroupsWsAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/usergroups/ws/UserGroupsWsAction.java rename to sonar-server/src/main/java/org/sonar/server/usergroups/ws/UserGroupsWsAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/usergroups/ws/UsersAction.java b/sonar-server/src/main/java/org/sonar/server/usergroups/ws/UsersAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/usergroups/ws/UsersAction.java rename to sonar-server/src/main/java/org/sonar/server/usergroups/ws/UsersAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/usergroups/ws/package-info.java b/sonar-server/src/main/java/org/sonar/server/usergroups/ws/package-info.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/usergroups/ws/package-info.java rename to sonar-server/src/main/java/org/sonar/server/usergroups/ws/package-info.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/usertoken/TokenGenerator.java b/sonar-server/src/main/java/org/sonar/server/usertoken/TokenGenerator.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/usertoken/TokenGenerator.java rename to sonar-server/src/main/java/org/sonar/server/usertoken/TokenGenerator.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/usertoken/TokenGeneratorImpl.java b/sonar-server/src/main/java/org/sonar/server/usertoken/TokenGeneratorImpl.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/usertoken/TokenGeneratorImpl.java rename to sonar-server/src/main/java/org/sonar/server/usertoken/TokenGeneratorImpl.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/usertoken/UserTokenAuthenticator.java b/sonar-server/src/main/java/org/sonar/server/usertoken/UserTokenAuthenticator.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/usertoken/UserTokenAuthenticator.java rename to sonar-server/src/main/java/org/sonar/server/usertoken/UserTokenAuthenticator.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/usertoken/UserTokenModule.java b/sonar-server/src/main/java/org/sonar/server/usertoken/UserTokenModule.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/usertoken/UserTokenModule.java rename to sonar-server/src/main/java/org/sonar/server/usertoken/UserTokenModule.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/usertoken/package-info.java b/sonar-server/src/main/java/org/sonar/server/usertoken/package-info.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/usertoken/package-info.java rename to sonar-server/src/main/java/org/sonar/server/usertoken/package-info.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/usertoken/ws/GenerateAction.java b/sonar-server/src/main/java/org/sonar/server/usertoken/ws/GenerateAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/usertoken/ws/GenerateAction.java rename to sonar-server/src/main/java/org/sonar/server/usertoken/ws/GenerateAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/usertoken/ws/RevokeAction.java b/sonar-server/src/main/java/org/sonar/server/usertoken/ws/RevokeAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/usertoken/ws/RevokeAction.java rename to sonar-server/src/main/java/org/sonar/server/usertoken/ws/RevokeAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/usertoken/ws/SearchAction.java b/sonar-server/src/main/java/org/sonar/server/usertoken/ws/SearchAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/usertoken/ws/SearchAction.java rename to sonar-server/src/main/java/org/sonar/server/usertoken/ws/SearchAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/usertoken/ws/TokenPermissionsValidator.java b/sonar-server/src/main/java/org/sonar/server/usertoken/ws/TokenPermissionsValidator.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/usertoken/ws/TokenPermissionsValidator.java rename to sonar-server/src/main/java/org/sonar/server/usertoken/ws/TokenPermissionsValidator.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/usertoken/ws/UserTokensWs.java b/sonar-server/src/main/java/org/sonar/server/usertoken/ws/UserTokensWs.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/usertoken/ws/UserTokensWs.java rename to sonar-server/src/main/java/org/sonar/server/usertoken/ws/UserTokensWs.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/usertoken/ws/UserTokensWsAction.java b/sonar-server/src/main/java/org/sonar/server/usertoken/ws/UserTokensWsAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/usertoken/ws/UserTokensWsAction.java rename to sonar-server/src/main/java/org/sonar/server/usertoken/ws/UserTokensWsAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/usertoken/ws/package-info.java b/sonar-server/src/main/java/org/sonar/server/usertoken/ws/package-info.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/usertoken/ws/package-info.java rename to sonar-server/src/main/java/org/sonar/server/usertoken/ws/package-info.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/util/AbstractStoppableExecutorService.java b/sonar-server/src/main/java/org/sonar/server/util/AbstractStoppableExecutorService.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/util/AbstractStoppableExecutorService.java rename to sonar-server/src/main/java/org/sonar/server/util/AbstractStoppableExecutorService.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/util/AbstractStoppableScheduledExecutorServiceImpl.java b/sonar-server/src/main/java/org/sonar/server/util/AbstractStoppableScheduledExecutorServiceImpl.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/util/AbstractStoppableScheduledExecutorServiceImpl.java rename to sonar-server/src/main/java/org/sonar/server/util/AbstractStoppableScheduledExecutorServiceImpl.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/util/BooleanTypeValidation.java b/sonar-server/src/main/java/org/sonar/server/util/BooleanTypeValidation.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/util/BooleanTypeValidation.java rename to sonar-server/src/main/java/org/sonar/server/util/BooleanTypeValidation.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/util/ClassLoaderUtils.java b/sonar-server/src/main/java/org/sonar/server/util/ClassLoaderUtils.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/util/ClassLoaderUtils.java rename to sonar-server/src/main/java/org/sonar/server/util/ClassLoaderUtils.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/util/DateCollector.java b/sonar-server/src/main/java/org/sonar/server/util/DateCollector.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/util/DateCollector.java rename to sonar-server/src/main/java/org/sonar/server/util/DateCollector.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/util/EnumUtils.java b/sonar-server/src/main/java/org/sonar/server/util/EnumUtils.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/util/EnumUtils.java rename to sonar-server/src/main/java/org/sonar/server/util/EnumUtils.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/util/FloatTypeValidation.java b/sonar-server/src/main/java/org/sonar/server/util/FloatTypeValidation.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/util/FloatTypeValidation.java rename to sonar-server/src/main/java/org/sonar/server/util/FloatTypeValidation.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/util/IntegerTypeValidation.java b/sonar-server/src/main/java/org/sonar/server/util/IntegerTypeValidation.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/util/IntegerTypeValidation.java rename to sonar-server/src/main/java/org/sonar/server/util/IntegerTypeValidation.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/util/LanguageParamUtils.java b/sonar-server/src/main/java/org/sonar/server/util/LanguageParamUtils.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/util/LanguageParamUtils.java rename to sonar-server/src/main/java/org/sonar/server/util/LanguageParamUtils.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/util/LongTypeValidation.java b/sonar-server/src/main/java/org/sonar/server/util/LongTypeValidation.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/util/LongTypeValidation.java rename to sonar-server/src/main/java/org/sonar/server/util/LongTypeValidation.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/util/MetricKeyValidator.java b/sonar-server/src/main/java/org/sonar/server/util/MetricKeyValidator.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/util/MetricKeyValidator.java rename to sonar-server/src/main/java/org/sonar/server/util/MetricKeyValidator.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/util/MetricLevelTypeValidation.java b/sonar-server/src/main/java/org/sonar/server/util/MetricLevelTypeValidation.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/util/MetricLevelTypeValidation.java rename to sonar-server/src/main/java/org/sonar/server/util/MetricLevelTypeValidation.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/util/ObjectInputStreamIterator.java b/sonar-server/src/main/java/org/sonar/server/util/ObjectInputStreamIterator.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/util/ObjectInputStreamIterator.java rename to sonar-server/src/main/java/org/sonar/server/util/ObjectInputStreamIterator.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/util/OkHttpClientProvider.java b/sonar-server/src/main/java/org/sonar/server/util/OkHttpClientProvider.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/util/OkHttpClientProvider.java rename to sonar-server/src/main/java/org/sonar/server/util/OkHttpClientProvider.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/util/RubyUtils.java b/sonar-server/src/main/java/org/sonar/server/util/RubyUtils.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/util/RubyUtils.java rename to sonar-server/src/main/java/org/sonar/server/util/RubyUtils.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/util/StoppableExecutorService.java b/sonar-server/src/main/java/org/sonar/server/util/StoppableExecutorService.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/util/StoppableExecutorService.java rename to sonar-server/src/main/java/org/sonar/server/util/StoppableExecutorService.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/util/StoppableScheduledExecutorService.java b/sonar-server/src/main/java/org/sonar/server/util/StoppableScheduledExecutorService.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/util/StoppableScheduledExecutorService.java rename to sonar-server/src/main/java/org/sonar/server/util/StoppableScheduledExecutorService.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/util/StringListTypeValidation.java b/sonar-server/src/main/java/org/sonar/server/util/StringListTypeValidation.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/util/StringListTypeValidation.java rename to sonar-server/src/main/java/org/sonar/server/util/StringListTypeValidation.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/util/StringTypeValidation.java b/sonar-server/src/main/java/org/sonar/server/util/StringTypeValidation.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/util/StringTypeValidation.java rename to sonar-server/src/main/java/org/sonar/server/util/StringTypeValidation.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/util/TextTypeValidation.java b/sonar-server/src/main/java/org/sonar/server/util/TextTypeValidation.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/util/TextTypeValidation.java rename to sonar-server/src/main/java/org/sonar/server/util/TextTypeValidation.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/util/TypeValidation.java b/sonar-server/src/main/java/org/sonar/server/util/TypeValidation.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/util/TypeValidation.java rename to sonar-server/src/main/java/org/sonar/server/util/TypeValidation.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/util/TypeValidationModule.java b/sonar-server/src/main/java/org/sonar/server/util/TypeValidationModule.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/util/TypeValidationModule.java rename to sonar-server/src/main/java/org/sonar/server/util/TypeValidationModule.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/util/TypeValidations.java b/sonar-server/src/main/java/org/sonar/server/util/TypeValidations.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/util/TypeValidations.java rename to sonar-server/src/main/java/org/sonar/server/util/TypeValidations.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/util/Validation.java b/sonar-server/src/main/java/org/sonar/server/util/Validation.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/util/Validation.java rename to sonar-server/src/main/java/org/sonar/server/util/Validation.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/util/cache/CacheLoader.java b/sonar-server/src/main/java/org/sonar/server/util/cache/CacheLoader.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/util/cache/CacheLoader.java rename to sonar-server/src/main/java/org/sonar/server/util/cache/CacheLoader.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/util/cache/DiskCache.java b/sonar-server/src/main/java/org/sonar/server/util/cache/DiskCache.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/util/cache/DiskCache.java rename to sonar-server/src/main/java/org/sonar/server/util/cache/DiskCache.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/util/cache/MemoryCache.java b/sonar-server/src/main/java/org/sonar/server/util/cache/MemoryCache.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/util/cache/MemoryCache.java rename to sonar-server/src/main/java/org/sonar/server/util/cache/MemoryCache.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/util/cache/package-info.java b/sonar-server/src/main/java/org/sonar/server/util/cache/package-info.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/util/cache/package-info.java rename to sonar-server/src/main/java/org/sonar/server/util/cache/package-info.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/util/package-info.java b/sonar-server/src/main/java/org/sonar/server/util/package-info.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/util/package-info.java rename to sonar-server/src/main/java/org/sonar/server/util/package-info.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/view/index/ViewDoc.java b/sonar-server/src/main/java/org/sonar/server/view/index/ViewDoc.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/view/index/ViewDoc.java rename to sonar-server/src/main/java/org/sonar/server/view/index/ViewDoc.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/view/index/ViewIndex.java b/sonar-server/src/main/java/org/sonar/server/view/index/ViewIndex.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/view/index/ViewIndex.java rename to sonar-server/src/main/java/org/sonar/server/view/index/ViewIndex.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/view/index/ViewIndexDefinition.java b/sonar-server/src/main/java/org/sonar/server/view/index/ViewIndexDefinition.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/view/index/ViewIndexDefinition.java rename to sonar-server/src/main/java/org/sonar/server/view/index/ViewIndexDefinition.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/view/index/ViewIndexer.java b/sonar-server/src/main/java/org/sonar/server/view/index/ViewIndexer.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/view/index/ViewIndexer.java rename to sonar-server/src/main/java/org/sonar/server/view/index/ViewIndexer.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/view/index/package-info.java b/sonar-server/src/main/java/org/sonar/server/view/index/package-info.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/view/index/package-info.java rename to sonar-server/src/main/java/org/sonar/server/view/index/package-info.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/webhook/ws/WebhookDeliveriesAction.java b/sonar-server/src/main/java/org/sonar/server/webhook/ws/WebhookDeliveriesAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/webhook/ws/WebhookDeliveriesAction.java rename to sonar-server/src/main/java/org/sonar/server/webhook/ws/WebhookDeliveriesAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/webhook/ws/WebhookDeliveryAction.java b/sonar-server/src/main/java/org/sonar/server/webhook/ws/WebhookDeliveryAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/webhook/ws/WebhookDeliveryAction.java rename to sonar-server/src/main/java/org/sonar/server/webhook/ws/WebhookDeliveryAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/webhook/ws/WebhookWsSupport.java b/sonar-server/src/main/java/org/sonar/server/webhook/ws/WebhookWsSupport.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/webhook/ws/WebhookWsSupport.java rename to sonar-server/src/main/java/org/sonar/server/webhook/ws/WebhookWsSupport.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/webhook/ws/WebhooksWs.java b/sonar-server/src/main/java/org/sonar/server/webhook/ws/WebhooksWs.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/webhook/ws/WebhooksWs.java rename to sonar-server/src/main/java/org/sonar/server/webhook/ws/WebhooksWs.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/webhook/ws/WebhooksWsAction.java b/sonar-server/src/main/java/org/sonar/server/webhook/ws/WebhooksWsAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/webhook/ws/WebhooksWsAction.java rename to sonar-server/src/main/java/org/sonar/server/webhook/ws/WebhooksWsAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/webhook/ws/WebhooksWsModule.java b/sonar-server/src/main/java/org/sonar/server/webhook/ws/WebhooksWsModule.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/webhook/ws/WebhooksWsModule.java rename to sonar-server/src/main/java/org/sonar/server/webhook/ws/WebhooksWsModule.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/webhook/ws/package-info.java b/sonar-server/src/main/java/org/sonar/server/webhook/ws/package-info.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/webhook/ws/package-info.java rename to sonar-server/src/main/java/org/sonar/server/webhook/ws/package-info.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/ws/DefaultLocalResponse.java b/sonar-server/src/main/java/org/sonar/server/ws/DefaultLocalResponse.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/ws/DefaultLocalResponse.java rename to sonar-server/src/main/java/org/sonar/server/ws/DefaultLocalResponse.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/ws/DeprecatedPropertiesWsFilter.java b/sonar-server/src/main/java/org/sonar/server/ws/DeprecatedPropertiesWsFilter.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/ws/DeprecatedPropertiesWsFilter.java rename to sonar-server/src/main/java/org/sonar/server/ws/DeprecatedPropertiesWsFilter.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/ws/JsonWriterUtils.java b/sonar-server/src/main/java/org/sonar/server/ws/JsonWriterUtils.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/ws/JsonWriterUtils.java rename to sonar-server/src/main/java/org/sonar/server/ws/JsonWriterUtils.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/ws/KeyExamples.java b/sonar-server/src/main/java/org/sonar/server/ws/KeyExamples.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/ws/KeyExamples.java rename to sonar-server/src/main/java/org/sonar/server/ws/KeyExamples.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/ws/LocalRequestAdapter.java b/sonar-server/src/main/java/org/sonar/server/ws/LocalRequestAdapter.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/ws/LocalRequestAdapter.java rename to sonar-server/src/main/java/org/sonar/server/ws/LocalRequestAdapter.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/ws/RemovedWebServiceHandler.java b/sonar-server/src/main/java/org/sonar/server/ws/RemovedWebServiceHandler.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/ws/RemovedWebServiceHandler.java rename to sonar-server/src/main/java/org/sonar/server/ws/RemovedWebServiceHandler.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/ws/RequestVerifier.java b/sonar-server/src/main/java/org/sonar/server/ws/RequestVerifier.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/ws/RequestVerifier.java rename to sonar-server/src/main/java/org/sonar/server/ws/RequestVerifier.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/ws/ServletFilterHandler.java b/sonar-server/src/main/java/org/sonar/server/ws/ServletFilterHandler.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/ws/ServletFilterHandler.java rename to sonar-server/src/main/java/org/sonar/server/ws/ServletFilterHandler.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/ws/ServletRequest.java b/sonar-server/src/main/java/org/sonar/server/ws/ServletRequest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/ws/ServletRequest.java rename to sonar-server/src/main/java/org/sonar/server/ws/ServletRequest.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/ws/ServletResponse.java b/sonar-server/src/main/java/org/sonar/server/ws/ServletResponse.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/ws/ServletResponse.java rename to sonar-server/src/main/java/org/sonar/server/ws/ServletResponse.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/ws/WebServiceEngine.java b/sonar-server/src/main/java/org/sonar/server/ws/WebServiceEngine.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/ws/WebServiceEngine.java rename to sonar-server/src/main/java/org/sonar/server/ws/WebServiceEngine.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/ws/WebServiceFilter.java b/sonar-server/src/main/java/org/sonar/server/ws/WebServiceFilter.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/ws/WebServiceFilter.java rename to sonar-server/src/main/java/org/sonar/server/ws/WebServiceFilter.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/ws/WebServiceReroutingFilter.java b/sonar-server/src/main/java/org/sonar/server/ws/WebServiceReroutingFilter.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/ws/WebServiceReroutingFilter.java rename to sonar-server/src/main/java/org/sonar/server/ws/WebServiceReroutingFilter.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/ws/WsAction.java b/sonar-server/src/main/java/org/sonar/server/ws/WsAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/ws/WsAction.java rename to sonar-server/src/main/java/org/sonar/server/ws/WsAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/ws/WsParameterBuilder.java b/sonar-server/src/main/java/org/sonar/server/ws/WsParameterBuilder.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/ws/WsParameterBuilder.java rename to sonar-server/src/main/java/org/sonar/server/ws/WsParameterBuilder.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/ws/WsResponseCommonFormat.java b/sonar-server/src/main/java/org/sonar/server/ws/WsResponseCommonFormat.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/ws/WsResponseCommonFormat.java rename to sonar-server/src/main/java/org/sonar/server/ws/WsResponseCommonFormat.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/ws/WsUtils.java b/sonar-server/src/main/java/org/sonar/server/ws/WsUtils.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/ws/WsUtils.java rename to sonar-server/src/main/java/org/sonar/server/ws/WsUtils.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/ws/package-info.java b/sonar-server/src/main/java/org/sonar/server/ws/package-info.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/ws/package-info.java rename to sonar-server/src/main/java/org/sonar/server/ws/package-info.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/ws/ws/ListAction.java b/sonar-server/src/main/java/org/sonar/server/ws/ws/ListAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/ws/ws/ListAction.java rename to sonar-server/src/main/java/org/sonar/server/ws/ws/ListAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/ws/ws/ResponseExampleAction.java b/sonar-server/src/main/java/org/sonar/server/ws/ws/ResponseExampleAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/ws/ws/ResponseExampleAction.java rename to sonar-server/src/main/java/org/sonar/server/ws/ws/ResponseExampleAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/ws/ws/WebServicesWs.java b/sonar-server/src/main/java/org/sonar/server/ws/ws/WebServicesWs.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/ws/ws/WebServicesWs.java rename to sonar-server/src/main/java/org/sonar/server/ws/ws/WebServicesWs.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/ws/ws/WebServicesWsAction.java b/sonar-server/src/main/java/org/sonar/server/ws/ws/WebServicesWsAction.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/ws/ws/WebServicesWsAction.java rename to sonar-server/src/main/java/org/sonar/server/ws/ws/WebServicesWsAction.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/ws/ws/WebServicesWsModule.java b/sonar-server/src/main/java/org/sonar/server/ws/ws/WebServicesWsModule.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/ws/ws/WebServicesWsModule.java rename to sonar-server/src/main/java/org/sonar/server/ws/ws/WebServicesWsModule.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/ws/ws/package-info.java b/sonar-server/src/main/java/org/sonar/server/ws/ws/package-info.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/java/org/sonar/server/ws/ws/package-info.java rename to sonar-server/src/main/java/org/sonar/server/ws/ws/package-info.java diff --git a/sonarqube-6.5/server/sonar-server/src/main/resources/build.properties b/sonar-server/src/main/resources/build.properties similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/resources/build.properties rename to sonar-server/src/main/resources/build.properties diff --git a/sonarqube-6.5/server/sonar-server/src/main/resources/com/sonar/sqale/technical-debt-model.xml b/sonar-server/src/main/resources/com/sonar/sqale/technical-debt-model.xml similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/resources/com/sonar/sqale/technical-debt-model.xml rename to sonar-server/src/main/resources/com/sonar/sqale/technical-debt-model.xml diff --git a/sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/authentication/ws/example-validate.json b/sonar-server/src/main/resources/org/sonar/server/authentication/ws/example-validate.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/authentication/ws/example-validate.json rename to sonar-server/src/main/resources/org/sonar/server/authentication/ws/example-validate.json diff --git a/sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/batch/batch-file-example.txt b/sonar-server/src/main/resources/org/sonar/server/batch/batch-file-example.txt similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/batch/batch-file-example.txt rename to sonar-server/src/main/resources/org/sonar/server/batch/batch-file-example.txt diff --git a/sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/batch/global-example.json b/sonar-server/src/main/resources/org/sonar/server/batch/global-example.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/batch/global-example.json rename to sonar-server/src/main/resources/org/sonar/server/batch/global-example.json diff --git a/sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/batch/index-example.txt b/sonar-server/src/main/resources/org/sonar/server/batch/index-example.txt similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/batch/index-example.txt rename to sonar-server/src/main/resources/org/sonar/server/batch/index-example.txt diff --git a/sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/batch/issues-example.proto b/sonar-server/src/main/resources/org/sonar/server/batch/issues-example.proto similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/batch/issues-example.proto rename to sonar-server/src/main/resources/org/sonar/server/batch/issues-example.proto diff --git a/sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/batch/project-example.json b/sonar-server/src/main/resources/org/sonar/server/batch/project-example.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/batch/project-example.json rename to sonar-server/src/main/resources/org/sonar/server/batch/project-example.json diff --git a/sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/ce/ws/activity-example.json b/sonar-server/src/main/resources/org/sonar/server/ce/ws/activity-example.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/ce/ws/activity-example.json rename to sonar-server/src/main/resources/org/sonar/server/ce/ws/activity-example.json diff --git a/sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/ce/ws/activity_status-example.json b/sonar-server/src/main/resources/org/sonar/server/ce/ws/activity_status-example.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/ce/ws/activity_status-example.json rename to sonar-server/src/main/resources/org/sonar/server/ce/ws/activity_status-example.json diff --git a/sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/ce/ws/component-example.json b/sonar-server/src/main/resources/org/sonar/server/ce/ws/component-example.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/ce/ws/component-example.json rename to sonar-server/src/main/resources/org/sonar/server/ce/ws/component-example.json diff --git a/sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/ce/ws/is_queue_empty-example.txt b/sonar-server/src/main/resources/org/sonar/server/ce/ws/is_queue_empty-example.txt similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/ce/ws/is_queue_empty-example.txt rename to sonar-server/src/main/resources/org/sonar/server/ce/ws/is_queue_empty-example.txt diff --git a/sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/ce/ws/submit-example.json b/sonar-server/src/main/resources/org/sonar/server/ce/ws/submit-example.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/ce/ws/submit-example.json rename to sonar-server/src/main/resources/org/sonar/server/ce/ws/submit-example.json diff --git a/sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/ce/ws/task-example.json b/sonar-server/src/main/resources/org/sonar/server/ce/ws/task-example.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/ce/ws/task-example.json rename to sonar-server/src/main/resources/org/sonar/server/ce/ws/task-example.json diff --git a/sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/ce/ws/task_types-example.json b/sonar-server/src/main/resources/org/sonar/server/ce/ws/task_types-example.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/ce/ws/task_types-example.json rename to sonar-server/src/main/resources/org/sonar/server/ce/ws/task_types-example.json diff --git a/sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/component/ws/app-example.json b/sonar-server/src/main/resources/org/sonar/server/component/ws/app-example.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/component/ws/app-example.json rename to sonar-server/src/main/resources/org/sonar/server/component/ws/app-example.json diff --git a/sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/component/ws/components-example-suggestions.json b/sonar-server/src/main/resources/org/sonar/server/component/ws/components-example-suggestions.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/component/ws/components-example-suggestions.json rename to sonar-server/src/main/resources/org/sonar/server/component/ws/components-example-suggestions.json diff --git a/sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/component/ws/events-index-example.json b/sonar-server/src/main/resources/org/sonar/server/component/ws/events-index-example.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/component/ws/events-index-example.json rename to sonar-server/src/main/resources/org/sonar/server/component/ws/events-index-example.json diff --git a/sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/component/ws/resources-example-index.json b/sonar-server/src/main/resources/org/sonar/server/component/ws/resources-example-index.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/component/ws/resources-example-index.json rename to sonar-server/src/main/resources/org/sonar/server/component/ws/resources-example-index.json diff --git a/sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/component/ws/search-components-example.json b/sonar-server/src/main/resources/org/sonar/server/component/ws/search-components-example.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/component/ws/search-components-example.json rename to sonar-server/src/main/resources/org/sonar/server/component/ws/search-components-example.json diff --git a/sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/component/ws/search_projects-example.json b/sonar-server/src/main/resources/org/sonar/server/component/ws/search_projects-example.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/component/ws/search_projects-example.json rename to sonar-server/src/main/resources/org/sonar/server/component/ws/search_projects-example.json diff --git a/sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/component/ws/show-example.json b/sonar-server/src/main/resources/org/sonar/server/component/ws/show-example.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/component/ws/show-example.json rename to sonar-server/src/main/resources/org/sonar/server/component/ws/show-example.json diff --git a/sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/component/ws/tree-example.json b/sonar-server/src/main/resources/org/sonar/server/component/ws/tree-example.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/component/ws/tree-example.json rename to sonar-server/src/main/resources/org/sonar/server/component/ws/tree-example.json diff --git a/sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/duplication/ws/show-example.json b/sonar-server/src/main/resources/org/sonar/server/duplication/ws/show-example.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/duplication/ws/show-example.json rename to sonar-server/src/main/resources/org/sonar/server/duplication/ws/show-example.json diff --git a/sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/favorite/ws/search-example.json b/sonar-server/src/main/resources/org/sonar/server/favorite/ws/search-example.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/favorite/ws/search-example.json rename to sonar-server/src/main/resources/org/sonar/server/favorite/ws/search-example.json diff --git a/sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/issue/ws/add_comment-example.json b/sonar-server/src/main/resources/org/sonar/server/issue/ws/add_comment-example.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/issue/ws/add_comment-example.json rename to sonar-server/src/main/resources/org/sonar/server/issue/ws/add_comment-example.json diff --git a/sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/issue/ws/assign-example.json b/sonar-server/src/main/resources/org/sonar/server/issue/ws/assign-example.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/issue/ws/assign-example.json rename to sonar-server/src/main/resources/org/sonar/server/issue/ws/assign-example.json diff --git a/sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/issue/ws/authors-example.json b/sonar-server/src/main/resources/org/sonar/server/issue/ws/authors-example.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/issue/ws/authors-example.json rename to sonar-server/src/main/resources/org/sonar/server/issue/ws/authors-example.json diff --git a/sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/issue/ws/bulk_change-example.json b/sonar-server/src/main/resources/org/sonar/server/issue/ws/bulk_change-example.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/issue/ws/bulk_change-example.json rename to sonar-server/src/main/resources/org/sonar/server/issue/ws/bulk_change-example.json diff --git a/sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/issue/ws/changelog-example.json b/sonar-server/src/main/resources/org/sonar/server/issue/ws/changelog-example.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/issue/ws/changelog-example.json rename to sonar-server/src/main/resources/org/sonar/server/issue/ws/changelog-example.json diff --git a/sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/issue/ws/component-tags-example.json b/sonar-server/src/main/resources/org/sonar/server/issue/ws/component-tags-example.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/issue/ws/component-tags-example.json rename to sonar-server/src/main/resources/org/sonar/server/issue/ws/component-tags-example.json diff --git a/sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/issue/ws/delete_comment-example.json b/sonar-server/src/main/resources/org/sonar/server/issue/ws/delete_comment-example.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/issue/ws/delete_comment-example.json rename to sonar-server/src/main/resources/org/sonar/server/issue/ws/delete_comment-example.json diff --git a/sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/issue/ws/do_transition-example.json b/sonar-server/src/main/resources/org/sonar/server/issue/ws/do_transition-example.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/issue/ws/do_transition-example.json rename to sonar-server/src/main/resources/org/sonar/server/issue/ws/do_transition-example.json diff --git a/sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/issue/ws/edit_comment-example.json b/sonar-server/src/main/resources/org/sonar/server/issue/ws/edit_comment-example.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/issue/ws/edit_comment-example.json rename to sonar-server/src/main/resources/org/sonar/server/issue/ws/edit_comment-example.json diff --git a/sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/issue/ws/search-example.json b/sonar-server/src/main/resources/org/sonar/server/issue/ws/search-example.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/issue/ws/search-example.json rename to sonar-server/src/main/resources/org/sonar/server/issue/ws/search-example.json diff --git a/sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/issue/ws/set_severity-example.json b/sonar-server/src/main/resources/org/sonar/server/issue/ws/set_severity-example.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/issue/ws/set_severity-example.json rename to sonar-server/src/main/resources/org/sonar/server/issue/ws/set_severity-example.json diff --git a/sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/issue/ws/set_tags-example.json b/sonar-server/src/main/resources/org/sonar/server/issue/ws/set_tags-example.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/issue/ws/set_tags-example.json rename to sonar-server/src/main/resources/org/sonar/server/issue/ws/set_tags-example.json diff --git a/sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/issue/ws/set_type-example.json b/sonar-server/src/main/resources/org/sonar/server/issue/ws/set_type-example.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/issue/ws/set_type-example.json rename to sonar-server/src/main/resources/org/sonar/server/issue/ws/set_type-example.json diff --git a/sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/issue/ws/tags-example.json b/sonar-server/src/main/resources/org/sonar/server/issue/ws/tags-example.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/issue/ws/tags-example.json rename to sonar-server/src/main/resources/org/sonar/server/issue/ws/tags-example.json diff --git a/sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/language/ws/example-list.json b/sonar-server/src/main/resources/org/sonar/server/language/ws/example-list.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/language/ws/example-list.json rename to sonar-server/src/main/resources/org/sonar/server/language/ws/example-list.json diff --git a/sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/license/ws/list-example.json b/sonar-server/src/main/resources/org/sonar/server/license/ws/list-example.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/license/ws/list-example.json rename to sonar-server/src/main/resources/org/sonar/server/license/ws/list-example.json diff --git a/sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/measure/custom/ws/example-metrics.json b/sonar-server/src/main/resources/org/sonar/server/measure/custom/ws/example-metrics.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/measure/custom/ws/example-metrics.json rename to sonar-server/src/main/resources/org/sonar/server/measure/custom/ws/example-metrics.json diff --git a/sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/measure/custom/ws/example-search.json b/sonar-server/src/main/resources/org/sonar/server/measure/custom/ws/example-search.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/measure/custom/ws/example-search.json rename to sonar-server/src/main/resources/org/sonar/server/measure/custom/ws/example-search.json diff --git a/sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/measure/ws/component-example.json b/sonar-server/src/main/resources/org/sonar/server/measure/ws/component-example.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/measure/ws/component-example.json rename to sonar-server/src/main/resources/org/sonar/server/measure/ws/component-example.json diff --git a/sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/measure/ws/component_tree-example.json b/sonar-server/src/main/resources/org/sonar/server/measure/ws/component_tree-example.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/measure/ws/component_tree-example.json rename to sonar-server/src/main/resources/org/sonar/server/measure/ws/component_tree-example.json diff --git a/sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/measure/ws/search-example.json b/sonar-server/src/main/resources/org/sonar/server/measure/ws/search-example.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/measure/ws/search-example.json rename to sonar-server/src/main/resources/org/sonar/server/measure/ws/search-example.json diff --git a/sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/measure/ws/search_history-example.json b/sonar-server/src/main/resources/org/sonar/server/measure/ws/search_history-example.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/measure/ws/search_history-example.json rename to sonar-server/src/main/resources/org/sonar/server/measure/ws/search_history-example.json diff --git a/sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/metric/ws/example-domains.json b/sonar-server/src/main/resources/org/sonar/server/metric/ws/example-domains.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/metric/ws/example-domains.json rename to sonar-server/src/main/resources/org/sonar/server/metric/ws/example-domains.json diff --git a/sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/metric/ws/example-search.json b/sonar-server/src/main/resources/org/sonar/server/metric/ws/example-search.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/metric/ws/example-search.json rename to sonar-server/src/main/resources/org/sonar/server/metric/ws/example-search.json diff --git a/sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/metric/ws/example-types.json b/sonar-server/src/main/resources/org/sonar/server/metric/ws/example-types.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/metric/ws/example-types.json rename to sonar-server/src/main/resources/org/sonar/server/metric/ws/example-types.json diff --git a/sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/notification/ws/list-example.json b/sonar-server/src/main/resources/org/sonar/server/notification/ws/list-example.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/notification/ws/list-example.json rename to sonar-server/src/main/resources/org/sonar/server/notification/ws/list-example.json diff --git a/sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/organization/ws/add_member-example.json b/sonar-server/src/main/resources/org/sonar/server/organization/ws/add_member-example.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/organization/ws/add_member-example.json rename to sonar-server/src/main/resources/org/sonar/server/organization/ws/add_member-example.json diff --git a/sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/organization/ws/create-example.json b/sonar-server/src/main/resources/org/sonar/server/organization/ws/create-example.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/organization/ws/create-example.json rename to sonar-server/src/main/resources/org/sonar/server/organization/ws/create-example.json diff --git a/sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/organization/ws/search-example.json b/sonar-server/src/main/resources/org/sonar/server/organization/ws/search-example.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/organization/ws/search-example.json rename to sonar-server/src/main/resources/org/sonar/server/organization/ws/search-example.json diff --git a/sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/organization/ws/search_members-example.json b/sonar-server/src/main/resources/org/sonar/server/organization/ws/search_members-example.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/organization/ws/search_members-example.json rename to sonar-server/src/main/resources/org/sonar/server/organization/ws/search_members-example.json diff --git a/sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/organization/ws/search_my_organization-example.json b/sonar-server/src/main/resources/org/sonar/server/organization/ws/search_my_organization-example.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/organization/ws/search_my_organization-example.json rename to sonar-server/src/main/resources/org/sonar/server/organization/ws/search_my_organization-example.json diff --git a/sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/permission/ws/groups-example.json b/sonar-server/src/main/resources/org/sonar/server/permission/ws/groups-example.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/permission/ws/groups-example.json rename to sonar-server/src/main/resources/org/sonar/server/permission/ws/groups-example.json diff --git a/sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/permission/ws/search_global_permissions-example.json b/sonar-server/src/main/resources/org/sonar/server/permission/ws/search_global_permissions-example.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/permission/ws/search_global_permissions-example.json rename to sonar-server/src/main/resources/org/sonar/server/permission/ws/search_global_permissions-example.json diff --git a/sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/permission/ws/search_project_permissions-example.json b/sonar-server/src/main/resources/org/sonar/server/permission/ws/search_project_permissions-example.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/permission/ws/search_project_permissions-example.json rename to sonar-server/src/main/resources/org/sonar/server/permission/ws/search_project_permissions-example.json diff --git a/sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/permission/ws/template/create_template-example.json b/sonar-server/src/main/resources/org/sonar/server/permission/ws/template/create_template-example.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/permission/ws/template/create_template-example.json rename to sonar-server/src/main/resources/org/sonar/server/permission/ws/template/create_template-example.json diff --git a/sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/permission/ws/template/search_templates-example.json b/sonar-server/src/main/resources/org/sonar/server/permission/ws/template/search_templates-example.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/permission/ws/template/search_templates-example.json rename to sonar-server/src/main/resources/org/sonar/server/permission/ws/template/search_templates-example.json diff --git a/sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/permission/ws/template/template_groups-example.json b/sonar-server/src/main/resources/org/sonar/server/permission/ws/template/template_groups-example.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/permission/ws/template/template_groups-example.json rename to sonar-server/src/main/resources/org/sonar/server/permission/ws/template/template_groups-example.json diff --git a/sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/permission/ws/template/template_users-example.json b/sonar-server/src/main/resources/org/sonar/server/permission/ws/template/template_users-example.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/permission/ws/template/template_users-example.json rename to sonar-server/src/main/resources/org/sonar/server/permission/ws/template/template_users-example.json diff --git a/sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/permission/ws/template/update_template-example.json b/sonar-server/src/main/resources/org/sonar/server/permission/ws/template/update_template-example.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/permission/ws/template/update_template-example.json rename to sonar-server/src/main/resources/org/sonar/server/permission/ws/template/update_template-example.json diff --git a/sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/permission/ws/users-example.json b/sonar-server/src/main/resources/org/sonar/server/permission/ws/users-example.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/permission/ws/users-example.json rename to sonar-server/src/main/resources/org/sonar/server/permission/ws/users-example.json diff --git a/sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/platform/ws/example-migrate_db.json b/sonar-server/src/main/resources/org/sonar/server/platform/ws/example-migrate_db.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/platform/ws/example-migrate_db.json rename to sonar-server/src/main/resources/org/sonar/server/platform/ws/example-migrate_db.json diff --git a/sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/platform/ws/example-server-version.txt b/sonar-server/src/main/resources/org/sonar/server/platform/ws/example-server-version.txt similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/platform/ws/example-server-version.txt rename to sonar-server/src/main/resources/org/sonar/server/platform/ws/example-server-version.txt diff --git a/sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/platform/ws/example-status.json b/sonar-server/src/main/resources/org/sonar/server/platform/ws/example-status.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/platform/ws/example-status.json rename to sonar-server/src/main/resources/org/sonar/server/platform/ws/example-status.json diff --git a/sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/platform/ws/example-system-info.json b/sonar-server/src/main/resources/org/sonar/server/platform/ws/example-system-info.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/platform/ws/example-system-info.json rename to sonar-server/src/main/resources/org/sonar/server/platform/ws/example-system-info.json diff --git a/sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/platform/ws/example-upgrades_plugins.json b/sonar-server/src/main/resources/org/sonar/server/platform/ws/example-upgrades_plugins.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/platform/ws/example-upgrades_plugins.json rename to sonar-server/src/main/resources/org/sonar/server/platform/ws/example-upgrades_plugins.json diff --git a/sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/platform/ws/l10n-index-example.json b/sonar-server/src/main/resources/org/sonar/server/platform/ws/l10n-index-example.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/platform/ws/l10n-index-example.json rename to sonar-server/src/main/resources/org/sonar/server/platform/ws/l10n-index-example.json diff --git a/sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/platform/ws/logs-example.log b/sonar-server/src/main/resources/org/sonar/server/platform/ws/logs-example.log similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/platform/ws/logs-example.log rename to sonar-server/src/main/resources/org/sonar/server/platform/ws/logs-example.log diff --git a/sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/platform/ws/ping-example.txt b/sonar-server/src/main/resources/org/sonar/server/platform/ws/ping-example.txt similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/platform/ws/ping-example.txt rename to sonar-server/src/main/resources/org/sonar/server/platform/ws/ping-example.txt diff --git a/sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/plugins/ws/example-available_plugins.json b/sonar-server/src/main/resources/org/sonar/server/plugins/ws/example-available_plugins.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/plugins/ws/example-available_plugins.json rename to sonar-server/src/main/resources/org/sonar/server/plugins/ws/example-available_plugins.json diff --git a/sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/plugins/ws/example-installed_plugins.json b/sonar-server/src/main/resources/org/sonar/server/plugins/ws/example-installed_plugins.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/plugins/ws/example-installed_plugins.json rename to sonar-server/src/main/resources/org/sonar/server/plugins/ws/example-installed_plugins.json diff --git a/sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/plugins/ws/example-pending_plugins.json b/sonar-server/src/main/resources/org/sonar/server/plugins/ws/example-pending_plugins.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/plugins/ws/example-pending_plugins.json rename to sonar-server/src/main/resources/org/sonar/server/plugins/ws/example-pending_plugins.json diff --git a/sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/plugins/ws/example-updates_plugins.json b/sonar-server/src/main/resources/org/sonar/server/plugins/ws/example-updates_plugins.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/plugins/ws/example-updates_plugins.json rename to sonar-server/src/main/resources/org/sonar/server/plugins/ws/example-updates_plugins.json diff --git a/sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/project/ws/bulk_update_key-example.json b/sonar-server/src/main/resources/org/sonar/server/project/ws/bulk_update_key-example.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/project/ws/bulk_update_key-example.json rename to sonar-server/src/main/resources/org/sonar/server/project/ws/bulk_update_key-example.json diff --git a/sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/project/ws/create-example.json b/sonar-server/src/main/resources/org/sonar/server/project/ws/create-example.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/project/ws/create-example.json rename to sonar-server/src/main/resources/org/sonar/server/project/ws/create-example.json diff --git a/sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/project/ws/index-example.json b/sonar-server/src/main/resources/org/sonar/server/project/ws/index-example.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/project/ws/index-example.json rename to sonar-server/src/main/resources/org/sonar/server/project/ws/index-example.json diff --git a/sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/project/ws/projects-example-ghosts.json b/sonar-server/src/main/resources/org/sonar/server/project/ws/projects-example-ghosts.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/project/ws/projects-example-ghosts.json rename to sonar-server/src/main/resources/org/sonar/server/project/ws/projects-example-ghosts.json diff --git a/sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/project/ws/projects-example-provisioned.json b/sonar-server/src/main/resources/org/sonar/server/project/ws/projects-example-provisioned.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/project/ws/projects-example-provisioned.json rename to sonar-server/src/main/resources/org/sonar/server/project/ws/projects-example-provisioned.json diff --git a/sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/project/ws/search-example.json b/sonar-server/src/main/resources/org/sonar/server/project/ws/search-example.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/project/ws/search-example.json rename to sonar-server/src/main/resources/org/sonar/server/project/ws/search-example.json diff --git a/sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/project/ws/search_my_projects-example.json b/sonar-server/src/main/resources/org/sonar/server/project/ws/search_my_projects-example.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/project/ws/search_my_projects-example.json rename to sonar-server/src/main/resources/org/sonar/server/project/ws/search_my_projects-example.json diff --git a/sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/projectanalysis/ws/create_event-example.json b/sonar-server/src/main/resources/org/sonar/server/projectanalysis/ws/create_event-example.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/projectanalysis/ws/create_event-example.json rename to sonar-server/src/main/resources/org/sonar/server/projectanalysis/ws/create_event-example.json diff --git a/sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/projectanalysis/ws/search-example.json b/sonar-server/src/main/resources/org/sonar/server/projectanalysis/ws/search-example.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/projectanalysis/ws/search-example.json rename to sonar-server/src/main/resources/org/sonar/server/projectanalysis/ws/search-example.json diff --git a/sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/projectanalysis/ws/update_event-example.json b/sonar-server/src/main/resources/org/sonar/server/projectanalysis/ws/update_event-example.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/projectanalysis/ws/update_event-example.json rename to sonar-server/src/main/resources/org/sonar/server/projectanalysis/ws/update_event-example.json diff --git a/sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/projectlink/ws/create-example.json b/sonar-server/src/main/resources/org/sonar/server/projectlink/ws/create-example.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/projectlink/ws/create-example.json rename to sonar-server/src/main/resources/org/sonar/server/projectlink/ws/create-example.json diff --git a/sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/projectlink/ws/list-example.json b/sonar-server/src/main/resources/org/sonar/server/projectlink/ws/list-example.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/projectlink/ws/list-example.json rename to sonar-server/src/main/resources/org/sonar/server/projectlink/ws/list-example.json diff --git a/sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/projecttag/ws/search-example.json b/sonar-server/src/main/resources/org/sonar/server/projecttag/ws/search-example.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/projecttag/ws/search-example.json rename to sonar-server/src/main/resources/org/sonar/server/projecttag/ws/search-example.json diff --git a/sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/property/ws/index-example.json b/sonar-server/src/main/resources/org/sonar/server/property/ws/index-example.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/property/ws/index-example.json rename to sonar-server/src/main/resources/org/sonar/server/property/ws/index-example.json diff --git a/sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/qualitygate/ws/app-example.json b/sonar-server/src/main/resources/org/sonar/server/qualitygate/ws/app-example.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/qualitygate/ws/app-example.json rename to sonar-server/src/main/resources/org/sonar/server/qualitygate/ws/app-example.json diff --git a/sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/qualitygate/ws/example-list.json b/sonar-server/src/main/resources/org/sonar/server/qualitygate/ws/example-list.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/qualitygate/ws/example-list.json rename to sonar-server/src/main/resources/org/sonar/server/qualitygate/ws/example-list.json diff --git a/sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/qualitygate/ws/example-search.json b/sonar-server/src/main/resources/org/sonar/server/qualitygate/ws/example-search.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/qualitygate/ws/example-search.json rename to sonar-server/src/main/resources/org/sonar/server/qualitygate/ws/example-search.json diff --git a/sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/qualitygate/ws/example-show.json b/sonar-server/src/main/resources/org/sonar/server/qualitygate/ws/example-show.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/qualitygate/ws/example-show.json rename to sonar-server/src/main/resources/org/sonar/server/qualitygate/ws/example-show.json diff --git a/sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/qualitygate/ws/get_by_project-example.json b/sonar-server/src/main/resources/org/sonar/server/qualitygate/ws/get_by_project-example.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/qualitygate/ws/get_by_project-example.json rename to sonar-server/src/main/resources/org/sonar/server/qualitygate/ws/get_by_project-example.json diff --git a/sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/qualitygate/ws/project_status-example.json b/sonar-server/src/main/resources/org/sonar/server/qualitygate/ws/project_status-example.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/qualitygate/ws/project_status-example.json rename to sonar-server/src/main/resources/org/sonar/server/qualitygate/ws/project_status-example.json diff --git a/sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/qualityprofile/ws/backup-example.xml b/sonar-server/src/main/resources/org/sonar/server/qualityprofile/ws/backup-example.xml similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/qualityprofile/ws/backup-example.xml rename to sonar-server/src/main/resources/org/sonar/server/qualityprofile/ws/backup-example.xml diff --git a/sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/qualityprofile/ws/changelog-example.json b/sonar-server/src/main/resources/org/sonar/server/qualityprofile/ws/changelog-example.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/qualityprofile/ws/changelog-example.json rename to sonar-server/src/main/resources/org/sonar/server/qualityprofile/ws/changelog-example.json diff --git a/sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/qualityprofile/ws/compare-example.json b/sonar-server/src/main/resources/org/sonar/server/qualityprofile/ws/compare-example.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/qualityprofile/ws/compare-example.json rename to sonar-server/src/main/resources/org/sonar/server/qualityprofile/ws/compare-example.json diff --git a/sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/qualityprofile/ws/create-example.json b/sonar-server/src/main/resources/org/sonar/server/qualityprofile/ws/create-example.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/qualityprofile/ws/create-example.json rename to sonar-server/src/main/resources/org/sonar/server/qualityprofile/ws/create-example.json diff --git a/sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/qualityprofile/ws/export-example.xml b/sonar-server/src/main/resources/org/sonar/server/qualityprofile/ws/export-example.xml similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/qualityprofile/ws/export-example.xml rename to sonar-server/src/main/resources/org/sonar/server/qualityprofile/ws/export-example.xml diff --git a/sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/qualityprofile/ws/exporters-example.json b/sonar-server/src/main/resources/org/sonar/server/qualityprofile/ws/exporters-example.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/qualityprofile/ws/exporters-example.json rename to sonar-server/src/main/resources/org/sonar/server/qualityprofile/ws/exporters-example.json diff --git a/sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/qualityprofile/ws/importers-example.json b/sonar-server/src/main/resources/org/sonar/server/qualityprofile/ws/importers-example.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/qualityprofile/ws/importers-example.json rename to sonar-server/src/main/resources/org/sonar/server/qualityprofile/ws/importers-example.json diff --git a/sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/qualityprofile/ws/inheritance-example.json b/sonar-server/src/main/resources/org/sonar/server/qualityprofile/ws/inheritance-example.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/qualityprofile/ws/inheritance-example.json rename to sonar-server/src/main/resources/org/sonar/server/qualityprofile/ws/inheritance-example.json diff --git a/sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/qualityprofile/ws/projects-example.json b/sonar-server/src/main/resources/org/sonar/server/qualityprofile/ws/projects-example.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/qualityprofile/ws/projects-example.json rename to sonar-server/src/main/resources/org/sonar/server/qualityprofile/ws/projects-example.json diff --git a/sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/qualityprofile/ws/search-example.json b/sonar-server/src/main/resources/org/sonar/server/qualityprofile/ws/search-example.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/qualityprofile/ws/search-example.json rename to sonar-server/src/main/resources/org/sonar/server/qualityprofile/ws/search-example.json diff --git a/sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/qualityprofile/ws/show-example.json b/sonar-server/src/main/resources/org/sonar/server/qualityprofile/ws/show-example.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/qualityprofile/ws/show-example.json rename to sonar-server/src/main/resources/org/sonar/server/qualityprofile/ws/show-example.json diff --git a/sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/root/ws/search-example.json b/sonar-server/src/main/resources/org/sonar/server/root/ws/search-example.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/root/ws/search-example.json rename to sonar-server/src/main/resources/org/sonar/server/root/ws/search-example.json diff --git a/sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/rule/ws/app-example.json b/sonar-server/src/main/resources/org/sonar/server/rule/ws/app-example.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/rule/ws/app-example.json rename to sonar-server/src/main/resources/org/sonar/server/rule/ws/app-example.json diff --git a/sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/rule/ws/example-repositories.json b/sonar-server/src/main/resources/org/sonar/server/rule/ws/example-repositories.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/rule/ws/example-repositories.json rename to sonar-server/src/main/resources/org/sonar/server/rule/ws/example-repositories.json diff --git a/sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/rule/ws/example-show.json b/sonar-server/src/main/resources/org/sonar/server/rule/ws/example-show.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/rule/ws/example-show.json rename to sonar-server/src/main/resources/org/sonar/server/rule/ws/example-show.json diff --git a/sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/rule/ws/example-tags.json b/sonar-server/src/main/resources/org/sonar/server/rule/ws/example-tags.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/rule/ws/example-tags.json rename to sonar-server/src/main/resources/org/sonar/server/rule/ws/example-tags.json diff --git a/sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/rule/ws/list-example.txt b/sonar-server/src/main/resources/org/sonar/server/rule/ws/list-example.txt similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/rule/ws/list-example.txt rename to sonar-server/src/main/resources/org/sonar/server/rule/ws/list-example.txt diff --git a/sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/rule/ws/search-example.json b/sonar-server/src/main/resources/org/sonar/server/rule/ws/search-example.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/rule/ws/search-example.json rename to sonar-server/src/main/resources/org/sonar/server/rule/ws/search-example.json diff --git a/sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/serverid/ws/generate-example.json b/sonar-server/src/main/resources/org/sonar/server/serverid/ws/generate-example.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/serverid/ws/generate-example.json rename to sonar-server/src/main/resources/org/sonar/server/serverid/ws/generate-example.json diff --git a/sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/serverid/ws/show-example.json b/sonar-server/src/main/resources/org/sonar/server/serverid/ws/show-example.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/serverid/ws/show-example.json rename to sonar-server/src/main/resources/org/sonar/server/serverid/ws/show-example.json diff --git a/sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/setting/ws/check_secret_key-example.json b/sonar-server/src/main/resources/org/sonar/server/setting/ws/check_secret_key-example.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/setting/ws/check_secret_key-example.json rename to sonar-server/src/main/resources/org/sonar/server/setting/ws/check_secret_key-example.json diff --git a/sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/setting/ws/encrypt-example.json b/sonar-server/src/main/resources/org/sonar/server/setting/ws/encrypt-example.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/setting/ws/encrypt-example.json rename to sonar-server/src/main/resources/org/sonar/server/setting/ws/encrypt-example.json diff --git a/sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/setting/ws/generate_secret_key-example.json b/sonar-server/src/main/resources/org/sonar/server/setting/ws/generate_secret_key-example.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/setting/ws/generate_secret_key-example.json rename to sonar-server/src/main/resources/org/sonar/server/setting/ws/generate_secret_key-example.json diff --git a/sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/setting/ws/list_definitions-example.json b/sonar-server/src/main/resources/org/sonar/server/setting/ws/list_definitions-example.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/setting/ws/list_definitions-example.json rename to sonar-server/src/main/resources/org/sonar/server/setting/ws/list_definitions-example.json diff --git a/sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/setting/ws/values-example.json b/sonar-server/src/main/resources/org/sonar/server/setting/ws/values-example.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/setting/ws/values-example.json rename to sonar-server/src/main/resources/org/sonar/server/setting/ws/values-example.json diff --git a/sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/source/ws/example-hash.txt b/sonar-server/src/main/resources/org/sonar/server/source/ws/example-hash.txt similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/source/ws/example-hash.txt rename to sonar-server/src/main/resources/org/sonar/server/source/ws/example-hash.txt diff --git a/sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/source/ws/example-index.json b/sonar-server/src/main/resources/org/sonar/server/source/ws/example-index.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/source/ws/example-index.json rename to sonar-server/src/main/resources/org/sonar/server/source/ws/example-index.json diff --git a/sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/source/ws/example-lines.json b/sonar-server/src/main/resources/org/sonar/server/source/ws/example-lines.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/source/ws/example-lines.json rename to sonar-server/src/main/resources/org/sonar/server/source/ws/example-lines.json diff --git a/sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/source/ws/example-raw.txt b/sonar-server/src/main/resources/org/sonar/server/source/ws/example-raw.txt similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/source/ws/example-raw.txt rename to sonar-server/src/main/resources/org/sonar/server/source/ws/example-raw.txt diff --git a/sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/source/ws/example-scm.json b/sonar-server/src/main/resources/org/sonar/server/source/ws/example-scm.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/source/ws/example-scm.json rename to sonar-server/src/main/resources/org/sonar/server/source/ws/example-scm.json diff --git a/sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/source/ws/example-show.json b/sonar-server/src/main/resources/org/sonar/server/source/ws/example-show.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/source/ws/example-show.json rename to sonar-server/src/main/resources/org/sonar/server/source/ws/example-show.json diff --git a/sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/test/ws/tests-example-covered-files.json b/sonar-server/src/main/resources/org/sonar/server/test/ws/tests-example-covered-files.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/test/ws/tests-example-covered-files.json rename to sonar-server/src/main/resources/org/sonar/server/test/ws/tests-example-covered-files.json diff --git a/sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/test/ws/tests-example-list.json b/sonar-server/src/main/resources/org/sonar/server/test/ws/tests-example-list.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/test/ws/tests-example-list.json rename to sonar-server/src/main/resources/org/sonar/server/test/ws/tests-example-list.json diff --git a/sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/ui/ws/component-example.json b/sonar-server/src/main/resources/org/sonar/server/ui/ws/component-example.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/ui/ws/component-example.json rename to sonar-server/src/main/resources/org/sonar/server/ui/ws/component-example.json diff --git a/sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/ui/ws/global-example.json b/sonar-server/src/main/resources/org/sonar/server/ui/ws/global-example.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/ui/ws/global-example.json rename to sonar-server/src/main/resources/org/sonar/server/ui/ws/global-example.json diff --git a/sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/ui/ws/organization-example.json b/sonar-server/src/main/resources/org/sonar/server/ui/ws/organization-example.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/ui/ws/organization-example.json rename to sonar-server/src/main/resources/org/sonar/server/ui/ws/organization-example.json diff --git a/sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/ui/ws/settings-example.json b/sonar-server/src/main/resources/org/sonar/server/ui/ws/settings-example.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/ui/ws/settings-example.json rename to sonar-server/src/main/resources/org/sonar/server/ui/ws/settings-example.json diff --git a/sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/updatecenter/ws/installed_plugins-example.json b/sonar-server/src/main/resources/org/sonar/server/updatecenter/ws/installed_plugins-example.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/updatecenter/ws/installed_plugins-example.json rename to sonar-server/src/main/resources/org/sonar/server/updatecenter/ws/installed_plugins-example.json diff --git a/sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/user/ws/current-example.json b/sonar-server/src/main/resources/org/sonar/server/user/ws/current-example.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/user/ws/current-example.json rename to sonar-server/src/main/resources/org/sonar/server/user/ws/current-example.json diff --git a/sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/user/ws/deactivate-example.json b/sonar-server/src/main/resources/org/sonar/server/user/ws/deactivate-example.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/user/ws/deactivate-example.json rename to sonar-server/src/main/resources/org/sonar/server/user/ws/deactivate-example.json diff --git a/sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/user/ws/groups-example.json b/sonar-server/src/main/resources/org/sonar/server/user/ws/groups-example.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/user/ws/groups-example.json rename to sonar-server/src/main/resources/org/sonar/server/user/ws/groups-example.json diff --git a/sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/user/ws/identity_providers-example.json b/sonar-server/src/main/resources/org/sonar/server/user/ws/identity_providers-example.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/user/ws/identity_providers-example.json rename to sonar-server/src/main/resources/org/sonar/server/user/ws/identity_providers-example.json diff --git a/sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/user/ws/search-example.json b/sonar-server/src/main/resources/org/sonar/server/user/ws/search-example.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/user/ws/search-example.json rename to sonar-server/src/main/resources/org/sonar/server/user/ws/search-example.json diff --git a/sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/user/ws/update-example.json b/sonar-server/src/main/resources/org/sonar/server/user/ws/update-example.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/user/ws/update-example.json rename to sonar-server/src/main/resources/org/sonar/server/user/ws/update-example.json diff --git a/sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/usergroups/ws/create-example.json b/sonar-server/src/main/resources/org/sonar/server/usergroups/ws/create-example.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/usergroups/ws/create-example.json rename to sonar-server/src/main/resources/org/sonar/server/usergroups/ws/create-example.json diff --git a/sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/usergroups/ws/search-example.json b/sonar-server/src/main/resources/org/sonar/server/usergroups/ws/search-example.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/usergroups/ws/search-example.json rename to sonar-server/src/main/resources/org/sonar/server/usergroups/ws/search-example.json diff --git a/sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/usergroups/ws/update-example.json b/sonar-server/src/main/resources/org/sonar/server/usergroups/ws/update-example.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/usergroups/ws/update-example.json rename to sonar-server/src/main/resources/org/sonar/server/usergroups/ws/update-example.json diff --git a/sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/usergroups/ws/users-example.json b/sonar-server/src/main/resources/org/sonar/server/usergroups/ws/users-example.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/usergroups/ws/users-example.json rename to sonar-server/src/main/resources/org/sonar/server/usergroups/ws/users-example.json diff --git a/sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/usertoken/ws/generate-example.json b/sonar-server/src/main/resources/org/sonar/server/usertoken/ws/generate-example.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/usertoken/ws/generate-example.json rename to sonar-server/src/main/resources/org/sonar/server/usertoken/ws/generate-example.json diff --git a/sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/usertoken/ws/search-example.json b/sonar-server/src/main/resources/org/sonar/server/usertoken/ws/search-example.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/usertoken/ws/search-example.json rename to sonar-server/src/main/resources/org/sonar/server/usertoken/ws/search-example.json diff --git a/sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/webhook/ws/example-deliveries.json b/sonar-server/src/main/resources/org/sonar/server/webhook/ws/example-deliveries.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/webhook/ws/example-deliveries.json rename to sonar-server/src/main/resources/org/sonar/server/webhook/ws/example-deliveries.json diff --git a/sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/webhook/ws/example-delivery.json b/sonar-server/src/main/resources/org/sonar/server/webhook/ws/example-delivery.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/webhook/ws/example-delivery.json rename to sonar-server/src/main/resources/org/sonar/server/webhook/ws/example-delivery.json diff --git a/sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/ws/removed-ws-example.json b/sonar-server/src/main/resources/org/sonar/server/ws/removed-ws-example.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/ws/removed-ws-example.json rename to sonar-server/src/main/resources/org/sonar/server/ws/removed-ws-example.json diff --git a/sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/ws/ws/list-example.json b/sonar-server/src/main/resources/org/sonar/server/ws/ws/list-example.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/ws/ws/list-example.json rename to sonar-server/src/main/resources/org/sonar/server/ws/ws/list-example.json diff --git a/sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/ws/ws/response_example-example.json b/sonar-server/src/main/resources/org/sonar/server/ws/ws/response_example-example.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/main/resources/org/sonar/server/ws/ws/response_example-example.json rename to sonar-server/src/main/resources/org/sonar/server/ws/ws/response_example-example.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/ce/http/CeHttpClientTest.java b/sonar-server/src/test/java/org/sonar/ce/http/CeHttpClientTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/ce/http/CeHttpClientTest.java rename to sonar-server/src/test/java/org/sonar/ce/http/CeHttpClientTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/ce/log/CeLoggingTest.java b/sonar-server/src/test/java/org/sonar/ce/log/CeLoggingTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/ce/log/CeLoggingTest.java rename to sonar-server/src/test/java/org/sonar/ce/log/CeLoggingTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/ce/log/CeProcessLoggingTest.java b/sonar-server/src/test/java/org/sonar/ce/log/CeProcessLoggingTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/ce/log/CeProcessLoggingTest.java rename to sonar-server/src/test/java/org/sonar/ce/log/CeProcessLoggingTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/ce/organization/DefaultOrganizationLoaderTest.java b/sonar-server/src/test/java/org/sonar/ce/organization/DefaultOrganizationLoaderTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/ce/organization/DefaultOrganizationLoaderTest.java rename to sonar-server/src/test/java/org/sonar/ce/organization/DefaultOrganizationLoaderTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/ce/queue/CeQueueImplTest.java b/sonar-server/src/test/java/org/sonar/ce/queue/CeQueueImplTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/ce/queue/CeQueueImplTest.java rename to sonar-server/src/test/java/org/sonar/ce/queue/CeQueueImplTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/ce/queue/CeTaskTest.java b/sonar-server/src/test/java/org/sonar/ce/queue/CeTaskTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/ce/queue/CeTaskTest.java rename to sonar-server/src/test/java/org/sonar/ce/queue/CeTaskTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/ce/settings/SettingsLoaderTest.java b/sonar-server/src/test/java/org/sonar/ce/settings/SettingsLoaderTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/ce/settings/SettingsLoaderTest.java rename to sonar-server/src/test/java/org/sonar/ce/settings/SettingsLoaderTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/ce/taskprocessor/ReportTaskProcessorDeclarationTest.java b/sonar-server/src/test/java/org/sonar/ce/taskprocessor/ReportTaskProcessorDeclarationTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/ce/taskprocessor/ReportTaskProcessorDeclarationTest.java rename to sonar-server/src/test/java/org/sonar/ce/taskprocessor/ReportTaskProcessorDeclarationTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/app/EmbeddedTomcatTest.java b/sonar-server/src/test/java/org/sonar/server/app/EmbeddedTomcatTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/app/EmbeddedTomcatTest.java rename to sonar-server/src/test/java/org/sonar/server/app/EmbeddedTomcatTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/app/NullJarScannerTest.java b/sonar-server/src/test/java/org/sonar/server/app/NullJarScannerTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/app/NullJarScannerTest.java rename to sonar-server/src/test/java/org/sonar/server/app/NullJarScannerTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/app/ProcessCommandWrapperImplTest.java b/sonar-server/src/test/java/org/sonar/server/app/ProcessCommandWrapperImplTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/app/ProcessCommandWrapperImplTest.java rename to sonar-server/src/test/java/org/sonar/server/app/ProcessCommandWrapperImplTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/app/ProgrammaticLogbackValveTest.java b/sonar-server/src/test/java/org/sonar/server/app/ProgrammaticLogbackValveTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/app/ProgrammaticLogbackValveTest.java rename to sonar-server/src/test/java/org/sonar/server/app/ProgrammaticLogbackValveTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/app/StartupLogsTest.java b/sonar-server/src/test/java/org/sonar/server/app/StartupLogsTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/app/StartupLogsTest.java rename to sonar-server/src/test/java/org/sonar/server/app/StartupLogsTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/app/TomcatAccessLogTest.java b/sonar-server/src/test/java/org/sonar/server/app/TomcatAccessLogTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/app/TomcatAccessLogTest.java rename to sonar-server/src/test/java/org/sonar/server/app/TomcatAccessLogTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/app/TomcatConnectorsTest.java b/sonar-server/src/test/java/org/sonar/server/app/TomcatConnectorsTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/app/TomcatConnectorsTest.java rename to sonar-server/src/test/java/org/sonar/server/app/TomcatConnectorsTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/app/TomcatContextsTest.java b/sonar-server/src/test/java/org/sonar/server/app/TomcatContextsTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/app/TomcatContextsTest.java rename to sonar-server/src/test/java/org/sonar/server/app/TomcatContextsTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/app/WebServerProcessLoggingTest.java b/sonar-server/src/test/java/org/sonar/server/app/WebServerProcessLoggingTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/app/WebServerProcessLoggingTest.java rename to sonar-server/src/test/java/org/sonar/server/app/WebServerProcessLoggingTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/authentication/AuthenticationModuleTest.java b/sonar-server/src/test/java/org/sonar/server/authentication/AuthenticationModuleTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/authentication/AuthenticationModuleTest.java rename to sonar-server/src/test/java/org/sonar/server/authentication/AuthenticationModuleTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/authentication/BaseContextFactoryTest.java b/sonar-server/src/test/java/org/sonar/server/authentication/BaseContextFactoryTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/authentication/BaseContextFactoryTest.java rename to sonar-server/src/test/java/org/sonar/server/authentication/BaseContextFactoryTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/authentication/BasicAuthenticatorTest.java b/sonar-server/src/test/java/org/sonar/server/authentication/BasicAuthenticatorTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/authentication/BasicAuthenticatorTest.java rename to sonar-server/src/test/java/org/sonar/server/authentication/BasicAuthenticatorTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/authentication/CookiesTest.java b/sonar-server/src/test/java/org/sonar/server/authentication/CookiesTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/authentication/CookiesTest.java rename to sonar-server/src/test/java/org/sonar/server/authentication/CookiesTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/authentication/CredentialsAuthenticatorTest.java b/sonar-server/src/test/java/org/sonar/server/authentication/CredentialsAuthenticatorTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/authentication/CredentialsAuthenticatorTest.java rename to sonar-server/src/test/java/org/sonar/server/authentication/CredentialsAuthenticatorTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/authentication/FakeBasicIdentityProvider.java b/sonar-server/src/test/java/org/sonar/server/authentication/FakeBasicIdentityProvider.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/authentication/FakeBasicIdentityProvider.java rename to sonar-server/src/test/java/org/sonar/server/authentication/FakeBasicIdentityProvider.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/authentication/FakeOAuth2IdentityProvider.java b/sonar-server/src/test/java/org/sonar/server/authentication/FakeOAuth2IdentityProvider.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/authentication/FakeOAuth2IdentityProvider.java rename to sonar-server/src/test/java/org/sonar/server/authentication/FakeOAuth2IdentityProvider.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/authentication/IdentityProviderRepositoryRule.java b/sonar-server/src/test/java/org/sonar/server/authentication/IdentityProviderRepositoryRule.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/authentication/IdentityProviderRepositoryRule.java rename to sonar-server/src/test/java/org/sonar/server/authentication/IdentityProviderRepositoryRule.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/authentication/IdentityProviderRepositoryTest.java b/sonar-server/src/test/java/org/sonar/server/authentication/IdentityProviderRepositoryTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/authentication/IdentityProviderRepositoryTest.java rename to sonar-server/src/test/java/org/sonar/server/authentication/IdentityProviderRepositoryTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/authentication/InitFilterTest.java b/sonar-server/src/test/java/org/sonar/server/authentication/InitFilterTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/authentication/InitFilterTest.java rename to sonar-server/src/test/java/org/sonar/server/authentication/InitFilterTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/authentication/JwtCsrfVerifierTest.java b/sonar-server/src/test/java/org/sonar/server/authentication/JwtCsrfVerifierTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/authentication/JwtCsrfVerifierTest.java rename to sonar-server/src/test/java/org/sonar/server/authentication/JwtCsrfVerifierTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/authentication/JwtHttpHandlerTest.java b/sonar-server/src/test/java/org/sonar/server/authentication/JwtHttpHandlerTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/authentication/JwtHttpHandlerTest.java rename to sonar-server/src/test/java/org/sonar/server/authentication/JwtHttpHandlerTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/authentication/JwtSerializerTest.java b/sonar-server/src/test/java/org/sonar/server/authentication/JwtSerializerTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/authentication/JwtSerializerTest.java rename to sonar-server/src/test/java/org/sonar/server/authentication/JwtSerializerTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/authentication/OAuth2CallbackFilterTest.java b/sonar-server/src/test/java/org/sonar/server/authentication/OAuth2CallbackFilterTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/authentication/OAuth2CallbackFilterTest.java rename to sonar-server/src/test/java/org/sonar/server/authentication/OAuth2CallbackFilterTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/authentication/OAuth2ContextFactoryTest.java b/sonar-server/src/test/java/org/sonar/server/authentication/OAuth2ContextFactoryTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/authentication/OAuth2ContextFactoryTest.java rename to sonar-server/src/test/java/org/sonar/server/authentication/OAuth2ContextFactoryTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/authentication/OAuthCsrfVerifierTest.java b/sonar-server/src/test/java/org/sonar/server/authentication/OAuthCsrfVerifierTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/authentication/OAuthCsrfVerifierTest.java rename to sonar-server/src/test/java/org/sonar/server/authentication/OAuthCsrfVerifierTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/authentication/RealmAuthenticatorTest.java b/sonar-server/src/test/java/org/sonar/server/authentication/RealmAuthenticatorTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/authentication/RealmAuthenticatorTest.java rename to sonar-server/src/test/java/org/sonar/server/authentication/RealmAuthenticatorTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/authentication/SsoAuthenticatorTest.java b/sonar-server/src/test/java/org/sonar/server/authentication/SsoAuthenticatorTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/authentication/SsoAuthenticatorTest.java rename to sonar-server/src/test/java/org/sonar/server/authentication/SsoAuthenticatorTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/authentication/TestIdentityProvider.java b/sonar-server/src/test/java/org/sonar/server/authentication/TestIdentityProvider.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/authentication/TestIdentityProvider.java rename to sonar-server/src/test/java/org/sonar/server/authentication/TestIdentityProvider.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/authentication/UserIdentityAuthenticatorTest.java b/sonar-server/src/test/java/org/sonar/server/authentication/UserIdentityAuthenticatorTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/authentication/UserIdentityAuthenticatorTest.java rename to sonar-server/src/test/java/org/sonar/server/authentication/UserIdentityAuthenticatorTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/authentication/UserSessionInitializerTest.java b/sonar-server/src/test/java/org/sonar/server/authentication/UserSessionInitializerTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/authentication/UserSessionInitializerTest.java rename to sonar-server/src/test/java/org/sonar/server/authentication/UserSessionInitializerTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/authentication/event/AuthenticationEventImplTest.java b/sonar-server/src/test/java/org/sonar/server/authentication/event/AuthenticationEventImplTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/authentication/event/AuthenticationEventImplTest.java rename to sonar-server/src/test/java/org/sonar/server/authentication/event/AuthenticationEventImplTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/authentication/event/AuthenticationEventSourceTest.java b/sonar-server/src/test/java/org/sonar/server/authentication/event/AuthenticationEventSourceTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/authentication/event/AuthenticationEventSourceTest.java rename to sonar-server/src/test/java/org/sonar/server/authentication/event/AuthenticationEventSourceTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/authentication/event/AuthenticationExceptionMatcher.java b/sonar-server/src/test/java/org/sonar/server/authentication/event/AuthenticationExceptionMatcher.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/authentication/event/AuthenticationExceptionMatcher.java rename to sonar-server/src/test/java/org/sonar/server/authentication/event/AuthenticationExceptionMatcher.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/authentication/event/AuthenticationExceptionTest.java b/sonar-server/src/test/java/org/sonar/server/authentication/event/AuthenticationExceptionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/authentication/event/AuthenticationExceptionTest.java rename to sonar-server/src/test/java/org/sonar/server/authentication/event/AuthenticationExceptionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/authentication/ws/AuthenticationWsTest.java b/sonar-server/src/test/java/org/sonar/server/authentication/ws/AuthenticationWsTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/authentication/ws/AuthenticationWsTest.java rename to sonar-server/src/test/java/org/sonar/server/authentication/ws/AuthenticationWsTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/authentication/ws/LoginActionTest.java b/sonar-server/src/test/java/org/sonar/server/authentication/ws/LoginActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/authentication/ws/LoginActionTest.java rename to sonar-server/src/test/java/org/sonar/server/authentication/ws/LoginActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/authentication/ws/LogoutActionTest.java b/sonar-server/src/test/java/org/sonar/server/authentication/ws/LogoutActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/authentication/ws/LogoutActionTest.java rename to sonar-server/src/test/java/org/sonar/server/authentication/ws/LogoutActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/authentication/ws/ValidateActionTest.java b/sonar-server/src/test/java/org/sonar/server/authentication/ws/ValidateActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/authentication/ws/ValidateActionTest.java rename to sonar-server/src/test/java/org/sonar/server/authentication/ws/ValidateActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/batch/BatchIndexTest.java b/sonar-server/src/test/java/org/sonar/server/batch/BatchIndexTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/batch/BatchIndexTest.java rename to sonar-server/src/test/java/org/sonar/server/batch/BatchIndexTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/batch/BatchWsModuleTest.java b/sonar-server/src/test/java/org/sonar/server/batch/BatchWsModuleTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/batch/BatchWsModuleTest.java rename to sonar-server/src/test/java/org/sonar/server/batch/BatchWsModuleTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/batch/FileActionTest.java b/sonar-server/src/test/java/org/sonar/server/batch/FileActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/batch/FileActionTest.java rename to sonar-server/src/test/java/org/sonar/server/batch/FileActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/batch/IndexActionTest.java b/sonar-server/src/test/java/org/sonar/server/batch/IndexActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/batch/IndexActionTest.java rename to sonar-server/src/test/java/org/sonar/server/batch/IndexActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/batch/IssuesActionTest.java b/sonar-server/src/test/java/org/sonar/server/batch/IssuesActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/batch/IssuesActionTest.java rename to sonar-server/src/test/java/org/sonar/server/batch/IssuesActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/batch/ProjectActionTest.java b/sonar-server/src/test/java/org/sonar/server/batch/ProjectActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/batch/ProjectActionTest.java rename to sonar-server/src/test/java/org/sonar/server/batch/ProjectActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/batch/ProjectDataLoaderMediumTest.java b/sonar-server/src/test/java/org/sonar/server/batch/ProjectDataLoaderMediumTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/batch/ProjectDataLoaderMediumTest.java rename to sonar-server/src/test/java/org/sonar/server/batch/ProjectDataLoaderMediumTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/batch/ProjectDataLoaderTest.java b/sonar-server/src/test/java/org/sonar/server/batch/ProjectDataLoaderTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/batch/ProjectDataLoaderTest.java rename to sonar-server/src/test/java/org/sonar/server/batch/ProjectDataLoaderTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/ce/ws/ActivityActionTest.java b/sonar-server/src/test/java/org/sonar/server/ce/ws/ActivityActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/ce/ws/ActivityActionTest.java rename to sonar-server/src/test/java/org/sonar/server/ce/ws/ActivityActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/ce/ws/ActivityStatusActionTest.java b/sonar-server/src/test/java/org/sonar/server/ce/ws/ActivityStatusActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/ce/ws/ActivityStatusActionTest.java rename to sonar-server/src/test/java/org/sonar/server/ce/ws/ActivityStatusActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/ce/ws/CancelActionTest.java b/sonar-server/src/test/java/org/sonar/server/ce/ws/CancelActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/ce/ws/CancelActionTest.java rename to sonar-server/src/test/java/org/sonar/server/ce/ws/CancelActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/ce/ws/CancelAllActionTest.java b/sonar-server/src/test/java/org/sonar/server/ce/ws/CancelAllActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/ce/ws/CancelAllActionTest.java rename to sonar-server/src/test/java/org/sonar/server/ce/ws/CancelAllActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/ce/ws/CeWsModuleTest.java b/sonar-server/src/test/java/org/sonar/server/ce/ws/CeWsModuleTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/ce/ws/CeWsModuleTest.java rename to sonar-server/src/test/java/org/sonar/server/ce/ws/CeWsModuleTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/ce/ws/CeWsTest.java b/sonar-server/src/test/java/org/sonar/server/ce/ws/CeWsTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/ce/ws/CeWsTest.java rename to sonar-server/src/test/java/org/sonar/server/ce/ws/CeWsTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/ce/ws/ComponentActionTest.java b/sonar-server/src/test/java/org/sonar/server/ce/ws/ComponentActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/ce/ws/ComponentActionTest.java rename to sonar-server/src/test/java/org/sonar/server/ce/ws/ComponentActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/ce/ws/SubmitActionTest.java b/sonar-server/src/test/java/org/sonar/server/ce/ws/SubmitActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/ce/ws/SubmitActionTest.java rename to sonar-server/src/test/java/org/sonar/server/ce/ws/SubmitActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/ce/ws/TaskActionTest.java b/sonar-server/src/test/java/org/sonar/server/ce/ws/TaskActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/ce/ws/TaskActionTest.java rename to sonar-server/src/test/java/org/sonar/server/ce/ws/TaskActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/ce/ws/TaskFormatterTest.java b/sonar-server/src/test/java/org/sonar/server/ce/ws/TaskFormatterTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/ce/ws/TaskFormatterTest.java rename to sonar-server/src/test/java/org/sonar/server/ce/ws/TaskFormatterTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/ce/ws/TaskTypesActionTest.java b/sonar-server/src/test/java/org/sonar/server/ce/ws/TaskTypesActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/ce/ws/TaskTypesActionTest.java rename to sonar-server/src/test/java/org/sonar/server/ce/ws/TaskTypesActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/component/ComponentCleanerServiceTest.java b/sonar-server/src/test/java/org/sonar/server/component/ComponentCleanerServiceTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/component/ComponentCleanerServiceTest.java rename to sonar-server/src/test/java/org/sonar/server/component/ComponentCleanerServiceTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/component/ComponentFinderTest.java b/sonar-server/src/test/java/org/sonar/server/component/ComponentFinderTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/component/ComponentFinderTest.java rename to sonar-server/src/test/java/org/sonar/server/component/ComponentFinderTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/component/ComponentServiceTest.java b/sonar-server/src/test/java/org/sonar/server/component/ComponentServiceTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/component/ComponentServiceTest.java rename to sonar-server/src/test/java/org/sonar/server/component/ComponentServiceTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/component/ComponentServiceUpdateKeyTest.java b/sonar-server/src/test/java/org/sonar/server/component/ComponentServiceUpdateKeyTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/component/ComponentServiceUpdateKeyTest.java rename to sonar-server/src/test/java/org/sonar/server/component/ComponentServiceUpdateKeyTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/component/ComponentUpdaterTest.java b/sonar-server/src/test/java/org/sonar/server/component/ComponentUpdaterTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/component/ComponentUpdaterTest.java rename to sonar-server/src/test/java/org/sonar/server/component/ComponentUpdaterTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/component/NewComponentTest.java b/sonar-server/src/test/java/org/sonar/server/component/NewComponentTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/component/NewComponentTest.java rename to sonar-server/src/test/java/org/sonar/server/component/NewComponentTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/component/TestComponentFinder.java b/sonar-server/src/test/java/org/sonar/server/component/TestComponentFinder.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/component/TestComponentFinder.java rename to sonar-server/src/test/java/org/sonar/server/component/TestComponentFinder.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/component/index/ComponentIndexCombinationTest.java b/sonar-server/src/test/java/org/sonar/server/component/index/ComponentIndexCombinationTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/component/index/ComponentIndexCombinationTest.java rename to sonar-server/src/test/java/org/sonar/server/component/index/ComponentIndexCombinationTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/component/index/ComponentIndexFeatureExactTest.java b/sonar-server/src/test/java/org/sonar/server/component/index/ComponentIndexFeatureExactTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/component/index/ComponentIndexFeatureExactTest.java rename to sonar-server/src/test/java/org/sonar/server/component/index/ComponentIndexFeatureExactTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/component/index/ComponentIndexFeatureFavoriteTest.java b/sonar-server/src/test/java/org/sonar/server/component/index/ComponentIndexFeatureFavoriteTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/component/index/ComponentIndexFeatureFavoriteTest.java rename to sonar-server/src/test/java/org/sonar/server/component/index/ComponentIndexFeatureFavoriteTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/component/index/ComponentIndexFeatureKeyTest.java b/sonar-server/src/test/java/org/sonar/server/component/index/ComponentIndexFeatureKeyTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/component/index/ComponentIndexFeatureKeyTest.java rename to sonar-server/src/test/java/org/sonar/server/component/index/ComponentIndexFeatureKeyTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/component/index/ComponentIndexFeaturePartialTest.java b/sonar-server/src/test/java/org/sonar/server/component/index/ComponentIndexFeaturePartialTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/component/index/ComponentIndexFeaturePartialTest.java rename to sonar-server/src/test/java/org/sonar/server/component/index/ComponentIndexFeaturePartialTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/component/index/ComponentIndexFeaturePrefixTest.java b/sonar-server/src/test/java/org/sonar/server/component/index/ComponentIndexFeaturePrefixTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/component/index/ComponentIndexFeaturePrefixTest.java rename to sonar-server/src/test/java/org/sonar/server/component/index/ComponentIndexFeaturePrefixTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/component/index/ComponentIndexFeatureRecentlyBrowsedTest.java b/sonar-server/src/test/java/org/sonar/server/component/index/ComponentIndexFeatureRecentlyBrowsedTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/component/index/ComponentIndexFeatureRecentlyBrowsedTest.java rename to sonar-server/src/test/java/org/sonar/server/component/index/ComponentIndexFeatureRecentlyBrowsedTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/component/index/ComponentIndexHighlightTest.java b/sonar-server/src/test/java/org/sonar/server/component/index/ComponentIndexHighlightTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/component/index/ComponentIndexHighlightTest.java rename to sonar-server/src/test/java/org/sonar/server/component/index/ComponentIndexHighlightTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/component/index/ComponentIndexLoginTest.java b/sonar-server/src/test/java/org/sonar/server/component/index/ComponentIndexLoginTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/component/index/ComponentIndexLoginTest.java rename to sonar-server/src/test/java/org/sonar/server/component/index/ComponentIndexLoginTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/component/index/ComponentIndexMultipleWordsTest.java b/sonar-server/src/test/java/org/sonar/server/component/index/ComponentIndexMultipleWordsTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/component/index/ComponentIndexMultipleWordsTest.java rename to sonar-server/src/test/java/org/sonar/server/component/index/ComponentIndexMultipleWordsTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/component/index/ComponentIndexQueryTest.java b/sonar-server/src/test/java/org/sonar/server/component/index/ComponentIndexQueryTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/component/index/ComponentIndexQueryTest.java rename to sonar-server/src/test/java/org/sonar/server/component/index/ComponentIndexQueryTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/component/index/ComponentIndexScoreTest.java b/sonar-server/src/test/java/org/sonar/server/component/index/ComponentIndexScoreTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/component/index/ComponentIndexScoreTest.java rename to sonar-server/src/test/java/org/sonar/server/component/index/ComponentIndexScoreTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/component/index/ComponentIndexTest.java b/sonar-server/src/test/java/org/sonar/server/component/index/ComponentIndexTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/component/index/ComponentIndexTest.java rename to sonar-server/src/test/java/org/sonar/server/component/index/ComponentIndexTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/component/index/ComponentIndexerTest.java b/sonar-server/src/test/java/org/sonar/server/component/index/ComponentIndexerTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/component/index/ComponentIndexerTest.java rename to sonar-server/src/test/java/org/sonar/server/component/index/ComponentIndexerTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/component/ws/AppActionTest.java b/sonar-server/src/test/java/org/sonar/server/component/ws/AppActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/component/ws/AppActionTest.java rename to sonar-server/src/test/java/org/sonar/server/component/ws/AppActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/component/ws/ComponentDtoToWsComponentTest.java b/sonar-server/src/test/java/org/sonar/server/component/ws/ComponentDtoToWsComponentTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/component/ws/ComponentDtoToWsComponentTest.java rename to sonar-server/src/test/java/org/sonar/server/component/ws/ComponentDtoToWsComponentTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/component/ws/ComponentsWsModuleTest.java b/sonar-server/src/test/java/org/sonar/server/component/ws/ComponentsWsModuleTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/component/ws/ComponentsWsModuleTest.java rename to sonar-server/src/test/java/org/sonar/server/component/ws/ComponentsWsModuleTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/component/ws/ComponentsWsTest.java b/sonar-server/src/test/java/org/sonar/server/component/ws/ComponentsWsTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/component/ws/ComponentsWsTest.java rename to sonar-server/src/test/java/org/sonar/server/component/ws/ComponentsWsTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/component/ws/FilterParserTest.java b/sonar-server/src/test/java/org/sonar/server/component/ws/FilterParserTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/component/ws/FilterParserTest.java rename to sonar-server/src/test/java/org/sonar/server/component/ws/FilterParserTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/component/ws/ProjectMeasuresQueryFactoryTest.java b/sonar-server/src/test/java/org/sonar/server/component/ws/ProjectMeasuresQueryFactoryTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/component/ws/ProjectMeasuresQueryFactoryTest.java rename to sonar-server/src/test/java/org/sonar/server/component/ws/ProjectMeasuresQueryFactoryTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/component/ws/ProjectMeasuresQueryValidatorTest.java b/sonar-server/src/test/java/org/sonar/server/component/ws/ProjectMeasuresQueryValidatorTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/component/ws/ProjectMeasuresQueryValidatorTest.java rename to sonar-server/src/test/java/org/sonar/server/component/ws/ProjectMeasuresQueryValidatorTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/component/ws/ResourcesWsTest.java b/sonar-server/src/test/java/org/sonar/server/component/ws/ResourcesWsTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/component/ws/ResourcesWsTest.java rename to sonar-server/src/test/java/org/sonar/server/component/ws/ResourcesWsTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/component/ws/SearchActionTest.java b/sonar-server/src/test/java/org/sonar/server/component/ws/SearchActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/component/ws/SearchActionTest.java rename to sonar-server/src/test/java/org/sonar/server/component/ws/SearchActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/component/ws/SearchProjectsActionTest.java b/sonar-server/src/test/java/org/sonar/server/component/ws/SearchProjectsActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/component/ws/SearchProjectsActionTest.java rename to sonar-server/src/test/java/org/sonar/server/component/ws/SearchProjectsActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/component/ws/ShowActionTest.java b/sonar-server/src/test/java/org/sonar/server/component/ws/ShowActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/component/ws/ShowActionTest.java rename to sonar-server/src/test/java/org/sonar/server/component/ws/ShowActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/component/ws/SuggestionsActionTest.java b/sonar-server/src/test/java/org/sonar/server/component/ws/SuggestionsActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/component/ws/SuggestionsActionTest.java rename to sonar-server/src/test/java/org/sonar/server/component/ws/SuggestionsActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/component/ws/TreeActionTest.java b/sonar-server/src/test/java/org/sonar/server/component/ws/TreeActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/component/ws/TreeActionTest.java rename to sonar-server/src/test/java/org/sonar/server/component/ws/TreeActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/dbcleaner/IndexPurgeListenerTest.java b/sonar-server/src/test/java/org/sonar/server/computation/dbcleaner/IndexPurgeListenerTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/dbcleaner/IndexPurgeListenerTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/dbcleaner/IndexPurgeListenerTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/dbcleaner/ProjectCleanerTest.java b/sonar-server/src/test/java/org/sonar/server/computation/dbcleaner/ProjectCleanerTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/dbcleaner/ProjectCleanerTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/dbcleaner/ProjectCleanerTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/queue/ReportSubmitterTest.java b/sonar-server/src/test/java/org/sonar/server/computation/queue/ReportSubmitterTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/queue/ReportSubmitterTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/queue/ReportSubmitterTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/ChangeLogLevel.java b/sonar-server/src/test/java/org/sonar/server/computation/task/ChangeLogLevel.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/ChangeLogLevel.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/ChangeLogLevel.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/container/TaskContainerImplTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/container/TaskContainerImplTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/container/TaskContainerImplTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/container/TaskContainerImplTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/analysis/AnalysisImplTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/analysis/AnalysisImplTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/analysis/AnalysisImplTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/analysis/AnalysisImplTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/analysis/AnalysisMetadataHolderImplTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/analysis/AnalysisMetadataHolderImplTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/analysis/AnalysisMetadataHolderImplTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/analysis/AnalysisMetadataHolderImplTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/analysis/AnalysisMetadataHolderRule.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/analysis/AnalysisMetadataHolderRule.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/analysis/AnalysisMetadataHolderRule.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/analysis/AnalysisMetadataHolderRule.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/analysis/MutableAnalysisMetadataHolderRule.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/analysis/MutableAnalysisMetadataHolderRule.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/analysis/MutableAnalysisMetadataHolderRule.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/analysis/MutableAnalysisMetadataHolderRule.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/analysis/OrganizationTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/analysis/OrganizationTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/analysis/OrganizationTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/analysis/OrganizationTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/api/measurecomputer/ComponentImplTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/api/measurecomputer/ComponentImplTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/api/measurecomputer/ComponentImplTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/api/measurecomputer/ComponentImplTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/api/measurecomputer/MeasureComputerContextImplTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/api/measurecomputer/MeasureComputerContextImplTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/api/measurecomputer/MeasureComputerContextImplTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/api/measurecomputer/MeasureComputerContextImplTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/api/measurecomputer/MeasureComputerDefinitionImplTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/api/measurecomputer/MeasureComputerDefinitionImplTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/api/measurecomputer/MeasureComputerDefinitionImplTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/api/measurecomputer/MeasureComputerDefinitionImplTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/api/measurecomputer/MeasureImplTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/api/measurecomputer/MeasureImplTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/api/measurecomputer/MeasureImplTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/api/measurecomputer/MeasureImplTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/api/posttask/CeTaskImplTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/api/posttask/CeTaskImplTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/api/posttask/CeTaskImplTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/api/posttask/CeTaskImplTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/api/posttask/ConditionImplTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/api/posttask/ConditionImplTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/api/posttask/ConditionImplTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/api/posttask/ConditionImplTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/api/posttask/ConditionToConditionTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/api/posttask/ConditionToConditionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/api/posttask/ConditionToConditionTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/api/posttask/ConditionToConditionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/api/posttask/PostProjectAnalysisTasksExecutorTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/api/posttask/PostProjectAnalysisTasksExecutorTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/api/posttask/PostProjectAnalysisTasksExecutorTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/api/posttask/PostProjectAnalysisTasksExecutorTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/api/posttask/ProjectImplTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/api/posttask/ProjectImplTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/api/posttask/ProjectImplTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/api/posttask/ProjectImplTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/api/posttask/QualityGateImplTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/api/posttask/QualityGateImplTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/api/posttask/QualityGateImplTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/api/posttask/QualityGateImplTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/batch/BatchReportDirectoryHolderImplTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/batch/BatchReportDirectoryHolderImplTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/batch/BatchReportDirectoryHolderImplTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/batch/BatchReportDirectoryHolderImplTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/batch/BatchReportReaderImplTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/batch/BatchReportReaderImplTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/batch/BatchReportReaderImplTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/batch/BatchReportReaderImplTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/batch/BatchReportReaderRule.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/batch/BatchReportReaderRule.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/batch/BatchReportReaderRule.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/batch/BatchReportReaderRule.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/batch/ImmutableBatchReportDirectoryHolder.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/batch/ImmutableBatchReportDirectoryHolder.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/batch/ImmutableBatchReportDirectoryHolder.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/batch/ImmutableBatchReportDirectoryHolder.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/AbstractComponentProvider.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/AbstractComponentProvider.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/AbstractComponentProvider.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/AbstractComponentProvider.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/CallRecord.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/CallRecord.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/CallRecord.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/CallRecord.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/CallRecorderPathAwareVisitor.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/CallRecorderPathAwareVisitor.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/CallRecorderPathAwareVisitor.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/CallRecorderPathAwareVisitor.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/CallRecorderTypeAwareVisitor.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/CallRecorderTypeAwareVisitor.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/CallRecorderTypeAwareVisitor.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/CallRecorderTypeAwareVisitor.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ComponentFunctionsTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ComponentFunctionsTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ComponentFunctionsTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ComponentFunctionsTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ComponentImplTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ComponentImplTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ComponentImplTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ComponentImplTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ComponentProvider.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ComponentProvider.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ComponentProvider.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ComponentProvider.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ComponentRootBuilderTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ComponentRootBuilderTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ComponentRootBuilderTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ComponentRootBuilderTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ComponentTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ComponentTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ComponentTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ComponentTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ConfigurationRepositoryTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ConfigurationRepositoryTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ConfigurationRepositoryTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ConfigurationRepositoryTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/CrawlerDepthLimitTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/CrawlerDepthLimitTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/CrawlerDepthLimitTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/CrawlerDepthLimitTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/DbIdsRepositoryImplTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/DbIdsRepositoryImplTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/DbIdsRepositoryImplTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/DbIdsRepositoryImplTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/DisabledComponentsHolderImplTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/DisabledComponentsHolderImplTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/DisabledComponentsHolderImplTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/DisabledComponentsHolderImplTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/DumbDeveloper.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/DumbDeveloper.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/DumbDeveloper.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/DumbDeveloper.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/FileAttributesTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/FileAttributesTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/FileAttributesTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/FileAttributesTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/MutableDbIdsRepositoryRule.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/MutableDbIdsRepositoryRule.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/MutableDbIdsRepositoryRule.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/MutableDbIdsRepositoryRule.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/MutableTreeRootHolderRule.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/MutableTreeRootHolderRule.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/MutableTreeRootHolderRule.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/MutableTreeRootHolderRule.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/NoComponentProvider.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/NoComponentProvider.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/NoComponentProvider.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/NoComponentProvider.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/PathAwareCallRecord.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/PathAwareCallRecord.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/PathAwareCallRecord.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/PathAwareCallRecord.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ReportComponent.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ReportComponent.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ReportComponent.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ReportComponent.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ReportPathAwareVisitorTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ReportPathAwareVisitorTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ReportPathAwareVisitorTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ReportPathAwareVisitorTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ReportPostOrderDepthTraversalTypeAwareCrawlerTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ReportPostOrderDepthTraversalTypeAwareCrawlerTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ReportPostOrderDepthTraversalTypeAwareCrawlerTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ReportPostOrderDepthTraversalTypeAwareCrawlerTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ReportPreOrderDepthTraversalTypeAwareCrawlerTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ReportPreOrderDepthTraversalTypeAwareCrawlerTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ReportPreOrderDepthTraversalTypeAwareCrawlerTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ReportPreOrderDepthTraversalTypeAwareCrawlerTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ReportVisitorsCrawlerTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ReportVisitorsCrawlerTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ReportVisitorsCrawlerTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ReportVisitorsCrawlerTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ReportVisitorsCrawlerWithPathAwareVisitorTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ReportVisitorsCrawlerWithPathAwareVisitorTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ReportVisitorsCrawlerWithPathAwareVisitorTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ReportVisitorsCrawlerWithPathAwareVisitorTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ReportVisitorsCrawlerWithPostOrderTypeAwareVisitorTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ReportVisitorsCrawlerWithPostOrderTypeAwareVisitorTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ReportVisitorsCrawlerWithPostOrderTypeAwareVisitorTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ReportVisitorsCrawlerWithPostOrderTypeAwareVisitorTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ReportVisitorsCrawlerWithPreOrderTypeAwareVisitorTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ReportVisitorsCrawlerWithPreOrderTypeAwareVisitorTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ReportVisitorsCrawlerWithPreOrderTypeAwareVisitorTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ReportVisitorsCrawlerWithPreOrderTypeAwareVisitorTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/TestSettingsRepository.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/TestSettingsRepository.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/TestSettingsRepository.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/TestSettingsRepository.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/TreeComponentProvider.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/TreeComponentProvider.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/TreeComponentProvider.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/TreeComponentProvider.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/TreeRootHolderComponentProvider.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/TreeRootHolderComponentProvider.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/TreeRootHolderComponentProvider.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/TreeRootHolderComponentProvider.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/TreeRootHolderImplTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/TreeRootHolderImplTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/TreeRootHolderImplTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/TreeRootHolderImplTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/TreeRootHolderRule.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/TreeRootHolderRule.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/TreeRootHolderRule.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/TreeRootHolderRule.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/TypeAwareVisitorAdapterTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/TypeAwareVisitorAdapterTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/TypeAwareVisitorAdapterTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/TypeAwareVisitorAdapterTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ViewsComponent.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ViewsComponent.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ViewsComponent.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ViewsComponent.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ViewsPathAwareVisitorTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ViewsPathAwareVisitorTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ViewsPathAwareVisitorTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ViewsPathAwareVisitorTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ViewsPostOrderDepthTraversalTypeAwareCrawlerTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ViewsPostOrderDepthTraversalTypeAwareCrawlerTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ViewsPostOrderDepthTraversalTypeAwareCrawlerTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ViewsPostOrderDepthTraversalTypeAwareCrawlerTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ViewsPreOrderDepthTraversalTypeAwareCrawlerTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ViewsPreOrderDepthTraversalTypeAwareCrawlerTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ViewsPreOrderDepthTraversalTypeAwareCrawlerTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ViewsPreOrderDepthTraversalTypeAwareCrawlerTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ViewsVisitorsCrawlerTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ViewsVisitorsCrawlerTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ViewsVisitorsCrawlerTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ViewsVisitorsCrawlerTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ViewsVisitorsCrawlerWithPathAwareVisitorTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ViewsVisitorsCrawlerWithPathAwareVisitorTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ViewsVisitorsCrawlerWithPathAwareVisitorTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ViewsVisitorsCrawlerWithPathAwareVisitorTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ViewsVisitorsCrawlerWithPostOrderTypeAwareVisitorTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ViewsVisitorsCrawlerWithPostOrderTypeAwareVisitorTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ViewsVisitorsCrawlerWithPostOrderTypeAwareVisitorTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ViewsVisitorsCrawlerWithPostOrderTypeAwareVisitorTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ViewsVisitorsCrawlerWithPreOrderTypeAwareVisitorTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ViewsVisitorsCrawlerWithPreOrderTypeAwareVisitorTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ViewsVisitorsCrawlerWithPreOrderTypeAwareVisitorTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ViewsVisitorsCrawlerWithPreOrderTypeAwareVisitorTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/container/ProjectAnalysisTaskContainerPopulatorTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/container/ProjectAnalysisTaskContainerPopulatorTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/container/ProjectAnalysisTaskContainerPopulatorTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/container/ProjectAnalysisTaskContainerPopulatorTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/duplication/CrossProjectDuplicateTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/duplication/CrossProjectDuplicateTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/duplication/CrossProjectDuplicateTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/duplication/CrossProjectDuplicateTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/duplication/CrossProjectDuplicationStatusHolderImplTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/duplication/CrossProjectDuplicationStatusHolderImplTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/duplication/CrossProjectDuplicationStatusHolderImplTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/duplication/CrossProjectDuplicationStatusHolderImplTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/duplication/DuplicateTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/duplication/DuplicateTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/duplication/DuplicateTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/duplication/DuplicateTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/duplication/DuplicationRepositoryImplTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/duplication/DuplicationRepositoryImplTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/duplication/DuplicationRepositoryImplTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/duplication/DuplicationRepositoryImplTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/duplication/DuplicationRepositoryRule.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/duplication/DuplicationRepositoryRule.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/duplication/DuplicationRepositoryRule.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/duplication/DuplicationRepositoryRule.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/duplication/DuplicationTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/duplication/DuplicationTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/duplication/DuplicationTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/duplication/DuplicationTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/duplication/InProjectDuplicateTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/duplication/InProjectDuplicateTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/duplication/InProjectDuplicateTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/duplication/InProjectDuplicateTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/duplication/InnerDuplicateTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/duplication/InnerDuplicateTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/duplication/InnerDuplicateTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/duplication/InnerDuplicateTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/duplication/IntegrateCrossProjectDuplicationsTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/duplication/IntegrateCrossProjectDuplicationsTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/duplication/IntegrateCrossProjectDuplicationsTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/duplication/IntegrateCrossProjectDuplicationsTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/duplication/TextBlockTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/duplication/TextBlockTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/duplication/TextBlockTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/duplication/TextBlockTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/event/EventRepositoryImplTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/event/EventRepositoryImplTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/event/EventRepositoryImplTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/event/EventRepositoryImplTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/event/EventTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/event/EventTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/event/EventTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/event/EventTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/filemove/MatchTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/filemove/MatchTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/filemove/MatchTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/filemove/MatchTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/filemove/MatchesByScoreTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/filemove/MatchesByScoreTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/filemove/MatchesByScoreTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/filemove/MatchesByScoreTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/filemove/MutableMovedFilesRepositoryImplTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/filemove/MutableMovedFilesRepositoryImplTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/filemove/MutableMovedFilesRepositoryImplTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/filemove/MutableMovedFilesRepositoryImplTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/filemove/MutableMovedFilesRepositoryRule.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/filemove/MutableMovedFilesRepositoryRule.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/filemove/MutableMovedFilesRepositoryRule.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/filemove/MutableMovedFilesRepositoryRule.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/filemove/SourceSimilarityImplTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/filemove/SourceSimilarityImplTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/filemove/SourceSimilarityImplTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/filemove/SourceSimilarityImplTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/AverageFormulaExecutionTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/AverageFormulaExecutionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/AverageFormulaExecutionTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/AverageFormulaExecutionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/AverageFormulaTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/AverageFormulaTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/AverageFormulaTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/AverageFormulaTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/DistributionFormulaExecutionTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/DistributionFormulaExecutionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/DistributionFormulaExecutionTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/DistributionFormulaExecutionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/DistributionFormulaTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/DistributionFormulaTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/DistributionFormulaTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/DistributionFormulaTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/DumbCreateMeasureContext.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/DumbCreateMeasureContext.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/DumbCreateMeasureContext.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/DumbCreateMeasureContext.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/IntSumFormulaTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/IntSumFormulaTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/IntSumFormulaTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/IntSumFormulaTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/LongSumFormulaTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/LongSumFormulaTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/LongSumFormulaTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/LongSumFormulaTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/ReportFormulaExecutorComponentVisitorTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/ReportFormulaExecutorComponentVisitorTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/ReportFormulaExecutorComponentVisitorTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/ReportFormulaExecutorComponentVisitorTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/SumFormulaExecutionTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/SumFormulaExecutionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/SumFormulaExecutionTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/SumFormulaExecutionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/ViewsFormulaExecutorComponentVisitorTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/ViewsFormulaExecutorComponentVisitorTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/ViewsFormulaExecutorComponentVisitorTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/ViewsFormulaExecutorComponentVisitorTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/counter/DoubleValueTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/counter/DoubleValueTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/counter/DoubleValueTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/counter/DoubleValueTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/counter/IntSumCounterTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/counter/IntSumCounterTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/counter/IntSumCounterTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/counter/IntSumCounterTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/counter/IntValueTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/counter/IntValueTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/counter/IntValueTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/counter/IntValueTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/counter/LongSumCounterTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/counter/LongSumCounterTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/counter/LongSumCounterTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/counter/LongSumCounterTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/counter/LongValueTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/counter/LongValueTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/counter/LongValueTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/counter/LongValueTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/counter/RatingValueTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/counter/RatingValueTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/counter/RatingValueTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/counter/RatingValueTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/CoverageUtilsTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/CoverageUtilsTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/CoverageUtilsTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/CoverageUtilsTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/CloseIssuesOnRemovedComponentsVisitorTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/CloseIssuesOnRemovedComponentsVisitorTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/CloseIssuesOnRemovedComponentsVisitorTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/CloseIssuesOnRemovedComponentsVisitorTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/ComponentIssuesRepositoryImplTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/ComponentIssuesRepositoryImplTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/ComponentIssuesRepositoryImplTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/ComponentIssuesRepositoryImplTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/ComponentIssuesRepositoryRule.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/ComponentIssuesRepositoryRule.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/ComponentIssuesRepositoryRule.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/ComponentIssuesRepositoryRule.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/ComponentsWithUnprocessedIssuesTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/ComponentsWithUnprocessedIssuesTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/ComponentsWithUnprocessedIssuesTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/ComponentsWithUnprocessedIssuesTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/DebtCalculatorTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/DebtCalculatorTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/DebtCalculatorTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/DebtCalculatorTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/DefaultAssigneeTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/DefaultAssigneeTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/DefaultAssigneeTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/DefaultAssigneeTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/DumbRule.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/DumbRule.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/DumbRule.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/DumbRule.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/EffortAggregatorTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/EffortAggregatorTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/EffortAggregatorTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/EffortAggregatorTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/FillComponentIssuesVisitorRule.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/FillComponentIssuesVisitorRule.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/FillComponentIssuesVisitorRule.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/FillComponentIssuesVisitorRule.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/IntegrateIssuesVisitorTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/IntegrateIssuesVisitorTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/IntegrateIssuesVisitorTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/IntegrateIssuesVisitorTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/IssueAssignerTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/IssueAssignerTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/IssueAssignerTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/IssueAssignerTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/IssueCounterTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/IssueCounterTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/IssueCounterTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/IssueCounterTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/IssueCreationDateCalculatorTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/IssueCreationDateCalculatorTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/IssueCreationDateCalculatorTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/IssueCreationDateCalculatorTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/IssueLifecycleTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/IssueLifecycleTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/IssueLifecycleTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/IssueLifecycleTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/LoadComponentUuidsHavingOpenIssuesVisitorTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/LoadComponentUuidsHavingOpenIssuesVisitorTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/LoadComponentUuidsHavingOpenIssuesVisitorTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/LoadComponentUuidsHavingOpenIssuesVisitorTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/MovedIssueVisitorTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/MovedIssueVisitorTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/MovedIssueVisitorTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/MovedIssueVisitorTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/NewEffortAggregatorTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/NewEffortAggregatorTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/NewEffortAggregatorTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/NewEffortAggregatorTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/NewEffortCalculatorTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/NewEffortCalculatorTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/NewEffortCalculatorTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/NewEffortCalculatorTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/RuleRepositoryImplTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/RuleRepositoryImplTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/RuleRepositoryImplTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/RuleRepositoryImplTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/RuleRepositoryRule.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/RuleRepositoryRule.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/RuleRepositoryRule.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/RuleRepositoryRule.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/RuleTagsCopierTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/RuleTagsCopierTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/RuleTagsCopierTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/RuleTagsCopierTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/RuleTypeCopierTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/RuleTypeCopierTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/RuleTypeCopierTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/RuleTypeCopierTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/ScmAccountToUserLoaderTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/ScmAccountToUserLoaderTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/ScmAccountToUserLoaderTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/ScmAccountToUserLoaderTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/TrackerBaseInputFactoryTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/TrackerBaseInputFactoryTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/TrackerBaseInputFactoryTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/TrackerBaseInputFactoryTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/TrackerRawInputFactoryTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/TrackerRawInputFactoryTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/TrackerRawInputFactoryTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/TrackerRawInputFactoryTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/UpdateConflictResolverTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/UpdateConflictResolverTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/UpdateConflictResolverTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/UpdateConflictResolverTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/BranchCoverageRuleTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/BranchCoverageRuleTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/BranchCoverageRuleTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/BranchCoverageRuleTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/CommentDensityRuleTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/CommentDensityRuleTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/CommentDensityRuleTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/CommentDensityRuleTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/CommonRuleEngineImplTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/CommonRuleEngineImplTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/CommonRuleEngineImplTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/CommonRuleEngineImplTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/CommonRuleTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/CommonRuleTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/CommonRuleTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/CommonRuleTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/CoverageRuleTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/CoverageRuleTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/CoverageRuleTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/CoverageRuleTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/DuplicatedBlockRuleTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/DuplicatedBlockRuleTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/DuplicatedBlockRuleTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/DuplicatedBlockRuleTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/LineCoverageRuleTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/LineCoverageRuleTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/LineCoverageRuleTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/LineCoverageRuleTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/SkippedTestRuleTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/SkippedTestRuleTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/SkippedTestRuleTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/SkippedTestRuleTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/TestErrorRuleTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/TestErrorRuleTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/TestErrorRuleTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/TestErrorRuleTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/filter/IssueFilterTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/filter/IssueFilterTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/filter/IssueFilterTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/filter/IssueFilterTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/filter/IssuePatternTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/filter/IssuePatternTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/filter/IssuePatternTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/filter/IssuePatternTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/language/LanguageRepositoryImplTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/language/LanguageRepositoryImplTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/language/LanguageRepositoryImplTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/language/LanguageRepositoryImplTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/BatchMeasureToMeasureTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/BatchMeasureToMeasureTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/BatchMeasureToMeasureTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/BatchMeasureToMeasureTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/BestValueOptimizationTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/BestValueOptimizationTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/BestValueOptimizationTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/BestValueOptimizationTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MapBasedRawMeasureRepositoryTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MapBasedRawMeasureRepositoryTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MapBasedRawMeasureRepositoryTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MapBasedRawMeasureRepositoryTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureAssert.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureAssert.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureAssert.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureAssert.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureComputersHolderImplTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureComputersHolderImplTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureComputersHolderImplTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureComputersHolderImplTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureComputersHolderRule.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureComputersHolderRule.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureComputersHolderRule.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureComputersHolderRule.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureDtoToMeasureTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureDtoToMeasureTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureDtoToMeasureTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureDtoToMeasureTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureKeyTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureKeyTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureKeyTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureKeyTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureLevelTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureLevelTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureLevelTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureLevelTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureRepoEntry.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureRepoEntry.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureRepoEntry.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureRepoEntry.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureRepositoryImplTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureRepositoryImplTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureRepositoryImplTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureRepositoryImplTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureRepositoryRule.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureRepositoryRule.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureRepositoryRule.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureRepositoryRule.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureToMeasureDtoTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureToMeasureDtoTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureToMeasureDtoTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureToMeasureDtoTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/QualityGateStatusTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/QualityGateStatusTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/QualityGateStatusTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/QualityGateStatusTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/ReportMeasureComputersVisitorTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/ReportMeasureComputersVisitorTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/ReportMeasureComputersVisitorTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/ReportMeasureComputersVisitorTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/ViewsMeasureComputersVisitorTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/ViewsMeasureComputersVisitorTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/ViewsMeasureComputersVisitorTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/ViewsMeasureComputersVisitorTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/qualitygatedetails/EvaluatedConditionTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/qualitygatedetails/EvaluatedConditionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/qualitygatedetails/EvaluatedConditionTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/qualitygatedetails/EvaluatedConditionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/qualitygatedetails/QualityGateDetailsDataTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/qualitygatedetails/QualityGateDetailsDataTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/qualitygatedetails/QualityGateDetailsDataTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/qualitygatedetails/QualityGateDetailsDataTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/metric/MetricDtoToMetricTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/metric/MetricDtoToMetricTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/metric/MetricDtoToMetricTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/metric/MetricDtoToMetricTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/metric/MetricImplTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/metric/MetricImplTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/metric/MetricImplTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/metric/MetricImplTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/metric/MetricRepositoryImplTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/metric/MetricRepositoryImplTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/metric/MetricRepositoryImplTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/metric/MetricRepositoryImplTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/metric/MetricRepositoryRule.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/metric/MetricRepositoryRule.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/metric/MetricRepositoryRule.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/metric/MetricRepositoryRule.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/metric/ReportMetricValidatorImplTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/metric/ReportMetricValidatorImplTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/metric/ReportMetricValidatorImplTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/metric/ReportMetricValidatorImplTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/period/PeriodHolderImplTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/period/PeriodHolderImplTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/period/PeriodHolderImplTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/period/PeriodHolderImplTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/period/PeriodHolderRule.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/period/PeriodHolderRule.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/period/PeriodHolderRule.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/period/PeriodHolderRule.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/period/PeriodTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/period/PeriodTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/period/PeriodTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/period/PeriodTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitygate/ConditionEvaluatorTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitygate/ConditionEvaluatorTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitygate/ConditionEvaluatorTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitygate/ConditionEvaluatorTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitygate/ConditionStatusTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitygate/ConditionStatusTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitygate/ConditionStatusTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitygate/ConditionStatusTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitygate/ConditionTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitygate/ConditionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitygate/ConditionTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitygate/ConditionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitygate/EvaluationResultAssert.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitygate/EvaluationResultAssert.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitygate/EvaluationResultAssert.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitygate/EvaluationResultAssert.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitygate/EvaluationResultTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitygate/EvaluationResultTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitygate/EvaluationResultTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitygate/EvaluationResultTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitygate/EvaluationResultTextConverterTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitygate/EvaluationResultTextConverterTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitygate/EvaluationResultTextConverterTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitygate/EvaluationResultTextConverterTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitygate/MutableQualityGateHolderRule.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitygate/MutableQualityGateHolderRule.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitygate/MutableQualityGateHolderRule.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitygate/MutableQualityGateHolderRule.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitygate/MutableQualityGateStatusHolderRule.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitygate/MutableQualityGateStatusHolderRule.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitygate/MutableQualityGateStatusHolderRule.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitygate/MutableQualityGateStatusHolderRule.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitygate/QualityGateHolderImplTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitygate/QualityGateHolderImplTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitygate/QualityGateHolderImplTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitygate/QualityGateHolderImplTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitygate/QualityGateHolderRule.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitygate/QualityGateHolderRule.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitygate/QualityGateHolderRule.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitygate/QualityGateHolderRule.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitygate/QualityGateServiceImplTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitygate/QualityGateServiceImplTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitygate/QualityGateServiceImplTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitygate/QualityGateServiceImplTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitygate/QualityGateStatusHolderImplTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitygate/QualityGateStatusHolderImplTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitygate/QualityGateStatusHolderImplTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitygate/QualityGateStatusHolderImplTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitymodel/MaintainabilityMeasuresVisitorTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitymodel/MaintainabilityMeasuresVisitorTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitymodel/MaintainabilityMeasuresVisitorTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitymodel/MaintainabilityMeasuresVisitorTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitymodel/NewMaintainabilityMeasuresVisitorTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitymodel/NewMaintainabilityMeasuresVisitorTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitymodel/NewMaintainabilityMeasuresVisitorTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitymodel/NewMaintainabilityMeasuresVisitorTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitymodel/NewReliabilityAndSecurityRatingMeasuresVisitorTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitymodel/NewReliabilityAndSecurityRatingMeasuresVisitorTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitymodel/NewReliabilityAndSecurityRatingMeasuresVisitorTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitymodel/NewReliabilityAndSecurityRatingMeasuresVisitorTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitymodel/RatingGridTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitymodel/RatingGridTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitymodel/RatingGridTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitymodel/RatingGridTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitymodel/RatingSettingsTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitymodel/RatingSettingsTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitymodel/RatingSettingsTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitymodel/RatingSettingsTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitymodel/ReliabilityAndSecurityRatingMeasuresVisitorTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitymodel/ReliabilityAndSecurityRatingMeasuresVisitorTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitymodel/ReliabilityAndSecurityRatingMeasuresVisitorTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitymodel/ReliabilityAndSecurityRatingMeasuresVisitorTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualityprofile/ActiveRulesHolderImplTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualityprofile/ActiveRulesHolderImplTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualityprofile/ActiveRulesHolderImplTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualityprofile/ActiveRulesHolderImplTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualityprofile/ActiveRulesHolderRule.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualityprofile/ActiveRulesHolderRule.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualityprofile/ActiveRulesHolderRule.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualityprofile/ActiveRulesHolderRule.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/scm/ChangesetTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/scm/ChangesetTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/scm/ChangesetTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/scm/ChangesetTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/scm/DbScmInfoTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/scm/DbScmInfoTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/scm/DbScmInfoTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/scm/DbScmInfoTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/scm/ReportScmInfoTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/scm/ReportScmInfoTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/scm/ReportScmInfoTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/scm/ReportScmInfoTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/scm/ScmInfoImplTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/scm/ScmInfoImplTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/scm/ScmInfoImplTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/scm/ScmInfoImplTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/scm/ScmInfoRepositoryImplTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/scm/ScmInfoRepositoryImplTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/scm/ScmInfoRepositoryImplTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/scm/ScmInfoRepositoryImplTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/scm/ScmInfoRepositoryRule.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/scm/ScmInfoRepositoryRule.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/scm/ScmInfoRepositoryRule.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/scm/ScmInfoRepositoryRule.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/source/ComputeFileSourceDataTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/source/ComputeFileSourceDataTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/source/ComputeFileSourceDataTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/source/ComputeFileSourceDataTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/source/CoverageLineReaderTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/source/CoverageLineReaderTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/source/CoverageLineReaderTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/source/CoverageLineReaderTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/source/DuplicationLineReaderTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/source/DuplicationLineReaderTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/source/DuplicationLineReaderTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/source/DuplicationLineReaderTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/source/HighlightingLineReaderTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/source/HighlightingLineReaderTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/source/HighlightingLineReaderTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/source/HighlightingLineReaderTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/source/LastCommitVisitorTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/source/LastCommitVisitorTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/source/LastCommitVisitorTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/source/LastCommitVisitorTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/source/RangeOffsetConverterTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/source/RangeOffsetConverterTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/source/RangeOffsetConverterTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/source/RangeOffsetConverterTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/source/ReportIteratorTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/source/ReportIteratorTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/source/ReportIteratorTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/source/ReportIteratorTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/source/ScmLineReaderTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/source/ScmLineReaderTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/source/ScmLineReaderTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/source/ScmLineReaderTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/source/SourceHashRepositoryImplTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/source/SourceHashRepositoryImplTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/source/SourceHashRepositoryImplTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/source/SourceHashRepositoryImplTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/source/SourceLinesRepositoryImplTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/source/SourceLinesRepositoryImplTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/source/SourceLinesRepositoryImplTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/source/SourceLinesRepositoryImplTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/source/SourceLinesRepositoryRule.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/source/SourceLinesRepositoryRule.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/source/SourceLinesRepositoryRule.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/source/SourceLinesRepositoryRule.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/source/SymbolsLineReaderTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/source/SymbolsLineReaderTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/source/SymbolsLineReaderTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/source/SymbolsLineReaderTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/BaseStepTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/BaseStepTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/BaseStepTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/BaseStepTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/BuildComponentTreeStepTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/BuildComponentTreeStepTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/BuildComponentTreeStepTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/BuildComponentTreeStepTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ComputeQProfileMeasureStepTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ComputeQProfileMeasureStepTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ComputeQProfileMeasureStepTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ComputeQProfileMeasureStepTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/CustomMeasuresCopyStepTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/CustomMeasuresCopyStepTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/CustomMeasuresCopyStepTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/CustomMeasuresCopyStepTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/DuplicationDataMeasuresStepTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/DuplicationDataMeasuresStepTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/DuplicationDataMeasuresStepTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/DuplicationDataMeasuresStepTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/EnableAnalysisStepTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/EnableAnalysisStepTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/EnableAnalysisStepTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/EnableAnalysisStepTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ExecuteVisitorsStepTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ExecuteVisitorsStepTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ExecuteVisitorsStepTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ExecuteVisitorsStepTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ExtractReportStepTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ExtractReportStepTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ExtractReportStepTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ExtractReportStepTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/IndexAnalysisStepTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/IndexAnalysisStepTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/IndexAnalysisStepTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/IndexAnalysisStepTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/LoadCrossProjectDuplicationsRepositoryStepTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/LoadCrossProjectDuplicationsRepositoryStepTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/LoadCrossProjectDuplicationsRepositoryStepTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/LoadCrossProjectDuplicationsRepositoryStepTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/LoadDuplicationsFromReportStepTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/LoadDuplicationsFromReportStepTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/LoadDuplicationsFromReportStepTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/LoadDuplicationsFromReportStepTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/LoadMeasureComputersStepTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/LoadMeasureComputersStepTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/LoadMeasureComputersStepTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/LoadMeasureComputersStepTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/LoadPeriodsStepTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/LoadPeriodsStepTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/LoadPeriodsStepTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/LoadPeriodsStepTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/LoadQualityProfilesStepTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/LoadQualityProfilesStepTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/LoadQualityProfilesStepTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/LoadQualityProfilesStepTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/LoadReportAnalysisMetadataHolderStepTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/LoadReportAnalysisMetadataHolderStepTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/LoadReportAnalysisMetadataHolderStepTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/LoadReportAnalysisMetadataHolderStepTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/NewSizeMeasuresStepTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/NewSizeMeasuresStepTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/NewSizeMeasuresStepTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/NewSizeMeasuresStepTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/PersistComponentsStepTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/PersistComponentsStepTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/PersistComponentsStepTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/PersistComponentsStepTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/PersistCrossProjectDuplicationIndexStepTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/PersistCrossProjectDuplicationIndexStepTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/PersistCrossProjectDuplicationIndexStepTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/PersistCrossProjectDuplicationIndexStepTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/PersistDevelopersStepTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/PersistDevelopersStepTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/PersistDevelopersStepTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/PersistDevelopersStepTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/PersistEventsStepTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/PersistEventsStepTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/PersistEventsStepTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/PersistEventsStepTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/PersistFileSourcesStepTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/PersistFileSourcesStepTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/PersistFileSourcesStepTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/PersistFileSourcesStepTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/PersistIssuesStepTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/PersistIssuesStepTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/PersistIssuesStepTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/PersistIssuesStepTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/PersistMeasuresStepTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/PersistMeasuresStepTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/PersistMeasuresStepTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/PersistMeasuresStepTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/PersistProjectLinksStepTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/PersistProjectLinksStepTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/PersistProjectLinksStepTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/PersistProjectLinksStepTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/PersistScannerContextStepTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/PersistScannerContextStepTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/PersistScannerContextStepTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/PersistScannerContextStepTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/PersistTestsStepTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/PersistTestsStepTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/PersistTestsStepTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/PersistTestsStepTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/PublishTaskResultStepTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/PublishTaskResultStepTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/PublishTaskResultStepTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/PublishTaskResultStepTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/PurgeDatastoresStepTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/PurgeDatastoresStepTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/PurgeDatastoresStepTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/PurgeDatastoresStepTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/QualityGateEventsStepTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/QualityGateEventsStepTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/QualityGateEventsStepTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/QualityGateEventsStepTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/QualityGateLoadingStepTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/QualityGateLoadingStepTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/QualityGateLoadingStepTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/QualityGateLoadingStepTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/QualityGateMeasuresStepTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/QualityGateMeasuresStepTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/QualityGateMeasuresStepTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/QualityGateMeasuresStepTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/QualityProfileEventsStepTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/QualityProfileEventsStepTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/QualityProfileEventsStepTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/QualityProfileEventsStepTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportCommentMeasuresStepTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportCommentMeasuresStepTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportCommentMeasuresStepTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportCommentMeasuresStepTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportComplexityMeasuresStepTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportComplexityMeasuresStepTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportComplexityMeasuresStepTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportComplexityMeasuresStepTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportComputationStepsTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportComputationStepsTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportComputationStepsTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportComputationStepsTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportComputeMeasureVariationsStepTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportComputeMeasureVariationsStepTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportComputeMeasureVariationsStepTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportComputeMeasureVariationsStepTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportCoverageMeasuresStepTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportCoverageMeasuresStepTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportCoverageMeasuresStepTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportCoverageMeasuresStepTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportDuplicationMeasuresStepTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportDuplicationMeasuresStepTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportDuplicationMeasuresStepTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportDuplicationMeasuresStepTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportLanguageDistributionMeasuresStepTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportLanguageDistributionMeasuresStepTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportLanguageDistributionMeasuresStepTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportLanguageDistributionMeasuresStepTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportNewCoverageMeasuresStepTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportNewCoverageMeasuresStepTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportNewCoverageMeasuresStepTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportNewCoverageMeasuresStepTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportPersistAnalysisStepTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportPersistAnalysisStepTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportPersistAnalysisStepTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportPersistAnalysisStepTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportPersistComponentsStepTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportPersistComponentsStepTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportPersistComponentsStepTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportPersistComponentsStepTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportSizeMeasuresStepTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportSizeMeasuresStepTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportSizeMeasuresStepTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportSizeMeasuresStepTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportUnitTestMeasuresStepTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportUnitTestMeasuresStepTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportUnitTestMeasuresStepTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportUnitTestMeasuresStepTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/SendIssueNotificationsStepTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/SendIssueNotificationsStepTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/SendIssueNotificationsStepTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/SendIssueNotificationsStepTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/UpdateQualityProfilesLastUsedDateStepTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/UpdateQualityProfilesLastUsedDateStepTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/UpdateQualityProfilesLastUsedDateStepTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/UpdateQualityProfilesLastUsedDateStepTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ValidateProjectStepTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ValidateProjectStepTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ValidateProjectStepTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ValidateProjectStepTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ViewsCommentMeasuresStepTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ViewsCommentMeasuresStepTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ViewsCommentMeasuresStepTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ViewsCommentMeasuresStepTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ViewsComplexityMeasuresStepTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ViewsComplexityMeasuresStepTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ViewsComplexityMeasuresStepTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ViewsComplexityMeasuresStepTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ViewsComputeMeasureVariationsStepTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ViewsComputeMeasureVariationsStepTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ViewsComputeMeasureVariationsStepTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ViewsComputeMeasureVariationsStepTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ViewsCoverageMeasuresStepTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ViewsCoverageMeasuresStepTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ViewsCoverageMeasuresStepTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ViewsCoverageMeasuresStepTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ViewsDuplicationMeasuresStepTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ViewsDuplicationMeasuresStepTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ViewsDuplicationMeasuresStepTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ViewsDuplicationMeasuresStepTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ViewsLanguageDistributionMeasuresStepTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ViewsLanguageDistributionMeasuresStepTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ViewsLanguageDistributionMeasuresStepTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ViewsLanguageDistributionMeasuresStepTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ViewsNewCoverageMeasuresStepTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ViewsNewCoverageMeasuresStepTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ViewsNewCoverageMeasuresStepTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ViewsNewCoverageMeasuresStepTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ViewsPersistAnalysisStepTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ViewsPersistAnalysisStepTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ViewsPersistAnalysisStepTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ViewsPersistAnalysisStepTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ViewsPersistComponentsStepTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ViewsPersistComponentsStepTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ViewsPersistComponentsStepTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ViewsPersistComponentsStepTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ViewsSizeMeasuresStepTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ViewsSizeMeasuresStepTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ViewsSizeMeasuresStepTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ViewsSizeMeasuresStepTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ViewsUnitTestMeasuresStepTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ViewsUnitTestMeasuresStepTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ViewsUnitTestMeasuresStepTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ViewsUnitTestMeasuresStepTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/webhook/TestWebhookCaller.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/webhook/TestWebhookCaller.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/webhook/TestWebhookCaller.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/webhook/TestWebhookCaller.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/webhook/WebhookCallerImplTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/webhook/WebhookCallerImplTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/webhook/WebhookCallerImplTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/webhook/WebhookCallerImplTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/webhook/WebhookDeliveryStorageTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/webhook/WebhookDeliveryStorageTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/webhook/WebhookDeliveryStorageTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/webhook/WebhookDeliveryStorageTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/webhook/WebhookDeliveryTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/webhook/WebhookDeliveryTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/webhook/WebhookDeliveryTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/webhook/WebhookDeliveryTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/webhook/WebhookModuleTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/webhook/WebhookModuleTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/webhook/WebhookModuleTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/webhook/WebhookModuleTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/webhook/WebhookPayloadFactoryImplTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/webhook/WebhookPayloadFactoryImplTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/webhook/WebhookPayloadFactoryImplTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/webhook/WebhookPayloadFactoryImplTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/webhook/WebhookPostTaskTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/webhook/WebhookPostTaskTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/webhook/WebhookPostTaskTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/webhook/WebhookPostTaskTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/step/ComputationStepExecutorTest.java b/sonar-server/src/test/java/org/sonar/server/computation/task/step/ComputationStepExecutorTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/step/ComputationStepExecutorTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/step/ComputationStepExecutorTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/step/StepsExplorer.java b/sonar-server/src/test/java/org/sonar/server/computation/task/step/StepsExplorer.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/task/step/StepsExplorer.java rename to sonar-server/src/test/java/org/sonar/server/computation/task/step/StepsExplorer.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/taskprocessor/MutableTaskResultHolderImplTest.java b/sonar-server/src/test/java/org/sonar/server/computation/taskprocessor/MutableTaskResultHolderImplTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/computation/taskprocessor/MutableTaskResultHolderImplTest.java rename to sonar-server/src/test/java/org/sonar/server/computation/taskprocessor/MutableTaskResultHolderImplTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/debt/DebtModelPluginRepositoryTest.java b/sonar-server/src/test/java/org/sonar/server/debt/DebtModelPluginRepositoryTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/debt/DebtModelPluginRepositoryTest.java rename to sonar-server/src/test/java/org/sonar/server/debt/DebtModelPluginRepositoryTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/debt/DebtModelXMLExporterTest.java b/sonar-server/src/test/java/org/sonar/server/debt/DebtModelXMLExporterTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/debt/DebtModelXMLExporterTest.java rename to sonar-server/src/test/java/org/sonar/server/debt/DebtModelXMLExporterTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/debt/DebtRulesXMLImporterTest.java b/sonar-server/src/test/java/org/sonar/server/debt/DebtRulesXMLImporterTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/debt/DebtRulesXMLImporterTest.java rename to sonar-server/src/test/java/org/sonar/server/debt/DebtRulesXMLImporterTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/duplication/ws/DuplicationsParserTest.java b/sonar-server/src/test/java/org/sonar/server/duplication/ws/DuplicationsParserTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/duplication/ws/DuplicationsParserTest.java rename to sonar-server/src/test/java/org/sonar/server/duplication/ws/DuplicationsParserTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/duplication/ws/DuplicationsWsTest.java b/sonar-server/src/test/java/org/sonar/server/duplication/ws/DuplicationsWsTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/duplication/ws/DuplicationsWsTest.java rename to sonar-server/src/test/java/org/sonar/server/duplication/ws/DuplicationsWsTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/duplication/ws/ShowActionTest.java b/sonar-server/src/test/java/org/sonar/server/duplication/ws/ShowActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/duplication/ws/ShowActionTest.java rename to sonar-server/src/test/java/org/sonar/server/duplication/ws/ShowActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/duplication/ws/ShowResponseBuilderTest.java b/sonar-server/src/test/java/org/sonar/server/duplication/ws/ShowResponseBuilderTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/duplication/ws/ShowResponseBuilderTest.java rename to sonar-server/src/test/java/org/sonar/server/duplication/ws/ShowResponseBuilderTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/email/ws/EmailsWsModuleTest.java b/sonar-server/src/test/java/org/sonar/server/email/ws/EmailsWsModuleTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/email/ws/EmailsWsModuleTest.java rename to sonar-server/src/test/java/org/sonar/server/email/ws/EmailsWsModuleTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/email/ws/SendActionTest.java b/sonar-server/src/test/java/org/sonar/server/email/ws/SendActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/email/ws/SendActionTest.java rename to sonar-server/src/test/java/org/sonar/server/email/ws/SendActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/es/BulkIndexerConcurrentRequestCalculationTest.java b/sonar-server/src/test/java/org/sonar/server/es/BulkIndexerConcurrentRequestCalculationTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/es/BulkIndexerConcurrentRequestCalculationTest.java rename to sonar-server/src/test/java/org/sonar/server/es/BulkIndexerConcurrentRequestCalculationTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/es/BulkIndexerTest.java b/sonar-server/src/test/java/org/sonar/server/es/BulkIndexerTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/es/BulkIndexerTest.java rename to sonar-server/src/test/java/org/sonar/server/es/BulkIndexerTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/es/DefaultIndexSettingsTest.java b/sonar-server/src/test/java/org/sonar/server/es/DefaultIndexSettingsTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/es/DefaultIndexSettingsTest.java rename to sonar-server/src/test/java/org/sonar/server/es/DefaultIndexSettingsTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/es/EsClientProviderTest.java b/sonar-server/src/test/java/org/sonar/server/es/EsClientProviderTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/es/EsClientProviderTest.java rename to sonar-server/src/test/java/org/sonar/server/es/EsClientProviderTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/es/EsClientStopperTest.java b/sonar-server/src/test/java/org/sonar/server/es/EsClientStopperTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/es/EsClientStopperTest.java rename to sonar-server/src/test/java/org/sonar/server/es/EsClientStopperTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/es/EsClientTest.java b/sonar-server/src/test/java/org/sonar/server/es/EsClientTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/es/EsClientTest.java rename to sonar-server/src/test/java/org/sonar/server/es/EsClientTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/es/EsServerHolder.java b/sonar-server/src/test/java/org/sonar/server/es/EsServerHolder.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/es/EsServerHolder.java rename to sonar-server/src/test/java/org/sonar/server/es/EsServerHolder.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/es/EsTester.java b/sonar-server/src/test/java/org/sonar/server/es/EsTester.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/es/EsTester.java rename to sonar-server/src/test/java/org/sonar/server/es/EsTester.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/es/EsUtilsTest.java b/sonar-server/src/test/java/org/sonar/server/es/EsUtilsTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/es/EsUtilsTest.java rename to sonar-server/src/test/java/org/sonar/server/es/EsUtilsTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/es/FakeDoc.java b/sonar-server/src/test/java/org/sonar/server/es/FakeDoc.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/es/FakeDoc.java rename to sonar-server/src/test/java/org/sonar/server/es/FakeDoc.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/es/FakeIndexDefinition.java b/sonar-server/src/test/java/org/sonar/server/es/FakeIndexDefinition.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/es/FakeIndexDefinition.java rename to sonar-server/src/test/java/org/sonar/server/es/FakeIndexDefinition.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/es/IndexCreatorTest.java b/sonar-server/src/test/java/org/sonar/server/es/IndexCreatorTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/es/IndexCreatorTest.java rename to sonar-server/src/test/java/org/sonar/server/es/IndexCreatorTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/es/IndexDefinitionContextTest.java b/sonar-server/src/test/java/org/sonar/server/es/IndexDefinitionContextTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/es/IndexDefinitionContextTest.java rename to sonar-server/src/test/java/org/sonar/server/es/IndexDefinitionContextTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/es/IndexDefinitionHashTest.java b/sonar-server/src/test/java/org/sonar/server/es/IndexDefinitionHashTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/es/IndexDefinitionHashTest.java rename to sonar-server/src/test/java/org/sonar/server/es/IndexDefinitionHashTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/es/IndexerStartupTaskTest.java b/sonar-server/src/test/java/org/sonar/server/es/IndexerStartupTaskTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/es/IndexerStartupTaskTest.java rename to sonar-server/src/test/java/org/sonar/server/es/IndexerStartupTaskTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/es/IndexingResultTest.java b/sonar-server/src/test/java/org/sonar/server/es/IndexingResultTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/es/IndexingResultTest.java rename to sonar-server/src/test/java/org/sonar/server/es/IndexingResultTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/es/NewIndexTest.java b/sonar-server/src/test/java/org/sonar/server/es/NewIndexTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/es/NewIndexTest.java rename to sonar-server/src/test/java/org/sonar/server/es/NewIndexTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/es/RecoveryIndexerTest.java b/sonar-server/src/test/java/org/sonar/server/es/RecoveryIndexerTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/es/RecoveryIndexerTest.java rename to sonar-server/src/test/java/org/sonar/server/es/RecoveryIndexerTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/es/SearchOptionsTest.java b/sonar-server/src/test/java/org/sonar/server/es/SearchOptionsTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/es/SearchOptionsTest.java rename to sonar-server/src/test/java/org/sonar/server/es/SearchOptionsTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/es/SortingTest.java b/sonar-server/src/test/java/org/sonar/server/es/SortingTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/es/SortingTest.java rename to sonar-server/src/test/java/org/sonar/server/es/SortingTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/es/request/ProxyBulkRequestBuilderTest.java b/sonar-server/src/test/java/org/sonar/server/es/request/ProxyBulkRequestBuilderTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/es/request/ProxyBulkRequestBuilderTest.java rename to sonar-server/src/test/java/org/sonar/server/es/request/ProxyBulkRequestBuilderTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/es/request/ProxyClearCacheRequestBuilderTest.java b/sonar-server/src/test/java/org/sonar/server/es/request/ProxyClearCacheRequestBuilderTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/es/request/ProxyClearCacheRequestBuilderTest.java rename to sonar-server/src/test/java/org/sonar/server/es/request/ProxyClearCacheRequestBuilderTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/es/request/ProxyClusterHealthRequestBuilderTest.java b/sonar-server/src/test/java/org/sonar/server/es/request/ProxyClusterHealthRequestBuilderTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/es/request/ProxyClusterHealthRequestBuilderTest.java rename to sonar-server/src/test/java/org/sonar/server/es/request/ProxyClusterHealthRequestBuilderTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/es/request/ProxyClusterStateRequestBuilderTest.java b/sonar-server/src/test/java/org/sonar/server/es/request/ProxyClusterStateRequestBuilderTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/es/request/ProxyClusterStateRequestBuilderTest.java rename to sonar-server/src/test/java/org/sonar/server/es/request/ProxyClusterStateRequestBuilderTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/es/request/ProxyClusterStatsRequestBuilderTest.java b/sonar-server/src/test/java/org/sonar/server/es/request/ProxyClusterStatsRequestBuilderTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/es/request/ProxyClusterStatsRequestBuilderTest.java rename to sonar-server/src/test/java/org/sonar/server/es/request/ProxyClusterStatsRequestBuilderTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/es/request/ProxyCreateIndexRequestBuilderTest.java b/sonar-server/src/test/java/org/sonar/server/es/request/ProxyCreateIndexRequestBuilderTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/es/request/ProxyCreateIndexRequestBuilderTest.java rename to sonar-server/src/test/java/org/sonar/server/es/request/ProxyCreateIndexRequestBuilderTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/es/request/ProxyDeleteRequestBuilderTest.java b/sonar-server/src/test/java/org/sonar/server/es/request/ProxyDeleteRequestBuilderTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/es/request/ProxyDeleteRequestBuilderTest.java rename to sonar-server/src/test/java/org/sonar/server/es/request/ProxyDeleteRequestBuilderTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/es/request/ProxyFlushRequestBuilderTest.java b/sonar-server/src/test/java/org/sonar/server/es/request/ProxyFlushRequestBuilderTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/es/request/ProxyFlushRequestBuilderTest.java rename to sonar-server/src/test/java/org/sonar/server/es/request/ProxyFlushRequestBuilderTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/es/request/ProxyGetRequestBuilderTest.java b/sonar-server/src/test/java/org/sonar/server/es/request/ProxyGetRequestBuilderTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/es/request/ProxyGetRequestBuilderTest.java rename to sonar-server/src/test/java/org/sonar/server/es/request/ProxyGetRequestBuilderTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/es/request/ProxyIndexRequestBuilderTest.java b/sonar-server/src/test/java/org/sonar/server/es/request/ProxyIndexRequestBuilderTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/es/request/ProxyIndexRequestBuilderTest.java rename to sonar-server/src/test/java/org/sonar/server/es/request/ProxyIndexRequestBuilderTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/es/request/ProxyIndicesExistsRequestBuilderTest.java b/sonar-server/src/test/java/org/sonar/server/es/request/ProxyIndicesExistsRequestBuilderTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/es/request/ProxyIndicesExistsRequestBuilderTest.java rename to sonar-server/src/test/java/org/sonar/server/es/request/ProxyIndicesExistsRequestBuilderTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/es/request/ProxyIndicesStatsRequestBuilderTest.java b/sonar-server/src/test/java/org/sonar/server/es/request/ProxyIndicesStatsRequestBuilderTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/es/request/ProxyIndicesStatsRequestBuilderTest.java rename to sonar-server/src/test/java/org/sonar/server/es/request/ProxyIndicesStatsRequestBuilderTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/es/request/ProxyMultiGetRequestBuilderTest.java b/sonar-server/src/test/java/org/sonar/server/es/request/ProxyMultiGetRequestBuilderTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/es/request/ProxyMultiGetRequestBuilderTest.java rename to sonar-server/src/test/java/org/sonar/server/es/request/ProxyMultiGetRequestBuilderTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/es/request/ProxyNodesStatsRequestBuilderTest.java b/sonar-server/src/test/java/org/sonar/server/es/request/ProxyNodesStatsRequestBuilderTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/es/request/ProxyNodesStatsRequestBuilderTest.java rename to sonar-server/src/test/java/org/sonar/server/es/request/ProxyNodesStatsRequestBuilderTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/es/request/ProxyPutMappingRequestBuilderTest.java b/sonar-server/src/test/java/org/sonar/server/es/request/ProxyPutMappingRequestBuilderTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/es/request/ProxyPutMappingRequestBuilderTest.java rename to sonar-server/src/test/java/org/sonar/server/es/request/ProxyPutMappingRequestBuilderTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/es/request/ProxyRefreshRequestBuilderTest.java b/sonar-server/src/test/java/org/sonar/server/es/request/ProxyRefreshRequestBuilderTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/es/request/ProxyRefreshRequestBuilderTest.java rename to sonar-server/src/test/java/org/sonar/server/es/request/ProxyRefreshRequestBuilderTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/es/request/ProxySearchRequestBuilderTest.java b/sonar-server/src/test/java/org/sonar/server/es/request/ProxySearchRequestBuilderTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/es/request/ProxySearchRequestBuilderTest.java rename to sonar-server/src/test/java/org/sonar/server/es/request/ProxySearchRequestBuilderTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/es/request/ProxySearchScrollRequestBuilderTest.java b/sonar-server/src/test/java/org/sonar/server/es/request/ProxySearchScrollRequestBuilderTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/es/request/ProxySearchScrollRequestBuilderTest.java rename to sonar-server/src/test/java/org/sonar/server/es/request/ProxySearchScrollRequestBuilderTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/es/textsearch/ComponentTextSearchFeatureRule.java b/sonar-server/src/test/java/org/sonar/server/es/textsearch/ComponentTextSearchFeatureRule.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/es/textsearch/ComponentTextSearchFeatureRule.java rename to sonar-server/src/test/java/org/sonar/server/es/textsearch/ComponentTextSearchFeatureRule.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/es/textsearch/ComponentTextSearchQueryFactoryTest.java b/sonar-server/src/test/java/org/sonar/server/es/textsearch/ComponentTextSearchQueryFactoryTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/es/textsearch/ComponentTextSearchQueryFactoryTest.java rename to sonar-server/src/test/java/org/sonar/server/es/textsearch/ComponentTextSearchQueryFactoryTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/event/NewAlertsTest.java b/sonar-server/src/test/java/org/sonar/server/event/NewAlertsTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/event/NewAlertsTest.java rename to sonar-server/src/test/java/org/sonar/server/event/NewAlertsTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/exceptions/BadRequestExceptionTest.java b/sonar-server/src/test/java/org/sonar/server/exceptions/BadRequestExceptionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/exceptions/BadRequestExceptionTest.java rename to sonar-server/src/test/java/org/sonar/server/exceptions/BadRequestExceptionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/exceptions/MessageTest.java b/sonar-server/src/test/java/org/sonar/server/exceptions/MessageTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/exceptions/MessageTest.java rename to sonar-server/src/test/java/org/sonar/server/exceptions/MessageTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/exceptions/ServerExceptionTest.java b/sonar-server/src/test/java/org/sonar/server/exceptions/ServerExceptionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/exceptions/ServerExceptionTest.java rename to sonar-server/src/test/java/org/sonar/server/exceptions/ServerExceptionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/favorite/FavoriteModuleTest.java b/sonar-server/src/test/java/org/sonar/server/favorite/FavoriteModuleTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/favorite/FavoriteModuleTest.java rename to sonar-server/src/test/java/org/sonar/server/favorite/FavoriteModuleTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/favorite/FavoriteUpdaterTest.java b/sonar-server/src/test/java/org/sonar/server/favorite/FavoriteUpdaterTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/favorite/FavoriteUpdaterTest.java rename to sonar-server/src/test/java/org/sonar/server/favorite/FavoriteUpdaterTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/favorite/ws/AddActionTest.java b/sonar-server/src/test/java/org/sonar/server/favorite/ws/AddActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/favorite/ws/AddActionTest.java rename to sonar-server/src/test/java/org/sonar/server/favorite/ws/AddActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/favorite/ws/FavoritesWsTest.java b/sonar-server/src/test/java/org/sonar/server/favorite/ws/FavoritesWsTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/favorite/ws/FavoritesWsTest.java rename to sonar-server/src/test/java/org/sonar/server/favorite/ws/FavoritesWsTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/favorite/ws/RemoveActionTest.java b/sonar-server/src/test/java/org/sonar/server/favorite/ws/RemoveActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/favorite/ws/RemoveActionTest.java rename to sonar-server/src/test/java/org/sonar/server/favorite/ws/RemoveActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/favorite/ws/SearchActionTest.java b/sonar-server/src/test/java/org/sonar/server/favorite/ws/SearchActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/favorite/ws/SearchActionTest.java rename to sonar-server/src/test/java/org/sonar/server/favorite/ws/SearchActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/i18n/I18nRule.java b/sonar-server/src/test/java/org/sonar/server/i18n/I18nRule.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/i18n/I18nRule.java rename to sonar-server/src/test/java/org/sonar/server/i18n/I18nRule.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/i18n/package-info.java b/sonar-server/src/test/java/org/sonar/server/i18n/package-info.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/i18n/package-info.java rename to sonar-server/src/test/java/org/sonar/server/i18n/package-info.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/issue/ActionFinderTest.java b/sonar-server/src/test/java/org/sonar/server/issue/ActionFinderTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/issue/ActionFinderTest.java rename to sonar-server/src/test/java/org/sonar/server/issue/ActionFinderTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/issue/ActionTest.java b/sonar-server/src/test/java/org/sonar/server/issue/ActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/issue/ActionTest.java rename to sonar-server/src/test/java/org/sonar/server/issue/ActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/issue/AddTagsActionTest.java b/sonar-server/src/test/java/org/sonar/server/issue/AddTagsActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/issue/AddTagsActionTest.java rename to sonar-server/src/test/java/org/sonar/server/issue/AddTagsActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/issue/AssignActionTest.java b/sonar-server/src/test/java/org/sonar/server/issue/AssignActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/issue/AssignActionTest.java rename to sonar-server/src/test/java/org/sonar/server/issue/AssignActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/issue/CommentActionTest.java b/sonar-server/src/test/java/org/sonar/server/issue/CommentActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/issue/CommentActionTest.java rename to sonar-server/src/test/java/org/sonar/server/issue/CommentActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/issue/IssueDocTesting.java b/sonar-server/src/test/java/org/sonar/server/issue/IssueDocTesting.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/issue/IssueDocTesting.java rename to sonar-server/src/test/java/org/sonar/server/issue/IssueDocTesting.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/issue/IssueFieldsSetterTest.java b/sonar-server/src/test/java/org/sonar/server/issue/IssueFieldsSetterTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/issue/IssueFieldsSetterTest.java rename to sonar-server/src/test/java/org/sonar/server/issue/IssueFieldsSetterTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/issue/IssueFinderTest.java b/sonar-server/src/test/java/org/sonar/server/issue/IssueFinderTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/issue/IssueFinderTest.java rename to sonar-server/src/test/java/org/sonar/server/issue/IssueFinderTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/issue/IssueQueryFactoryTest.java b/sonar-server/src/test/java/org/sonar/server/issue/IssueQueryFactoryTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/issue/IssueQueryFactoryTest.java rename to sonar-server/src/test/java/org/sonar/server/issue/IssueQueryFactoryTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/issue/IssueQueryTest.java b/sonar-server/src/test/java/org/sonar/server/issue/IssueQueryTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/issue/IssueQueryTest.java rename to sonar-server/src/test/java/org/sonar/server/issue/IssueQueryTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/issue/IssueServiceMediumTest.java b/sonar-server/src/test/java/org/sonar/server/issue/IssueServiceMediumTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/issue/IssueServiceMediumTest.java rename to sonar-server/src/test/java/org/sonar/server/issue/IssueServiceMediumTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/issue/IssueStorageTest.java b/sonar-server/src/test/java/org/sonar/server/issue/IssueStorageTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/issue/IssueStorageTest.java rename to sonar-server/src/test/java/org/sonar/server/issue/IssueStorageTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/issue/IssueUpdaterTest.java b/sonar-server/src/test/java/org/sonar/server/issue/IssueUpdaterTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/issue/IssueUpdaterTest.java rename to sonar-server/src/test/java/org/sonar/server/issue/IssueUpdaterTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/issue/IssuesFinderSortTest.java b/sonar-server/src/test/java/org/sonar/server/issue/IssuesFinderSortTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/issue/IssuesFinderSortTest.java rename to sonar-server/src/test/java/org/sonar/server/issue/IssuesFinderSortTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/issue/RemoveTagsActionTest.java b/sonar-server/src/test/java/org/sonar/server/issue/RemoveTagsActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/issue/RemoveTagsActionTest.java rename to sonar-server/src/test/java/org/sonar/server/issue/RemoveTagsActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/issue/ResultTest.java b/sonar-server/src/test/java/org/sonar/server/issue/ResultTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/issue/ResultTest.java rename to sonar-server/src/test/java/org/sonar/server/issue/ResultTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/issue/RulesAggregation.java b/sonar-server/src/test/java/org/sonar/server/issue/RulesAggregation.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/issue/RulesAggregation.java rename to sonar-server/src/test/java/org/sonar/server/issue/RulesAggregation.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/issue/RulesAggregationTest.java b/sonar-server/src/test/java/org/sonar/server/issue/RulesAggregationTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/issue/RulesAggregationTest.java rename to sonar-server/src/test/java/org/sonar/server/issue/RulesAggregationTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/issue/ServerIssueStorageTest.java b/sonar-server/src/test/java/org/sonar/server/issue/ServerIssueStorageTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/issue/ServerIssueStorageTest.java rename to sonar-server/src/test/java/org/sonar/server/issue/ServerIssueStorageTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/issue/SetSeverityActionTest.java b/sonar-server/src/test/java/org/sonar/server/issue/SetSeverityActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/issue/SetSeverityActionTest.java rename to sonar-server/src/test/java/org/sonar/server/issue/SetSeverityActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/issue/SetTypeActionTest.java b/sonar-server/src/test/java/org/sonar/server/issue/SetTypeActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/issue/SetTypeActionTest.java rename to sonar-server/src/test/java/org/sonar/server/issue/SetTypeActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/issue/TransitionActionTest.java b/sonar-server/src/test/java/org/sonar/server/issue/TransitionActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/issue/TransitionActionTest.java rename to sonar-server/src/test/java/org/sonar/server/issue/TransitionActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/issue/TransitionServiceTest.java b/sonar-server/src/test/java/org/sonar/server/issue/TransitionServiceTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/issue/TransitionServiceTest.java rename to sonar-server/src/test/java/org/sonar/server/issue/TransitionServiceTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/issue/index/IssueIndexDebtTest.java b/sonar-server/src/test/java/org/sonar/server/issue/index/IssueIndexDebtTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/issue/index/IssueIndexDebtTest.java rename to sonar-server/src/test/java/org/sonar/server/issue/index/IssueIndexDebtTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/issue/index/IssueIndexDefinitionTest.java b/sonar-server/src/test/java/org/sonar/server/issue/index/IssueIndexDefinitionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/issue/index/IssueIndexDefinitionTest.java rename to sonar-server/src/test/java/org/sonar/server/issue/index/IssueIndexDefinitionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/issue/index/IssueIndexTest.java b/sonar-server/src/test/java/org/sonar/server/issue/index/IssueIndexTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/issue/index/IssueIndexTest.java rename to sonar-server/src/test/java/org/sonar/server/issue/index/IssueIndexTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/issue/index/IssueIndexerTest.java b/sonar-server/src/test/java/org/sonar/server/issue/index/IssueIndexerTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/issue/index/IssueIndexerTest.java rename to sonar-server/src/test/java/org/sonar/server/issue/index/IssueIndexerTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/issue/index/IssueIteratorFactoryTest.java b/sonar-server/src/test/java/org/sonar/server/issue/index/IssueIteratorFactoryTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/issue/index/IssueIteratorFactoryTest.java rename to sonar-server/src/test/java/org/sonar/server/issue/index/IssueIteratorFactoryTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/issue/notification/ChangesOnMyIssueNotificationDispatcherTest.java b/sonar-server/src/test/java/org/sonar/server/issue/notification/ChangesOnMyIssueNotificationDispatcherTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/issue/notification/ChangesOnMyIssueNotificationDispatcherTest.java rename to sonar-server/src/test/java/org/sonar/server/issue/notification/ChangesOnMyIssueNotificationDispatcherTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/issue/notification/DoNotFixNotificationDispatcherTest.java b/sonar-server/src/test/java/org/sonar/server/issue/notification/DoNotFixNotificationDispatcherTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/issue/notification/DoNotFixNotificationDispatcherTest.java rename to sonar-server/src/test/java/org/sonar/server/issue/notification/DoNotFixNotificationDispatcherTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/issue/notification/IssueChangeNotificationTest.java b/sonar-server/src/test/java/org/sonar/server/issue/notification/IssueChangeNotificationTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/issue/notification/IssueChangeNotificationTest.java rename to sonar-server/src/test/java/org/sonar/server/issue/notification/IssueChangeNotificationTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/issue/notification/IssueChangesEmailTemplateTest.java b/sonar-server/src/test/java/org/sonar/server/issue/notification/IssueChangesEmailTemplateTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/issue/notification/IssueChangesEmailTemplateTest.java rename to sonar-server/src/test/java/org/sonar/server/issue/notification/IssueChangesEmailTemplateTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/issue/notification/MyNewIssuesEmailTemplateTest.java b/sonar-server/src/test/java/org/sonar/server/issue/notification/MyNewIssuesEmailTemplateTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/issue/notification/MyNewIssuesEmailTemplateTest.java rename to sonar-server/src/test/java/org/sonar/server/issue/notification/MyNewIssuesEmailTemplateTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/issue/notification/MyNewIssuesNotificationDispatcherTest.java b/sonar-server/src/test/java/org/sonar/server/issue/notification/MyNewIssuesNotificationDispatcherTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/issue/notification/MyNewIssuesNotificationDispatcherTest.java rename to sonar-server/src/test/java/org/sonar/server/issue/notification/MyNewIssuesNotificationDispatcherTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/issue/notification/MyNewIssuesNotificationTest.java b/sonar-server/src/test/java/org/sonar/server/issue/notification/MyNewIssuesNotificationTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/issue/notification/MyNewIssuesNotificationTest.java rename to sonar-server/src/test/java/org/sonar/server/issue/notification/MyNewIssuesNotificationTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/issue/notification/NewIssuesEmailTemplateTest.java b/sonar-server/src/test/java/org/sonar/server/issue/notification/NewIssuesEmailTemplateTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/issue/notification/NewIssuesEmailTemplateTest.java rename to sonar-server/src/test/java/org/sonar/server/issue/notification/NewIssuesEmailTemplateTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/issue/notification/NewIssuesNotificationDispatcherTest.java b/sonar-server/src/test/java/org/sonar/server/issue/notification/NewIssuesNotificationDispatcherTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/issue/notification/NewIssuesNotificationDispatcherTest.java rename to sonar-server/src/test/java/org/sonar/server/issue/notification/NewIssuesNotificationDispatcherTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/issue/notification/NewIssuesNotificationTest.java b/sonar-server/src/test/java/org/sonar/server/issue/notification/NewIssuesNotificationTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/issue/notification/NewIssuesNotificationTest.java rename to sonar-server/src/test/java/org/sonar/server/issue/notification/NewIssuesNotificationTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/issue/notification/NewIssuesStatisticsTest.java b/sonar-server/src/test/java/org/sonar/server/issue/notification/NewIssuesStatisticsTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/issue/notification/NewIssuesStatisticsTest.java rename to sonar-server/src/test/java/org/sonar/server/issue/notification/NewIssuesStatisticsTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/issue/workflow/IsBeingClosedTest.java b/sonar-server/src/test/java/org/sonar/server/issue/workflow/IsBeingClosedTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/issue/workflow/IsBeingClosedTest.java rename to sonar-server/src/test/java/org/sonar/server/issue/workflow/IsBeingClosedTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/issue/workflow/IssueWorkflowTest.java b/sonar-server/src/test/java/org/sonar/server/issue/workflow/IssueWorkflowTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/issue/workflow/IssueWorkflowTest.java rename to sonar-server/src/test/java/org/sonar/server/issue/workflow/IssueWorkflowTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/issue/workflow/SetCloseDateTest.java b/sonar-server/src/test/java/org/sonar/server/issue/workflow/SetCloseDateTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/issue/workflow/SetCloseDateTest.java rename to sonar-server/src/test/java/org/sonar/server/issue/workflow/SetCloseDateTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/issue/workflow/SetClosedTest.java b/sonar-server/src/test/java/org/sonar/server/issue/workflow/SetClosedTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/issue/workflow/SetClosedTest.java rename to sonar-server/src/test/java/org/sonar/server/issue/workflow/SetClosedTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/issue/workflow/SetResolutionTest.java b/sonar-server/src/test/java/org/sonar/server/issue/workflow/SetResolutionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/issue/workflow/SetResolutionTest.java rename to sonar-server/src/test/java/org/sonar/server/issue/workflow/SetResolutionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/issue/workflow/StateMachineTest.java b/sonar-server/src/test/java/org/sonar/server/issue/workflow/StateMachineTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/issue/workflow/StateMachineTest.java rename to sonar-server/src/test/java/org/sonar/server/issue/workflow/StateMachineTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/issue/workflow/StateTest.java b/sonar-server/src/test/java/org/sonar/server/issue/workflow/StateTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/issue/workflow/StateTest.java rename to sonar-server/src/test/java/org/sonar/server/issue/workflow/StateTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/issue/workflow/TransitionTest.java b/sonar-server/src/test/java/org/sonar/server/issue/workflow/TransitionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/issue/workflow/TransitionTest.java rename to sonar-server/src/test/java/org/sonar/server/issue/workflow/TransitionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/issue/workflow/UnsetAssigneeTest.java b/sonar-server/src/test/java/org/sonar/server/issue/workflow/UnsetAssigneeTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/issue/workflow/UnsetAssigneeTest.java rename to sonar-server/src/test/java/org/sonar/server/issue/workflow/UnsetAssigneeTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/issue/ws/AddCommentActionTest.java b/sonar-server/src/test/java/org/sonar/server/issue/ws/AddCommentActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/issue/ws/AddCommentActionTest.java rename to sonar-server/src/test/java/org/sonar/server/issue/ws/AddCommentActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/issue/ws/AssignActionTest.java b/sonar-server/src/test/java/org/sonar/server/issue/ws/AssignActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/issue/ws/AssignActionTest.java rename to sonar-server/src/test/java/org/sonar/server/issue/ws/AssignActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/issue/ws/AuthorsActionTest.java b/sonar-server/src/test/java/org/sonar/server/issue/ws/AuthorsActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/issue/ws/AuthorsActionTest.java rename to sonar-server/src/test/java/org/sonar/server/issue/ws/AuthorsActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/issue/ws/AvatarResolverImplTest.java b/sonar-server/src/test/java/org/sonar/server/issue/ws/AvatarResolverImplTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/issue/ws/AvatarResolverImplTest.java rename to sonar-server/src/test/java/org/sonar/server/issue/ws/AvatarResolverImplTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/issue/ws/BulkChangeActionTest.java b/sonar-server/src/test/java/org/sonar/server/issue/ws/BulkChangeActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/issue/ws/BulkChangeActionTest.java rename to sonar-server/src/test/java/org/sonar/server/issue/ws/BulkChangeActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/issue/ws/ChangelogActionTest.java b/sonar-server/src/test/java/org/sonar/server/issue/ws/ChangelogActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/issue/ws/ChangelogActionTest.java rename to sonar-server/src/test/java/org/sonar/server/issue/ws/ChangelogActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/issue/ws/ComponentTagsActionTest.java b/sonar-server/src/test/java/org/sonar/server/issue/ws/ComponentTagsActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/issue/ws/ComponentTagsActionTest.java rename to sonar-server/src/test/java/org/sonar/server/issue/ws/ComponentTagsActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/issue/ws/DeleteCommentActionTest.java b/sonar-server/src/test/java/org/sonar/server/issue/ws/DeleteCommentActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/issue/ws/DeleteCommentActionTest.java rename to sonar-server/src/test/java/org/sonar/server/issue/ws/DeleteCommentActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/issue/ws/DoTransitionActionTest.java b/sonar-server/src/test/java/org/sonar/server/issue/ws/DoTransitionActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/issue/ws/DoTransitionActionTest.java rename to sonar-server/src/test/java/org/sonar/server/issue/ws/DoTransitionActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/issue/ws/EditCommentActionTest.java b/sonar-server/src/test/java/org/sonar/server/issue/ws/EditCommentActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/issue/ws/EditCommentActionTest.java rename to sonar-server/src/test/java/org/sonar/server/issue/ws/EditCommentActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/issue/ws/IssueWsModuleTest.java b/sonar-server/src/test/java/org/sonar/server/issue/ws/IssueWsModuleTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/issue/ws/IssueWsModuleTest.java rename to sonar-server/src/test/java/org/sonar/server/issue/ws/IssueWsModuleTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/issue/ws/SearchActionComponentsMediumTest.java b/sonar-server/src/test/java/org/sonar/server/issue/ws/SearchActionComponentsMediumTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/issue/ws/SearchActionComponentsMediumTest.java rename to sonar-server/src/test/java/org/sonar/server/issue/ws/SearchActionComponentsMediumTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/issue/ws/SearchActionMediumTest.java b/sonar-server/src/test/java/org/sonar/server/issue/ws/SearchActionMediumTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/issue/ws/SearchActionMediumTest.java rename to sonar-server/src/test/java/org/sonar/server/issue/ws/SearchActionMediumTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/issue/ws/SearchActionTest.java b/sonar-server/src/test/java/org/sonar/server/issue/ws/SearchActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/issue/ws/SearchActionTest.java rename to sonar-server/src/test/java/org/sonar/server/issue/ws/SearchActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/issue/ws/SetSeverityActionTest.java b/sonar-server/src/test/java/org/sonar/server/issue/ws/SetSeverityActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/issue/ws/SetSeverityActionTest.java rename to sonar-server/src/test/java/org/sonar/server/issue/ws/SetSeverityActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/issue/ws/SetTagsActionTest.java b/sonar-server/src/test/java/org/sonar/server/issue/ws/SetTagsActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/issue/ws/SetTagsActionTest.java rename to sonar-server/src/test/java/org/sonar/server/issue/ws/SetTagsActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/issue/ws/SetTypeActionTest.java b/sonar-server/src/test/java/org/sonar/server/issue/ws/SetTypeActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/issue/ws/SetTypeActionTest.java rename to sonar-server/src/test/java/org/sonar/server/issue/ws/SetTypeActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/issue/ws/TagsActionTest.java b/sonar-server/src/test/java/org/sonar/server/issue/ws/TagsActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/issue/ws/TagsActionTest.java rename to sonar-server/src/test/java/org/sonar/server/issue/ws/TagsActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/language/LanguageTesting.java b/sonar-server/src/test/java/org/sonar/server/language/LanguageTesting.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/language/LanguageTesting.java rename to sonar-server/src/test/java/org/sonar/server/language/LanguageTesting.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/language/ws/LanguageWsTest.java b/sonar-server/src/test/java/org/sonar/server/language/ws/LanguageWsTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/language/ws/LanguageWsTest.java rename to sonar-server/src/test/java/org/sonar/server/language/ws/LanguageWsTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/license/ws/LicensesWsModuleTest.java b/sonar-server/src/test/java/org/sonar/server/license/ws/LicensesWsModuleTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/license/ws/LicensesWsModuleTest.java rename to sonar-server/src/test/java/org/sonar/server/license/ws/LicensesWsModuleTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/license/ws/ListActionTest.java b/sonar-server/src/test/java/org/sonar/server/license/ws/ListActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/license/ws/ListActionTest.java rename to sonar-server/src/test/java/org/sonar/server/license/ws/ListActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/measure/custom/ws/CreateActionTest.java b/sonar-server/src/test/java/org/sonar/server/measure/custom/ws/CreateActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/measure/custom/ws/CreateActionTest.java rename to sonar-server/src/test/java/org/sonar/server/measure/custom/ws/CreateActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/measure/custom/ws/CustomMeasureValidatorTest.java b/sonar-server/src/test/java/org/sonar/server/measure/custom/ws/CustomMeasureValidatorTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/measure/custom/ws/CustomMeasureValidatorTest.java rename to sonar-server/src/test/java/org/sonar/server/measure/custom/ws/CustomMeasureValidatorTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/measure/custom/ws/CustomMeasuresWsModuleTest.java b/sonar-server/src/test/java/org/sonar/server/measure/custom/ws/CustomMeasuresWsModuleTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/measure/custom/ws/CustomMeasuresWsModuleTest.java rename to sonar-server/src/test/java/org/sonar/server/measure/custom/ws/CustomMeasuresWsModuleTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/measure/custom/ws/CustomMeasuresWsTest.java b/sonar-server/src/test/java/org/sonar/server/measure/custom/ws/CustomMeasuresWsTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/measure/custom/ws/CustomMeasuresWsTest.java rename to sonar-server/src/test/java/org/sonar/server/measure/custom/ws/CustomMeasuresWsTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/measure/custom/ws/DeleteActionTest.java b/sonar-server/src/test/java/org/sonar/server/measure/custom/ws/DeleteActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/measure/custom/ws/DeleteActionTest.java rename to sonar-server/src/test/java/org/sonar/server/measure/custom/ws/DeleteActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/measure/custom/ws/MetricsActionTest.java b/sonar-server/src/test/java/org/sonar/server/measure/custom/ws/MetricsActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/measure/custom/ws/MetricsActionTest.java rename to sonar-server/src/test/java/org/sonar/server/measure/custom/ws/MetricsActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/measure/custom/ws/SearchActionTest.java b/sonar-server/src/test/java/org/sonar/server/measure/custom/ws/SearchActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/measure/custom/ws/SearchActionTest.java rename to sonar-server/src/test/java/org/sonar/server/measure/custom/ws/SearchActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/measure/custom/ws/UpdateActionTest.java b/sonar-server/src/test/java/org/sonar/server/measure/custom/ws/UpdateActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/measure/custom/ws/UpdateActionTest.java rename to sonar-server/src/test/java/org/sonar/server/measure/custom/ws/UpdateActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/measure/index/ProjectMeasuresIndexTest.java b/sonar-server/src/test/java/org/sonar/server/measure/index/ProjectMeasuresIndexTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/measure/index/ProjectMeasuresIndexTest.java rename to sonar-server/src/test/java/org/sonar/server/measure/index/ProjectMeasuresIndexTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/measure/index/ProjectMeasuresIndexTextSearchTest.java b/sonar-server/src/test/java/org/sonar/server/measure/index/ProjectMeasuresIndexTextSearchTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/measure/index/ProjectMeasuresIndexTextSearchTest.java rename to sonar-server/src/test/java/org/sonar/server/measure/index/ProjectMeasuresIndexTextSearchTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/measure/index/ProjectMeasuresIndexerTest.java b/sonar-server/src/test/java/org/sonar/server/measure/index/ProjectMeasuresIndexerTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/measure/index/ProjectMeasuresIndexerTest.java rename to sonar-server/src/test/java/org/sonar/server/measure/index/ProjectMeasuresIndexerTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/measure/index/ProjectMeasuresQueryTest.java b/sonar-server/src/test/java/org/sonar/server/measure/index/ProjectMeasuresQueryTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/measure/index/ProjectMeasuresQueryTest.java rename to sonar-server/src/test/java/org/sonar/server/measure/index/ProjectMeasuresQueryTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/measure/index/ProjectsEsModuleTest.java b/sonar-server/src/test/java/org/sonar/server/measure/index/ProjectsEsModuleTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/measure/index/ProjectsEsModuleTest.java rename to sonar-server/src/test/java/org/sonar/server/measure/index/ProjectsEsModuleTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/measure/ws/ComponentActionTest.java b/sonar-server/src/test/java/org/sonar/server/measure/ws/ComponentActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/measure/ws/ComponentActionTest.java rename to sonar-server/src/test/java/org/sonar/server/measure/ws/ComponentActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/measure/ws/ComponentTreeActionTest.java b/sonar-server/src/test/java/org/sonar/server/measure/ws/ComponentTreeActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/measure/ws/ComponentTreeActionTest.java rename to sonar-server/src/test/java/org/sonar/server/measure/ws/ComponentTreeActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/measure/ws/ComponentTreeSortTest.java b/sonar-server/src/test/java/org/sonar/server/measure/ws/ComponentTreeSortTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/measure/ws/ComponentTreeSortTest.java rename to sonar-server/src/test/java/org/sonar/server/measure/ws/ComponentTreeSortTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/measure/ws/MeasureValueFormatterTest.java b/sonar-server/src/test/java/org/sonar/server/measure/ws/MeasureValueFormatterTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/measure/ws/MeasureValueFormatterTest.java rename to sonar-server/src/test/java/org/sonar/server/measure/ws/MeasureValueFormatterTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/measure/ws/MeasuresWsModuleTest.java b/sonar-server/src/test/java/org/sonar/server/measure/ws/MeasuresWsModuleTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/measure/ws/MeasuresWsModuleTest.java rename to sonar-server/src/test/java/org/sonar/server/measure/ws/MeasuresWsModuleTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/measure/ws/MeasuresWsTest.java b/sonar-server/src/test/java/org/sonar/server/measure/ws/MeasuresWsTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/measure/ws/MeasuresWsTest.java rename to sonar-server/src/test/java/org/sonar/server/measure/ws/MeasuresWsTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/measure/ws/SearchActionTest.java b/sonar-server/src/test/java/org/sonar/server/measure/ws/SearchActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/measure/ws/SearchActionTest.java rename to sonar-server/src/test/java/org/sonar/server/measure/ws/SearchActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/measure/ws/SearchHistoryActionTest.java b/sonar-server/src/test/java/org/sonar/server/measure/ws/SearchHistoryActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/measure/ws/SearchHistoryActionTest.java rename to sonar-server/src/test/java/org/sonar/server/measure/ws/SearchHistoryActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/measure/ws/TimeMachineWsTest.java b/sonar-server/src/test/java/org/sonar/server/measure/ws/TimeMachineWsTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/measure/ws/TimeMachineWsTest.java rename to sonar-server/src/test/java/org/sonar/server/measure/ws/TimeMachineWsTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/metric/CoreCustomMetricsTest.java b/sonar-server/src/test/java/org/sonar/server/metric/CoreCustomMetricsTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/metric/CoreCustomMetricsTest.java rename to sonar-server/src/test/java/org/sonar/server/metric/CoreCustomMetricsTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/metric/DefaultMetricFinderTest.java b/sonar-server/src/test/java/org/sonar/server/metric/DefaultMetricFinderTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/metric/DefaultMetricFinderTest.java rename to sonar-server/src/test/java/org/sonar/server/metric/DefaultMetricFinderTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/metric/ws/CreateActionTest.java b/sonar-server/src/test/java/org/sonar/server/metric/ws/CreateActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/metric/ws/CreateActionTest.java rename to sonar-server/src/test/java/org/sonar/server/metric/ws/CreateActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/metric/ws/DeleteActionTest.java b/sonar-server/src/test/java/org/sonar/server/metric/ws/DeleteActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/metric/ws/DeleteActionTest.java rename to sonar-server/src/test/java/org/sonar/server/metric/ws/DeleteActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/metric/ws/DomainsActionTest.java b/sonar-server/src/test/java/org/sonar/server/metric/ws/DomainsActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/metric/ws/DomainsActionTest.java rename to sonar-server/src/test/java/org/sonar/server/metric/ws/DomainsActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/metric/ws/MetricsWsModuleTest.java b/sonar-server/src/test/java/org/sonar/server/metric/ws/MetricsWsModuleTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/metric/ws/MetricsWsModuleTest.java rename to sonar-server/src/test/java/org/sonar/server/metric/ws/MetricsWsModuleTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/metric/ws/MetricsWsTest.java b/sonar-server/src/test/java/org/sonar/server/metric/ws/MetricsWsTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/metric/ws/MetricsWsTest.java rename to sonar-server/src/test/java/org/sonar/server/metric/ws/MetricsWsTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/metric/ws/SearchActionTest.java b/sonar-server/src/test/java/org/sonar/server/metric/ws/SearchActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/metric/ws/SearchActionTest.java rename to sonar-server/src/test/java/org/sonar/server/metric/ws/SearchActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/metric/ws/TypesActionTest.java b/sonar-server/src/test/java/org/sonar/server/metric/ws/TypesActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/metric/ws/TypesActionTest.java rename to sonar-server/src/test/java/org/sonar/server/metric/ws/TypesActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/metric/ws/UpdateActionTest.java b/sonar-server/src/test/java/org/sonar/server/metric/ws/UpdateActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/metric/ws/UpdateActionTest.java rename to sonar-server/src/test/java/org/sonar/server/metric/ws/UpdateActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/notification/DefaultNotificationManagerTest.java b/sonar-server/src/test/java/org/sonar/server/notification/DefaultNotificationManagerTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/notification/DefaultNotificationManagerTest.java rename to sonar-server/src/test/java/org/sonar/server/notification/DefaultNotificationManagerTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/notification/NotificationCenterTest.java b/sonar-server/src/test/java/org/sonar/server/notification/NotificationCenterTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/notification/NotificationCenterTest.java rename to sonar-server/src/test/java/org/sonar/server/notification/NotificationCenterTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/notification/NotificationChannelTest.java b/sonar-server/src/test/java/org/sonar/server/notification/NotificationChannelTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/notification/NotificationChannelTest.java rename to sonar-server/src/test/java/org/sonar/server/notification/NotificationChannelTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/notification/NotificationDaemonTest.java b/sonar-server/src/test/java/org/sonar/server/notification/NotificationDaemonTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/notification/NotificationDaemonTest.java rename to sonar-server/src/test/java/org/sonar/server/notification/NotificationDaemonTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/notification/NotificationDispatcherMetadataTest.java b/sonar-server/src/test/java/org/sonar/server/notification/NotificationDispatcherMetadataTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/notification/NotificationDispatcherMetadataTest.java rename to sonar-server/src/test/java/org/sonar/server/notification/NotificationDispatcherMetadataTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/notification/NotificationDispatcherTest.java b/sonar-server/src/test/java/org/sonar/server/notification/NotificationDispatcherTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/notification/NotificationDispatcherTest.java rename to sonar-server/src/test/java/org/sonar/server/notification/NotificationDispatcherTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/notification/NotificationModuleTest.java b/sonar-server/src/test/java/org/sonar/server/notification/NotificationModuleTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/notification/NotificationModuleTest.java rename to sonar-server/src/test/java/org/sonar/server/notification/NotificationModuleTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/notification/NotificationTest.java b/sonar-server/src/test/java/org/sonar/server/notification/NotificationTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/notification/NotificationTest.java rename to sonar-server/src/test/java/org/sonar/server/notification/NotificationTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/notification/email/AlertsEmailTemplateTest.java b/sonar-server/src/test/java/org/sonar/server/notification/email/AlertsEmailTemplateTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/notification/email/AlertsEmailTemplateTest.java rename to sonar-server/src/test/java/org/sonar/server/notification/email/AlertsEmailTemplateTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/notification/email/EmailNotificationChannelTest.java b/sonar-server/src/test/java/org/sonar/server/notification/email/EmailNotificationChannelTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/notification/email/EmailNotificationChannelTest.java rename to sonar-server/src/test/java/org/sonar/server/notification/email/EmailNotificationChannelTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/notification/ws/AddActionTest.java b/sonar-server/src/test/java/org/sonar/server/notification/ws/AddActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/notification/ws/AddActionTest.java rename to sonar-server/src/test/java/org/sonar/server/notification/ws/AddActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/notification/ws/ListActionTest.java b/sonar-server/src/test/java/org/sonar/server/notification/ws/ListActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/notification/ws/ListActionTest.java rename to sonar-server/src/test/java/org/sonar/server/notification/ws/ListActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/notification/ws/NotificationWsModuleTest.java b/sonar-server/src/test/java/org/sonar/server/notification/ws/NotificationWsModuleTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/notification/ws/NotificationWsModuleTest.java rename to sonar-server/src/test/java/org/sonar/server/notification/ws/NotificationWsModuleTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/notification/ws/NotificationsWsTest.java b/sonar-server/src/test/java/org/sonar/server/notification/ws/NotificationsWsTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/notification/ws/NotificationsWsTest.java rename to sonar-server/src/test/java/org/sonar/server/notification/ws/NotificationsWsTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/notification/ws/RemoveActionTest.java b/sonar-server/src/test/java/org/sonar/server/notification/ws/RemoveActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/notification/ws/RemoveActionTest.java rename to sonar-server/src/test/java/org/sonar/server/notification/ws/RemoveActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/organization/BillingValidationsProxyImplTest.java b/sonar-server/src/test/java/org/sonar/server/organization/BillingValidationsProxyImplTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/organization/BillingValidationsProxyImplTest.java rename to sonar-server/src/test/java/org/sonar/server/organization/BillingValidationsProxyImplTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/organization/DefaultOrganizationEnforcerTest.java b/sonar-server/src/test/java/org/sonar/server/organization/DefaultOrganizationEnforcerTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/organization/DefaultOrganizationEnforcerTest.java rename to sonar-server/src/test/java/org/sonar/server/organization/DefaultOrganizationEnforcerTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/organization/DefaultOrganizationProviderImplTest.java b/sonar-server/src/test/java/org/sonar/server/organization/DefaultOrganizationProviderImplTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/organization/DefaultOrganizationProviderImplTest.java rename to sonar-server/src/test/java/org/sonar/server/organization/DefaultOrganizationProviderImplTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/organization/DefaultOrganizationTest.java b/sonar-server/src/test/java/org/sonar/server/organization/DefaultOrganizationTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/organization/DefaultOrganizationTest.java rename to sonar-server/src/test/java/org/sonar/server/organization/DefaultOrganizationTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/organization/OrganizationCreationImplTest.java b/sonar-server/src/test/java/org/sonar/server/organization/OrganizationCreationImplTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/organization/OrganizationCreationImplTest.java rename to sonar-server/src/test/java/org/sonar/server/organization/OrganizationCreationImplTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/organization/OrganizationFlagsImplTest.java b/sonar-server/src/test/java/org/sonar/server/organization/OrganizationFlagsImplTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/organization/OrganizationFlagsImplTest.java rename to sonar-server/src/test/java/org/sonar/server/organization/OrganizationFlagsImplTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/organization/OrganizationValidationImplTest.java b/sonar-server/src/test/java/org/sonar/server/organization/OrganizationValidationImplTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/organization/OrganizationValidationImplTest.java rename to sonar-server/src/test/java/org/sonar/server/organization/OrganizationValidationImplTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/organization/TestDefaultOrganizationProvider.java b/sonar-server/src/test/java/org/sonar/server/organization/TestDefaultOrganizationProvider.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/organization/TestDefaultOrganizationProvider.java rename to sonar-server/src/test/java/org/sonar/server/organization/TestDefaultOrganizationProvider.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/organization/TestOrganizationFlags.java b/sonar-server/src/test/java/org/sonar/server/organization/TestOrganizationFlags.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/organization/TestOrganizationFlags.java rename to sonar-server/src/test/java/org/sonar/server/organization/TestOrganizationFlags.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/organization/ws/AddMemberActionTest.java b/sonar-server/src/test/java/org/sonar/server/organization/ws/AddMemberActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/organization/ws/AddMemberActionTest.java rename to sonar-server/src/test/java/org/sonar/server/organization/ws/AddMemberActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/organization/ws/CreateActionTest.java b/sonar-server/src/test/java/org/sonar/server/organization/ws/CreateActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/organization/ws/CreateActionTest.java rename to sonar-server/src/test/java/org/sonar/server/organization/ws/CreateActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/organization/ws/DeleteActionTest.java b/sonar-server/src/test/java/org/sonar/server/organization/ws/DeleteActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/organization/ws/DeleteActionTest.java rename to sonar-server/src/test/java/org/sonar/server/organization/ws/DeleteActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/organization/ws/EnableSupportActionTest.java b/sonar-server/src/test/java/org/sonar/server/organization/ws/EnableSupportActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/organization/ws/EnableSupportActionTest.java rename to sonar-server/src/test/java/org/sonar/server/organization/ws/EnableSupportActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/organization/ws/OrganizationsWsModuleTest.java b/sonar-server/src/test/java/org/sonar/server/organization/ws/OrganizationsWsModuleTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/organization/ws/OrganizationsWsModuleTest.java rename to sonar-server/src/test/java/org/sonar/server/organization/ws/OrganizationsWsModuleTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/organization/ws/OrganizationsWsTestSupport.java b/sonar-server/src/test/java/org/sonar/server/organization/ws/OrganizationsWsTestSupport.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/organization/ws/OrganizationsWsTestSupport.java rename to sonar-server/src/test/java/org/sonar/server/organization/ws/OrganizationsWsTestSupport.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/organization/ws/RemoveMemberActionTest.java b/sonar-server/src/test/java/org/sonar/server/organization/ws/RemoveMemberActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/organization/ws/RemoveMemberActionTest.java rename to sonar-server/src/test/java/org/sonar/server/organization/ws/RemoveMemberActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/organization/ws/SearchActionTest.java b/sonar-server/src/test/java/org/sonar/server/organization/ws/SearchActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/organization/ws/SearchActionTest.java rename to sonar-server/src/test/java/org/sonar/server/organization/ws/SearchActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/organization/ws/SearchMembersActionTest.java b/sonar-server/src/test/java/org/sonar/server/organization/ws/SearchMembersActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/organization/ws/SearchMembersActionTest.java rename to sonar-server/src/test/java/org/sonar/server/organization/ws/SearchMembersActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/organization/ws/SearchMyOrganizationsActionTest.java b/sonar-server/src/test/java/org/sonar/server/organization/ws/SearchMyOrganizationsActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/organization/ws/SearchMyOrganizationsActionTest.java rename to sonar-server/src/test/java/org/sonar/server/organization/ws/SearchMyOrganizationsActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/organization/ws/UpdateActionTest.java b/sonar-server/src/test/java/org/sonar/server/organization/ws/UpdateActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/organization/ws/UpdateActionTest.java rename to sonar-server/src/test/java/org/sonar/server/organization/ws/UpdateActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/organization/ws/UpdateProjectVisibilityActionTest.java b/sonar-server/src/test/java/org/sonar/server/organization/ws/UpdateProjectVisibilityActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/organization/ws/UpdateProjectVisibilityActionTest.java rename to sonar-server/src/test/java/org/sonar/server/organization/ws/UpdateProjectVisibilityActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/permission/ApplyPermissionTemplateQueryTest.java b/sonar-server/src/test/java/org/sonar/server/permission/ApplyPermissionTemplateQueryTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/permission/ApplyPermissionTemplateQueryTest.java rename to sonar-server/src/test/java/org/sonar/server/permission/ApplyPermissionTemplateQueryTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/permission/GroupPermissionChangerTest.java b/sonar-server/src/test/java/org/sonar/server/permission/GroupPermissionChangerTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/permission/GroupPermissionChangerTest.java rename to sonar-server/src/test/java/org/sonar/server/permission/GroupPermissionChangerTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/permission/PermissionTemplateServiceTest.java b/sonar-server/src/test/java/org/sonar/server/permission/PermissionTemplateServiceTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/permission/PermissionTemplateServiceTest.java rename to sonar-server/src/test/java/org/sonar/server/permission/PermissionTemplateServiceTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/permission/UserPermissionChangerTest.java b/sonar-server/src/test/java/org/sonar/server/permission/UserPermissionChangerTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/permission/UserPermissionChangerTest.java rename to sonar-server/src/test/java/org/sonar/server/permission/UserPermissionChangerTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/permission/index/AuthorizationTypeSupportTest.java b/sonar-server/src/test/java/org/sonar/server/permission/index/AuthorizationTypeSupportTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/permission/index/AuthorizationTypeSupportTest.java rename to sonar-server/src/test/java/org/sonar/server/permission/index/AuthorizationTypeSupportTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/permission/index/FooIndex.java b/sonar-server/src/test/java/org/sonar/server/permission/index/FooIndex.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/permission/index/FooIndex.java rename to sonar-server/src/test/java/org/sonar/server/permission/index/FooIndex.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/permission/index/FooIndexDefinition.java b/sonar-server/src/test/java/org/sonar/server/permission/index/FooIndexDefinition.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/permission/index/FooIndexDefinition.java rename to sonar-server/src/test/java/org/sonar/server/permission/index/FooIndexDefinition.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/permission/index/FooIndexer.java b/sonar-server/src/test/java/org/sonar/server/permission/index/FooIndexer.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/permission/index/FooIndexer.java rename to sonar-server/src/test/java/org/sonar/server/permission/index/FooIndexer.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/permission/index/PermissionIndexerDaoTest.java b/sonar-server/src/test/java/org/sonar/server/permission/index/PermissionIndexerDaoTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/permission/index/PermissionIndexerDaoTest.java rename to sonar-server/src/test/java/org/sonar/server/permission/index/PermissionIndexerDaoTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/permission/index/PermissionIndexerTest.java b/sonar-server/src/test/java/org/sonar/server/permission/index/PermissionIndexerTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/permission/index/PermissionIndexerTest.java rename to sonar-server/src/test/java/org/sonar/server/permission/index/PermissionIndexerTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/permission/index/PermissionIndexerTester.java b/sonar-server/src/test/java/org/sonar/server/permission/index/PermissionIndexerTester.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/permission/index/PermissionIndexerTester.java rename to sonar-server/src/test/java/org/sonar/server/permission/index/PermissionIndexerTester.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/permission/ws/AddGroupActionTest.java b/sonar-server/src/test/java/org/sonar/server/permission/ws/AddGroupActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/permission/ws/AddGroupActionTest.java rename to sonar-server/src/test/java/org/sonar/server/permission/ws/AddGroupActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/permission/ws/AddUserActionTest.java b/sonar-server/src/test/java/org/sonar/server/permission/ws/AddUserActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/permission/ws/AddUserActionTest.java rename to sonar-server/src/test/java/org/sonar/server/permission/ws/AddUserActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/permission/ws/BasePermissionWsTest.java b/sonar-server/src/test/java/org/sonar/server/permission/ws/BasePermissionWsTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/permission/ws/BasePermissionWsTest.java rename to sonar-server/src/test/java/org/sonar/server/permission/ws/BasePermissionWsTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/permission/ws/GroupsActionTest.java b/sonar-server/src/test/java/org/sonar/server/permission/ws/GroupsActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/permission/ws/GroupsActionTest.java rename to sonar-server/src/test/java/org/sonar/server/permission/ws/GroupsActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/permission/ws/PermissionsWsModuleTest.java b/sonar-server/src/test/java/org/sonar/server/permission/ws/PermissionsWsModuleTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/permission/ws/PermissionsWsModuleTest.java rename to sonar-server/src/test/java/org/sonar/server/permission/ws/PermissionsWsModuleTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/permission/ws/PermissionsWsTest.java b/sonar-server/src/test/java/org/sonar/server/permission/ws/PermissionsWsTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/permission/ws/PermissionsWsTest.java rename to sonar-server/src/test/java/org/sonar/server/permission/ws/PermissionsWsTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/permission/ws/RemoveGroupActionTest.java b/sonar-server/src/test/java/org/sonar/server/permission/ws/RemoveGroupActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/permission/ws/RemoveGroupActionTest.java rename to sonar-server/src/test/java/org/sonar/server/permission/ws/RemoveGroupActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/permission/ws/RemoveUserActionTest.java b/sonar-server/src/test/java/org/sonar/server/permission/ws/RemoveUserActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/permission/ws/RemoveUserActionTest.java rename to sonar-server/src/test/java/org/sonar/server/permission/ws/RemoveUserActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/permission/ws/SearchGlobalPermissionsActionTest.java b/sonar-server/src/test/java/org/sonar/server/permission/ws/SearchGlobalPermissionsActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/permission/ws/SearchGlobalPermissionsActionTest.java rename to sonar-server/src/test/java/org/sonar/server/permission/ws/SearchGlobalPermissionsActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/permission/ws/SearchProjectPermissionsActionTest.java b/sonar-server/src/test/java/org/sonar/server/permission/ws/SearchProjectPermissionsActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/permission/ws/SearchProjectPermissionsActionTest.java rename to sonar-server/src/test/java/org/sonar/server/permission/ws/SearchProjectPermissionsActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/permission/ws/SearchProjectPermissionsDataTest.java b/sonar-server/src/test/java/org/sonar/server/permission/ws/SearchProjectPermissionsDataTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/permission/ws/SearchProjectPermissionsDataTest.java rename to sonar-server/src/test/java/org/sonar/server/permission/ws/SearchProjectPermissionsDataTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/permission/ws/UsersActionTest.java b/sonar-server/src/test/java/org/sonar/server/permission/ws/UsersActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/permission/ws/UsersActionTest.java rename to sonar-server/src/test/java/org/sonar/server/permission/ws/UsersActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/AddGroupToTemplateActionTest.java b/sonar-server/src/test/java/org/sonar/server/permission/ws/template/AddGroupToTemplateActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/AddGroupToTemplateActionTest.java rename to sonar-server/src/test/java/org/sonar/server/permission/ws/template/AddGroupToTemplateActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/AddProjectCreatorToTemplateActionTest.java b/sonar-server/src/test/java/org/sonar/server/permission/ws/template/AddProjectCreatorToTemplateActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/AddProjectCreatorToTemplateActionTest.java rename to sonar-server/src/test/java/org/sonar/server/permission/ws/template/AddProjectCreatorToTemplateActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/AddUserToTemplateActionTest.java b/sonar-server/src/test/java/org/sonar/server/permission/ws/template/AddUserToTemplateActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/AddUserToTemplateActionTest.java rename to sonar-server/src/test/java/org/sonar/server/permission/ws/template/AddUserToTemplateActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/ApplyTemplateActionTest.java b/sonar-server/src/test/java/org/sonar/server/permission/ws/template/ApplyTemplateActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/ApplyTemplateActionTest.java rename to sonar-server/src/test/java/org/sonar/server/permission/ws/template/ApplyTemplateActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/BulkApplyTemplateActionTest.java b/sonar-server/src/test/java/org/sonar/server/permission/ws/template/BulkApplyTemplateActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/BulkApplyTemplateActionTest.java rename to sonar-server/src/test/java/org/sonar/server/permission/ws/template/BulkApplyTemplateActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/CreateTemplateActionTest.java b/sonar-server/src/test/java/org/sonar/server/permission/ws/template/CreateTemplateActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/CreateTemplateActionTest.java rename to sonar-server/src/test/java/org/sonar/server/permission/ws/template/CreateTemplateActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/DefaultTemplatesResolverImplTest.java b/sonar-server/src/test/java/org/sonar/server/permission/ws/template/DefaultTemplatesResolverImplTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/DefaultTemplatesResolverImplTest.java rename to sonar-server/src/test/java/org/sonar/server/permission/ws/template/DefaultTemplatesResolverImplTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/DefaultTemplatesResolverRule.java b/sonar-server/src/test/java/org/sonar/server/permission/ws/template/DefaultTemplatesResolverRule.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/DefaultTemplatesResolverRule.java rename to sonar-server/src/test/java/org/sonar/server/permission/ws/template/DefaultTemplatesResolverRule.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/DeleteTemplateActionTest.java b/sonar-server/src/test/java/org/sonar/server/permission/ws/template/DeleteTemplateActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/DeleteTemplateActionTest.java rename to sonar-server/src/test/java/org/sonar/server/permission/ws/template/DeleteTemplateActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/PermissionTemplateDtoToPermissionTemplateResponseTest.java b/sonar-server/src/test/java/org/sonar/server/permission/ws/template/PermissionTemplateDtoToPermissionTemplateResponseTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/PermissionTemplateDtoToPermissionTemplateResponseTest.java rename to sonar-server/src/test/java/org/sonar/server/permission/ws/template/PermissionTemplateDtoToPermissionTemplateResponseTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/RemoveGroupFromTemplateActionTest.java b/sonar-server/src/test/java/org/sonar/server/permission/ws/template/RemoveGroupFromTemplateActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/RemoveGroupFromTemplateActionTest.java rename to sonar-server/src/test/java/org/sonar/server/permission/ws/template/RemoveGroupFromTemplateActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/RemoveProjectCreatorFromTemplateActionTest.java b/sonar-server/src/test/java/org/sonar/server/permission/ws/template/RemoveProjectCreatorFromTemplateActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/RemoveProjectCreatorFromTemplateActionTest.java rename to sonar-server/src/test/java/org/sonar/server/permission/ws/template/RemoveProjectCreatorFromTemplateActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/RemoveUserFromTemplateActionTest.java b/sonar-server/src/test/java/org/sonar/server/permission/ws/template/RemoveUserFromTemplateActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/RemoveUserFromTemplateActionTest.java rename to sonar-server/src/test/java/org/sonar/server/permission/ws/template/RemoveUserFromTemplateActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/SearchTemplatesActionTest.java b/sonar-server/src/test/java/org/sonar/server/permission/ws/template/SearchTemplatesActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/SearchTemplatesActionTest.java rename to sonar-server/src/test/java/org/sonar/server/permission/ws/template/SearchTemplatesActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/SearchTemplatesDataTest.java b/sonar-server/src/test/java/org/sonar/server/permission/ws/template/SearchTemplatesDataTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/SearchTemplatesDataTest.java rename to sonar-server/src/test/java/org/sonar/server/permission/ws/template/SearchTemplatesDataTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/SetDefaultTemplateActionTest.java b/sonar-server/src/test/java/org/sonar/server/permission/ws/template/SetDefaultTemplateActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/SetDefaultTemplateActionTest.java rename to sonar-server/src/test/java/org/sonar/server/permission/ws/template/SetDefaultTemplateActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/TemplateGroupsActionTest.java b/sonar-server/src/test/java/org/sonar/server/permission/ws/template/TemplateGroupsActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/TemplateGroupsActionTest.java rename to sonar-server/src/test/java/org/sonar/server/permission/ws/template/TemplateGroupsActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/TemplateUsersActionTest.java b/sonar-server/src/test/java/org/sonar/server/permission/ws/template/TemplateUsersActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/TemplateUsersActionTest.java rename to sonar-server/src/test/java/org/sonar/server/permission/ws/template/TemplateUsersActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/UpdateTemplateActionTest.java b/sonar-server/src/test/java/org/sonar/server/permission/ws/template/UpdateTemplateActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/UpdateTemplateActionTest.java rename to sonar-server/src/test/java/org/sonar/server/permission/ws/template/UpdateTemplateActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/platform/BackendCleanupTest.java b/sonar-server/src/test/java/org/sonar/server/platform/BackendCleanupTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/platform/BackendCleanupTest.java rename to sonar-server/src/test/java/org/sonar/server/platform/BackendCleanupTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/platform/ClassLoaderUtilsTest.java b/sonar-server/src/test/java/org/sonar/server/platform/ClassLoaderUtilsTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/platform/ClassLoaderUtilsTest.java rename to sonar-server/src/test/java/org/sonar/server/platform/ClassLoaderUtilsTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/platform/DatabaseServerCompatibilityTest.java b/sonar-server/src/test/java/org/sonar/server/platform/DatabaseServerCompatibilityTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/platform/DatabaseServerCompatibilityTest.java rename to sonar-server/src/test/java/org/sonar/server/platform/DatabaseServerCompatibilityTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/platform/DefaultServerUpgradeStatusTest.java b/sonar-server/src/test/java/org/sonar/server/platform/DefaultServerUpgradeStatusTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/platform/DefaultServerUpgradeStatusTest.java rename to sonar-server/src/test/java/org/sonar/server/platform/DefaultServerUpgradeStatusTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/platform/PersistentSettingsTest.java b/sonar-server/src/test/java/org/sonar/server/platform/PersistentSettingsTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/platform/PersistentSettingsTest.java rename to sonar-server/src/test/java/org/sonar/server/platform/PersistentSettingsTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/platform/ServerIdGeneratorTest.java b/sonar-server/src/test/java/org/sonar/server/platform/ServerIdGeneratorTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/platform/ServerIdGeneratorTest.java rename to sonar-server/src/test/java/org/sonar/server/platform/ServerIdGeneratorTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/platform/ServerIdLoaderTest.java b/sonar-server/src/test/java/org/sonar/server/platform/ServerIdLoaderTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/platform/ServerIdLoaderTest.java rename to sonar-server/src/test/java/org/sonar/server/platform/ServerIdLoaderTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/platform/ServerIdManagerTest.java b/sonar-server/src/test/java/org/sonar/server/platform/ServerIdManagerTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/platform/ServerIdManagerTest.java rename to sonar-server/src/test/java/org/sonar/server/platform/ServerIdManagerTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/platform/ServerImplTest.java b/sonar-server/src/test/java/org/sonar/server/platform/ServerImplTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/platform/ServerImplTest.java rename to sonar-server/src/test/java/org/sonar/server/platform/ServerImplTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/platform/ServerLifecycleNotifierTest.java b/sonar-server/src/test/java/org/sonar/server/platform/ServerLifecycleNotifierTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/platform/ServerLifecycleNotifierTest.java rename to sonar-server/src/test/java/org/sonar/server/platform/ServerLifecycleNotifierTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/platform/ServerLoggingTest.java b/sonar-server/src/test/java/org/sonar/server/platform/ServerLoggingTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/platform/ServerLoggingTest.java rename to sonar-server/src/test/java/org/sonar/server/platform/ServerLoggingTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/platform/ServerTesterPlatform.java b/sonar-server/src/test/java/org/sonar/server/platform/ServerTesterPlatform.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/platform/ServerTesterPlatform.java rename to sonar-server/src/test/java/org/sonar/server/platform/ServerTesterPlatform.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/platform/SettingsChangeNotifierTest.java b/sonar-server/src/test/java/org/sonar/server/platform/SettingsChangeNotifierTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/platform/SettingsChangeNotifierTest.java rename to sonar-server/src/test/java/org/sonar/server/platform/SettingsChangeNotifierTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/platform/StartupMetadataPersisterTest.java b/sonar-server/src/test/java/org/sonar/server/platform/StartupMetadataPersisterTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/platform/StartupMetadataPersisterTest.java rename to sonar-server/src/test/java/org/sonar/server/platform/StartupMetadataPersisterTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/platform/StartupMetadataProviderTest.java b/sonar-server/src/test/java/org/sonar/server/platform/StartupMetadataProviderTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/platform/StartupMetadataProviderTest.java rename to sonar-server/src/test/java/org/sonar/server/platform/StartupMetadataProviderTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/platform/TempFolderProviderTest.java b/sonar-server/src/test/java/org/sonar/server/platform/TempFolderProviderTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/platform/TempFolderProviderTest.java rename to sonar-server/src/test/java/org/sonar/server/platform/TempFolderProviderTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/platform/UrlSettingsTest.java b/sonar-server/src/test/java/org/sonar/server/platform/UrlSettingsTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/platform/UrlSettingsTest.java rename to sonar-server/src/test/java/org/sonar/server/platform/UrlSettingsTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/platform/cluster/ClusterImplTest.java b/sonar-server/src/test/java/org/sonar/server/platform/cluster/ClusterImplTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/platform/cluster/ClusterImplTest.java rename to sonar-server/src/test/java/org/sonar/server/platform/cluster/ClusterImplTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/platform/cluster/ClusterMock.java b/sonar-server/src/test/java/org/sonar/server/platform/cluster/ClusterMock.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/platform/cluster/ClusterMock.java rename to sonar-server/src/test/java/org/sonar/server/platform/cluster/ClusterMock.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/platform/db/CheckDatabaseCharsetAtStartupTest.java b/sonar-server/src/test/java/org/sonar/server/platform/db/CheckDatabaseCharsetAtStartupTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/platform/db/CheckDatabaseCharsetAtStartupTest.java rename to sonar-server/src/test/java/org/sonar/server/platform/db/CheckDatabaseCharsetAtStartupTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/platform/db/EmbeddedDatabaseFactoryTest.java b/sonar-server/src/test/java/org/sonar/server/platform/db/EmbeddedDatabaseFactoryTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/platform/db/EmbeddedDatabaseFactoryTest.java rename to sonar-server/src/test/java/org/sonar/server/platform/db/EmbeddedDatabaseFactoryTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/platform/db/EmbeddedDatabaseTest.java b/sonar-server/src/test/java/org/sonar/server/platform/db/EmbeddedDatabaseTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/platform/db/EmbeddedDatabaseTest.java rename to sonar-server/src/test/java/org/sonar/server/platform/db/EmbeddedDatabaseTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/platform/db/migration/AutoDbMigrationTest.java b/sonar-server/src/test/java/org/sonar/server/platform/db/migration/AutoDbMigrationTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/platform/db/migration/AutoDbMigrationTest.java rename to sonar-server/src/test/java/org/sonar/server/platform/db/migration/AutoDbMigrationTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/platform/db/migration/DatabaseMigrationExecutorServiceAdaptor.java b/sonar-server/src/test/java/org/sonar/server/platform/db/migration/DatabaseMigrationExecutorServiceAdaptor.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/platform/db/migration/DatabaseMigrationExecutorServiceAdaptor.java rename to sonar-server/src/test/java/org/sonar/server/platform/db/migration/DatabaseMigrationExecutorServiceAdaptor.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/platform/db/migration/DatabaseMigrationImplAsynchronousTest.java b/sonar-server/src/test/java/org/sonar/server/platform/db/migration/DatabaseMigrationImplAsynchronousTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/platform/db/migration/DatabaseMigrationImplAsynchronousTest.java rename to sonar-server/src/test/java/org/sonar/server/platform/db/migration/DatabaseMigrationImplAsynchronousTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/platform/db/migration/DatabaseMigrationImplConcurrentAccessTest.java b/sonar-server/src/test/java/org/sonar/server/platform/db/migration/DatabaseMigrationImplConcurrentAccessTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/platform/db/migration/DatabaseMigrationImplConcurrentAccessTest.java rename to sonar-server/src/test/java/org/sonar/server/platform/db/migration/DatabaseMigrationImplConcurrentAccessTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/platform/db/migration/DatabaseMigrationImplTest.java b/sonar-server/src/test/java/org/sonar/server/platform/db/migration/DatabaseMigrationImplTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/platform/db/migration/DatabaseMigrationImplTest.java rename to sonar-server/src/test/java/org/sonar/server/platform/db/migration/DatabaseMigrationImplTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/platform/monitoring/BaseMonitorMBeanTest.java b/sonar-server/src/test/java/org/sonar/server/platform/monitoring/BaseMonitorMBeanTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/platform/monitoring/BaseMonitorMBeanTest.java rename to sonar-server/src/test/java/org/sonar/server/platform/monitoring/BaseMonitorMBeanTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/platform/monitoring/DatabaseMonitorTest.java b/sonar-server/src/test/java/org/sonar/server/platform/monitoring/DatabaseMonitorTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/platform/monitoring/DatabaseMonitorTest.java rename to sonar-server/src/test/java/org/sonar/server/platform/monitoring/DatabaseMonitorTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/platform/monitoring/EsMonitorTest.java b/sonar-server/src/test/java/org/sonar/server/platform/monitoring/EsMonitorTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/platform/monitoring/EsMonitorTest.java rename to sonar-server/src/test/java/org/sonar/server/platform/monitoring/EsMonitorTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/platform/monitoring/FakeMonitor.java b/sonar-server/src/test/java/org/sonar/server/platform/monitoring/FakeMonitor.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/platform/monitoring/FakeMonitor.java rename to sonar-server/src/test/java/org/sonar/server/platform/monitoring/FakeMonitor.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/platform/monitoring/FakeMonitorMBean.java b/sonar-server/src/test/java/org/sonar/server/platform/monitoring/FakeMonitorMBean.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/platform/monitoring/FakeMonitorMBean.java rename to sonar-server/src/test/java/org/sonar/server/platform/monitoring/FakeMonitorMBean.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/platform/monitoring/JvmPropsMonitorTest.java b/sonar-server/src/test/java/org/sonar/server/platform/monitoring/JvmPropsMonitorTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/platform/monitoring/JvmPropsMonitorTest.java rename to sonar-server/src/test/java/org/sonar/server/platform/monitoring/JvmPropsMonitorTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/platform/monitoring/PluginsMonitorTest.java b/sonar-server/src/test/java/org/sonar/server/platform/monitoring/PluginsMonitorTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/platform/monitoring/PluginsMonitorTest.java rename to sonar-server/src/test/java/org/sonar/server/platform/monitoring/PluginsMonitorTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/platform/monitoring/SettingsMonitorTest.java b/sonar-server/src/test/java/org/sonar/server/platform/monitoring/SettingsMonitorTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/platform/monitoring/SettingsMonitorTest.java rename to sonar-server/src/test/java/org/sonar/server/platform/monitoring/SettingsMonitorTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/platform/monitoring/SonarQubeMonitorTest.java b/sonar-server/src/test/java/org/sonar/server/platform/monitoring/SonarQubeMonitorTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/platform/monitoring/SonarQubeMonitorTest.java rename to sonar-server/src/test/java/org/sonar/server/platform/monitoring/SonarQubeMonitorTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/platform/monitoring/SystemMonitorTest.java b/sonar-server/src/test/java/org/sonar/server/platform/monitoring/SystemMonitorTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/platform/monitoring/SystemMonitorTest.java rename to sonar-server/src/test/java/org/sonar/server/platform/monitoring/SystemMonitorTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/platform/platformlevel/PlatformLevel1Test.java b/sonar-server/src/test/java/org/sonar/server/platform/platformlevel/PlatformLevel1Test.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/platform/platformlevel/PlatformLevel1Test.java rename to sonar-server/src/test/java/org/sonar/server/platform/platformlevel/PlatformLevel1Test.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/platform/platformlevel/PlatformLevel2Test.java b/sonar-server/src/test/java/org/sonar/server/platform/platformlevel/PlatformLevel2Test.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/platform/platformlevel/PlatformLevel2Test.java rename to sonar-server/src/test/java/org/sonar/server/platform/platformlevel/PlatformLevel2Test.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/platform/web/MasterServletFilterTest.java b/sonar-server/src/test/java/org/sonar/server/platform/web/MasterServletFilterTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/platform/web/MasterServletFilterTest.java rename to sonar-server/src/test/java/org/sonar/server/platform/web/MasterServletFilterTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/platform/web/RedirectFilterTest.java b/sonar-server/src/test/java/org/sonar/server/platform/web/RedirectFilterTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/platform/web/RedirectFilterTest.java rename to sonar-server/src/test/java/org/sonar/server/platform/web/RedirectFilterTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/platform/web/RootFilterTest.java b/sonar-server/src/test/java/org/sonar/server/platform/web/RootFilterTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/platform/web/RootFilterTest.java rename to sonar-server/src/test/java/org/sonar/server/platform/web/RootFilterTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/platform/web/SecurityServletFilterTest.java b/sonar-server/src/test/java/org/sonar/server/platform/web/SecurityServletFilterTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/platform/web/SecurityServletFilterTest.java rename to sonar-server/src/test/java/org/sonar/server/platform/web/SecurityServletFilterTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/platform/web/WebPagesFilterTest.java b/sonar-server/src/test/java/org/sonar/server/platform/web/WebPagesFilterTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/platform/web/WebPagesFilterTest.java rename to sonar-server/src/test/java/org/sonar/server/platform/web/WebPagesFilterTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/platform/web/requestid/HttpRequestIdModuleTest.java b/sonar-server/src/test/java/org/sonar/server/platform/web/requestid/HttpRequestIdModuleTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/platform/web/requestid/HttpRequestIdModuleTest.java rename to sonar-server/src/test/java/org/sonar/server/platform/web/requestid/HttpRequestIdModuleTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/platform/web/requestid/RequestIdConfigurationTest.java b/sonar-server/src/test/java/org/sonar/server/platform/web/requestid/RequestIdConfigurationTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/platform/web/requestid/RequestIdConfigurationTest.java rename to sonar-server/src/test/java/org/sonar/server/platform/web/requestid/RequestIdConfigurationTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/platform/web/requestid/RequestIdFilterTest.java b/sonar-server/src/test/java/org/sonar/server/platform/web/requestid/RequestIdFilterTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/platform/web/requestid/RequestIdFilterTest.java rename to sonar-server/src/test/java/org/sonar/server/platform/web/requestid/RequestIdFilterTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/platform/web/requestid/RequestIdGeneratorImplTest.java b/sonar-server/src/test/java/org/sonar/server/platform/web/requestid/RequestIdGeneratorImplTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/platform/web/requestid/RequestIdGeneratorImplTest.java rename to sonar-server/src/test/java/org/sonar/server/platform/web/requestid/RequestIdGeneratorImplTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/platform/ws/ChangeLogLevelActionTest.java b/sonar-server/src/test/java/org/sonar/server/platform/ws/ChangeLogLevelActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/platform/ws/ChangeLogLevelActionTest.java rename to sonar-server/src/test/java/org/sonar/server/platform/ws/ChangeLogLevelActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/platform/ws/DbMigrationStatusActionTest.java b/sonar-server/src/test/java/org/sonar/server/platform/ws/DbMigrationStatusActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/platform/ws/DbMigrationStatusActionTest.java rename to sonar-server/src/test/java/org/sonar/server/platform/ws/DbMigrationStatusActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/platform/ws/IndexActionTest.java b/sonar-server/src/test/java/org/sonar/server/platform/ws/IndexActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/platform/ws/IndexActionTest.java rename to sonar-server/src/test/java/org/sonar/server/platform/ws/IndexActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/platform/ws/InfoActionTest.java b/sonar-server/src/test/java/org/sonar/server/platform/ws/InfoActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/platform/ws/InfoActionTest.java rename to sonar-server/src/test/java/org/sonar/server/platform/ws/InfoActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/platform/ws/LogsActionTest.java b/sonar-server/src/test/java/org/sonar/server/platform/ws/LogsActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/platform/ws/LogsActionTest.java rename to sonar-server/src/test/java/org/sonar/server/platform/ws/LogsActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/platform/ws/MigrateDbActionTest.java b/sonar-server/src/test/java/org/sonar/server/platform/ws/MigrateDbActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/platform/ws/MigrateDbActionTest.java rename to sonar-server/src/test/java/org/sonar/server/platform/ws/MigrateDbActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/platform/ws/PingActionTest.java b/sonar-server/src/test/java/org/sonar/server/platform/ws/PingActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/platform/ws/PingActionTest.java rename to sonar-server/src/test/java/org/sonar/server/platform/ws/PingActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/platform/ws/RestartActionTest.java b/sonar-server/src/test/java/org/sonar/server/platform/ws/RestartActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/platform/ws/RestartActionTest.java rename to sonar-server/src/test/java/org/sonar/server/platform/ws/RestartActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/platform/ws/ServerWsTest.java b/sonar-server/src/test/java/org/sonar/server/platform/ws/ServerWsTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/platform/ws/ServerWsTest.java rename to sonar-server/src/test/java/org/sonar/server/platform/ws/ServerWsTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/platform/ws/StatusActionTest.java b/sonar-server/src/test/java/org/sonar/server/platform/ws/StatusActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/platform/ws/StatusActionTest.java rename to sonar-server/src/test/java/org/sonar/server/platform/ws/StatusActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/platform/ws/SystemWsTest.java b/sonar-server/src/test/java/org/sonar/server/platform/ws/SystemWsTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/platform/ws/SystemWsTest.java rename to sonar-server/src/test/java/org/sonar/server/platform/ws/SystemWsTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/platform/ws/UpgradesActionTest.java b/sonar-server/src/test/java/org/sonar/server/platform/ws/UpgradesActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/platform/ws/UpgradesActionTest.java rename to sonar-server/src/test/java/org/sonar/server/platform/ws/UpgradesActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/plugins/InstalledPluginReferentialFactoryTest.java b/sonar-server/src/test/java/org/sonar/server/plugins/InstalledPluginReferentialFactoryTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/plugins/InstalledPluginReferentialFactoryTest.java rename to sonar-server/src/test/java/org/sonar/server/plugins/InstalledPluginReferentialFactoryTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/plugins/PluginDownloaderTest.java b/sonar-server/src/test/java/org/sonar/server/plugins/PluginDownloaderTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/plugins/PluginDownloaderTest.java rename to sonar-server/src/test/java/org/sonar/server/plugins/PluginDownloaderTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/plugins/PluginReferentialMetadataConverterTest.java b/sonar-server/src/test/java/org/sonar/server/plugins/PluginReferentialMetadataConverterTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/plugins/PluginReferentialMetadataConverterTest.java rename to sonar-server/src/test/java/org/sonar/server/plugins/PluginReferentialMetadataConverterTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/plugins/ServerPluginJarExploderTest.java b/sonar-server/src/test/java/org/sonar/server/plugins/ServerPluginJarExploderTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/plugins/ServerPluginJarExploderTest.java rename to sonar-server/src/test/java/org/sonar/server/plugins/ServerPluginJarExploderTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/plugins/ServerPluginRepositoryTest.java b/sonar-server/src/test/java/org/sonar/server/plugins/ServerPluginRepositoryTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/plugins/ServerPluginRepositoryTest.java rename to sonar-server/src/test/java/org/sonar/server/plugins/ServerPluginRepositoryTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/plugins/StaticResourcesServletTest.java b/sonar-server/src/test/java/org/sonar/server/plugins/StaticResourcesServletTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/plugins/StaticResourcesServletTest.java rename to sonar-server/src/test/java/org/sonar/server/plugins/StaticResourcesServletTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/plugins/TestPluginA.java b/sonar-server/src/test/java/org/sonar/server/plugins/TestPluginA.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/plugins/TestPluginA.java rename to sonar-server/src/test/java/org/sonar/server/plugins/TestPluginA.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/plugins/TestProjectUtils.java b/sonar-server/src/test/java/org/sonar/server/plugins/TestProjectUtils.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/plugins/TestProjectUtils.java rename to sonar-server/src/test/java/org/sonar/server/plugins/TestProjectUtils.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/plugins/UpdateCenterClientTest.java b/sonar-server/src/test/java/org/sonar/server/plugins/UpdateCenterClientTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/plugins/UpdateCenterClientTest.java rename to sonar-server/src/test/java/org/sonar/server/plugins/UpdateCenterClientTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/plugins/UpdateCenterMatrixFactoryTest.java b/sonar-server/src/test/java/org/sonar/server/plugins/UpdateCenterMatrixFactoryTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/plugins/UpdateCenterMatrixFactoryTest.java rename to sonar-server/src/test/java/org/sonar/server/plugins/UpdateCenterMatrixFactoryTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/plugins/UpdateCenterServlet.java b/sonar-server/src/test/java/org/sonar/server/plugins/UpdateCenterServlet.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/plugins/UpdateCenterServlet.java rename to sonar-server/src/test/java/org/sonar/server/plugins/UpdateCenterServlet.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/plugins/privileged/PrivilegedPluginsBootstraperTest.java b/sonar-server/src/test/java/org/sonar/server/plugins/privileged/PrivilegedPluginsBootstraperTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/plugins/privileged/PrivilegedPluginsBootstraperTest.java rename to sonar-server/src/test/java/org/sonar/server/plugins/privileged/PrivilegedPluginsBootstraperTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/plugins/privileged/PrivilegedPluginsStopperTest.java b/sonar-server/src/test/java/org/sonar/server/plugins/privileged/PrivilegedPluginsStopperTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/plugins/privileged/PrivilegedPluginsStopperTest.java rename to sonar-server/src/test/java/org/sonar/server/plugins/privileged/PrivilegedPluginsStopperTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/AbstractUpdateCenterBasedPluginsWsActionTest.java b/sonar-server/src/test/java/org/sonar/server/plugins/ws/AbstractUpdateCenterBasedPluginsWsActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/AbstractUpdateCenterBasedPluginsWsActionTest.java rename to sonar-server/src/test/java/org/sonar/server/plugins/ws/AbstractUpdateCenterBasedPluginsWsActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/AvailableActionTest.java b/sonar-server/src/test/java/org/sonar/server/plugins/ws/AvailableActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/AvailableActionTest.java rename to sonar-server/src/test/java/org/sonar/server/plugins/ws/AvailableActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/CancelAllActionTest.java b/sonar-server/src/test/java/org/sonar/server/plugins/ws/CancelAllActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/CancelAllActionTest.java rename to sonar-server/src/test/java/org/sonar/server/plugins/ws/CancelAllActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/InstallActionTest.java b/sonar-server/src/test/java/org/sonar/server/plugins/ws/InstallActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/InstallActionTest.java rename to sonar-server/src/test/java/org/sonar/server/plugins/ws/InstallActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/InstalledActionTest.java b/sonar-server/src/test/java/org/sonar/server/plugins/ws/InstalledActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/InstalledActionTest.java rename to sonar-server/src/test/java/org/sonar/server/plugins/ws/InstalledActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/PendingActionTest.java b/sonar-server/src/test/java/org/sonar/server/plugins/ws/PendingActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/PendingActionTest.java rename to sonar-server/src/test/java/org/sonar/server/plugins/ws/PendingActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/PluginUpdateAggregateBuilderTest.java b/sonar-server/src/test/java/org/sonar/server/plugins/ws/PluginUpdateAggregateBuilderTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/PluginUpdateAggregateBuilderTest.java rename to sonar-server/src/test/java/org/sonar/server/plugins/ws/PluginUpdateAggregateBuilderTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/PluginUpdateAggregatorTest.java b/sonar-server/src/test/java/org/sonar/server/plugins/ws/PluginUpdateAggregatorTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/PluginUpdateAggregatorTest.java rename to sonar-server/src/test/java/org/sonar/server/plugins/ws/PluginUpdateAggregatorTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/PluginWSCommonsTest.java b/sonar-server/src/test/java/org/sonar/server/plugins/ws/PluginWSCommonsTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/PluginWSCommonsTest.java rename to sonar-server/src/test/java/org/sonar/server/plugins/ws/PluginWSCommonsTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/PluginsWsTest.java b/sonar-server/src/test/java/org/sonar/server/plugins/ws/PluginsWsTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/PluginsWsTest.java rename to sonar-server/src/test/java/org/sonar/server/plugins/ws/PluginsWsTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/UninstallActionTest.java b/sonar-server/src/test/java/org/sonar/server/plugins/ws/UninstallActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/UninstallActionTest.java rename to sonar-server/src/test/java/org/sonar/server/plugins/ws/UninstallActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/UpdateActionTest.java b/sonar-server/src/test/java/org/sonar/server/plugins/ws/UpdateActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/UpdateActionTest.java rename to sonar-server/src/test/java/org/sonar/server/plugins/ws/UpdateActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/UpdatesActionTest.java b/sonar-server/src/test/java/org/sonar/server/plugins/ws/UpdatesActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/UpdatesActionTest.java rename to sonar-server/src/test/java/org/sonar/server/plugins/ws/UpdatesActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/project/ws/BulkDeleteActionTest.java b/sonar-server/src/test/java/org/sonar/server/project/ws/BulkDeleteActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/project/ws/BulkDeleteActionTest.java rename to sonar-server/src/test/java/org/sonar/server/project/ws/BulkDeleteActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/project/ws/BulkUpdateKeyActionTest.java b/sonar-server/src/test/java/org/sonar/server/project/ws/BulkUpdateKeyActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/project/ws/BulkUpdateKeyActionTest.java rename to sonar-server/src/test/java/org/sonar/server/project/ws/BulkUpdateKeyActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/project/ws/CreateActionTest.java b/sonar-server/src/test/java/org/sonar/server/project/ws/CreateActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/project/ws/CreateActionTest.java rename to sonar-server/src/test/java/org/sonar/server/project/ws/CreateActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/project/ws/DeleteActionTest.java b/sonar-server/src/test/java/org/sonar/server/project/ws/DeleteActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/project/ws/DeleteActionTest.java rename to sonar-server/src/test/java/org/sonar/server/project/ws/DeleteActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/project/ws/GhostsActionTest.java b/sonar-server/src/test/java/org/sonar/server/project/ws/GhostsActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/project/ws/GhostsActionTest.java rename to sonar-server/src/test/java/org/sonar/server/project/ws/GhostsActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/project/ws/IndexActionTest.java b/sonar-server/src/test/java/org/sonar/server/project/ws/IndexActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/project/ws/IndexActionTest.java rename to sonar-server/src/test/java/org/sonar/server/project/ws/IndexActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/project/ws/ProjectsWsModuleTest.java b/sonar-server/src/test/java/org/sonar/server/project/ws/ProjectsWsModuleTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/project/ws/ProjectsWsModuleTest.java rename to sonar-server/src/test/java/org/sonar/server/project/ws/ProjectsWsModuleTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/project/ws/ProvisionedActionTest.java b/sonar-server/src/test/java/org/sonar/server/project/ws/ProvisionedActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/project/ws/ProvisionedActionTest.java rename to sonar-server/src/test/java/org/sonar/server/project/ws/ProvisionedActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/project/ws/SearchActionTest.java b/sonar-server/src/test/java/org/sonar/server/project/ws/SearchActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/project/ws/SearchActionTest.java rename to sonar-server/src/test/java/org/sonar/server/project/ws/SearchActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/project/ws/SearchMyProjectsActionTest.java b/sonar-server/src/test/java/org/sonar/server/project/ws/SearchMyProjectsActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/project/ws/SearchMyProjectsActionTest.java rename to sonar-server/src/test/java/org/sonar/server/project/ws/SearchMyProjectsActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/project/ws/SearchMyProjectsDataLoaderTest.java b/sonar-server/src/test/java/org/sonar/server/project/ws/SearchMyProjectsDataLoaderTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/project/ws/SearchMyProjectsDataLoaderTest.java rename to sonar-server/src/test/java/org/sonar/server/project/ws/SearchMyProjectsDataLoaderTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/project/ws/SearchMyProjectsDataTest.java b/sonar-server/src/test/java/org/sonar/server/project/ws/SearchMyProjectsDataTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/project/ws/SearchMyProjectsDataTest.java rename to sonar-server/src/test/java/org/sonar/server/project/ws/SearchMyProjectsDataTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/project/ws/UpdateKeyActionTest.java b/sonar-server/src/test/java/org/sonar/server/project/ws/UpdateKeyActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/project/ws/UpdateKeyActionTest.java rename to sonar-server/src/test/java/org/sonar/server/project/ws/UpdateKeyActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/project/ws/UpdateVisibilityActionTest.java b/sonar-server/src/test/java/org/sonar/server/project/ws/UpdateVisibilityActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/project/ws/UpdateVisibilityActionTest.java rename to sonar-server/src/test/java/org/sonar/server/project/ws/UpdateVisibilityActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/projectanalysis/ProjectAnalysisModuleTest.java b/sonar-server/src/test/java/org/sonar/server/projectanalysis/ProjectAnalysisModuleTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/projectanalysis/ProjectAnalysisModuleTest.java rename to sonar-server/src/test/java/org/sonar/server/projectanalysis/ProjectAnalysisModuleTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/projectanalysis/ws/CreateEventActionTest.java b/sonar-server/src/test/java/org/sonar/server/projectanalysis/ws/CreateEventActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/projectanalysis/ws/CreateEventActionTest.java rename to sonar-server/src/test/java/org/sonar/server/projectanalysis/ws/CreateEventActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/projectanalysis/ws/DeleteActionTest.java b/sonar-server/src/test/java/org/sonar/server/projectanalysis/ws/DeleteActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/projectanalysis/ws/DeleteActionTest.java rename to sonar-server/src/test/java/org/sonar/server/projectanalysis/ws/DeleteActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/projectanalysis/ws/DeleteEventActionTest.java b/sonar-server/src/test/java/org/sonar/server/projectanalysis/ws/DeleteEventActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/projectanalysis/ws/DeleteEventActionTest.java rename to sonar-server/src/test/java/org/sonar/server/projectanalysis/ws/DeleteEventActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/projectanalysis/ws/EventValidatorTest.java b/sonar-server/src/test/java/org/sonar/server/projectanalysis/ws/EventValidatorTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/projectanalysis/ws/EventValidatorTest.java rename to sonar-server/src/test/java/org/sonar/server/projectanalysis/ws/EventValidatorTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/projectanalysis/ws/SearchActionTest.java b/sonar-server/src/test/java/org/sonar/server/projectanalysis/ws/SearchActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/projectanalysis/ws/SearchActionTest.java rename to sonar-server/src/test/java/org/sonar/server/projectanalysis/ws/SearchActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/projectanalysis/ws/UpdateEventActionTest.java b/sonar-server/src/test/java/org/sonar/server/projectanalysis/ws/UpdateEventActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/projectanalysis/ws/UpdateEventActionTest.java rename to sonar-server/src/test/java/org/sonar/server/projectanalysis/ws/UpdateEventActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/projectlink/ws/CreateActionTest.java b/sonar-server/src/test/java/org/sonar/server/projectlink/ws/CreateActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/projectlink/ws/CreateActionTest.java rename to sonar-server/src/test/java/org/sonar/server/projectlink/ws/CreateActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/projectlink/ws/DeleteActionTest.java b/sonar-server/src/test/java/org/sonar/server/projectlink/ws/DeleteActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/projectlink/ws/DeleteActionTest.java rename to sonar-server/src/test/java/org/sonar/server/projectlink/ws/DeleteActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/projectlink/ws/ProjectLinksWsModuleTest.java b/sonar-server/src/test/java/org/sonar/server/projectlink/ws/ProjectLinksWsModuleTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/projectlink/ws/ProjectLinksWsModuleTest.java rename to sonar-server/src/test/java/org/sonar/server/projectlink/ws/ProjectLinksWsModuleTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/projectlink/ws/ProjectLinksWsTest.java b/sonar-server/src/test/java/org/sonar/server/projectlink/ws/ProjectLinksWsTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/projectlink/ws/ProjectLinksWsTest.java rename to sonar-server/src/test/java/org/sonar/server/projectlink/ws/ProjectLinksWsTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/projectlink/ws/SearchActionTest.java b/sonar-server/src/test/java/org/sonar/server/projectlink/ws/SearchActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/projectlink/ws/SearchActionTest.java rename to sonar-server/src/test/java/org/sonar/server/projectlink/ws/SearchActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/projecttag/ws/ProjectTagsWsModuleTest.java b/sonar-server/src/test/java/org/sonar/server/projecttag/ws/ProjectTagsWsModuleTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/projecttag/ws/ProjectTagsWsModuleTest.java rename to sonar-server/src/test/java/org/sonar/server/projecttag/ws/ProjectTagsWsModuleTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/projecttag/ws/ProjectTagsWsTest.java b/sonar-server/src/test/java/org/sonar/server/projecttag/ws/ProjectTagsWsTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/projecttag/ws/ProjectTagsWsTest.java rename to sonar-server/src/test/java/org/sonar/server/projecttag/ws/ProjectTagsWsTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/projecttag/ws/SearchActionTest.java b/sonar-server/src/test/java/org/sonar/server/projecttag/ws/SearchActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/projecttag/ws/SearchActionTest.java rename to sonar-server/src/test/java/org/sonar/server/projecttag/ws/SearchActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/projecttag/ws/SetActionTest.java b/sonar-server/src/test/java/org/sonar/server/projecttag/ws/SetActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/projecttag/ws/SetActionTest.java rename to sonar-server/src/test/java/org/sonar/server/projecttag/ws/SetActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/property/InternalPropertiesImplTest.java b/sonar-server/src/test/java/org/sonar/server/property/InternalPropertiesImplTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/property/InternalPropertiesImplTest.java rename to sonar-server/src/test/java/org/sonar/server/property/InternalPropertiesImplTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/property/ws/IndexActionTest.java b/sonar-server/src/test/java/org/sonar/server/property/ws/IndexActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/property/ws/IndexActionTest.java rename to sonar-server/src/test/java/org/sonar/server/property/ws/IndexActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/qualitygate/QgateProjectFinderTest.java b/sonar-server/src/test/java/org/sonar/server/qualitygate/QgateProjectFinderTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/qualitygate/QgateProjectFinderTest.java rename to sonar-server/src/test/java/org/sonar/server/qualitygate/QgateProjectFinderTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/qualitygate/QualityGateConditionsUpdaterTest.java b/sonar-server/src/test/java/org/sonar/server/qualitygate/QualityGateConditionsUpdaterTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/qualitygate/QualityGateConditionsUpdaterTest.java rename to sonar-server/src/test/java/org/sonar/server/qualitygate/QualityGateConditionsUpdaterTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/qualitygate/QualityGateFinderTest.java b/sonar-server/src/test/java/org/sonar/server/qualitygate/QualityGateFinderTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/qualitygate/QualityGateFinderTest.java rename to sonar-server/src/test/java/org/sonar/server/qualitygate/QualityGateFinderTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/qualitygate/QualityGateModuleTest.java b/sonar-server/src/test/java/org/sonar/server/qualitygate/QualityGateModuleTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/qualitygate/QualityGateModuleTest.java rename to sonar-server/src/test/java/org/sonar/server/qualitygate/QualityGateModuleTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/qualitygate/QualityGateUpdaterTest.java b/sonar-server/src/test/java/org/sonar/server/qualitygate/QualityGateUpdaterTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/qualitygate/QualityGateUpdaterTest.java rename to sonar-server/src/test/java/org/sonar/server/qualitygate/QualityGateUpdaterTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/qualitygate/QualityGatesTest.java b/sonar-server/src/test/java/org/sonar/server/qualitygate/QualityGatesTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/qualitygate/QualityGatesTest.java rename to sonar-server/src/test/java/org/sonar/server/qualitygate/QualityGatesTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/qualitygate/RegisterQualityGatesTest.java b/sonar-server/src/test/java/org/sonar/server/qualitygate/RegisterQualityGatesTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/qualitygate/RegisterQualityGatesTest.java rename to sonar-server/src/test/java/org/sonar/server/qualitygate/RegisterQualityGatesTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/qualitygate/ws/AppActionTest.java b/sonar-server/src/test/java/org/sonar/server/qualitygate/ws/AppActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/qualitygate/ws/AppActionTest.java rename to sonar-server/src/test/java/org/sonar/server/qualitygate/ws/AppActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/qualitygate/ws/CreateActionTest.java b/sonar-server/src/test/java/org/sonar/server/qualitygate/ws/CreateActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/qualitygate/ws/CreateActionTest.java rename to sonar-server/src/test/java/org/sonar/server/qualitygate/ws/CreateActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/qualitygate/ws/CreateConditionActionTest.java b/sonar-server/src/test/java/org/sonar/server/qualitygate/ws/CreateConditionActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/qualitygate/ws/CreateConditionActionTest.java rename to sonar-server/src/test/java/org/sonar/server/qualitygate/ws/CreateConditionActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/qualitygate/ws/DeselectActionTest.java b/sonar-server/src/test/java/org/sonar/server/qualitygate/ws/DeselectActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/qualitygate/ws/DeselectActionTest.java rename to sonar-server/src/test/java/org/sonar/server/qualitygate/ws/DeselectActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/qualitygate/ws/GetByProjectActionTest.java b/sonar-server/src/test/java/org/sonar/server/qualitygate/ws/GetByProjectActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/qualitygate/ws/GetByProjectActionTest.java rename to sonar-server/src/test/java/org/sonar/server/qualitygate/ws/GetByProjectActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/qualitygate/ws/ProjectStatusActionTest.java b/sonar-server/src/test/java/org/sonar/server/qualitygate/ws/ProjectStatusActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/qualitygate/ws/ProjectStatusActionTest.java rename to sonar-server/src/test/java/org/sonar/server/qualitygate/ws/ProjectStatusActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/qualitygate/ws/QualityGateDetailsFormatterTest.java b/sonar-server/src/test/java/org/sonar/server/qualitygate/ws/QualityGateDetailsFormatterTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/qualitygate/ws/QualityGateDetailsFormatterTest.java rename to sonar-server/src/test/java/org/sonar/server/qualitygate/ws/QualityGateDetailsFormatterTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/qualitygate/ws/QualityGatesWsTest.java b/sonar-server/src/test/java/org/sonar/server/qualitygate/ws/QualityGatesWsTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/qualitygate/ws/QualityGatesWsTest.java rename to sonar-server/src/test/java/org/sonar/server/qualitygate/ws/QualityGatesWsTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/qualitygate/ws/SelectActionTest.java b/sonar-server/src/test/java/org/sonar/server/qualitygate/ws/SelectActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/qualitygate/ws/SelectActionTest.java rename to sonar-server/src/test/java/org/sonar/server/qualitygate/ws/SelectActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/qualitygate/ws/UpdateConditionActionTest.java b/sonar-server/src/test/java/org/sonar/server/qualitygate/ws/UpdateConditionActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/qualitygate/ws/UpdateConditionActionTest.java rename to sonar-server/src/test/java/org/sonar/server/qualitygate/ws/UpdateConditionActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ActiveRuleChangeTest.java b/sonar-server/src/test/java/org/sonar/server/qualityprofile/ActiveRuleChangeTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ActiveRuleChangeTest.java rename to sonar-server/src/test/java/org/sonar/server/qualityprofile/ActiveRuleChangeTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/BuiltInQProfileInsertImplTest.java b/sonar-server/src/test/java/org/sonar/server/qualityprofile/BuiltInQProfileInsertImplTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/BuiltInQProfileInsertImplTest.java rename to sonar-server/src/test/java/org/sonar/server/qualityprofile/BuiltInQProfileInsertImplTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/BuiltInQProfileLoaderTest.java b/sonar-server/src/test/java/org/sonar/server/qualityprofile/BuiltInQProfileLoaderTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/BuiltInQProfileLoaderTest.java rename to sonar-server/src/test/java/org/sonar/server/qualityprofile/BuiltInQProfileLoaderTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/BuiltInQProfileRepositoryImplTest.java b/sonar-server/src/test/java/org/sonar/server/qualityprofile/BuiltInQProfileRepositoryImplTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/BuiltInQProfileRepositoryImplTest.java rename to sonar-server/src/test/java/org/sonar/server/qualityprofile/BuiltInQProfileRepositoryImplTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/BuiltInQProfileRepositoryRule.java b/sonar-server/src/test/java/org/sonar/server/qualityprofile/BuiltInQProfileRepositoryRule.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/BuiltInQProfileRepositoryRule.java rename to sonar-server/src/test/java/org/sonar/server/qualityprofile/BuiltInQProfileRepositoryRule.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/BuiltInQProfileUpdateImplTest.java b/sonar-server/src/test/java/org/sonar/server/qualityprofile/BuiltInQProfileUpdateImplTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/BuiltInQProfileUpdateImplTest.java rename to sonar-server/src/test/java/org/sonar/server/qualityprofile/BuiltInQProfileUpdateImplTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/BuiltInQualityProfilesNotificationDispatcherTest.java b/sonar-server/src/test/java/org/sonar/server/qualityprofile/BuiltInQualityProfilesNotificationDispatcherTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/BuiltInQualityProfilesNotificationDispatcherTest.java rename to sonar-server/src/test/java/org/sonar/server/qualityprofile/BuiltInQualityProfilesNotificationDispatcherTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/BuiltInQualityProfilesNotificationTemplateTest.java b/sonar-server/src/test/java/org/sonar/server/qualityprofile/BuiltInQualityProfilesNotificationTemplateTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/BuiltInQualityProfilesNotificationTemplateTest.java rename to sonar-server/src/test/java/org/sonar/server/qualityprofile/BuiltInQualityProfilesNotificationTemplateTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/BuiltInQualityProfilesNotificationTest.java b/sonar-server/src/test/java/org/sonar/server/qualityprofile/BuiltInQualityProfilesNotificationTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/BuiltInQualityProfilesNotificationTest.java rename to sonar-server/src/test/java/org/sonar/server/qualityprofile/BuiltInQualityProfilesNotificationTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/BuiltInQualityProfilesUpdateListenerTest.java b/sonar-server/src/test/java/org/sonar/server/qualityprofile/BuiltInQualityProfilesUpdateListenerTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/BuiltInQualityProfilesUpdateListenerTest.java rename to sonar-server/src/test/java/org/sonar/server/qualityprofile/BuiltInQualityProfilesUpdateListenerTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileBackuperImplTest.java b/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileBackuperImplTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileBackuperImplTest.java rename to sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileBackuperImplTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileComparisonMediumTest.java b/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileComparisonMediumTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileComparisonMediumTest.java rename to sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileComparisonMediumTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileCopierTest.java b/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileCopierTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileCopierTest.java rename to sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileCopierTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileExportersTest.java b/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileExportersTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileExportersTest.java rename to sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileExportersTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileFactoryImplTest.java b/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileFactoryImplTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileFactoryImplTest.java rename to sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileFactoryImplTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileTesting.java b/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileTesting.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileTesting.java rename to sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileTesting.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QualityProfileTest.java b/sonar-server/src/test/java/org/sonar/server/qualityprofile/QualityProfileTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QualityProfileTest.java rename to sonar-server/src/test/java/org/sonar/server/qualityprofile/QualityProfileTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/RegisterQualityProfilesMediumTest.java b/sonar-server/src/test/java/org/sonar/server/qualityprofile/RegisterQualityProfilesMediumTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/RegisterQualityProfilesMediumTest.java rename to sonar-server/src/test/java/org/sonar/server/qualityprofile/RegisterQualityProfilesMediumTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/RegisterQualityProfilesNotificationTest.java b/sonar-server/src/test/java/org/sonar/server/qualityprofile/RegisterQualityProfilesNotificationTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/RegisterQualityProfilesNotificationTest.java rename to sonar-server/src/test/java/org/sonar/server/qualityprofile/RegisterQualityProfilesNotificationTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/RegisterQualityProfilesTest.java b/sonar-server/src/test/java/org/sonar/server/qualityprofile/RegisterQualityProfilesTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/RegisterQualityProfilesTest.java rename to sonar-server/src/test/java/org/sonar/server/qualityprofile/RegisterQualityProfilesTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/RuleActivatorTest.java b/sonar-server/src/test/java/org/sonar/server/qualityprofile/RuleActivatorTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/RuleActivatorTest.java rename to sonar-server/src/test/java/org/sonar/server/qualityprofile/RuleActivatorTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/index/ActiveRuleIndexerTest.java b/sonar-server/src/test/java/org/sonar/server/qualityprofile/index/ActiveRuleIndexerTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/index/ActiveRuleIndexerTest.java rename to sonar-server/src/test/java/org/sonar/server/qualityprofile/index/ActiveRuleIndexerTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ActivateRuleActionTest.java b/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ActivateRuleActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ActivateRuleActionTest.java rename to sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ActivateRuleActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ActivateRulesActionTest.java b/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ActivateRulesActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ActivateRulesActionTest.java rename to sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ActivateRulesActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/AddProjectActionTest.java b/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/AddProjectActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/AddProjectActionTest.java rename to sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/AddProjectActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/BackupActionTest.java b/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/BackupActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/BackupActionTest.java rename to sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/BackupActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ChangeParentActionTest.java b/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ChangeParentActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ChangeParentActionTest.java rename to sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ChangeParentActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ChangelogActionDatabaseTest.java b/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ChangelogActionDatabaseTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ChangelogActionDatabaseTest.java rename to sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ChangelogActionDatabaseTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ChangelogActionMockTest.java b/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ChangelogActionMockTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ChangelogActionMockTest.java rename to sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ChangelogActionMockTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ChangelogLoaderTest.java b/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ChangelogLoaderTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ChangelogLoaderTest.java rename to sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ChangelogLoaderTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/CompareActionMediumTest.java b/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/CompareActionMediumTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/CompareActionMediumTest.java rename to sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/CompareActionMediumTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/CompareActionTest.java b/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/CompareActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/CompareActionTest.java rename to sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/CompareActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/CopyActionTest.java b/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/CopyActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/CopyActionTest.java rename to sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/CopyActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/CreateActionTest.java b/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/CreateActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/CreateActionTest.java rename to sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/CreateActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/DeactivateRuleActionTest.java b/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/DeactivateRuleActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/DeactivateRuleActionTest.java rename to sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/DeactivateRuleActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/DeactivateRulesActionTest.java b/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/DeactivateRulesActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/DeactivateRulesActionTest.java rename to sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/DeactivateRulesActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/DeleteActionTest.java b/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/DeleteActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/DeleteActionTest.java rename to sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/DeleteActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ExportActionTest.java b/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ExportActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ExportActionTest.java rename to sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ExportActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ExportersActionTest.java b/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ExportersActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ExportersActionTest.java rename to sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ExportersActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ImportersActionTest.java b/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ImportersActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ImportersActionTest.java rename to sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ImportersActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/InheritanceActionTest.java b/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/InheritanceActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/InheritanceActionTest.java rename to sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/InheritanceActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ProfilesWsTest.java b/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ProfilesWsTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ProfilesWsTest.java rename to sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ProfilesWsTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ProjectsActionTest.java b/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ProjectsActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ProjectsActionTest.java rename to sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ProjectsActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfileReferenceTest.java b/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfileReferenceTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfileReferenceTest.java rename to sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfileReferenceTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfileWsSupportTest.java b/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfileWsSupportTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfileWsSupportTest.java rename to sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfileWsSupportTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfilesWsMediumTest.java b/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfilesWsMediumTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfilesWsMediumTest.java rename to sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfilesWsMediumTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfilesWsModuleTest.java b/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfilesWsModuleTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfilesWsModuleTest.java rename to sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfilesWsModuleTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfilesWsTest.java b/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfilesWsTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfilesWsTest.java rename to sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfilesWsTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/RemoveProjectActionTest.java b/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/RemoveProjectActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/RemoveProjectActionTest.java rename to sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/RemoveProjectActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/RenameActionTest.java b/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/RenameActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/RenameActionTest.java rename to sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/RenameActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/RestoreActionTest.java b/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/RestoreActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/RestoreActionTest.java rename to sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/RestoreActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/RestoreBuiltInActionTest.java b/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/RestoreBuiltInActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/RestoreBuiltInActionTest.java rename to sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/RestoreBuiltInActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/SearchActionTest.java b/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/SearchActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/SearchActionTest.java rename to sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/SearchActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/SetDefaultActionTest.java b/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/SetDefaultActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/SetDefaultActionTest.java rename to sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/SetDefaultActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ShowActionTest.java b/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ShowActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ShowActionTest.java rename to sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ShowActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/root/ws/RootsWsModuleTest.java b/sonar-server/src/test/java/org/sonar/server/root/ws/RootsWsModuleTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/root/ws/RootsWsModuleTest.java rename to sonar-server/src/test/java/org/sonar/server/root/ws/RootsWsModuleTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/root/ws/RootsWsTest.java b/sonar-server/src/test/java/org/sonar/server/root/ws/RootsWsTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/root/ws/RootsWsTest.java rename to sonar-server/src/test/java/org/sonar/server/root/ws/RootsWsTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/root/ws/SearchActionTest.java b/sonar-server/src/test/java/org/sonar/server/root/ws/SearchActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/root/ws/SearchActionTest.java rename to sonar-server/src/test/java/org/sonar/server/root/ws/SearchActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/root/ws/SetRootActionTest.java b/sonar-server/src/test/java/org/sonar/server/root/ws/SetRootActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/root/ws/SetRootActionTest.java rename to sonar-server/src/test/java/org/sonar/server/root/ws/SetRootActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/root/ws/UnsetRootActionTest.java b/sonar-server/src/test/java/org/sonar/server/root/ws/UnsetRootActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/root/ws/UnsetRootActionTest.java rename to sonar-server/src/test/java/org/sonar/server/root/ws/UnsetRootActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/rule/CachingRuleFinderTest.java b/sonar-server/src/test/java/org/sonar/server/rule/CachingRuleFinderTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/rule/CachingRuleFinderTest.java rename to sonar-server/src/test/java/org/sonar/server/rule/CachingRuleFinderTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/rule/CommonRuleKeysTest.java b/sonar-server/src/test/java/org/sonar/server/rule/CommonRuleKeysTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/rule/CommonRuleKeysTest.java rename to sonar-server/src/test/java/org/sonar/server/rule/CommonRuleKeysTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/rule/DefaultRuleFinderTest.java b/sonar-server/src/test/java/org/sonar/server/rule/DefaultRuleFinderTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/rule/DefaultRuleFinderTest.java rename to sonar-server/src/test/java/org/sonar/server/rule/DefaultRuleFinderTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/rule/DeprecatedRulesDefinitionLoaderTest.java b/sonar-server/src/test/java/org/sonar/server/rule/DeprecatedRulesDefinitionLoaderTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/rule/DeprecatedRulesDefinitionLoaderTest.java rename to sonar-server/src/test/java/org/sonar/server/rule/DeprecatedRulesDefinitionLoaderTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/rule/RegisterRulesMediumTest.java b/sonar-server/src/test/java/org/sonar/server/rule/RegisterRulesMediumTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/rule/RegisterRulesMediumTest.java rename to sonar-server/src/test/java/org/sonar/server/rule/RegisterRulesMediumTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/rule/RegisterRulesTest.java b/sonar-server/src/test/java/org/sonar/server/rule/RegisterRulesTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/rule/RegisterRulesTest.java rename to sonar-server/src/test/java/org/sonar/server/rule/RegisterRulesTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/rule/RuleCreatorTest.java b/sonar-server/src/test/java/org/sonar/server/rule/RuleCreatorTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/rule/RuleCreatorTest.java rename to sonar-server/src/test/java/org/sonar/server/rule/RuleCreatorTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/rule/RuleDefinitionsLoaderTest.java b/sonar-server/src/test/java/org/sonar/server/rule/RuleDefinitionsLoaderTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/rule/RuleDefinitionsLoaderTest.java rename to sonar-server/src/test/java/org/sonar/server/rule/RuleDefinitionsLoaderTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/rule/RuleTagHelperTest.java b/sonar-server/src/test/java/org/sonar/server/rule/RuleTagHelperTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/rule/RuleTagHelperTest.java rename to sonar-server/src/test/java/org/sonar/server/rule/RuleTagHelperTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/rule/RuleUpdaterTest.java b/sonar-server/src/test/java/org/sonar/server/rule/RuleUpdaterTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/rule/RuleUpdaterTest.java rename to sonar-server/src/test/java/org/sonar/server/rule/RuleUpdaterTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/rule/WebServerRuleFinderImplTest.java b/sonar-server/src/test/java/org/sonar/server/rule/WebServerRuleFinderImplTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/rule/WebServerRuleFinderImplTest.java rename to sonar-server/src/test/java/org/sonar/server/rule/WebServerRuleFinderImplTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/rule/index/RuleIndexDefinitionTest.java b/sonar-server/src/test/java/org/sonar/server/rule/index/RuleIndexDefinitionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/rule/index/RuleIndexDefinitionTest.java rename to sonar-server/src/test/java/org/sonar/server/rule/index/RuleIndexDefinitionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/rule/index/RuleIndexTest.java b/sonar-server/src/test/java/org/sonar/server/rule/index/RuleIndexTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/rule/index/RuleIndexTest.java rename to sonar-server/src/test/java/org/sonar/server/rule/index/RuleIndexTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/rule/index/RuleIndexerTest.java b/sonar-server/src/test/java/org/sonar/server/rule/index/RuleIndexerTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/rule/index/RuleIndexerTest.java rename to sonar-server/src/test/java/org/sonar/server/rule/index/RuleIndexerTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/rule/ws/ActiveRuleCompleterTest.java b/sonar-server/src/test/java/org/sonar/server/rule/ws/ActiveRuleCompleterTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/rule/ws/ActiveRuleCompleterTest.java rename to sonar-server/src/test/java/org/sonar/server/rule/ws/ActiveRuleCompleterTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/rule/ws/AppActionTest.java b/sonar-server/src/test/java/org/sonar/server/rule/ws/AppActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/rule/ws/AppActionTest.java rename to sonar-server/src/test/java/org/sonar/server/rule/ws/AppActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/rule/ws/CreateActionTest.java b/sonar-server/src/test/java/org/sonar/server/rule/ws/CreateActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/rule/ws/CreateActionTest.java rename to sonar-server/src/test/java/org/sonar/server/rule/ws/CreateActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/rule/ws/DeleteActionTest.java b/sonar-server/src/test/java/org/sonar/server/rule/ws/DeleteActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/rule/ws/DeleteActionTest.java rename to sonar-server/src/test/java/org/sonar/server/rule/ws/DeleteActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/rule/ws/ListActionTest.java b/sonar-server/src/test/java/org/sonar/server/rule/ws/ListActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/rule/ws/ListActionTest.java rename to sonar-server/src/test/java/org/sonar/server/rule/ws/ListActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/rule/ws/RepositoriesActionTest.java b/sonar-server/src/test/java/org/sonar/server/rule/ws/RepositoriesActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/rule/ws/RepositoriesActionTest.java rename to sonar-server/src/test/java/org/sonar/server/rule/ws/RepositoriesActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/rule/ws/RuleQueryFactoryTest.java b/sonar-server/src/test/java/org/sonar/server/rule/ws/RuleQueryFactoryTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/rule/ws/RuleQueryFactoryTest.java rename to sonar-server/src/test/java/org/sonar/server/rule/ws/RuleQueryFactoryTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/rule/ws/SearchActionMediumTest.java b/sonar-server/src/test/java/org/sonar/server/rule/ws/SearchActionMediumTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/rule/ws/SearchActionMediumTest.java rename to sonar-server/src/test/java/org/sonar/server/rule/ws/SearchActionMediumTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/rule/ws/SearchActionTest.java b/sonar-server/src/test/java/org/sonar/server/rule/ws/SearchActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/rule/ws/SearchActionTest.java rename to sonar-server/src/test/java/org/sonar/server/rule/ws/SearchActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/rule/ws/ShowActionMediumTest.java b/sonar-server/src/test/java/org/sonar/server/rule/ws/ShowActionMediumTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/rule/ws/ShowActionMediumTest.java rename to sonar-server/src/test/java/org/sonar/server/rule/ws/ShowActionMediumTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/rule/ws/ShowActionTest.java b/sonar-server/src/test/java/org/sonar/server/rule/ws/ShowActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/rule/ws/ShowActionTest.java rename to sonar-server/src/test/java/org/sonar/server/rule/ws/ShowActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/rule/ws/TagsActionTest.java b/sonar-server/src/test/java/org/sonar/server/rule/ws/TagsActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/rule/ws/TagsActionTest.java rename to sonar-server/src/test/java/org/sonar/server/rule/ws/TagsActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/rule/ws/UpdateActionTest.java b/sonar-server/src/test/java/org/sonar/server/rule/ws/UpdateActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/rule/ws/UpdateActionTest.java rename to sonar-server/src/test/java/org/sonar/server/rule/ws/UpdateActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/search/BaseDocTest.java b/sonar-server/src/test/java/org/sonar/server/search/BaseDocTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/search/BaseDocTest.java rename to sonar-server/src/test/java/org/sonar/server/search/BaseDocTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/search/EsSearchModuleTest.java b/sonar-server/src/test/java/org/sonar/server/search/EsSearchModuleTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/search/EsSearchModuleTest.java rename to sonar-server/src/test/java/org/sonar/server/search/EsSearchModuleTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/search/FacetValueTest.java b/sonar-server/src/test/java/org/sonar/server/search/FacetValueTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/search/FacetValueTest.java rename to sonar-server/src/test/java/org/sonar/server/search/FacetValueTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/serverid/ws/GenerateActionTest.java b/sonar-server/src/test/java/org/sonar/server/serverid/ws/GenerateActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/serverid/ws/GenerateActionTest.java rename to sonar-server/src/test/java/org/sonar/server/serverid/ws/GenerateActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/serverid/ws/ServerIdWsModuleTest.java b/sonar-server/src/test/java/org/sonar/server/serverid/ws/ServerIdWsModuleTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/serverid/ws/ServerIdWsModuleTest.java rename to sonar-server/src/test/java/org/sonar/server/serverid/ws/ServerIdWsModuleTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/serverid/ws/ServerIdWsTest.java b/sonar-server/src/test/java/org/sonar/server/serverid/ws/ServerIdWsTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/serverid/ws/ServerIdWsTest.java rename to sonar-server/src/test/java/org/sonar/server/serverid/ws/ServerIdWsTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/serverid/ws/ShowActionTest.java b/sonar-server/src/test/java/org/sonar/server/serverid/ws/ShowActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/serverid/ws/ShowActionTest.java rename to sonar-server/src/test/java/org/sonar/server/serverid/ws/ShowActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/setting/DatabaseSettingLoaderTest.java b/sonar-server/src/test/java/org/sonar/server/setting/DatabaseSettingLoaderTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/setting/DatabaseSettingLoaderTest.java rename to sonar-server/src/test/java/org/sonar/server/setting/DatabaseSettingLoaderTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/setting/DatabaseSettingsEnablerTest.java b/sonar-server/src/test/java/org/sonar/server/setting/DatabaseSettingsEnablerTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/setting/DatabaseSettingsEnablerTest.java rename to sonar-server/src/test/java/org/sonar/server/setting/DatabaseSettingsEnablerTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/setting/NopSettingLoaderTest.java b/sonar-server/src/test/java/org/sonar/server/setting/NopSettingLoaderTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/setting/NopSettingLoaderTest.java rename to sonar-server/src/test/java/org/sonar/server/setting/NopSettingLoaderTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/setting/ProjectSettingsFactoryTest.java b/sonar-server/src/test/java/org/sonar/server/setting/ProjectSettingsFactoryTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/setting/ProjectSettingsFactoryTest.java rename to sonar-server/src/test/java/org/sonar/server/setting/ProjectSettingsFactoryTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/setting/ThreadLocalSettingsTest.java b/sonar-server/src/test/java/org/sonar/server/setting/ThreadLocalSettingsTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/setting/ThreadLocalSettingsTest.java rename to sonar-server/src/test/java/org/sonar/server/setting/ThreadLocalSettingsTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/setting/ws/CheckSecretKeyActionTest.java b/sonar-server/src/test/java/org/sonar/server/setting/ws/CheckSecretKeyActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/setting/ws/CheckSecretKeyActionTest.java rename to sonar-server/src/test/java/org/sonar/server/setting/ws/CheckSecretKeyActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/setting/ws/EncryptActionTest.java b/sonar-server/src/test/java/org/sonar/server/setting/ws/EncryptActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/setting/ws/EncryptActionTest.java rename to sonar-server/src/test/java/org/sonar/server/setting/ws/EncryptActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/setting/ws/GenerateSecretKeyActionTest.java b/sonar-server/src/test/java/org/sonar/server/setting/ws/GenerateSecretKeyActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/setting/ws/GenerateSecretKeyActionTest.java rename to sonar-server/src/test/java/org/sonar/server/setting/ws/GenerateSecretKeyActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/setting/ws/ListDefinitionsActionTest.java b/sonar-server/src/test/java/org/sonar/server/setting/ws/ListDefinitionsActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/setting/ws/ListDefinitionsActionTest.java rename to sonar-server/src/test/java/org/sonar/server/setting/ws/ListDefinitionsActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/setting/ws/ResetActionTest.java b/sonar-server/src/test/java/org/sonar/server/setting/ws/ResetActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/setting/ws/ResetActionTest.java rename to sonar-server/src/test/java/org/sonar/server/setting/ws/ResetActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/setting/ws/ScannerSettingsTest.java b/sonar-server/src/test/java/org/sonar/server/setting/ws/ScannerSettingsTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/setting/ws/ScannerSettingsTest.java rename to sonar-server/src/test/java/org/sonar/server/setting/ws/ScannerSettingsTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/setting/ws/SetActionTest.java b/sonar-server/src/test/java/org/sonar/server/setting/ws/SetActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/setting/ws/SetActionTest.java rename to sonar-server/src/test/java/org/sonar/server/setting/ws/SetActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/setting/ws/SettingsFinderTest.java b/sonar-server/src/test/java/org/sonar/server/setting/ws/SettingsFinderTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/setting/ws/SettingsFinderTest.java rename to sonar-server/src/test/java/org/sonar/server/setting/ws/SettingsFinderTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/setting/ws/SettingsUpdaterTest.java b/sonar-server/src/test/java/org/sonar/server/setting/ws/SettingsUpdaterTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/setting/ws/SettingsUpdaterTest.java rename to sonar-server/src/test/java/org/sonar/server/setting/ws/SettingsUpdaterTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/setting/ws/SettingsWsModuleTest.java b/sonar-server/src/test/java/org/sonar/server/setting/ws/SettingsWsModuleTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/setting/ws/SettingsWsModuleTest.java rename to sonar-server/src/test/java/org/sonar/server/setting/ws/SettingsWsModuleTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/setting/ws/ValuesActionTest.java b/sonar-server/src/test/java/org/sonar/server/setting/ws/ValuesActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/setting/ws/ValuesActionTest.java rename to sonar-server/src/test/java/org/sonar/server/setting/ws/ValuesActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/source/DecorationDataHolderTest.java b/sonar-server/src/test/java/org/sonar/server/source/DecorationDataHolderTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/source/DecorationDataHolderTest.java rename to sonar-server/src/test/java/org/sonar/server/source/DecorationDataHolderTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/source/HtmlSourceDecoratorTest.java b/sonar-server/src/test/java/org/sonar/server/source/HtmlSourceDecoratorTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/source/HtmlSourceDecoratorTest.java rename to sonar-server/src/test/java/org/sonar/server/source/HtmlSourceDecoratorTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/source/HtmlTextDecoratorTest.java b/sonar-server/src/test/java/org/sonar/server/source/HtmlTextDecoratorTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/source/HtmlTextDecoratorTest.java rename to sonar-server/src/test/java/org/sonar/server/source/HtmlTextDecoratorTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/source/OpeningHtmlTagTest.java b/sonar-server/src/test/java/org/sonar/server/source/OpeningHtmlTagTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/source/OpeningHtmlTagTest.java rename to sonar-server/src/test/java/org/sonar/server/source/OpeningHtmlTagTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/source/SourceServiceTest.java b/sonar-server/src/test/java/org/sonar/server/source/SourceServiceTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/source/SourceServiceTest.java rename to sonar-server/src/test/java/org/sonar/server/source/SourceServiceTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/source/index/FileSourceTesting.java b/sonar-server/src/test/java/org/sonar/server/source/index/FileSourceTesting.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/source/index/FileSourceTesting.java rename to sonar-server/src/test/java/org/sonar/server/source/index/FileSourceTesting.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/source/ws/HashActionTest.java b/sonar-server/src/test/java/org/sonar/server/source/ws/HashActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/source/ws/HashActionTest.java rename to sonar-server/src/test/java/org/sonar/server/source/ws/HashActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/source/ws/IndexActionTest.java b/sonar-server/src/test/java/org/sonar/server/source/ws/IndexActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/source/ws/IndexActionTest.java rename to sonar-server/src/test/java/org/sonar/server/source/ws/IndexActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/source/ws/LinesActionTest.java b/sonar-server/src/test/java/org/sonar/server/source/ws/LinesActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/source/ws/LinesActionTest.java rename to sonar-server/src/test/java/org/sonar/server/source/ws/LinesActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/source/ws/RawActionTest.java b/sonar-server/src/test/java/org/sonar/server/source/ws/RawActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/source/ws/RawActionTest.java rename to sonar-server/src/test/java/org/sonar/server/source/ws/RawActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/source/ws/ScmActionTest.java b/sonar-server/src/test/java/org/sonar/server/source/ws/ScmActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/source/ws/ScmActionTest.java rename to sonar-server/src/test/java/org/sonar/server/source/ws/ScmActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/source/ws/ShowActionTest.java b/sonar-server/src/test/java/org/sonar/server/source/ws/ShowActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/source/ws/ShowActionTest.java rename to sonar-server/src/test/java/org/sonar/server/source/ws/ShowActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/source/ws/SourcesWsTest.java b/sonar-server/src/test/java/org/sonar/server/source/ws/SourcesWsTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/source/ws/SourcesWsTest.java rename to sonar-server/src/test/java/org/sonar/server/source/ws/SourcesWsTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/startup/DeleteOldAnalysisReportsFromFsTest.java b/sonar-server/src/test/java/org/sonar/server/startup/DeleteOldAnalysisReportsFromFsTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/startup/DeleteOldAnalysisReportsFromFsTest.java rename to sonar-server/src/test/java/org/sonar/server/startup/DeleteOldAnalysisReportsFromFsTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/startup/DisplayLogOnDeprecatedProjectsTest.java b/sonar-server/src/test/java/org/sonar/server/startup/DisplayLogOnDeprecatedProjectsTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/startup/DisplayLogOnDeprecatedProjectsTest.java rename to sonar-server/src/test/java/org/sonar/server/startup/DisplayLogOnDeprecatedProjectsTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/startup/GeneratePluginIndexTest.java b/sonar-server/src/test/java/org/sonar/server/startup/GeneratePluginIndexTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/startup/GeneratePluginIndexTest.java rename to sonar-server/src/test/java/org/sonar/server/startup/GeneratePluginIndexTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/startup/LogServerIdTest.java b/sonar-server/src/test/java/org/sonar/server/startup/LogServerIdTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/startup/LogServerIdTest.java rename to sonar-server/src/test/java/org/sonar/server/startup/LogServerIdTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/startup/RegisterMetricsTest.java b/sonar-server/src/test/java/org/sonar/server/startup/RegisterMetricsTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/startup/RegisterMetricsTest.java rename to sonar-server/src/test/java/org/sonar/server/startup/RegisterMetricsTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/startup/RegisterPermissionTemplatesTest.java b/sonar-server/src/test/java/org/sonar/server/startup/RegisterPermissionTemplatesTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/startup/RegisterPermissionTemplatesTest.java rename to sonar-server/src/test/java/org/sonar/server/startup/RegisterPermissionTemplatesTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/startup/RegisterServletFiltersTest.java b/sonar-server/src/test/java/org/sonar/server/startup/RegisterServletFiltersTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/startup/RegisterServletFiltersTest.java rename to sonar-server/src/test/java/org/sonar/server/startup/RegisterServletFiltersTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/startup/RenameDeprecatedPropertyKeysTest.java b/sonar-server/src/test/java/org/sonar/server/startup/RenameDeprecatedPropertyKeysTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/startup/RenameDeprecatedPropertyKeysTest.java rename to sonar-server/src/test/java/org/sonar/server/startup/RenameDeprecatedPropertyKeysTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/test/db/TestTesting.java b/sonar-server/src/test/java/org/sonar/server/test/db/TestTesting.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/test/db/TestTesting.java rename to sonar-server/src/test/java/org/sonar/server/test/db/TestTesting.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/test/index/TestIndexTest.java b/sonar-server/src/test/java/org/sonar/server/test/index/TestIndexTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/test/index/TestIndexTest.java rename to sonar-server/src/test/java/org/sonar/server/test/index/TestIndexTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/test/index/TestIndexerTest.java b/sonar-server/src/test/java/org/sonar/server/test/index/TestIndexerTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/test/index/TestIndexerTest.java rename to sonar-server/src/test/java/org/sonar/server/test/index/TestIndexerTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/test/index/TestResultSetIteratorTest.java b/sonar-server/src/test/java/org/sonar/server/test/index/TestResultSetIteratorTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/test/index/TestResultSetIteratorTest.java rename to sonar-server/src/test/java/org/sonar/server/test/index/TestResultSetIteratorTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/test/ws/CoveredFilesActionTest.java b/sonar-server/src/test/java/org/sonar/server/test/ws/CoveredFilesActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/test/ws/CoveredFilesActionTest.java rename to sonar-server/src/test/java/org/sonar/server/test/ws/CoveredFilesActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/test/ws/ListActionTest.java b/sonar-server/src/test/java/org/sonar/server/test/ws/ListActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/test/ws/ListActionTest.java rename to sonar-server/src/test/java/org/sonar/server/test/ws/ListActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/test/ws/TestsWsTest.java b/sonar-server/src/test/java/org/sonar/server/test/ws/TestsWsTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/test/ws/TestsWsTest.java rename to sonar-server/src/test/java/org/sonar/server/test/ws/TestsWsTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/tester/AbstractMockUserSession.java b/sonar-server/src/test/java/org/sonar/server/tester/AbstractMockUserSession.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/tester/AbstractMockUserSession.java rename to sonar-server/src/test/java/org/sonar/server/tester/AbstractMockUserSession.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/tester/AnonymousMockUserSession.java b/sonar-server/src/test/java/org/sonar/server/tester/AnonymousMockUserSession.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/tester/AnonymousMockUserSession.java rename to sonar-server/src/test/java/org/sonar/server/tester/AnonymousMockUserSession.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/tester/AttributeHolderServletContext.java b/sonar-server/src/test/java/org/sonar/server/tester/AttributeHolderServletContext.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/tester/AttributeHolderServletContext.java rename to sonar-server/src/test/java/org/sonar/server/tester/AttributeHolderServletContext.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/tester/AttributeHolderServletContextTest.java b/sonar-server/src/test/java/org/sonar/server/tester/AttributeHolderServletContextTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/tester/AttributeHolderServletContextTest.java rename to sonar-server/src/test/java/org/sonar/server/tester/AttributeHolderServletContextTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/tester/MockUserSession.java b/sonar-server/src/test/java/org/sonar/server/tester/MockUserSession.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/tester/MockUserSession.java rename to sonar-server/src/test/java/org/sonar/server/tester/MockUserSession.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/tester/MockUserSessionTest.java b/sonar-server/src/test/java/org/sonar/server/tester/MockUserSessionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/tester/MockUserSessionTest.java rename to sonar-server/src/test/java/org/sonar/server/tester/MockUserSessionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/tester/ServerTester.java b/sonar-server/src/test/java/org/sonar/server/tester/ServerTester.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/tester/ServerTester.java rename to sonar-server/src/test/java/org/sonar/server/tester/ServerTester.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/tester/UserSessionRule.java b/sonar-server/src/test/java/org/sonar/server/tester/UserSessionRule.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/tester/UserSessionRule.java rename to sonar-server/src/test/java/org/sonar/server/tester/UserSessionRule.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/tester/package-info.java b/sonar-server/src/test/java/org/sonar/server/tester/package-info.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/tester/package-info.java rename to sonar-server/src/test/java/org/sonar/server/tester/package-info.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/text/MacroInterpreterTest.java b/sonar-server/src/test/java/org/sonar/server/text/MacroInterpreterTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/text/MacroInterpreterTest.java rename to sonar-server/src/test/java/org/sonar/server/text/MacroInterpreterTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/ui/DeprecatedViewsTest.java b/sonar-server/src/test/java/org/sonar/server/ui/DeprecatedViewsTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/ui/DeprecatedViewsTest.java rename to sonar-server/src/test/java/org/sonar/server/ui/DeprecatedViewsTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/ui/PageDecorationsTest.java b/sonar-server/src/test/java/org/sonar/server/ui/PageDecorationsTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/ui/PageDecorationsTest.java rename to sonar-server/src/test/java/org/sonar/server/ui/PageDecorationsTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/ui/PageRepositoryTest.java b/sonar-server/src/test/java/org/sonar/server/ui/PageRepositoryTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/ui/PageRepositoryTest.java rename to sonar-server/src/test/java/org/sonar/server/ui/PageRepositoryTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/ui/VersionFormatterTest.java b/sonar-server/src/test/java/org/sonar/server/ui/VersionFormatterTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/ui/VersionFormatterTest.java rename to sonar-server/src/test/java/org/sonar/server/ui/VersionFormatterTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/ui/ws/ComponentActionTest.java b/sonar-server/src/test/java/org/sonar/server/ui/ws/ComponentActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/ui/ws/ComponentActionTest.java rename to sonar-server/src/test/java/org/sonar/server/ui/ws/ComponentActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/ui/ws/GlobalActionTest.java b/sonar-server/src/test/java/org/sonar/server/ui/ws/GlobalActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/ui/ws/GlobalActionTest.java rename to sonar-server/src/test/java/org/sonar/server/ui/ws/GlobalActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/ui/ws/NavigationWsModuleTest.java b/sonar-server/src/test/java/org/sonar/server/ui/ws/NavigationWsModuleTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/ui/ws/NavigationWsModuleTest.java rename to sonar-server/src/test/java/org/sonar/server/ui/ws/NavigationWsModuleTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/ui/ws/OrganizationActionTest.java b/sonar-server/src/test/java/org/sonar/server/ui/ws/OrganizationActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/ui/ws/OrganizationActionTest.java rename to sonar-server/src/test/java/org/sonar/server/ui/ws/OrganizationActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/ui/ws/SettingsActionTest.java b/sonar-server/src/test/java/org/sonar/server/ui/ws/SettingsActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/ui/ws/SettingsActionTest.java rename to sonar-server/src/test/java/org/sonar/server/ui/ws/SettingsActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/updatecenter/UpdateCenterModuleTest.java b/sonar-server/src/test/java/org/sonar/server/updatecenter/UpdateCenterModuleTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/updatecenter/UpdateCenterModuleTest.java rename to sonar-server/src/test/java/org/sonar/server/updatecenter/UpdateCenterModuleTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/updatecenter/ws/InstalledPluginsActionTest.java b/sonar-server/src/test/java/org/sonar/server/updatecenter/ws/InstalledPluginsActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/updatecenter/ws/InstalledPluginsActionTest.java rename to sonar-server/src/test/java/org/sonar/server/updatecenter/ws/InstalledPluginsActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/updatecenter/ws/UpdateCenterWsTest.java b/sonar-server/src/test/java/org/sonar/server/updatecenter/ws/UpdateCenterWsTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/updatecenter/ws/UpdateCenterWsTest.java rename to sonar-server/src/test/java/org/sonar/server/updatecenter/ws/UpdateCenterWsTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/updatecenter/ws/UploadActionTest.java b/sonar-server/src/test/java/org/sonar/server/updatecenter/ws/UploadActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/updatecenter/ws/UploadActionTest.java rename to sonar-server/src/test/java/org/sonar/server/updatecenter/ws/UploadActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/user/CompatibilityRealmTest.java b/sonar-server/src/test/java/org/sonar/server/user/CompatibilityRealmTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/user/CompatibilityRealmTest.java rename to sonar-server/src/test/java/org/sonar/server/user/CompatibilityRealmTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/user/DefaultUserTest.java b/sonar-server/src/test/java/org/sonar/server/user/DefaultUserTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/user/DefaultUserTest.java rename to sonar-server/src/test/java/org/sonar/server/user/DefaultUserTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/user/DeprecatedUserFinderTest.java b/sonar-server/src/test/java/org/sonar/server/user/DeprecatedUserFinderTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/user/DeprecatedUserFinderTest.java rename to sonar-server/src/test/java/org/sonar/server/user/DeprecatedUserFinderTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/user/DoPrivilegedTest.java b/sonar-server/src/test/java/org/sonar/server/user/DoPrivilegedTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/user/DoPrivilegedTest.java rename to sonar-server/src/test/java/org/sonar/server/user/DoPrivilegedTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/user/ExternalIdentityTest.java b/sonar-server/src/test/java/org/sonar/server/user/ExternalIdentityTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/user/ExternalIdentityTest.java rename to sonar-server/src/test/java/org/sonar/server/user/ExternalIdentityTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/user/NewUserNotifierTest.java b/sonar-server/src/test/java/org/sonar/server/user/NewUserNotifierTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/user/NewUserNotifierTest.java rename to sonar-server/src/test/java/org/sonar/server/user/NewUserNotifierTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/user/NewUserTest.java b/sonar-server/src/test/java/org/sonar/server/user/NewUserTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/user/NewUserTest.java rename to sonar-server/src/test/java/org/sonar/server/user/NewUserTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/user/SecurityRealmFactoryTest.java b/sonar-server/src/test/java/org/sonar/server/user/SecurityRealmFactoryTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/user/SecurityRealmFactoryTest.java rename to sonar-server/src/test/java/org/sonar/server/user/SecurityRealmFactoryTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/user/ServerUserSessionTest.java b/sonar-server/src/test/java/org/sonar/server/user/ServerUserSessionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/user/ServerUserSessionTest.java rename to sonar-server/src/test/java/org/sonar/server/user/ServerUserSessionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/user/TestUserSessionFactory.java b/sonar-server/src/test/java/org/sonar/server/user/TestUserSessionFactory.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/user/TestUserSessionFactory.java rename to sonar-server/src/test/java/org/sonar/server/user/TestUserSessionFactory.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/user/ThreadLocalUserSessionTest.java b/sonar-server/src/test/java/org/sonar/server/user/ThreadLocalUserSessionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/user/ThreadLocalUserSessionTest.java rename to sonar-server/src/test/java/org/sonar/server/user/ThreadLocalUserSessionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/user/UserSessionFilterTest.java b/sonar-server/src/test/java/org/sonar/server/user/UserSessionFilterTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/user/UserSessionFilterTest.java rename to sonar-server/src/test/java/org/sonar/server/user/UserSessionFilterTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/user/UserUpdaterTest.java b/sonar-server/src/test/java/org/sonar/server/user/UserUpdaterTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/user/UserUpdaterTest.java rename to sonar-server/src/test/java/org/sonar/server/user/UserUpdaterTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/user/index/UserIndexDefinitionTest.java b/sonar-server/src/test/java/org/sonar/server/user/index/UserIndexDefinitionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/user/index/UserIndexDefinitionTest.java rename to sonar-server/src/test/java/org/sonar/server/user/index/UserIndexDefinitionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/user/index/UserIndexTest.java b/sonar-server/src/test/java/org/sonar/server/user/index/UserIndexTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/user/index/UserIndexTest.java rename to sonar-server/src/test/java/org/sonar/server/user/index/UserIndexTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/user/index/UserIndexerTest.java b/sonar-server/src/test/java/org/sonar/server/user/index/UserIndexerTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/user/index/UserIndexerTest.java rename to sonar-server/src/test/java/org/sonar/server/user/index/UserIndexerTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/user/ws/ChangePasswordActionTest.java b/sonar-server/src/test/java/org/sonar/server/user/ws/ChangePasswordActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/user/ws/ChangePasswordActionTest.java rename to sonar-server/src/test/java/org/sonar/server/user/ws/ChangePasswordActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/user/ws/CreateActionTest.java b/sonar-server/src/test/java/org/sonar/server/user/ws/CreateActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/user/ws/CreateActionTest.java rename to sonar-server/src/test/java/org/sonar/server/user/ws/CreateActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/user/ws/CurrentActionTest.java b/sonar-server/src/test/java/org/sonar/server/user/ws/CurrentActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/user/ws/CurrentActionTest.java rename to sonar-server/src/test/java/org/sonar/server/user/ws/CurrentActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/user/ws/DeactivateActionTest.java b/sonar-server/src/test/java/org/sonar/server/user/ws/DeactivateActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/user/ws/DeactivateActionTest.java rename to sonar-server/src/test/java/org/sonar/server/user/ws/DeactivateActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/user/ws/GroupsActionTest.java b/sonar-server/src/test/java/org/sonar/server/user/ws/GroupsActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/user/ws/GroupsActionTest.java rename to sonar-server/src/test/java/org/sonar/server/user/ws/GroupsActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/user/ws/IdentityProvidersActionTest.java b/sonar-server/src/test/java/org/sonar/server/user/ws/IdentityProvidersActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/user/ws/IdentityProvidersActionTest.java rename to sonar-server/src/test/java/org/sonar/server/user/ws/IdentityProvidersActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/user/ws/SearchActionTest.java b/sonar-server/src/test/java/org/sonar/server/user/ws/SearchActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/user/ws/SearchActionTest.java rename to sonar-server/src/test/java/org/sonar/server/user/ws/SearchActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/user/ws/SkipOnboardingTutorialActionTest.java b/sonar-server/src/test/java/org/sonar/server/user/ws/SkipOnboardingTutorialActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/user/ws/SkipOnboardingTutorialActionTest.java rename to sonar-server/src/test/java/org/sonar/server/user/ws/SkipOnboardingTutorialActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/user/ws/UpdateActionTest.java b/sonar-server/src/test/java/org/sonar/server/user/ws/UpdateActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/user/ws/UpdateActionTest.java rename to sonar-server/src/test/java/org/sonar/server/user/ws/UpdateActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/user/ws/UserPropertiesWsTest.java b/sonar-server/src/test/java/org/sonar/server/user/ws/UserPropertiesWsTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/user/ws/UserPropertiesWsTest.java rename to sonar-server/src/test/java/org/sonar/server/user/ws/UserPropertiesWsTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/user/ws/UsersWsModuleTest.java b/sonar-server/src/test/java/org/sonar/server/user/ws/UsersWsModuleTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/user/ws/UsersWsModuleTest.java rename to sonar-server/src/test/java/org/sonar/server/user/ws/UsersWsModuleTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/user/ws/UsersWsTest.java b/sonar-server/src/test/java/org/sonar/server/user/ws/UsersWsTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/user/ws/UsersWsTest.java rename to sonar-server/src/test/java/org/sonar/server/user/ws/UsersWsTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/usergroups/DefaultGroupCreatorImplTest.java b/sonar-server/src/test/java/org/sonar/server/usergroups/DefaultGroupCreatorImplTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/usergroups/DefaultGroupCreatorImplTest.java rename to sonar-server/src/test/java/org/sonar/server/usergroups/DefaultGroupCreatorImplTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/usergroups/DefaultGroupFinderTest.java b/sonar-server/src/test/java/org/sonar/server/usergroups/DefaultGroupFinderTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/usergroups/DefaultGroupFinderTest.java rename to sonar-server/src/test/java/org/sonar/server/usergroups/DefaultGroupFinderTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/AddUserActionTest.java b/sonar-server/src/test/java/org/sonar/server/usergroups/ws/AddUserActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/AddUserActionTest.java rename to sonar-server/src/test/java/org/sonar/server/usergroups/ws/AddUserActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/CreateActionTest.java b/sonar-server/src/test/java/org/sonar/server/usergroups/ws/CreateActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/CreateActionTest.java rename to sonar-server/src/test/java/org/sonar/server/usergroups/ws/CreateActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/DeleteActionTest.java b/sonar-server/src/test/java/org/sonar/server/usergroups/ws/DeleteActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/DeleteActionTest.java rename to sonar-server/src/test/java/org/sonar/server/usergroups/ws/DeleteActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/GroupWsRefTest.java b/sonar-server/src/test/java/org/sonar/server/usergroups/ws/GroupWsRefTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/GroupWsRefTest.java rename to sonar-server/src/test/java/org/sonar/server/usergroups/ws/GroupWsRefTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/RemoveUserActionTest.java b/sonar-server/src/test/java/org/sonar/server/usergroups/ws/RemoveUserActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/RemoveUserActionTest.java rename to sonar-server/src/test/java/org/sonar/server/usergroups/ws/RemoveUserActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/SearchActionTest.java b/sonar-server/src/test/java/org/sonar/server/usergroups/ws/SearchActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/SearchActionTest.java rename to sonar-server/src/test/java/org/sonar/server/usergroups/ws/SearchActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/UpdateActionTest.java b/sonar-server/src/test/java/org/sonar/server/usergroups/ws/UpdateActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/UpdateActionTest.java rename to sonar-server/src/test/java/org/sonar/server/usergroups/ws/UpdateActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/UserGroupsModuleTest.java b/sonar-server/src/test/java/org/sonar/server/usergroups/ws/UserGroupsModuleTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/UserGroupsModuleTest.java rename to sonar-server/src/test/java/org/sonar/server/usergroups/ws/UserGroupsModuleTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/UserGroupsWsTest.java b/sonar-server/src/test/java/org/sonar/server/usergroups/ws/UserGroupsWsTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/UserGroupsWsTest.java rename to sonar-server/src/test/java/org/sonar/server/usergroups/ws/UserGroupsWsTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/UsersActionTest.java b/sonar-server/src/test/java/org/sonar/server/usergroups/ws/UsersActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/UsersActionTest.java rename to sonar-server/src/test/java/org/sonar/server/usergroups/ws/UsersActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/usertoken/TokenGeneratorImplTest.java b/sonar-server/src/test/java/org/sonar/server/usertoken/TokenGeneratorImplTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/usertoken/TokenGeneratorImplTest.java rename to sonar-server/src/test/java/org/sonar/server/usertoken/TokenGeneratorImplTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/usertoken/UserTokenAuthenticatorTest.java b/sonar-server/src/test/java/org/sonar/server/usertoken/UserTokenAuthenticatorTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/usertoken/UserTokenAuthenticatorTest.java rename to sonar-server/src/test/java/org/sonar/server/usertoken/UserTokenAuthenticatorTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/usertoken/UserTokenModuleTest.java b/sonar-server/src/test/java/org/sonar/server/usertoken/UserTokenModuleTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/usertoken/UserTokenModuleTest.java rename to sonar-server/src/test/java/org/sonar/server/usertoken/UserTokenModuleTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/usertoken/ws/GenerateActionTest.java b/sonar-server/src/test/java/org/sonar/server/usertoken/ws/GenerateActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/usertoken/ws/GenerateActionTest.java rename to sonar-server/src/test/java/org/sonar/server/usertoken/ws/GenerateActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/usertoken/ws/RevokeActionTest.java b/sonar-server/src/test/java/org/sonar/server/usertoken/ws/RevokeActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/usertoken/ws/RevokeActionTest.java rename to sonar-server/src/test/java/org/sonar/server/usertoken/ws/RevokeActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/usertoken/ws/SearchActionTest.java b/sonar-server/src/test/java/org/sonar/server/usertoken/ws/SearchActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/usertoken/ws/SearchActionTest.java rename to sonar-server/src/test/java/org/sonar/server/usertoken/ws/SearchActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/usertoken/ws/UserTokensWsTest.java b/sonar-server/src/test/java/org/sonar/server/usertoken/ws/UserTokensWsTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/usertoken/ws/UserTokensWsTest.java rename to sonar-server/src/test/java/org/sonar/server/usertoken/ws/UserTokensWsTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/util/AbstractStoppableExecutorServiceTest.java b/sonar-server/src/test/java/org/sonar/server/util/AbstractStoppableExecutorServiceTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/util/AbstractStoppableExecutorServiceTest.java rename to sonar-server/src/test/java/org/sonar/server/util/AbstractStoppableExecutorServiceTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/util/BooleanTypeValidationTest.java b/sonar-server/src/test/java/org/sonar/server/util/BooleanTypeValidationTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/util/BooleanTypeValidationTest.java rename to sonar-server/src/test/java/org/sonar/server/util/BooleanTypeValidationTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/util/DateCollectorTest.java b/sonar-server/src/test/java/org/sonar/server/util/DateCollectorTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/util/DateCollectorTest.java rename to sonar-server/src/test/java/org/sonar/server/util/DateCollectorTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/util/FloatTypeValidationTest.java b/sonar-server/src/test/java/org/sonar/server/util/FloatTypeValidationTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/util/FloatTypeValidationTest.java rename to sonar-server/src/test/java/org/sonar/server/util/FloatTypeValidationTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/util/IntegerTypeValidationTest.java b/sonar-server/src/test/java/org/sonar/server/util/IntegerTypeValidationTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/util/IntegerTypeValidationTest.java rename to sonar-server/src/test/java/org/sonar/server/util/IntegerTypeValidationTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/util/LongTypeValidationTest.java b/sonar-server/src/test/java/org/sonar/server/util/LongTypeValidationTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/util/LongTypeValidationTest.java rename to sonar-server/src/test/java/org/sonar/server/util/LongTypeValidationTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/util/MetricKeyValidatorTest.java b/sonar-server/src/test/java/org/sonar/server/util/MetricKeyValidatorTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/util/MetricKeyValidatorTest.java rename to sonar-server/src/test/java/org/sonar/server/util/MetricKeyValidatorTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/util/ObjectInputStreamIteratorTest.java b/sonar-server/src/test/java/org/sonar/server/util/ObjectInputStreamIteratorTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/util/ObjectInputStreamIteratorTest.java rename to sonar-server/src/test/java/org/sonar/server/util/ObjectInputStreamIteratorTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/util/OkHttpClientProviderTest.java b/sonar-server/src/test/java/org/sonar/server/util/OkHttpClientProviderTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/util/OkHttpClientProviderTest.java rename to sonar-server/src/test/java/org/sonar/server/util/OkHttpClientProviderTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/util/RubyUtilsTest.java b/sonar-server/src/test/java/org/sonar/server/util/RubyUtilsTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/util/RubyUtilsTest.java rename to sonar-server/src/test/java/org/sonar/server/util/RubyUtilsTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/util/StringListTypeValidationTest.java b/sonar-server/src/test/java/org/sonar/server/util/StringListTypeValidationTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/util/StringListTypeValidationTest.java rename to sonar-server/src/test/java/org/sonar/server/util/StringListTypeValidationTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/util/StringTypeValidationTest.java b/sonar-server/src/test/java/org/sonar/server/util/StringTypeValidationTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/util/StringTypeValidationTest.java rename to sonar-server/src/test/java/org/sonar/server/util/StringTypeValidationTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/util/TextTypeValidationTest.java b/sonar-server/src/test/java/org/sonar/server/util/TextTypeValidationTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/util/TextTypeValidationTest.java rename to sonar-server/src/test/java/org/sonar/server/util/TextTypeValidationTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/util/TypeValidationModuleTest.java b/sonar-server/src/test/java/org/sonar/server/util/TypeValidationModuleTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/util/TypeValidationModuleTest.java rename to sonar-server/src/test/java/org/sonar/server/util/TypeValidationModuleTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/util/TypeValidationsTest.java b/sonar-server/src/test/java/org/sonar/server/util/TypeValidationsTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/util/TypeValidationsTest.java rename to sonar-server/src/test/java/org/sonar/server/util/TypeValidationsTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/util/TypeValidationsTesting.java b/sonar-server/src/test/java/org/sonar/server/util/TypeValidationsTesting.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/util/TypeValidationsTesting.java rename to sonar-server/src/test/java/org/sonar/server/util/TypeValidationsTesting.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/util/WrapInSingleElementArray.java b/sonar-server/src/test/java/org/sonar/server/util/WrapInSingleElementArray.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/util/WrapInSingleElementArray.java rename to sonar-server/src/test/java/org/sonar/server/util/WrapInSingleElementArray.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/util/cache/DiskCacheTest.java b/sonar-server/src/test/java/org/sonar/server/util/cache/DiskCacheTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/util/cache/DiskCacheTest.java rename to sonar-server/src/test/java/org/sonar/server/util/cache/DiskCacheTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/util/cache/MemoryCacheTest.java b/sonar-server/src/test/java/org/sonar/server/util/cache/MemoryCacheTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/util/cache/MemoryCacheTest.java rename to sonar-server/src/test/java/org/sonar/server/util/cache/MemoryCacheTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/view/index/ViewIndexDefinitionTest.java b/sonar-server/src/test/java/org/sonar/server/view/index/ViewIndexDefinitionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/view/index/ViewIndexDefinitionTest.java rename to sonar-server/src/test/java/org/sonar/server/view/index/ViewIndexDefinitionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/view/index/ViewIndexTest.java b/sonar-server/src/test/java/org/sonar/server/view/index/ViewIndexTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/view/index/ViewIndexTest.java rename to sonar-server/src/test/java/org/sonar/server/view/index/ViewIndexTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/view/index/ViewIndexerTest.java b/sonar-server/src/test/java/org/sonar/server/view/index/ViewIndexerTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/view/index/ViewIndexerTest.java rename to sonar-server/src/test/java/org/sonar/server/view/index/ViewIndexerTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/webhook/ws/WebhookDeliveriesActionTest.java b/sonar-server/src/test/java/org/sonar/server/webhook/ws/WebhookDeliveriesActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/webhook/ws/WebhookDeliveriesActionTest.java rename to sonar-server/src/test/java/org/sonar/server/webhook/ws/WebhookDeliveriesActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/webhook/ws/WebhookDeliveryActionTest.java b/sonar-server/src/test/java/org/sonar/server/webhook/ws/WebhookDeliveryActionTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/webhook/ws/WebhookDeliveryActionTest.java rename to sonar-server/src/test/java/org/sonar/server/webhook/ws/WebhookDeliveryActionTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/webhook/ws/WebhooksWsModuleTest.java b/sonar-server/src/test/java/org/sonar/server/webhook/ws/WebhooksWsModuleTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/webhook/ws/WebhooksWsModuleTest.java rename to sonar-server/src/test/java/org/sonar/server/webhook/ws/WebhooksWsModuleTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/webhook/ws/WebhooksWsTest.java b/sonar-server/src/test/java/org/sonar/server/webhook/ws/WebhooksWsTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/webhook/ws/WebhooksWsTest.java rename to sonar-server/src/test/java/org/sonar/server/webhook/ws/WebhooksWsTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/ws/DeprecatedPropertiesWsFilterTest.java b/sonar-server/src/test/java/org/sonar/server/ws/DeprecatedPropertiesWsFilterTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/ws/DeprecatedPropertiesWsFilterTest.java rename to sonar-server/src/test/java/org/sonar/server/ws/DeprecatedPropertiesWsFilterTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/ws/DumbResponse.java b/sonar-server/src/test/java/org/sonar/server/ws/DumbResponse.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/ws/DumbResponse.java rename to sonar-server/src/test/java/org/sonar/server/ws/DumbResponse.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/ws/RemovedWebServiceHandlerTest.java b/sonar-server/src/test/java/org/sonar/server/ws/RemovedWebServiceHandlerTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/ws/RemovedWebServiceHandlerTest.java rename to sonar-server/src/test/java/org/sonar/server/ws/RemovedWebServiceHandlerTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/ws/ServletRequestTest.java b/sonar-server/src/test/java/org/sonar/server/ws/ServletRequestTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/ws/ServletRequestTest.java rename to sonar-server/src/test/java/org/sonar/server/ws/ServletRequestTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/ws/ServletResponseTest.java b/sonar-server/src/test/java/org/sonar/server/ws/ServletResponseTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/ws/ServletResponseTest.java rename to sonar-server/src/test/java/org/sonar/server/ws/ServletResponseTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/ws/TestRequest.java b/sonar-server/src/test/java/org/sonar/server/ws/TestRequest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/ws/TestRequest.java rename to sonar-server/src/test/java/org/sonar/server/ws/TestRequest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/ws/TestResponse.java b/sonar-server/src/test/java/org/sonar/server/ws/TestResponse.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/ws/TestResponse.java rename to sonar-server/src/test/java/org/sonar/server/ws/TestResponse.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/ws/WebServiceEngineTest.java b/sonar-server/src/test/java/org/sonar/server/ws/WebServiceEngineTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/ws/WebServiceEngineTest.java rename to sonar-server/src/test/java/org/sonar/server/ws/WebServiceEngineTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/ws/WebServiceFilterTest.java b/sonar-server/src/test/java/org/sonar/server/ws/WebServiceFilterTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/ws/WebServiceFilterTest.java rename to sonar-server/src/test/java/org/sonar/server/ws/WebServiceFilterTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/ws/WebServiceReroutingFilterTest.java b/sonar-server/src/test/java/org/sonar/server/ws/WebServiceReroutingFilterTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/ws/WebServiceReroutingFilterTest.java rename to sonar-server/src/test/java/org/sonar/server/ws/WebServiceReroutingFilterTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/ws/WsActionTester.java b/sonar-server/src/test/java/org/sonar/server/ws/WsActionTester.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/ws/WsActionTester.java rename to sonar-server/src/test/java/org/sonar/server/ws/WsActionTester.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/ws/WsTester.java b/sonar-server/src/test/java/org/sonar/server/ws/WsTester.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/ws/WsTester.java rename to sonar-server/src/test/java/org/sonar/server/ws/WsTester.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/ws/WsUtilsTest.java b/sonar-server/src/test/java/org/sonar/server/ws/WsUtilsTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/ws/WsUtilsTest.java rename to sonar-server/src/test/java/org/sonar/server/ws/WsUtilsTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/ws/ws/WebServicesWsModuleTest.java b/sonar-server/src/test/java/org/sonar/server/ws/ws/WebServicesWsModuleTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/ws/ws/WebServicesWsModuleTest.java rename to sonar-server/src/test/java/org/sonar/server/ws/ws/WebServicesWsModuleTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/ws/ws/WebServicesWsTest.java b/sonar-server/src/test/java/org/sonar/server/ws/ws/WebServicesWsTest.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/java/org/sonar/server/ws/ws/WebServicesWsTest.java rename to sonar-server/src/test/java/org/sonar/server/ws/ws/WebServicesWsTest.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/projects/.gitignore b/sonar-server/src/test/projects/.gitignore similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/projects/.gitignore rename to sonar-server/src/test/projects/.gitignore diff --git a/sonarqube-6.5/server/sonar-server/src/test/projects/README.txt b/sonar-server/src/test/projects/README.txt similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/projects/README.txt rename to sonar-server/src/test/projects/README.txt diff --git a/sonarqube-6.5/server/sonar-server/src/test/projects/fake-report-plugin/pom.xml b/sonar-server/src/test/projects/fake-report-plugin/pom.xml similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/projects/fake-report-plugin/pom.xml rename to sonar-server/src/test/projects/fake-report-plugin/pom.xml diff --git a/sonarqube-6.5/server/sonar-server/src/test/projects/fake-report-plugin/src/BasePlugin.java b/sonar-server/src/test/projects/fake-report-plugin/src/BasePlugin.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/projects/fake-report-plugin/src/BasePlugin.java rename to sonar-server/src/test/projects/fake-report-plugin/src/BasePlugin.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/projects/fake-report-plugin/src/org/sonar/plugins/testbase/api/BaseApi.java b/sonar-server/src/test/projects/fake-report-plugin/src/org/sonar/plugins/testbase/api/BaseApi.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/projects/fake-report-plugin/src/org/sonar/plugins/testbase/api/BaseApi.java rename to sonar-server/src/test/projects/fake-report-plugin/src/org/sonar/plugins/testbase/api/BaseApi.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/projects/fake-report-plugin/target/fake-report-plugin-0.1-SNAPSHOT.jar b/sonar-server/src/test/projects/fake-report-plugin/target/fake-report-plugin-0.1-SNAPSHOT.jar similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/projects/fake-report-plugin/target/fake-report-plugin-0.1-SNAPSHOT.jar rename to sonar-server/src/test/projects/fake-report-plugin/target/fake-report-plugin-0.1-SNAPSHOT.jar diff --git a/sonarqube-6.5/server/sonar-server/src/test/projects/fake-sqale-plugin/pom.xml b/sonar-server/src/test/projects/fake-sqale-plugin/pom.xml similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/projects/fake-sqale-plugin/pom.xml rename to sonar-server/src/test/projects/fake-sqale-plugin/pom.xml diff --git a/sonarqube-6.5/server/sonar-server/src/test/projects/fake-sqale-plugin/src/BasePlugin.java b/sonar-server/src/test/projects/fake-sqale-plugin/src/BasePlugin.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/projects/fake-sqale-plugin/src/BasePlugin.java rename to sonar-server/src/test/projects/fake-sqale-plugin/src/BasePlugin.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/projects/fake-sqale-plugin/src/org/sonar/plugins/testbase/api/BaseApi.java b/sonar-server/src/test/projects/fake-sqale-plugin/src/org/sonar/plugins/testbase/api/BaseApi.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/projects/fake-sqale-plugin/src/org/sonar/plugins/testbase/api/BaseApi.java rename to sonar-server/src/test/projects/fake-sqale-plugin/src/org/sonar/plugins/testbase/api/BaseApi.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/projects/fake-sqale-plugin/target/fake-sqale-plugin-0.1-SNAPSHOT.jar b/sonar-server/src/test/projects/fake-sqale-plugin/target/fake-sqale-plugin-0.1-SNAPSHOT.jar similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/projects/fake-sqale-plugin/target/fake-sqale-plugin-0.1-SNAPSHOT.jar rename to sonar-server/src/test/projects/fake-sqale-plugin/target/fake-sqale-plugin-0.1-SNAPSHOT.jar diff --git a/sonarqube-6.5/server/sonar-server/src/test/projects/fake-views-plugin/pom.xml b/sonar-server/src/test/projects/fake-views-plugin/pom.xml similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/projects/fake-views-plugin/pom.xml rename to sonar-server/src/test/projects/fake-views-plugin/pom.xml diff --git a/sonarqube-6.5/server/sonar-server/src/test/projects/fake-views-plugin/src/BasePlugin.java b/sonar-server/src/test/projects/fake-views-plugin/src/BasePlugin.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/projects/fake-views-plugin/src/BasePlugin.java rename to sonar-server/src/test/projects/fake-views-plugin/src/BasePlugin.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/projects/fake-views-plugin/src/org/sonar/plugins/testbase/api/BaseApi.java b/sonar-server/src/test/projects/fake-views-plugin/src/org/sonar/plugins/testbase/api/BaseApi.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/projects/fake-views-plugin/src/org/sonar/plugins/testbase/api/BaseApi.java rename to sonar-server/src/test/projects/fake-views-plugin/src/org/sonar/plugins/testbase/api/BaseApi.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/projects/fake-views-plugin/target/fake-views-plugin-0.1-SNAPSHOT.jar b/sonar-server/src/test/projects/fake-views-plugin/target/fake-views-plugin-0.1-SNAPSHOT.jar similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/projects/fake-views-plugin/target/fake-views-plugin-0.1-SNAPSHOT.jar rename to sonar-server/src/test/projects/fake-views-plugin/target/fake-views-plugin-0.1-SNAPSHOT.jar diff --git a/sonarqube-6.5/server/sonar-server/src/test/projects/pom.xml b/sonar-server/src/test/projects/pom.xml similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/projects/pom.xml rename to sonar-server/src/test/projects/pom.xml diff --git a/sonarqube-6.5/server/sonar-server/src/test/projects/test-base-plugin-v2/pom.xml b/sonar-server/src/test/projects/test-base-plugin-v2/pom.xml similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/projects/test-base-plugin-v2/pom.xml rename to sonar-server/src/test/projects/test-base-plugin-v2/pom.xml diff --git a/sonarqube-6.5/server/sonar-server/src/test/projects/test-base-plugin-v2/src/BasePlugin.java b/sonar-server/src/test/projects/test-base-plugin-v2/src/BasePlugin.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/projects/test-base-plugin-v2/src/BasePlugin.java rename to sonar-server/src/test/projects/test-base-plugin-v2/src/BasePlugin.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/projects/test-base-plugin-v2/src/org/sonar/plugins/testbase/api/BaseApi.java b/sonar-server/src/test/projects/test-base-plugin-v2/src/org/sonar/plugins/testbase/api/BaseApi.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/projects/test-base-plugin-v2/src/org/sonar/plugins/testbase/api/BaseApi.java rename to sonar-server/src/test/projects/test-base-plugin-v2/src/org/sonar/plugins/testbase/api/BaseApi.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/projects/test-base-plugin-v2/target/test-base-plugin-0.2-SNAPSHOT.jar b/sonar-server/src/test/projects/test-base-plugin-v2/target/test-base-plugin-0.2-SNAPSHOT.jar similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/projects/test-base-plugin-v2/target/test-base-plugin-0.2-SNAPSHOT.jar rename to sonar-server/src/test/projects/test-base-plugin-v2/target/test-base-plugin-0.2-SNAPSHOT.jar diff --git a/sonarqube-6.5/server/sonar-server/src/test/projects/test-base-plugin/pom.xml b/sonar-server/src/test/projects/test-base-plugin/pom.xml similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/projects/test-base-plugin/pom.xml rename to sonar-server/src/test/projects/test-base-plugin/pom.xml diff --git a/sonarqube-6.5/server/sonar-server/src/test/projects/test-base-plugin/src/BasePlugin.java b/sonar-server/src/test/projects/test-base-plugin/src/BasePlugin.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/projects/test-base-plugin/src/BasePlugin.java rename to sonar-server/src/test/projects/test-base-plugin/src/BasePlugin.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/projects/test-base-plugin/src/org/sonar/plugins/testbase/api/BaseApi.java b/sonar-server/src/test/projects/test-base-plugin/src/org/sonar/plugins/testbase/api/BaseApi.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/projects/test-base-plugin/src/org/sonar/plugins/testbase/api/BaseApi.java rename to sonar-server/src/test/projects/test-base-plugin/src/org/sonar/plugins/testbase/api/BaseApi.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/projects/test-base-plugin/target/test-base-plugin-0.1-SNAPSHOT.jar b/sonar-server/src/test/projects/test-base-plugin/target/test-base-plugin-0.1-SNAPSHOT.jar similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/projects/test-base-plugin/target/test-base-plugin-0.1-SNAPSHOT.jar rename to sonar-server/src/test/projects/test-base-plugin/target/test-base-plugin-0.1-SNAPSHOT.jar diff --git a/sonarqube-6.5/server/sonar-server/src/test/projects/test-core-plugin/pom.xml b/sonar-server/src/test/projects/test-core-plugin/pom.xml similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/projects/test-core-plugin/pom.xml rename to sonar-server/src/test/projects/test-core-plugin/pom.xml diff --git a/sonarqube-6.5/server/sonar-server/src/test/projects/test-core-plugin/src/CorePlugin.java b/sonar-server/src/test/projects/test-core-plugin/src/CorePlugin.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/projects/test-core-plugin/src/CorePlugin.java rename to sonar-server/src/test/projects/test-core-plugin/src/CorePlugin.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/projects/test-core-plugin/target/test-core-plugin-0.1-SNAPSHOT.jar b/sonar-server/src/test/projects/test-core-plugin/target/test-core-plugin-0.1-SNAPSHOT.jar similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/projects/test-core-plugin/target/test-core-plugin-0.1-SNAPSHOT.jar rename to sonar-server/src/test/projects/test-core-plugin/target/test-core-plugin-0.1-SNAPSHOT.jar diff --git a/sonarqube-6.5/server/sonar-server/src/test/projects/test-extend-plugin/pom.xml b/sonar-server/src/test/projects/test-extend-plugin/pom.xml similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/projects/test-extend-plugin/pom.xml rename to sonar-server/src/test/projects/test-extend-plugin/pom.xml diff --git a/sonarqube-6.5/server/sonar-server/src/test/projects/test-extend-plugin/src/ExtendPlugin.java b/sonar-server/src/test/projects/test-extend-plugin/src/ExtendPlugin.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/projects/test-extend-plugin/src/ExtendPlugin.java rename to sonar-server/src/test/projects/test-extend-plugin/src/ExtendPlugin.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/projects/test-extend-plugin/target/test-extend-plugin-0.1-SNAPSHOT.jar b/sonar-server/src/test/projects/test-extend-plugin/target/test-extend-plugin-0.1-SNAPSHOT.jar similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/projects/test-extend-plugin/target/test-extend-plugin-0.1-SNAPSHOT.jar rename to sonar-server/src/test/projects/test-extend-plugin/target/test-extend-plugin-0.1-SNAPSHOT.jar diff --git a/sonarqube-6.5/server/sonar-server/src/test/projects/test-libs-plugin/pom.xml b/sonar-server/src/test/projects/test-libs-plugin/pom.xml similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/projects/test-libs-plugin/pom.xml rename to sonar-server/src/test/projects/test-libs-plugin/pom.xml diff --git a/sonarqube-6.5/server/sonar-server/src/test/projects/test-libs-plugin/src/LibsPlugin.java b/sonar-server/src/test/projects/test-libs-plugin/src/LibsPlugin.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/projects/test-libs-plugin/src/LibsPlugin.java rename to sonar-server/src/test/projects/test-libs-plugin/src/LibsPlugin.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/projects/test-libs-plugin/target/test-libs-plugin-0.1-SNAPSHOT.jar b/sonar-server/src/test/projects/test-libs-plugin/target/test-libs-plugin-0.1-SNAPSHOT.jar similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/projects/test-libs-plugin/target/test-libs-plugin-0.1-SNAPSHOT.jar rename to sonar-server/src/test/projects/test-libs-plugin/target/test-libs-plugin-0.1-SNAPSHOT.jar diff --git a/sonarqube-6.5/server/sonar-server/src/test/projects/test-require-plugin/pom.xml b/sonar-server/src/test/projects/test-require-plugin/pom.xml similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/projects/test-require-plugin/pom.xml rename to sonar-server/src/test/projects/test-require-plugin/pom.xml diff --git a/sonarqube-6.5/server/sonar-server/src/test/projects/test-require-plugin/src/RequirePlugin.java b/sonar-server/src/test/projects/test-require-plugin/src/RequirePlugin.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/projects/test-require-plugin/src/RequirePlugin.java rename to sonar-server/src/test/projects/test-require-plugin/src/RequirePlugin.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/projects/test-require-plugin/target/test-require-plugin-0.1-SNAPSHOT.jar b/sonar-server/src/test/projects/test-require-plugin/target/test-require-plugin-0.1-SNAPSHOT.jar similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/projects/test-require-plugin/target/test-require-plugin-0.1-SNAPSHOT.jar rename to sonar-server/src/test/projects/test-require-plugin/target/test-require-plugin-0.1-SNAPSHOT.jar diff --git a/sonarqube-6.5/server/sonar-server/src/test/projects/test-requirenew-plugin/pom.xml b/sonar-server/src/test/projects/test-requirenew-plugin/pom.xml similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/projects/test-requirenew-plugin/pom.xml rename to sonar-server/src/test/projects/test-requirenew-plugin/pom.xml diff --git a/sonarqube-6.5/server/sonar-server/src/test/projects/test-requirenew-plugin/src/RequirePlugin.java b/sonar-server/src/test/projects/test-requirenew-plugin/src/RequirePlugin.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/projects/test-requirenew-plugin/src/RequirePlugin.java rename to sonar-server/src/test/projects/test-requirenew-plugin/src/RequirePlugin.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/projects/test-requirenew-plugin/target/test-requirenew-plugin-0.1-SNAPSHOT.jar b/sonar-server/src/test/projects/test-requirenew-plugin/target/test-requirenew-plugin-0.1-SNAPSHOT.jar similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/projects/test-requirenew-plugin/target/test-requirenew-plugin-0.1-SNAPSHOT.jar rename to sonar-server/src/test/projects/test-requirenew-plugin/target/test-requirenew-plugin-0.1-SNAPSHOT.jar diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/batch/ProjectActionTest/project_referentials.json b/sonar-server/src/test/resources/org/sonar/server/batch/ProjectActionTest/project_referentials.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/batch/ProjectActionTest/project_referentials.json rename to sonar-server/src/test/resources/org/sonar/server/batch/ProjectActionTest/project_referentials.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/component/ws/AppActionTest/app.json b/sonar-server/src/test/resources/org/sonar/server/component/ws/AppActionTest/app.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/component/ws/AppActionTest/app.json rename to sonar-server/src/test/resources/org/sonar/server/component/ws/AppActionTest/app.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/component/ws/AppActionTest/app_with_it_measure.json b/sonar-server/src/test/resources/org/sonar/server/component/ws/AppActionTest/app_with_it_measure.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/component/ws/AppActionTest/app_with_it_measure.json rename to sonar-server/src/test/resources/org/sonar/server/component/ws/AppActionTest/app_with_it_measure.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/component/ws/AppActionTest/app_with_measures.json b/sonar-server/src/test/resources/org/sonar/server/component/ws/AppActionTest/app_with_measures.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/component/ws/AppActionTest/app_with_measures.json rename to sonar-server/src/test/resources/org/sonar/server/component/ws/AppActionTest/app_with_measures.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/component/ws/AppActionTest/app_with_overall_measure.json b/sonar-server/src/test/resources/org/sonar/server/component/ws/AppActionTest/app_with_overall_measure.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/component/ws/AppActionTest/app_with_overall_measure.json rename to sonar-server/src/test/resources/org/sonar/server/component/ws/AppActionTest/app_with_overall_measure.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/component/ws/AppActionTest/app_with_ut_measure.json b/sonar-server/src/test/resources/org/sonar/server/component/ws/AppActionTest/app_with_ut_measure.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/component/ws/AppActionTest/app_with_ut_measure.json rename to sonar-server/src/test/resources/org/sonar/server/component/ws/AppActionTest/app_with_ut_measure.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest/v1/1235_add_component_uuid_to_duplications_index.rb b/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest/v1/1235_add_component_uuid_to_duplications_index.rb similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest/v1/1235_add_component_uuid_to_duplications_index.rb rename to sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest/v1/1235_add_component_uuid_to_duplications_index.rb diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest/v1/1236_populate_component_uuid_of_duplications_index.rb b/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest/v1/1236_populate_component_uuid_of_duplications_index.rb similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest/v1/1236_populate_component_uuid_of_duplications_index.rb rename to sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest/v1/1236_populate_component_uuid_of_duplications_index.rb diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest/v1/1238_make_component_uuid_not_null_on_duplications_index.rb b/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest/v1/1238_make_component_uuid_not_null_on_duplications_index.rb similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest/v1/1238_make_component_uuid_not_null_on_duplications_index.rb rename to sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest/v1/1238_make_component_uuid_not_null_on_duplications_index.rb diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest/v1/1239_add_analysis_uuid_to_duplications_index.rb b/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest/v1/1239_add_analysis_uuid_to_duplications_index.rb similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest/v1/1239_add_analysis_uuid_to_duplications_index.rb rename to sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest/v1/1239_add_analysis_uuid_to_duplications_index.rb diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest/v1/1240_populate_analysis_uuid_of_duplications_index.rb b/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest/v1/1240_populate_analysis_uuid_of_duplications_index.rb similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest/v1/1240_populate_analysis_uuid_of_duplications_index.rb rename to sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest/v1/1240_populate_analysis_uuid_of_duplications_index.rb diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest/v1/1242_make_analysis_uuid_not_null_on_duplications_index.rb b/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest/v1/1242_make_analysis_uuid_not_null_on_duplications_index.rb similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest/v1/1242_make_analysis_uuid_not_null_on_duplications_index.rb rename to sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest/v1/1242_make_analysis_uuid_not_null_on_duplications_index.rb diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest/v1/AddAnalysisUuidColumnToDuplicationsIndex.java b/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest/v1/AddAnalysisUuidColumnToDuplicationsIndex.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest/v1/AddAnalysisUuidColumnToDuplicationsIndex.java rename to sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest/v1/AddAnalysisUuidColumnToDuplicationsIndex.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest/v1/AddComponentUuidColumnToDuplicationsIndex.java b/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest/v1/AddComponentUuidColumnToDuplicationsIndex.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest/v1/AddComponentUuidColumnToDuplicationsIndex.java rename to sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest/v1/AddComponentUuidColumnToDuplicationsIndex.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest/v1/DeleteOrphanDuplicationsIndexRowsWithoutComponent.java b/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest/v1/DeleteOrphanDuplicationsIndexRowsWithoutComponent.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest/v1/DeleteOrphanDuplicationsIndexRowsWithoutComponent.java rename to sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest/v1/DeleteOrphanDuplicationsIndexRowsWithoutComponent.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest/v1/MakeComponentUuidNotNullOnDuplicationsIndex.java b/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest/v1/MakeComponentUuidNotNullOnDuplicationsIndex.java similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest/v1/MakeComponentUuidNotNullOnDuplicationsIndex.java rename to sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest/v1/MakeComponentUuidNotNullOnDuplicationsIndex.java diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/issue/ScmAccountToUserLoaderTest/charlie.json b/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/issue/ScmAccountToUserLoaderTest/charlie.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/issue/ScmAccountToUserLoaderTest/charlie.json rename to sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/issue/ScmAccountToUserLoaderTest/charlie.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/issue/ScmAccountToUserLoaderTest/charlie_conflict.json b/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/issue/ScmAccountToUserLoaderTest/charlie_conflict.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/issue/ScmAccountToUserLoaderTest/charlie_conflict.json rename to sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/issue/ScmAccountToUserLoaderTest/charlie_conflict.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/issue/SourceLinesCacheTest/load_data.xml b/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/issue/SourceLinesCacheTest/load_data.xml similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/issue/SourceLinesCacheTest/load_data.xml rename to sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/issue/SourceLinesCacheTest/load_data.xml diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/measure/MeasureRepositoryImplTest/shared.xml b/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/measure/MeasureRepositoryImplTest/shared.xml similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/measure/MeasureRepositoryImplTest/shared.xml rename to sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/measure/MeasureRepositoryImplTest/shared.xml diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/measure/MetricCacheTest/metrics.xml b/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/measure/MetricCacheTest/metrics.xml similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/measure/MetricCacheTest/metrics.xml rename to sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/measure/MetricCacheTest/metrics.xml diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/metric/MetricRepositoryImplTest/shared.xml b/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/metric/MetricRepositoryImplTest/shared.xml similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/metric/MetricRepositoryImplTest/shared.xml rename to sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/metric/MetricRepositoryImplTest/shared.xml diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/CustomMeasuresCopyStepTest/report-custom-measures.xml b/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/CustomMeasuresCopyStepTest/report-custom-measures.xml similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/CustomMeasuresCopyStepTest/report-custom-measures.xml rename to sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/CustomMeasuresCopyStepTest/report-custom-measures.xml diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/CustomMeasuresCopyStepTest/view-custom-measures.xml b/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/CustomMeasuresCopyStepTest/view-custom-measures.xml similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/CustomMeasuresCopyStepTest/view-custom-measures.xml rename to sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/CustomMeasuresCopyStepTest/view-custom-measures.xml diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/IndexSourceLinesStepTest/index_source.xml b/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/IndexSourceLinesStepTest/index_source.xml similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/IndexSourceLinesStepTest/index_source.xml rename to sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/IndexSourceLinesStepTest/index_source.xml diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/IndexTestsStepTest/index_source.xml b/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/IndexTestsStepTest/index_source.xml similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/IndexTestsStepTest/index_source.xml rename to sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/IndexTestsStepTest/index_source.xml diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/LoadPeriodsStepTest/empty.xml b/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/LoadPeriodsStepTest/empty.xml similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/LoadPeriodsStepTest/empty.xml rename to sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/LoadPeriodsStepTest/empty.xml diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/LoadPeriodsStepTest/no_previous_version.xml b/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/LoadPeriodsStepTest/no_previous_version.xml similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/LoadPeriodsStepTest/no_previous_version.xml rename to sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/LoadPeriodsStepTest/no_previous_version.xml diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/LoadPeriodsStepTest/previous_version_deleted.xml b/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/LoadPeriodsStepTest/previous_version_deleted.xml similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/LoadPeriodsStepTest/previous_version_deleted.xml rename to sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/LoadPeriodsStepTest/previous_version_deleted.xml diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/LoadPeriodsStepTest/previous_version_is_last_one.xml b/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/LoadPeriodsStepTest/previous_version_is_last_one.xml similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/LoadPeriodsStepTest/previous_version_is_last_one.xml rename to sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/LoadPeriodsStepTest/previous_version_is_last_one.xml diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/LoadPeriodsStepTest/shared.xml b/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/LoadPeriodsStepTest/shared.xml similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/LoadPeriodsStepTest/shared.xml rename to sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/LoadPeriodsStepTest/shared.xml diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/LoadPeriodsStepTest/unprocessed_snapshots.xml b/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/LoadPeriodsStepTest/unprocessed_snapshots.xml similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/LoadPeriodsStepTest/unprocessed_snapshots.xml rename to sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/LoadPeriodsStepTest/unprocessed_snapshots.xml diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistDuplicationMeasuresStepTest/persist_duplication_on_same_file-result.xml b/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistDuplicationMeasuresStepTest/persist_duplication_on_same_file-result.xml similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistDuplicationMeasuresStepTest/persist_duplication_on_same_file-result.xml rename to sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistDuplicationMeasuresStepTest/persist_duplication_on_same_file-result.xml diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistDuplicationMeasuresStepTest/persist_duplication_on_same_file.xml b/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistDuplicationMeasuresStepTest/persist_duplication_on_same_file.xml similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistDuplicationMeasuresStepTest/persist_duplication_on_same_file.xml rename to sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistDuplicationMeasuresStepTest/persist_duplication_on_same_file.xml diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistEventsStepTest/add_events-result.xml b/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistEventsStepTest/add_events-result.xml similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistEventsStepTest/add_events-result.xml rename to sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistEventsStepTest/add_events-result.xml diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistEventsStepTest/add_version_event-result.xml b/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistEventsStepTest/add_version_event-result.xml similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistEventsStepTest/add_version_event-result.xml rename to sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistEventsStepTest/add_version_event-result.xml diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistEventsStepTest/empty.xml b/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistEventsStepTest/empty.xml similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistEventsStepTest/empty.xml rename to sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistEventsStepTest/empty.xml diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistEventsStepTest/keep_one_event_by_version-result.xml b/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistEventsStepTest/keep_one_event_by_version-result.xml similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistEventsStepTest/keep_one_event_by_version-result.xml rename to sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistEventsStepTest/keep_one_event_by_version-result.xml diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistEventsStepTest/keep_one_event_by_version.xml b/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistEventsStepTest/keep_one_event_by_version.xml similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistEventsStepTest/keep_one_event_by_version.xml rename to sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistEventsStepTest/keep_one_event_by_version.xml diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistEventsStepTest/nothing_to_do_when_no_events_in_report.xml b/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistEventsStepTest/nothing_to_do_when_no_events_in_report.xml similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistEventsStepTest/nothing_to_do_when_no_events_in_report.xml rename to sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistEventsStepTest/nothing_to_do_when_no_events_in_report.xml diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistEventsStepTest/persist_report_events_with_component_children-result.xml b/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistEventsStepTest/persist_report_events_with_component_children-result.xml similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistEventsStepTest/persist_report_events_with_component_children-result.xml rename to sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistEventsStepTest/persist_report_events_with_component_children-result.xml diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistIssuesStepTest/add_change-result.xml b/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistIssuesStepTest/add_change-result.xml similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistIssuesStepTest/add_change-result.xml rename to sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistIssuesStepTest/add_change-result.xml diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistIssuesStepTest/add_comment-result.xml b/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistIssuesStepTest/add_comment-result.xml similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistIssuesStepTest/add_comment-result.xml rename to sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistIssuesStepTest/add_comment-result.xml diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistIssuesStepTest/close_issue-result.xml b/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistIssuesStepTest/close_issue-result.xml similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistIssuesStepTest/close_issue-result.xml rename to sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistIssuesStepTest/close_issue-result.xml diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistIssuesStepTest/insert_new_issue.xml b/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistIssuesStepTest/insert_new_issue.xml similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistIssuesStepTest/insert_new_issue.xml rename to sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistIssuesStepTest/insert_new_issue.xml diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistIssuesStepTest/shared.xml b/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistIssuesStepTest/shared.xml similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistIssuesStepTest/shared.xml rename to sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistIssuesStepTest/shared.xml diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistMeasuresStepTest/shared.xml b/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistMeasuresStepTest/shared.xml similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistMeasuresStepTest/shared.xml rename to sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistMeasuresStepTest/shared.xml diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistNumberOfDaysSinceLastCommitStepTest/empty.xml b/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistNumberOfDaysSinceLastCommitStepTest/empty.xml similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistNumberOfDaysSinceLastCommitStepTest/empty.xml rename to sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistNumberOfDaysSinceLastCommitStepTest/empty.xml diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistNumberOfDaysSinceLastCommitStepTest/insert-from-index-result.xml b/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistNumberOfDaysSinceLastCommitStepTest/insert-from-index-result.xml similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistNumberOfDaysSinceLastCommitStepTest/insert-from-index-result.xml rename to sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistNumberOfDaysSinceLastCommitStepTest/insert-from-index-result.xml diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistNumberOfDaysSinceLastCommitStepTest/insert-from-report-result.xml b/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistNumberOfDaysSinceLastCommitStepTest/insert-from-report-result.xml similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistNumberOfDaysSinceLastCommitStepTest/insert-from-report-result.xml rename to sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistNumberOfDaysSinceLastCommitStepTest/insert-from-report-result.xml diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistProjectLinksStepTest/add_links_on_project_and_module-result.xml b/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistProjectLinksStepTest/add_links_on_project_and_module-result.xml similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistProjectLinksStepTest/add_links_on_project_and_module-result.xml rename to sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistProjectLinksStepTest/add_links_on_project_and_module-result.xml diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistProjectLinksStepTest/delete_link.xml b/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistProjectLinksStepTest/delete_link.xml similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistProjectLinksStepTest/delete_link.xml rename to sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistProjectLinksStepTest/delete_link.xml diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistProjectLinksStepTest/empty.xml b/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistProjectLinksStepTest/empty.xml similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistProjectLinksStepTest/empty.xml rename to sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistProjectLinksStepTest/empty.xml diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistProjectLinksStepTest/not_delete_custom_link.xml b/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistProjectLinksStepTest/not_delete_custom_link.xml similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistProjectLinksStepTest/not_delete_custom_link.xml rename to sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistProjectLinksStepTest/not_delete_custom_link.xml diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistProjectLinksStepTest/nothing_to_do_when_link_already_exists.xml b/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistProjectLinksStepTest/nothing_to_do_when_link_already_exists.xml similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistProjectLinksStepTest/nothing_to_do_when_link_already_exists.xml rename to sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistProjectLinksStepTest/nothing_to_do_when_link_already_exists.xml diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistProjectLinksStepTest/update_link-result.xml b/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistProjectLinksStepTest/update_link-result.xml similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistProjectLinksStepTest/update_link-result.xml rename to sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistProjectLinksStepTest/update_link-result.xml diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistProjectLinksStepTest/update_link.xml b/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistProjectLinksStepTest/update_link.xml similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistProjectLinksStepTest/update_link.xml rename to sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistProjectLinksStepTest/update_link.xml diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/ReportExtractionStepTest/demozip.zip b/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/ReportExtractionStepTest/demozip.zip similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/ReportExtractionStepTest/demozip.zip rename to sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/ReportExtractionStepTest/demozip.zip diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/SwitchSnapshotStepTest/empty.xml b/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/SwitchSnapshotStepTest/empty.xml similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/SwitchSnapshotStepTest/empty.xml rename to sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/SwitchSnapshotStepTest/empty.xml diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/SwitchSnapshotStepTest/snapshots-result.xml b/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/SwitchSnapshotStepTest/snapshots-result.xml similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/SwitchSnapshotStepTest/snapshots-result.xml rename to sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/SwitchSnapshotStepTest/snapshots-result.xml diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/SwitchSnapshotStepTest/snapshots.xml b/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/SwitchSnapshotStepTest/snapshots.xml similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/SwitchSnapshotStepTest/snapshots.xml rename to sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/SwitchSnapshotStepTest/snapshots.xml diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/webhook/WebhookPayloadTest/failed.json b/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/webhook/WebhookPayloadTest/failed.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/webhook/WebhookPayloadTest/failed.json rename to sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/webhook/WebhookPayloadTest/failed.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/webhook/WebhookPayloadTest/gate_condition_without_value.json b/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/webhook/WebhookPayloadTest/gate_condition_without_value.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/webhook/WebhookPayloadTest/gate_condition_without_value.json rename to sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/webhook/WebhookPayloadTest/gate_condition_without_value.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/webhook/WebhookPayloadTest/success.json b/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/webhook/WebhookPayloadTest/success.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/webhook/WebhookPayloadTest/success.json rename to sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/webhook/WebhookPayloadTest/success.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/webhook/WebhookPayloadTest/with_analysis_properties.json b/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/webhook/WebhookPayloadTest/with_analysis_properties.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/webhook/WebhookPayloadTest/with_analysis_properties.json rename to sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/webhook/WebhookPayloadTest/with_analysis_properties.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/debt/DebtCharacteristicsXMLImporterTest/convert_network_use_key.xml b/sonar-server/src/test/resources/org/sonar/server/debt/DebtCharacteristicsXMLImporterTest/convert_network_use_key.xml similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/debt/DebtCharacteristicsXMLImporterTest/convert_network_use_key.xml rename to sonar-server/src/test/resources/org/sonar/server/debt/DebtCharacteristicsXMLImporterTest/convert_network_use_key.xml diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/debt/DebtCharacteristicsXMLImporterTest/fail_on_bad_xml.xml b/sonar-server/src/test/resources/org/sonar/server/debt/DebtCharacteristicsXMLImporterTest/fail_on_bad_xml.xml similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/debt/DebtCharacteristicsXMLImporterTest/fail_on_bad_xml.xml rename to sonar-server/src/test/resources/org/sonar/server/debt/DebtCharacteristicsXMLImporterTest/fail_on_bad_xml.xml diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/debt/DebtCharacteristicsXMLImporterTest/import_badly_formatted_xml.xml b/sonar-server/src/test/resources/org/sonar/server/debt/DebtCharacteristicsXMLImporterTest/import_badly_formatted_xml.xml similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/debt/DebtCharacteristicsXMLImporterTest/import_badly_formatted_xml.xml rename to sonar-server/src/test/resources/org/sonar/server/debt/DebtCharacteristicsXMLImporterTest/import_badly_formatted_xml.xml diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/debt/DebtCharacteristicsXMLImporterTest/import_characteristics.xml b/sonar-server/src/test/resources/org/sonar/server/debt/DebtCharacteristicsXMLImporterTest/import_characteristics.xml similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/debt/DebtCharacteristicsXMLImporterTest/import_characteristics.xml rename to sonar-server/src/test/resources/org/sonar/server/debt/DebtCharacteristicsXMLImporterTest/import_characteristics.xml diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/debt/DebtModelPluginRepositoryTest/csharp-model.xml b/sonar-server/src/test/resources/org/sonar/server/debt/DebtModelPluginRepositoryTest/csharp-model.xml similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/debt/DebtModelPluginRepositoryTest/csharp-model.xml rename to sonar-server/src/test/resources/org/sonar/server/debt/DebtModelPluginRepositoryTest/csharp-model.xml diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/debt/DebtModelPluginRepositoryTest/java-model.xml b/sonar-server/src/test/resources/org/sonar/server/debt/DebtModelPluginRepositoryTest/java-model.xml similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/debt/DebtModelPluginRepositoryTest/java-model.xml rename to sonar-server/src/test/resources/org/sonar/server/debt/DebtModelPluginRepositoryTest/java-model.xml diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/debt/DebtModelXMLExporterTest/export_xml.xml b/sonar-server/src/test/resources/org/sonar/server/debt/DebtModelXMLExporterTest/export_xml.xml similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/debt/DebtModelXMLExporterTest/export_xml.xml rename to sonar-server/src/test/resources/org/sonar/server/debt/DebtModelXMLExporterTest/export_xml.xml diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/convert_constant_per_issue_with_coefficient_by_constant_per_issue_with_offset.xml b/sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/convert_constant_per_issue_with_coefficient_by_constant_per_issue_with_offset.xml similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/convert_constant_per_issue_with_coefficient_by_constant_per_issue_with_offset.xml rename to sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/convert_constant_per_issue_with_coefficient_by_constant_per_issue_with_offset.xml diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/convert_deprecated_linear_with_threshold_function_by_linear_function.xml b/sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/convert_deprecated_linear_with_threshold_function_by_linear_function.xml similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/convert_deprecated_linear_with_threshold_function_by_linear_function.xml rename to sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/convert_deprecated_linear_with_threshold_function_by_linear_function.xml diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/convert_network_use_key.xml b/sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/convert_network_use_key.xml similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/convert_network_use_key.xml rename to sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/convert_network_use_key.xml diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/fail_on_bad_xml.xml b/sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/fail_on_bad_xml.xml similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/fail_on_bad_xml.xml rename to sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/fail_on_bad_xml.xml diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/ignore_deprecated_constant_per_file_function.xml b/sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/ignore_deprecated_constant_per_file_function.xml similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/ignore_deprecated_constant_per_file_function.xml rename to sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/ignore_deprecated_constant_per_file_function.xml diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/ignore_invalid_value.xml b/sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/ignore_invalid_value.xml similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/ignore_invalid_value.xml rename to sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/ignore_invalid_value.xml diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/ignore_remediation_cost_having_zero_value.xml b/sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/ignore_remediation_cost_having_zero_value.xml similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/ignore_remediation_cost_having_zero_value.xml rename to sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/ignore_remediation_cost_having_zero_value.xml diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/ignore_rule_on_root_characteristics.xml b/sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/ignore_rule_on_root_characteristics.xml similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/ignore_rule_on_root_characteristics.xml rename to sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/ignore_rule_on_root_characteristics.xml diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/import_badly_formatted_xml.xml b/sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/import_badly_formatted_xml.xml similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/import_badly_formatted_xml.xml rename to sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/import_badly_formatted_xml.xml diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/import_constant_issue.xml b/sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/import_constant_issue.xml similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/import_constant_issue.xml rename to sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/import_constant_issue.xml diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/import_linear.xml b/sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/import_linear.xml similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/import_linear.xml rename to sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/import_linear.xml diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/import_linear_having_offset_to_zero.xml b/sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/import_linear_having_offset_to_zero.xml similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/import_linear_having_offset_to_zero.xml rename to sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/import_linear_having_offset_to_zero.xml diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/import_linear_with_offset.xml b/sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/import_linear_with_offset.xml similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/import_linear_with_offset.xml rename to sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/import_linear_with_offset.xml diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/import_rules.xml b/sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/import_rules.xml similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/import_rules.xml rename to sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/import_rules.xml diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/import_rules_with_deprecated_quality_model_format.xml b/sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/import_rules_with_deprecated_quality_model_format.xml similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/import_rules_with_deprecated_quality_model_format.xml rename to sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/import_rules_with_deprecated_quality_model_format.xml diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/read_integer.xml b/sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/read_integer.xml similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/read_integer.xml rename to sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/read_integer.xml diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/replace_mn_by_min.xml b/sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/replace_mn_by_min.xml similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/replace_mn_by_min.xml rename to sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/replace_mn_by_min.xml diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/use_default_unit_when_no_unit.xml b/sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/use_default_unit_when_no_unit.xml similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/use_default_unit_when_no_unit.xml rename to sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/use_default_unit_when_no_unit.xml diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/duplication/ws/DuplicationsParserTest/complex_duplication.xml b/sonar-server/src/test/resources/org/sonar/server/duplication/ws/DuplicationsParserTest/complex_duplication.xml similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/duplication/ws/DuplicationsParserTest/complex_duplication.xml rename to sonar-server/src/test/resources/org/sonar/server/duplication/ws/DuplicationsParserTest/complex_duplication.xml diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/duplication/ws/DuplicationsParserTest/duplication_on_removed_file.xml b/sonar-server/src/test/resources/org/sonar/server/duplication/ws/DuplicationsParserTest/duplication_on_removed_file.xml similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/duplication/ws/DuplicationsParserTest/duplication_on_removed_file.xml rename to sonar-server/src/test/resources/org/sonar/server/duplication/ws/DuplicationsParserTest/duplication_on_removed_file.xml diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/duplication/ws/DuplicationsParserTest/duplication_on_same_file.xml b/sonar-server/src/test/resources/org/sonar/server/duplication/ws/DuplicationsParserTest/duplication_on_same_file.xml similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/duplication/ws/DuplicationsParserTest/duplication_on_same_file.xml rename to sonar-server/src/test/resources/org/sonar/server/duplication/ws/DuplicationsParserTest/duplication_on_same_file.xml diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/duplication/ws/DuplicationsParserTest/duplication_on_same_project.xml b/sonar-server/src/test/resources/org/sonar/server/duplication/ws/DuplicationsParserTest/duplication_on_same_project.xml similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/duplication/ws/DuplicationsParserTest/duplication_on_same_project.xml rename to sonar-server/src/test/resources/org/sonar/server/duplication/ws/DuplicationsParserTest/duplication_on_same_project.xml diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/duplication/ws/DuplicationsParserTest/duplications_on_different_project.xml b/sonar-server/src/test/resources/org/sonar/server/duplication/ws/DuplicationsParserTest/duplications_on_different_project.xml similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/duplication/ws/DuplicationsParserTest/duplications_on_different_project.xml rename to sonar-server/src/test/resources/org/sonar/server/duplication/ws/DuplicationsParserTest/duplications_on_different_project.xml diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/duplication/ws/DuplicationsParserTest/duplications_on_many_blocks.xml b/sonar-server/src/test/resources/org/sonar/server/duplication/ws/DuplicationsParserTest/duplications_on_many_blocks.xml similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/duplication/ws/DuplicationsParserTest/duplications_on_many_blocks.xml rename to sonar-server/src/test/resources/org/sonar/server/duplication/ws/DuplicationsParserTest/duplications_on_many_blocks.xml diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/issue/IssueStorageTest/should_insert_new_issues-result.xml b/sonar-server/src/test/resources/org/sonar/server/issue/IssueStorageTest/should_insert_new_issues-result.xml similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/issue/IssueStorageTest/should_insert_new_issues-result.xml rename to sonar-server/src/test/resources/org/sonar/server/issue/IssueStorageTest/should_insert_new_issues-result.xml diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/issue/IssueStorageTest/should_resolve_conflicts_on_updates-result.xml b/sonar-server/src/test/resources/org/sonar/server/issue/IssueStorageTest/should_resolve_conflicts_on_updates-result.xml similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/issue/IssueStorageTest/should_resolve_conflicts_on_updates-result.xml rename to sonar-server/src/test/resources/org/sonar/server/issue/IssueStorageTest/should_resolve_conflicts_on_updates-result.xml diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/issue/IssueStorageTest/should_resolve_conflicts_on_updates.xml b/sonar-server/src/test/resources/org/sonar/server/issue/IssueStorageTest/should_resolve_conflicts_on_updates.xml similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/issue/IssueStorageTest/should_resolve_conflicts_on_updates.xml rename to sonar-server/src/test/resources/org/sonar/server/issue/IssueStorageTest/should_resolve_conflicts_on_updates.xml diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/issue/IssueStorageTest/should_update_issues-result.xml b/sonar-server/src/test/resources/org/sonar/server/issue/IssueStorageTest/should_update_issues-result.xml similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/issue/IssueStorageTest/should_update_issues-result.xml rename to sonar-server/src/test/resources/org/sonar/server/issue/IssueStorageTest/should_update_issues-result.xml diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/issue/IssueStorageTest/should_update_issues.xml b/sonar-server/src/test/resources/org/sonar/server/issue/IssueStorageTest/should_update_issues.xml similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/issue/IssueStorageTest/should_update_issues.xml rename to sonar-server/src/test/resources/org/sonar/server/issue/IssueStorageTest/should_update_issues.xml diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/issue/ServerIssueStorageTest/empty.xml b/sonar-server/src/test/resources/org/sonar/server/issue/ServerIssueStorageTest/empty.xml similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/issue/ServerIssueStorageTest/empty.xml rename to sonar-server/src/test/resources/org/sonar/server/issue/ServerIssueStorageTest/empty.xml diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/issue/ServerIssueStorageTest/load_component_id_from_db.xml b/sonar-server/src/test/resources/org/sonar/server/issue/ServerIssueStorageTest/load_component_id_from_db.xml similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/issue/ServerIssueStorageTest/load_component_id_from_db.xml rename to sonar-server/src/test/resources/org/sonar/server/issue/ServerIssueStorageTest/load_component_id_from_db.xml diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/issue/ServerIssueStorageTest/load_project_id_from_db.xml b/sonar-server/src/test/resources/org/sonar/server/issue/ServerIssueStorageTest/load_project_id_from_db.xml similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/issue/ServerIssueStorageTest/load_project_id_from_db.xml rename to sonar-server/src/test/resources/org/sonar/server/issue/ServerIssueStorageTest/load_project_id_from_db.xml diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/issue/ServerIssueStorageTest/should_insert_new_issues-result.xml b/sonar-server/src/test/resources/org/sonar/server/issue/ServerIssueStorageTest/should_insert_new_issues-result.xml similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/issue/ServerIssueStorageTest/should_insert_new_issues-result.xml rename to sonar-server/src/test/resources/org/sonar/server/issue/ServerIssueStorageTest/should_insert_new_issues-result.xml diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/issue/ServerIssueStorageTest/should_insert_new_issues.xml b/sonar-server/src/test/resources/org/sonar/server/issue/ServerIssueStorageTest/should_insert_new_issues.xml similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/issue/ServerIssueStorageTest/should_insert_new_issues.xml rename to sonar-server/src/test/resources/org/sonar/server/issue/ServerIssueStorageTest/should_insert_new_issues.xml diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/issue/ServerIssueStorageTest/should_update_issues-result.xml b/sonar-server/src/test/resources/org/sonar/server/issue/ServerIssueStorageTest/should_update_issues-result.xml similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/issue/ServerIssueStorageTest/should_update_issues-result.xml rename to sonar-server/src/test/resources/org/sonar/server/issue/ServerIssueStorageTest/should_update_issues-result.xml diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/issue/ServerIssueStorageTest/should_update_issues.xml b/sonar-server/src/test/resources/org/sonar/server/issue/ServerIssueStorageTest/should_update_issues.xml similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/issue/ServerIssueStorageTest/should_update_issues.xml rename to sonar-server/src/test/resources/org/sonar/server/issue/ServerIssueStorageTest/should_update_issues.xml diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/issue/index/IssueIndexerTest/index.xml b/sonar-server/src/test/resources/org/sonar/server/issue/index/IssueIndexerTest/index.xml similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/issue/index/IssueIndexerTest/index.xml rename to sonar-server/src/test/resources/org/sonar/server/issue/index/IssueIndexerTest/index.xml diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/issue/index/IssueIndexerTest/index_project.xml b/sonar-server/src/test/resources/org/sonar/server/issue/index/IssueIndexerTest/index_project.xml similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/issue/index/IssueIndexerTest/index_project.xml rename to sonar-server/src/test/resources/org/sonar/server/issue/index/IssueIndexerTest/index_project.xml diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/issue/index/IssueIteratorFactoryTest/extract_directory_path.xml b/sonar-server/src/test/resources/org/sonar/server/issue/index/IssueIteratorFactoryTest/extract_directory_path.xml similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/issue/index/IssueIteratorFactoryTest/extract_directory_path.xml rename to sonar-server/src/test/resources/org/sonar/server/issue/index/IssueIteratorFactoryTest/extract_directory_path.xml diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/issue/index/IssueIteratorFactoryTest/extract_file_path.xml b/sonar-server/src/test/resources/org/sonar/server/issue/index/IssueIteratorFactoryTest/extract_file_path.xml similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/issue/index/IssueIteratorFactoryTest/extract_file_path.xml rename to sonar-server/src/test/resources/org/sonar/server/issue/index/IssueIteratorFactoryTest/extract_file_path.xml diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/issue/index/IssueIteratorFactoryTest/many_projects.xml b/sonar-server/src/test/resources/org/sonar/server/issue/index/IssueIteratorFactoryTest/many_projects.xml similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/issue/index/IssueIteratorFactoryTest/many_projects.xml rename to sonar-server/src/test/resources/org/sonar/server/issue/index/IssueIteratorFactoryTest/many_projects.xml diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/issue/index/IssueIteratorFactoryTest/one_issue.xml b/sonar-server/src/test/resources/org/sonar/server/issue/index/IssueIteratorFactoryTest/one_issue.xml similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/issue/index/IssueIteratorFactoryTest/one_issue.xml rename to sonar-server/src/test/resources/org/sonar/server/issue/index/IssueIteratorFactoryTest/one_issue.xml diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/issue/index/IssueIteratorFactoryTest/shared.xml b/sonar-server/src/test/resources/org/sonar/server/issue/index/IssueIteratorFactoryTest/shared.xml similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/issue/index/IssueIteratorFactoryTest/shared.xml rename to sonar-server/src/test/resources/org/sonar/server/issue/index/IssueIteratorFactoryTest/shared.xml diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/issue/notification/IssueChangesEmailTemplateTest/display_component_key_if_no_component_name.txt b/sonar-server/src/test/resources/org/sonar/server/issue/notification/IssueChangesEmailTemplateTest/display_component_key_if_no_component_name.txt similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/issue/notification/IssueChangesEmailTemplateTest/display_component_key_if_no_component_name.txt rename to sonar-server/src/test/resources/org/sonar/server/issue/notification/IssueChangesEmailTemplateTest/display_component_key_if_no_component_name.txt diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/issue/notification/IssueChangesEmailTemplateTest/email_should_display_resolution_change.txt b/sonar-server/src/test/resources/org/sonar/server/issue/notification/IssueChangesEmailTemplateTest/email_should_display_resolution_change.txt similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/issue/notification/IssueChangesEmailTemplateTest/email_should_display_resolution_change.txt rename to sonar-server/src/test/resources/org/sonar/server/issue/notification/IssueChangesEmailTemplateTest/email_should_display_resolution_change.txt diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/issue/notification/IssueChangesEmailTemplateTest/email_with_action_plan_change.txt b/sonar-server/src/test/resources/org/sonar/server/issue/notification/IssueChangesEmailTemplateTest/email_with_action_plan_change.txt similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/issue/notification/IssueChangesEmailTemplateTest/email_with_action_plan_change.txt rename to sonar-server/src/test/resources/org/sonar/server/issue/notification/IssueChangesEmailTemplateTest/email_with_action_plan_change.txt diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/issue/notification/IssueChangesEmailTemplateTest/email_with_assignee_change.txt b/sonar-server/src/test/resources/org/sonar/server/issue/notification/IssueChangesEmailTemplateTest/email_with_assignee_change.txt similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/issue/notification/IssueChangesEmailTemplateTest/email_with_assignee_change.txt rename to sonar-server/src/test/resources/org/sonar/server/issue/notification/IssueChangesEmailTemplateTest/email_with_assignee_change.txt diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/issue/notification/IssueChangesEmailTemplateTest/email_with_multiple_changes.txt b/sonar-server/src/test/resources/org/sonar/server/issue/notification/IssueChangesEmailTemplateTest/email_with_multiple_changes.txt similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/issue/notification/IssueChangesEmailTemplateTest/email_with_multiple_changes.txt rename to sonar-server/src/test/resources/org/sonar/server/issue/notification/IssueChangesEmailTemplateTest/email_with_multiple_changes.txt diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/issue/notification/MyNewIssuesEmailTemplateTest/email_with_all_details.txt b/sonar-server/src/test/resources/org/sonar/server/issue/notification/MyNewIssuesEmailTemplateTest/email_with_all_details.txt similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/issue/notification/MyNewIssuesEmailTemplateTest/email_with_all_details.txt rename to sonar-server/src/test/resources/org/sonar/server/issue/notification/MyNewIssuesEmailTemplateTest/email_with_all_details.txt diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/issue/notification/MyNewIssuesEmailTemplateTest/email_with_no_assignee_tags_components.txt b/sonar-server/src/test/resources/org/sonar/server/issue/notification/MyNewIssuesEmailTemplateTest/email_with_no_assignee_tags_components.txt similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/issue/notification/MyNewIssuesEmailTemplateTest/email_with_no_assignee_tags_components.txt rename to sonar-server/src/test/resources/org/sonar/server/issue/notification/MyNewIssuesEmailTemplateTest/email_with_no_assignee_tags_components.txt diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/issue/notification/NewIssuesEmailTemplateTest/email_with_all_details.txt b/sonar-server/src/test/resources/org/sonar/server/issue/notification/NewIssuesEmailTemplateTest/email_with_all_details.txt similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/issue/notification/NewIssuesEmailTemplateTest/email_with_all_details.txt rename to sonar-server/src/test/resources/org/sonar/server/issue/notification/NewIssuesEmailTemplateTest/email_with_all_details.txt diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/issue/notification/NewIssuesEmailTemplateTest/email_with_partial_details.txt b/sonar-server/src/test/resources/org/sonar/server/issue/notification/NewIssuesEmailTemplateTest/email_with_partial_details.txt similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/issue/notification/NewIssuesEmailTemplateTest/email_with_partial_details.txt rename to sonar-server/src/test/resources/org/sonar/server/issue/notification/NewIssuesEmailTemplateTest/email_with_partial_details.txt diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/ComponentTagsActionTest/component-tags.json b/sonar-server/src/test/resources/org/sonar/server/issue/ws/ComponentTagsActionTest/component-tags.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/ComponentTagsActionTest/component-tags.json rename to sonar-server/src/test/resources/org/sonar/server/issue/ws/ComponentTagsActionTest/component-tags.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionComponentsMediumTest/display_directory_facet.json b/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionComponentsMediumTest/display_directory_facet.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionComponentsMediumTest/display_directory_facet.json rename to sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionComponentsMediumTest/display_directory_facet.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionComponentsMediumTest/display_file_facet.json b/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionComponentsMediumTest/display_file_facet.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionComponentsMediumTest/display_file_facet.json rename to sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionComponentsMediumTest/display_file_facet.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionComponentsMediumTest/display_module_facet.json b/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionComponentsMediumTest/display_module_facet.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionComponentsMediumTest/display_module_facet.json rename to sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionComponentsMediumTest/display_module_facet.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionComponentsMediumTest/display_non_sticky_project_facet.json b/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionComponentsMediumTest/display_non_sticky_project_facet.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionComponentsMediumTest/display_non_sticky_project_facet.json rename to sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionComponentsMediumTest/display_non_sticky_project_facet.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionComponentsMediumTest/display_sticky_project_facet.json b/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionComponentsMediumTest/display_sticky_project_facet.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionComponentsMediumTest/display_sticky_project_facet.json rename to sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionComponentsMediumTest/display_sticky_project_facet.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionComponentsMediumTest/issues_on_different_projects.json b/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionComponentsMediumTest/issues_on_different_projects.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionComponentsMediumTest/issues_on_different_projects.json rename to sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionComponentsMediumTest/issues_on_different_projects.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionComponentsMediumTest/no_issue.json b/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionComponentsMediumTest/no_issue.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionComponentsMediumTest/no_issue.json rename to sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionComponentsMediumTest/no_issue.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionComponentsMediumTest/search_by_authors.json b/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionComponentsMediumTest/search_by_authors.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionComponentsMediumTest/search_by_authors.json rename to sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionComponentsMediumTest/search_by_authors.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionComponentsMediumTest/search_by_developer.json b/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionComponentsMediumTest/search_by_developer.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionComponentsMediumTest/search_by_developer.json rename to sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionComponentsMediumTest/search_by_developer.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionComponentsMediumTest/search_by_directory_uuid.json b/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionComponentsMediumTest/search_by_directory_uuid.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionComponentsMediumTest/search_by_directory_uuid.json rename to sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionComponentsMediumTest/search_by_directory_uuid.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionComponentsMediumTest/search_by_file_key.json b/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionComponentsMediumTest/search_by_file_key.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionComponentsMediumTest/search_by_file_key.json rename to sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionComponentsMediumTest/search_by_file_key.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionComponentsMediumTest/search_by_file_uuid.json b/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionComponentsMediumTest/search_by_file_uuid.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionComponentsMediumTest/search_by_file_uuid.json rename to sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionComponentsMediumTest/search_by_file_uuid.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionComponentsMediumTest/search_by_project_uuid.json b/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionComponentsMediumTest/search_by_project_uuid.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionComponentsMediumTest/search_by_project_uuid.json rename to sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionComponentsMediumTest/search_by_project_uuid.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionComponentsMediumTest/search_by_test_key.json b/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionComponentsMediumTest/search_by_test_key.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionComponentsMediumTest/search_by_test_key.json rename to sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionComponentsMediumTest/search_by_test_key.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionComponentsMediumTest/search_by_view_uuid.json b/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionComponentsMediumTest/search_by_view_uuid.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionComponentsMediumTest/search_by_view_uuid.json rename to sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionComponentsMediumTest/search_by_view_uuid.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionComponentsMediumTest/search_since_leak_period.json b/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionComponentsMediumTest/search_since_leak_period.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionComponentsMediumTest/search_since_leak_period.json rename to sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionComponentsMediumTest/search_since_leak_period.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionMediumTest/apply_paging_with_multiple_components.json b/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionMediumTest/apply_paging_with_multiple_components.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionMediumTest/apply_paging_with_multiple_components.json rename to sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionMediumTest/apply_paging_with_multiple_components.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionMediumTest/apply_paging_with_one_component.json b/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionMediumTest/apply_paging_with_one_component.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionMediumTest/apply_paging_with_one_component.json rename to sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionMediumTest/apply_paging_with_one_component.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionMediumTest/assignedToMe_facet_must_escape_login_of_authenticated_user.json b/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionMediumTest/assignedToMe_facet_must_escape_login_of_authenticated_user.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionMediumTest/assignedToMe_facet_must_escape_login_of_authenticated_user.json rename to sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionMediumTest/assignedToMe_facet_must_escape_login_of_authenticated_user.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionMediumTest/assigned_to_me_facet_sticky.json b/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionMediumTest/assigned_to_me_facet_sticky.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionMediumTest/assigned_to_me_facet_sticky.json rename to sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionMediumTest/assigned_to_me_facet_sticky.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionMediumTest/components_contains_sub_projects.json b/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionMediumTest/components_contains_sub_projects.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionMediumTest/components_contains_sub_projects.json rename to sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionMediumTest/components_contains_sub_projects.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionMediumTest/default_page_size_is_100.json b/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionMediumTest/default_page_size_is_100.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionMediumTest/default_page_size_is_100.json rename to sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionMediumTest/default_page_size_is_100.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionMediumTest/deprecated_paging.json b/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionMediumTest/deprecated_paging.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionMediumTest/deprecated_paging.json rename to sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionMediumTest/deprecated_paging.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionMediumTest/display_deprecated_debt_fields.json b/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionMediumTest/display_deprecated_debt_fields.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionMediumTest/display_deprecated_debt_fields.json rename to sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionMediumTest/display_deprecated_debt_fields.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionMediumTest/display_facets.json b/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionMediumTest/display_facets.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionMediumTest/display_facets.json rename to sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionMediumTest/display_facets.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionMediumTest/display_facets_effort.json b/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionMediumTest/display_facets_effort.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionMediumTest/display_facets_effort.json rename to sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionMediumTest/display_facets_effort.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionMediumTest/display_zero_facets.json b/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionMediumTest/display_zero_facets.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionMediumTest/display_zero_facets.json rename to sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionMediumTest/display_zero_facets.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionMediumTest/empty_result.json b/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionMediumTest/empty_result.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionMediumTest/empty_result.json rename to sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionMediumTest/empty_result.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionMediumTest/filter_by_assigned_to_me.json b/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionMediumTest/filter_by_assigned_to_me.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionMediumTest/filter_by_assigned_to_me.json rename to sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionMediumTest/filter_by_assigned_to_me.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionMediumTest/hide_rules.json b/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionMediumTest/hide_rules.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionMediumTest/hide_rules.json rename to sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionMediumTest/hide_rules.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionMediumTest/ignore_paging_with_one_component.json b/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionMediumTest/ignore_paging_with_one_component.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionMediumTest/ignore_paging_with_one_component.json rename to sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionMediumTest/ignore_paging_with_one_component.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionMediumTest/issue_on_removed_file.json b/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionMediumTest/issue_on_removed_file.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionMediumTest/issue_on_removed_file.json rename to sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionMediumTest/issue_on_removed_file.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionMediumTest/issue_with_comment_hidden.json b/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionMediumTest/issue_with_comment_hidden.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionMediumTest/issue_with_comment_hidden.json rename to sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionMediumTest/issue_with_comment_hidden.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionMediumTest/issue_with_comments.json b/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionMediumTest/issue_with_comments.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionMediumTest/issue_with_comments.json rename to sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionMediumTest/issue_with_comments.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionMediumTest/load_additional_fields.json b/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionMediumTest/load_additional_fields.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionMediumTest/load_additional_fields.json rename to sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionMediumTest/load_additional_fields.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionMediumTest/load_additional_fields_with_issue_admin_permission.json b/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionMediumTest/load_additional_fields_with_issue_admin_permission.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionMediumTest/load_additional_fields_with_issue_admin_permission.json rename to sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionMediumTest/load_additional_fields_with_issue_admin_permission.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionMediumTest/no_issue.json b/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionMediumTest/no_issue.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionMediumTest/no_issue.json rename to sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionMediumTest/no_issue.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionMediumTest/paging.json b/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionMediumTest/paging.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionMediumTest/paging.json rename to sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionMediumTest/paging.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionMediumTest/paging_with_page_size_to_minus_one.json b/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionMediumTest/paging_with_page_size_to_minus_one.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionMediumTest/paging_with_page_size_to_minus_one.json rename to sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionMediumTest/paging_with_page_size_to_minus_one.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionMediumTest/response_contains_all_fields_except_additional_fields.json b/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionMediumTest/response_contains_all_fields_except_additional_fields.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionMediumTest/response_contains_all_fields_except_additional_fields.json rename to sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionMediumTest/response_contains_all_fields_except_additional_fields.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionMediumTest/sort_by_updated_at.json b/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionMediumTest/sort_by_updated_at.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionMediumTest/sort_by_updated_at.json rename to sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionMediumTest/sort_by_updated_at.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/language/ws/LanguageWsTest/list.json b/sonar-server/src/test/resources/org/sonar/server/language/ws/LanguageWsTest/list.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/language/ws/LanguageWsTest/list.json rename to sonar-server/src/test/resources/org/sonar/server/language/ws/LanguageWsTest/list.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/language/ws/LanguageWsTest/list_filtered_key.json b/sonar-server/src/test/resources/org/sonar/server/language/ws/LanguageWsTest/list_filtered_key.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/language/ws/LanguageWsTest/list_filtered_key.json rename to sonar-server/src/test/resources/org/sonar/server/language/ws/LanguageWsTest/list_filtered_key.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/language/ws/LanguageWsTest/list_filtered_name.json b/sonar-server/src/test/resources/org/sonar/server/language/ws/LanguageWsTest/list_filtered_name.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/language/ws/LanguageWsTest/list_filtered_name.json rename to sonar-server/src/test/resources/org/sonar/server/language/ws/LanguageWsTest/list_filtered_name.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/language/ws/LanguageWsTest/list_limited.json b/sonar-server/src/test/resources/org/sonar/server/language/ws/LanguageWsTest/list_limited.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/language/ws/LanguageWsTest/list_limited.json rename to sonar-server/src/test/resources/org/sonar/server/language/ws/LanguageWsTest/list_limited.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/measure/custom/ws/CreateActionTest/custom-measure.json b/sonar-server/src/test/resources/org/sonar/server/measure/custom/ws/CreateActionTest/custom-measure.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/measure/custom/ws/CreateActionTest/custom-measure.json rename to sonar-server/src/test/resources/org/sonar/server/measure/custom/ws/CreateActionTest/custom-measure.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/measure/custom/ws/MetricsActionTest/metrics.json b/sonar-server/src/test/resources/org/sonar/server/measure/custom/ws/MetricsActionTest/metrics.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/measure/custom/ws/MetricsActionTest/metrics.json rename to sonar-server/src/test/resources/org/sonar/server/measure/custom/ws/MetricsActionTest/metrics.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/measure/custom/ws/SearchActionTest/custom-measures.json b/sonar-server/src/test/resources/org/sonar/server/measure/custom/ws/SearchActionTest/custom-measures.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/measure/custom/ws/SearchActionTest/custom-measures.json rename to sonar-server/src/test/resources/org/sonar/server/measure/custom/ws/SearchActionTest/custom-measures.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/measure/custom/ws/SearchActionTest/empty.json b/sonar-server/src/test/resources/org/sonar/server/measure/custom/ws/SearchActionTest/empty.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/measure/custom/ws/SearchActionTest/empty.json rename to sonar-server/src/test/resources/org/sonar/server/measure/custom/ws/SearchActionTest/empty.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/measure/custom/ws/UpdateActionTest/custom-measure.json b/sonar-server/src/test/resources/org/sonar/server/measure/custom/ws/UpdateActionTest/custom-measure.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/measure/custom/ws/UpdateActionTest/custom-measure.json rename to sonar-server/src/test/resources/org/sonar/server/measure/custom/ws/UpdateActionTest/custom-measure.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/metric/DefaultMetricFinderTest/shared.xml b/sonar-server/src/test/resources/org/sonar/server/metric/DefaultMetricFinderTest/shared.xml similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/metric/DefaultMetricFinderTest/shared.xml rename to sonar-server/src/test/resources/org/sonar/server/metric/DefaultMetricFinderTest/shared.xml diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/metric/ws/CreateActionTest/metric.json b/sonar-server/src/test/resources/org/sonar/server/metric/ws/CreateActionTest/metric.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/metric/ws/CreateActionTest/metric.json rename to sonar-server/src/test/resources/org/sonar/server/metric/ws/CreateActionTest/metric.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/metric/ws/SearchActionTest/search_metrics.json b/sonar-server/src/test/resources/org/sonar/server/metric/ws/SearchActionTest/search_metrics.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/metric/ws/SearchActionTest/search_metrics.json rename to sonar-server/src/test/resources/org/sonar/server/metric/ws/SearchActionTest/search_metrics.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/metric/ws/UpdateActionTest/metric.json b/sonar-server/src/test/resources/org/sonar/server/metric/ws/UpdateActionTest/metric.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/metric/ws/UpdateActionTest/metric.json rename to sonar-server/src/test/resources/org/sonar/server/metric/ws/UpdateActionTest/metric.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/permission/ws/GroupsActionTest/groups.json b/sonar-server/src/test/resources/org/sonar/server/permission/ws/GroupsActionTest/groups.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/permission/ws/GroupsActionTest/groups.json rename to sonar-server/src/test/resources/org/sonar/server/permission/ws/GroupsActionTest/groups.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/permission/ws/SearchProjectPermissionsActionTest/display_all_project_permissions.json b/sonar-server/src/test/resources/org/sonar/server/permission/ws/SearchProjectPermissionsActionTest/display_all_project_permissions.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/permission/ws/SearchProjectPermissionsActionTest/display_all_project_permissions.json rename to sonar-server/src/test/resources/org/sonar/server/permission/ws/SearchProjectPermissionsActionTest/display_all_project_permissions.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/permission/ws/SearchProjectPermissionsActionTest/empty.json b/sonar-server/src/test/resources/org/sonar/server/permission/ws/SearchProjectPermissionsActionTest/empty.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/permission/ws/SearchProjectPermissionsActionTest/empty.json rename to sonar-server/src/test/resources/org/sonar/server/permission/ws/SearchProjectPermissionsActionTest/empty.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/permission/ws/UsersActionTest/search_for_users_is_paginated.json b/sonar-server/src/test/resources/org/sonar/server/permission/ws/UsersActionTest/search_for_users_is_paginated.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/permission/ws/UsersActionTest/search_for_users_is_paginated.json rename to sonar-server/src/test/resources/org/sonar/server/permission/ws/UsersActionTest/search_for_users_is_paginated.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/permission/ws/UsersActionTest/users.json b/sonar-server/src/test/resources/org/sonar/server/permission/ws/UsersActionTest/users.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/permission/ws/UsersActionTest/users.json rename to sonar-server/src/test/resources/org/sonar/server/permission/ws/UsersActionTest/users.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/permission/ws/template/SearchTemplatesActionTest/display_all_project_permissions.json b/sonar-server/src/test/resources/org/sonar/server/permission/ws/template/SearchTemplatesActionTest/display_all_project_permissions.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/permission/ws/template/SearchTemplatesActionTest/display_all_project_permissions.json rename to sonar-server/src/test/resources/org/sonar/server/permission/ws/template/SearchTemplatesActionTest/display_all_project_permissions.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/permission/ws/template/SearchTemplatesActionTest/empty.json b/sonar-server/src/test/resources/org/sonar/server/permission/ws/template/SearchTemplatesActionTest/empty.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/permission/ws/template/SearchTemplatesActionTest/empty.json rename to sonar-server/src/test/resources/org/sonar/server/permission/ws/template/SearchTemplatesActionTest/empty.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/platform/BackendCleanupTest/shared.xml b/sonar-server/src/test/resources/org/sonar/server/platform/BackendCleanupTest/shared.xml similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/platform/BackendCleanupTest/shared.xml rename to sonar-server/src/test/resources/org/sonar/server/platform/BackendCleanupTest/shared.xml diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/platform/ClassLoaderUtilsTest/ClassLoaderUtilsTest.jar b/sonar-server/src/test/resources/org/sonar/server/platform/ClassLoaderUtilsTest/ClassLoaderUtilsTest.jar similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/platform/ClassLoaderUtilsTest/ClassLoaderUtilsTest.jar rename to sonar-server/src/test/resources/org/sonar/server/platform/ClassLoaderUtilsTest/ClassLoaderUtilsTest.jar diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/platform/ServerImplTest/build.properties b/sonar-server/src/test/resources/org/sonar/server/platform/ServerImplTest/build.properties similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/platform/ServerImplTest/build.properties rename to sonar-server/src/test/resources/org/sonar/server/platform/ServerImplTest/build.properties diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/platform/ServerImplTest/empty-version.txt b/sonar-server/src/test/resources/org/sonar/server/platform/ServerImplTest/empty-version.txt similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/platform/ServerImplTest/empty-version.txt rename to sonar-server/src/test/resources/org/sonar/server/platform/ServerImplTest/empty-version.txt diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/platform/ServerImplTest/version.txt b/sonar-server/src/test/resources/org/sonar/server/platform/ServerImplTest/version.txt similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/platform/ServerImplTest/version.txt rename to sonar-server/src/test/resources/org/sonar/server/platform/ServerImplTest/version.txt diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/platform/web/WebPagesFilterTest/index.html b/sonar-server/src/test/resources/org/sonar/server/platform/web/WebPagesFilterTest/index.html similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/platform/web/WebPagesFilterTest/index.html rename to sonar-server/src/test/resources/org/sonar/server/platform/web/WebPagesFilterTest/index.html diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/plugins/ws/AvailableActionTest/properties_per_plugin.json b/sonar-server/src/test/resources/org/sonar/server/plugins/ws/AvailableActionTest/properties_per_plugin.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/plugins/ws/AvailableActionTest/properties_per_plugin.json rename to sonar-server/src/test/resources/org/sonar/server/plugins/ws/AvailableActionTest/properties_per_plugin.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/plugins/ws/InstalledActionTest/some.jar b/sonar-server/src/test/resources/org/sonar/server/plugins/ws/InstalledActionTest/some.jar similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/plugins/ws/InstalledActionTest/some.jar rename to sonar-server/src/test/resources/org/sonar/server/plugins/ws/InstalledActionTest/some.jar diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/project/ws/IndexActionTest/empty.json b/sonar-server/src/test/resources/org/sonar/server/project/ws/IndexActionTest/empty.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/project/ws/IndexActionTest/empty.json rename to sonar-server/src/test/resources/org/sonar/server/project/ws/IndexActionTest/empty.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/project/ws/IndexActionTest/return_only_projects_authorized_for_user.json b/sonar-server/src/test/resources/org/sonar/server/project/ws/IndexActionTest/return_only_projects_authorized_for_user.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/project/ws/IndexActionTest/return_only_projects_authorized_for_user.json rename to sonar-server/src/test/resources/org/sonar/server/project/ws/IndexActionTest/return_only_projects_authorized_for_user.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/project/ws/IndexActionTest/search_project_by_id.json b/sonar-server/src/test/resources/org/sonar/server/project/ws/IndexActionTest/search_project_by_id.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/project/ws/IndexActionTest/search_project_by_id.json rename to sonar-server/src/test/resources/org/sonar/server/project/ws/IndexActionTest/search_project_by_id.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/project/ws/IndexActionTest/search_project_by_key.json b/sonar-server/src/test/resources/org/sonar/server/project/ws/IndexActionTest/search_project_by_key.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/project/ws/IndexActionTest/search_project_by_key.json rename to sonar-server/src/test/resources/org/sonar/server/project/ws/IndexActionTest/search_project_by_key.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/project/ws/IndexActionTest/search_projects.json b/sonar-server/src/test/resources/org/sonar/server/project/ws/IndexActionTest/search_projects.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/project/ws/IndexActionTest/search_projects.json rename to sonar-server/src/test/resources/org/sonar/server/project/ws/IndexActionTest/search_projects.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/project/ws/IndexActionTest/search_projects_by_name.json b/sonar-server/src/test/resources/org/sonar/server/project/ws/IndexActionTest/search_projects_by_name.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/project/ws/IndexActionTest/search_projects_by_name.json rename to sonar-server/src/test/resources/org/sonar/server/project/ws/IndexActionTest/search_projects_by_name.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/project/ws/IndexActionTest/search_projects_with_modules.json b/sonar-server/src/test/resources/org/sonar/server/project/ws/IndexActionTest/search_projects_with_modules.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/project/ws/IndexActionTest/search_projects_with_modules.json rename to sonar-server/src/test/resources/org/sonar/server/project/ws/IndexActionTest/search_projects_with_modules.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/project/ws/IndexActionTest/search_projects_with_modules_by_name.json b/sonar-server/src/test/resources/org/sonar/server/project/ws/IndexActionTest/search_projects_with_modules_by_name.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/project/ws/IndexActionTest/search_projects_with_modules_by_name.json rename to sonar-server/src/test/resources/org/sonar/server/project/ws/IndexActionTest/search_projects_with_modules_by_name.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/does_not_fail_when_user_has_not_project_browse_permission.json b/sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/does_not_fail_when_user_has_not_project_browse_permission.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/does_not_fail_when_user_has_not_project_browse_permission.json rename to sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/does_not_fail_when_user_has_not_project_browse_permission.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/does_not_returned_secured_and_license_settings_in_property_set_when_not_authenticated.json b/sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/does_not_returned_secured_and_license_settings_in_property_set_when_not_authenticated.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/does_not_returned_secured_and_license_settings_in_property_set_when_not_authenticated.json rename to sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/does_not_returned_secured_and_license_settings_in_property_set_when_not_authenticated.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/does_not_returned_secured_and_license_settings_when_not_authenticated.json b/sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/does_not_returned_secured_and_license_settings_when_not_authenticated.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/does_not_returned_secured_and_license_settings_when_not_authenticated.json rename to sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/does_not_returned_secured_and_license_settings_when_not_authenticated.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/empty.json b/sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/empty.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/empty.json rename to sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/empty.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_all_project_settings_when_component_and_no_key.json b/sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_all_project_settings_when_component_and_no_key.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_all_project_settings_when_component_and_no_key.json rename to sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_all_project_settings_when_component_and_no_key.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_all_settings_when_no_component_and_no_key.json b/sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_all_settings_when_no_component_and_no_key.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_all_settings_when_no_component_and_no_key.json rename to sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_all_settings_when_no_component_and_no_key.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_default_values.json b/sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_default_values.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_default_values.json rename to sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_default_values.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_global_values.json b/sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_global_values.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_global_values.json rename to sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_global_values.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_inherited_values_on_global_setting.json b/sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_inherited_values_on_global_setting.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_inherited_values_on_global_setting.json rename to sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_inherited_values_on_global_setting.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_inherited_values_on_module.json b/sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_inherited_values_on_module.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_inherited_values_on_module.json rename to sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_inherited_values_on_module.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_license_with_hash_settings_when_authenticated_but_not_admin.json b/sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_license_with_hash_settings_when_authenticated_but_not_admin.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_license_with_hash_settings_when_authenticated_but_not_admin.json rename to sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_license_with_hash_settings_when_authenticated_but_not_admin.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_module_values.json b/sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_module_values.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_module_values.json rename to sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_module_values.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_multi_value_with_coma.json b/sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_multi_value_with_coma.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_multi_value_with_coma.json rename to sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_multi_value_with_coma.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_multi_values.json b/sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_multi_values.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_multi_values.json rename to sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_multi_values.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_only_one_setting_when_key_is_provided.json b/sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_only_one_setting_when_key_is_provided.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_only_one_setting_when_key_is_provided.json rename to sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_only_one_setting_when_key_is_provided.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_project_values.json b/sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_project_values.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_project_values.json rename to sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_project_values.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_property_set.json b/sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_property_set.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_property_set.json rename to sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_property_set.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_secured_and_license_settings_in_property_set_when_system_admin.json b/sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_secured_and_license_settings_in_property_set_when_system_admin.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_secured_and_license_settings_in_property_set_when_system_admin.json rename to sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_secured_and_license_settings_in_property_set_when_system_admin.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_secured_and_license_settings_when_project_admin.json b/sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_secured_and_license_settings_when_project_admin.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_secured_and_license_settings_when_project_admin.json rename to sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_secured_and_license_settings_when_project_admin.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_secured_and_license_settings_when_system_admin.json b/sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_secured_and_license_settings_when_system_admin.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_secured_and_license_settings_when_system_admin.json rename to sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_secured_and_license_settings_when_system_admin.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_simple_value.json b/sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_simple_value.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_simple_value.json rename to sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_simple_value.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_values_even_if_no_property_definition.json b/sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_values_even_if_no_property_definition.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_values_even_if_no_property_definition.json rename to sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_values_even_if_no_property_definition.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/qualitygate/ws/ProjectStatusActionTest/measure_data.json b/sonar-server/src/test/resources/org/sonar/server/qualitygate/ws/ProjectStatusActionTest/measure_data.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/qualitygate/ws/ProjectStatusActionTest/measure_data.json rename to sonar-server/src/test/resources/org/sonar/server/qualitygate/ws/ProjectStatusActionTest/measure_data.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/qualitygate/ws/QualityGateDetailsFormatterTest/non_leak_period.json b/sonar-server/src/test/resources/org/sonar/server/qualitygate/ws/QualityGateDetailsFormatterTest/non_leak_period.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/qualitygate/ws/QualityGateDetailsFormatterTest/non_leak_period.json rename to sonar-server/src/test/resources/org/sonar/server/qualitygate/ws/QualityGateDetailsFormatterTest/non_leak_period.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/qualitygate/ws/QualityGateDetailsFormatterTest/quality_gate_details.json b/sonar-server/src/test/resources/org/sonar/server/qualitygate/ws/QualityGateDetailsFormatterTest/quality_gate_details.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/qualitygate/ws/QualityGateDetailsFormatterTest/quality_gate_details.json rename to sonar-server/src/test/resources/org/sonar/server/qualitygate/ws/QualityGateDetailsFormatterTest/quality_gate_details.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileBackuperMediumTest/duplicates-xml-backup.xml b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileBackuperMediumTest/duplicates-xml-backup.xml similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileBackuperMediumTest/duplicates-xml-backup.xml rename to sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileBackuperMediumTest/duplicates-xml-backup.xml diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_active_rules_with_inheritance/active_rule25.json b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_active_rules_with_inheritance/active_rule25.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_active_rules_with_inheritance/active_rule25.json rename to sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_active_rules_with_inheritance/active_rule25.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_active_rules_with_inheritance/active_rule391.json b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_active_rules_with_inheritance/active_rule391.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_active_rules_with_inheritance/active_rule391.json rename to sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_active_rules_with_inheritance/active_rule391.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_inactive_rules_sorted_ignoring_case/rule_A.json b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_inactive_rules_sorted_ignoring_case/rule_A.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_inactive_rules_sorted_ignoring_case/rule_A.json rename to sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_inactive_rules_sorted_ignoring_case/rule_A.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_inactive_rules_sorted_ignoring_case/rule_C.json b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_inactive_rules_sorted_ignoring_case/rule_C.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_inactive_rules_sorted_ignoring_case/rule_C.json rename to sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_inactive_rules_sorted_ignoring_case/rule_C.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_inactive_rules_sorted_ignoring_case/rule_b.json b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_inactive_rules_sorted_ignoring_case/rule_b.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_inactive_rules_sorted_ignoring_case/rule_b.json rename to sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_inactive_rules_sorted_ignoring_case/rule_b.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_inactive_rules_with_tags/active_rule_ace.json b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_inactive_rules_with_tags/active_rule_ace.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_inactive_rules_with_tags/active_rule_ace.json rename to sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_inactive_rules_with_tags/active_rule_ace.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_inactive_rules_with_tags/active_rule_empty.json b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_inactive_rules_with_tags/active_rule_empty.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_inactive_rules_with_tags/active_rule_empty.json rename to sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_inactive_rules_with_tags/active_rule_empty.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_inactive_rules_with_tags/tags_a.json b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_inactive_rules_with_tags/tags_a.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_inactive_rules_with_tags/tags_a.json rename to sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_inactive_rules_with_tags/tags_a.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_inactive_rules_with_tags/tags_ab.json b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_inactive_rules_with_tags/tags_ab.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_inactive_rules_with_tags/tags_ab.json rename to sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_inactive_rules_with_tags/tags_ab.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_inactive_rules_with_tags/tags_ace.json b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_inactive_rules_with_tags/tags_ace.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_inactive_rules_with_tags/tags_ace.json rename to sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_inactive_rules_with_tags/tags_ace.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_inactive_rules_with_tags/tags_bc.json b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_inactive_rules_with_tags/tags_bc.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_inactive_rules_with_tags/tags_bc.json rename to sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_inactive_rules_with_tags/tags_bc.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_inactive_rules_with_tags/tags_empty.json b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_inactive_rules_with_tags/tags_empty.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_inactive_rules_with_tags/tags_empty.json rename to sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_inactive_rules_with_tags/tags_empty.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/shared/active_rule25.json b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/shared/active_rule25.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/shared/active_rule25.json rename to sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/shared/active_rule25.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/shared/active_rule2702.json b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/shared/active_rule2702.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/shared/active_rule2702.json rename to sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/shared/active_rule2702.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/shared/active_rule391.json b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/shared/active_rule391.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/shared/active_rule391.json rename to sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/shared/active_rule391.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/shared/active_rule523.json b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/shared/active_rule523.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/shared/active_rule523.json rename to sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/shared/active_rule523.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/shared/rule1482.json b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/shared/rule1482.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/shared/rule1482.json rename to sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/shared/rule1482.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/shared/rule25.json b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/shared/rule25.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/shared/rule25.json rename to sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/shared/rule25.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/shared/rule719.json b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/shared/rule719.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/shared/rule719.json rename to sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/shared/rule719.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/shared/rule759.json b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/shared/rule759.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/shared/rule759.json rename to sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/shared/rule759.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/shared/rule860.json b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/shared/rule860.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/shared/rule860.json rename to sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/shared/rule860.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/shared/rule944.json b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/shared/rule944.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/shared/rule944.json rename to sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/shared/rule944.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/ChangelogActionMockTest/changelog_empty.json b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/ChangelogActionMockTest/changelog_empty.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/ChangelogActionMockTest/changelog_empty.json rename to sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/ChangelogActionMockTest/changelog_empty.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/ChangelogActionMockTest/changelog_full.json b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/ChangelogActionMockTest/changelog_full.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/ChangelogActionMockTest/changelog_full.json rename to sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/ChangelogActionMockTest/changelog_full.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/ChangelogActionMockTest/changelog_nominal.json b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/ChangelogActionMockTest/changelog_nominal.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/ChangelogActionMockTest/changelog_nominal.json rename to sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/ChangelogActionMockTest/changelog_nominal.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/CompareActionMediumTest/compare_nominal.json b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/CompareActionMediumTest/compare_nominal.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/CompareActionMediumTest/compare_nominal.json rename to sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/CompareActionMediumTest/compare_nominal.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/CompareActionMediumTest/compare_param_on_left.json b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/CompareActionMediumTest/compare_param_on_left.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/CompareActionMediumTest/compare_param_on_left.json rename to sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/CompareActionMediumTest/compare_param_on_left.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/CompareActionMediumTest/compare_param_on_right.json b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/CompareActionMediumTest/compare_param_on_right.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/CompareActionMediumTest/compare_param_on_right.json rename to sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/CompareActionMediumTest/compare_param_on_right.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/CreateActionMediumTest/create-with-messages.json b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/CreateActionMediumTest/create-with-messages.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/CreateActionMediumTest/create-with-messages.json rename to sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/CreateActionMediumTest/create-with-messages.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/CreateActionTest/test_json.json b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/CreateActionTest/test_json.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/CreateActionTest/test_json.json rename to sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/CreateActionTest/test_json.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/InheritanceActionTest/inheritance-buWide.json b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/InheritanceActionTest/inheritance-buWide.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/InheritanceActionTest/inheritance-buWide.json rename to sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/InheritanceActionTest/inheritance-buWide.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/InheritanceActionTest/inheritance-simple.json b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/InheritanceActionTest/inheritance-simple.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/InheritanceActionTest/inheritance-simple.json rename to sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/InheritanceActionTest/inheritance-simple.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/ProjectsActionTest/all.json b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/ProjectsActionTest/all.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/ProjectsActionTest/all.json rename to sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/ProjectsActionTest/all.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/ProjectsActionTest/all_filtered.json b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/ProjectsActionTest/all_filtered.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/ProjectsActionTest/all_filtered.json rename to sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/ProjectsActionTest/all_filtered.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/ProjectsActionTest/authorized_selected.json b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/ProjectsActionTest/authorized_selected.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/ProjectsActionTest/authorized_selected.json rename to sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/ProjectsActionTest/authorized_selected.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/ProjectsActionTest/deselected.json b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/ProjectsActionTest/deselected.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/ProjectsActionTest/deselected.json rename to sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/ProjectsActionTest/deselected.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/ProjectsActionTest/empty.json b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/ProjectsActionTest/empty.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/ProjectsActionTest/empty.json rename to sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/ProjectsActionTest/empty.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/ProjectsActionTest/return_deprecated_uuid_field.json b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/ProjectsActionTest/return_deprecated_uuid_field.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/ProjectsActionTest/return_deprecated_uuid_field.json rename to sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/ProjectsActionTest/return_deprecated_uuid_field.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/ProjectsActionTest/selected_page1.json b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/ProjectsActionTest/selected_page1.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/ProjectsActionTest/selected_page1.json rename to sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/ProjectsActionTest/selected_page1.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/ProjectsActionTest/selected_page2.json b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/ProjectsActionTest/selected_page2.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/ProjectsActionTest/selected_page2.json rename to sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/ProjectsActionTest/selected_page2.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/ProjectsActionTest/selected_ps3_page1.json b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/ProjectsActionTest/selected_ps3_page1.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/ProjectsActionTest/selected_ps3_page1.json rename to sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/ProjectsActionTest/selected_ps3_page1.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/ProjectsActionTest/selected_ps3_page2.json b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/ProjectsActionTest/selected_ps3_page2.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/ProjectsActionTest/selected_ps3_page2.json rename to sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/ProjectsActionTest/selected_ps3_page2.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/QProfilesWsMediumTest/bulk_activate_rule.json b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/QProfilesWsMediumTest/bulk_activate_rule.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/QProfilesWsMediumTest/bulk_activate_rule.json rename to sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/QProfilesWsMediumTest/bulk_activate_rule.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/QProfilesWsMediumTest/bulk_activate_rule_not_all.json b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/QProfilesWsMediumTest/bulk_activate_rule_not_all.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/QProfilesWsMediumTest/bulk_activate_rule_not_all.json rename to sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/QProfilesWsMediumTest/bulk_activate_rule_not_all.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/RestoreActionTest/restore_profile.json b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/RestoreActionTest/restore_profile.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/RestoreActionTest/restore_profile.json rename to sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/RestoreActionTest/restore_profile.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/rule/RuleRegistryTest/shared/removed_rule.json b/sonar-server/src/test/resources/org/sonar/server/rule/RuleRegistryTest/shared/removed_rule.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/rule/RuleRegistryTest/shared/removed_rule.json rename to sonar-server/src/test/resources/org/sonar/server/rule/RuleRegistryTest/shared/removed_rule.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/rule/RuleRegistryTest/shared/rule1.json b/sonar-server/src/test/resources/org/sonar/server/rule/RuleRegistryTest/shared/rule1.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/rule/RuleRegistryTest/shared/rule1.json rename to sonar-server/src/test/resources/org/sonar/server/rule/RuleRegistryTest/shared/rule1.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/rule/RuleRegistryTest/shared/rule2.json b/sonar-server/src/test/resources/org/sonar/server/rule/RuleRegistryTest/shared/rule2.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/rule/RuleRegistryTest/shared/rule2.json rename to sonar-server/src/test/resources/org/sonar/server/rule/RuleRegistryTest/shared/rule2.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/rule/RuleRegistryTest/shared/rule3.json b/sonar-server/src/test/resources/org/sonar/server/rule/RuleRegistryTest/shared/rule3.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/rule/RuleRegistryTest/shared/rule3.json rename to sonar-server/src/test/resources/org/sonar/server/rule/RuleRegistryTest/shared/rule3.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RepositoriesActionTest/repositories.json b/sonar-server/src/test/resources/org/sonar/server/rule/ws/RepositoriesActionTest/repositories.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RepositoriesActionTest/repositories.json rename to sonar-server/src/test/resources/org/sonar/server/rule/ws/RepositoriesActionTest/repositories.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RepositoriesActionTest/repositories_common.json b/sonar-server/src/test/resources/org/sonar/server/rule/ws/RepositoriesActionTest/repositories_common.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RepositoriesActionTest/repositories_common.json rename to sonar-server/src/test/resources/org/sonar/server/rule/ws/RepositoriesActionTest/repositories_common.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RepositoriesActionTest/repositories_sonar.json b/sonar-server/src/test/resources/org/sonar/server/rule/ws/RepositoriesActionTest/repositories_sonar.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RepositoriesActionTest/repositories_sonar.json rename to sonar-server/src/test/resources/org/sonar/server/rule/ws/RepositoriesActionTest/repositories_sonar.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RepositoriesActionTest/repositories_squid.json b/sonar-server/src/test/resources/org/sonar/server/rule/ws/RepositoriesActionTest/repositories_squid.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RepositoriesActionTest/repositories_squid.json rename to sonar-server/src/test/resources/org/sonar/server/rule/ws/RepositoriesActionTest/repositories_squid.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RepositoriesActionTest/repositories_ws.json b/sonar-server/src/test/resources/org/sonar/server/rule/ws/RepositoriesActionTest/repositories_ws.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RepositoriesActionTest/repositories_ws.json rename to sonar-server/src/test/resources/org/sonar/server/rule/ws/RepositoriesActionTest/repositories_ws.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RepositoriesActionTest/repositories_xoo.json b/sonar-server/src/test/resources/org/sonar/server/rule/ws/RepositoriesActionTest/repositories_xoo.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RepositoriesActionTest/repositories_xoo.json rename to sonar-server/src/test/resources/org/sonar/server/rule/ws/RepositoriesActionTest/repositories_xoo.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RuleSearchWsHandlerTest/search_rules.json b/sonar-server/src/test/resources/org/sonar/server/rule/ws/RuleSearchWsHandlerTest/search_rules.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RuleSearchWsHandlerTest/search_rules.json rename to sonar-server/src/test/resources/org/sonar/server/rule/ws/RuleSearchWsHandlerTest/search_rules.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RuleShowWsHandlerTest/show_manuel_rule.json b/sonar-server/src/test/resources/org/sonar/server/rule/ws/RuleShowWsHandlerTest/show_manuel_rule.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RuleShowWsHandlerTest/show_manuel_rule.json rename to sonar-server/src/test/resources/org/sonar/server/rule/ws/RuleShowWsHandlerTest/show_manuel_rule.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RuleShowWsHandlerTest/show_rule.json b/sonar-server/src/test/resources/org/sonar/server/rule/ws/RuleShowWsHandlerTest/show_rule.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RuleShowWsHandlerTest/show_rule.json rename to sonar-server/src/test/resources/org/sonar/server/rule/ws/RuleShowWsHandlerTest/show_rule.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RuleShowWsHandlerTest/show_rule_with_dates.json b/sonar-server/src/test/resources/org/sonar/server/rule/ws/RuleShowWsHandlerTest/show_rule_with_dates.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RuleShowWsHandlerTest/show_rule_with_dates.json rename to sonar-server/src/test/resources/org/sonar/server/rule/ws/RuleShowWsHandlerTest/show_rule_with_dates.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RuleShowWsHandlerTest/show_rule_with_note.json b/sonar-server/src/test/resources/org/sonar/server/rule/ws/RuleShowWsHandlerTest/show_rule_with_note.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RuleShowWsHandlerTest/show_rule_with_note.json rename to sonar-server/src/test/resources/org/sonar/server/rule/ws/RuleShowWsHandlerTest/show_rule_with_note.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RuleShowWsHandlerTest/show_rule_with_tags.json b/sonar-server/src/test/resources/org/sonar/server/rule/ws/RuleShowWsHandlerTest/show_rule_with_tags.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RuleShowWsHandlerTest/show_rule_with_tags.json rename to sonar-server/src/test/resources/org/sonar/server/rule/ws/RuleShowWsHandlerTest/show_rule_with_tags.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/filter_by_tags.json b/sonar-server/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/filter_by_tags.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/filter_by_tags.json rename to sonar-server/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/filter_by_tags.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/get_note_as_markdown_and_html.json b/sonar-server/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/get_note_as_markdown_and_html.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/get_note_as_markdown_and_html.json rename to sonar-server/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/get_note_as_markdown_and_html.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/return_mandatory_fields_even_when_setting_f_param.json b/sonar-server/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/return_mandatory_fields_even_when_setting_f_param.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/return_mandatory_fields_even_when_setting_f_param.json rename to sonar-server/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/return_mandatory_fields_even_when_setting_f_param.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/search_2_rules.json b/sonar-server/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/search_2_rules.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/search_2_rules.json rename to sonar-server/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/search_2_rules.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/search_2_rules_fields.json b/sonar-server/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/search_2_rules_fields.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/search_2_rules_fields.json rename to sonar-server/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/search_2_rules_fields.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/search_active_rules.json b/sonar-server/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/search_active_rules.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/search_active_rules.json rename to sonar-server/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/search_active_rules.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/search_active_rules_params.json b/sonar-server/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/search_active_rules_params.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/search_active_rules_params.json rename to sonar-server/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/search_active_rules_params.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/search_debt_rules_with_default_and_overridden_debt_values.json b/sonar-server/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/search_debt_rules_with_default_and_overridden_debt_values.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/search_debt_rules_with_default_and_overridden_debt_values.json rename to sonar-server/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/search_debt_rules_with_default_and_overridden_debt_values.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/search_debt_rules_with_default_linear_offset_and_overridden_constant_debt.json b/sonar-server/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/search_debt_rules_with_default_linear_offset_and_overridden_constant_debt.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/search_debt_rules_with_default_linear_offset_and_overridden_constant_debt.json rename to sonar-server/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/search_debt_rules_with_default_linear_offset_and_overridden_constant_debt.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/search_debt_rules_with_default_linear_offset_and_overridden_linear_debt.json b/sonar-server/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/search_debt_rules_with_default_linear_offset_and_overridden_linear_debt.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/search_debt_rules_with_default_linear_offset_and_overridden_linear_debt.json rename to sonar-server/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/search_debt_rules_with_default_linear_offset_and_overridden_linear_debt.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/search_no_rules.json b/sonar-server/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/search_no_rules.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/search_no_rules.json rename to sonar-server/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/search_no_rules.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/search_profile_active_rules.json b/sonar-server/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/search_profile_active_rules.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/search_profile_active_rules.json rename to sonar-server/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/search_profile_active_rules.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/search_profile_active_rules_inheritance.json b/sonar-server/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/search_profile_active_rules_inheritance.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/search_profile_active_rules_inheritance.json rename to sonar-server/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/search_profile_active_rules_inheritance.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/search_rules_from_template_key.json b/sonar-server/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/search_rules_from_template_key.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/search_rules_from_template_key.json rename to sonar-server/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/search_rules_from_template_key.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/search_rules_with_deprecated_fields.json b/sonar-server/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/search_rules_with_deprecated_fields.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/search_rules_with_deprecated_fields.json rename to sonar-server/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/search_rules_with_deprecated_fields.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/search_template_rules.json b/sonar-server/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/search_template_rules.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/search_template_rules.json rename to sonar-server/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/search_template_rules.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/severities_facet.json b/sonar-server/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/severities_facet.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/severities_facet.json rename to sonar-server/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/severities_facet.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/statuses_facet.json b/sonar-server/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/statuses_facet.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/statuses_facet.json rename to sonar-server/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/statuses_facet.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/statuses_facet_sticky.json b/sonar-server/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/statuses_facet_sticky.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/statuses_facet_sticky.json rename to sonar-server/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/statuses_facet_sticky.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/ShowActionMediumTest/encode_html_description_of_custom_rule.json b/sonar-server/src/test/resources/org/sonar/server/rule/ws/ShowActionMediumTest/encode_html_description_of_custom_rule.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/ShowActionMediumTest/encode_html_description_of_custom_rule.json rename to sonar-server/src/test/resources/org/sonar/server/rule/ws/ShowActionMediumTest/encode_html_description_of_custom_rule.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/ShowActionMediumTest/show_deprecated_rule_rem_function_fields.json b/sonar-server/src/test/resources/org/sonar/server/rule/ws/ShowActionMediumTest/show_deprecated_rule_rem_function_fields.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/ShowActionMediumTest/show_deprecated_rule_rem_function_fields.json rename to sonar-server/src/test/resources/org/sonar/server/rule/ws/ShowActionMediumTest/show_deprecated_rule_rem_function_fields.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/ShowActionMediumTest/show_rule.json b/sonar-server/src/test/resources/org/sonar/server/rule/ws/ShowActionMediumTest/show_rule.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/ShowActionMediumTest/show_rule.json rename to sonar-server/src/test/resources/org/sonar/server/rule/ws/ShowActionMediumTest/show_rule.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/ShowActionMediumTest/show_rule_when_activated.json b/sonar-server/src/test/resources/org/sonar/server/rule/ws/ShowActionMediumTest/show_rule_when_activated.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/ShowActionMediumTest/show_rule_when_activated.json rename to sonar-server/src/test/resources/org/sonar/server/rule/ws/ShowActionMediumTest/show_rule_when_activated.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/ShowActionMediumTest/show_rule_with_default_and_overridden_debt_infos.json b/sonar-server/src/test/resources/org/sonar/server/rule/ws/ShowActionMediumTest/show_rule_with_default_and_overridden_debt_infos.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/ShowActionMediumTest/show_rule_with_default_and_overridden_debt_infos.json rename to sonar-server/src/test/resources/org/sonar/server/rule/ws/ShowActionMediumTest/show_rule_with_default_and_overridden_debt_infos.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/ShowActionMediumTest/show_rule_with_default_debt_infos.json b/sonar-server/src/test/resources/org/sonar/server/rule/ws/ShowActionMediumTest/show_rule_with_default_debt_infos.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/ShowActionMediumTest/show_rule_with_default_debt_infos.json rename to sonar-server/src/test/resources/org/sonar/server/rule/ws/ShowActionMediumTest/show_rule_with_default_debt_infos.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/ShowActionMediumTest/show_rule_with_no_default_and_no_overridden_debt.json b/sonar-server/src/test/resources/org/sonar/server/rule/ws/ShowActionMediumTest/show_rule_with_no_default_and_no_overridden_debt.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/ShowActionMediumTest/show_rule_with_no_default_and_no_overridden_debt.json rename to sonar-server/src/test/resources/org/sonar/server/rule/ws/ShowActionMediumTest/show_rule_with_no_default_and_no_overridden_debt.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/ShowActionMediumTest/show_rule_with_overridden_debt_infos.json b/sonar-server/src/test/resources/org/sonar/server/rule/ws/ShowActionMediumTest/show_rule_with_overridden_debt_infos.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/ShowActionMediumTest/show_rule_with_overridden_debt_infos.json rename to sonar-server/src/test/resources/org/sonar/server/rule/ws/ShowActionMediumTest/show_rule_with_overridden_debt_infos.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/UpdateActionMediumTest/deprecated_remediation_function.json b/sonar-server/src/test/resources/org/sonar/server/rule/ws/UpdateActionMediumTest/deprecated_remediation_function.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/UpdateActionMediumTest/deprecated_remediation_function.json rename to sonar-server/src/test/resources/org/sonar/server/rule/ws/UpdateActionMediumTest/deprecated_remediation_function.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/UpdateActionMediumTest/update_custom_rule.json b/sonar-server/src/test/resources/org/sonar/server/rule/ws/UpdateActionMediumTest/update_custom_rule.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/UpdateActionMediumTest/update_custom_rule.json rename to sonar-server/src/test/resources/org/sonar/server/rule/ws/UpdateActionMediumTest/update_custom_rule.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/source/ws/HashActionTest/no_source.xml b/sonar-server/src/test/resources/org/sonar/server/source/ws/HashActionTest/no_source.xml similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/source/ws/HashActionTest/no_source.xml rename to sonar-server/src/test/resources/org/sonar/server/source/ws/HashActionTest/no_source.xml diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/source/ws/HashActionTest/shared.xml b/sonar-server/src/test/resources/org/sonar/server/source/ws/HashActionTest/shared.xml similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/source/ws/HashActionTest/shared.xml rename to sonar-server/src/test/resources/org/sonar/server/source/ws/HashActionTest/shared.xml diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/source/ws/HashActionTest/show_hashes_on_test_file.xml b/sonar-server/src/test/resources/org/sonar/server/source/ws/HashActionTest/show_hashes_on_test_file.xml similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/source/ws/HashActionTest/show_hashes_on_test_file.xml rename to sonar-server/src/test/resources/org/sonar/server/source/ws/HashActionTest/show_hashes_on_test_file.xml diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/source/ws/LinesActionTest/convert_deprecated_data.json b/sonar-server/src/test/resources/org/sonar/server/source/ws/LinesActionTest/convert_deprecated_data.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/source/ws/LinesActionTest/convert_deprecated_data.json rename to sonar-server/src/test/resources/org/sonar/server/source/ws/LinesActionTest/convert_deprecated_data.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/source/ws/LinesActionTest/display_deprecated_fields.json b/sonar-server/src/test/resources/org/sonar/server/source/ws/LinesActionTest/display_deprecated_fields.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/source/ws/LinesActionTest/display_deprecated_fields.json rename to sonar-server/src/test/resources/org/sonar/server/source/ws/LinesActionTest/display_deprecated_fields.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/source/ws/LinesActionTest/show_paginated_lines.json b/sonar-server/src/test/resources/org/sonar/server/source/ws/LinesActionTest/show_paginated_lines.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/source/ws/LinesActionTest/show_paginated_lines.json rename to sonar-server/src/test/resources/org/sonar/server/source/ws/LinesActionTest/show_paginated_lines.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/source/ws/LinesActionTest/show_source.json b/sonar-server/src/test/resources/org/sonar/server/source/ws/LinesActionTest/show_source.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/source/ws/LinesActionTest/show_source.json rename to sonar-server/src/test/resources/org/sonar/server/source/ws/LinesActionTest/show_source.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/source/ws/LinesActionTest/show_source_by_file_key.json b/sonar-server/src/test/resources/org/sonar/server/source/ws/LinesActionTest/show_source_by_file_key.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/source/ws/LinesActionTest/show_source_by_file_key.json rename to sonar-server/src/test/resources/org/sonar/server/source/ws/LinesActionTest/show_source_by_file_key.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/source/ws/ScmActionTest/accept_negative_value_in_from_parameter.json b/sonar-server/src/test/resources/org/sonar/server/source/ws/ScmActionTest/accept_negative_value_in_from_parameter.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/source/ws/ScmActionTest/accept_negative_value_in_from_parameter.json rename to sonar-server/src/test/resources/org/sonar/server/source/ws/ScmActionTest/accept_negative_value_in_from_parameter.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/source/ws/ScmActionTest/group_lines_by_commit.json b/sonar-server/src/test/resources/org/sonar/server/source/ws/ScmActionTest/group_lines_by_commit.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/source/ws/ScmActionTest/group_lines_by_commit.json rename to sonar-server/src/test/resources/org/sonar/server/source/ws/ScmActionTest/group_lines_by_commit.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/source/ws/ScmActionTest/not_group_lines_by_commit.json b/sonar-server/src/test/resources/org/sonar/server/source/ws/ScmActionTest/not_group_lines_by_commit.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/source/ws/ScmActionTest/not_group_lines_by_commit.json rename to sonar-server/src/test/resources/org/sonar/server/source/ws/ScmActionTest/not_group_lines_by_commit.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/source/ws/ScmActionTest/return_empty_value_when_no_scm.json b/sonar-server/src/test/resources/org/sonar/server/source/ws/ScmActionTest/return_empty_value_when_no_scm.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/source/ws/ScmActionTest/return_empty_value_when_no_scm.json rename to sonar-server/src/test/resources/org/sonar/server/source/ws/ScmActionTest/return_empty_value_when_no_scm.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/source/ws/ScmActionTest/show_scm.json b/sonar-server/src/test/resources/org/sonar/server/source/ws/ScmActionTest/show_scm.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/source/ws/ScmActionTest/show_scm.json rename to sonar-server/src/test/resources/org/sonar/server/source/ws/ScmActionTest/show_scm.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/source/ws/ScmActionTest/show_scm_from_given_range_lines.json b/sonar-server/src/test/resources/org/sonar/server/source/ws/ScmActionTest/show_scm_from_given_range_lines.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/source/ws/ScmActionTest/show_scm_from_given_range_lines.json rename to sonar-server/src/test/resources/org/sonar/server/source/ws/ScmActionTest/show_scm_from_given_range_lines.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/source/ws/ShowActionTest/show_source.json b/sonar-server/src/test/resources/org/sonar/server/source/ws/ShowActionTest/show_source.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/source/ws/ShowActionTest/show_source.json rename to sonar-server/src/test/resources/org/sonar/server/source/ws/ShowActionTest/show_source.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/source/ws/ShowActionTest/show_source_with_params_from_and_to.json b/sonar-server/src/test/resources/org/sonar/server/source/ws/ShowActionTest/show_source_with_params_from_and_to.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/source/ws/ShowActionTest/show_source_with_params_from_and_to.json rename to sonar-server/src/test/resources/org/sonar/server/source/ws/ShowActionTest/show_source_with_params_from_and_to.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/startup/RegisterMetricsTest/disable_undefined_metrics-result.xml b/sonar-server/src/test/resources/org/sonar/server/startup/RegisterMetricsTest/disable_undefined_metrics-result.xml similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/startup/RegisterMetricsTest/disable_undefined_metrics-result.xml rename to sonar-server/src/test/resources/org/sonar/server/startup/RegisterMetricsTest/disable_undefined_metrics-result.xml diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/startup/RegisterMetricsTest/disable_undefined_metrics.xml b/sonar-server/src/test/resources/org/sonar/server/startup/RegisterMetricsTest/disable_undefined_metrics.xml similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/startup/RegisterMetricsTest/disable_undefined_metrics.xml rename to sonar-server/src/test/resources/org/sonar/server/startup/RegisterMetricsTest/disable_undefined_metrics.xml diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/startup/RegisterMetricsTest/enable_disabled_metric-result.xml b/sonar-server/src/test/resources/org/sonar/server/startup/RegisterMetricsTest/enable_disabled_metric-result.xml similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/startup/RegisterMetricsTest/enable_disabled_metric-result.xml rename to sonar-server/src/test/resources/org/sonar/server/startup/RegisterMetricsTest/enable_disabled_metric-result.xml diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/startup/RegisterMetricsTest/enable_disabled_metric.xml b/sonar-server/src/test/resources/org/sonar/server/startup/RegisterMetricsTest/enable_disabled_metric.xml similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/startup/RegisterMetricsTest/enable_disabled_metric.xml rename to sonar-server/src/test/resources/org/sonar/server/startup/RegisterMetricsTest/enable_disabled_metric.xml diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/startup/RegisterMetricsTest/insert_new_metrics-result.xml b/sonar-server/src/test/resources/org/sonar/server/startup/RegisterMetricsTest/insert_new_metrics-result.xml similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/startup/RegisterMetricsTest/insert_new_metrics-result.xml rename to sonar-server/src/test/resources/org/sonar/server/startup/RegisterMetricsTest/insert_new_metrics-result.xml diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/startup/RegisterMetricsTest/insert_new_metrics.xml b/sonar-server/src/test/resources/org/sonar/server/startup/RegisterMetricsTest/insert_new_metrics.xml similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/startup/RegisterMetricsTest/insert_new_metrics.xml rename to sonar-server/src/test/resources/org/sonar/server/startup/RegisterMetricsTest/insert_new_metrics.xml diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/startup/RegisterMetricsTest/update_non_custom_metrics-result.xml b/sonar-server/src/test/resources/org/sonar/server/startup/RegisterMetricsTest/update_non_custom_metrics-result.xml similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/startup/RegisterMetricsTest/update_non_custom_metrics-result.xml rename to sonar-server/src/test/resources/org/sonar/server/startup/RegisterMetricsTest/update_non_custom_metrics-result.xml diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/startup/RegisterMetricsTest/update_non_custom_metrics.xml b/sonar-server/src/test/resources/org/sonar/server/startup/RegisterMetricsTest/update_non_custom_metrics.xml similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/startup/RegisterMetricsTest/update_non_custom_metrics.xml rename to sonar-server/src/test/resources/org/sonar/server/startup/RegisterMetricsTest/update_non_custom_metrics.xml diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/test/index/TestIndexerTest/P1_F1_T1.json b/sonar-server/src/test/resources/org/sonar/server/test/index/TestIndexerTest/P1_F1_T1.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/test/index/TestIndexerTest/P1_F1_T1.json rename to sonar-server/src/test/resources/org/sonar/server/test/index/TestIndexerTest/P1_F1_T1.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/test/index/TestIndexerTest/P1_F1_T2.json b/sonar-server/src/test/resources/org/sonar/server/test/index/TestIndexerTest/P1_F1_T2.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/test/index/TestIndexerTest/P1_F1_T2.json rename to sonar-server/src/test/resources/org/sonar/server/test/index/TestIndexerTest/P1_F1_T2.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/test/index/TestIndexerTest/P1_F2_T1.json b/sonar-server/src/test/resources/org/sonar/server/test/index/TestIndexerTest/P1_F2_T1.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/test/index/TestIndexerTest/P1_F2_T1.json rename to sonar-server/src/test/resources/org/sonar/server/test/index/TestIndexerTest/P1_F2_T1.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/test/index/TestIndexerTest/P2_F3_T1.json b/sonar-server/src/test/resources/org/sonar/server/test/index/TestIndexerTest/P2_F3_T1.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/test/index/TestIndexerTest/P2_F3_T1.json rename to sonar-server/src/test/resources/org/sonar/server/test/index/TestIndexerTest/P2_F3_T1.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/test/index/TestIndexerTest/db.xml b/sonar-server/src/test/resources/org/sonar/server/test/index/TestIndexerTest/db.xml similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/test/index/TestIndexerTest/db.xml rename to sonar-server/src/test/resources/org/sonar/server/test/index/TestIndexerTest/db.xml diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/test/index/TestResultSetIteratorTest/filter_by_project.xml b/sonar-server/src/test/resources/org/sonar/server/test/index/TestResultSetIteratorTest/filter_by_project.xml similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/test/index/TestResultSetIteratorTest/filter_by_project.xml rename to sonar-server/src/test/resources/org/sonar/server/test/index/TestResultSetIteratorTest/filter_by_project.xml diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/test/index/TestResultSetIteratorTest/filter_by_project_and_date.xml b/sonar-server/src/test/resources/org/sonar/server/test/index/TestResultSetIteratorTest/filter_by_project_and_date.xml similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/test/index/TestResultSetIteratorTest/filter_by_project_and_date.xml rename to sonar-server/src/test/resources/org/sonar/server/test/index/TestResultSetIteratorTest/filter_by_project_and_date.xml diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/test/index/TestResultSetIteratorTest/schema.sql b/sonar-server/src/test/resources/org/sonar/server/test/index/TestResultSetIteratorTest/schema.sql similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/test/index/TestResultSetIteratorTest/schema.sql rename to sonar-server/src/test/resources/org/sonar/server/test/index/TestResultSetIteratorTest/schema.sql diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/test/index/TestResultSetIteratorTest/shared.xml b/sonar-server/src/test/resources/org/sonar/server/test/index/TestResultSetIteratorTest/shared.xml similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/test/index/TestResultSetIteratorTest/shared.xml rename to sonar-server/src/test/resources/org/sonar/server/test/index/TestResultSetIteratorTest/shared.xml diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/test/ws/CoveredFilesActionTest/tests-covered-files.json b/sonar-server/src/test/resources/org/sonar/server/test/ws/CoveredFilesActionTest/tests-covered-files.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/test/ws/CoveredFilesActionTest/tests-covered-files.json rename to sonar-server/src/test/resources/org/sonar/server/test/ws/CoveredFilesActionTest/tests-covered-files.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/test/ws/ListActionTest/list-main-file.json b/sonar-server/src/test/resources/org/sonar/server/test/ws/ListActionTest/list-main-file.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/test/ws/ListActionTest/list-main-file.json rename to sonar-server/src/test/resources/org/sonar/server/test/ws/ListActionTest/list-main-file.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/test/ws/ListActionTest/list-test-uuid.json b/sonar-server/src/test/resources/org/sonar/server/test/ws/ListActionTest/list-test-uuid.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/test/ws/ListActionTest/list-test-uuid.json rename to sonar-server/src/test/resources/org/sonar/server/test/ws/ListActionTest/list-test-uuid.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_bread_crumbs_on_several_levels.json b/sonar-server/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_bread_crumbs_on_several_levels.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_bread_crumbs_on_several_levels.json rename to sonar-server/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_bread_crumbs_on_several_levels.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_breadcrumbs_on_module.json b/sonar-server/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_breadcrumbs_on_module.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_breadcrumbs_on_module.json rename to sonar-server/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_breadcrumbs_on_module.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_component_info_when_anonymous_no_snapshot.json b/sonar-server/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_component_info_when_anonymous_no_snapshot.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_component_info_when_anonymous_no_snapshot.json rename to sonar-server/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_component_info_when_anonymous_no_snapshot.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_component_info_when_snapshot.json b/sonar-server/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_component_info_when_snapshot.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_component_info_when_snapshot.json rename to sonar-server/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_component_info_when_snapshot.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_component_info_with_favourite.json b/sonar-server/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_component_info_with_favourite.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_component_info_with_favourite.json rename to sonar-server/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_component_info_with_favourite.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_configuration_for_admin.json b/sonar-server/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_configuration_for_admin.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_configuration_for_admin.json rename to sonar-server/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_configuration_for_admin.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_configuration_for_quality_gate_admin.json b/sonar-server/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_configuration_for_quality_gate_admin.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_configuration_for_quality_gate_admin.json rename to sonar-server/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_configuration_for_quality_gate_admin.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_configuration_for_quality_profile_admin.json b/sonar-server/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_configuration_for_quality_profile_admin.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_configuration_for_quality_profile_admin.json rename to sonar-server/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_configuration_for_quality_profile_admin.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_configuration_with_all_properties.json b/sonar-server/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_configuration_with_all_properties.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_configuration_with_all_properties.json rename to sonar-server/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_configuration_with_all_properties.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_default_quality_gate.json b/sonar-server/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_default_quality_gate.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_default_quality_gate.json rename to sonar-server/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_default_quality_gate.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_empty_quality_profiles_when_no_measure.json b/sonar-server/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_empty_quality_profiles_when_no_measure.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_empty_quality_profiles_when_no_measure.json rename to sonar-server/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_empty_quality_profiles_when_no_measure.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_extensions.json b/sonar-server/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_extensions.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_extensions.json rename to sonar-server/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_extensions.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_extensions_for_admin.json b/sonar-server/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_extensions_for_admin.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_extensions_for_admin.json rename to sonar-server/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_extensions_for_admin.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_quality_gate.json b/sonar-server/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_quality_gate.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_quality_gate.json rename to sonar-server/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_quality_gate.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_quality_profiles.json b/sonar-server/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_quality_profiles.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_quality_profiles.json rename to sonar-server/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_quality_profiles.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/GlobalActionTest/deprecated_logo_settings.json b/sonar-server/src/test/resources/org/sonar/server/ui/ws/GlobalActionTest/deprecated_logo_settings.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/GlobalActionTest/deprecated_logo_settings.json rename to sonar-server/src/test/resources/org/sonar/server/ui/ws/GlobalActionTest/deprecated_logo_settings.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/GlobalActionTest/empty.json b/sonar-server/src/test/resources/org/sonar/server/ui/ws/GlobalActionTest/empty.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/GlobalActionTest/empty.json rename to sonar-server/src/test/resources/org/sonar/server/ui/ws/GlobalActionTest/empty.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/GlobalActionTest/global_pages.json b/sonar-server/src/test/resources/org/sonar/server/ui/ws/GlobalActionTest/global_pages.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/GlobalActionTest/global_pages.json rename to sonar-server/src/test/resources/org/sonar/server/ui/ws/GlobalActionTest/global_pages.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/GlobalActionTest/organization_support.json b/sonar-server/src/test/resources/org/sonar/server/ui/ws/GlobalActionTest/organization_support.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/GlobalActionTest/organization_support.json rename to sonar-server/src/test/resources/org/sonar/server/ui/ws/GlobalActionTest/organization_support.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/GlobalActionTest/production_database.json b/sonar-server/src/test/resources/org/sonar/server/ui/ws/GlobalActionTest/production_database.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/GlobalActionTest/production_database.json rename to sonar-server/src/test/resources/org/sonar/server/ui/ws/GlobalActionTest/production_database.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/GlobalActionTest/qualifiers.json b/sonar-server/src/test/resources/org/sonar/server/ui/ws/GlobalActionTest/qualifiers.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/GlobalActionTest/qualifiers.json rename to sonar-server/src/test/resources/org/sonar/server/ui/ws/GlobalActionTest/qualifiers.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/GlobalActionTest/settings.json b/sonar-server/src/test/resources/org/sonar/server/ui/ws/GlobalActionTest/settings.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/GlobalActionTest/settings.json rename to sonar-server/src/test/resources/org/sonar/server/ui/ws/GlobalActionTest/settings.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/GlobalActionTest/version.json b/sonar-server/src/test/resources/org/sonar/server/ui/ws/GlobalActionTest/version.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/GlobalActionTest/version.json rename to sonar-server/src/test/resources/org/sonar/server/ui/ws/GlobalActionTest/version.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/SettingsActionTest/empty.json b/sonar-server/src/test/resources/org/sonar/server/ui/ws/SettingsActionTest/empty.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/SettingsActionTest/empty.json rename to sonar-server/src/test/resources/org/sonar/server/ui/ws/SettingsActionTest/empty.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/SettingsActionTest/with_pages.json b/sonar-server/src/test/resources/org/sonar/server/ui/ws/SettingsActionTest/with_pages.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/SettingsActionTest/with_pages.json rename to sonar-server/src/test/resources/org/sonar/server/ui/ws/SettingsActionTest/with_pages.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/SettingsActionTest/with_update_center.json b/sonar-server/src/test/resources/org/sonar/server/ui/ws/SettingsActionTest/with_update_center.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/SettingsActionTest/with_update_center.json rename to sonar-server/src/test/resources/org/sonar/server/ui/ws/SettingsActionTest/with_update_center.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/updatecenter/ws/UploadActionTest/anotherPlugin.jar b/sonar-server/src/test/resources/org/sonar/server/updatecenter/ws/UploadActionTest/anotherPlugin.jar similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/updatecenter/ws/UploadActionTest/anotherPlugin.jar rename to sonar-server/src/test/resources/org/sonar/server/updatecenter/ws/UploadActionTest/anotherPlugin.jar diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/updatecenter/ws/UploadActionTest/plugin.jar b/sonar-server/src/test/resources/org/sonar/server/updatecenter/ws/UploadActionTest/plugin.jar similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/updatecenter/ws/UploadActionTest/plugin.jar rename to sonar-server/src/test/resources/org/sonar/server/updatecenter/ws/UploadActionTest/plugin.jar diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/user/DeprecatedUserFinderTest/fixture.xml b/sonar-server/src/test/resources/org/sonar/server/user/DeprecatedUserFinderTest/fixture.xml similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/user/DeprecatedUserFinderTest/fixture.xml rename to sonar-server/src/test/resources/org/sonar/server/user/DeprecatedUserFinderTest/fixture.xml diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/user/ws/CreateActionTest/create_user.json b/sonar-server/src/test/resources/org/sonar/server/user/ws/CreateActionTest/create_user.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/user/ws/CreateActionTest/create_user.json rename to sonar-server/src/test/resources/org/sonar/server/user/ws/CreateActionTest/create_user.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/user/ws/CreateActionTest/reactivate_user.json b/sonar-server/src/test/resources/org/sonar/server/user/ws/CreateActionTest/reactivate_user.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/user/ws/CreateActionTest/reactivate_user.json rename to sonar-server/src/test/resources/org/sonar/server/user/ws/CreateActionTest/reactivate_user.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/user/ws/SearchActionTest/five_users.json b/sonar-server/src/test/resources/org/sonar/server/user/ws/SearchActionTest/five_users.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/user/ws/SearchActionTest/five_users.json rename to sonar-server/src/test/resources/org/sonar/server/user/ws/SearchActionTest/five_users.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/user/ws/SearchActionTest/page_one.json b/sonar-server/src/test/resources/org/sonar/server/user/ws/SearchActionTest/page_one.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/user/ws/SearchActionTest/page_one.json rename to sonar-server/src/test/resources/org/sonar/server/user/ws/SearchActionTest/page_one.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/user/ws/SearchActionTest/page_two.json b/sonar-server/src/test/resources/org/sonar/server/user/ws/SearchActionTest/page_two.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/user/ws/SearchActionTest/page_two.json rename to sonar-server/src/test/resources/org/sonar/server/user/ws/SearchActionTest/page_two.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/user/ws/SearchActionTest/user_one.json b/sonar-server/src/test/resources/org/sonar/server/user/ws/SearchActionTest/user_one.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/user/ws/SearchActionTest/user_one.json rename to sonar-server/src/test/resources/org/sonar/server/user/ws/SearchActionTest/user_one.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/user/ws/SearchActionTest/user_with_groups.json b/sonar-server/src/test/resources/org/sonar/server/user/ws/SearchActionTest/user_with_groups.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/user/ws/SearchActionTest/user_with_groups.json rename to sonar-server/src/test/resources/org/sonar/server/user/ws/SearchActionTest/user_with_groups.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/user/ws/UpdateActionTest/blank_email_is_updated_to_null.json b/sonar-server/src/test/resources/org/sonar/server/user/ws/UpdateActionTest/blank_email_is_updated_to_null.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/user/ws/UpdateActionTest/blank_email_is_updated_to_null.json rename to sonar-server/src/test/resources/org/sonar/server/user/ws/UpdateActionTest/blank_email_is_updated_to_null.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/user/ws/UpdateActionTest/update_email.json b/sonar-server/src/test/resources/org/sonar/server/user/ws/UpdateActionTest/update_email.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/user/ws/UpdateActionTest/update_email.json rename to sonar-server/src/test/resources/org/sonar/server/user/ws/UpdateActionTest/update_email.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/user/ws/UpdateActionTest/update_name.json b/sonar-server/src/test/resources/org/sonar/server/user/ws/UpdateActionTest/update_name.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/user/ws/UpdateActionTest/update_name.json rename to sonar-server/src/test/resources/org/sonar/server/user/ws/UpdateActionTest/update_name.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/user/ws/UpdateActionTest/update_scm_accounts.json b/sonar-server/src/test/resources/org/sonar/server/user/ws/UpdateActionTest/update_scm_accounts.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/user/ws/UpdateActionTest/update_scm_accounts.json rename to sonar-server/src/test/resources/org/sonar/server/user/ws/UpdateActionTest/update_scm_accounts.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/user/ws/UpdateActionTest/update_user.json b/sonar-server/src/test/resources/org/sonar/server/user/ws/UpdateActionTest/update_user.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/user/ws/UpdateActionTest/update_user.json rename to sonar-server/src/test/resources/org/sonar/server/user/ws/UpdateActionTest/update_user.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/view/index/ViewIndexerTest/index.xml b/sonar-server/src/test/resources/org/sonar/server/view/index/ViewIndexerTest/index.xml similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/view/index/ViewIndexerTest/index.xml rename to sonar-server/src/test/resources/org/sonar/server/view/index/ViewIndexerTest/index.xml diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/ws/ws/WebServicesWsTest/list_including_internals.json b/sonar-server/src/test/resources/org/sonar/server/ws/ws/WebServicesWsTest/list_including_internals.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/ws/ws/WebServicesWsTest/list_including_internals.json rename to sonar-server/src/test/resources/org/sonar/server/ws/ws/WebServicesWsTest/list_including_internals.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/ws/ws/WebServicesWsTest/metrics_example.json b/sonar-server/src/test/resources/org/sonar/server/ws/ws/WebServicesWsTest/metrics_example.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/ws/ws/WebServicesWsTest/metrics_example.json rename to sonar-server/src/test/resources/org/sonar/server/ws/ws/WebServicesWsTest/metrics_example.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/ws/ws/WebServicesWsTest/response_example.json b/sonar-server/src/test/resources/org/sonar/server/ws/ws/WebServicesWsTest/response_example.json similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/ws/ws/WebServicesWsTest/response_example.json rename to sonar-server/src/test/resources/org/sonar/server/ws/ws/WebServicesWsTest/response_example.json diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/ws/ws/web-service-engine-test.txt b/sonar-server/src/test/resources/org/sonar/server/ws/ws/web-service-engine-test.txt similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/ws/ws/web-service-engine-test.txt rename to sonar-server/src/test/resources/org/sonar/server/ws/ws/web-service-engine-test.txt diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/ws/ws/web-services-ws-test.txt b/sonar-server/src/test/resources/org/sonar/server/ws/ws/web-services-ws-test.txt similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/org/sonar/server/ws/ws/web-services-ws-test.txt rename to sonar-server/src/test/resources/org/sonar/server/ws/ws/web-services-ws-test.txt diff --git a/sonarqube-6.5/server/sonar-server/src/test/resources/static/foo.txt b/sonar-server/src/test/resources/static/foo.txt similarity index 100% rename from sonarqube-6.5/server/sonar-server/src/test/resources/static/foo.txt rename to sonar-server/src/test/resources/static/foo.txt diff --git a/sonarqube-6.5/.gitignore b/sonarqube-6.5/.gitignore deleted file mode 100644 index cd0a13b31..000000000 --- a/sonarqube-6.5/.gitignore +++ /dev/null @@ -1,43 +0,0 @@ -# The following should be moved in related sub-directories -server/sonar-web/src/main/webapp/stylesheets/sonar-colorizer.css -server/sonar-web/src/main/webapp/deploy/plugins -server/sonar-web/src/main/webapp/deploy/bootstrap -server/sonar-web/src/main/webapp/deploy/maven/org -server/sonar-web/src/main/webapp/WEB-INF/log/ -server/sonar-web/src/main/webapp/deploy/*.jar -server/sonar-web/src/main/webapp/deploy/jdbc-driver.txt - - -# ---- Javadoc -docs.tar - -# ---- Maven -target/ -dependency-reduced-pom.xml - -# ---- IntelliJ IDEA -*.iws -*.iml -*.ipr -.idea/ - -# ---- Eclipse -.classpath -.project -.settings -.externalToolBuilders - -# ---- Mac OS X -.DS_Store -Icon? -# Thumbnails -._* -# Files that might appear on external disk -.Spotlight-V100 -.Trashes - -# ---- Windows -# Windows image file caches -Thumbs.db -# Folder config file -Desktop.ini diff --git a/sonarqube-6.5/README.md b/sonarqube-6.5/README.md deleted file mode 100644 index 6f3d46ff5..000000000 --- a/sonarqube-6.5/README.md +++ /dev/null @@ -1,17 +0,0 @@ -### License - -Copyright 2008-2017 SonarSource. - -Licensed under the [GNU Lesser General Public License, Version 3.0](http://www.gnu.org/licenses/lgpl.txt) - -### Build status - -[![Build Status](https://travis-ci.org/SonarSource/sonarqube.svg?branch=master)](https://travis-ci.org/SonarSource/sonarqube) - -### Links - -Project website: http://www.sonarqube.org/ - -Documentation: http://docs.sonarqube.org/display/SONAR - -Issue tracking: http://jira.sonarsource.com/browse/SONAR diff --git a/sonarqube-6.5/pom.xml b/sonarqube-6.5/pom.xml deleted file mode 100644 index d2d9958e7..000000000 --- a/sonarqube-6.5/pom.xml +++ /dev/null @@ -1,1402 +0,0 @@ - - - 4.0.0 - - org.sonarsource.parent - parent - 40 - - org.sonarsource.sonarqube - sonarqube - pom - 6.5 - SonarQube - http://www.sonarqube.org/ - Open source platform for continuous inspection of code quality - - - sonar-plugin-api-deps - sonar-application - sonar-scanner-engine - sonar-scanner-protocol - sonar-scanner-engine-shaded - sonar-check-api - sonar-core - sonar-duplications - sonar-home - sonar-markdown - sonar-plugin-api - server - sonar-ws - sonar-testing-harness - plugins/sonar-xoo-plugin - - - - SonarSource - http://www.sonarsource.com - - 2009 - - - jira - http://jira.sonarsource.com/browse/SONAR - - - - - - 5.10.1.1411 - - - 4.12.0.11033 - - - 3.1.1.5128 - - - 2.10.0.2087 - - - 1.8.0.1496 - - - 2.3 - - - 1.4.3.1027 - 1.2 - 1.5.0.715 - 1.18.0.487 - 1.3.176 - 8.1.12.v20130726 - 1.1.7 - 1.7.21 - 8.5.16 - 2.4.4 - 3.15.0.1090 - 3.7.0 - 2.6.6 - - 3.0.0-beta-2 - - 3.8 - - UTF-8 - 3.2 - ${maven.build.timestamp} - yyyy-MM-dd'T'HH:mm:ssZ - SonarQube - - false - - -Xmx512m -Djava.awt.headless=true - true - - - sonarqube - - ${project.groupId}:sonar-application:zip - - - - 3.2 - - - - - - kr.motd.maven - os-maven-plugin - 1.4.1.Final - - - - - - - - com.github.eirslett - frontend-maven-plugin - 1.4 - - - org.apache.maven.plugins - maven-assembly-plugin - 2.4 - - - - - 420 - - 493 - 493 - - - - - org.codehaus.mojo - build-helper-maven-plugin - 1.12 - - - org.apache.maven.plugins - maven-clean-plugin - 3.0.0 - - - org.apache.maven.plugins - maven-dependency-plugin - 2.10 - - - org.apache.maven.plugins - maven-enforcer-plugin - 1.4.1 - - - org.apache.maven.plugins - maven-gpg-plugin - 1.6 - - - org.jacoco - jacoco-maven-plugin - 0.7.9 - - - *_javassist_* - - - org.sonar.* - org.sonarqube.* - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.10.4 - - false - true - - - - org.apache.maven.plugins - maven-jar-plugin - 3.0.2 - - - org.apache.maven.plugins - maven-jxr-plugin - 2.5 - - - org.apache.maven.plugins - maven-resources-plugin - 3.0.1 - - - org.apache.maven.plugins - maven-shade-plugin - 3.0.0 - - - org.apache.maven.plugins - maven-source-plugin - 3.0.1 - - - org.apache.maven.plugins - maven-surefire-plugin - 2.20 - - - org.apache.maven.plugins - maven-war-plugin - 2.6 - - - - org.codehaus.sonar - sonar-dev-maven-plugin - 1.8 - - - org.sonarsource.sonar-packaging-maven-plugin - sonar-packaging-maven-plugin - 1.18.0.372 - - - org.owasp - dependency-check-maven - 1.2.11 - - 8 - cve-false-positives.xml - - - - - org.basepom.maven - duplicate-finder-maven-plugin - 1.1.1 - - true - - true - true - false - - - - org.xolstice.maven.plugins - protobuf-maven-plugin - 0.5.0 - - - com.github.genthaler - beanshell-maven-plugin - 1.2 - - - - - - - org.apache.maven.plugins - maven-enforcer-plugin - - - enforce-rules - - enforce - - - - - Build reproducibility : always define plugin versions - true - true - clean,deploy - - - No SNAPSHOT versions allowed for dependencies - true - - - To build this project JDK ${jdk.min.version} (or upper) is required. Please install it. - - ${jdk.min.version} - - - [${maven.min.version},) - - - - commons-beanutils:commons-beanutils should be used instead - - commons-beanutils:commons-beanutils-core - - true - - - Definition of new repositories is not allowed in order to deploy to central repository. - - - - - - - - - - com.github.genthaler - beanshell-maven-plugin - - - randomize-environment - validate - - run - - - - - - - - - org.apache.maven.plugins - maven-jxr-plugin - - true - true - ${project.reporting.outputDirectory}/${project.version}/apidocs - - - - org.apache.maven.plugins - maven-surefire-plugin - - random - - - ${project.build.directory} - - ${testTimezone} - - 1 - - - - - - - - - - org.codehaus.sonar - sonar-channel - 4.1 - - - org.slf4j - slf4j-api - - - - - org.codehaus.sonar - sonar-classloader - 1.0 - - - ${project.groupId} - sonar-markdown - ${project.version} - - - ${project.groupId} - sonar-core - ${project.version} - - - ${project.groupId} - sonar-db-dao - ${project.version} - - - ${project.groupId} - sonar-db-migration - ${project.version} - - - ${project.groupId} - sonar-db-testing - ${project.version} - pom - - - ${project.groupId} - sonar-scanner-protocol - ${project.version} - - - ${project.groupId} - sonar-ws - ${project.version} - - - ${project.groupId} - sonar-home - ${project.version} - - - ${project.groupId} - sonar-plugin-api - ${project.version} - - - org.sonarsource.update-center - sonar-update-center-common - ${sonarUpdateCenter.version} - - - org.sonarsource.sonarqube - sonar-ce-api - ${project.version} - - - ${project.groupId} - sonar-server - ${project.version} - - - org.codehaus.sonar - sonar-squid - 4.1 - - - - org.codehaus.sonar - sonar-check-api - - - - - org.sonarsource.sonarqube - sonar-xoo-plugin - ${project.version} - test - - - org.sonarsource.scm.git - sonar-scm-git-plugin - ${sonarGit.version} - sonar-plugin - - - - org.eclipse.jgit - org.eclipse.jgit - - - - - org.sonarsource.scm.svn - sonar-scm-svn-plugin - ${sonarSvn.version} - sonar-plugin - - - - org.tmatesoft.svnkit - svnkit - - - - - org.sonarsource.sonarqube - sonar-db-core - ${project.version} - - - org.sonarsource.sonarqube - sonar-db-testing - ${project.version} - - - org.sonarsource.sonarqube - sonar-testing-harness - ${project.version} - - - org.sonarsource.sonarqube - sonar-plugin-bridge - ${project.version} - - - org.sonarsource.java - sonar-java-plugin - ${sonarJava.version} - sonar-plugin - - - - classworlds - classworlds - - - org.mockito - mockito-all - - - org.sonarsource.java - java-surefire - - - org.sonarsource.java - java-jacoco - - - org.sonarsource.java - java-frontend - - - org.sonarsource.java - java-checks - - - - - org.sonarsource.javascript - sonar-javascript-plugin - ${sonarJavaScript.version} - sonar-plugin - - - - org.sonarsource.javascript - javascript-frontend - - - org.sonarsource.javascript - javascript-checks - - - - - org.sonarsource.dotnet - sonar-csharp-plugin - ${sonarCSharp.version} - sonar-plugin - - - org.sonarsource.dotnet - sonar-dotnet-tests-library - - - org.sonarsource.dotnet - sonar-dotnet-shared-library - - - org.sonarsource.sslr-squid-bridge - sslr-squid-bridge - - - - - org.sonarsource.php - sonar-php-plugin - ${sonarPhp.version} - sonar-plugin - - - - org.sonarsource.php - php-frontend - - - org.sonarsource.php - php-checks - - - com.thoughtworks.xstream - xstream - - - - - org.sonarsource.python - sonar-python-plugin - ${sonarPython.version} - sonar-plugin - - - - org.sonarsource.python - python-squid - - - org.sonarsource.python - python-checks - - - org.codehaus.woodstox - woodstox-core-lgpl - - - org.codehaus.staxmate - staxmate - - - - - org.sonarsource.flex - sonar-flex-plugin - ${sonarFlex.version} - sonar-plugin - - - - org.sonarsource.flex - flex-squid - - - org.sonarsource.flex - flex-checks - - - - - org.sonarsource.xml - sonar-xml-plugin - ${sonarXml.version} - sonar-plugin - - - - org.sonarsource.xml - xml-squid - - - - - net.java.dev.jna - jna - 4.1.0 - - - com.hazelcast - hazelcast - ${hazelcast.version} - - - com.hazelcast - hazelcast-client - ${hazelcast.version} - - - org.elasticsearch - elasticsearch - ${elasticsearch.version} - - - com.github.tlrx - elasticsearch-test - 1.2.1 - - - com.google.guava - guava - 18.0 - - - com.google.code.findbugs - jsr305 - 3.0.2 - - - commons-dbutils - commons-dbutils - 1.5 - - - commons-io - commons-io - 2.4 - - - org.apache.commons - commons-csv - 1.4 - - - commons-codec - commons-codec - 1.8 - - - org.apache.commons - commons-email - 1.3.2 - - - commons-lang - commons-lang - 2.6 - - - commons-dbcp - commons-dbcp - 1.4 - - - - commons-beanutils - commons-beanutils - 1.8.3 - - - commons-logging - commons-logging - - - - - com.ibm.icu - icu4j - - 3.4.4 - - - com.googlecode.json-simple - json-simple - 1.1.1 - - - junit - junit - - - - - io.jsonwebtoken - jjwt - 0.6.0 - - - com.fasterxml.jackson.core - jackson-core - ${jackson.version} - - - com.fasterxml.jackson.core - jackson-databind - ${jackson.version} - - - com.fasterxml.jackson.core - jackson-annotations - ${jackson.version} - - - org.mybatis - mybatis - 3.4.4 - - - org.nanohttpd - nanohttpd - 2.3.0 - - - org.picocontainer - picocontainer - 2.15 - - - org.slf4j - slf4j-api - ${slf4j.version} - - - org.slf4j - jul-to-slf4j - ${slf4j.version} - - - org.slf4j - jcl-over-slf4j - ${slf4j.version} - - - org.slf4j - log4j-over-slf4j - ${slf4j.version} - - - ch.qos.logback - logback-access - ${logback.version} - - - ch.qos.logback - logback-classic - ${logback.version} - - - ch.qos.logback - logback-core - ${logback.version} - - - com.h2database - h2 - ${h2.version} - - - com.microsoft.sqlserver - mssql-jdbc - 6.1.0.jre8 - - - mysql - mysql-connector-java - 5.1.42 - - - com.oracle - ojdbc6 - - - 11.2.0.3.0 - - - org.postgresql - postgresql - 42.1.1 - - - org.codehaus.woodstox - woodstox-core-lgpl - 4.4.0 - - - - javax.xml.stream - stax-api - - - - - org.codehaus.staxmate - staxmate - 2.0.1 - - - - org.codehaus.woodstox - stax2-api - - - stax - stax-api - - - org.codehaus.woodstox - woodstox-core-asl - - - - - org.mockito - mockito-core - 1.10.19 - - - org.hamcrest - hamcrest-core - - - - - org.assertj - assertj-core - 3.4.1 - - - org.assertj - assertj-guava - 3.0.0 - - - org.codehaus.woodstox - stax2-api - 3.1.4 - - - stax - stax-api - - - - - javax.servlet - javax.servlet-api - 3.0.1 - - - org.eclipse.jetty - jetty-server - ${jetty.version} - - - org.hamcrest - hamcrest-all - 1.3 - - - junit - junit - 4.12 - - - com.tngtech.java - junit-dataprovider - 1.9.2 - - - org.dbunit - dbunit - 2.4.5 - - - - commons-lang - commons-lang - - - xerces - xmlParserAPIs - - - xerces - xercesImpl - - - - - org.eclipse.jetty - test-jetty-servlet - ${jetty.version} - - - org.reflections - reflections - 0.9.9 - - - com.google.code.gson - gson - 2.3.1 - - - org.sonarsource - sonar-persistit - 3.3.2 - - - commons-logging - commons-logging - - - - - com.github.kevinsawicki - http-request - 5.4.1 - - - org.codehaus.sonar.runner - sonar-runner-api - 2.4 - - - org.freemarker - freemarker - 2.3.20 - - - com.google.protobuf - protobuf-java - ${protobuf.version} - - - net.jpountz.lz4 - lz4 - 1.3.0 - - - org.subethamail - subethasmtp - 3.1.7 - test - - - - - org.apache.tomcat.embed - tomcat-embed-core - ${tomcat.version} - - - org.apache.tomcat.embed - tomcat-embed-jasper - - - org.eclipse.jdt - ecj - - - - - com.squareup.okhttp3 - okhttp - ${okhttp.version} - - - com.squareup.okhttp3 - mockwebserver - ${okhttp.version} - - - - - xml-apis - xml-apis - 1.4.01 - provided - - - - - - - - SonarQube users mailing list - http://xircles.codehaus.org/projects/sonar/lists - http://xircles.codehaus.org/projects/sonar/lists - user@sonar.codehaus.org - http://www.nabble.com/Sonar-f30151.html - - - - - scm:git:git@github.com:SonarSource/sonarqube.git - scm:git:git@github.com:SonarSource/sonarqube.git - https://github.com/SonarSource/sonarqube - HEAD - - - - travis-ci - https://travis-ci.org/SonarSource/sonarqube - - - - - GNU LGPL 3 - http://www.gnu.org/licenses/lgpl.txt - repo - - - - - - - - bellingard - Fabrice Bellingard - fabrice.bellingard@sonarsource.com - SonarSource - +1 - - - dbolkensteyn - Dinesh Bolkensteyn - dinesh.bolkensteyn@sonarsource.com - SonarSource - +1 - - - dgageot - David Gageot - SonarSource - +1 - - - ehartmann - Eric Hartmann - SonarSource - +1 - - - fmallet - Freddy Mallet - freddy.mallet@sonarsource.com - SonarSource - +1 - - - Godin - Evgeny Mandrikov - evgeny.mandrikov@sonarsource.com - SonarSource - +3 - - - henryju - Julien Henry - julien.henry@sonarsource.com - SonarSource - +1 - - - jblievremont - Jean-Baptiste Lievremont - SonarSource - +1 - - - julienlancelot - Julien Lancelot - julien.lancelot@sonarsource.com - SonarSource - +1 - - - olivier.gaudin - Olivier Gaudin - olivier.gaudin@sonarsource.com - SonarSource - +1 - - - simonbrandhof - Simon Brandhof - simon.brandhof@sonarsource.com - SonarSource - +1 - - - sns-seb - Sebastien Lesaint - SonarSource - +1 - - - stas-vilchik - Stas Vilchik - SonarSource - +1 - - - teryk - Teryk Bellahsene - SonarSource - +1 - - - - - - dev - - true - true - - - - release - - - - org.apache.maven.plugins - maven-javadoc-plugin - - - attach-javadocs - - jar - - - - - - - - - - protobuf-compile - - - src/main/protobuf - - - - - - org.xolstice.maven.plugins - protobuf-maven-plugin - - - generate-protobuf-java-sources - - compile - - - com.google.protobuf:protoc:${protobuf.version}:exe:${os.detected.classifier} - - ${project.basedir}/src/main/protobuf - ${project.build.directory}/generated-sources/protobuf - - - - - - com.google.protobuf - protoc - ${protobuf.version} - exe - ${os.detected.classifier} - - - - - org.codehaus.mojo - build-helper-maven-plugin - - - add-protobuf-generated-sources - generate-sources - - add-source - - - - ${project.build.directory}/generated-sources/protobuf - - - - - - - - - - protobuf-test-compile - - - src/test/protobuf - - - - - - org.xolstice.maven.plugins - protobuf-maven-plugin - - - generate-protobuf-java-tests - - test-compile - - - com.google.protobuf:protoc:${protobuf.version}:exe:${os.detected.classifier} - - ${project.basedir}/src/test/protobuf - ${project.build.directory}/generated-test-sources/protobuf - - - - - - com.google.protobuf - protoc - ${protobuf.version} - ${os.detected.classifier} - exe - - - - - org.codehaus.mojo - build-helper-maven-plugin - - - add-protobuf-generated-tests - generate-test-sources - - add-test-source - - - - ${project.build.directory}/generated-test-sources/protobuf - - - - - - - - - - - - securityCheck - - - - org.owasp - dependency-check-maven - - - - check - - - - - - - - - - - tests - - tests - tests/plugins - - - - - diff --git a/sonarqube-6.5/server/pom.xml b/sonarqube-6.5/server/pom.xml deleted file mode 100644 index 5acadae01..000000000 --- a/sonarqube-6.5/server/pom.xml +++ /dev/null @@ -1,60 +0,0 @@ - - - 4.0.0 - - org.sonarsource.sonarqube - sonarqube - 6.5 - - server - pom - SonarQube :: Server :: Parent - - - sonar-process - sonar-process-monitor - sonar-search - sonar-db-core - sonar-db-migration - sonar-db-dao - sonar-db-testing - sonar-ce-api - sonar-server - sonar-ce - sonar-plugin-bridge - sonar-web - - - - - - - with-db-drivers - - - with-db-drivers - - - - - com.microsoft.sqlserver - mssql-jdbc - - - mysql - mysql-connector-java - - - org.postgresql - postgresql - - - com.oracle - ojdbc6 - - - - -