diff options
author | Duarte Meneses <duarte.meneses@sonarsource.com> | 2015-07-16 13:51:30 +0200 |
---|---|---|
committer | Duarte Meneses <duarte.meneses@sonarsource.com> | 2015-07-20 12:59:15 +0200 |
commit | 73b46e381ff0a7a0b3bc280ac45de592e547513a (patch) | |
tree | a784542f624aa1a97be6f77eed75eda094be2166 /it/projects/multi-module | |
parent | f20b8927e6b8747b37ae750de393215312b774c2 (diff) | |
download | sonar-scanner-cli-73b46e381ff0a7a0b3bc280ac45de592e547513a.tar.gz sonar-scanner-cli-73b46e381ff0a7a0b3bc280ac45de592e547513a.zip |
merge it-sonar-runner and update groupId
Diffstat (limited to 'it/projects/multi-module')
35 files changed, 159 insertions, 0 deletions
diff --git a/it/projects/multi-module/advanced/using-config-file-prop/module1/src/Hello.java b/it/projects/multi-module/advanced/using-config-file-prop/module1/src/Hello.java new file mode 100644 index 0000000..8a94806 --- /dev/null +++ b/it/projects/multi-module/advanced/using-config-file-prop/module1/src/Hello.java @@ -0,0 +1,2 @@ +public class Hello { +} diff --git a/it/projects/multi-module/advanced/using-config-file-prop/module1/temp/generated-sonar-project.properties b/it/projects/multi-module/advanced/using-config-file-prop/module1/temp/generated-sonar-project.properties new file mode 100644 index 0000000..81dd0e0 --- /dev/null +++ b/it/projects/multi-module/advanced/using-config-file-prop/module1/temp/generated-sonar-project.properties @@ -0,0 +1,2 @@ +sonar.projectName=Module 1 +sonar.projectBaseDir=.. diff --git a/it/projects/multi-module/advanced/using-config-file-prop/module2/src/Hello.java b/it/projects/multi-module/advanced/using-config-file-prop/module2/src/Hello.java new file mode 100644 index 0000000..8a94806 --- /dev/null +++ b/it/projects/multi-module/advanced/using-config-file-prop/module2/src/Hello.java @@ -0,0 +1,2 @@ +public class Hello { +} diff --git a/it/projects/multi-module/advanced/using-config-file-prop/module2/temp/generated-sonar-project.properties b/it/projects/multi-module/advanced/using-config-file-prop/module2/temp/generated-sonar-project.properties new file mode 100644 index 0000000..0b0e342 --- /dev/null +++ b/it/projects/multi-module/advanced/using-config-file-prop/module2/temp/generated-sonar-project.properties @@ -0,0 +1,2 @@ +sonar.projectName=Module 2 +sonar.projectBaseDir=..
\ No newline at end of file diff --git a/it/projects/multi-module/advanced/using-config-file-prop/sonar-project.properties b/it/projects/multi-module/advanced/using-config-file-prop/sonar-project.properties new file mode 100644 index 0000000..448cf40 --- /dev/null +++ b/it/projects/multi-module/advanced/using-config-file-prop/sonar-project.properties @@ -0,0 +1,10 @@ +sonar.projectKey=using-config-file-prop +sonar.projectName=Advanced use case - mostly used by the Ant task +sonar.projectVersion=1.2.3 + +sonar.sources=src + +sonar.modules=module1,module2 + +module1.sonar.projectConfigFile=module1/temp/generated-sonar-project.properties +module2.sonar.projectConfigFile=module2/temp/generated-sonar-project.properties diff --git a/it/projects/multi-module/customization/deep-path-for-modules/modules/module1/src/Hello.java b/it/projects/multi-module/customization/deep-path-for-modules/modules/module1/src/Hello.java new file mode 100644 index 0000000..8a94806 --- /dev/null +++ b/it/projects/multi-module/customization/deep-path-for-modules/modules/module1/src/Hello.java @@ -0,0 +1,2 @@ +public class Hello { +} diff --git a/it/projects/multi-module/customization/deep-path-for-modules/modules/module2/src/Hello.java b/it/projects/multi-module/customization/deep-path-for-modules/modules/module2/src/Hello.java new file mode 100644 index 0000000..8a94806 --- /dev/null +++ b/it/projects/multi-module/customization/deep-path-for-modules/modules/module2/src/Hello.java @@ -0,0 +1,2 @@ +public class Hello { +} diff --git a/it/projects/multi-module/customization/deep-path-for-modules/sonar-project.properties b/it/projects/multi-module/customization/deep-path-for-modules/sonar-project.properties new file mode 100644 index 0000000..e366eaa --- /dev/null +++ b/it/projects/multi-module/customization/deep-path-for-modules/sonar-project.properties @@ -0,0 +1,13 @@ +sonar.projectKey=deep-path-for-modules +sonar.projectName=Project with deep path for modules +sonar.projectVersion=1.2.3 + +sonar.sources=src + +sonar.modules=mod1,mod2 + +mod1.sonar.projectBaseDir=modules/module1 +mod1.sonar.projectName=Module 1 + +mod2.sonar.projectBaseDir=modules/module2 +mod2.sonar.projectName=Module 2
\ No newline at end of file diff --git a/it/projects/multi-module/customization/module-path-with-space/my module 1/src/Hello.java b/it/projects/multi-module/customization/module-path-with-space/my module 1/src/Hello.java new file mode 100644 index 0000000..8a94806 --- /dev/null +++ b/it/projects/multi-module/customization/module-path-with-space/my module 1/src/Hello.java @@ -0,0 +1,2 @@ +public class Hello { +} diff --git a/it/projects/multi-module/customization/module-path-with-space/my module 2/src/Hello.java b/it/projects/multi-module/customization/module-path-with-space/my module 2/src/Hello.java new file mode 100644 index 0000000..8a94806 --- /dev/null +++ b/it/projects/multi-module/customization/module-path-with-space/my module 2/src/Hello.java @@ -0,0 +1,2 @@ +public class Hello { +} diff --git a/it/projects/multi-module/customization/module-path-with-space/sonar-project.properties b/it/projects/multi-module/customization/module-path-with-space/sonar-project.properties new file mode 100644 index 0000000..4a2c774 --- /dev/null +++ b/it/projects/multi-module/customization/module-path-with-space/sonar-project.properties @@ -0,0 +1,14 @@ +sonar.projectKey=module-path-with-space +sonar.projectName=Project with module path that contain spaces +sonar.projectVersion=1.2.3 + +sonar.sources=src + +sonar.modules=module1,module2 + +# module1 and module2 are located in a path that differs from their id AND that contains a space +module1.sonar.projectName=Module 1 +module1.sonar.projectBaseDir=my module 1 + +module2.sonar.projectName=Module 2 +module2.sonar.projectBaseDir=my module 2 diff --git a/it/projects/multi-module/customization/overwriting-parent-properties/module1/src1/Hello.java b/it/projects/multi-module/customization/overwriting-parent-properties/module1/src1/Hello.java new file mode 100644 index 0000000..8a94806 --- /dev/null +++ b/it/projects/multi-module/customization/overwriting-parent-properties/module1/src1/Hello.java @@ -0,0 +1,2 @@ +public class Hello { +} diff --git a/it/projects/multi-module/customization/overwriting-parent-properties/module2/sonar-project.properties b/it/projects/multi-module/customization/overwriting-parent-properties/module2/sonar-project.properties new file mode 100644 index 0000000..19d46fb --- /dev/null +++ b/it/projects/multi-module/customization/overwriting-parent-properties/module2/sonar-project.properties @@ -0,0 +1,4 @@ +sonar.projectKey=module2-new-key +sonar.projectName=Module 2 +sonar.projectDescription=Description of module 2 +sonar.sources=src2 diff --git a/it/projects/multi-module/customization/overwriting-parent-properties/module2/src2/Hello.java b/it/projects/multi-module/customization/overwriting-parent-properties/module2/src2/Hello.java new file mode 100644 index 0000000..8a94806 --- /dev/null +++ b/it/projects/multi-module/customization/overwriting-parent-properties/module2/src2/Hello.java @@ -0,0 +1,2 @@ +public class Hello { +} diff --git a/it/projects/multi-module/customization/overwriting-parent-properties/sonar-project.properties b/it/projects/multi-module/customization/overwriting-parent-properties/sonar-project.properties new file mode 100644 index 0000000..b2dff8d --- /dev/null +++ b/it/projects/multi-module/customization/overwriting-parent-properties/sonar-project.properties @@ -0,0 +1,16 @@ +sonar.projectKey=overwriting-parent-properties +sonar.projectName=Project with modules that overwrite properties +sonar.projectVersion=1.2.3 +sonar.projectDescription=Description of root project + +sonar.sources=src + +sonar.modules=module1,module2 + +# For module 1, we overwrite properties here +module1.sonar.projectKey=module1-new-key +module1.sonar.projectName=Module 1 +module1.sonar.projectDescription=Description of module 1 +module1.sonar.sources=src1 + +# For module 2, we do it in the "sonar-project.properties" defined in the module diff --git a/it/projects/multi-module/failures/unexisting-base-dir/module1/src/Hello.java b/it/projects/multi-module/failures/unexisting-base-dir/module1/src/Hello.java new file mode 100644 index 0000000..8a94806 --- /dev/null +++ b/it/projects/multi-module/failures/unexisting-base-dir/module1/src/Hello.java @@ -0,0 +1,2 @@ +public class Hello { +} diff --git a/it/projects/multi-module/failures/unexisting-base-dir/module2/src/Hello.java b/it/projects/multi-module/failures/unexisting-base-dir/module2/src/Hello.java new file mode 100644 index 0000000..8a94806 --- /dev/null +++ b/it/projects/multi-module/failures/unexisting-base-dir/module2/src/Hello.java @@ -0,0 +1,2 @@ +public class Hello { +} diff --git a/it/projects/multi-module/failures/unexisting-base-dir/sonar-project.properties b/it/projects/multi-module/failures/unexisting-base-dir/sonar-project.properties new file mode 100644 index 0000000..8bb89b7 --- /dev/null +++ b/it/projects/multi-module/failures/unexisting-base-dir/sonar-project.properties @@ -0,0 +1,10 @@ +sonar.projectKey=unexisting-base-dir +sonar.projectName=Project with unexisting base directory for module +sonar.projectVersion=1.2.3 + +sonar.sources=src + +sonar.modules=module1,module3 + +module1.sonar.projectName=Module 1 +module3.sonar.projectName=Module 3 diff --git a/it/projects/multi-module/failures/unexisting-config-file/module1/src/Hello.java b/it/projects/multi-module/failures/unexisting-config-file/module1/src/Hello.java new file mode 100644 index 0000000..8a94806 --- /dev/null +++ b/it/projects/multi-module/failures/unexisting-config-file/module1/src/Hello.java @@ -0,0 +1,2 @@ +public class Hello { +} diff --git a/it/projects/multi-module/failures/unexisting-config-file/module1/temp/empty-dir.txt b/it/projects/multi-module/failures/unexisting-config-file/module1/temp/empty-dir.txt new file mode 100644 index 0000000..0026da6 --- /dev/null +++ b/it/projects/multi-module/failures/unexisting-config-file/module1/temp/empty-dir.txt @@ -0,0 +1 @@ +File to be sure that SVN keeps this "empty" directory
\ No newline at end of file diff --git a/it/projects/multi-module/failures/unexisting-config-file/module2/src/Hello.java b/it/projects/multi-module/failures/unexisting-config-file/module2/src/Hello.java new file mode 100644 index 0000000..8a94806 --- /dev/null +++ b/it/projects/multi-module/failures/unexisting-config-file/module2/src/Hello.java @@ -0,0 +1,2 @@ +public class Hello { +} diff --git a/it/projects/multi-module/failures/unexisting-config-file/module2/temp/generated-sonar-project.properties b/it/projects/multi-module/failures/unexisting-config-file/module2/temp/generated-sonar-project.properties new file mode 100644 index 0000000..0b0e342 --- /dev/null +++ b/it/projects/multi-module/failures/unexisting-config-file/module2/temp/generated-sonar-project.properties @@ -0,0 +1,2 @@ +sonar.projectName=Module 2 +sonar.projectBaseDir=..
\ No newline at end of file diff --git a/it/projects/multi-module/failures/unexisting-config-file/sonar-project.properties b/it/projects/multi-module/failures/unexisting-config-file/sonar-project.properties new file mode 100644 index 0000000..d3f7d6e --- /dev/null +++ b/it/projects/multi-module/failures/unexisting-config-file/sonar-project.properties @@ -0,0 +1,10 @@ +sonar.projectKey=unexisting-config-file +sonar.projectName=Project using an unexisting config file +sonar.projectVersion=1.2.3 + +sonar.sources=src + +sonar.modules=module1,module2 + +module1.sonar.projectConfigFile=module1/temp/generated-sonar-project.properties +module2.sonar.projectConfigFile=module2/temp/generated-sonar-project.properties diff --git a/it/projects/multi-module/multi-language/sonar-project.properties b/it/projects/multi-module/multi-language/sonar-project.properties new file mode 100644 index 0000000..3598e57 --- /dev/null +++ b/it/projects/multi-module/multi-language/sonar-project.properties @@ -0,0 +1,14 @@ +sonar.projectKey=multi-language +sonar.projectName=Simplest multi-language project +sonar.projectVersion=1.2.3 + + +sonar.modules=java-module,js-module + +java-module.sonar.language=java +java-module.sonar.projectBaseDir=. +java-module.sonar.sources=src/main/java + +js-module.sonar.language=js +js-module.sonar.projectBaseDir=. +js-module.sonar.sources=src/main/js diff --git a/it/projects/multi-module/multi-language/src/main/java/Hello.java b/it/projects/multi-module/multi-language/src/main/java/Hello.java new file mode 100644 index 0000000..8a94806 --- /dev/null +++ b/it/projects/multi-module/multi-language/src/main/java/Hello.java @@ -0,0 +1,2 @@ +public class Hello { +} diff --git a/it/projects/multi-module/multi-language/src/main/js/Hello.js b/it/projects/multi-module/multi-language/src/main/js/Hello.js new file mode 100644 index 0000000..2096104 --- /dev/null +++ b/it/projects/multi-module/multi-language/src/main/js/Hello.js @@ -0,0 +1,3 @@ +function hello() { + alert("Hello World"); +} diff --git a/it/projects/multi-module/simplest/simplest-with-props-on-each-module/module1/sonar-project.properties b/it/projects/multi-module/simplest/simplest-with-props-on-each-module/module1/sonar-project.properties new file mode 100644 index 0000000..f5e701d --- /dev/null +++ b/it/projects/multi-module/simplest/simplest-with-props-on-each-module/module1/sonar-project.properties @@ -0,0 +1,2 @@ +# no need to set the "sonar.projectKey": it defaults to the module ID ('module1') +# no need to set the "sonar.projectName": it defaults to the module ID ('module1')
\ No newline at end of file diff --git a/it/projects/multi-module/simplest/simplest-with-props-on-each-module/module1/src/Hello.java b/it/projects/multi-module/simplest/simplest-with-props-on-each-module/module1/src/Hello.java new file mode 100644 index 0000000..8a94806 --- /dev/null +++ b/it/projects/multi-module/simplest/simplest-with-props-on-each-module/module1/src/Hello.java @@ -0,0 +1,2 @@ +public class Hello { +} diff --git a/it/projects/multi-module/simplest/simplest-with-props-on-each-module/module2/sonar-project.properties b/it/projects/multi-module/simplest/simplest-with-props-on-each-module/module2/sonar-project.properties new file mode 100644 index 0000000..93a6c21 --- /dev/null +++ b/it/projects/multi-module/simplest/simplest-with-props-on-each-module/module2/sonar-project.properties @@ -0,0 +1,3 @@ +# here, we overwrite "sonar.projectKey" and "sonar.projectName" for 'module2' +sonar.projectKey=overridden-key-for-module2 +sonar.projectName=Module 2
\ No newline at end of file diff --git a/it/projects/multi-module/simplest/simplest-with-props-on-each-module/module2/src/Hello.java b/it/projects/multi-module/simplest/simplest-with-props-on-each-module/module2/src/Hello.java new file mode 100644 index 0000000..8a94806 --- /dev/null +++ b/it/projects/multi-module/simplest/simplest-with-props-on-each-module/module2/src/Hello.java @@ -0,0 +1,2 @@ +public class Hello { +} diff --git a/it/projects/multi-module/simplest/simplest-with-props-on-each-module/sonar-project.properties b/it/projects/multi-module/simplest/simplest-with-props-on-each-module/sonar-project.properties new file mode 100644 index 0000000..6bfae93 --- /dev/null +++ b/it/projects/multi-module/simplest/simplest-with-props-on-each-module/sonar-project.properties @@ -0,0 +1,7 @@ +sonar.projectKey=simplest-with-props-each-module +sonar.projectName=Simplest multi-module project with properties set on each module +sonar.projectVersion=1.2.3 + +sonar.sources=src + +sonar.modules=module1,module2
\ No newline at end of file diff --git a/it/projects/multi-module/simplest/simplest-with-props-on-each-module/src/placeholder.txt b/it/projects/multi-module/simplest/simplest-with-props-on-each-module/src/placeholder.txt new file mode 100644 index 0000000..1a5bdeb --- /dev/null +++ b/it/projects/multi-module/simplest/simplest-with-props-on-each-module/src/placeholder.txt @@ -0,0 +1 @@ +The root module contains a src folder but it will not be analysed (SONARPLUGINS-2295) and a warning will be displayed.
\ No newline at end of file diff --git a/it/projects/multi-module/simplest/simplest-with-props-on-root/module1/src/Hello.java b/it/projects/multi-module/simplest/simplest-with-props-on-root/module1/src/Hello.java new file mode 100644 index 0000000..8a94806 --- /dev/null +++ b/it/projects/multi-module/simplest/simplest-with-props-on-root/module1/src/Hello.java @@ -0,0 +1,2 @@ +public class Hello { +} diff --git a/it/projects/multi-module/simplest/simplest-with-props-on-root/module2/src/Hello.java b/it/projects/multi-module/simplest/simplest-with-props-on-root/module2/src/Hello.java new file mode 100644 index 0000000..8a94806 --- /dev/null +++ b/it/projects/multi-module/simplest/simplest-with-props-on-root/module2/src/Hello.java @@ -0,0 +1,2 @@ +public class Hello { +} diff --git a/it/projects/multi-module/simplest/simplest-with-props-on-root/sonar-project.properties b/it/projects/multi-module/simplest/simplest-with-props-on-root/sonar-project.properties new file mode 100644 index 0000000..a3488b8 --- /dev/null +++ b/it/projects/multi-module/simplest/simplest-with-props-on-root/sonar-project.properties @@ -0,0 +1,11 @@ +sonar.projectKey=simplest-with-props-on-root +sonar.projectName=Simplest multi-module project with all properties set on the root project +sonar.projectVersion=1.2.3 + +sonar.sources=src + +sonar.modules=module1,module2 + +# no need to set the "sonar.projectBaseDir": it also defaults to <current_dir>/<module_ID> +# no need to set the "sonar.projectKey": it defaults to the module ID ('module1') +# no need to set the "sonar.projectName": it defaults to the module ID ('module1')
\ No newline at end of file |