Improve packaging

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

diff --git a/org.argeo.slc/pom.xml b/org.argeo.slc/pom.xml
index 3fc5c54bed46e46bad1930e039a59d51605cf9bb..d71c60d490c35f1a77aaef9e91092304d67b241d 100644 (file)
--- a/org.argeo.slc/pom.xml
+++ b/org.argeo.slc/pom.xml
@@ -7,17 +7,15 @@
        <artifactId>argeo-slc</artifactId>\r
        <packaging>pom</packaging>\r
        <name>Argeo SLC</name>\r
-       <version>0.5.2</version>\r
+       <version>0.6.0</version>\r
        <description>SLC Distribution</description>\r
        <url>\r
                http://www.argeo.org/projects/slc/${project.artfactId}/${project.version}\r
        </url>\r
-\r
        <modules>\r
                <module>../org.argeo.slc.core</module>\r
                <module>../org.argeo.slc.example</module>\r
        </modules>\r
-\r
        <scm>\r
                <connection>\r
                        scm:svn:https://www.argeo.org/svn/slc/trunk/org.argeo.slc\r
@@ -55,56 +53,45 @@
                </developer>\r
        </developers>\r
        <build>\r
-               <plugins>\r
-                       <plugin>\r
-                               <groupId>org.apache.maven.plugins</groupId>\r
-                               <artifactId>maven-compiler-plugin</artifactId>\r
-                               <configuration>\r
-                                       <source>1.5</source>\r
-                                       <target>1.5</target>\r
-                               </configuration>\r
-                       </plugin>\r
-                       <plugin>\r
-                               <groupId>org.apache.maven.plugins</groupId>\r
-                               <artifactId>maven-source-plugin</artifactId>\r
-                               <executions>\r
-                                       <execution>\r
-                                               <id>attach-sources</id>\r
-                                               <phase>verify</phase>\r
-                                               <goals>\r
-                                                       <goal>jar</goal>\r
-                                               </goals>\r
-                                       </execution>\r
-                               </executions>\r
-                       </plugin>\r
-                       <plugin>\r
-                               <groupId>org.apache.maven.plugins</groupId>\r
-                               <artifactId>maven-javadoc-plugin</artifactId>\r
-                               <executions>\r
-                                       <execution>\r
-                                               <id>attach-javadoc</id>\r
-                                               <phase>verify</phase>\r
-                                               <goals>\r
-                                                       <goal>jar</goal>\r
-                                               </goals>\r
-                                       </execution>\r
-                               </executions>\r
-                       </plugin>\r
-                       <!-- \r
+               <pluginManagement>\r
+                       <plugins>\r
                                <plugin>\r
-                               <groupId>org.apache.maven.plugins</groupId>\r
-                               <artifactId>maven-site-plugin</artifactId>\r
-                               <executions>\r
-                               <execution>\r
-                               <id>attach-javadoc</id>\r
-                               <phase>verify</phase>\r
-                               <goals>\r
-                               <goal>jar</goal>\r
-                               </goals>\r
-                               </execution>\r
-                               </executions>\r
+                                       <groupId>org.apache.maven.plugins</groupId>\r
+                                       <artifactId>maven-compiler-plugin</artifactId>\r
+                                       <configuration>\r
+                                               <source>1.5</source>\r
+                                               <target>1.5</target>\r
+                                       </configuration>\r
                                </plugin>\r
-                       -->\r
+                               <plugin>\r
+                                       <groupId>org.apache.maven.plugins</groupId>\r
+                                       <artifactId>maven-source-plugin</artifactId>\r
+                                       <executions>\r
+                                               <execution>\r
+                                                       <id>attach-sources</id>\r
+                                                       <phase>package</phase>\r
+                                                       <goals>\r
+                                                               <goal>jar</goal>\r
+                                                       </goals>\r
+                                               </execution>\r
+                                       </executions>\r
+                               </plugin>\r
+                               <plugin>\r
+                                       <groupId>org.apache.maven.plugins</groupId>\r
+                                       <artifactId>maven-javadoc-plugin</artifactId>\r
+                                       <executions>\r
+                                               <execution>\r
+                                                       <id>attach-javadoc</id>\r
+                                                       <phase>package</phase>\r
+                                                       <goals>\r
+                                                               <goal>jar</goal>\r
+                                                       </goals>\r
+                                               </execution>\r
+                                       </executions>\r
+                               </plugin>\r
+                       </plugins>\r
+               </pluginManagement>\r
+               <plugins>\r
                        <plugin>\r
                                <groupId>org.apache.maven.plugins</groupId>\r
                                <artifactId>maven-assembly-plugin</artifactId>\r
@@ -116,23 +103,6 @@
                                                </descriptor>\r
                                        </descriptors>\r
                                </configuration>\r
-                               <executions>\r
-                                       <execution>\r
-                                               <id>assembly-exampleSlcAppli</id>\r
-                                               <phase>verify</phase>\r
-                                               <inherited>false</inherited>\r
-                                               <goals>\r
-                                                       <goal>single</goal>\r
-                                               </goals>\r
-                                               <configuration>\r
-                                                       <descriptors>\r
-                                                               <descriptor>\r
-                                                                       src/assembly/base.xml\r
-                                                               </descriptor>\r
-                                                       </descriptors>\r
-                                               </configuration>\r
-                                       </execution>\r
-                               </executions>\r
                        </plugin>\r
                </plugins>\r
        </build>\r