X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=pom.xml;h=afb0873f91242a9de423ebf958829dae1700fe5f;hb=49080f09ed17e6331c95594b012cf1dd5bded8f6;hp=cb36f1991220b74a1c19ce501631a63335ae7a2d;hpb=05f3f8d7c67bffd535ecbf5aa575eb9d41a435b4;p=gpl%2Fargeo-slc.git

diff --git a/pom.xml b/pom.xml
index cb36f1991..afb0873f9 100644
--- 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>
@@ -20,12 +20,12 @@
 	<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.slc}</url>
@@ -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>${version.slc}-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>