projects / lgpl / argeo-commons.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 9c6bad2)
Work on Argeo TP v2.1.19
authorMathieu Baudier <mbaudier@argeo.org>
Thu, 28 Dec 2017 21:48:04 +0000 (22:48 +0100)
committerMathieu Baudier <mbaudier@argeo.org>
Thu, 28 Dec 2017 21:48:04 +0000 (22:48 +0100)
dep/org.argeo.dep.cms.platform/pom.xml patch | blob | history
dep/org.argeo.dep.cms.sdk/pom.xml patch | blob | history
pom.xml patch | blob | history

diff --git a/dep/org.argeo.dep.cms.platform/pom.xml b/dep/org.argeo.dep.cms.platform/pom.xml
index aeadd914c4c7037786ad4ed39c78e2ed0daf8a0b..4ac46a8cbd73dee4242c6f8cbec67815ac880589 100644 (file)
--- a/dep/org.argeo.dep.cms.platform/pom.xml
+++ b/dep/org.argeo.dep.cms.platform/pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<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>
@@ -55,36 +56,46 @@
                        <groupId>org.argeo.tp.apache.ant</groupId>
                        <artifactId>org.apache.ant.launch</artifactId>
                </dependency>
-<!--           <dependency> -->
-<!--                   <groupId>org.argeo.tp.misc</groupId> -->
-<!--                   <artifactId>org.quartz-scheduler.quartz</artifactId> -->
-<!--           </dependency> -->
-<!--           <dependency> -->
-<!--                   <groupId>org.argeo.tp.misc</groupId> -->
-<!--                   <artifactId>org.quartz-scheduler.quartz.jobs</artifactId> -->
-<!--           </dependency> -->
+               <!-- <dependency> -->
+               <!-- <groupId>org.argeo.tp.misc</groupId> -->
+               <!-- <artifactId>org.quartz-scheduler.quartz</artifactId> -->
+               <!-- </dependency> -->
+               <!-- <dependency> -->
+               <!-- <groupId>org.argeo.tp.misc</groupId> -->
+               <!-- <artifactId>org.quartz-scheduler.quartz.jobs</artifactId> -->
+               <!-- </dependency> -->
                <dependency>
                        <groupId>org.argeo.tp.javax</groupId>
                        <artifactId>javax.mail</artifactId>
                </dependency>
 
-               <!-- RAP Workbench -->
+               <!-- Spring -->
                <dependency>
-                       <groupId>org.argeo.tp.rap.platform</groupId>
-                       <artifactId>org.eclipse.rap.ui</artifactId>
+                       <groupId>org.argeo.tp.spring</groupId>
+                       <artifactId>org.springframework.aspects</artifactId>
                </dependency>
                <dependency>
-                       <groupId>org.argeo.tp.rap.platform</groupId>
-                       <artifactId>org.eclipse.rap.ui.forms</artifactId>
+                       <groupId>org.argeo.tp.spring</groupId>
+                       <artifactId>org.springframework.context.support</artifactId>
                </dependency>
                <dependency>
-                       <groupId>org.argeo.tp.rap.platform</groupId>
-                       <artifactId>org.eclipse.rap.ui.views</artifactId>
+                       <groupId>org.argeo.tp.spring</groupId>
+                       <artifactId>org.springframework.jdbc</artifactId>
                </dependency>
                <dependency>
-                       <groupId>org.argeo.tp.rap.platform</groupId>
-                       <artifactId>org.eclipse.rap.ui.workbench</artifactId>
+                       <groupId>org.argeo.tp.spring</groupId>
+                       <artifactId>org.springframework.tx</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.spring</groupId>
+                       <artifactId>org.springframework.web</artifactId>
                </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.spring</groupId>
+                       <artifactId>org.springframework.web.servlet</artifactId>
+               </dependency>
+
+               <!-- Eclipse Core -->
                <dependency>
                        <groupId>org.argeo.tp.rap.platform</groupId>
                        <artifactId>org.eclipse.core.databinding</artifactId>
@@ -134,31 +145,110 @@
                        <artifactId>org.eclipse.help</artifactId>
                </dependency>
 
-               <!-- Spring -->
-               <dependency>
-                       <groupId>org.argeo.tp.spring</groupId>
-                       <artifactId>org.springframework.aspects</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.tp.spring</groupId>
-                       <artifactId>org.springframework.context.support</artifactId>
-               </dependency>
+               <!-- RAP Workbench -->
                <dependency>
-                       <groupId>org.argeo.tp.spring</groupId>
-                       <artifactId>org.springframework.jdbc</artifactId>
+                       <groupId>org.argeo.tp.rap.platform</groupId>
+                       <artifactId>org.eclipse.rap.ui</artifactId>
                </dependency>
                <dependency>
-                       <groupId>org.argeo.tp.spring</groupId>
-                       <artifactId>org.springframework.tx</artifactId>
+                       <groupId>org.argeo.tp.rap.platform</groupId>
+                       <artifactId>org.eclipse.rap.ui.forms</artifactId>
                </dependency>
                <dependency>
