From b30b002d2f68c83d7d04dc8d15199a93b6126ed2 Mon Sep 17 00:00:00 2001 From: "Determe, Sebastien (sd378r)" Date: Fri, 22 Sep 2017 17:28:44 +0200 Subject: Rework the indentation Remove the tabs and replace by Spaces Change-Id: Id9e1e5e434789ec7ebf5ba0d3e25a8ccf9765852 Issue-ID: CLAMP-54 Signed-off-by: Determe, Sebastien (sd378r) --- pom.xml | 1672 +++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 836 insertions(+), 836 deletions(-) diff --git a/pom.xml b/pom.xml index d1b17b758..8e9ed9d13 100644 --- a/pom.xml +++ b/pom.xml @@ -23,20 +23,20 @@ --> - 4.0.0 - org.onap.clamp - clds - 1.1.0 - clamp - - - org.onap.oparent - oparent - 1.0.0-SNAPSHOT - - - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + org.onap.clamp + clds + 1.1.0 + clamp + + + org.onap.oparent + oparent + 1.0.0-SNAPSHOT + + + This project build the ONAP CLAMP JAR that contains AJSC + CLAMP code. By Default "mvn clean install" command will execute also the unit tests @@ -49,348 +49,348 @@ "mvn clean install -Dspring.config.location=classpath:application-test.properties" The application.properties contains the location of the CLAMP parameters files: - - org.onap.clamp.config.files.cldsReference=classpath:/clds/clds-reference.properties - - org.onap.clamp.config.files.cldsPolicyConfig=classpath:/clds/clds-policy-config.properties - - org.onap.clamp.config.files.cldsUsers=classpath:/clds/clds-users.json - - org.onap.clamp.config.files.globalClds=classpath:/clds/globalClds.properties + - org.onap.clamp.config.files.cldsReference=classpath:/clds/clds-reference.properties + - org.onap.clamp.config.files.cldsPolicyConfig=classpath:/clds/clds-policy-config.properties + - org.onap.clamp.config.files.cldsUsers=classpath:/clds/clds-users.json + - org.onap.clamp.config.files.globalClds=classpath:/clds/globalClds.properties - - yyyy.MM.dd'T'hh.mm.ss'Z' - ${project.version} - ${maven.build.timestamp} - 1.8 - 1.8 - UTF-8 - UTF-8 - - 3306 - 0.0.3-oss - git-server - 1.8 - 6.1.0.6-oss - 6.2.0.6-oss - 6.1.0.3-oss - - java - jacoco - ${project.build.directory}/surefire-reports - ${project.build.directory}/coverage-reports/jacoco.exec - ${project.build.directory}/coverage-reports/jacoco-it.exec - true - ${project.version} - - localhost:5000 - true - true - false - - - - - ecomp-releases - Clamp Release Repository - https://nexus.onap.org/content/repositories/releases/ - - - ecomp-snapshots - Clamp Snapshot Repository - https://nexus.onap.org/content/repositories/snapshots/ - - - ecomp-site - dav:https://nexus.onap.org/content/sites/site/org/onap/clamp/${project.version} - - - - - - central - Maven 2 repository 2 - http://repo2.maven.org/maven2/ - - - ecomp-releases - ONAP Release Repository - https://nexus.onap.org/content/repositories/releases/ - - - ecomp-staging - ONAP Staging Repository - https://nexus.onap.org/content/repositories/staging/ - - - ecomp-snapshots - ONAP Snapshot Repository - https://nexus.onap.org/content/repositories/snapshots/ - - true - - - false - - - - spring-repo - Spring repo - https://artifacts.alfresco.com/nexus/content/repositories/public/ - - - repository.jboss.org-public - JBoss.org Maven repository - https://repository.jboss.org/nexus/content/groups/public - - - - - - - - org.springframework.boot - spring-boot-dependencies - 1.4.1.RELEASE - pom - import - - - - - - - - com.googlecode.json-simple - json-simple - 1.1 - - - org.apache.commons - commons-vfs2 - 2.0 - - - - org.springframework.security - spring-security-test - - test - - - - - - com.att.ajsc - sdk-java-common-logging - ${sdk.java.common.logging} - - - org.springframework.boot - spring-boot-starter-tomcat - compile - - - org.springframework.boot - spring-boot-starter-actuator - - - org.springframework.boot - spring-boot-starter-security - - - org.springframework.boot - spring-boot-starter-test - test - - - joda-time - joda-time - - - org.springframework - spring-context - - - org.slf4j - slf4j-api - - - javax.ws.rs - javax.ws.rs-api - 2.0 - - - org.springframework - spring-test - - - junit - junit - - - org.mockito - mockito-all - 1.9.5 - - - commons-logging - commons-logging - 1.1.1 - - - org.springframework - spring-aspects - - - com.fasterxml.jackson.core - jackson-core - - - com.fasterxml.jackson.core - jackson-databind - - - org.springframework - spring-webmvc - - - org.springframework.boot - spring-boot-starter-web - - - log4j - log4j - 1.2.17 - - - org.springframework.boot - spring-boot - - - org.springframework.boot - spring-boot-autoconfigure - - - javax.transaction - jta - 1.1 - - - javax.persistence - persistence-api - 1.0.2 - - - org.hibernate - hibernate-annotations - 3.5.6-Final - - - org.apache.geronimo.specs - geronimo-jpa_2.0_spec - 1.1 - - - dom4j - dom4j - 1.6.1 - - - - com.att.ajsc - sdk-java-camel-rest - ${sdk.camel.rest} - - - io.swagger - swagger-core - 1.5.8 - - - io.swagger - swagger-annotations - 1.5.8 - - - - - com.att.ajsc - sdk-java-camunda-core - ${sdk.camunda.core} - - - mysql - mysql-connector-java - - - - - - org.springframework - spring-context-support - - - - com.att.ajsc - sdk-java-common-interceptors - ${csi.logging} - - - org.eclipse.jetty.orbit - javax.servlet - - - com.att.ajsc - ajsc-core - - - - - - org.onap.policy.engine - PolicyEngineAPI - 1.1.0 - - - log4j - log4j - - - org.slf4j - slf4j-log4j12 - - - apache-log4j-extras - log4j - - - jackson-databind - com.fasterxml.jackson.core - - - mysql - mysql-connector-java - - - - - org.onap.policy.common - ONAP-Logging - 1.1.0 - - - log4j - log4j - - - org.slf4j - slf4j-log4j12 - - - apache-log4j-extras - log4j - - - + + yyyy.MM.dd'T'hh.mm.ss'Z' + ${project.version} + ${maven.build.timestamp} + 1.8 + 1.8 + UTF-8 + UTF-8 + + 3306 + 0.0.3-oss + git-server + 1.8 + 6.1.0.6-oss + 6.2.0.6-oss + 6.1.0.3-oss + + java + jacoco + ${project.build.directory}/surefire-reports + ${project.build.directory}/coverage-reports/jacoco.exec + ${project.build.directory}/coverage-reports/jacoco-it.exec + true + ${project.version} + + localhost:5000 + true + true + false + + + + + ecomp-releases + Clamp Release Repository + https://nexus.onap.org/content/repositories/releases/ + + + ecomp-snapshots + Clamp Snapshot Repository + https://nexus.onap.org/content/repositories/snapshots/ + + + ecomp-site + dav:https://nexus.onap.org/content/sites/site/org/onap/clamp/${project.version} + + + + + + central + Maven 2 repository 2 + http://repo2.maven.org/maven2/ + + + ecomp-releases + ONAP Release Repository + https://nexus.onap.org/content/repositories/releases/ + + + ecomp-staging + ONAP Staging Repository + https://nexus.onap.org/content/repositories/staging/ + + + ecomp-snapshots + ONAP Snapshot Repository + https://nexus.onap.org/content/repositories/snapshots/ + + true + + + false + + + + spring-repo + Spring repo + https://artifacts.alfresco.com/nexus/content/repositories/public/ + + + repository.jboss.org-public + JBoss.org Maven repository + https://repository.jboss.org/nexus/content/groups/public + + + + + + + + org.springframework.boot + spring-boot-dependencies + 1.4.1.RELEASE + pom + import + + + + + + + + com.googlecode.json-simple + json-simple + 1.1 + + + org.apache.commons + commons-vfs2 + 2.0 + + + + org.springframework.security + spring-security-test + + test + + + + + + com.att.ajsc + sdk-java-common-logging + ${sdk.java.common.logging} + + + org.springframework.boot + spring-boot-starter-tomcat + compile + + + org.springframework.boot + spring-boot-starter-actuator + + + org.springframework.boot + spring-boot-starter-security + + + org.springframework.boot + spring-boot-starter-test + test + + + joda-time + joda-time + + + org.springframework + spring-context + + + org.slf4j + slf4j-api + + + javax.ws.rs + javax.ws.rs-api + 2.0 + + + org.springframework + spring-test + + + junit + junit + + + org.mockito + mockito-all + 1.9.5 + + + commons-logging + commons-logging + 1.1.1 + + + org.springframework + spring-aspects + + + com.fasterxml.jackson.core + jackson-core + + + com.fasterxml.jackson.core + jackson-databind + + + org.springframework + spring-webmvc + + + org.springframework.boot + spring-boot-starter-web + + + log4j + log4j + 1.2.17 + + + org.springframework.boot + spring-boot + + + org.springframework.boot + spring-boot-autoconfigure + + + javax.transaction + jta + 1.1 + + + javax.persistence + persistence-api + 1.0.2 + + + org.hibernate + hibernate-annotations + 3.5.6-Final + + + org.apache.geronimo.specs + geronimo-jpa_2.0_spec + 1.1 + + + dom4j + dom4j + 1.6.1 + + + + com.att.ajsc + sdk-java-camel-rest + ${sdk.camel.rest} + + + io.swagger + swagger-core + 1.5.8 + + + io.swagger + swagger-annotations + 1.5.8 + + + + + com.att.ajsc + sdk-java-camunda-core + ${sdk.camunda.core} + + + mysql + mysql-connector-java + + + + + + org.springframework + spring-context-support + + + + com.att.ajsc + sdk-java-common-interceptors + ${csi.logging} + + + org.eclipse.jetty.orbit + javax.servlet + + + com.att.ajsc + ajsc-core + + + + + + org.onap.policy.engine + PolicyEngineAPI + 1.1.0 + + + log4j + log4j + + + org.slf4j + slf4j-log4j12 + + + apache-log4j-extras + log4j + + + jackson-databind + com.fasterxml.jackson.core + + + mysql + mysql-connector-java + + + + + org.onap.policy.common + ONAP-Logging + 1.1.0 + + + log4j + log4j + + + org.slf4j + slf4j-log4j12 + + + apache-log4j-extras + log4j + + + org.onap.policy.drools-applications @@ -411,7 +411,7 @@ - + org.onap.policy.drools-applications sdc 1.1.0 @@ -430,486 +430,486 @@ - - com.fasterxml.jackson.core - jackson-databind - 2.6.3 - - - com.fasterxml.jackson.dataformat - jackson-dataformat-yaml - 2.6.3 - - - org.apache.commons - commons-csv - 1.3 - - - org.jboss.resteasy - resteasy-client - 3.0.8.Final - - - com.sun.faces - jsf-api - 2.1.7 - - - com.sun.faces - jsf-impl - 2.1.7 - - - - - org.mariadb.jdbc - mariadb-java-client - 2.1.1 - - - - - clamp - - - - src/test/resources - - **/*.jks - - true - - - src/test/resources/https - - **.jks - - false - https - - - - - src/main/resources - true - - - src/main/docker - - **/* - - true - - - - - - org.codehaus.groovy.maven - gmaven-plugin - 1.0 - - - validate - - execute - - - ${project.basedir}/src/main/script/TagVersion.groovy - - - - - - org.apache.maven.plugins - maven-jar-plugin - 3.0.2 - - - jar-with-only-classes - package - - jar - - - classes - - org/** - - - - - - - com.github.kongchen - swagger-maven-plugin - 3.1.5 - - - compile - - generate - - - - - - org.onap.clamp.clds.service - - / - - ${project.artifactId} Service - ${project.version} - - ${project.build.directory}/classes/META-INF/resources/icd - - - - - - - - org.codehaus.mojo - build-helper-maven-plugin - 3.0.0 - - - - attach-artifact - - package - - - - ${project.build.directory}/clamp-classes.jar - jar - classes - - - - - - - - - org.springframework.boot - spring-boot-maven-plugin - 1.5.3.RELEASE - - - - repackage - - package - - - - - org.apache.maven.plugins - maven-gpg-plugin - 1.5 - - true - - - - sign-artifacts - verify - - sign - - - - - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.7 - true - - https://nexus.onap.org - 176c31dfe190a - ecomp-staging - ${skip.staging.artifacts} - - - - com.spotify - docker-maven-plugin - 1.0.0 - - onap/clamp - src/main/docker - docker-hub - - latest - ${project.docker.latesttagtimestamp.version} - ${project.docker.latesttag.version} - - true - - - / - ${project.build.directory} - ${project.build.finalName}.jar - - - / - ${project.build.directory} - etc/config/** - - - / - ${project.build.directory} - etc/keystore/** - - - - - - build-image - package - - build - - - ${skip.docker.build} - - ${env.HTTP_PROXY} - ${env.HTTPS_PROXY} - - - - - - tag-image-latest-timestamp - package - - tag - - - onap/clamp - ${docker.push.registry}/onap/clamp:${project.docker.latesttagtimestamp.version} - ${skip.docker.push} - - - - push-image-latest-timestamp - deploy - - push - - - ${docker.push.registry}/onap/clamp:${project.docker.latesttagtimestamp.version} - ${skip.docker.push} - - - - tag-image-latest - package - - tag - - - onap/clamp - ${docker.push.registry}/onap/clamp:${project.docker.latesttag.version} - ${skip.docker.push} - - - - push-image-latest - deploy - - push - - - ${docker.push.registry}/onap/clamp:${project.docker.latesttag.version} - ${skip.docker.push} - - - - tag-image - package - - tag - - - onap/clamp - ${docker.push.registry}/onap/clamp:latest - ${skip.docker.push} - - - - push-image - deploy - - push - - - ${docker.push.registry}/onap/clamp:latest - ${skip.docker.push} - - - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.19.1 - - 1 - false - - - - - org.apache.maven.plugins - maven-failsafe-plugin - 2.16 - - - - integration-tests - - integration-test - verify - - - 1 - false - - - - - - - io.fabric8 - docker-maven-plugin - 0.16.5 - - true - 1.23 - - - mariadb:10.1.11 - mariadb - - - strong_pitchou - - mariadb - - - ${project.basedir}/extra/sql/:/docker-entrypoint-initdb.d - ${project.basedir}/extra/docker/mariadb/conf1:/etc/mysql/conf.d - - - - socket: '/var/run/mysqld/mysqld.sock' port: 3306 mariadb.org binary distribution - - - - ${docker.mariadb.port.host}:3306 - - - - - ${skipITs} - - - - - mariadb-start-for-it - pre-integration-test - - start - - - ${skipITs} - - - - mariadb-stop-for-it - post-integration-test - - stop - - - ${skipITs} - - - - - - - org.jacoco - jacoco-maven-plugin - 0.7.7.201606060606 - - true - - org.onap.clamp.* - - - - - pre-unit-test - - prepare-agent - - - ${project.build.directory}/coverage-reports/jacoco.exec - - - - - pre-integration-test - pre-integration-test - - prepare-agent - - - ${project.build.directory}/coverage-reports/jacoco-it.exec - - - - - - merge - - post-integration-test - - - - ${project.build.directory}/coverage-reports - - *.exec - - - - ${project.build.directory}/jacoco-dev.exec - - - - - - - - org.codehaus.mojo - versions-maven-plugin - 1.3.1 - - - - - - docker - - true - false - false - false - - - + + com.fasterxml.jackson.core + jackson-databind + 2.6.3 + + + com.fasterxml.jackson.dataformat + jackson-dataformat-yaml + 2.6.3 + + + org.apache.commons + commons-csv + 1.3 + + + org.jboss.resteasy + resteasy-client + 3.0.8.Final + + + com.sun.faces + jsf-api + 2.1.7 + + + com.sun.faces + jsf-impl + 2.1.7 + + + + + org.mariadb.jdbc + mariadb-java-client + 2.1.1 + + + + + clamp + + + + src/test/resources + + **/*.jks + + true + + + src/test/resources/https + + **.jks + + false + https + + + + + src/main/resources + true + + + src/main/docker + + **/* + + true + + + + + + org.codehaus.groovy.maven + gmaven-plugin + 1.0 + + + validate + + execute + + + ${project.basedir}/src/main/script/TagVersion.groovy + + + + + + org.apache.maven.plugins + maven-jar-plugin + 3.0.2 + + + jar-with-only-classes + package + + jar + + + classes + + org/** + + + + + + + com.github.kongchen + swagger-maven-plugin + 3.1.5 + + + compile + + generate + + + + + + org.onap.clamp.clds.service + + / + + ${project.artifactId} Service + ${project.version} + + ${project.build.directory}/classes/META-INF/resources/icd + + + + + + + + org.codehaus.mojo + build-helper-maven-plugin + 3.0.0 + + + + attach-artifact + + package + + + + ${project.build.directory}/clamp-classes.jar + jar + classes + + + + + + + + + org.springframework.boot + spring-boot-maven-plugin + 1.5.3.RELEASE + + + + repackage + + package + + + + + org.apache.maven.plugins + maven-gpg-plugin + 1.5 + + true + + + + sign-artifacts + verify + + sign + + + + + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.6.7 + true + + https://nexus.onap.org + 176c31dfe190a + ecomp-staging + ${skip.staging.artifacts} + + + + com.spotify + docker-maven-plugin + 1.0.0 + + onap/clamp + src/main/docker + docker-hub + + latest + ${project.docker.latesttagtimestamp.version} + ${project.docker.latesttag.version} + + true + + + / + ${project.build.directory} + ${project.build.finalName}.jar + + + / + ${project.build.directory} + etc/config/** + + + / + ${project.build.directory} + etc/keystore/** + + + + + + build-image + package + + build + + + ${skip.docker.build} + + ${env.HTTP_PROXY} + ${env.HTTPS_PROXY} + + + + + + tag-image-latest-timestamp + package + + tag + + + onap/clamp + ${docker.push.registry}/onap/clamp:${project.docker.latesttagtimestamp.version} + ${skip.docker.push} + + + + push-image-latest-timestamp + deploy + + push + + + ${docker.push.registry}/onap/clamp:${project.docker.latesttagtimestamp.version} + ${skip.docker.push} + + + + tag-image-latest + package + + tag + + + onap/clamp + ${docker.push.registry}/onap/clamp:${project.docker.latesttag.version} + ${skip.docker.push} + + + + push-image-latest + deploy + + push + + + ${docker.push.registry}/onap/clamp:${project.docker.latesttag.version} + ${skip.docker.push} + + + + tag-image + package + + tag + + + onap/clamp + ${docker.push.registry}/onap/clamp:latest + ${skip.docker.push} + + + + push-image + deploy + + push + + + ${docker.push.registry}/onap/clamp:latest + ${skip.docker.push} + + + + + + org.apache.maven.plugins + maven-surefire-plugin + 2.19.1 + + 1 + false + + + + + org.apache.maven.plugins + maven-failsafe-plugin + 2.16 + + + + integration-tests + + integration-test + verify + + + 1 + false + + + + + + + io.fabric8 + docker-maven-plugin + 0.16.5 + + true + 1.23 + + + mariadb:10.1.11 + mariadb + + + strong_pitchou + + mariadb + + + ${project.basedir}/extra/sql/:/docker-entrypoint-initdb.d + ${project.basedir}/extra/docker/mariadb/conf1:/etc/mysql/conf.d + + + + socket: '/var/run/mysqld/mysqld.sock' port: 3306 mariadb.org binary distribution + + + + ${docker.mariadb.port.host}:3306 + + + + + ${skipITs} + + + + + mariadb-start-for-it + pre-integration-test + + start + + + ${skipITs} + + + + mariadb-stop-for-it + post-integration-test + + stop + + + ${skipITs} + + + + + + + org.jacoco + jacoco-maven-plugin + 0.7.7.201606060606 + + true + + org.onap.clamp.* + + + + + pre-unit-test + + prepare-agent + + + ${project.build.directory}/coverage-reports/jacoco.exec + + + + + pre-integration-test + pre-integration-test + + prepare-agent + + + ${project.build.directory}/coverage-reports/jacoco-it.exec + + + + + + merge + + post-integration-test + + + + ${project.build.directory}/coverage-reports + + *.exec + + + + ${project.build.directory}/jacoco-dev.exec + + + + + + + + org.codehaus.mojo + versions-maven-plugin + 1.3.1 + + + + + + docker + + true + false + false + false + + + -- cgit 1.2.3-korg