<dependency>\r
<groupId>com.thoughtworks.xstream</groupId>\r
<artifactId>xstream</artifactId>\r
- <version>1.4.7</version>\r
+ <version>${thoughtworks.version}</version>\r
</dependency>\r
<dependency>\r
<groupId>org.json</groupId>\r
<artifactId>eelf-core</artifactId>\r
<version>0.0.1</version>\r
</dependency>\r
- <dependency>\r
- <groupId>javax.servlet</groupId>\r
- <artifactId>servlet-api</artifactId>\r
- <version>2.5</version>\r
- </dependency>\r
<dependency>\r
<groupId>org.eclipse.jetty</groupId>\r
<artifactId>jetty-server</artifactId>\r
- <version>7.6.14.v20131031</version>\r
+ <version>${jetty.version}</version>\r
</dependency>\r
<dependency>\r
<groupId>org.eclipse.jetty</groupId>\r
<artifactId>jetty-continuation</artifactId>\r
- <version>7.6.14.v20131031</version>\r
+ <version>${jetty.version}</version>\r
</dependency>\r
<dependency>\r
<groupId>org.eclipse.jetty</groupId>\r
<artifactId>jetty-util</artifactId>\r
- <version>7.6.14.v20131031</version>\r
+ <version>${jetty.version}</version>\r
</dependency>\r
<dependency>\r
<groupId>org.eclipse.jetty</groupId>\r
<artifactId>jetty-deploy</artifactId>\r
- <version>7.6.14.v20131031</version>\r
+ <version>${jetty.version}</version>\r
</dependency>\r
<dependency>\r
<groupId>org.eclipse.jetty</groupId>\r
<artifactId>jetty-servlet</artifactId>\r
- <version>7.6.14.v20131031</version>\r
+ <version>${jetty.version}</version>\r
</dependency>\r
<dependency>\r
<groupId>org.eclipse.jetty</groupId>\r
<artifactId>jetty-servlets</artifactId>\r
- <version>7.6.14.v20131031</version>\r
+ <version>${jetty.version}</version>\r
</dependency>\r
<dependency>\r
<groupId>org.eclipse.jetty</groupId>\r
<artifactId>jetty-http</artifactId>\r
- <version>7.6.14.v20131031</version>\r
+ <version>${jetty.version}</version>\r
</dependency>\r
<dependency>\r
<groupId>org.eclipse.jetty</groupId>\r
<artifactId>jetty-security</artifactId>\r
- <version>7.6.14.v20131031</version>\r
+ <version>${jetty.version}</version>\r
</dependency>\r
<dependency>\r
<groupId>org.eclipse.jetty</groupId>\r
<artifactId>jetty-websocket</artifactId>\r
- <version>7.6.14.v20131031</version>\r
+ <version>${jetty.websocket.version}</version>\r
</dependency>\r
<dependency>\r
<groupId>org.eclipse.jetty</groupId>\r
<artifactId>jetty-io</artifactId>\r
- <version>7.6.14.v20131031</version>\r
+ <version>${jetty.version}</version>\r
</dependency>\r
<dependency>\r
<groupId>org.apache.commons</groupId>\r
<version>1.6.4</version>\r
<scope>test</scope>\r
</dependency>\r
- <!-- <dependency><groupId>org.junit</groupId><artifactId>com.springsource.org.junit</artifactId><version>4.4.0</version></dependency>-->\r
<dependency>\r
- <groupId>mysql</groupId>\r
- <artifactId>mysql-connector-java</artifactId>\r
- <version>5.1.21</version>\r
+ <groupId>org.apache.commons</groupId>\r
+ <artifactId>commons-lang3</artifactId>\r
+ <version>3.0</version>\r
+ </dependency>\r
+ <dependency>\r
+ <groupId>org.mariadb.jdbc</groupId>\r
+ <artifactId>mariadb-java-client</artifactId>\r
+ <version>2.2.5</version>\r
</dependency>\r
<dependency>\r
<groupId>org.eclipse.jetty.cdi</groupId>\r
<artifactId>cdi-websocket</artifactId>\r
- <version>9.3.11.v20160721</version>\r
+ <version>${jetty.version}</version>\r
</dependency>\r
<dependency>\r
<groupId>log4j</groupId>\r
<directory>src/main/resources</directory>\r
<filtering>true</filtering>\r
<includes>\r
- <include>**/proserver.properties</include>\r
+ <include>**/provserver.properties</include>\r
</includes>\r
</resource>\r
<resource>\r
<include>**/log4j.properties</include>\r
</includes>\r
</resource>\r
- <!-- <resource><directory>src/main/config</directory><filtering>true</filtering><includes><include>**/log4j*.xml</include></includes></resource><resource><directory>src/main/resources</directory><filtering>false</filtering><excludes><exclude>**/cambriaApiVersion.properties</exclude></excludes></resource>-->\r
+ <resource>\r
+ <directory>src/test/resources</directory>\r
+ <filtering>true</filtering>\r
+ <includes>\r
+ <include>**/log4j.properties</include>\r
+ </includes>\r
+ </resource>\r
</resources>\r
<plugins>\r
<plugin>\r
<goal>copy-resources</goal>\r
</goals>\r
<configuration>\r
- <outputDirectory>${basedir}/target/opt/app/datartr/self_signed</outputDirectory>\r
+ <outputDirectory>${basedir}/target/opt/app/datartr/aaf_certs</outputDirectory>\r
<resources>\r
<resource>\r
- <directory>${basedir}/self_signed</directory>\r
+ <directory>${basedir}/aaf_certs</directory>\r
<includes>\r
<include>misc/**</include>\r
<include>**/**</include>\r
<version>1.6.7</version>\r
<extensions>true</extensions>\r
<configuration>\r
- <nexusUrl>${onap.nexus.dockerregistry.daily}</nexusUrl>\r
+ <nexusUrl>${onap.nexus.url}</nexusUrl>\r
<stagingProfileId>176c31dfe190a</stagingProfileId>\r
<serverId>ecomp-staging</serverId>\r
</configuration>\r