-                       <groupId>org.argeo.tp.spring</groupId>
-                       <artifactId>org.springframework.web</artifactId>
+                       <groupId>org.argeo.tp.rap.platform</groupId>
+                       <artifactId>org.eclipse.rap.ui.views</artifactId>
                </dependency>
                <dependency>
-                       <groupId>org.argeo.tp.spring</groupId>
-                       <artifactId>org.springframework.web.servlet</artifactId>
+                       <groupId>org.argeo.tp.rap.platform</groupId>
+                       <artifactId>org.eclipse.rap.ui.workbench</artifactId>
                </dependency>
+
+               <!-- Eclipse 4 -->
+               <!-- <dependency> -->
+               <!-- <groupId>org.argeo.tp.rap.platform</groupId> -->
+               <!-- <artifactId>org.eclipse.rap.e4</artifactId> -->
+               <!-- </dependency> -->
+               <!-- <dependency> -->
+               <!-- <groupId>org.argeo.tp.rap.platform</groupId> -->
+               <!-- <artifactId>org.eclipse.emf.common</artifactId> -->
+               <!-- </dependency> -->
+               <!-- <dependency> -->
+               <!-- <groupId>org.argeo.tp.rap.platform</groupId> -->
+               <!-- <artifactId>org.eclipse.emf.ecore.change</artifactId> -->
+               <!-- </dependency> -->
+               <!-- <dependency> -->
+               <!-- <groupId>org.argeo.tp.rap.platform</groupId> -->
+               <!-- <artifactId>org.eclipse.emf.ecore.xmi</artifactId> -->
+               <!-- </dependency> -->
+               <!-- <dependency> -->
+               <!-- <groupId>org.argeo.tp.rap.platform</groupId> -->
+               <!-- <artifactId>org.eclipse.e4.ui.workbench.renderers.swt</artifactId> -->
+               <!-- </dependency> -->
+               <!-- <dependency> -->
+               <!-- <groupId>org.argeo.tp.rap.platform</groupId> -->
+               <!-- <artifactId>org.eclipse.e4.ui.di</artifactId> -->
+               <!-- </dependency> -->
+               <!-- <dependency> -->
+               <!-- <groupId>org.argeo.tp.rap.platform</groupId> -->
+               <!-- <artifactId>org.eclipse.e4.core.di</artifactId> -->
+               <!-- </dependency> -->
+               <!-- <dependency> -->
+               <!-- <groupId>org.argeo.tp.rap.platform</groupId> -->
+               <!-- <artifactId>org.eclipse.e4.ui.workbench.addons.swt</artifactId> -->
+               <!-- </dependency> -->
+               <!-- <dependency> -->
+               <!-- <groupId>org.argeo.tp.rap.platform</groupId> -->
+               <!-- <artifactId>org.eclipse.e4.core.commands</artifactId> -->
+               <!-- </dependency> -->
+               <!-- <dependency> -->
+               <!-- <groupId>org.argeo.tp.rap.platform</groupId> -->
+               <!-- <artifactId>org.eclipse.e4.ui.bindings</artifactId> -->
+               <!-- </dependency> -->
+               <!-- <dependency> -->
+               <!-- <groupId>org.argeo.tp.rap.platform</groupId> -->
+               <!-- <artifactId>org.eclipse.e4.ui.workbench.swt</artifactId> -->
+               <!-- </dependency> -->
+               <!-- <dependency> -->
+               <!-- <groupId>org.argeo.tp.rap.platform</groupId> -->
+               <!-- <artifactId>org.eclipse.e4.core.di.extensions.supplier</artifactId> -->
+               <!-- </dependency> -->
+               <!-- <dependency> -->
+               <!-- <groupId>org.argeo.tp.rap.platform</groupId> -->
+               <!-- <artifactId>org.eclipse.e4.ui.model.workbench</artifactId> -->
+               <!-- </dependency> -->
+               <!-- <dependency> -->
+               <!-- <groupId>org.argeo.tp.rap.platform</groupId> -->
+               <!-- <artifactId>org.eclipse.e4.emf.xpath</artifactId> -->
+               <!-- </dependency> -->
+               <!-- <dependency> -->
+               <!-- <groupId>org.argeo.tp.rap.platform</groupId> -->
+               <!-- <artifactId>org.eclipse.e4.core.contexts</artifactId> -->
+               <!-- </dependency> -->
+               <!-- <dependency> -->
+               <!-- <groupId>org.argeo.tp.rap.platform</groupId> -->
+               <!-- <artifactId>org.eclipse.e4.core.services</artifactId> -->
+               <!-- </dependency> -->
+               <!-- <dependency> -->
+               <!-- <groupId>org.argeo.tp.rap.platform</groupId> -->
+               <!-- <artifactId>org.eclipse.e4.core.di.annotations</artifactId> -->
+               <!-- </dependency> -->
+               <!-- <dependency> -->
+               <!-- <groupId>org.argeo.tp.rap.platform</groupId> -->
+               <!-- <artifactId>org.eclipse.e4.ui.services</artifactId> -->
+               <!-- </dependency> -->
+               <!-- <dependency> -->
+               <!-- <groupId>org.argeo.tp.rap.platform</groupId> -->
+               <!-- <artifactId>org.eclipse.rap.fileupload</artifactId> -->
+               <!-- </dependency> -->
+               <!-- <dependency> -->
+               <!-- <groupId>org.argeo.tp.rap.platform</groupId> -->
+               <!-- <artifactId>org.eclipse.e4.core.di.extensions</artifactId> -->
+               <!-- </dependency> -->
+               <!-- <dependency> -->
+               <!-- <groupId>org.argeo.tp.rap.platform</groupId> -->
+               <!-- <artifactId>org.eclipse.e4.ui.workbench</artifactId> -->
+               <!-- </dependency> -->
+
        </dependencies>
 
        <profiles>
