diff options
| -rw-r--r-- | pom.xml | 18 | ||||
| -rw-r--r-- | sonar-application/assembly.xml | 10 |
2 files changed, 14 insertions, 14 deletions
@@ -128,7 +128,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-assembly-plugin</artifactId> - <version>2.4</version> + <version>3.1.0</version> <configuration> <archiverConfig> <!-- Workaround for http://jira.codehaus.org/browse/MASSEMBLY-422 --> @@ -143,7 +143,7 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>build-helper-maven-plugin</artifactId> - <version>1.12</version> + <version>3.0.0</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -153,12 +153,12 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> - <version>2.10</version> + <version>3.0.2</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-enforcer-plugin</artifactId> - <version>1.4.1</version> + <version>3.0.0-M1</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -182,7 +182,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> - <version>2.10.4</version> + <version>3.0.0-M1</version> <configuration> <author>false</author> <linksource>true</linksource> @@ -201,12 +201,12 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-resources-plugin</artifactId> - <version>3.0.1</version> + <version>3.0.2</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-shade-plugin</artifactId> - <version>3.0.0</version> + <version>3.1.0</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -216,12 +216,12 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> - <version>2.20</version> + <version>2.20.1</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-war-plugin</artifactId> - <version>2.6</version> + <version>3.2.0</version> </plugin> <plugin> <!-- not thread safe --> diff --git a/sonar-application/assembly.xml b/sonar-application/assembly.xml index a2122e2ebff..126f0bd12a1 100644 --- a/sonar-application/assembly.xml +++ b/sonar-application/assembly.xml @@ -122,7 +122,7 @@ <!-- wrapper binaries --> <fileSet> <directory>src/main/assembly</directory> - <outputDirectory>/</outputDirectory> + <outputDirectory></outputDirectory> <includes> <include>bin/*/lib/*.so</include> <include>bin/*/lib/*.jnilib</include> @@ -137,7 +137,7 @@ <!-- Configuration Files --> <fileSet> <directory>src/main/assembly</directory> - <outputDirectory>/</outputDirectory> + <outputDirectory></outputDirectory> <includes> <include>conf/**</include> </includes> @@ -148,7 +148,7 @@ <!-- Windows Scripts --> <fileSet> <directory>src/main/assembly</directory> - <outputDirectory>/</outputDirectory> + <outputDirectory></outputDirectory> <includes> <include>**/*.bat</include> <include>**/*.cmd</include> @@ -159,7 +159,7 @@ <!-- Linux Scripts --> <fileSet> <directory>src/main/assembly</directory> - <outputDirectory>/</outputDirectory> + <outputDirectory></outputDirectory> <includes> <include>**/*.sh</include> <include>**/ant</include> @@ -171,7 +171,7 @@ <!-- Other stuff --> <fileSet> <directory>src/main/assembly</directory> - <outputDirectory>/</outputDirectory> + <outputDirectory></outputDirectory> <excludes> <exclude>conf/**</exclude> <exclude>**/*.bat</exclude> |