projects / gpl / argeo-suite.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (from parent 1: acefd63)
RPM packaging
authorMathieu Baudier <mbaudier@argeo.org>
Fri, 4 May 2018 16:05:50 +0000 (18:05 +0200)
committerMathieu Baudier <mbaudier@argeo.org>
Fri, 4 May 2018 16:05:50 +0000 (18:05 +0200)
dep/org.argeo.suite.dep.e4.rap/pom.xml patch | blob | history
dep/org.argeo.suite.dep.e4.rcp/pom.xml patch | blob | history
dep/org.argeo.suite.platform/pom.xml patch | blob | history
dep/pom.xml patch | blob | history

diff --git a/dep/org.argeo.suite.dep.e4.rap/pom.xml b/dep/org.argeo.suite.dep.e4.rap/pom.xml
index 022b35e72277a91526a894e5c6c76859daa237f0..9fdfa81802d7c1ba25b19abc94cf36542efee53c 100644 (file)
--- a/dep/org.argeo.suite.dep.e4.rap/pom.xml
+++ b/dep/org.argeo.suite.dep.e4.rap/pom.xml
@@ -39,6 +39,7 @@
                        <groupId>org.argeo.connect</groupId>
                        <artifactId>org.argeo.connect.dep.e4.rap</artifactId>
                        <version>${version.argeo-connect}</version>
+                       <type>pom</type>
                </dependency>
                
                <!-- Argeo TP Extras -->
@@ -54,26 +55,43 @@
                        <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.suite</includeGroupIds>
-                                                                       <includeTypes>jar</includeTypes>
-                                                                       <includeScope>runtime</includeScope>
-                                                                       <useRepositoryLayout>true</useRepositoryLayout>
+                                                                       <descriptorRefs>
+                                                                               <descriptorRef>a2-source</descriptorRef>
+                                                                       </descriptorRefs>
                                                                </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.suite</includeGroupIds> -->
+<!--                                                                   <includeTypes>jar</includeTypes> -->
+<!--                                                                   <includeScope>runtime</includeScope> -->
+<!--                                                                   <useRepositoryLayout>true</useRepositoryLayout> -->
+<!--                                                           </configuration> -->
+<!--                                                   </execution> -->
+<!--                                           </executions> -->
+<!--                                   </plugin> -->
                                        <plugin>
                                                <groupId>org.codehaus.mojo</groupId>
                                                <artifactId>rpm-maven-plugin</artifactId>
@@ -85,7 +103,7 @@
                                                                        <goal>rpm</goal>
                                                                </goals>
                                                                <configuration>
-                                                                       <name>argeo-suite-e4</name>
+                                                                       <name>argeo-suite-e4-rap</name>
                                                                        <mappings>
                                                                                <mapping>
                                                                                        <directory>/usr/share/osgi</directory>
@@ -95,7 +113,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>
@@ -104,7 +122,7 @@
                                                                                </mapping>
                                                                        </mappings>
                                                                        <requires>
-                                                                               <require>argeo-connect-e4-tp</require>
+                                                                               <require>argeo-connect-e4-rap</require>
                                                                        </requires>
                                                                </configuration>
                                                        </execution>
diff --git a/dep/org.argeo.suite.dep.e4.rcp/pom.xml b/dep/org.argeo.suite.dep.e4.rcp/pom.xml
index 02d06abf2c89248d0a9b85ba6cf61df19a122a59..0c9c1f67d6f4096650bd096ea0eea7e758d869c9 100644 (file)
--- a/dep/org.argeo.suite.dep.e4.rcp/pom.xml
+++ b/dep/org.argeo.suite.dep.e4.rcp/pom.xml
@@ -34,6 +34,7 @@
                        <groupId>org.argeo.connect</groupId>
                        <artifactId>org.argeo.connect.dep.e4.rcp</artifactId>
                        <version>${version.argeo-connect}</version>
+                       <type>pom</type>
                </dependency>
                
                <!-- Argeo TP Extras -->
@@ -49,26 +50,43 @@
                        <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.suite</includeGroupIds>
-                                                                       <includeTypes>jar</includeTypes>
-                                                                       <includeScope>runtime</includeScope>
-                                                                       <useRepositoryLayout>true</useRepositoryLayout>
+                                                                       <descriptorRefs>
+                                                                               <descriptorRef>a2-source</descriptorRef>
+                                                                       </descriptorRefs>
                                                                </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.suite</includeGroupIds> -->
+<!--                                                                   <includeTypes>jar</includeTypes> -->
+<!--                                                                   <includeScope>runtime</includeScope> -->
+<!--                                                                   <useRepositoryLayout>true</useRepositoryLayout> -->
+<!--                                                           </configuration> -->
+<!--                                                   </execution> -->
+<!--                                           </executions> -->
+<!--                                   </plugin> -->
                                        <plugin>
                                                <groupId>org.codehaus.mojo</groupId>
                                                <artifactId>rpm-maven-plugin</artifactId>
@@ -90,7 +108,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>
diff --git a/dep/org.argeo.suite.platform/pom.xml b/dep/org.argeo.suite.platform/pom.xml
index 4e6153d36a6b3fd1b145e3f0d746f0647b0ed2ba..89489cad31cb303b291a71db1e9caf2e6f2c76b4 100644 (file)
--- a/dep/org.argeo.suite.platform/pom.xml
+++ b/dep/org.argeo.suite.platform/pom.xml
@@ -34,6 +34,7 @@
                        <groupId>org.argeo.connect</groupId>
                        <artifactId>org.argeo.connect.platform</artifactId>
                        <version>${version.argeo-connect}</version>
+                       <type>pom</type>
                </dependency>
                
                <!-- Argeo TP Extras -->
@@ -49,26 +50,43 @@
                        <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.suite</includeGroupIds>
-                                                                       <includeTypes>jar</includeTypes>
-                                                                       <includeScope>runtime</includeScope>
-                                                                       <useRepositoryLayout>true</useRepositoryLayout>
+                                                                       <descriptorRefs>
+                                                                               <descriptorRef>a2-source</descriptorRef>
+                                                                       </descriptorRefs>
                                                                </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.suite</includeGroupIds> -->
+<!--                                                                   <includeTypes>jar</includeTypes> -->
+<!--                                                                   <includeScope>runtime</includeScope> -->
+<!--                                                                   <useRepositoryLayout>true</useRepositoryLayout> -->
+<!--                                                           </configuration> -->
+<!--                                                   </execution> -->
+<!--                                           </executions> -->
+<!--                                   </plugin> -->
                                        <plugin>
                                                <groupId>org.codehaus.mojo</groupId>
                                                <artifactId>rpm-maven-plugin</artifactId>
@@ -90,7 +108,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>
diff --git a/dep/pom.xml b/dep/pom.xml
index 35b76e7e04217e41828d0a32a639e7cd9d4279ae..56b90d091e1db5f4da5d2db34a03d609f2200f71 100644 (file)
--- a/dep/pom.xml
+++ b/dep/pom.xml
@@ -39,6 +39,19 @@
                                        </execution>
                                </executions>
                        </plugin>
+                       <plugin>
+                               <artifactId>maven-assembly-plugin</artifactId>
+                               <dependencies>
+                                       <dependency>
+                                               <groupId>org.argeo.commons</groupId>
+                                               <artifactId>assembly-descriptors</artifactId>
+                                               <version>${version.argeo-commons}</version>
+                                       </dependency>
+                               </dependencies>
+                               <configuration>
+                                       <attach>false</attach>
+                               </configuration>
+                       </plugin>
                </plugins>
        </build>
        <dependencies>
Argeo Suite - Productivity Applications