diff options
Diffstat (limited to 'aai-core')
| -rw-r--r-- | aai-core/pom.xml | 53 | ||||
| -rw-r--r-- | aai-core/src/test/java/org/onap/aai/AAISetup.java | 6 |
2 files changed, 36 insertions, 23 deletions
diff --git a/aai-core/pom.xml b/aai-core/pom.xml index dfc9ca52..75aea62b 100644 --- a/aai-core/pom.xml +++ b/aai-core/pom.xml @@ -27,13 +27,14 @@ <parent> <groupId>org.onap.aai.aai-common</groupId> <artifactId>aai-common</artifactId> - <version>1.4.3-SNAPSHOT</version> + <version>1.6.0-SNAPSHOT</version> </parent> <artifactId>aai-core</artifactId> <name>aai-core</name> - <version>1.4.3-SNAPSHOT</version> + <version>1.6.0-SNAPSHOT</version> <packaging>jar</packaging> <properties> + <springframework.version>4.3.24.RELEASE</springframework.version> <sonar.language>java</sonar.language> <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin> <sonar.surefire.reportsPath>${project.build.directory}/surefire-reports</sonar.surefire.reportsPath> @@ -74,6 +75,7 @@ <profile> <id>onap</id> <properties> + <springframework.version>4.3.24.RELEASE</springframework.version> <aai.release>onap</aai.release> <schema.configuration.location>N/A</schema.configuration.location> <schema.nodes.location>aai-schema/src/main/resources/${aai.release}/oxm</schema.nodes.location> @@ -174,10 +176,6 @@ <artifactId>maven-deploy-plugin</artifactId> </plugin> <plugin> - <groupId>org.sonatype.plugins</groupId> - <artifactId>nexus-staging-maven-plugin</artifactId> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-site-plugin</artifactId> </plugin> @@ -265,7 +263,7 @@ <dependency> <groupId>org.janusgraph</groupId> <artifactId>janusgraph-core</artifactId> - <version>0.2.0</version> + <version>0.2.3</version> <exclusions> <exclusion> <groupId>org.slf4j</groupId> @@ -288,16 +286,6 @@ <version>1.1.1</version> </dependency> <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-web</artifactId> - <version>4.3.21.RELEASE</version> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-context</artifactId> - <version>4.3.21.RELEASE</version> - </dependency> - <dependency> <groupId>javax.xml.bind</groupId> <artifactId>jaxb-api</artifactId> <version>2.2.11</version> @@ -443,16 +431,41 @@ <version>${groovy.version}</version> <classifier>indy</classifier> </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-context</artifactId> + <version>${springframework.version}</version> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-web</artifactId> + <version>${springframework.version}</version> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-core</artifactId> + <version>${springframework.version}</version> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-expression</artifactId> + <version>${springframework.version}</version> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-webmvc</artifactId> + <version>${springframework.version}</version> + </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-test</artifactId> - <version>4.3.21.RELEASE</version> + <version>${springframework.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-test</artifactId> - <version>1.5.20.RELEASE</version> + <version>1.5.21.RELEASE</version> <scope>test</scope> </dependency> <dependency> @@ -486,7 +499,7 @@ <dependency> <groupId>org.springframework</groupId> <artifactId>spring-jms</artifactId> - <version>4.3.21.RELEASE</version> + <version>${springframework.version}</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> diff --git a/aai-core/src/test/java/org/onap/aai/AAISetup.java b/aai-core/src/test/java/org/onap/aai/AAISetup.java index ade20f4a..4bc30b8c 100644 --- a/aai-core/src/test/java/org/onap/aai/AAISetup.java +++ b/aai-core/src/test/java/org/onap/aai/AAISetup.java @@ -22,7 +22,7 @@ package org.onap.aai; import java.util.Map; -import org.junit.BeforeClass; +import org.junit.Before; import org.junit.ClassRule; import org.junit.Rule; import org.onap.aai.config.ConfigConfiguration; @@ -88,8 +88,8 @@ public abstract class AAISetup { protected static final String SERVICE_NAME = "JUNIT"; - @BeforeClass - public static void setupBundleconfig() throws Exception { + @Before + public void setupBundleconfig() throws Exception { System.setProperty("AJSC_HOME", "."); System.setProperty("BUNDLECONFIG_DIR", "src/test/resources/bundleconfig-local"); System.setProperty("aai.service.name", SERVICE_NAME); |