<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>
<groupId>org.onap.portal</groupId>
<artifactId>onap-portal-parent</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>2.2.0</version>
</parent>
- <artifactId>ecompportal-be-os</artifactId>
+ <artifactId>portal-be-os</artifactId>
<packaging>war</packaging>
<properties>
<finalName>${project.artifactId}</finalName>
<plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>sonar-maven-plugin</artifactId>
- <version>3.2</version>
- </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
</dependency>
</dependencies>
</plugin>
- <plugin>
- <groupId>org.jacoco</groupId>
- <artifactId>jacoco-maven-plugin</artifactId>
- <version>0.7.6.201602180812</version>
- <inherited>True</inherited>
- <executions>
- <!-- Unit-Tests -->
- <execution>
- <id>prepare-agent</id>
- <goals>
- <goal>prepare-agent</goal>
- </goals>
- <configuration>
- <skipTests>false</skipTests>
- <destFile>${sonar.jacoco.reportPath}</destFile>
- </configuration>
- </execution>
- <execution>
- <id>default-instrument</id>
- <goals>
- <goal>instrument</goal>
- </goals>
- <configuration>
- <skipTests>false</skipTests>
- </configuration>
- </execution>
- <execution>
- <id>default-restore-instrumented-classes</id>
- <phase>test</phase>
- <goals>
- <goal>restore-instrumented-classes</goal>
- </goals>
- <configuration>
- <skipTests>false</skipTests>
- </configuration>
- </execution>
- <execution>
- <id>post-unit-test</id>
- <phase>test</phase>
-
- <goals>
- <goal>report</goal>
- </goals>
- <configuration>
- <skipTests>false</skipTests>
- <dataFile>${sonar.jacoco.reportPath}</dataFile>
- <outputDirectory>${project.basedir}/target/site/jacoco</outputDirectory>
- </configuration>
- </execution>
- <!-- Will see build errors while running the test cases because of dual
- instrumentation -->
-
- <!-- Integration Tests (Only report goal) -->
- <execution>
- <id>report-integration</id>
- <phase>test</phase>
- <goals>
- <goal>report-integration</goal>
- </goals>
- <configuration>
- <skipTests>false</skipTests>
- <dataFile>${sonar.jacoco.itReportPath}</dataFile>
- <outputDirectory>${project.basedir}/target/site/it-jacoco</outputDirectory>
- </configuration>
- </execution>
- </executions>
- </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<!-- specify the order in which these should be applied -->
<overlay>
<groupId>org.onap.portal</groupId>
- <artifactId>ecompportal-be-common</artifactId>
+ <artifactId>portal-be-common</artifactId>
</overlay>
<overlay>
<groupId>org.onap.portal.sdk</groupId>
<version>2.3.1</version>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jstl</artifactId>
- <version>1.2</version>
+ <groupId>org.apache.taglibs</groupId>
+ <artifactId>taglibs-standard-spec</artifactId>
+ <version>1.2.5</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.taglibs</groupId>
+ <artifactId>taglibs-standard-impl</artifactId>
+ <version>1.2.5</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.taglibs</groupId>
+ <artifactId>taglibs-standard-jstlel</artifactId>
+ <version>1.2.5</version>
</dependency>
-
<!-- Apache Tiles -->
<dependency>
<groupId>org.apache.tiles</groupId>
<artifactId>epsdk-app-common</artifactId>
<version>${epsdk.version}</version>
<type>jar</type>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils-core</artifactId>
+ </exclusion>
+ </exclusions>
+
</dependency>
<!-- EcompPortal common overlay -->
<dependency>
<groupId>org.onap.portal</groupId>
- <artifactId>ecompportal-be-common</artifactId>
+ <artifactId>portal-be-common</artifactId>
<version>${project.version}</version>
<type>war</type>
</dependency>
<dependency>
<groupId>org.onap.portal</groupId>
- <artifactId>ecompportal-be-common</artifactId>
+ <artifactId>portal-be-common</artifactId>
<version>${project.version}</version>
<type>jar</type>
<classifier>classes</classifier>
</dependency>
+ <dependency>
+ <groupId>org.onap.portal</groupId>
+ <artifactId>portal-be-common</artifactId>
+ <version>${project.version}</version>
+ <type>jar</type>
+ <classifier>tests</classifier>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.onap.portal.sdk</groupId>
<artifactId>epsdk-fw</artifactId>
<artifactId>epsdk-analytics</artifactId>
<version>${epsdk.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.json</groupId>
+ <artifactId>json</artifactId>
+ <version>20171018</version>
+ </dependency>
<!-- Referenced by some poms and needed for testing; do NOT use "test"
scope here. -->
<dependency>
<dependency>
<groupId>org.mitre</groupId>
<artifactId>openid-connect-client</artifactId>
- <version>1.2.2</version>
+ <version>1.3.1</version>
<exclusions>
<exclusion>
<groupId>org.codehaus.jackson</groupId>
</exclusion>
</exclusions>
</dependency>
- <dependency>
+<!-- <dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-taglibs</artifactId>
<version>3.2.8.RELEASE</version>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
- </dependency>
+ </dependency> -->
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjrt</artifactId>
<artifactId>aspectjweaver</artifactId>
<version>1.8.9</version>
</dependency>
+ <!-- Jacoco for offline instrumentation -->
+ <dependency>
+ <groupId>org.jacoco</groupId>
+ <artifactId>org.jacoco.agent</artifactId>
+ <version>${jacocoVersion}</version>
+ <classifier>runtime</classifier>
+ </dependency>
</dependencies>
<reporting>
</plugins>
</reporting>
-
</project>