diff options
author | liamfallon <liam.fallon@est.tech> | 2021-02-10 19:03:47 +0000 |
---|---|---|
committer | liamfallon <liam.fallon@est.tech> | 2021-02-11 09:08:50 +0000 |
commit | d7f6e96eb454f45df7ec571506d11ac2a5c7deac (patch) | |
tree | 032c788258a622e04a9a5bf6cbe97c8b05c92ab0 | |
parent | cd3f004747d8513f34ded969d86cadad845505e7 (diff) |
Enable building of the tosca PoC code
At the moment, because the code in the tosca-controlloop directory is
not linked to the CLAMP pom, it is not built by the Jenkins jobs.
This commit makes a change to the pom.xml file on the tosca-poc branch
only so that the tosca-controlloop code is built.
The maven-invoker-plugin runs a build of the code in the
tosca-controlloop subdirectory by invoking a build of its pom.xml. The
output artifacts are placed in target/tosca-controlloop and do not
interfere in any way with the main CLAMP build.
However, if there are compile erors/test fails/maven errors in the
tosca-controlloop coode, the build wil and should fail.
Issue-ID: POLICY-2995
Change-Id: Ie4d3e3189af6afe0a046ab565a7cc2703afa503d
Signed-off-by: liamfallon <liam.fallon@est.tech>
-rw-r--r-- | pom.xml | 21 | ||||
-rwxr-xr-x | tosca-controlloop/common/pom.xml | 5 | ||||
-rwxr-xr-x | tosca-controlloop/design/pom.xml | 5 | ||||
-rwxr-xr-x | tosca-controlloop/models/pom.xml | 5 | ||||
-rw-r--r-- | tosca-controlloop/participants/pom.xml | 22 | ||||
-rwxr-xr-x | tosca-controlloop/pom.xml | 69 | ||||
-rw-r--r-- | tosca-controlloop/runtime/pom.xml | 18 |
7 files changed, 92 insertions, 53 deletions
@@ -5,6 +5,7 @@ ================================================================================ Copyright (C) 2017-2021 AT&T Intellectual Property. All rights reserved. + Modifications Copyright (C) 2021 Nordix Foundation. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -1306,6 +1307,26 @@ </execution> </executions> </plugin> + <plugin> + <artifactId>maven-invoker-plugin</artifactId> + <version>3.2.1</version> + <configuration> + <projectsDirectory>tosca-controlloop</projectsDirectory> + <cloneProjectsTo>${project.build.directory}/tosca-controlloop</cloneProjectsTo> + <pomIncludes> + <pomInclude>*/pom.xml</pomInclude> + </pomIncludes> + <streamLogs>true</streamLogs> + </configuration> + <executions> + <execution> + <id>build-tosca-controlloop</id> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + </plugin> </plugins> </build> </project> diff --git a/tosca-controlloop/common/pom.xml b/tosca-controlloop/common/pom.xml index ad69440ea..fef79f002 100755 --- a/tosca-controlloop/common/pom.xml +++ b/tosca-controlloop/common/pom.xml @@ -1,8 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- ============LICENSE_START======================================================= - Copyright (C) 2020 AT&T Intellectual Property. All rights reserved. - Modifications Copyright (C) 2020 Nordix Foundation. + Copyright (C) 2021 Nordix Foundation. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -26,7 +25,7 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.policy.clamp</groupId> + <groupId>org.onap.policy.clamp.controlloop</groupId> <artifactId>controlloop</artifactId> <version>6.0.0-SNAPSHOT</version> </parent> diff --git a/tosca-controlloop/design/pom.xml b/tosca-controlloop/design/pom.xml index a3a09626a..d17933fa4 100755 --- a/tosca-controlloop/design/pom.xml +++ b/tosca-controlloop/design/pom.xml @@ -1,8 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- ============LICENSE_START======================================================= - Copyright (C) 2020 AT&T Intellectual Property. All rights reserved. - Modifications Copyright (C) 2020 Nordix Foundation. + Copyright (C) 2021 Nordix Foundation. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -26,7 +25,7 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.policy.clamp</groupId> + <groupId>org.onap.policy.clamp.controlloop</groupId> <artifactId>controlloop</artifactId> <version>6.0.0-SNAPSHOT</version> </parent> diff --git a/tosca-controlloop/models/pom.xml b/tosca-controlloop/models/pom.xml index 45e479849..2c5dd7d61 100755 --- a/tosca-controlloop/models/pom.xml +++ b/tosca-controlloop/models/pom.xml @@ -1,8 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- ============LICENSE_START======================================================= - Copyright (C) 2020 AT&T Intellectual Property. All rights reserved. - Modifications Copyright (C) 2020 Nordix Foundation. + Copyright (C) 2021 Nordix Foundation. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -26,7 +25,7 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.policy.clamp</groupId> + <groupId>org.onap.policy.clamp.controlloop</groupId> <artifactId>controlloop</artifactId> <version>6.0.0-SNAPSHOT</version> </parent> diff --git a/tosca-controlloop/participants/pom.xml b/tosca-controlloop/participants/pom.xml index b84aa1599..4707a5c2b 100644 --- a/tosca-controlloop/participants/pom.xml +++ b/tosca-controlloop/participants/pom.xml @@ -1,7 +1,6 @@ <!-- ============LICENSE_START======================================================= - Copyright (C) 2020 AT&T Intellectual Property. All rights reserved. - Modifications Copyright (C) 2020 Nordix Foundation. + Copyright (C) 2021 Nordix Foundation. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -24,7 +23,7 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.policy.clamp</groupId> + <groupId>org.onap.policy.clamp.controlloop</groupId> <artifactId>controlloop</artifactId> <version>6.0.0-SNAPSHOT</version> </parent> @@ -104,22 +103,5 @@ </exclusion> </exclusions> </dependency> - - <!--test dependencies --> - <dependency> - <groupId>org.assertj</groupId> - <artifactId>assertj-core</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.powermock</groupId> - <artifactId>powermock-api-mockito2</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> </dependencies> </project> diff --git a/tosca-controlloop/pom.xml b/tosca-controlloop/pom.xml index a328c03ee..008f45e36 100755 --- a/tosca-controlloop/pom.xml +++ b/tosca-controlloop/pom.xml @@ -1,8 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- ============LICENSE_START======================================================= - Copyright (C) 2020 AT&T Intellectual Property. All rights reserved. - Modifications Copyright (C) 2020 Nordix Foundation. + Copyright (C) 2021 Nordix Foundation. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -25,15 +24,23 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.policy.clamp</groupId> - <artifactId>clamp</artifactId> - <version>6.0.0-SNAPSHOT</version> + <groupId>org.onap.policy.parent</groupId> + <artifactId>integration</artifactId> + <version>3.3.0-SNAPSHOT</version> + <relativePath/> </parent> + <groupId>org.onap.policy.clamp.controlloop</groupId> <artifactId>controlloop</artifactId> + <version>6.0.0-SNAPSHOT</version> <name>${project.artifactId}</name> <packaging>pom</packaging> + <properties> + <policy.common.version>1.8.0-SNAPSHOT</policy.common.version> + <policy.models.version>2.4.0-SNAPSHOT</policy.models.version> + </properties> + <modules> <module>common</module> <module>models</module> @@ -59,12 +66,6 @@ </dependency> <dependency> <groupId>org.onap.policy.common</groupId> - <artifactId>utils-test</artifactId> - <version>${policy.common.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.onap.policy.common</groupId> <artifactId>policy-endpoints</artifactId> <version>${policy.common.version}</version> </dependency> @@ -78,9 +79,53 @@ <artifactId>policy-models-provider</artifactId> <version>${policy.models.version}</version> </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + </dependency> + <dependency> + <groupId>org.onap.policy.common</groupId> + <artifactId>utils-test</artifactId> + <version>${policy.common.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.assertj</groupId> + <artifactId>assertj-core</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</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-api-mockito2</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.powermock</groupId> + <artifactId>powermock-module-junit4</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.awaitility</groupId> + <artifactId>awaitility</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>com.h2database</groupId> + <artifactId>h2</artifactId> + <scope>test</scope> + </dependency> </dependencies> - <build> <resources> <!-- Output the version of the control loop system --> diff --git a/tosca-controlloop/runtime/pom.xml b/tosca-controlloop/runtime/pom.xml index d3bfd3925..93498f5e1 100644 --- a/tosca-controlloop/runtime/pom.xml +++ b/tosca-controlloop/runtime/pom.xml @@ -1,8 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- ============LICENSE_START======================================================= - Copyright (C) 2020 AT&T Intellectual Property. All rights reserved. - Modifications Copyright (C) 2020 Nordix Foundation. + Copyright (C) 2021 Nordix Foundation. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -26,24 +25,19 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.policy.clamp</groupId> + <groupId>org.onap.policy.clamp.controlloop</groupId> <artifactId>controlloop</artifactId> <version>6.0.0-SNAPSHOT</version> </parent> <artifactId>controlloop-runtime</artifactId> <name>${project.artifactId}</name> - + <dependencies> - <dependency> - <groupId>org.onap.policy.clamp</groupId> - <artifactId>controlloop-common</artifactId> - <version>${project.version}</version> - </dependency> <dependency> - <groupId>org.onap.policy.clamp</groupId> - <artifactId>controlloop-models</artifactId> - <version>${project.version}</version> + <groupId>com.h2database</groupId> + <artifactId>h2</artifactId> + <scope>test</scope> </dependency> </dependencies> </project> |