<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.argeo.commons</groupId>
- <version>2.1.74</version>
+ <version>2.1.100</version>
<artifactId>dep</artifactId>
<relativePath>..</relativePath>
</parent>
<!-- Argeo Commons -->
<dependency>
<groupId>org.argeo.commons</groupId>
- <artifactId>org.argeo.util</artifactId>
- <version>2.1.74</version>
+ <artifactId>org.argeo.enterprise</artifactId>
+ <version>2.1.100</version>
</dependency>
<dependency>
<groupId>org.argeo.commons</groupId>
<artifactId>org.argeo.jcr</artifactId>
- <version>2.1.74</version>
+ <version>2.1.100</version>
+ </dependency>
+ <dependency>
+ <groupId>org.argeo.commons</groupId>
+ <artifactId>org.argeo.core</artifactId>
+ <version>2.1.100</version>
</dependency>
<!-- Third Parties -->
</dependency>
<dependency>
<groupId>org.argeo.tp.javax</groupId>
- <artifactId>javax.transaction</artifactId>
+ <artifactId>javax.el-api</artifactId>
</dependency>
<dependency>
- <groupId>org.argeo.tp.apache</groupId>
- <artifactId>org.apache.log4j</artifactId>
+ <groupId>org.argeo.tp.javax</groupId>
+ <artifactId>javax.interceptor-api</artifactId>
</dependency>
<dependency>
- <groupId>org.argeo.tp.misc</groupId>
- <artifactId>com.jcraft.jsch</artifactId>
+ <groupId>org.argeo.tp.javax</groupId>
+ <artifactId>javax.enterprise.cdi-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.argeo.tp.javax</groupId>
+ <artifactId>javax.transaction-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.argeo.tp.apache</groupId>
+ <artifactId>org.apache.log4j</artifactId>
</dependency>
<dependency>
<groupId>org.argeo.tp.misc</groupId>
<groupId>org.argeo.tp.misc</groupId>
<artifactId>org.slf4j.commons.logging</artifactId>
</dependency>
+
+ <!-- OSGi annotations -->
+<!-- <dependency> -->
+<!-- <groupId>org.argeo.tp.sdk</groupId> -->
+<!-- <artifactId>osgi.annotation</artifactId> -->
+<!-- </dependency> -->
+<!-- <dependency> -->
+<!-- <groupId>org.argeo.tp.sdk</groupId> -->
+<!-- <artifactId>org.osgi.service.metatype.annotations</artifactId> -->
+<!-- </dependency> -->
+<!-- <dependency> -->
+<!-- <groupId>org.argeo.tp.sdk</groupId> -->
+<!-- <artifactId>org.osgi.service.component.annotations</artifactId> -->
+<!-- </dependency> -->
+
+
<dependency>
<groupId>org.argeo.tp.bouncycastle</groupId>
- <artifactId>bcprov</artifactId>
+ <artifactId>bcpkix</artifactId>
</dependency>
<dependency>
<groupId>org.argeo.tp.bouncycastle</groupId>
- <artifactId>bcpkix</artifactId>
+ <artifactId>bcpg</artifactId>
</dependency>
+
<dependency>
<groupId>org.argeo.tp.apache</groupId>
<artifactId>org.apache.httpcomponents.httpcore</artifactId>
</dependency>
<dependency>
<groupId>org.argeo.tp.apache.commons</groupId>
- <artifactId>org.apache.commons.httpclient</artifactId>
+ <artifactId>org.apache.commons.cli</artifactId>
</dependency>
<dependency>
<groupId>org.argeo.tp.apache.commons</groupId>
- <artifactId>org.apache.commons.vfs</artifactId>
+ <artifactId>org.apache.commons.httpclient</artifactId>
</dependency>
<dependency>
<groupId>org.argeo.tp.apache.commons</groupId>
<groupId>org.argeo.tp.apache.commons</groupId>
<artifactId>org.apache.commons.collections</artifactId>
</dependency>
- <dependency>
- <groupId>org.argeo.tp.apache.commons</groupId>
- <artifactId>org.apache.commons.dbcp</artifactId>
- </dependency>
- <dependency>
- <groupId>org.argeo.tp.apache.commons</groupId>
- <artifactId>org.apache.commons.pool</artifactId>
- </dependency>
<dependency>
<groupId>org.argeo.tp.apache.commons</groupId>
<artifactId>org.apache.commons.compress</artifactId>
</dependency>
- <dependency>
- <groupId>org.argeo.tp.javax</groupId>
- <artifactId>javax.servlet</artifactId>
- </dependency>
+
+ <!-- Equinox -->
<dependency>
<groupId>org.argeo.tp.equinox</groupId>
<artifactId>org.eclipse.osgi.util</artifactId>
<artifactId>org.eclipse.equinox.metatype</artifactId>
</dependency>
- <!-- SSH -->
- <dependency>
- <groupId>org.argeo.tp.apache</groupId>
- <artifactId>org.apache.mina.core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.argeo.tp.apache</groupId>
- <artifactId>org.apache.sshd.core</artifactId>
- </dependency>
-
<!-- Console -->
<dependency>
<groupId>org.argeo.tp.apache.felix</groupId>
<artifactId>org.apache.jackrabbit.jcr2spi</artifactId>
</dependency>
- <!-- Required by Jackrabbit 2.12 -->
- <dependency>
- <groupId>org.argeo.tp.misc</groupId>
- <artifactId>com.google.guava</artifactId>
- </dependency>
-
<!-- Test only -->
<dependency>
<groupId>org.argeo.commons</groupId>
<artifactId>org.argeo.osgi.boot</artifactId>
- <version>2.1.74</version>
+ <version>2.1.100</version>
<scope>test</scope>
</dependency>
</dependencies>
</execution>
</executions>
</plugin>
-<!-- <plugin> -->
-<!-- <groupId>org.apache.maven.plugins</groupId> -->
-<!-- <artifactId>maven-dependency-plugin</artifactId> -->
-<!-- <executions> -->
-<!-- <execution> -->
-<!-- <id>copy-argeo</id> -->
-<!-- <phase>package</phase> -->
-<!-- <goals> -->
-<!-- <goal>copy-dependencies</goal> -->
-<!-- </goals> -->
-<!-- <configuration> -->
-<!-- <includeTypes>jar</includeTypes> -->
-<!-- <outputDirectory>${project.build.directory}/lib-argeo</outputDirectory> -->
-<!-- <includeGroupIds>org.argeo.commons</includeGroupIds> -->
-<!-- <excludeTransitive>true</excludeTransitive> -->
-<!-- <includeTypes>jar</includeTypes> -->
-<!-- <includeScope>runtime</includeScope> -->
-<!-- <useRepositoryLayout>true</useRepositoryLayout> -->
-<!-- </configuration> -->
-<!-- </execution> -->
-<!-- </executions> -->
-<!-- </plugin> -->
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>rpm-maven-plugin</artifactId>
</source>
</sources>
</mapping>
-<!-- <mapping> -->
-<!-- <directory>/usr/share/osgi/org/argeo/commons/${project.artifactId}/${project.version}</directory> -->
-<!-- <username>root</username> -->
-<!-- <groupname>root</groupname> -->
-<!-- <directoryIncluded>false</directoryIncluded> -->
-<!-- <artifact /> -->
-<!-- </mapping> -->
</mappings>
<requires>
<require>argeo-cms-client-tp</require>
- <require>osgi-boot</require>
+ <require>argeo-osgi-boot</require>
</requires>
</configuration>
</execution>
</execution>
</executions>
</plugin>
-<!-- <plugin> -->
-<!-- <groupId>org.apache.maven.plugins</groupId> -->
-<!-- <artifactId>maven-dependency-plugin</artifactId> -->
-<!-- <executions> -->
-<!-- <execution> -->
-<!-- <id>copy-tp</id> -->
-<!-- <phase>package</phase> -->
-<!-- <goals> -->
-<!-- <goal>copy-dependencies</goal> -->
-<!-- </goals> -->
-<!-- <configuration> -->
-<!-- <includeTypes>jar</includeTypes> -->
-<!-- <outputDirectory>${project.build.directory}/lib-tp</outputDirectory> -->
-<!-- <excludeGroupIds>org.argeo.commons</excludeGroupIds> -->
-<!-- <excludeTransitive>true</excludeTransitive> -->
-<!-- <includeTypes>jar</includeTypes> -->
-<!-- <includeScope>runtime</includeScope> -->
-<!-- <useRepositoryLayout>true</useRepositoryLayout> -->
-<!-- </configuration> -->
-<!-- </execution> -->
-<!-- </executions> -->
-<!-- </plugin> -->
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>rpm-maven-plugin</artifactId>
<configuration>
<name>argeo-cms-client-tp</name>
<projversion>${version.argeo-tp}</projversion>
+ <release>${maven.build.timestamp}</release>
<mappings>
<mapping>
<directory>/usr/share/osgi</directory>