]> git.argeo.org Git - gpl/argeo-slc.git/blobdiff - pom.xml
Improve Maven support in repo
[gpl/argeo-slc.git] / pom.xml
diff --git a/pom.xml b/pom.xml
index 3808b1e7ab1dc05d66235d3f63f209b6afa4cac2..afb0873f91242a9de423ebf958829dae1700fe5f 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
        <parent>
                <groupId>org.argeo.commons</groupId>
                <artifactId>argeo-commons</artifactId>
-               <version>0.2.3-SNAPSHOT</version>
+               <version>0.3.4-SNAPSHOT</version>
        </parent>
        <groupId>org.argeo.slc</groupId>
        <artifactId>argeo-slc</artifactId>
        <name>Argeo SLC</name>
        <version>0.13.1-SNAPSHOT</version>
        <properties>
-               <developmentCycle>0.13</developmentCycle>
+               <developmentCycle.slc>0.13</developmentCycle.slc>
                <site.repoBase>file:///srv/projects/www/slc/site</site.repoBase>
                <site.urlBase>http://projects.argeo.org/slc/site</site.urlBase>
-               <version.argeo-slc>0.13.1-SNAPSHOT</version.argeo-slc>
+               <version.slc>${developmentCycle.slc}.1-SNAPSHOT</version.slc>
        </properties>
        <modules>
                <module>runtime</module>
                <module>modules</module>
+<!--           <module>server</module> -->
                <module>eclipse</module>
-               <module>server</module>
                <module>demo</module>
                <module>dep</module>
-               <module>integration-tests</module>
-               <!-- <module>archetypes</module> -->
+               <!-- FIXME: integration tests are currently failing -->
+               <!-- <module>integration-tests</module> -->
                <module>dist</module>
        </modules>
-       <url>${site.urlBase}/${developmentCycle}</url>
+       <url>${site.urlBase}/${developmentCycle.slc}</url>
        <scm>
                <connection>scm:svn:https://svn.argeo.org/slc/trunk</connection>
                <developerConnection>scm:svn:https://svn.argeo.org/slc/trunk</developerConnection>
@@ -186,52 +186,21 @@ limitations under the License.
                        </plugin>
                </plugins>
        </build>
