diff options
| author |   Timoney, Dan (dt5972) <dt5972@att.com> | 2018-04-20 14:25:32 -0400 |
|---|---|---|
| committer | Timoney, Dan (dt5972) <dt5972@att.com> | 2018-04-20 14:25:32 -0400 |
| commit | 69c4c5b6100492d3158364699d46a7c80e49ca49 (patch) | |
| tree | e0c8489d5e4cdb4222add1372915fdff868732ff | |
| parent | 6f0adc3452a470d031978e3cfb8a0aa8bc834e34 (diff) | |
Fix feature dependency versions
Fix single-feature pom.xmls to use version of sli/core artifactsi
specified in parent poms, as opposed to project.version, which
is incorrect and causes release build to break.
Change-Id: Iec00a73b1b4adf9e8fecdb190385bb35ab1fe1c7
Issue-ID: CCSDK-248
Signed-off-by: Timoney, Dan (dt5972) <dt5972@att.com>
14 files changed, 5 insertions, 25 deletions
diff --git a/.gitignore b/.gitignore index f7a3d77cd..3865ebb96 100755 --- a/.gitignore +++ b/.gitignore @@ -31,6 +31,9 @@ out/ .metadata provider/src/main/java/META-INF/ provider/src/main/java/inventory/ +logs/ +debug-logs/ +*.log ## BlackDuck generated file ccsdk-adaptors_bdio.jsonld diff --git a/aai-service/features/ccsdk-aai-service/pom.xml b/aai-service/features/ccsdk-aai-service/pom.xml index 3e1a5059e..1e33927ce 100644 --- a/aai-service/features/ccsdk-aai-service/pom.xml +++ b/aai-service/features/ccsdk-aai-service/pom.xml @@ -27,7 +27,6 @@ <dependency> <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>ccsdk-sli</artifactId> - <version>${project.version}</version> <type>xml</type> <classifier>features</classifier> </dependency> diff --git a/ansible-adapter/ansible-adapter-bundle/debug-logs/EELF/debug.log b/ansible-adapter/ansible-adapter-bundle/debug-logs/EELF/debug.log deleted file mode 100644 index e69de29bb..000000000 --- a/ansible-adapter/ansible-adapter-bundle/debug-logs/EELF/debug.log +++ /dev/null diff --git a/ansible-adapter/ansible-adapter-bundle/logs/EELF/application.log b/ansible-adapter/ansible-adapter-bundle/logs/EELF/application.log deleted file mode 100644 index e42f4053d..000000000 --- a/ansible-adapter/ansible-adapter-bundle/logs/EELF/application.log +++ /dev/null @@ -1,19 +0,0 @@ -2018-04-17 22:38:28,679|||main||||INFO||||||| EELF0005I Searching path "${user.home};etc;../etc" for log configuration file "logback-test.xml" -2018-04-17 22:38:28,682|||main||||INFO||||||| EELF0001I Loading default logging configuration from system resource file "com/att/eelf/logback.xml" -2018-04-17 22:38:28,698|||main||||INFO||||||| Retrieving results from https://192.168.1.1?Id=101&Type=GetLog -2018-04-17 22:38:28,698|||main||||INFO||||||| Querying url = https://192.168.1.1?Id=101&Type=GetLog -2018-04-17 22:38:28,709|||main||||INFO||||||| Request output = {"Results":{"192.168.1.10":{"Id":"101","StatusCode":200,"StatusMessage":"SUCCESS"}},"StatusCode":200,"StatusMessage":"FINISHED"} -2018-04-17 22:38:28,712|||main||||INFO||||||| Got uri -2018-04-17 22:38:28,715|||main||||INFO||||||| Querying url = https://192.168.1.1?Id=100&Type=GetResult -2018-04-17 22:38:28,715|||main||||INFO||||||| Parsing response from Server = {"Results":{"192.168.1.10":{"Id":"100","StatusCode":200,"StatusMessage":"SUCCESS"}},"StatusCode":200,"StatusMessage":"FINISHED"} -2018-04-17 22:38:28,719|||main||||INFO||||||| Received response with code = 200, Message = FINISHED -2018-04-17 22:38:28,719|||main||||INFO||||||| Processing results in response -2018-04-17 22:38:28,719|||main||||INFO||||||| Get JSON dictionary from Results .. -2018-04-17 22:38:28,719|||main||||INFO||||||| Iterating through hosts -2018-04-17 22:38:28,719|||main||||INFO||||||| Processing host = 192.168.1.10 -2018-04-17 22:38:28,719|||main||||INFO||||||| Code = 200, Message = SUCCESS -2018-04-17 22:38:28,720|||main||||INFO||||||| Request response = FINISHED -2018-04-17 22:38:28,720|||main||||INFO||||||| Ansible Request 100 finished with Result = success, Message = FINISHED -2018-04-17 22:38:28,775|||main||||INFO||||||| Updated Payload = {"Id":"cd75d4da-096c-419e-a2c8-3e14362c729c","PlaybookName":"test_playbook.yaml"} -2018-04-17 22:38:28,775|||main||||INFO||||||| Posting request = {"Id":"cd75d4da-096c-419e-a2c8-3e14362c729c","PlaybookName":"test_playbook.yaml"} to url = https://192.168.1.1 -2018-04-17 22:38:28,775|||main||||INFO||||||| Submission of Test successful. diff --git a/ansible-adapter/ansible-adapter-bundle/logs/EELF/audit.log b/ansible-adapter/ansible-adapter-bundle/logs/EELF/audit.log deleted file mode 100644 index e69de29bb..000000000 --- a/ansible-adapter/ansible-adapter-bundle/logs/EELF/audit.log +++ /dev/null diff --git a/ansible-adapter/ansible-adapter-bundle/logs/EELF/error.log b/ansible-adapter/ansible-adapter-bundle/logs/EELF/error.log deleted file mode 100644 index e69de29bb..000000000 --- a/ansible-adapter/ansible-adapter-bundle/logs/EELF/error.log +++ /dev/null diff --git a/ansible-adapter/ansible-adapter-bundle/logs/EELF/metrics.log b/ansible-adapter/ansible-adapter-bundle/logs/EELF/metrics.log deleted file mode 100644 index e69de29bb..000000000 --- a/ansible-adapter/ansible-adapter-bundle/logs/EELF/metrics.log +++ /dev/null diff --git a/ansible-adapter/ansible-adapter-bundle/logs/EELF/performance.log b/ansible-adapter/ansible-adapter-bundle/logs/EELF/performance.log deleted file mode 100644 index e69de29bb..000000000 --- a/ansible-adapter/ansible-adapter-bundle/logs/EELF/performance.log +++ /dev/null diff --git a/ansible-adapter/ansible-adapter-bundle/logs/EELF/policy.log b/ansible-adapter/ansible-adapter-bundle/logs/EELF/policy.log deleted file mode 100644 index e69de29bb..000000000 --- a/ansible-adapter/ansible-adapter-bundle/logs/EELF/policy.log +++ /dev/null diff --git a/ansible-adapter/ansible-adapter-bundle/logs/EELF/security.log b/ansible-adapter/ansible-adapter-bundle/logs/EELF/security.log deleted file mode 100644 index e69de29bb..000000000 --- a/ansible-adapter/ansible-adapter-bundle/logs/EELF/security.log +++ /dev/null diff --git a/ansible-adapter/ansible-adapter-bundle/logs/EELF/server.log b/ansible-adapter/ansible-adapter-bundle/logs/EELF/server.log deleted file mode 100644 index e69de29bb..000000000 --- a/ansible-adapter/ansible-adapter-bundle/logs/EELF/server.log +++ /dev/null diff --git a/mdsal-resource/features/ccsdk-mdsal-resource/pom.xml b/mdsal-resource/features/ccsdk-mdsal-resource/pom.xml index 6869f16c5..a6d6c3057 100644 --- a/mdsal-resource/features/ccsdk-mdsal-resource/pom.xml +++ b/mdsal-resource/features/ccsdk-mdsal-resource/pom.xml @@ -28,7 +28,6 @@ <dependency> <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>ccsdk-sli</artifactId> - <version>${project.version}</version> <type>xml</type> <classifier>features</classifier> </dependency> diff --git a/resource-assignment/features/ccsdk-resource-assignment/pom.xml b/resource-assignment/features/ccsdk-resource-assignment/pom.xml index c50cf3ca5..568b246a6 100644 --- a/resource-assignment/features/ccsdk-resource-assignment/pom.xml +++ b/resource-assignment/features/ccsdk-resource-assignment/pom.xml @@ -28,7 +28,6 @@ <dependency> <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>ccsdk-sli</artifactId> - <version>${project.version}</version> <type>xml</type> <classifier>features</classifier> </dependency> @@ -36,7 +35,7 @@ <dependency> <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>ccsdk-dblib</artifactId> - <version>${project.version}</version> + <version>${ccsdk.sli.core.version}</version> <type>xml</type> <classifier>features</classifier> </dependency> diff --git a/sql-resource/features/ccsdk-sql-resource/pom.xml b/sql-resource/features/ccsdk-sql-resource/pom.xml index d547eb1d5..5a20846a5 100644 --- a/sql-resource/features/ccsdk-sql-resource/pom.xml +++ b/sql-resource/features/ccsdk-sql-resource/pom.xml @@ -28,14 +28,13 @@ <dependency> <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>ccsdk-sli</artifactId> - <version>${project.version}</version> <type>xml</type> <classifier>features</classifier> </dependency> <dependency> <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>ccsdk-dblib</artifactId> - <version>${project.version}</version> + <version>${ccsdk.sli.core.version}</version> <type>xml</type> <classifier>features</classifier> </dependency> |