Use released Argeo Commons

diff --git a/dep/org.argeo.slc.dep.minimal/pom.xml b/dep/org.argeo.slc.dep.minimal/pom.xml
index af9bbdcf52732e60616ad026c7517cfa3ced67be..8b74da1a3b4d45132a05c225d3292a256e4d0125 100644 (file)
--- a/dep/org.argeo.slc.dep.minimal/pom.xml
+++ b/dep/org.argeo.slc.dep.minimal/pom.xml
@@ -10,6 +10,15 @@
        <name>SLC Agent</name>
        <build>
                <plugins>
+                       <plugin>
+                               <groupId>org.apache.felix</groupId>
+                               <artifactId>maven-bundle-plugin</artifactId>
+                               <configuration>
+                                       <instructions>
+                                               <SLC-ModularDistribution>default</SLC-ModularDistribution>
+                                       </instructions>
+                               </configuration>
+                       </plugin>
                        <plugin>
                                <groupId>org.argeo.maven.plugins</groupId>
                                <artifactId>maven-argeo-osgi-plugin</artifactId>
@@ -23,19 +32,19 @@
                                        </execution>
                                </executions>
                        </plugin>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-dependency-plugin</artifactId>
-                               <executions>
-                                       <execution>
-                                               <id>copy-dependencies</id>
-                                               <phase>package</phase>
-                                               <goals>
-                                                       <goal>copy-dependencies</goal>
-                                               </goals>
-                                       </execution>
-                               </executions>
-                       </plugin>
+<!--                   <plugin> -->
+<!--                           <groupId>org.apache.maven.plugins</groupId> -->
+<!--                           <artifactId>maven-dependency-plugin</artifactId> -->
+<!--                           <executions> -->
+<!--                                   <execution> -->
+<!--                                           <id>copy-dependencies</id> -->
+<!--                                           <phase>package</phase> -->
+<!--                                           <goals> -->
+<!--                                                   <goal>copy-dependencies</goal> -->
+<!--                                           </goals> -->
+<!--                                   </execution> -->
+<!--                           </executions> -->
+<!--                   </plugin> -->
                </plugins>
        </build>
        <dependencies>

diff --git a/pom.xml b/pom.xml
index 49cfb3e65578aaa1b844714385d79daff4f31b12..13c7ac18c27e1c4e44a82659f6bf91180ffe7429 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -1,9 +1,10 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
        <modelVersion>4.0.0</modelVersion>
        <parent>
                <groupId>org.argeo.commons</groupId>
                <artifactId>argeo-commons</artifactId>
-               <version>2.1.72-SNAPSHOT</version>
+               <version>2.1.72</version>
        </parent>
        <groupId>org.argeo.slc</groupId>
        <artifactId>argeo-slc</artifactId>
@@ -15,8 +16,8 @@
                <version.slc>2.1.12-SNAPSHOT</version.slc>
                <developmentCycle.slc>2.1</developmentCycle.slc>
 
-               <version.argeo-rcp>2.1.17-SNAPSHOT</version.argeo-rcp>
-               <version.equinox>3.12.50.v20170928-1321</version.equinox>
+               <!-- <version.argeo-rcp>2.1.17-SNAPSHOT</version.argeo-rcp> -->
+               <!-- <version.equinox>3.12.50.v20170928-1321</version.equinox> -->
                <!-- Embedded Maven -->
                <!-- <version.maven>3.2.5</version.maven> -->
        </properties>
@@ -43,7 +44,7 @@
 
                <module>lib</module>
                <module>dep</module>
-<!--           <module>ide</module> -->
+               <!-- <module>ide</module> -->
                <module>dist</module>
                <module>demo</module>
        </modules>