diff options
| author |   efiacor <fiachra.corcoran@est.tech> | 2019-10-08 16:24:28 +0100 |
|---|---|---|
| committer | efiacor <fiachra.corcoran@est.tech> | 2019-10-11 09:22:47 +0100 |
| commit | 1ccd9c36ba12849148f9eb73e8ff2ffe4ade5870 (patch) | |
| tree | b138596f05a8cdda774d5b447253ac6c673ceceb /datarouter-node/pom.xml | |
| parent | 029b5296b1bc070be3f1718190c50a1d58a2ecfa (diff) | |
Update AAF loading procedure2.1.3
Signed-off-by: efiacor <fiachra.corcoran@est.tech>
Issue-ID: DMAAP-1318
Change-Id: I8dc75bdbcd05e5316b5c05cbc258010068fb63e8
Diffstat (limited to 'datarouter-node/pom.xml')
| -rwxr-xr-x | datarouter-node/pom.xml | 86 |
1 files changed, 33 insertions, 53 deletions
diff --git a/datarouter-node/pom.xml b/datarouter-node/pom.xml index 6ebfd967..af605b0b 100755 --- a/datarouter-node/pom.xml +++ b/datarouter-node/pom.xml @@ -42,8 +42,8 @@ </properties> <dependencies> <dependency> - <groupId>org.hamcrest</groupId> - <artifactId>hamcrest-library</artifactId> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> </dependency> <dependency> <groupId>org.slf4j</groupId> @@ -58,10 +58,6 @@ <artifactId>commons-io</artifactId> </dependency> <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </dependency> - <dependency> <groupId>org.json</groupId> <artifactId>json</artifactId> </dependency> @@ -78,10 +74,6 @@ <artifactId>logback-core</artifactId> </dependency> <dependency> - <groupId>com.intellij</groupId> - <artifactId>annotations</artifactId> - </dependency> - <dependency> <groupId>javax.servlet</groupId> <artifactId>javax.servlet-api</artifactId> </dependency> @@ -106,37 +98,54 @@ <artifactId>aaf-cadi-core</artifactId> </dependency> <dependency> + <groupId>com.intellij</groupId> + <artifactId>annotations</artifactId> + </dependency> + <dependency> + <groupId>org.hamcrest</groupId> + <artifactId>hamcrest-library</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>org.sonatype.http-testing-harness</groupId> <artifactId>junit-runner</artifactId> + <scope>test</scope> </dependency> <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> + <scope>test</scope> </dependency> <dependency> <groupId>org.powermock</groupId> <artifactId>powermock-module-junit4</artifactId> + <scope>test</scope> </dependency> <dependency> <groupId>org.powermock</groupId> <artifactId>powermock-api-mockito</artifactId> + <scope>test</scope> </dependency> <dependency> <groupId>org.powermock</groupId> <artifactId>powermock-api-support</artifactId> + <scope>test</scope> </dependency> <dependency> <groupId>org.powermock</groupId> <artifactId>powermock-core</artifactId> - </dependency> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-lang3</artifactId> + <scope>test</scope> </dependency> <dependency> <groupId>org.awaitility</groupId> <artifactId>awaitility</artifactId> <version>3.1.6</version> + <scope>test</scope> </dependency> </dependencies> <profiles> @@ -205,7 +214,7 @@ <directory>src/main/resources</directory> <filtering>true</filtering> <includes> - <include>**/EelfMessages.properties</include> + <include>**/logback.xml</include> </includes> </resource> </resources> @@ -260,7 +269,7 @@ <directory>${basedir}/src/main/resources/docker</directory> <filtering>true</filtering> <includes> - <include>**/*</include> + <include>Dockerfile</include> </includes> </resource> </resources> @@ -287,7 +296,7 @@ </configuration> </execution> <execution> - <id>copy-resources-2</id> + <id>copy-resources-etc</id> <phase>validate</phase> <goals> <goal>copy-resources</goal> @@ -301,61 +310,32 @@ <include>misc/**</include> <include>**/**</include> </includes> + <excludes> + <exclude>aaf/**</exclude> + <exclude>docker/**</exclude> + </excludes> </resource> </resources> </configuration> </execution> <execution> - <id>copy-resources-3</id> + <id>copy-aaf-props</id> <phase>validate</phase> <goals> <goal>copy-resources</goal> </goals> <configuration> - <outputDirectory>${basedir}/target/docker-stage/opt/app/datartr</outputDirectory> + <outputDirectory>${basedir}/target/docker-stage/opt/app/osaaf/local</outputDirectory> <resources> <resource> - <directory>${basedir}/data</directory> + <directory>${basedir}/src/main/resources/aaf</directory> <includes> - <include>misc/**</include> <include>**/**</include> </includes> </resource> </resources> </configuration> </execution> - <execution> - <id>copy-resources-4</id> - <phase>validate</phase> - <goals> - <goal>copy-resources</goal> - </goals> - <configuration> - <outputDirectory>${basedir}/target/docker-stage/opt/app/datartr/aaf_certs</outputDirectory> - <resources> - <resource> - <directory>${basedir}/aaf_certs</directory> - <includes> - <include>misc/**</include> - <include>**/**</include> - </includes> - </resource> - </resources> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <id>copy-dependencies</id> - <phase>package</phase> - <configuration> - <outputDirectory>${project.build.directory}/docker-stage/opt/app/datartr/lib</outputDirectory> - </configuration> - </execution> </executions> </plugin> <plugin> |