-
-
-       <!-- TO BE DELETED : done differently now to handle automatic generation 
-               of target platform. <build> <pluginManagement> <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> 
-               <artifactId>maven-compiler-plugin</artifactId> <version>2.3.2</version> <configuration> 
-               <source>1.5</source> <target>1.5</target> </configuration> </plugin> <plugin> 
-               <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-source-plugin</artifactId> 
-               <version>2.1.2</version> <executions> <execution> <id>attach-sources</id> 
-               <phase>package</phase> <goals> <goal>jar</goal> </goals> </execution> </executions> 
-               </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-clean-plugin</artifactId> 
-               <version>2.4.1</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> 
-               <artifactId>maven-surefire-plugin</artifactId> <version>2.7.1</version> </plugin> 
-               <plugin> <groupId>org.argeo.maven.plugins</groupId> <artifactId>maven-argeo-osgi-plugin</artifactId> 
-               <version>${version.maven-argeo-osgi}</version> </plugin> <plugin> <artifactId>maven-jar-plugin</artifactId> 
-               <version>2.3.1</version> <configuration> <archive> <manifestFile>target/classes/META-INF/MANIFEST.MF</manifestFile> 
-               </archive> </configuration> </plugin> <plugin> <groupId>org.apache.felix</groupId> 
-               <artifactId>maven-bundle-plugin</artifactId> <version>${version.maven-bundle-plugin}</version> 
-               <extensions>true</extensions> <configuration> <manifestLocation>target/classes/META-INF</manifestLocation> 
-               <instructions> <Bundle-Version>${project.version}-r${buildNumber}</Bundle-Version> 
-               <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName> <Bundle-RequiredExecutionEnvironment>J2SE-1.5</Bundle-RequiredExecutionEnvironment> 
-               <_removeheaders>Bnd-LastModified</_removeheaders> </instructions> </configuration> 
-               <executions> <execution> <id>bundle-manifest</id> <phase>process-classes</phase> 
-               <goals> <goal>manifest</goal> </goals> </execution> </executions> </plugin> 
-               </plugins> </pluginManagement> <plugins> <plugin> <groupId>org.codehaus.mojo</groupId> 
-               <artifactId>buildnumber-maven-plugin</artifactId> <version>1.0-beta-4</version> 
-               <executions> <execution> <phase>generate-resources</phase> <goals> <goal>create</goal> 
-               </goals> </execution> </executions> <configuration> <doCheck>false</doCheck> 
-               <doUpdate>false</doUpdate> <format>{0,date,yyyyMMdd_HHmmss}</format> <items> 
-               <item>timestamp</item> </items> <revisionOnScmFailure>git</revisionOnScmFailure> 
-               <providerImplementations> <git>svn</git> </providerImplementations> </configuration> 
-               </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-resources-plugin</artifactId> 
-               <version>2.4.3</version> <configuration> <encoding>UTF-8</encoding> </configuration> 
-               </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-site-plugin</artifactId> 
-               <version>2.1.1</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> 
-               <artifactId>maven-release-plugin</artifactId> <version>2.1</version> <configuration> 
-               <autoVersionSubmodules>true</autoVersionSubmodules> <releaseProfiles>release</releaseProfiles> 
-               <preparationGoals>clean install</preparationGoals> </configuration> </plugin> 
-               <plugin> <groupId>com.mycila.maven-license-plugin</groupId> <artifactId>maven-license-plugin</artifactId> 
-               <version>1.8.0</version> <configuration> <header>license-apache2-header.txt</header> 
-               <failIfMissing>true</failIfMissing> <aggregate>true</aggregate> <includes> 
-               <include>src/**/*.java</include> <include>src/**/*.xml</include> </includes> 
-               <excludes> <exclude>**/springutil/**</exclude> <exclude>**/qooxdoo-sdk/**</exclude> 
-               </excludes> <useDefaultExcludes>true</useDefaultExcludes> <mapping> <java>SLASHSTAR_STYLE</java> 
-               <xml>XML_STYLE</xml> </mapping> </configuration> </plugin> </plugins> </build> -->
        <dependencyManagement>
                <dependencies>
+                       <!-- FIXME : use distribution > v1.1.5 and remove this -->
+                       <dependency>
+                               <groupId>org.eclipse.core</groupId>
+                               <artifactId>org.eclipse.core.databinding.observable</artifactId>
+                               <version>1.3.0</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.eclipse.core</groupId>
+                               <artifactId>org.eclipse.core.databinding.property</artifactId>
+                               <version>1.3.0</version>
+                       </dependency>
+
+
                        <dependency>
                                <groupId>org.argeo.dep</groupId>
                                <artifactId>versions-all</artifactId>
@@ -244,92 +213,92 @@ limitations under the License.
                        <dependency>
                                <groupId>org.argeo.slc.runtime</groupId>
                                <artifactId>org.argeo.slc.specs</artifactId>
-                               <version>${project.version}</version>
+                               <version>${version.slc}</version>
                        </dependency>
                        <dependency>
                                <groupId>org.argeo.slc.runtime</groupId>
                                <artifactId>org.argeo.slc.core</artifactId>
-                               <version>${project.version}</version>
+                               <version>${version.slc}</version>
                        </dependency>
                        <dependency>
                                <groupId>org.argeo.slc.runtime</groupId>
                                <artifactId>org.argeo.slc.unit</artifactId>
-                               <version>${project.version}</version>
+                               <version>${version.slc}</version>
                        </dependency>
                        <dependency>
                                <groupId>org.argeo.slc.runtime</groupId>
                                <artifactId>org.argeo.slc.launcher</artifactId>
-                               <version>${project.version}</version>
+                               <version>${version.slc}</version>
                        </dependency>
                        <dependency>
                                <groupId>org.argeo.slc.runtime</groupId>
                                <artifactId>org.argeo.slc.detached</artifactId>
-                               <version>${project.version}</version>
+                               <version>${version.slc}</version>
                        </dependency>
                        <dependency>
                                <groupId>org.argeo.slc.runtime</groupId>
                                <artifactId>org.argeo.slc.lib.detached</artifactId>
-                               <version>${project.version}</version>
+                               <version>${version.slc}</version>
                        </dependency>
                        <dependency>
                                <groupId>org.argeo.slc.runtime</groupId>
                                <artifactId>org.argeo.slc.support.simple</artifactId>
-                               <version>${project.version}</version>
+                               <version>${version.slc}</version>
                        </dependency>
                        <dependency>
                                <groupId>org.argeo.slc.runtime</groupId>
                                <artifactId>org.argeo.slc.support.ant</artifactId>
-                               <version>${project.version}</version>
+                               <version>${version.slc}</version>
                        </dependency>
                        <dependency>
                                <groupId>org.argeo.slc.runtime</groupId>
                                <artifactId>org.argeo.slc.support.maven</artifactId>
-                               <version>${project.version}</version>
+                               <version>${version.slc}</version>
                        </dependency>
                        <dependency>
                                <groupId>org.argeo.slc.runtime</groupId>
                                <artifactId>org.argeo.slc.support.hibernate</artifactId>
-                               <version>${project.version}</version>
+                               <version>${version.slc}</version>
                        </dependency>
                        <dependency>
                                <groupId>org.argeo.slc.runtime</groupId>
                                <artifactId>org.argeo.slc.support.castor</artifactId>
-                               <version>${project.version}</version>
+                               <version>${version.slc}</version>
                        </dependency>
                        <dependency>
                                <groupId>org.argeo.slc.runtime</groupId>
                                <artifactId>org.argeo.slc.support.activemq</artifactId>
-                               <version>${project.version}</version>
+                               <version>${version.slc}</version>
                        </dependency>
                        <dependency>
                                <groupId>org.argeo.slc.runtime</groupId>
                                <artifactId>org.argeo.slc.support.jcr</artifactId>
-                               <version>${project.version}</version>
+                               <version>${version.slc}</version>
                        </dependency>
                        <dependency>
                                <groupId>org.argeo.slc.runtime</groupId>
                                <artifactId>org.argeo.slc.server</artifactId>
-                               <version>${project.version}</version>
+                               <version>${version.slc}</version>
                        </dependency>
                        <dependency>
                                <groupId>org.argeo.slc.runtime</groupId>
                                <artifactId>org.argeo.slc.support.osgi</artifactId>
-                               <version>${project.version}</version>
+                               <version>${version.slc}</version>
                        </dependency>
                        <dependency>
                                <groupId>org.argeo.slc.runtime</groupId>
                                <artifactId>org.argeo.slc.support.equinox</artifactId>
-                               <version>${project.version}</version>
+                               <version>${version.slc}</version>
                        </dependency>
                        <dependency>
                                <groupId>org.argeo.slc.runtime</groupId>
                                <artifactId>org.argeo.slc.support.jemmy</artifactId>
-                               <version>${project.version}</version>
+                               <version>${version.slc}</version>
                        </dependency>
                        <dependency>
                                <groupId>org.argeo.slc.server</groupId>
                                <artifactId>org.argeo.slc.ria</artifactId>
-                               <version>${project.version}</version>
+                               <version>${version.slc}</version>
                        </dependency>
                        <dependency>
                                <groupId>org.argeo.ria</groupId>
@@ -339,14 +308,14 @@ limitations under the License.
                        <dependency>
                                <groupId>org.argeo.slc.server</groupId>
                                <artifactId>deploy</artifactId>
-                               <version>${project.version}</version>
+                               <version>${version.slc}</version>
                                <type>pom</type>
                        </dependency>
                        <!-- SLC dubious -->
                        <dependency>
                                <groupId>org.argeo.slc.runtime</groupId>
                                <artifactId>org.argeo.slc.detached.launcher</artifactId>
-                               <version>${project.version}</version>
+                               <version>${version.slc}</version>
                                <type>tar.gz</type>
                                <classifier>dist</classifier>
                        </dependency>
@@ -415,7 +384,7 @@ limitations under the License.
                <site>
                        <id>argeo-slc-site</id>
                        <name>SLC Site</name>
-                       <url>file://${site.repoBase}/${developmentCycle}/</url>
+                       <url>file://${site.repoBase}/${developmentCycle.slc}/</url>
                </site>
        </distributionManagement>
        <reporting>
@@ -534,7 +503,7 @@ limitations under the License.
                                <site>
                                        <id>argeo-slc-site</id>
                                        <name>SLC Site</name>
-                                       <url>file://${site.repoBase}/${project.version}</url>
+                                       <url>file://${site.repoBase}/${version.slc}</url>
                                </site>
                        </distributionManagement>
                </profile>