Merge "Spring Boot Actuator enabled on /manage" into cps_poc
authorToine Siebelink <toine.siebelink@est.tech>
Fri, 6 Nov 2020 16:45:55 +0000 (16:45 +0000)
committerNordix Gerrit <gerrit@nordix.org>
Fri, 6 Nov 2020 16:45:55 +0000 (16:45 +0000)
1  2 
cps/cps-parent/pom.xml
cps/cps-rest/pom.xml
cps/cps-rest/src/main/resources/application.yml

diff --combined cps/cps-parent/pom.xml
  
      <properties>
          <java.version>11</java.version>
 -        <maven-resources-plugin.version>3.2.0</maven-resources-plugin.version>
 -        <maven-dependency-plugin.version>3.1.2</maven-dependency-plugin.version>
 -        <maven-replacer-plugin.version>1.5.3</maven-replacer-plugin.version>
          <oparent.version>3.1.0</oparent.version>
          <spring-boot-maven-plugin.version>2.3.3.RELEASE</spring-boot-maven-plugin.version>
 -        <swagger-ui.version>3.35.0</swagger-ui.version>
 +        <swagger-codegen-maven-plugin.version>3.0.18</swagger-codegen-maven-plugin.version>
      </properties>
  
      <dependencyManagement>
                      <executions>
                          <execution>
                              <goals>
