<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
- <version>1.5.10.RELEASE</version>
+ <version>1.5.12.RELEASE</version>
<relativePath />
</parent>
<groupId>org.onap.aai.data-router</groupId>
<artifactId>data-router</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.3.0-SNAPSHOT</version>
<name>aai-data-router</name>
<properties>
<sonar.jacoco.reportMissing.force.zero>false</sonar.jacoco.reportMissing.force.zero>
<sonar.projectVersion>${project.version}</sonar.projectVersion>
<logback.version>1.2.3</logback.version>
+ <version.com.google.guava>16.0.1</version.com.google.guava>
</properties>
<dependencies>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-jersey</artifactId>
- </dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-core</artifactId>
<groupId>org.apache.camel</groupId>
<artifactId>camel-spring-boot-starter</artifactId>
</dependency>
-
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-core</artifactId>
+ <version>2.20.1</version>
+ </dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-servlet-starter</artifactId>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
- </dependency>
+
+ </dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter</artifactId>
<artifactId>javax.ws.rs-api</artifactId>
<version>2.0.1</version>
</dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-security</artifactId>
- <version>9.3.8.RC0</version>
- </dependency>
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-module-junit4</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.assertj</groupId>
+ <artifactId>assertj-core</artifactId>
+ <version>3.10.0</version>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-api-mockito</artifactId>
<version>3.1.200</version>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.onap.aai.aai-common</groupId>
- <artifactId>aai-schema</artifactId>
- <version>1.2.2-SNAPSHOT</version>
- </dependency>
+ <!--<dependency>-->
+ <!--<groupId>org.onap.aai.aai-common</groupId>-->
+ <!--<artifactId>aai-schema</artifactId>-->
+ <!--<version>1.3.0-SNAPSHOT</version>-->
+ <!--</dependency>-->
+ <!--<dependency>-->
+ <!--<groupId>org.onap.aai.aai-common</groupId>-->
+ <!--<artifactId>aai-schema-ingest</artifactId>-->
+ <!--<version>1.2.2</version>-->
+ <!--<exclusions>-->
+ <!--<exclusion>-->
+ <!--<groupId>com.google.guava</groupId>-->
+ <!--<artifactId>guava</artifactId>-->
+ <!--</exclusion>-->
+ <!--</exclusions>-->
+ <!--</dependency>-->
<dependency>
<groupId>org.onap.aai.router-core</groupId>
<artifactId>router-core</artifactId>
- <version>1.1.0</version>
+ <version>1.3.0-SNAPSHOT</version>
</dependency>
<dependency>
<version>1.1.0</version>
</dependency>
-
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>${version.com.google.guava}</version>
+ </dependency>
</dependencies>
<include>**/*</include>
</includes>
</resource>
+ <resource>
+ <directory>${basedir}/config</directory>
+ <filtering>true</filtering>
+ <includes>
+ <include>schema/**</include>
+ </includes>
+ </resource>
</resources>
</configuration>
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>unpack</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.onap.aai.aai-common</groupId>
+ <artifactId>aai-schema</artifactId>
+ <version>1.2.2</version>
+ <type>jar</type>
+ <includes>oxm/</includes>
+ <outputDirectory>${project.build.directory}/bundleconfig-local/etc</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
<plugin>
<groupId>com.spotify</groupId>
<artifactId>docker-maven-plugin</artifactId>
</configuration>
</plugin>
<!-- license plugin -->
- <!-- Uncomment this to add a license header to every source file -->
- <plugin> <groupId>com.mycila</groupId> <artifactId>license-maven-plugin</artifactId>
- <version>3.0</version> <configuration> <header>License.txt</header> <includes>
- <include>src/main/java/**</include> <include>src/test/java/**</include> </includes>
- </configuration> <executions> <execution> <goals> <goal>format</goal> </goals>
- <phase>process-sources</phase> </execution> </executions> </plugin>
+ <!-- Uncomment this to add a license header to every source file
+ <plugin>
+ <groupId>com.mycila</groupId>
+ <artifactId>license-maven-plugin</artifactId>
+ <version>3.0</version>
+ <configuration>
+ <header>License.txt</header>
+ <includes>
+ <include>src/main/java/**</include>
+ <include>src/test/java/**</include>
+ </includes>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>format</goal>
+ </goals>
+ <phase>process-sources</phase>
+ </execution>
+ </executions>
+ </plugin> -->
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
- <version>4.5</version>
+ <version>4.5.5</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>