diff options
| author | Jenkins CI <ci@sonarsource.com> | 2014-12-19 11:28:14 +0100 |
|---|---|---|
| committer | Jenkins CI <ci@sonarsource.com> | 2014-12-19 11:28:14 +0100 |
| commit | 4742f1a30dfa08e9cc30b793c310bb693ce14e44 (patch) | |
| tree | 2a2d9bab25f7e58ec123c6047d3d7948eb9a5546 /sonar-batch/src/test/resources/org | |
| parent | 4f18574ffcc8ff822afaa40a9a12c690b2fa6fad (diff) | |
| parent | 863d26c40c1bb032733e912d5dcd8c883e8c1c4b (diff) | |
| download | sonarqube-4742f1a30dfa08e9cc30b793c310bb693ce14e44.tar.gz sonarqube-4742f1a30dfa08e9cc30b793c310bb693ce14e44.zip | |
Automatic merge from branch-5.0
* origin/branch-5.0:
SONAR-5878 Fix regression when parsing project properties
Fix navigation between issues in a big file
Diffstat (limited to 'sonar-batch/src/test/resources/org')
3 files changed, 21 insertions, 0 deletions
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-module-definitions-same-prefix/module1.feature/src/Fake.java b/sonar-batch/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-module-definitions-same-prefix/module1.feature/src/Fake.java new file mode 100644 index 00000000000..b2e6462a3f9 --- /dev/null +++ b/sonar-batch/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-module-definitions-same-prefix/module1.feature/src/Fake.java @@ -0,0 +1 @@ +Fake diff --git a/sonar-batch/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-module-definitions-same-prefix/module1/sources/Fake.java b/sonar-batch/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-module-definitions-same-prefix/module1/sources/Fake.java new file mode 100644 index 00000000000..b2e6462a3f9 --- /dev/null +++ b/sonar-batch/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-module-definitions-same-prefix/module1/sources/Fake.java @@ -0,0 +1 @@ +Fake diff --git a/sonar-batch/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-module-definitions-same-prefix/sonar-project.properties b/sonar-batch/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-module-definitions-same-prefix/sonar-project.properties new file mode 100644 index 00000000000..2a6221a3757 --- /dev/null +++ b/sonar-batch/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-module-definitions-same-prefix/sonar-project.properties @@ -0,0 +1,19 @@ +sonar.projectKey=com.foo.project +sonar.projectName=Foo Project +sonar.projectVersion=1.0-SNAPSHOT +sonar.projectDescription=Description of Foo Project + +sonar.sources=sources +sonar.tests=tests +sonar.binaries=target/classes + +sonar.modules=module1,\ + module1.feature + +# Mandatory properties for module1 are all inferred from the module ID + +module1.feature.sonar.projectKey=com.foo.project.module1.feature +module1.feature.sonar.projectName=Foo Module 1 Feature +# redefine some properties +module1.feature.sonar.projectDescription=Description of Module 1 Feature +module1.feature.sonar.sources=src |