diff --git a/dep/org.argeo.dep.cms.sdk/pom.xml b/dep/org.argeo.dep.cms.sdk/pom.xml
index c6ce350777aba8b4eecd1d8cb5b37c2fe077f731..63ca846ba004f5af4b4e8a2345cf96c2aea99033 100644 (file)
--- a/dep/org.argeo.dep.cms.sdk/pom.xml
+++ b/dep/org.argeo.dep.cms.sdk/pom.xml
@@ -40,34 +40,34 @@
                        <groupId>org.argeo.tp.sdk</groupId>
                        <artifactId>org.dbunit</artifactId>
                </dependency>
-               <dependency>
-                       <groupId>org.argeo.tp.aether</groupId>
-                       <artifactId>org.eclipse.aether.api</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.tp.aether</groupId>
-                       <artifactId>org.eclipse.aether.spi</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.tp.aether</groupId>
-                       <artifactId>org.eclipse.aether.util</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.tp.aether</groupId>
-                       <artifactId>org.eclipse.aether.impl</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.tp.aether</groupId>
-                       <artifactId>org.eclipse.aether.connector.basic</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.tp.aether</groupId>
-                       <artifactId>org.eclipse.aether.transport.classpath</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.tp.aether</groupId>
-                       <artifactId>org.eclipse.aether.transport.file</artifactId>
-               </dependency>
+<!--           <dependency> -->
+<!--                   <groupId>org.argeo.tp.aether</groupId> -->
+<!--                   <artifactId>org.eclipse.aether.api</artifactId> -->
+<!--           </dependency> -->
+<!--           <dependency> -->
+<!--                   <groupId>org.argeo.tp.aether</groupId> -->
+<!--                   <artifactId>org.eclipse.aether.spi</artifactId> -->
+<!--           </dependency> -->
+<!--           <dependency> -->
+<!--                   <groupId>org.argeo.tp.aether</groupId> -->
+<!--                   <artifactId>org.eclipse.aether.util</artifactId> -->
+<!--           </dependency> -->
+<!--           <dependency> -->
+<!--                   <groupId>org.argeo.tp.aether</groupId> -->
+<!--                   <artifactId>org.eclipse.aether.impl</artifactId> -->
+<!--           </dependency> -->
+<!--           <dependency> -->
+<!--                   <groupId>org.argeo.tp.aether</groupId> -->
+<!--                   <artifactId>org.eclipse.aether.connector.basic</artifactId> -->
+<!--           </dependency> -->
+<!--           <dependency> -->
+<!--                   <groupId>org.argeo.tp.aether</groupId> -->
+<!--                   <artifactId>org.eclipse.aether.transport.classpath</artifactId> -->
+<!--           </dependency> -->
+<!--           <dependency> -->
+<!--                   <groupId>org.argeo.tp.aether</groupId> -->
+<!--                   <artifactId>org.eclipse.aether.transport.file</artifactId> -->
+<!--           </dependency> -->
                <dependency>
                        <groupId>org.argeo.tp.sdk</groupId>
                        <artifactId>org.redline-rpm</artifactId>
diff --git a/pom.xml b/pom.xml
index c2bc411c72b69292e5240eda755547769996ebc1..36e7e7e253b04a21ce3d2616bb46ad1bf9c1ae82 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
                <version.argeo-commons>2.1.71-SNAPSHOT</version.argeo-commons>
                <developmentCycle.argeo-commons>2.1</developmentCycle.argeo-commons>
                <developmentCycle.argeo-commons.startDate>2012-12-19</developmentCycle.argeo-commons.startDate>
-               <version.argeo-distribution>2.1.18</version.argeo-distribution>
+               <version.argeo-distribution>2.1.19</version.argeo-distribution>
                <!-- RPM -->
                <argeo.rpm.release>7</argeo.rpm.release>
                <argeo.rpm.stagingRepository>/srv/rpmfactory/argeo-osgi-2-staging/7/x86_64</argeo.rpm.stagingRepository>
Argeo Commons - Lightweight integration framework in pure Java/OSGi