diff options
| -rw-r--r-- | aai-traversal/.classpath | 30 | ||||
| -rw-r--r-- | aai-traversal/pom.xml | 126 |
2 files changed, 80 insertions, 76 deletions
diff --git a/aai-traversal/.classpath b/aai-traversal/.classpath index d9feb1e..da63058 100644 --- a/aai-traversal/.classpath +++ b/aai-traversal/.classpath @@ -8,49 +8,55 @@ <attribute name="m2e-apt" value="true"/> </attributes> </classpathentry> - <classpathentry kind="src" output="target/classes" path="src/main/java"> + <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"> <attributes> - <attribute name="optional" value="true"/> <attribute name="maven.pomderived" value="true"/> </attributes> </classpathentry> - <classpathentry kind="src" output="target/classes" path="target/generated-sources/antlr4"> + <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/docker"> <attributes> - <attribute name="optional" value="true"/> <attribute name="maven.pomderived" value="true"/> </attributes> </classpathentry> - <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"> + <classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"> <attributes> <attribute name="maven.pomderived" value="true"/> + <attribute name="test" value="true"/> </attributes> </classpathentry> - <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/docker"> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"> <attributes> <attribute name="maven.pomderived" value="true"/> </attributes> </classpathentry> - <classpathentry kind="src" output="target/test-classes" path="src/test/java"> + <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"> <attributes> - <attribute name="optional" value="true"/> <attribute name="maven.pomderived" value="true"/> + </attributes> + </classpathentry> + <classpathentry kind="src" output="target/test-classes" path=".apt_generated_tests"> + <attributes> + <attribute name="optional" value="true"/> <attribute name="test" value="true"/> </attributes> </classpathentry> - <classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"> + <classpathentry kind="src" output="target/classes" path="src/main/java"> <attributes> + <attribute name="optional" value="true"/> <attribute name="maven.pomderived" value="true"/> - <attribute name="test" value="true"/> </attributes> </classpathentry> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"> + <classpathentry kind="src" output="target/classes" path="target/generated-sources/antlr4"> <attributes> + <attribute name="optional" value="true"/> <attribute name="maven.pomderived" value="true"/> </attributes> </classpathentry> - <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"> + <classpathentry kind="src" output="target/test-classes" path="src/test/java"> <attributes> + <attribute name="optional" value="true"/> <attribute name="maven.pomderived" value="true"/> + <attribute name="test" value="true"/> </attributes> </classpathentry> <classpathentry kind="src" output="target/test-classes" path="target/generated-test-sources/test-annotations"> diff --git a/aai-traversal/pom.xml b/aai-traversal/pom.xml index d789c78..3d48286 100644 --- a/aai-traversal/pom.xml +++ b/aai-traversal/pom.xml @@ -20,9 +20,7 @@ ============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"> +<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"> <modelVersion>4.0.0</modelVersion> <parent> @@ -34,7 +32,7 @@ <artifactId>aai-traversal</artifactId> <properties> - <mockito.core.version>2.4.0</mockito.core.version> + <mockito.core.version>2.4.0</mockito.core.version> <powermock.version>1.7.0RC2</powermock.version> <java.version>1.8</java.version> <start-class>org.onap.aai.TraversalApp</start-class> @@ -42,11 +40,11 @@ <maven.skip.tests>true</maven.skip.tests> <maven.compiler.source>1.8</maven.compiler.source> <maven.compiler.target>1.8</maven.compiler.target> - + <jopt.simple.version>4.9</jopt.simple.version> <!-- End of the jacoco plugin properties --> - + <!-- Default docker registry that maven fabric plugin will try to pull from --> <gremlin.version>3.2.3</gremlin.version> @@ -341,32 +339,32 @@ <version>${micrometer-jersey2}</version> </dependency> <dependency> - <groupId>javax.jms</groupId> - <artifactId>javax.jms-api</artifactId> - <version>2.0.1</version> + <groupId>javax.jms</groupId> + <artifactId>javax.jms-api</artifactId> + <version>2.0.1</version> + </dependency> + <dependency> + <groupId>javax.ws.rs</groupId> + <artifactId>javax.ws.rs-api</artifactId> + <version>2.1</version> </dependency> <dependency> - <groupId>javax.ws.rs</groupId> - <artifactId>javax.ws.rs-api</artifactId> - <version>2.1</version> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> </dependency> <dependency> - <groupId>javax.xml.bind</groupId> - <artifactId>jaxb-api</artifactId> + <groupId>com.sun.xml.bind</groupId> + <artifactId>jaxb-impl</artifactId> </dependency> <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-impl</artifactId> + <groupId>com.sun.xml.bind</groupId> + <artifactId>jaxb-core</artifactId> </dependency> <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-core</artifactId> + <groupId>net.sf.jopt-simple</groupId> + <artifactId>jopt-simple</artifactId> + <version>${jopt.simple.version}</version> </dependency> - <dependency> - <groupId>net.sf.jopt-simple</groupId> - <artifactId>jopt-simple</artifactId> - <version>${jopt.simple.version}</version> - </dependency> <dependency> <groupId>io.swagger</groupId> <artifactId>swagger-core</artifactId> @@ -420,14 +418,14 @@ <artifactId>commons-configuration</artifactId> <exclusions> <exclusion> - <artifactId>commons-lang</artifactId> - <groupId>commons-lang</groupId> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> </exclusion> </exclusions> </dependency> <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> </dependency> <dependency> <groupId>com.att.eelf</groupId> @@ -596,11 +594,11 @@ <groupId>org.springframework</groupId> <artifactId>spring-web</artifactId> </exclusion> - <exclusion> - <groupId>org.onap.aai</groupId> - <artifactId>aai-logging</artifactId> - </exclusion> - </exclusions> + <exclusion> + <groupId>org.onap.aai</groupId> + <artifactId>aai-logging</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.springframework</groupId> @@ -951,11 +949,11 @@ </plugin> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <runOrder>alphabetical</runOrder> - </configuration> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <runOrder>alphabetical</runOrder> + </configuration> </plugin> <plugin> @@ -980,7 +978,7 @@ </executions> </plugin> <plugin> - <groupId>org.springframework.boot</groupId> + <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-maven-plugin</artifactId> <configuration> <mainClass>${start-class}</mainClass> @@ -994,31 +992,31 @@ </execution> </executions> </plugin> - <plugin> - <artifactId>maven-resources-plugin</artifactId> - <version>3.0.0</version> - <executions> - <execution> - <id>copy-fat-jar</id> - <phase>post-integration-test</phase> - <goals> - <goal>copy-resources</goal> - </goals> - <configuration> - <outputDirectory>${aai.build.directory}/lib/</outputDirectory> - <resources> - <resource> - <directory>${project.build.directory}/</directory> - <includes> - <include>${project.artifactId}-${project.version}.jar</include> - </includes> - <filtering>false</filtering> - </resource> - </resources> - </configuration> - </execution> - </executions> - </plugin> + <plugin> + <artifactId>maven-resources-plugin</artifactId> + <version>3.0.0</version> + <executions> + <execution> + <id>copy-fat-jar</id> + <phase>post-integration-test</phase> + <goals> + <goal>copy-resources</goal> + </goals> + <configuration> + <outputDirectory>${aai.build.directory}/lib/</outputDirectory> + <resources> + <resource> + <directory>${project.build.directory}/</directory> + <includes> + <include>${project.artifactId}-${project.version}.jar</include> + </includes> + <filtering>false</filtering> + </resource> + </resources> + </configuration> + </execution> + </executions> + </plugin> <plugin> <artifactId>maven-assembly-plugin</artifactId> @@ -1107,4 +1105,4 @@ </plugin> </plugins> </build> -</project> +</project>
\ No newline at end of file |