+                                 <goal>build-info</goal>
                                  <goal>repackage</goal>
                              </goals>
                          </execution>
                      </executions>
                  </plugin>
 +                <!-- Swagger code generation. -->
                  <plugin>
 -                    <!-- Download Swagger UI webjar. -->
 -                    <groupId>org.apache.maven.plugins</groupId>
 -                    <artifactId>maven-dependency-plugin</artifactId>
 -                    <version>${maven-dependency-plugin.version}</version>
 +                    <groupId>io.swagger.codegen.v3</groupId>
 +                    <artifactId>swagger-codegen-maven-plugin</artifactId>
 +                    <version>${swagger-codegen-maven-plugin.version}</version>
                      <executions>
                          <execution>
 -                            <phase>prepare-package</phase>
                              <goals>
 -                                <goal>unpack</goal>
 +                                <goal>generate</goal>
                              </goals>
                              <configuration>
 -                                <artifactItems>
 -                                    <artifactItem>
 -                                        <groupId>org.webjars</groupId>
 -                                        <artifactId>swagger-ui</artifactId>
 -                                        <version>${swagger-ui.version}</version>
 -                                    </artifactItem>
 -                                </artifactItems>
 -                                <outputDirectory>
 -                                    ${project.build.directory}/swagger-ui-${swagger-ui.version}
 -                                </outputDirectory>
 +                                <inputSpec>${project.basedir}/docs/api/swagger/openapi.yml</inputSpec>
 +                                <invokerPackage>org.onap.cps.rest.controller</invokerPackage>
 +                                <modelPackage>org.onap.cps.rest.model</modelPackage>
 +                                <apiPackage>org.onap.cps.rest.api</apiPackage>
 +                                <language>spring</language>
 +                                <generateSupportingFiles>false</generateSupportingFiles>
 +                                <configOptions>
 +                                    <sourceFolder>src/gen/java</sourceFolder>
 +                                    <dateLibrary>java11</dateLibrary>
 +                                    <interfaceOnly>true</interfaceOnly>
 +                                    <useTags>true</useTags>
 +                                </configOptions>
                              </configuration>
                          </execution>
                      </executions>
                  </plugin>
 -                <plugin>
 -                    <!-- Copy Swagger UI resources to static resources directory. -->
 -                    <groupId>org.apache.maven.plugins</groupId>
 -                    <artifactId>maven-resources-plugin</artifactId>
 -                    <version>${maven-resources-plugin.version}</version>
 -                    <executions>
 -                        <execution>
 -                            <id>copy-resources</id>
 -                            <phase>prepare-package</phase>
 -                            <goals>
 -                                <goal>copy-resources</goal>
 -                            </goals>
 -                            <configuration>
 -                                <outputDirectory>${project.build.outputDirectory}/static/swagger-ui
 -                                </outputDirectory>
 -                                <resources>
 -                                    <resource>
 -                                        <directory>
 -                                            ${project.build.directory}/swagger-ui-${swagger-ui.version}/META-INF/resources/webjars/swagger-ui/${swagger-ui.version}/
 -                                        </directory>
 -                                        <excludes>
 -                                            <exclude>**/*.gz</exclude>
 -                                        </excludes>
 -                                    </resource>
 -                                </resources>
 -                            </configuration>
 -                        </execution>
 -                    </executions>
 -                </plugin>
 -                <plugin>
 -                    <!-- Replace the OpenAPI specification example URL with the local one. -->
 -                    <groupId>com.google.code.maven-replacer-plugin</groupId>
 -                    <artifactId>replacer</artifactId>
 -                    <version>${maven-replacer-plugin.version}</version>
 -                    <executions>
 -                        <execution>
 -                            <phase>prepare-package</phase>
 -                            <goals>
 -                                <goal>replace</goal>
 -                            </goals>
 -                        </execution>
 -                    </executions>
 -                    <configuration>
 -                        <file>${project.build.outputDirectory}/static/swagger-ui/index.html</file>
 -                        <replacements>
 -                            <replacement>
 -                                <token>https://petstore.swagger.io/v2/swagger.json</token>
 -                                <value>/api/cps/openapi.json</value>
 -                            </replacement>
 -                        </replacements>
 -                    </configuration>
 -                </plugin>
              </plugins>
          </pluginManagement>
          <plugins>
diff --combined cps/cps-rest/pom.xml
              <groupId>org.springframework.boot</groupId>\r
              <artifactId>spring-boot-starter-jetty</artifactId>\r
          </dependency>\r
+         <dependency>\r
+             <groupId>org.springframework.boot</groupId>\r
+             <artifactId>spring-boot-starter-actuator</artifactId>\r
+         </dependency>\r
          <dependency>\r
              <groupId>io.swagger.core.v3</groupId>\r
              <artifactId>swagger-annotations</artifactId>\r
          </dependency>\r
          <dependency>\r
 -            <groupId>io.swagger.core.v3</groupId>\r
 -            <artifactId>swagger-jaxrs2</artifactId>\r
 +            <groupId>io.springfox</groupId>\r
 +            <artifactId>springfox-boot-starter</artifactId>\r
          </dependency>\r
 +\r
          <dependency>\r
              <groupId>org.springframework.boot</groupId>\r
              <artifactId>spring-boot-starter-test</artifactId>\r
                  </exclusion>\r
              </exclusions>\r
          </dependency>\r
 +        <!-- T E S T   D E P E N D E N C I E S -->\r
 +        <dependency>\r
 +            <groupId>org.codehaus.groovy</groupId>\r
 +            <artifactId>groovy</artifactId>\r
 +            <scope>test</scope>\r
 +        </dependency>\r
 +        <dependency>\r
 +            <groupId>org.spockframework</groupId>\r
 +            <artifactId>spock-core</artifactId>\r
 +            <scope>test</scope>\r
 +        </dependency>\r
 +        <dependency>\r
 +            <groupId>cglib</groupId>\r
 +            <artifactId>cglib-nodep</artifactId>\r
 +            <scope>test</scope>\r
 +        </dependency>\r
      </dependencies>\r
  \r
      <build>\r
                  <groupId>org.springframework.boot</groupId>\r
                  <artifactId>spring-boot-maven-plugin</artifactId>\r
              </plugin>\r
 +            <!-- Swagger code generation. -->\r
              <plugin>\r
 -                <!-- Download Swagger UI webjar. -->\r
 -                <groupId>org.apache.maven.plugins</groupId>\r
 -                <artifactId>maven-dependency-plugin</artifactId>\r
 -            </plugin>\r
 -            <plugin>\r
 -                <!-- Copy Swagger UI resources to static resources directory. -->\r
 -                <groupId>org.apache.maven.plugins</groupId>\r
 -                <artifactId>maven-resources-plugin</artifactId>\r
 -            </plugin>\r
 -            <plugin>\r
 -                <!-- Replace the OpenAPI specification example URL with the local one. -->\r
 -                <groupId>com.google.code.maven-replacer-plugin</groupId>\r
 -                <artifactId>replacer</artifactId>\r
 +                <groupId>io.swagger.codegen.v3</groupId>\r
 +                <artifactId>swagger-codegen-maven-plugin</artifactId>\r
              </plugin>\r
          </plugins>\r
      </build>\r
@@@ -1,7 -1,7 +1,7 @@@
  server:\r
 -  port: 8080\r
 -  servlet:\r
 -     context-path: /api/cps\r
 +    port: 8080\r
 +    servlet:\r
 +        context-path: /api/cps\r
  \r
  spring:\r
      main:\r
          password: ${DB_PASSWORD}\r
          driverClassName: org.postgresql.Driver\r
          initialization-mode: always\r
 -    jersey:\r
 -        type: filter\r
  \r
+ # Actuator\r
+ management:\r
+     endpoints:\r
+         web:\r
+             base-path: /manage\r
+     endpoint:\r
+         health:\r
+             show-details: always\r
+             # kubernetes probes: liveness and readiness\r
+             probes:\r
+                 enabled: true\r
\r
  logging:\r
      level:\r
          org:\r