From 1a0b23395b66909c46d548a9b14b3497671ebed1 Mon Sep 17 00:00:00 2001 From: Dmitry Puzikov Date: Tue, 16 Apr 2019 16:53:15 +0200 Subject: [PATCH] Fixed project version parsing Fixed pom.xml to execute vesion parsing earlier. Change-Id: Ic5f2c1c304ab025cbac93d5177776c17a8ff803b Issue-ID: INT-801 Signed-off-by: Dmitry Puzikov --- pom.xml | 829 ++++++++++++++++++++++----------------- src/main/assembly/descriptor.xml | 36 ++ src/main/bin/start.sh | 11 +- src/main/docker/Dockerfile | 23 +- src/main/resources/logback.xml | 198 ++++++++++ 5 files changed, 711 insertions(+), 386 deletions(-) create mode 100644 src/main/assembly/descriptor.xml create mode 100644 src/main/resources/logback.xml diff --git a/pom.xml b/pom.xml index 38d2949..2e76668 100644 --- a/pom.xml +++ b/pom.xml @@ -22,381 +22,476 @@ --> - 4.0.0 + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + 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.oparent - oparent - 2.0.0 - - + + org.onap.oparent + oparent + 2.0.0 + + - org.onap.aai - babel - 1.6.0-SNAPSHOT - jar + org.onap.aai + babel + 1.6.0-SNAPSHOT + jar - aai-babel - ONAP AAI Babel Microservice + aai-babel + ONAP AAI Babel Microservice - - - 2.1.6.RELEASE + + + 2.1.6.RELEASE - UTF-8 - UTF-8 - 1.8 - ${basedir}/target - onap/aai_schema - ${project.build.directory}/aai-schema + UTF-8 + UTF-8 + 1.8 + onap/aai_schema + ${project.build.directory}/aai-schema - - 1.2.2 - 1.5.1 - 1.18 - 2.1 - 0.13.2 - org.onap.aai.schema-service - 1.5.0 - 3.7 - 1.2.1 - 1.3.0 - 1.6 - 1.2.3 - 1.8 - + + 0.28.0 + 1.0.0 + ${project.build.directory}/${project.artifactId}-${project.version}-build/ + + onap + alpine + 1.6.0 - - - - - org.springframework.boot - spring-boot-dependencies - ${spring.boot.version} - pom - import - - - + + 1.2.2 + 1.5.1 + 1.18 + 2.1 + 0.13.2 + org.onap.aai.schema-service + 1.5.0 + 3.7 + 1.2.1 + 1.3.0 + 1.6 + 1.2.3 + 1.8 + + yyyyMMdd'T'HHmmss'Z' + - - - org.springframework.boot - spring-boot-starter-jetty - - - org.springframework.boot - spring-boot-starter-jersey - - - org.springframework.boot - spring-boot-starter-tomcat - - - - - org.onap.aai.logging-service - common-logging - ${common.logging.version} - - - ch.qos.logback - logback-classic - ${logback.version} - - - ch.qos.logback - logback-core - ${logback.version} - - - commons-codec - commons-codec - - - org.apache.commons - commons-compress - ${commons.compress.version} - - - org.apache.commons - commons-lang3 - - - javax.ws.rs - javax.ws.rs-api - ${javax.ws.rs.version} - - - org.codehaus.groovy - groovy - - - org.onap.sdc.sdc-tosca - sdc-tosca - ${sdc.tosca.version} - - - org.onap.aai - rest-client - ${aai.rest.client.version} - - - - - org.springframework.boot - spring-boot-starter-test - test - - - org.onap.sdc.sdc-distribution-client - sdc-distribution-client - ${sdc.distribution.client.version} - test - - - xmlunit - xmlunit - ${xmlunit.version} - test - - + + + + + org.springframework.boot + spring-boot-dependencies + ${spring.boot.version} + pom + import + + + - - babel - - - org.springframework.boot - spring-boot-maven-plugin - ${spring.boot.version} - - - -DCONFIG_HOME=./appconfig-local - -DAPP_HOME=. - -Dtosca.mappings.config=./appconfig-local/tosca-mappings.json - -DKEY_STORE_PASSWORD=${KEY_STORE_PASSWORD} - - - - - - repackage - - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - unpack - initialize - - unpack - - - - - ${aai-schema.group.id} - aai-schema - ${aai-schema.version} - jar - ${aai.schema.source.folder}/aai_schema_v**.xsd - ${project.build.directory}/tmp - - - - - - - - org.apache.maven.plugins - maven-antrun-plugin - ${antrun.version} - - - Flatten XSDs - initialize - - run - - - - - - - - - - - - - - - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin - ${mvn.jaxb2.version} - - - process-sources - - generate - - - - - ${aai.schema.target.folder} - org.onap.aai.babel.xml.generator.xsd - ${project.build.directory}/generated-sources - - aai_schema_latest.xsd - - true - - -Xannotate - - - - org.jvnet.jaxb2_commons - jaxb2-basics-annotate - 0.6.4 - - - - org.jvnet.jaxb2_commons - jaxb2-annotate-plugin-test-annox-annotations - 1.0.0 - - - - - - exec-maven-plugin - org.codehaus.mojo - 1.5.0 - - - Get latest xsd version - generate-sources - - exec - - - ${basedir}/scripts - bash - get-latest-xsd-version.sh ${basedir} - - - - - - com.mycila - license-maven-plugin - 3.0 - -
License.txt
- - src/main/java/** - src/test/java/** - pom.xml - - true - - - - - - check - - validate - - - - - org.apache.maven.plugins - maven-surefire-plugin - - false - 1 - - . - src/test/resources - - - - - org.apache.maven.plugins - maven-resources-plugin - 3.0.2 - - - copy-docker-file - package - - copy-resources - - - target - true - - - ${basedir}/src/main/docker - true - - - ${basedir}/src/main/bin/ - true - - - - - - - - org.apache.maven.plugins - maven-jar-plugin - 3.0.2 - - - package - - jar - - - client - - **/babel/service/data/* - - - - - - - org.apache.maven.plugins - maven-deploy-plugin - - client - - - - com.spotify - docker-maven-plugin - 0.4.11 - - true - docker-hub - ${docker.push.registry}/onap/${project.artifactId} - ${docker.location} - - latest - - true - - - - + + + + docker + + + + org.codehaus.mojo + build-helper-maven-plugin + 3.0.0 + + + pre-clean + parse-version + + parse-version + + + + + + org.codehaus.groovy.maven + gmaven-plugin + 1.0 + + + pre-clean + + execute + + + + def userAaiBaseImage = session.userProperties['aai.base.image']; + def userAaiCommonVersion = session.userProperties['aai.base.image.version']; + if (userAaiCommonVersion != null) { + project.properties['aai.base.image.version'] = userAaiCommonVersion; + } + if (userAaiBaseImage != null) { + project.properties['aai.base.image'] = userAaiBaseImage; + } + log.info 'Base image flavour: ' + project.properties['aai.base.image']; + log.info 'Base image version: ' + project.properties['aai.base.image.version']; + + + + + + + io.fabric8 + docker-maven-plugin + ${docker.fabric.version} + + true + 1.23 + + + ${docker.push.registry}/${aai.docker.namespace}/${project.artifactId}:%l + + + @ + + latest + ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-latest + ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-${maven.build.timestamp} + + try + ${project.basedir}/src/main/docker + + + + + ${aai.build.directory} + /${project.artifactId} + + + + + + + + + + + clean-images + pre-clean + + remove + + + true + + + + generate-images + package + + build + + + + push-images + deploy + + push + + + + + + + + + + + org.springframework.boot + spring-boot-starter-jetty + + + org.springframework.boot + spring-boot-starter-jersey + + + org.springframework.boot + spring-boot-starter-tomcat + + + + + org.onap.aai.logging-service + common-logging + ${common.logging.version} + + + ch.qos.logback + logback-classic + ${logback.version} + + + ch.qos.logback + logback-core + ${logback.version} + + + commons-codec + commons-codec + + + org.apache.commons + commons-compress + ${commons.compress.version} + + + org.apache.commons + commons-lang3 + + + javax.ws.rs + javax.ws.rs-api + ${javax.ws.rs.version} + + + org.codehaus.groovy + groovy + + + org.onap.sdc.sdc-tosca + sdc-tosca + ${sdc.tosca.version} + + + org.onap.aai + rest-client + ${aai.rest.client.version} + + + + + org.springframework.boot + spring-boot-starter-test + test + + + org.onap.sdc.sdc-distribution-client + sdc-distribution-client + ${sdc.distribution.client.version} + test + + + xmlunit + xmlunit + ${xmlunit.version} + test + + + + + + + org.springframework.boot + spring-boot-maven-plugin + ${spring.boot.version} + + + -DCONFIG_HOME=./appconfig-local + -DAPP_HOME=. + -Dtosca.mappings.config=./appconfig-local/tosca-mappings.json + -DKEY_STORE_PASSWORD=${KEY_STORE_PASSWORD} + + + + + + repackage + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + unpack + initialize + + unpack + + + + + ${aai-schema.group.id} + aai-schema + ${aai-schema.version} + jar + ${aai.schema.source.folder}/aai_schema_v**.xsd + ${project.build.directory}/tmp + + + + + + + + org.apache.maven.plugins + maven-antrun-plugin + ${antrun.version} + + + Flatten XSDs + initialize + + run + + + + + + + + + + + + + + + org.jvnet.jaxb2.maven2 + maven-jaxb2-plugin + ${mvn.jaxb2.version} + + + process-sources + + generate + + + + + ${aai.schema.target.folder} + org.onap.aai.babel.xml.generator.xsd + ${project.build.directory}/generated-sources + + aai_schema_latest.xsd + + true + + -Xannotate + + + + org.jvnet.jaxb2_commons + jaxb2-basics-annotate + 0.6.4 + + + + org.jvnet.jaxb2_commons + jaxb2-annotate-plugin-test-annox-annotations + 1.0.0 + + + + + + exec-maven-plugin + org.codehaus.mojo + 1.5.0 + + + Get latest xsd version + generate-sources + + exec + + + ${basedir}/scripts + bash + get-latest-xsd-version.sh ${basedir} + + + + + + maven-assembly-plugin + + + src/main/assembly/descriptor.xml + + + + + make-assembly + package + + single + + + + + + com.mycila + license-maven-plugin + 3.0 + +
License.txt
+ + src/main/java/** + src/test/java/** + pom.xml + + true + + + + + + check + + validate + + + + + org.apache.maven.plugins + maven-surefire-plugin + + false + 1 + + . + src/test/resources + + + + + org.apache.maven.plugins + maven-jar-plugin + 3.0.2 + + + package + + jar + + + client + + **/babel/service/data/* + + + + + + + org.apache.maven.plugins + maven-deploy-plugin + + client + + + + diff --git a/src/main/assembly/descriptor.xml b/src/main/assembly/descriptor.xml new file mode 100644 index 0000000..5cc3707 --- /dev/null +++ b/src/main/assembly/descriptor.xml @@ -0,0 +1,36 @@ + + build + false + + dir + + + + ${project.basedir}/src/main/resources + / + + logback.xml + + + + ${project.basedir}/src/main/bin + /bin + + **/* + + + + ${project.build.directory} + / + + ${project.artifactId}-${project.version}.jar + + + Dockerfile + *.sh + + + + diff --git a/src/main/bin/start.sh b/src/main/bin/start.sh index 8c4cdf5..1dc4771 100644 --- a/src/main/bin/start.sh +++ b/src/main/bin/start.sh @@ -19,6 +19,13 @@ # limitations under the License. # ============LICENSE_END========================================================= +# jre-alpine image has $JAVA_HOME set and added to $PATH +# ubuntu image requires to set $JAVA_HOME and add java to $PATH manually +if ( uname -v | grep -i "ubuntu" ); then + export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-`dpkg --print-architecture | awk -F- '{ print $NF }'` + export PATH=${JAVA_HOME}:$PATH +fi + APP_HOME="${APP_HOME:-/opt/app/babel}" if [ -z "${CONFIG_HOME}" ]; then @@ -41,4 +48,6 @@ fi JVM_MAX_HEAP=${MAX_HEAP:-1024} -exec java -Xmx${JVM_MAX_HEAP}m ${PROPS} -jar ${APP_HOME}/babel.jar +JARFILE=$(ls ./babel*.jar); + +exec java -Xmx${JVM_MAX_HEAP}m ${PROPS} -jar ${APP_HOME}/${JARFILE} diff --git a/src/main/docker/Dockerfile b/src/main/docker/Dockerfile index 70088ae..03917f7 100644 --- a/src/main/docker/Dockerfile +++ b/src/main/docker/Dockerfile @@ -1,25 +1,12 @@ -FROM ubuntu:14.04 +FROM @aai.docker.namespace@/aai-common-@aai.base.image@:@aai.base.image.version@ ARG MICRO_HOME=/opt/app/babel -ARG BIN_HOME=$MICRO_HOME/bin -ARG JAR_FILE=babel.jar - -RUN apt-get update - -# Install and setup java8 -RUN apt-get update && apt-get install -y software-properties-common -## sudo -E is required to preserve the environment. If you remove that line, it will most like freeze at this step -RUN sudo -E add-apt-repository ppa:openjdk-r/ppa && apt-get update && apt-get install -y openjdk-8-jdk -## Setup JAVA_HOME, this is useful for docker commandline -ENV JAVA_HOME usr/lib/jvm/java-8-openjdk-amd64 -RUN export JAVA_HOME # Build up the deployment folder structure RUN mkdir -p $MICRO_HOME -COPY ${JAR_FILE} $MICRO_HOME -RUN mkdir -p $BIN_HOME -COPY *.sh $BIN_HOME -RUN chmod 755 $BIN_HOME/* -RUN ln -s /logs $MICRO_HOME/logs +WORKDIR $MICRO_HOME +COPY /maven/babel/ . +RUN chmod 755 bin/* \ + && ln -s /logs $MICRO_HOME/logs CMD ["/opt/app/babel/bin/start.sh"] diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml new file mode 100644 index 0000000..74d2ae0 --- /dev/null +++ b/src/main/resources/logback.xml @@ -0,0 +1,198 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${logDirectory}/${generalLogName}.log + + ${logDirectory}/${generalLogName}.%d{yyyy-MM-dd}.log.zip + + 60 + + + ${errorLogPattern} + + + + + + INFO + + 256 + + + + + + + ${logDirectory}/${auditLogName}.log + + ${logDirectory}/${auditLogName}.%d{yyyy-MM-dd}.log.zip + + 60 + + + ${auditLogPattern} + + + + 256 + + + + + ${logDirectory}/${metricsLogName}.log + + ${logDirectory}/${metricsLogName}.%d{yyyy-MM-dd}.log.zip + + 60 + + + ${metricsLogPattern} + + + + + 256 + + + + + + ${logDirectory}/${debugLogName}.log + + + ${logDirectory}/${debugLogName}.%d{yyyy-MM-dd}.log.zip + + 60 + + + ${errorLogPattern} + + + + + + + + + e.level.toInt() < INFO.toInt() + + + DENY + NEUTRAL + + 256 + + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- 2.16.6