Don't switch to log

[gpl/argeo-slc.git] / dist / org.argeo.slc.sdk / pom.xml

diff --git a/dist/org.argeo.slc.sdk/pom.xml b/dist/org.argeo.slc.sdk/pom.xml
index 879b206b8531f216333a7a521f82b96c5d561937..2e33e26fbee0b14efceb87880db01d69c2555308 100644 (file)
--- a/dist/org.argeo.slc.sdk/pom.xml
+++ b/dist/org.argeo.slc.sdk/pom.xml
@@ -45,6 +45,7 @@
                                                        <goal>pde-sources</goal>
                                                </goals>
                                                <configuration>
+                                                       <copyArtifacts>true</copyArtifacts>
                                                </configuration>
                                        </execution>
                                        <execution>
@@ -91,25 +92,25 @@
                                        </execution>
                                </executions>
                        </plugin>
-<!--                   <plugin>-->
-<!--                           <groupId>org.apache.maven.plugins</groupId>-->
-<!--                           <artifactId>maven-assembly-plugin</artifactId>-->
-<!--                           <configuration>-->
-<!--                                   <descriptors>-->
-<!--                                           <descriptor>src/assembly/dist.xml</descriptor>-->
-<!--                                           <descriptor>src/assembly/devel.xml</descriptor>-->
-<!--                                   </descriptors>-->
-<!--                           </configuration>-->
-<!--                           <executions>-->
-<!--                                   <execution>-->
-<!--                                           <id>attach-assembly</id>-->
-<!--                                           <phase>package</phase>-->
-<!--                                           <goals>-->
-<!--                                                   <goal>single</goal>-->
-<!--                                           </goals>-->
-<!--                                   </execution>-->
-<!--                           </executions>-->
-<!--                   </plugin>-->
+                       <plugin>
+                               <groupId>org.apache.maven.plugins</groupId>
+                               <artifactId>maven-assembly-plugin</artifactId>
+                               <configuration>
+                                       <descriptors>
+                                               <descriptor>src/assembly/dist.xml</descriptor>
+                                               <descriptor>src/assembly/devel.xml</descriptor>
+                                       </descriptors>
+                               </configuration>
+                               <executions>
+                                       <execution>
+                                               <id>attach-assembly</id>
+                                               <phase>package</phase>
+                                               <goals>
+                                                       <goal>single</goal>
+                                               </goals>
+                                       </execution>
+                               </executions>
+                       </plugin>
                        <!-- <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>exec-maven-plugin</artifactId> 
                                <version>1.1</version> <executions> <execution> <id>create-repository</id> 
                                <phase>deploy</phase> <goals> <goal>exec</goal> </goals> </execution> </executions> 
@@ -140,13 +141,8 @@
        <dependencies>
                <dependency>
                        <groupId>org.argeo.slc.dep</groupId>
-                       <artifactId>org.argeo.slc.dep.sdk</artifactId>
-                       <version>${project.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.slc.dep</groupId>
-                       <artifactId>org.argeo.slc.dep.sdk.sources</artifactId>
-                       <version>${project.version}</version>
+                       <artifactId>org.argeo.slc.dep.sdk.rcp</artifactId>
+                       <version>${version.slc}</version>
                </dependency>
        </dependencies>
        <profiles>
@@ -163,7 +159,7 @@
                        </activation>
 
                        <properties>
-                               <package.version>${project.version}</package.version>
+                               <package.version>${version.slc}</package.version>
                                <distribution.label>argeo</distribution.label>
                                <distribution.root>/var/argeo/linux/argeo-el/5/argeo-testing</distribution.root>
                        </properties>
@@ -344,6 +340,7 @@
                                                                        </mappings>
                                                                        <requires>
                                                                                <require>org.argeo.slc.sdk</require>
+                                                                               <!-- <require> org.argeo.slc.dep.sdk.rcp</require> -->
                                                                        </requires>
                                                                </configuration>
                                                        </execution>