-<?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">
+<?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">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.argeo.commons.security</groupId>
<artifactId>runtime</artifactId>
- <version>1.1.2</version>
+ <version>2.1.9</version>
<relativePath>..</relativePath>
</parent>
<artifactId>org.argeo.security.core</artifactId>
<!-- We need to exclude some packages which are added by BND but cause
use package conflict with some deployments -->
<Import-Package>
- org.springframework.context,
- org.springframework.beans.factory,
- org.argeo.jcr,
- org.xml.sax;version="0.0.0",
+ org.bouncycastle.*;resolution:=optional,
javax.jcr.security,
- javax.jcr.nodetype,
- javax.jcr.version,
- javax.jcr.observation,
- javax.jcr.query,
- javax.jcr.lock,
- javax.jcr.retention,
- *
+ *,
</Import-Package>
</instructions>
</configuration>
</build>
<dependencies>
<dependency>
- <groupId>org.argeo.commons.basic</groupId>
- <artifactId>org.argeo.basic.nodeps</artifactId>
- <version>1.1.2</version>
+ <groupId>org.argeo.commons.base</groupId>
+ <artifactId>org.argeo.util</artifactId>
+ <version>2.1.9</version>
</dependency>
<dependency>
<groupId>org.argeo.commons.server</groupId>
<artifactId>org.argeo.server.jcr</artifactId>
- <version>1.1.2</version>
+ <version>2.1.9</version>
</dependency>
<!-- Crypto -->
- <!-- <dependency> -->
- <!-- <groupId>org.argeo.dep.osgi</groupId> -->
- <!-- <artifactId>org.argeo.dep.osgi.bouncycastle.jdk15</artifactId> -->
- <!-- </dependency> -->
+ <dependency>
+ <groupId>org.argeo.tp</groupId>
+ <artifactId>bcprov</artifactId>
+ <optional>true</optional>
+ </dependency>
<dependency>
<groupId>org.argeo.tp</groupId>
<artifactId>org.apache.commons.codec</artifactId>
<groupId>org.argeo.tp</groupId>
<artifactId>org.springframework.transaction</artifactId>
</dependency>
+
+ <!-- OSGi -->
+ <dependency>
+ <groupId>org.argeo.tp</groupId>
+ <artifactId>org.eclipse.osgi</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
<!-- Logging -->
<dependency>
<groupId>org.argeo.tp</groupId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.argeo.commons.basic</groupId>
- <artifactId>org.argeo.basic.dep.log4j</artifactId>
- <version>1.1.2</version>
+ <groupId>org.argeo.commons.base</groupId>
+ <artifactId>org.argeo.dep.log4j</artifactId>
+ <version>2.1.9</version>
<type>pom</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.argeo.commons.server</groupId>
<artifactId>org.argeo.server.json</artifactId>
- <version>1.1.2</version>
+ <version>2.1.9</version>
<scope>test</scope>
</dependency>
<dependency>