diff options
| -rw-r--r-- | docs/clamp/acm/clamp-gui/policy-gui.rst | 27 | ||||
| -rw-r--r-- | integration/pom.xml | 66 | ||||
| -rw-r--r-- | pom.xml | 4 |
3 files changed, 62 insertions, 35 deletions
diff --git a/docs/clamp/acm/clamp-gui/policy-gui.rst b/docs/clamp/acm/clamp-gui/policy-gui.rst index bba52784..63d603b9 100644 --- a/docs/clamp/acm/clamp-gui/policy-gui.rst +++ b/docs/clamp/acm/clamp-gui/policy-gui.rst @@ -98,8 +98,6 @@ see `Clamp ACM Smoke Tests <https://docs.onap.org/projects/onap-policy-parent/en 2 - Checking out and building the UI ==================================== -.. _Building UI - **Step 1:** Checkout the UI from the repo .. code-block:: bash @@ -124,28 +122,25 @@ see `Clamp ACM Smoke Tests <https://docs.onap.org/projects/onap-policy-parent/en npm start --scripts-prepend-node-path -** If you get the following error +*If you get the following error* .. image:: images/03-gui.png - gedit package.json - .. code-block:: bash - change the following - "version": "${project.version}", + gedit package.json - to +Then change ``"version": "${project.version}",`` to ``"version": "2.1.1",`` - "version": "2.1.1", +Save and close, then delete the node_modules directory - save and close - - then delete the node_modules directory +.. code-block:: bash rm -rf node_modules/ - then run again +Then run again + +.. code-block:: bash npm install @@ -165,7 +160,7 @@ This section describes how to commission and decommission the Tosca Service Temp ** Prerequisite: -see clamp-policy-gui-label_ +See :ref:`Policy GUI Prerequisites<clamp-policy-gui-label>` **Step 1:** From the Main Menu Click on TOSCA Automation Composition Dropdown @@ -314,4 +309,6 @@ see building-ui-label_ .. image:: images/23-gui.png -* NOTE: Can't change from Passive to Running in a local developer machine, can only change in the production environment
\ No newline at end of file +* NOTE: Can't change from Passive to Running in a local developer machine, can only change in the production environment + +End of document diff --git a/integration/pom.xml b/integration/pom.xml index c9a5cdf5..cd3df998 100644 --- a/integration/pom.xml +++ b/integration/pom.xml @@ -43,7 +43,7 @@ <version.powermock>2.0.9</version.powermock> <version.eclipselink>2.7.8</version.eclipselink> <version.drools>7.68.0.Final</version.drools> - <version.jersey>2.34</version.jersey> + <version.jersey>2.33</version.jersey> <version.jackson>2.12.6</version.jackson> <version.jackson.databind>2.12.6.1</version.jackson.databind> <version.ccsdk>1.1.5</version.ccsdk> @@ -56,7 +56,7 @@ <version.hibernate.core>5.4.31.Final</version.hibernate.core> <version.eelf.core>1.0.0</version.eelf.core> <version.camel>3.7.3</version.camel> - <version.tomcat>9.0.45</version.tomcat> + <version.tomcat>9.0.62</version.tomcat> <version.mockserver>5.11.2</version.mockserver> <version.immutable>2.8.8</version.immutable> <version.springfox>3.0.0</version.springfox> @@ -371,13 +371,6 @@ <version>4.0.1</version> </dependency> - <!-- HttpComponents Client --> - <dependency> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpclient</artifactId> - <version>4.5.13</version> - </dependency> - <!-- HttpComponents Core (blocking I/O) --> <dependency> <groupId>org.apache.httpcomponents</groupId> @@ -389,7 +382,7 @@ <dependency> <groupId>com.google.code.gson</groupId> <artifactId>gson</artifactId> - <version>2.8.9</version> + <version>2.9.0</version> </dependency> <dependency> <groupId>org.json</groupId> @@ -669,13 +662,6 @@ <version>3.0.8</version> </dependency> - <!-- Tomcat --> - <dependency> - <groupId>org.apache.tomcat.embed</groupId> - <artifactId>tomcat-embed-core</artifactId> - <version>${version.tomcat}</version> - </dependency> - <!-- jaxws --> <dependency> <groupId>javax.xml.ws</groupId> @@ -886,6 +872,21 @@ <artifactId>spring-boot-starter-security</artifactId> <version>${version.springboot}</version> </dependency> + <dependency> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-data-jpa</artifactId> + <version>${version.springboot}</version> + </dependency> + <dependency> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-tomcat</artifactId> + <version>${version.springboot}</version> + </dependency> + <dependency> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-autoconfigure</artifactId> + <version>${version.springboot}</version> + </dependency> <!-- Hibernate --> <dependency> @@ -893,11 +894,40 @@ <artifactId>hibernate-core</artifactId> <version>${version.hibernate.core}</version> </dependency> + + <!-- Github --> + <dependency> + <groupId>io.github.classgraph</groupId> + <artifactId>classgraph</artifactId> + <version>4.8.146</version> + </dependency> + + <!-- Tomcat --> + <dependency> + <groupId>org.apache.tomcat</groupId> + <artifactId>tomcat-annotations-api</artifactId> + <version>${version.tomcat}</version> + </dependency> + <dependency> + <groupId>org.apache.tomcat.embed</groupId> + <artifactId>tomcat-embed-core</artifactId> + <version>${version.tomcat}</version> + </dependency> + <dependency> + <groupId>org.apache.tomcat.embed</groupId> + <artifactId>tomcat-embed-el</artifactId> + <version>${version.tomcat}</version> + </dependency> + <dependency> + <groupId>org.apache.tomcat.embed</groupId> + <artifactId>tomcat-embed-websocket</artifactId> + <version>${version.tomcat}</version> + </dependency> + </dependencies> </dependencyManagement> - <scm> <connection>scm:git:ssh://git.onap.org:29418/${project.groupId}</connection> <developerConnection>scm:git:ssh://git.onap.org:29418/${project.groupId}</developerConnection> @@ -24,7 +24,7 @@ <parent> <groupId>org.onap.oparent</groupId> <artifactId>oparent</artifactId> - <version>3.2.1</version> + <version>3.3.1-SNAPSHOT</version> <relativePath /> </parent> <groupId>org.onap.policy.parent</groupId> @@ -33,7 +33,7 @@ <packaging>pom</packaging> <properties> - <oparent.version>3.2.1</oparent.version> + <oparent.version>3.3.1-SNAPSHOT</oparent.version> </properties> <modules> |