]> source.dussan.org Git - sonarqube.git/commit
Upgrade hamcrest and fix conflicts with JUnit and Mockito
authorSimon Brandhof <simon.brandhof@sonarsource.com>
Thu, 19 Jun 2014 22:43:47 +0000 (00:43 +0200)
committerSimon Brandhof <simon.brandhof@sonarsource.com>
Thu, 19 Jun 2014 22:45:34 +0000 (00:45 +0200)
commit2f779df51e9da5b07ad6f837fe1c98eab9fbf439
treed2be9202eb947ecb005c72368bbcb4f1b86e8e68
parent24ec2501f751dc2a122f1e5f905ee4151ec8b891
Upgrade hamcrest and fix conflicts with JUnit and Mockito
102 files changed:
plugins/sonar-core-plugin/pom.xml
plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/UnitTestDecoratorTest.java
plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/timemachine/TendencyDecoratorTest.java
plugins/sonar-cpd-plugin/pom.xml
plugins/sonar-cpd-plugin/src/test/java/org/sonar/plugins/cpd/decorators/SumDuplicationsDecoratorTest.java
plugins/sonar-dbcleaner-plugin/pom.xml
plugins/sonar-dbcleaner-plugin/src/test/java/org/sonar/plugins/dbcleaner/period/DeleteAllFilterTest.java
plugins/sonar-dbcleaner-plugin/src/test/java/org/sonar/plugins/dbcleaner/period/KeepOneFilterTest.java
plugins/sonar-design-plugin/src/test/java/org/sonar/plugins/design/DesignPluginTest.java
plugins/sonar-email-notifications-plugin/pom.xml
plugins/sonar-l10n-en-plugin/pom.xml
pom.xml
sonar-application/pom.xml
sonar-application/src/test/java/org/sonar/application/ConfigurationUtilsTest.java
sonar-application/src/test/java/org/sonar/application/EncryptionTest.java
sonar-application/src/test/java/org/sonar/application/LoggingTest.java
sonar-application/src/test/java/org/sonar/application/StartServerTest.java
sonar-application/src/test/java/org/sonar/application/WebappTest.java
sonar-batch/pom.xml
sonar-batch/src/test/java/org/sonar/batch/bootstrap/BatchExtensionDictionnaryTest.java
sonar-batch/src/test/java/org/sonar/batch/components/PastMeasuresLoaderTest.java
sonar-batch/src/test/java/org/sonar/batch/components/PastSnapshotFinderByDateTest.java
sonar-batch/src/test/java/org/sonar/batch/components/PastSnapshotFinderByDaysTest.java
sonar-batch/src/test/java/org/sonar/batch/components/PastSnapshotFinderByPreviousAnalysisTest.java
sonar-batch/src/test/java/org/sonar/batch/index/BucketTest.java
sonar-batch/src/test/java/org/sonar/batch/index/DefaultResourcePersisterTest.java
sonar-batch/src/test/java/org/sonar/batch/maven/DefaultMavenPluginExecutorTest.java
sonar-batch/src/test/java/org/sonar/batch/scan/filesystem/ModuleFileSystemInitializerTest.java
sonar-colorizer/pom.xml
sonar-core/pom.xml
sonar-core/src/main/java/org/sonar/jpa/dao/BaseDao.java [deleted file]
sonar-core/src/main/java/org/sonar/jpa/dao/MeasuresDao.java
sonar-core/src/test/java/org/sonar/core/dashboard/DashboardDaoTest.java
sonar-core/src/test/java/org/sonar/core/i18n/GwtI18nTest.java
sonar-core/src/test/java/org/sonar/core/i18n/RuleI18nManagerTest.java
sonar-core/src/test/java/org/sonar/core/purge/PurgeDaoTest.java
sonar-core/src/test/java/org/sonar/core/purge/PurgeableSnapshotDtoTest.java
sonar-core/src/test/java/org/sonar/core/resource/ResourceIndexerDaoTest.java
sonar-core/src/test/java/org/sonar/core/rule/CacheRuleFinderTest.java
sonar-core/src/test/java/org/sonar/jpa/session/DatabaseSessionTest.java
sonar-deprecated/pom.xml
sonar-deprecated/src/test/java/org/sonar/api/resources/MethodTest.java
sonar-deprecated/src/test/java/org/sonar/api/utils/CoberturaReportParserUtilsTest.java
sonar-duplications/pom.xml
sonar-duplications/src/test/java/org/sonar/duplications/block/BlockChunkerTestCase.java
sonar-duplications/src/test/java/org/sonar/duplications/detector/CloneGroupMatcher.java
sonar-duplications/src/test/java/org/sonar/duplications/detector/DetectorTestCase.java
sonar-duplications/src/test/java/org/sonar/duplications/detector/original/BlocksGroupTest.java
sonar-duplications/src/test/java/org/sonar/duplications/detector/suffixtree/SuffixTreeTest.java
sonar-duplications/src/test/java/org/sonar/duplications/internal/pmd/TokenizerBridgeTest.java
sonar-duplications/src/test/java/org/sonar/duplications/java/JavaDuplicationsFunctionalTest.java
sonar-duplications/src/test/java/org/sonar/duplications/java/JavaTokenProducerTest.java
sonar-duplications/src/test/java/org/sonar/duplications/statement/StatementChannelTest.java
sonar-home/pom.xml
sonar-java-api/src/test/java/org/sonar/java/api/JavaClassTest.java
sonar-java-api/src/test/java/org/sonar/java/api/JavaMethodTest.java
sonar-java-api/src/test/java/org/sonar/java/api/JavaUtilsTest.java
sonar-markdown/pom.xml
sonar-maven-plugin/pom.xml
sonar-plugin-api/pom.xml
sonar-plugin-api/src/test/java/org/sonar/api/batch/bootstrap/ProjectDefinitionTest.java
sonar-plugin-api/src/test/java/org/sonar/api/batch/maven/MavenUtilsTest.java
sonar-plugin-api/src/test/java/org/sonar/api/config/AesCipherTest.java
sonar-plugin-api/src/test/java/org/sonar/api/config/EncryptionTest.java
sonar-plugin-api/src/test/java/org/sonar/api/measures/CountDistributionBuilderTest.java
sonar-plugin-api/src/test/java/org/sonar/api/measures/MeanAggregationFormulaTest.java
sonar-plugin-api/src/test/java/org/sonar/api/measures/MeasureUtilsTest.java
sonar-plugin-api/src/test/java/org/sonar/api/measures/PersistenceModeTest.java
sonar-plugin-api/src/test/java/org/sonar/api/measures/PropertiesBuilderTest.java
sonar-plugin-api/src/test/java/org/sonar/api/measures/SumChildDistributionFormulaTest.java
sonar-plugin-api/src/test/java/org/sonar/api/resources/DirectoryTest.java
sonar-plugin-api/src/test/java/org/sonar/api/resources/FileTest.java
sonar-plugin-api/src/test/java/org/sonar/api/resources/ResourceTypeTreeTest.java
sonar-plugin-api/src/test/java/org/sonar/api/utils/DateUtilsTest.java
sonar-plugin-api/src/test/java/org/sonar/api/utils/DeprecatedKeyValueFormatTest.java
sonar-plugin-api/src/test/java/org/sonar/api/utils/KeyValueFormatTest.java
sonar-plugin-api/src/test/java/org/sonar/api/utils/LocalizedMessagesTest.java
sonar-plugin-api/src/test/java/org/sonar/api/utils/ParsingUtilsTest.java
sonar-plugin-api/src/test/java/org/sonar/api/utils/WildcardPatternTest.java
sonar-plugin-api/src/test/java/org/sonar/api/web/AbstractRubyTemplateTest.java
sonar-server/pom.xml
sonar-server/src/test/java/org/sonar/server/platform/ClassLoaderUtilsTest.java
sonar-server/src/test/java/org/sonar/server/platform/RailsAppsDeployerTest.java
sonar-server/src/test/java/org/sonar/server/platform/ServerIdGeneratorTest.java
sonar-server/src/test/java/org/sonar/server/ui/ViewProxyTest.java
sonar-testing-harness/pom.xml
sonar-testing-harness/src/test/java/org/sonar/test/i18n/BundleSynchronizedMatcherTest.java
sonar-ws-client/pom.xml
sonar-ws-client/src/test/java/org/sonar/wsclient/SonarTest.java
sonar-ws-client/src/test/java/org/sonar/wsclient/services/ResourceTest.java
sonar-ws-client/src/test/java/org/sonar/wsclient/unmarshallers/DependencyUnmarshallerTest.java
sonar-ws-client/src/test/java/org/sonar/wsclient/unmarshallers/JsonUtilsTest.java
sonar-ws-client/src/test/java/org/sonar/wsclient/unmarshallers/ManualMeasureUnmarshallerTest.java
sonar-ws-client/src/test/java/org/sonar/wsclient/unmarshallers/MetricUnmarshallerTest.java
sonar-ws-client/src/test/java/org/sonar/wsclient/unmarshallers/ProfileUnmarshallerTest.java
sonar-ws-client/src/test/java/org/sonar/wsclient/unmarshallers/PropertyUnmarshallerTest.java
sonar-ws-client/src/test/java/org/sonar/wsclient/unmarshallers/ResourceSearchUnmarshallerTest.java
sonar-ws-client/src/test/java/org/sonar/wsclient/unmarshallers/ResourceUnmarshallerTest.java
sonar-ws-client/src/test/java/org/sonar/wsclient/unmarshallers/ServerSetupUnmarshallerTest.java
sonar-ws-client/src/test/java/org/sonar/wsclient/unmarshallers/ServerUnmarshallerTest.java
sonar-ws-client/src/test/java/org/sonar/wsclient/unmarshallers/SourceUnmarshallerTest.java
sonar-ws-client/src/test/java/org/sonar/wsclient/unmarshallers/UnmarshallersTest.java