usercompatibility dependency embedded

everit-org · Apr 17, 2014 · f8336f0 · f8336f0
1 parent 515d721
commit f8336f0
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 79 deletions.
diff --git a/core/assembly.xml b/core/assembly.xml
diff --git a/core/pom.xml b/core/pom.xml
@@ -38,30 +38,6 @@
 
 	<build>
 		<plugins>
-		    <plugin>
-				<artifactId>maven-assembly-plugin</artifactId>
-				<configuration>
-					<archive>
-						<index>true</index>
-						<manifest>
-							<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
-						</manifest>
-					</archive>
-				</configuration>
-				<executions>
-					<execution>
-						<id>jwq-depjar</id>
-						<phase>package</phase>
-						<goals>
-							<goal>single</goal>
-						</goals>
-						<configuration>
-						    <appendAssemblyId>false</appendAssemblyId>
-                            <descriptor>assembly.xml</descriptor>
-                        </configuration>
-					</execution>
-				</executions>
-			</plugin> 	
 			<plugin>
 				<groupId>org.apache.felix</groupId>
 				<artifactId>maven-bundle-plugin</artifactId>
@@ -72,11 +48,10 @@
 						<Import-Package>
 							*
 						</Import-Package>
-						<Export-Package/>
-<!-- 						<Export-Package> -->
-<!-- 							org.everit.jira.worklog.query.plugin.core -->
-<!-- 						</Export-Package> -->
-						<_failok>true</_failok>
+						<Export-Package />
+						<Embed-Dependency>
+							groupId=com.atlassian.usercompatibility;usercompatibility-jira
+						</Embed-Dependency>
 					</instructions>
 				</configuration>
 			</plugin>
@@ -91,9 +66,10 @@
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
-		    <groupId>com.atlassian.usercompatibility</groupId>
-		    <artifactId>usercompatibility-jira</artifactId>
-		    <version>0.18</version>
+			<groupId>com.atlassian.usercompatibility</groupId>
+			<artifactId>usercompatibility-jira</artifactId>
+			<version>0.18</version>
+			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>com.atlassian.crowd</groupId>

diff --git a/pom.xml b/pom.xml
@@ -155,4 +155,35 @@
 		</pluginRepository>
 	</pluginRepositories>
 
+	<build>
+		<pluginManagement>
+			<plugins>
+				<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
+				<plugin>
+					<groupId>org.eclipse.m2e</groupId>
+					<artifactId>lifecycle-mapping</artifactId>
+					<version>1.0.0</version>
+					<configuration>
+						<lifecycleMappingMetadata>
+							<pluginExecutions>
+								<pluginExecution>
+									<pluginExecutionFilter>
+										<groupId>org.apache.maven.plugins</groupId>
+										<artifactId>maven-dependency-plugin</artifactId>
+										<versionRange>[2.4,)</versionRange>
+										<goals>
+											<goal>unpack</goal>
+										</goals>
+									</pluginExecutionFilter>
+									<action>
+										<ignore></ignore>
+									</action>
+								</pluginExecution>
+							</pluginExecutions>
+						</lifecycleMappingMetadata>
+					</configuration>
+				</plugin>
+			</plugins>
+		</pluginManagement>
+	</build>
 </project>