diff options
| -rw-r--r-- | INFO.yaml | 16 | ||||
| -rw-r--r-- | pom.xml | 39 | ||||
| -rw-r--r-- | src/test/java/org/onap/aai/datarouter/util/client/NoAuthRestClientTest.java | 2 |
3 files changed, 45 insertions, 12 deletions
@@ -4,11 +4,11 @@ project_creation_date: '2017-05-03' project_category: '' lifecycle_state: 'Mature' project_lead: &onap_aai_ptl - name: 'James Forsyth' - email: 'jf2512@att.com' - id: 'jimmydot' + name: 'William Reehil' + email: 'william.reehil@att.com' company: 'ATT' - timezone: 'America/Detroit' + id: 'wreehil' + timezone: 'America/New_York' primary_contact: *onap_aai_ptl issue_tracking: type: 'jira' @@ -46,6 +46,11 @@ committers: company: 'ATT' id: 'vk250x' timezone: 'America/New_York' + - name: 'James Forsyth' + email: 'jf2512@att.com' + id: 'jimmydot' + company: 'ATT' + timezone: 'America/Detroit' tsc: approval: 'https://lists.onap.org/g/onap-tsc' changes: @@ -55,3 +60,6 @@ tsc: - type: 'removal' name: 'Tian Lee' link: 'https://lists.onap.org/g/onap-tsc/message/6227' + - type: 'Addition' + name: 'William Reehil' + link: 'https://lists.onap.org/g/onap-tsc/message/6506' @@ -25,7 +25,7 @@ limitations under the License. <parent> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-parent</artifactId> - <version>2.1.12.RELEASE</version> + <version>2.3.1.RELEASE</version> <relativePath /> </parent> <groupId>org.onap.aai.data-router</groupId> @@ -35,7 +35,7 @@ limitations under the License. <properties> <java.version>1.8</java.version> - <camel-spring-boot.version>2.22.5</camel-spring-boot.version> + <camel-spring-boot.version>3.4.0</camel-spring-boot.version> <absoluteDistFilesRoot>/appl/${project.artifactId}</absoluteDistFilesRoot> <!-- For NO Versioning, REMOVE the /${project.version} from the <distFilesRoot> property, below. PLEASE, NOTE: If your ${project.version} is a "-SNAPSHOT" @@ -100,8 +100,9 @@ limitations under the License. <version>${logback.version}</version> </dependency> <dependency> - <groupId>org.apache.camel</groupId> + <groupId>org.apache.camel.springboot</groupId> <artifactId>camel-spring-boot-starter</artifactId> + <version>${camel-spring-boot.version}</version> </dependency> <dependency> <groupId>org.apache.camel</groupId> @@ -109,8 +110,9 @@ limitations under the License. <version>${camel-spring-boot.version}</version> </dependency> <dependency> - <groupId>org.apache.camel</groupId> + <groupId>org.apache.camel.springboot</groupId> <artifactId>camel-servlet-starter</artifactId> + <version>${camel-spring-boot.version}</version> </dependency> <dependency> <groupId>org.apache.camel</groupId> @@ -212,7 +214,7 @@ limitations under the License. <dependency> <groupId>org.eclipse.persistence</groupId> <artifactId>eclipselink</artifactId> - <version>2.6.2</version> + <version>2.7.7</version> </dependency> <dependency> @@ -239,6 +241,12 @@ limitations under the License. <version>${version.com.google.guava}</version> </dependency> + <dependency> + <groupId>org.glassfish</groupId> + <artifactId>javax.json</artifactId> + <version>1.1</version> + </dependency> + </dependencies> <profiles> @@ -541,7 +549,7 @@ limitations under the License. <plugin> <groupId>org.jacoco</groupId> <artifactId>jacoco-maven-plugin</artifactId> - <version>0.7.7.201606060606</version> + <version>0.8.5</version> <configuration> <dumpOnExit>true</dumpOnExit> </configuration> @@ -588,7 +596,7 @@ limitations under the License. <dependencyManagement> <dependencies> <dependency> - <groupId>org.apache.camel</groupId> + <groupId>org.apache.camel.springboot</groupId> <artifactId>camel-spring-boot-dependencies</artifactId> <version>${camel-spring-boot.version}</version> <type>pom</type> @@ -609,6 +617,23 @@ limitations under the License. <artifactId>json</artifactId> <version>20131018</version> </dependency> + + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <version>2.3.0</version> + </dependency> + <dependency> + <groupId>com.sun.xml.bind</groupId> + <artifactId>jaxb-core</artifactId> + <version>2.3.0</version> + </dependency> + <dependency> + <groupId>com.sun.xml.bind</groupId> + <artifactId>jaxb-impl</artifactId> + <version>2.3.0</version> + </dependency> + </dependencies> </dependencyManagement> <distributionManagement> diff --git a/src/test/java/org/onap/aai/datarouter/util/client/NoAuthRestClientTest.java b/src/test/java/org/onap/aai/datarouter/util/client/NoAuthRestClientTest.java index 1ce7265..b9f8d86 100644 --- a/src/test/java/org/onap/aai/datarouter/util/client/NoAuthRestClientTest.java +++ b/src/test/java/org/onap/aai/datarouter/util/client/NoAuthRestClientTest.java @@ -28,7 +28,7 @@ import javax.ws.rs.core.MediaType; import org.apache.camel.CamelContext; import org.apache.camel.Exchange; import org.apache.camel.impl.DefaultCamelContext; -import org.apache.camel.impl.DefaultExchange; +import org.apache.camel.support.DefaultExchange; import org.junit.Before; import org.junit.Test; import org.mockito.Mockito; |