diff options
Diffstat (limited to 'sonar-application')
| -rw-r--r-- | sonar-application/assembly.xml | 21 | ||||
| -rw-r--r-- | sonar-application/pom.xml | 8 |
2 files changed, 22 insertions, 7 deletions
diff --git a/sonar-application/assembly.xml b/sonar-application/assembly.xml index 2304815d061..50553043ab1 100644 --- a/sonar-application/assembly.xml +++ b/sonar-application/assembly.xml @@ -38,8 +38,7 @@ <exclude>org.postgresql:postgresql</exclude> <exclude>net.sourceforge.jtds:jtds</exclude> <exclude>tanukisoft:wrapper</exclude> - <exclude>tanukisoft:wrapper</exclude> - <exclude>org.codehaus.sonar:sonar-server-app</exclude> + <exclude>org.codehaus.sonar:sonar-server</exclude> <exclude>org.codehaus.sonar:sonar-web</exclude> <exclude>org.codehaus.sonar:sonar-search</exclude> <exclude>org.codehaus.sonar.plugins:*</exclude> @@ -49,12 +48,24 @@ <scope>runtime</scope> </dependencySet> + <dependencySet> + <outputDirectory>lib/common</outputDirectory> + <useTransitiveFiltering>true</useTransitiveFiltering> + <useProjectArtifact>false</useProjectArtifact> + <includes> + <include>org.elasticsearch:elasticsearch</include> + </includes> + <scope>provided</scope> + </dependencySet> + + + <dependencySet> <outputDirectory>lib/search</outputDirectory> <useProjectArtifact>false</useProjectArtifact> <useTransitiveDependencies>true</useTransitiveDependencies> - <useTransitiveFiltering>true</useTransitiveFiltering> + <useTransitiveFiltering>false</useTransitiveFiltering> <includes> <include>org.codehaus.sonar:sonar-search</include> </includes> @@ -63,16 +74,16 @@ <dependencySet> <outputDirectory>lib/server</outputDirectory> + <useProjectArtifact>false</useProjectArtifact> <useTransitiveDependencies>true</useTransitiveDependencies> <useTransitiveFiltering>true</useTransitiveFiltering> <includes> - <include>org.codehaus.sonar:sonar-server-app</include> + <include>org.codehaus.sonar:sonar-server</include> </includes> <scope>provided</scope> </dependencySet> - <dependencySet> <outputDirectory>lib/batch</outputDirectory> <useTransitiveDependencies>false</useTransitiveDependencies> diff --git a/sonar-application/pom.xml b/sonar-application/pom.xml index 52ec763c1e4..b9a5d8afa09 100644 --- a/sonar-application/pom.xml +++ b/sonar-application/pom.xml @@ -31,10 +31,15 @@ <artifactId>jsr305</artifactId> <scope>provided</scope> </dependency> + <dependency> + <groupId>org.elasticsearch</groupId> + <artifactId>elasticsearch</artifactId> + <scope>provided</scope> + </dependency> <dependency> <groupId>org.codehaus.sonar</groupId> - <artifactId>sonar-server-app</artifactId> + <artifactId>sonar-server</artifactId> <version>${project.version}</version> <scope>provided</scope> </dependency> @@ -195,7 +200,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> - <version>2.5</version> <configuration> <archive> <index>true</index> |