Improve RPM build

[gpl/argeo-slc.git] / dep / org.argeo.slc.dep.e4.rap / pom.xml

diff --git a/dep/org.argeo.slc.dep.e4.rap/pom.xml b/dep/org.argeo.slc.dep.e4.rap/pom.xml
index 38b494331c901abef3d37ff5ef1af136f4d6f6d2..f72236391a1717378bcdebdb927b01efe06c545a 100644 (file)
--- a/dep/org.argeo.slc.dep.e4.rap/pom.xml
+++ b/dep/org.argeo.slc.dep.e4.rap/pom.xml
@@ -83,47 +83,45 @@
                        <build>
                                <plugins>
                                        <plugin>
-                                               <groupId>org.apache.maven.plugins</groupId>
-                                               <artifactId>maven-dependency-plugin</artifactId>
+                                               <artifactId>maven-assembly-plugin</artifactId>
                                                <executions>
                                                        <execution>
-                                                               <id>copy-argeo</id>
+                                                               <id>prepare-source</id>
                                                                <phase>package</phase>
                                                                <goals>
-                                                                       <goal>copy-dependencies</goal>
+                                                                       <goal>single</goal>
                                                                </goals>
                                                                <configuration>
-                                                                       <includeTypes>jar</includeTypes>
-                                                                       <outputDirectory>${project.build.directory}/lib-argeo</outputDirectory>
-                                                                       <includeGroupIds>org.argeo.slc</includeGroupIds>
-                                                                       <excludeTransitive>true</excludeTransitive>
-                                                                       <excludeArtifactIds>org.argeo.slc.dep.minimal</excludeArtifactIds>
-                                                                       <includeTypes>jar</includeTypes>
-                                                                       <includeScope>runtime</includeScope>
-                                                                       <useRepositoryLayout>true</useRepositoryLayout>
+                                                                       <descriptorRefs>
+                                                                               <descriptorRef>a2-source</descriptorRef>
+                                                                       </descriptorRefs>
                                                                </configuration>
                                                        </execution>
-                                                       <!-- <execution> -->
-                                                       <!-- <id>copy-argeo-self</id> -->
-                                                       <!-- <phase>package</phase> -->
-                                                       <!-- <goals> -->
-                                                       <!-- <goal>copy</goal> -->
-                                                       <!-- </goals> -->
-                                                       <!-- <configuration> -->
-                                                       <!-- <outputDirectory>${project.build.directory}/lib-argeo</outputDirectory> -->
-                                                       <!-- <useRepositoryLayout>true</useRepositoryLayout> -->
-                                                       <!-- <artifactItems> -->
-                                                       <!-- <artifactItem> -->
-                                                       <!-- <groupId>${project.groupId}</groupId> -->
-                                                       <!-- <artifactId>${project.artifactId}</artifactId> -->
-                                                       <!-- <version>${project.version}</version> -->
-                                                       <!-- <outputDirectory>${project.build.directory}/lib-argeo</outputDirectory> -->
-                                                       <!-- </artifactItem> -->
-                                                       <!-- </artifactItems> -->
-                                                       <!-- </configuration> -->
-                                                       <!-- </execution> -->
                                                </executions>
                                        </plugin>
+<!--                                   <plugin> -->
+<!--                                           <groupId>org.apache.maven.plugins</groupId> -->
+<!--                                           <artifactId>maven-dependency-plugin</artifactId> -->
+<!--                                           <executions> -->
+<!--                                                   <execution> -->
+<!--                                                           <id>copy-argeo</id> -->
+<!--                                                           <phase>package</phase> -->
+<!--                                                           <goals> -->
+<!--                                                                   <goal>copy-dependencies</goal> -->
+<!--                                                           </goals> -->
+<!--                                                           <configuration> -->
+<!--                                                                   <includeTypes>jar</includeTypes> -->
+<!--                                                                   <outputDirectory>${project.build.directory}/lib-argeo</outputDirectory> -->
+<!--                                                                   <includeGroupIds>org.argeo.slc</includeGroupIds> -->
+<!--                                                                   <excludeTransitive>true</excludeTransitive> -->
+<!--                                                                   <excludeArtifactIds>org.argeo.slc.dep.minimal</excludeArtifactIds> -->
+<!--                                                                   <includeTypes>jar</includeTypes> -->
+<!--                                                                   <includeScope>runtime</includeScope> -->
+<!--                                                                   <useRepositoryLayout>true</useRepositoryLayout> -->
+<!--                                                           </configuration> -->
+<!--                                                   </execution> -->
+<!--                                           </executions> -->
+<!--                                   </plugin> -->
                                        <plugin>
                                                <groupId>org.codehaus.mojo</groupId>
                                                <artifactId>rpm-maven-plugin</artifactId>
@@ -145,7 +143,7 @@
                                                                                        <directoryIncluded>true</directoryIncluded>
                                                                                        <sources>
                                                                                                <source>
-                                                                                                       <location>${project.build.directory}/lib-argeo</location>
+                                                                                                       <location>${project.build.directory}/${project.artifactId}-${project.version}-a2-source</location>
                                                                                                        <includes>
                                                                                                                <include>**/*.jar</include>
                                                                                                        </includes>