summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--pom.xml12
-rw-r--r--shiro-osgi-bundle/pom.xml22
-rw-r--r--shiro/pom.xml6
-rw-r--r--sidecar/.gitignore4
-rw-r--r--sidecar/fproxy/.gitignore4
-rw-r--r--sidecar/fproxy/pom.xml5
-rw-r--r--sidecar/pom.xml57
-rw-r--r--sidecar/rproxy/.gitignore4
-rw-r--r--sidecar/rproxy/pom.xml26
-rw-r--r--sidecar/tproxy-config/.gitignore4
-rw-r--r--sidecar/tproxy-config/pom.xml5
11 files changed, 90 insertions, 59 deletions
diff --git a/pom.xml b/pom.xml
index 45bfe29..550f8a4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,9 +21,9 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.onap.aaf.cadi</groupId>
- <artifactId>cadimiscparent</artifactId>
- <version>2.1.2-SNAPSHOT</version>
- <name>aaf-cadi</name>
+ <artifactId>parent</artifactId>
+ <version>2.1.7-SNAPSHOT</version>
+ <name>CADI Plugins Parent</name>
<packaging>pom</packaging>
<parent>
@@ -34,7 +34,7 @@
<properties>
<!-- This version needs to be RELEASED version. Fails on SNAPSHOT -->
- <cadi.version>2.1.2</cadi.version>
+ <cadi.version>2.1.6</cadi.version>
<!-- <sonar.skip>true</sonar.skip> -->
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.jettyVersion>9.3.9.v20160517</project.jettyVersion>
@@ -120,7 +120,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.10</version>
+ <version>4.12</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -131,7 +131,9 @@
<modules>
<module>shiro</module>
<module>shiro-osgi-bundle</module>
+ <!-- Not in Casablanca
<module>sidecar</module>
+ -->
</modules>
<!-- ============================================================== -->
diff --git a/shiro-osgi-bundle/pom.xml b/shiro-osgi-bundle/pom.xml
index a73d567..8fc885e 100644
--- a/shiro-osgi-bundle/pom.xml
+++ b/shiro-osgi-bundle/pom.xml
@@ -19,22 +19,20 @@
* -->
<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/xsd/maven-4.0.0.xsd">
-
<parent>
<groupId>org.onap.aaf.cadi</groupId>
- <artifactId>cadimiscparent</artifactId>
- <version>2.1.2-SNAPSHOT</version>
+ <artifactId>parent</artifactId>
+ <version>2.1.7-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
- <name>AAF Shiro CADI Plugin</name>
+ <modelVersion>4.0.0</modelVersion>
+ <name>Shiro OSGI CADI Plugin</name>
<artifactId>aaf-shiro-aafrealm-osgi-bundle</artifactId>
<packaging>bundle</packaging>
<properties>
<sonar.skip>true</sonar.skip>
- <cadi.shiro.version>2.1.1</cadi.shiro.version>
</properties>
<build>
@@ -49,7 +47,7 @@
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Bundle-Version>${project.version}</Bundle-Version>
<Export-Package>
- org.onap.aaf.cadi.shiro*;version=${cadi.shiro.version}
+ org.onap.aaf.cadi.shiro*;version=${project.version}
</Export-Package>
<Import-Package>
javax.servlet,
@@ -86,10 +84,10 @@
</build>
<dependencies>
- <dependency>
- <groupId>org.onap.aaf.authz</groupId>
- <artifactId>aaf-cadi-shiro</artifactId>
- <version>2.1.1</version>
- </dependency>
+ <dependency>
+ <groupId>org.onap.aaf.cadi</groupId>
+ <artifactId>aaf-cadi-shiro</artifactId>
+ <version>${project.version}</version>
+ </dependency>
</dependencies>
</project>
diff --git a/shiro/pom.xml b/shiro/pom.xml
index 8266a00..a228bd4 100644
--- a/shiro/pom.xml
+++ b/shiro/pom.xml
@@ -21,13 +21,13 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>org.onap.aaf.cadi</groupId>
- <artifactId>cadimiscparent</artifactId>
- <version>2.1.2-SNAPSHOT</version>
+ <artifactId>parent</artifactId>
+ <version>2.1.7-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
- <name>AAF CADI Shiro Plugin</name>
+ <name>Shiro CADI Plugin</name>
<packaging>jar</packaging>
<artifactId>aaf-cadi-shiro</artifactId>
diff --git a/sidecar/.gitignore b/sidecar/.gitignore
new file mode 100644
index 0000000..6028f0a
--- /dev/null
+++ b/sidecar/.gitignore
@@ -0,0 +1,4 @@
+/.classpath
+/.settings/
+/target/
+/.project
diff --git a/sidecar/fproxy/.gitignore b/sidecar/fproxy/.gitignore
new file mode 100644
index 0000000..6028f0a
--- /dev/null
+++ b/sidecar/fproxy/.gitignore
@@ -0,0 +1,4 @@
+/.classpath
+/.settings/
+/target/
+/.project
diff --git a/sidecar/fproxy/pom.xml b/sidecar/fproxy/pom.xml
index c8b55ab..0246eb2 100644
--- a/sidecar/fproxy/pom.xml
+++ b/sidecar/fproxy/pom.xml
@@ -24,14 +24,13 @@
<parent>
<groupId>org.onap.aaf.cadi.sidecar</groupId>
<artifactId>sidecar</artifactId>
- <version>2.1.2-SNAPSHOT</version>
+ <version>2.1.7-SNAPSHOT</version>
</parent>
<artifactId>fproxy</artifactId>
- <version>2.1.2-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>aaf-fproxy</name>
+ <name>Sidecar fproxy</name>
<description>ONAP AAF Forward Proxy Microservice For Pluggable Security</description>
<properties>
diff --git a/sidecar/pom.xml b/sidecar/pom.xml
index 86658f7..def9f20 100644
--- a/sidecar/pom.xml
+++ b/sidecar/pom.xml
@@ -18,26 +18,52 @@
* ============LICENSE_END====================================================
* -->
<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/xsd/maven-4.0.0.xsd">
+ <parent>
+ <groupId>org.onap.aaf.cadi</groupId>
+ <artifactId>parent</artifactId>
+ <version>2.1.7-SNAPSHOT</version>
+ <relativePath>..</relativePath>
+ </parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.onap.aaf.cadi.sidecar</groupId>
<artifactId>sidecar</artifactId>
- <version>2.1.2-SNAPSHOT</version>
- <name>aaf-cadi-sidecar</name>
+ <name>Sidecar Parent</name>
<packaging>pom</packaging>
- <parent>
- <groupId>org.onap.oparent</groupId>
- <artifactId>oparent</artifactId>
- <version>1.2.1</version>
- <relativePath />
- </parent>
-
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>1.8</java.version>
+ <spring.boot.version>2.0.3.RELEASE</spring.boot.version>
+ <docker.location>${basedir}/target</docker.location>
+ <!-- <skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo> -->
</properties>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.onap.aaf.cadi.sidecar</groupId>
+ <artifactId>fproxy</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.onap.aaf.cadi.sidecar</groupId>
+ <artifactId>rproxy</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <!-- Import dependency management from Spring Boot -->
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-dependencies</artifactId>
+ <version>${spring.boot.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
<!-- ============================================================== -->
<!-- Define sub-projects (modules) -->
<!-- ============================================================== -->
@@ -48,6 +74,19 @@
</modules>
<build>
+ <plugins>
+ <!-- Sidecare only works on Java 1.8 and above -->
+ <plugin>
+ <inherited>true</inherited>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.3.2</version>
+ <configuration>
+ <source>${java.version}</source>
+ <target>${java.version}</target>
+ </configuration>
+ </plugin>
+ </plugins>
<pluginManagement>
<plugins>
<plugin>
diff --git a/sidecar/rproxy/.gitignore b/sidecar/rproxy/.gitignore
new file mode 100644
index 0000000..6028f0a
--- /dev/null
+++ b/sidecar/rproxy/.gitignore
@@ -0,0 +1,4 @@
+/.classpath
+/.settings/
+/target/
+/.project
diff --git a/sidecar/rproxy/pom.xml b/sidecar/rproxy/pom.xml
index 6131a39..6c32238 100644
--- a/sidecar/rproxy/pom.xml
+++ b/sidecar/rproxy/pom.xml
@@ -24,35 +24,15 @@
<parent>
<groupId>org.onap.aaf.cadi.sidecar</groupId>
<artifactId>sidecar</artifactId>
- <version>2.1.2-SNAPSHOT</version>
+ <version>2.1.7-SNAPSHOT</version>
</parent>
<artifactId>rproxy</artifactId>
- <version>2.1.2-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>aaf-rproxy</name>
+ <name>Sidecar rproxy</name>
<description>ONAP AAF Reverse Proxy Microservice For Pluggable Security</description>
- <properties>
- <spring.boot.version>2.0.3.RELEASE</spring.boot.version>
- <docker.location>${basedir}/target</docker.location>
- <!-- <skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo> -->
- </properties>
-
- <dependencyManagement>
- <dependencies>
- <dependency>
- <!-- Import dependency management from Spring Boot -->
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-dependencies</artifactId>
- <version>${spring.boot.version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
<dependencies>
<!-- Spring Boot Dependencies -->
@@ -98,7 +78,6 @@
<dependency>
<groupId>org.onap.aaf.cadi.sidecar</groupId>
<artifactId>fproxy</artifactId>
- <version>2.1.2-SNAPSHOT</version>
</dependency>
<dependency>
@@ -116,7 +95,6 @@
<dependency>
<groupId>org.onap.aaf.authz</groupId>
<artifactId>aaf-cadi-aaf</artifactId>
- <version>2.1.2</version>
</dependency>
</dependencies>
diff --git a/sidecar/tproxy-config/.gitignore b/sidecar/tproxy-config/.gitignore
new file mode 100644
index 0000000..6028f0a
--- /dev/null
+++ b/sidecar/tproxy-config/.gitignore
@@ -0,0 +1,4 @@
+/.classpath
+/.settings/
+/target/
+/.project
diff --git a/sidecar/tproxy-config/pom.xml b/sidecar/tproxy-config/pom.xml
index ab939b8..b9a7104 100644
--- a/sidecar/tproxy-config/pom.xml
+++ b/sidecar/tproxy-config/pom.xml
@@ -24,14 +24,13 @@
<parent>
<groupId>org.onap.aaf.cadi.sidecar</groupId>
<artifactId>sidecar</artifactId>
- <version>2.1.2-SNAPSHOT</version>
+ <version>2.1.7-SNAPSHOT</version>
</parent>
<artifactId>tproxy-config</artifactId>
- <version>2.1.2-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>aaf-tproxy-config</name>
+ <name>Sidecar tproxy-config</name>
<description>ONAP AAF InitContainer For Pluggable Security</description>
<properties>