Code Review / aaf / authz.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Update to 2.1.11-SNAPSHOT
[aaf/authz.git] / auth / pom.xml
diff --git a/auth/pom.xml b/auth/pom.xml
index f9a6c7c..37bfc85 100644 (file)
--- a/auth/pom.xml
+++ b/auth/pom.xml
@@ -23,26 +23,19 @@
        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.authz.auth</groupId>
-       <artifactId>parent</artifactId>
-       <version>2.1.0-SNAPSHOT</version>
+       <parent>
+        <groupId>org.onap.aaf.authz</groupId>
+        <artifactId>parent</artifactId>
+        <version>2.1.11-SNAPSHOT</version>
+    </parent>
+       <artifactId>authparent</artifactId>
        <name>AAF Auth Parent</name>
        <packaging>pom</packaging>
+
        
-       <parent>             
-        <groupId>org.onap.oparent</groupId>
-        <artifactId>oparent</artifactId>
-        <version>1.1.0</version>
-    </parent>
        <properties>
                <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-               <project.interfaceVersion>2.10-SNAPSHOT</project.interfaceVersion>
-               <project.miscVersion>2.1.0-SNAPSHOT</project.miscVersion>
-               <project.cadiVersion>2.1.0-SNAPSHOT</project.cadiVersion>
-               <!-- >project.jettyVersion>9.3.22.v20171030</project.jettyVersion -->
-               <project.jettyVersion>9.4.8.v20171121</project.jettyVersion>
-               <powermock.version>1.5.1</powermock.version>
-               <project.conf_dir>/opt/app/osaaf/etc</project.conf_dir>
+               <project.ext_root_dir>/opt/app/osaaf</project.ext_root_dir>
                <!--  SONAR  -->
                 <jacoco.version>0.7.7.201606060606</jacoco.version>
            <sonar-jacoco-listeners.version>3.2</sonar-jacoco-listeners.version>
@@ -57,6 +50,9 @@
                <releaseNexusPath>/content/repositories/releases/</releaseNexusPath>
                <stagingNexusPath>/content/repositories/staging/</stagingNexusPath>
                <sitePath>/content/sites/site/org/onap/aaf/authz/${project.artifactId}/${project.version}</sitePath>
+               <!-- We have to up these versions from the original to avoid Security Errors -->
+               <project.nettyVersion>4.1.22.Final</project.nettyVersion>
+               <project.project.ext_root_dir>/opt/app/osaaf</project.project.ext_root_dir>
        </properties>
 
        <developers>
@@ -128,7 +124,7 @@
                                                </includes>
                                                <excludes>
                                                </excludes>
-
+                                               <useSystemClassLoader>false</useSystemClassLoader>
                                        </configuration>
                                </plugin>
 
@@ -137,7 +133,7 @@
                                        <artifactId>maven-failsafe-plugin</artifactId>
                                        <version>2.17</version>
                                        <configuration>
-                                               <skipTests>flase</skipTests>
+                                               <skipTests>false</skipTests>
                                        </configuration>
                                        <executions>
                                                <execution>
@@ -166,9 +162,10 @@
                                        <configuration>
                                                <programs/> <!-- this set in projects that have programs -->
                                                <assembleDirectory>../aaf_${project.version}</assembleDirectory>
-                                               <copyConfigurationDirectory>false</copyConfigurationDirectory>
+                                               <copyConfigurationDirectory>true</copyConfigurationDirectory>
                                                <configurationDirectory>etc</configurationDirectory>
                                                <repositoryName>lib</repositoryName>
+                                               <includeConfigurationDirectoryInClasspath>false</includeConfigurationDirectoryInClasspath>
                                                <repositoryLayout>flat</repositoryLayout>
                                        </configuration>
                                </plugin>
@@ -337,25 +334,21 @@
                <dependency>
                        <groupId>org.mockito</groupId>
                        <artifactId>mockito-all</artifactId>
-                       <version>1.9.5</version>
                        <scope>test</scope>
                </dependency>
                <dependency>
                        <groupId>org.powermock</groupId>
                        <artifactId>powermock-module-junit4</artifactId>
-                       <version>${powermock.version}</version>
                        <scope>test</scope>
                </dependency>
                <dependency>
                        <groupId>org.powermock</groupId>
                        <artifactId>powermock-api-mockito</artifactId>
-                       <version>${powermock.version}</version>
                        <scope>test</scope>
                </dependency>
                <dependency>
                        <groupId>junit</groupId>
                        <artifactId>junit</artifactId>
-                       <version>4.10</version>
                        <scope>test</scope>
                </dependency>
 
@@ -379,157 +372,5 @@
                <module>auth-hello</module>
        </modules>
 
