Code Review
/
aaf
/
cadi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Add Multi-Realm class handling
[aaf/cadi.git]
/
pom.xml
diff --git
a/pom.xml
b/pom.xml
index
550f8a4
..
c88f47a
100644
(file)
--- a/
pom.xml
+++ b/
pom.xml
@@
-22,7
+22,7
@@
<modelVersion>4.0.0</modelVersion>
<groupId>org.onap.aaf.cadi</groupId>
<artifactId>parent</artifactId>
<modelVersion>4.0.0</modelVersion>
<groupId>org.onap.aaf.cadi</groupId>
<artifactId>parent</artifactId>
- <version>2.1.
7
-SNAPSHOT</version>
+ <version>2.1.
13
-SNAPSHOT</version>
<name>CADI Plugins Parent</name>
<packaging>pom</packaging>
<name>CADI Plugins Parent</name>
<packaging>pom</packaging>
@@
-34,10
+34,10
@@
<properties>
<!-- This version needs to be RELEASED version. Fails on SNAPSHOT -->
<properties>
<!-- This version needs to be RELEASED version. Fails on SNAPSHOT -->
- <cadi.version>2.1.
6
</cadi.version>
+ <cadi.version>2.1.
8
</cadi.version>
<!-- <sonar.skip>true</sonar.skip> -->
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<!-- <sonar.skip>true</sonar.skip> -->
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <
project.jettyVersion>9.3.9.v20160517</project.jettyVersion
>
+ <
!-- project.jettyVersion>9.4.12.v20180830</project.jettyVersion --
>
<powermock.version>1.5.1</powermock.version>
<!-- SONAR -->
<jacoco.version>0.7.7.201606060606</jacoco.version>
<powermock.version>1.5.1</powermock.version>
<!-- SONAR -->
<jacoco.version>0.7.7.201606060606</jacoco.version>
@@
-131,9
+131,7
@@
<modules>
<module>shiro</module>
<module>shiro-osgi-bundle</module>
<modules>
<module>shiro</module>
<module>shiro-osgi-bundle</module>
- <!-- Not in Casablanca
<module>sidecar</module>
<module>sidecar</module>
- -->
</modules>
<!-- ============================================================== -->
</modules>
<!-- ============================================================== -->
@@
-159,7
+157,6
@@
<version>${cadi.version}</version>
</dependency>
<version>${cadi.version}</version>
</dependency>
-
<!-- Prevent Cycles in Testing -->
<dependency>
<groupId>org.onap.aaf.authz</groupId>
<!-- Prevent Cycles in Testing -->
<dependency>
<groupId>org.onap.aaf.authz</groupId>
@@
-216,6
+213,16
@@
<artifactId>aaf-misc-log4j</artifactId>
<version>${cadi.version}</version>
</dependency>
<artifactId>aaf-misc-log4j</artifactId>
<version>${cadi.version}</version>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.shiro</groupId>
+ <artifactId>shiro-core</artifactId>
+ <version>1.3.2</version>
+ </dependency>
+
+
+
+ <!--
<dependency>
<groupId>org.eclipse.jetty</groupId>
<dependency>
<groupId>org.eclipse.jetty</groupId>
@@
-252,13
+259,7
@@
<artifactId>jetty-server</artifactId>
<version>${project.jettyVersion}</version>
</dependency>
<artifactId>jetty-server</artifactId>
<version>${project.jettyVersion}</version>
</dependency>
-
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <version>3.0.1</version>
- </dependency>
-
+ -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
@@
-282,8
+283,8
@@
<artifactId>maven-compiler-plugin</artifactId>
<version>2.3.2</version>
<configuration>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.3.2</version>
<configuration>
- <source>
1.7
</source>
- <target>
1.7
</target>
+ <source>
${maven.compiler.source}
</source>
+ <target>
${maven.compiler.target}
</target>
</configuration>
</plugin>
</configuration>
</plugin>