diff options
Diffstat (limited to 'vid-app-common/pom.xml')
| -rwxr-xr-x | vid-app-common/pom.xml | 177 |
1 files changed, 143 insertions, 34 deletions
diff --git a/vid-app-common/pom.xml b/vid-app-common/pom.xml index 175c07711..79d8cdd4f 100755 --- a/vid-app-common/pom.xml +++ b/vid-app-common/pom.xml @@ -21,6 +21,10 @@ <epsdk.version>2.4.0</epsdk.version> <springframework.version>4.2.9.RELEASE</springframework.version> <hibernate.version>4.3.11.Final</hibernate.version> + <jackson.version>2.9.7</jackson.version> + <jersey.version>2.27</jersey.version> + <surefire.version>2.22.1</surefire.version> + <!-- Skip assembling the zip by default --> <skipassembly>true</skipassembly> <!-- Tests usually require some setup that maven cannot do, so skip. --> @@ -30,6 +34,11 @@ <releaseNexusPath>/content/repositories/releases/</releaseNexusPath> <stagingNexusPath>/content/repositories/staging/</stagingNexusPath> <sitePath>/content/sites/site/org/onap/vid/${project.version}</sitePath> + + <aspectj.version>1.8.9</aspectj.version> + <kotlin.version>1.3.11</kotlin.version> + <kotlin.compiler.jvmTarget>1.8</kotlin.compiler.jvmTarget> + </properties> @@ -82,6 +91,33 @@ <finalName>vid-common</finalName> <plugins> + + <plugin> + <artifactId>kotlin-maven-plugin</artifactId> + <groupId>org.jetbrains.kotlin</groupId> + <version>${kotlin.version}</version> + <executions> + <execution> + <id>compile</id> + <goals> <goal>compile</goal> </goals> + <configuration> + <sourceDirs> + <sourceDir>${project.basedir}/src/main/java</sourceDir> + </sourceDirs> + </configuration> + </execution> + <execution> + <id>test-compile</id> + <goals> <goal>test-compile</goal> </goals> + <configuration> + <sourceDirs> + <sourceDir>${project.basedir}/src/test/java</sourceDir> + </sourceDirs> + </configuration> + </execution> + </executions> + </plugin> + <plugin> <groupId>org.sonatype.plugins</groupId> <artifactId>nexus-staging-maven-plugin</artifactId> @@ -123,39 +159,44 @@ <version>2.2</version> </plugin> - <!-- Generate POJOs from MSO json schema --> <plugin> - <groupId>org.jsonschema2pojo</groupId> - <artifactId>jsonschema2pojo-maven-plugin</artifactId> - <version>0.4.23</version> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <version>3.5.1</version> <configuration> - <sourceDirectory>${basedir}/src/main/resources/json/mso</sourceDirectory> - <targetPackage>org.onap.vid.domain.mso</targetPackage> - <outputDirectory>${project.build.directory}/generated-sources</outputDirectory> + <source>1.8</source> + <target>1.8</target> </configuration> + <executions> + <!-- Replacing default-compile as it is treated specially by maven --> <execution> - <goals> - <goal>generate</goal> - </goals> + <id>default-compile</id> + <phase>none</phase> + </execution> + <!-- Replacing default-testCompile as it is treated specially by maven --> + <execution> + <id>default-testCompile</id> + <phase>none</phase> + </execution> + <execution> + <id>java-compile</id> + <phase>compile</phase> + <goals> <goal>compile</goal> </goals> + </execution> + <execution> + <id>java-test-compile</id> + <phase>test-compile</phase> + <goals> <goal>testCompile</goal> </goals> </execution> </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>3.1</version> - <configuration> - <source>1.8</source> - <target>1.8</target> - </configuration> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> - <version>2.19.1</version> + <version>${surefire.version}</version> <configuration> <skipTests>${skiptests}</skipTests> <includes> @@ -174,7 +215,29 @@ <container.classpath>classpath:</container.classpath> </systemPropertyVariables> <useSystemClassLoader>false</useSystemClassLoader> + <properties> + <property> + <!-- avoid running JUnit tests within surefire-testng provider --> + <name>junit</name> + <value>false</value> + </property> + </properties> + <threadCount>1</threadCount> </configuration> + <dependencies> + <!-- Running TestNG and JUnit Tests --> + <!-- https://maven.apache.org/surefire/maven-surefire-plugin/examples/testng.html --> + <dependency> + <groupId>org.apache.maven.surefire</groupId> + <artifactId>surefire-junit47</artifactId> + <version>${surefire.version}</version> + </dependency> + <dependency> + <groupId>org.apache.maven.surefire</groupId> + <artifactId>surefire-testng</artifactId> + <version>${surefire.version}</version> + </dependency> + </dependencies> </plugin> <plugin> @@ -237,8 +300,7 @@ <dateFormat>yyyy-MM-dd'T'HH:mm:ssZ</dateFormat> <dateFormatTimeZone>${user.timezone}</dateFormatTimeZone> <generateGitPropertiesFile>true</generateGitPropertiesFile> - <generateGitPropertiesFilename>${project.build.outputDirectory}/git.properties - </generateGitPropertiesFilename> + <generateGitPropertiesFilename>${project.build.outputDirectory}/git.properties</generateGitPropertiesFilename> <includeOnlyProperties> <includeOnlyProperty>^git.commit.id$</includeOnlyProperty> <includeOnlyProperty>^git.commit.message.short$</includeOnlyProperty> @@ -288,7 +350,7 @@ <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpclient</artifactId> - <version>4.3.6</version> + <version>4.5.6</version> </dependency> <dependency> <groupId>org.apache.httpcomponents</groupId> @@ -371,26 +433,32 @@ <version>1.2.3</version> </dependency> + <dependency> + <groupId>org.jetbrains.kotlin</groupId> + <artifactId>kotlin-stdlib-jdk8</artifactId> + <version>${kotlin.version}</version> + </dependency> + <!-- Mapper --> <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-annotations</artifactId> - <version>2.6.3</version> + <version>${jackson.version}</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-core</artifactId> - <version>2.8.6</version> + <version>${jackson.version}</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> - <version>2.6.7.1</version> + <version>${jackson.version}</version> </dependency> <dependency> - <groupId>org.codehaus.jackson</groupId> - <artifactId>jackson-mapper-asl</artifactId> - <version>1.9.13</version> + <groupId>com.fasterxml.jackson.module</groupId> + <artifactId>jackson-module-kotlin</artifactId> + <version>${jackson.version}</version> </dependency> <dependency> <groupId>com.mchange</groupId> @@ -418,6 +486,7 @@ <groupId>junit</groupId> <artifactId>junit</artifactId> <version>4.12</version> + <scope>test</scope> </dependency> <dependency> <groupId>commons-io</groupId> @@ -493,17 +562,23 @@ <dependency> <groupId>org.glassfish.jersey.core</groupId> <artifactId>jersey-client</artifactId> - <version>2.23.1</version> + <version>${jersey.version}</version> </dependency> <dependency> <groupId>org.glassfish.jersey.connectors</groupId> <artifactId>jersey-jetty-connector</artifactId> - <version>2.23.1</version> + <version>${jersey.version}</version> + </dependency> + <!--https://stackoverflow.com/questions/44088493/jersey-stopped-working-with-injectionmanagerfactory-not-found--> + <dependency> + <groupId>org.glassfish.jersey.inject</groupId> + <artifactId>jersey-hk2</artifactId> + <version>${jersey.version}</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.jaxrs</groupId> <artifactId>jackson-jaxrs-json-provider</artifactId> - <version>2.6.3</version> + <version>${jackson.version}</version> </dependency> <dependency> <groupId>commons-beanutils</groupId> @@ -530,7 +605,7 @@ <dependency> <groupId>org.testng</groupId> <artifactId>testng</artifactId> - <version>6.8</version> + <version>6.14.3</version> <scope>test</scope> </dependency> <dependency> @@ -558,11 +633,12 @@ <groupId>org.skyscreamer</groupId> <artifactId>jsonassert</artifactId> <version>1.5.0</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.onap.sdc.sdc-tosca</groupId> <artifactId>sdc-tosca</artifactId> - <version>1.4.1</version> + <version>1.4.7</version> <scope>compile</scope> </dependency> <dependency> @@ -572,11 +648,27 @@ <scope>test</scope> </dependency> <dependency> + <groupId>org.glassfish.jersey.media</groupId> + <artifactId>jersey-media-json-jackson</artifactId> + <version>${jersey.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + <version>3.6</version> + </dependency> + <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-text</artifactId> <version>1.1</version> </dependency> <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-proxy</artifactId> + <version>1.0</version> + </dependency> + <dependency> <groupId>org.hamcrest</groupId> <artifactId>java-hamcrest</artifactId> <version>2.0.0.0</version> @@ -588,10 +680,27 @@ <version>2.5.0.Final</version> </dependency> <dependency> + <groupId>com.h2database</groupId> + <artifactId>h2</artifactId> + <version>1.4.196</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <version>2.2.11</version> + </dependency> + + <dependency> <groupId>org.assertj</groupId> <artifactId>assertj-core</artifactId> <version>3.10.0</version> <scope>compile</scope> </dependency> + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + <version>23.0</version> + </dependency> </dependencies> </project> |