diff options
| author | Jenkins CI <ci@sonarsource.com> | 2015-12-18 08:01:22 +0100 |
|---|---|---|
| committer | Jenkins CI <ci@sonarsource.com> | 2015-12-18 08:01:22 +0100 |
| commit | feb13a2e4ab1234dc8f11c10efe692c96bf418ee (patch) | |
| tree | 49333c5a620d11f16e2f054ca64815d8c89da10c | |
| parent | 069498e3513365213618294886caff9781ac23aa (diff) | |
| parent | acd392a95c87a510c4df2246fe66cfe5310dfba8 (diff) | |
| download | sonarqube-feb13a2e4ab1234dc8f11c10efe692c96bf418ee.tar.gz sonarqube-feb13a2e4ab1234dc8f11c10efe692c96bf418ee.zip | |
Automatic merge from branch-5.3
* origin/branch-5.3:
[maven-release-plugin] prepare for next development iteration
[maven-release-plugin] prepare release 5.3-RC2
| -rw-r--r-- | plugins/sonar-xoo-plugin/pom.xml | 3 | ||||
| -rw-r--r-- | pom.xml | 28 | ||||
| -rw-r--r-- | sonar-batch-protocol/pom.xml | 3 | ||||
| -rw-r--r-- | sonar-plugin-api-deps/pom.xml | 3 | ||||
| -rw-r--r-- | sonar-ws/pom.xml | 3 |
5 files changed, 18 insertions, 22 deletions
diff --git a/plugins/sonar-xoo-plugin/pom.xml b/plugins/sonar-xoo-plugin/pom.xml index abf512a1075..79bb2d61254 100644 --- a/plugins/sonar-xoo-plugin/pom.xml +++ b/plugins/sonar-xoo-plugin/pom.xml @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.sonarsource.sonarqube</groupId> @@ -1368,15 +1368,15 @@ <configuration> <target> <fileset id="fileset" dir="${project.basedir}/src/main/protobuf"> - <include name="*.proto"/> + <include name="*.proto" /> </fileset> - <pathconvert refid="fileset" property="protos" pathsep=" "/> - <mkdir dir="${project.build.directory}/generated-sources/protobuf"/> - <chmod file="${protobuf.compiler}" perm="u+x"/> + <pathconvert refid="fileset" property="protos" pathsep=" " /> + <mkdir dir="${project.build.directory}/generated-sources/protobuf" /> + <chmod file="${protobuf.compiler}" perm="u+x" /> <exec failonerror="true" executable="${protobuf.compiler}"> - <arg value="--proto_path=${project.basedir}/src/main/protobuf"/> - <arg value="--java_out=${project.build.directory}/generated-sources/protobuf"/> - <arg line="${protos}"/> + <arg value="--proto_path=${project.basedir}/src/main/protobuf" /> + <arg value="--java_out=${project.build.directory}/generated-sources/protobuf" /> + <arg line="${protos}" /> </exec> </target> </configuration> @@ -1435,15 +1435,15 @@ <configuration> <target> <fileset id="fileset" dir="${project.basedir}/src/test/protobuf"> - <include name="*.proto"/> + <include name="*.proto" /> </fileset> - <pathconvert refid="fileset" property="protos" pathsep=" "/> - <mkdir dir="${project.build.directory}/generated-test-sources/protobuf"/> - <chmod file="${protobuf.compiler}" perm="u+x"/> + <pathconvert refid="fileset" property="protos" pathsep=" " /> + <mkdir dir="${project.build.directory}/generated-test-sources/protobuf" /> + <chmod file="${protobuf.compiler}" perm="u+x" /> <exec failonerror="true" executable="${protobuf.compiler}"> - <arg value="--proto_path=${project.basedir}/src/test/protobuf"/> - <arg value="--java_out=${project.build.directory}/generated-test-sources/protobuf"/> - <arg line="${protos}"/> + <arg value="--proto_path=${project.basedir}/src/test/protobuf" /> + <arg value="--java_out=${project.build.directory}/generated-test-sources/protobuf" /> + <arg line="${protos}" /> </exec> </target> </configuration> diff --git a/sonar-batch-protocol/pom.xml b/sonar-batch-protocol/pom.xml index f2b4fd57957..01b9a0e620d 100644 --- a/sonar-batch-protocol/pom.xml +++ b/sonar-batch-protocol/pom.xml @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.sonarsource.sonarqube</groupId> diff --git a/sonar-plugin-api-deps/pom.xml b/sonar-plugin-api-deps/pom.xml index b82faa06bcf..cd45a4571f6 100644 --- a/sonar-plugin-api-deps/pom.xml +++ b/sonar-plugin-api-deps/pom.xml @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> diff --git a/sonar-ws/pom.xml b/sonar-ws/pom.xml index 5bee2d57d6c..d55f7f445ef 100644 --- a/sonar-ws/pom.xml +++ b/sonar-ws/pom.xml @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> |