From e9171113772c0c7dc3f7514ffd0660d1e0f8ef02 Mon Sep 17 00:00:00 2001 From: vasraz Date: Fri, 26 Nov 2021 15:57:50 +0000 Subject: Revert accidentally formatted POMs Change-Id: I17ee875dcc2c63d6014c68345113df76cb2aa9b9 Signed-off-by: Vasyl Razinkov Issue-ID: SDC-3757 --- catalog-fe/pom.xml | 618 ++++++++++++++++++++++++++--------------------------- 1 file changed, 305 insertions(+), 313 deletions(-) (limited to 'catalog-fe') diff --git a/catalog-fe/pom.xml b/catalog-fe/pom.xml index 170c39d426..85b93c5228 100644 --- a/catalog-fe/pom.xml +++ b/catalog-fe/pom.xml @@ -2,463 +2,311 @@ xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 catalog-fe - - - ${project.artifactId}-${project.version} - - - - - - lifecycle-mapping - - - - - - - - - - jcabi-maven-plugin - - ajc - - com.jcabi - [0.0,) - - - - - - - org.eclipse.m2e - 1.0.0 - - - - - - - - - - maven-war-plugin - - - - true - - - - - - src/main/resources - - - - org.apache.maven.plugins - - - - jetty-maven-plugin - - ${project.build.directory}/${project.build.finalName}.war - - / - .*/.*jersey-[^/]\.jar$ - - - org.eclipse.jetty - ${jetty.version} - - - - maven-deploy-plugin - - true - - org.apache.maven.plugins - - - - jcabi-maven-plugin - - - aspectjtools - org.aspectj - ${aspectj.version} - - - aspectjweaver - org.aspectj - ${aspectj.version} - - - - - - ajc - - - - com.jcabi - ${jcabi.maven.plugin.version} - - - maven-clean-plugin - - - - - - - ${project.parent.basedir}/catalog-fe/sdc-frontend/ - - false - - *.war - - - - - - clean - - clean.catalog.fe.folder - clean - - - org.apache.maven.plugins - - - yaml-json-validator-maven-plugin - - - - ${skipYamlJsonValidator} - - - - src/main/resources/**/*.y*ml - src/test/resources/**/*.y*ml - - - - - src/main/resources/**/*.json - src/test/resources/**/*.json - - - - - - validate - - validate - validate - - - com.github.sylvainlaurent.maven - + war - + + org.openecomp.sdc + sdc-main + 1.10.0-SNAPSHOT + - - lombok org.projectlombok + lombok ${lombok.version} - functionaljava org.functionaljava - compile + functionaljava ${functionaljava.version} + compile - onap-configuration-management-api org.onap.sdc.common + onap-configuration-management-api ${project.version} - common-app-api org.openecomp.sdc + common-app-api ${project.version} - logback-classic ch.qos.logback - compile + logback-classic ${logback.version} + compile - groovy org.codehaus.groovy + groovy compile - janino org.codehaus.janino - compile + janino ${janino.version} + compile - snakeyaml org.yaml - compile + snakeyaml ${snakeyaml.version} + compile + org.apache.commons commons-jci-core + ${commons-jci-core.version} + compile - commons-io commons-io + commons-io - org.apache.commons - compile - ${commons-jci-core.version} - gson com.google.code.gson - compile + gson ${gson.version} + compile - jersey-container-servlet org.glassfish.jersey.containers - compile + jersey-container-servlet ${jersey-bom.version} + compile - jersey-media-multipart org.glassfish.jersey.media - compile + jersey-media-multipart ${jersey-bom.version} + compile - jersey-media-moxy org.glassfish.jersey.media - compile + jersey-media-moxy ${jersey-bom.version} + compile - jersey-media-json-jackson org.glassfish.jersey.media - compile + jersey-media-json-jackson ${jersey-bom.version} + compile - jersey-hk2 org.glassfish.jersey.inject + jersey-hk2 ${jersey-bom.version} - jackson-core com.fasterxml.jackson.core - compile + jackson-core ${jackson.version} + compile + com.fasterxml.jackson.core jackson-databind + ${jackson.version} - jackson-core com.fasterxml.jackson.core + jackson-core - com.fasterxml.jackson.core - ${jackson.version} - jackson-annotations com.fasterxml.jackson.core - compile + jackson-annotations ${jackson-annotations.version} + compile - httpclient org.apache.httpcomponents - compile + httpclient ${httpclient.version} + compile - httpcore org.apache.httpcomponents - compile + httpcore ${httpcore.version} + compile - httpmime org.apache.httpcomponents - compile + httpmime ${httpclient.version} + compile - commons-logging commons-logging - compile + commons-logging ${commons-logging} + compile - commons-codec commons-codec - compile + commons-codec ${commons-codec} + compile - javax.servlet-api javax.servlet - provided + javax.servlet-api ${servlet-api.version} + provided - jackson-dataformat-yaml com.fasterxml.jackson.dataformat - compile + jackson-dataformat-yaml ${jackson.version} + compile + org.eclipse.jetty jetty-proxy + ${jetty.version} + compile - jetty-http org.eclipse.jetty + jetty-http - org.eclipse.jetty - compile - ${jetty.version} + org.eclipse.jetty jetty-servlets + ${jetty.version} + compile - jetty-http org.eclipse.jetty + jetty-http - org.eclipse.jetty - compile - ${jetty.version} - guava com.google.guava - compile + guava ${guava.version} + compile - jcabi-aspects com.jcabi - compile + jcabi-aspects ${jcabi.version} + compile - aspectjrt org.aspectj - compile + aspectjrt ${aspectjrt.version} + compile - commons-lang3 org.apache.commons - compile + commons-lang3 ${lang3.version} + compile - jaxb-api javax.xml.bind - compile + jaxb-api ${jaxb-api.version} + compile - hibernate-validator org.hibernate.validator + hibernate-validator ${hibernate.validator.version} + org.owasp.esapi esapi + ${org.owasp.esapi.version} - log4j log4j + log4j - commons-io commons-io + commons-io - commons-fileupload commons-fileupload + commons-fileupload - xmlgraphics-commons org.apache.xmlgraphics + xmlgraphics-commons - xml-apis-ext xml-apis + xml-apis-ext - xml-apis xml-apis + xml-apis - org.owasp.esapi - ${org.owasp.esapi.version} + org.onap.portal.sdk epsdk-fw + ${ecomp.version} + compile - cambriaClient com.att.nsa + cambriaClient slf4j-log4j12 @@ -469,178 +317,330 @@ log4j - org.onap.portal.sdk - compile - ${ecomp.version} + org.fusesource sigar + ${sigar.version} + compile - log4j log4j + log4j - org.fusesource - compile - ${sigar.version} + org.glassfish.jersey.test-framework.providers jersey-test-framework-provider-bundle + ${jersey-bom.version} + pom + test - jetty-server org.eclipse.jetty + jetty-server - jetty-continuation org.eclipse.jetty + jetty-continuation - org.glassfish.jersey.test-framework.providers - test - pom - ${jersey-bom.version} - bean-matchers com.google.code.bean-matchers - test + bean-matchers ${bean-matchers.version} + test + org.eclipse.jetty jetty-servlet + ${jetty.version} + test - jetty-server org.eclipse.jetty + jetty-server - jetty-security org.eclipse.jetty + jetty-security - org.eclipse.jetty - test - ${jetty.version} + org.eclipse.jetty jetty-webapp + ${jetty.version} + test - jetty-servlet org.eclipse.jetty + jetty-servlet - org.eclipse.jetty - test - ${jetty.version} - jetty-http org.eclipse.jetty + jetty-http ${jetty.version} - javax.ws.rs-api javax.ws.rs - compile + javax.ws.rs-api ${ws.rs.version} + compile - validation-api javax.validation + validation-api ${javax.validation.version} - 4.0.0 + - war + ${project.artifactId}-${project.version} - - sdc-main - org.openecomp.sdc - 1.10.0-SNAPSHOT - + + + org.apache.maven.plugins + maven-war-plugin + + + + true + + + + + + src/main/resources + + + + + + + org.eclipse.jetty + jetty-maven-plugin + ${jetty.version} + + + / + .*/.*jersey-[^/]\.jar$ + + ${project.build.directory}/${project.build.finalName}.war + + + + + org.apache.maven.plugins + maven-deploy-plugin + + true + + + + + + com.jcabi + jcabi-maven-plugin + ${jcabi.maven.plugin.version} + + + org.aspectj + aspectjtools + ${aspectj.version} + + + org.aspectj + aspectjweaver + ${aspectj.version} + + + + + + ajc + + + + + + org.apache.maven.plugins + maven-clean-plugin + + + clean.catalog.fe.folder + clean + + clean + + + + + + ${project.parent.basedir}/catalog-fe/sdc-frontend/ + false + + *.war + + + + + + + + + com.github.sylvainlaurent.maven + yaml-json-validator-maven-plugin + + + validate + validate + + validate + + + + + + src/main/resources/**/*.y*ml + src/test/resources/**/*.y*ml + + + + + src/main/resources/**/*.json + src/test/resources/**/*.json + + + + ${skipYamlJsonValidator} + + + + + + + + + + + + org.eclipse.m2e + lifecycle-mapping + 1.0.0 + + + + + + + com.jcabi + jcabi-maven-plugin + [0.0,) + + ajc + + + + + + + + + + + + + + + catalog false + ${project.artifactId}-${project.version} - - catalog + docker false + + docker + docker + + org.apache.maven.plugins maven-resources-plugin + copy-resources-fe + verify + + copy-resources + ${basedir}/sdc-frontend - ${project.parent.basedir}/catalog-fe/target - + ${project.parent.basedir}/catalog-fe/target catalog-fe-${project.version}.war - - ${project.parent.basedir}/openecomp-ui/target - + ${project.parent.basedir}/openecomp-ui/target - onboarding-fe-${project.version}.war - + onboarding-fe-${project.version}.war - - copy-resources - - copy-resources-fe - verify - org.apache.maven.plugins + io.fabric8 docker-maven-plugin + ${verbose} ${docker.api.version} + nexus3.onap.org:10001 - ${docker.password} ${docker.username} + ${docker.password} + onap/sdc-frontend sdc-frontend try - ${project.basedir}/sdc-frontend - + ${project.basedir}/sdc-frontend latest @@ -651,53 +651,45 @@ - onap/sdc-frontend - nexus3.onap.org:10001 - ${verbose} - - onap/sdc-frontend - true - + clean-images + pre-clean remove - clean-images - pre-clean + + true + onap/sdc-frontend + + generate-images + install build - generate-images - install - - onap/sdc-frontend - + push-images + deploy push - push-images - deploy + + onap/sdc-frontend + - io.fabric8 - docker - - docker - docker - + -- cgit 1.2.3-korg