Move to AAF 2.1.8-SNAPSHOT

[aaf/authz.git] / cadi / servlet-sample / pom.xml

diff --git a/cadi/servlet-sample/pom.xml b/cadi/servlet-sample/pom.xml
index 5711d44..2080787 100644 (file)
--- a/cadi/servlet-sample/pom.xml
+++ b/cadi/servlet-sample/pom.xml
@@ -4,17 +4,12 @@
                <groupId>org.onap.aaf.authz</groupId>
                <artifactId>cadiparent</artifactId>
                <relativePath>..</relativePath>
-               <version>2.1.2-SNAPSHOT</version>
+               <version>2.1.8-SNAPSHOT</version>
        </parent>
        <modelVersion>4.0.0</modelVersion>
        <name>CADI Servlet Sample (Test Only)</name>
        <artifactId>aaf-cadi-servlet-sample</artifactId>
        <packaging>jar</packaging>
-       <properties>
-               <!--  Jetty Version set by oParent -->
-               <tomcat.version>8.5.23</tomcat.version>
-         </properties>
-
        <dependencies>
                <!-- needs to be first to avoid jar signer implications for servlet api  -->
                <dependency>
@@ -23,57 +18,34 @@
                        <version>${project.jettyVersion}</version>
                </dependency>
 
-               <dependency>
-               <groupId>org.apache.tomcat.embed</groupId>
-               <artifactId>tomcat-embed-jasper</artifactId>
-               <version>${tomcat.version}</version>
-           </dependency>
-            <dependency>
-               <groupId>org.apache.tomcat.embed</groupId>
-               <artifactId>tomcat-embed-core</artifactId>
-               <version>${tomcat.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.apache.tomcat.embed</groupId>
-               <artifactId>tomcat-embed-jasper</artifactId>
-               <version>${tomcat.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.apache.tomcat</groupId>
-               <artifactId>tomcat-jasper</artifactId>
-               <version>${tomcat.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.apache.tomcat</groupId>
-               <artifactId>tomcat-jasper-el</artifactId>
-               <version>${tomcat.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.apache.tomcat</groupId>
-               <artifactId>tomcat-jsp-api</artifactId>
-               <version>${tomcat.version}</version>
-           </dependency>
-
                <dependency>
                        <groupId>org.onap.aaf.authz</groupId>
                        <artifactId>aaf-cadi-aaf</artifactId>
-                       <version>${project.version}</version>
                </dependency>
 
        </dependencies>
        <build>
+               <plugins>
+                       <plugin>
+                               <artifactId>maven-assembly-plugin</artifactId>
+                               <executions>
+                                       <execution>
+                                               <id>sample</id>
+                                               <phase>package</phase>
+                                               <goals>
+                                                       <goal>single</goal>
+                                               </goals>
+                                               <configuration>
+                                                       <descriptors>
+                                                               <descriptor>src/assemble/servlet_sample.xml</descriptor>
+                                                       </descriptors>
+                                               </configuration>
+                                       </execution>
+                               </executions>
+                       </plugin>
+               </plugins>
                <pluginManagement>
                        <plugins>
-                               <plugin>
-                                       <inherited>true</inherited>
-                                       <groupId>org.apache.maven.plugins</groupId>
-                                       <artifactId>maven-compiler-plugin</artifactId>
-                                       <version>3.1</version>
-                                       <configuration>
-                                               <source>1.7</source>
-                                               <target>1.7</target>
-                                       </configuration>
-                               </plugin>
                                <plugin>
                                        <groupId>org.apache.maven.plugins</groupId>
                                        <version>2.4</version>
@@ -87,6 +59,16 @@
                                                </archive>
                                        </configuration>
                                </plugin>
+                               <plugin>
+                                       <inherited>true</inherited>
+                                       <groupId>org.apache.maven.plugins</groupId>
+                                       <artifactId>maven-compiler-plugin</artifactId>
+                                       <version>3.1</version>
+                                       <configuration>
+                                               <source>1.7</source>
+                                               <target>1.7</target>
+                                       </configuration>
+                               </plugin>
                        </plugins>
                </pluginManagement>
        </build>