projects
/
gpl
/
argeo-suite.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Adapt to changes in Argeo Commons
[gpl/argeo-suite.git]
/
pom.xml
diff --git
a/pom.xml
b/pom.xml
index 7161191b04af7f0e2c02167a76d46f09efdb99aa..2829432582202372229c4a5e3e69e399720be38b 100644
(file)
--- a/
pom.xml
+++ b/
pom.xml
@@
-1,11
+1,9
@@
-<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.maven</groupId>
<artifactId>argeo-osgi-parent</artifactId>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.argeo.maven</groupId>
<artifactId>argeo-osgi-parent</artifactId>
- <version>2.1.
6
</version>
+ <version>2.1.
7
</version>
</parent>
<groupId>org.argeo.suite</groupId>
<artifactId>argeo-suite</artifactId>
</parent>
<groupId>org.argeo.suite</groupId>
<artifactId>argeo-suite</artifactId>
@@
-19,7
+17,6
@@
<version.argeo-tp>2.1.27</version.argeo-tp>
<version.argeo-commons>2.3-SNAPSHOT</version.argeo-commons>
<version.argeo-suite-icons>2.3.1</version.argeo-suite-icons>
<version.argeo-tp>2.1.27</version.argeo-tp>
<version.argeo-commons>2.3-SNAPSHOT</version.argeo-commons>
<version.argeo-suite-icons>2.3.1</version.argeo-suite-icons>
- <!-- <version.argeo-rcp>2.3-SNAPSHOT</version.argeo-rcp> -->
<git.rw />
</properties>
<modules>
<git.rw />
</properties>
<modules>
@@
-85,6
+82,11
@@
<groupId>org.argeo.tp.misc</groupId>
<artifactId>slf4j.osgi</artifactId>
</exclusion>
<groupId>org.argeo.tp.misc</groupId>
<artifactId>slf4j.osgi</artifactId>
</exclusion>
+ <!-- Make sure JTA is not used anymore -->
+ <exclusion>
+ <groupId>org.argeo.tp.javax</groupId>
+ <artifactId>javax.transaction-api</artifactId>
+ </exclusion>
</exclusions>
</dependency>
</dependencies>
</exclusions>
</dependency>
</dependencies>