diff options
| author | Simon Brandhof <simon.brandhof@gmail.com> | 2014-04-21 23:41:03 +0200 |
|---|---|---|
| committer | Simon Brandhof <simon.brandhof@gmail.com> | 2014-04-21 23:41:03 +0200 |
| commit | cba389dcee6ddd3d0cffd82d4c28beb87e53c58a (patch) | |
| tree | 932dcc58798d99302f64de11e63ecea5fcba8320 /sonar-server | |
| parent | 30ba10e719b5152c529dc6022f48fe6f5c79dcb7 (diff) | |
| download | sonarqube-cba389dcee6ddd3d0cffd82d4c28beb87e53c58a.tar.gz sonarqube-cba389dcee6ddd3d0cffd82d4c28beb87e53c58a.zip | |
Continue move from hamcrest to fest-assert
Diffstat (limited to 'sonar-server')
| -rw-r--r-- | sonar-server/pom.xml | 52 |
1 files changed, 29 insertions, 23 deletions
diff --git a/sonar-server/pom.xml b/sonar-server/pom.xml index 4a57f7c8bfa..9b798cee8d8 100644 --- a/sonar-server/pom.xml +++ b/sonar-server/pom.xml @@ -166,6 +166,16 @@ <scope>test</scope> </dependency> <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.easytesting</groupId> + <artifactId>fest-assert</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-all</artifactId> <scope>test</scope> @@ -256,6 +266,24 @@ </resources> </configuration> </execution> + <execution> + <id>copy-generated-webapp</id> + <!-- must be after the execution of grunt --> + <phase>process-resources</phase> + <goals> + <goal>copy-resources</goal> + </goals> + <configuration> + <outputDirectory>${project.build.directory}/${project.build.finalName}</outputDirectory> + <overwrite>true</overwrite> + <resources> + <resource> + <directory>src/main/webapp/build</directory> + <filtering>false</filtering> + </resource> + </resources> + </configuration> + </execution> </executions> </plugin> <plugin> @@ -296,29 +324,6 @@ </executions> </plugin> <plugin> - <artifactId>maven-resources-plugin</artifactId> - <executions> - <execution> - <id>copy-generated-webapp</id> - <!-- must be after the execution of grunt --> - <phase>process-resources</phase> - <goals> - <goal>copy-resources</goal> - </goals> - <configuration> - <outputDirectory>${project.build.directory}/${project.build.finalName}</outputDirectory> - <overwrite>true</overwrite> - <resources> - <resource> - <directory>src/main/webapp/build</directory> - <filtering>false</filtering> - </resource> - </resources> - </configuration> - </execution> - </executions> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-war-plugin</artifactId> <configuration> @@ -397,6 +402,7 @@ </executions> </plugin> <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-resources-plugin</artifactId> <executions> <execution> |