-       <dependencyManagement>
-               <dependencies>
-                       <dependency>
-                               <groupId>org.onap.aaf.authz.misc</groupId>
-                               <artifactId>aaf-misc-env</artifactId>
-                               <version>${project.miscVersion}</version>
-                       </dependency>
-
-                       <dependency>
-                               <groupId>org.onap.aaf.authz.misc</groupId>
-                               <artifactId>aaf-misc-log4j</artifactId>
-                               <version>${project.miscVersion}</version>
-                       </dependency>
-
-                       <dependency>
-                               <groupId>org.onap.aaf.authz.misc</groupId>
-                               <artifactId>aaf-misc-rosetta</artifactId>
-                               <version>${project.miscVersion}</version>
-                       </dependency>
-
-                       <dependency>
-                               <groupId>org.onap.aaf.authz.misc</groupId>
-                               <artifactId>aaf-misc-xgen</artifactId>
-                               <version>${project.miscVersion}</version>
-                       </dependency>
-
-                       <dependency>
-                               <groupId>org.onap.aaf.authz.cadi</groupId>
-                               <artifactId>aaf-cadi-core</artifactId>
-                               <version>${project.cadiVersion}</version>
-                       </dependency>
-
-                       <dependency>
-                               <groupId>org.onap.aaf.authz.cadi</groupId>
-                               <artifactId>aaf-cadi-client</artifactId>
-                               <version>${project.cadiVersion}</version>
-                       </dependency>
-
-                       <dependency>
-                               <groupId>org.onap.aaf.authz.cadi</groupId>
-                               <artifactId>aaf-cadi-aaf</artifactId>
-                               <version>${project.cadiVersion}</version>
-                               <exclusions>
-                                       <exclusion>
-                                               <groupId>org.apache.cassandra</groupId>
-                                               <artifactId>cassandra-all</artifactId>
-                                       </exclusion>
-                               </exclusions>
-                       </dependency>
-
-                       <dependency>
-                               <groupId>org.onap.aaf.authz.auth</groupId>
-                               <artifactId>aaf-auth-client</artifactId>
-                               <version>${project.interfaceVersion}</version>
-                       </dependency>
-
-                       <dependency>
-                               <groupId>org.onap.aaf.authz.auth</groupId>
-                               <artifactId>aaf-auth-core</artifactId>
-                               <version>${project.version}</version>
-                       </dependency>
-
-                       <dependency>
-                               <groupId>org.onap.aaf.authz.auth</groupId>
-                               <artifactId>aaf-auth-cass</artifactId>
-                               <version>${project.version}</version>
-                       </dependency>
-
-                       <dependency>
-                               <groupId>org.onap.aaf.authz.auth</groupId>
-                               <artifactId>aaf-auth-cmd</artifactId>
-                               <version>${project.version}</version>
-                       </dependency>
-
-                       <dependency>
-                               <groupId>org.onap.aaf.authz.auth</groupId>
-                               <artifactId>aaf-auth-oauth</artifactId>
-                               <version>${project.version}</version>
-                       </dependency>
-
-                       <dependency>
-                               <groupId>org.onap.aaf.authz.auth</groupId>
-                               <artifactId>aaf-auth-deforg</artifactId>
-                               <version>${project.version}</version>
-                       </dependency>
-
-                       <dependency>
-                               <groupId>javax.servlet</groupId>
-                               <artifactId>servlet-api</artifactId>
-                               <version>2.5</version>
-                       </dependency>
-
-                       <dependency>
-                               <groupId>org.eclipse.jetty</groupId>
-                               <artifactId>jetty-servlet</artifactId>
-                               <version>${project.jettyVersion}</version>
-                       </dependency>
-
-                       <dependency>
-                               <groupId>org.eclipse.jetty</groupId>
-                               <artifactId>jetty-server</artifactId>
-                               <version>${project.jettyVersion}</version>
-                       </dependency>
-
-                       <dependency>
-                               <groupId>com.datastax.cassandra</groupId>
-                               <artifactId>cassandra-all</artifactId>
-                               <version>3.3.0</version>
-                               <exclusions>
-                                       <exclusion>
-                                               <groupId>org.slf4j</groupId>
-                                               <artifactId>slf4j-log4j12</artifactId>
-                                       </exclusion>
-                                       <exclusion>
-                                               <groupId>log4j</groupId>
-                                               <artifactId>log4j</artifactId>
-                                       </exclusion>
-                               </exclusions>
-                       </dependency>
-
-                       <dependency>
-                               <groupId>com.datastax.cassandra</groupId>
-                               <artifactId>cassandra-driver-core</artifactId>
-                               <version>3.3.0</version>
-                               <exclusions>
-                                       <exclusion>
-                                               <groupId>org.slf4j</groupId>
-                                               <artifactId>slf4j-log4j12</artifactId>
-                                       </exclusion>
-                                       <exclusion>
-                                               <groupId>log4j</groupId>
-                                               <artifactId>log4j</artifactId>
-                                       </exclusion>
-                               </exclusions>
-                       </dependency>
-
-                       <dependency>
-                               <groupId>org.slf4j</groupId>
-                               <artifactId>slf4j-log4j12</artifactId>
-                               <version>1.7.5</version>
-                       </dependency>
-
-                       <dependency>
-                               <groupId>javax.mail</groupId>
-                               <artifactId>mail</artifactId>
-                               <version>1.4.5</version>
-                       </dependency>
-               </dependencies>
-       </dependencyManagement>
-
-
-       
 
 </project>     
ARCHIVED- 2022-02-15 at the request of the project