From f1f9d9f72c20b2db67a1ce5f5dd25ee2cb4cf2ab Mon Sep 17 00:00:00 2001 From: Craig Bryant Date: Wed, 4 Feb 2015 08:15:02 -0700 Subject: [PATCH] Changes to get the java code to build on StackForge Build and upload the jar to tarballs.openstack.org Also, remove unused jars from shaded jar to reduce size Need to use an older version of the shade plugin because stackforge uses maven 2 by default Change-Id: Ie9c497d1be325264bf76b16e8d56820dafb1d097 --- download/download.sh | 68 ++++ download/pom.xml | 40 +++ java/pom.xml | 251 +++++++++++++ {src => java/src}/assembly/tar.xml | 0 {src => java/src}/deb/control/control | 0 {src => java/src}/deb/control/postinst | 0 {src => java/src}/deb/control/postrm | 0 {src => java/src}/deb/control/prerm | 0 .../src}/deb/etc/persister-config.yml-sample | 0 .../src}/deb/init/monasca-persister.conf | 0 .../persister/MonPersisterApplication.java | 0 .../monasca/persister/MonPersisterModule.java | 0 .../configuration/KafkaConfiguration.java | 0 .../MonPersisterConfiguration.java | 0 .../configuration/PipelineConfiguration.java | 0 .../VerticaMetricRepositoryConfiguration.java | 0 .../AlarmStateTransitionConsumer.java | 0 .../AlarmStateTransitionConsumerFactory.java | 0 .../monasca/persister/consumer/Consumer.java | 0 .../KafkaAlarmStateTransitionConsumer.java | 0 ...kaAlarmStateTransitionConsumerFactory.java | 0 ...mStateTransitionConsumerRunnableBasic.java | 0 ...ransitionConsumerRunnableBasicFactory.java | 0 .../persister/consumer/KafkaChannel.java | 0 .../consumer/KafkaChannelFactory.java | 0 .../persister/consumer/KafkaConsumer.java | 0 .../consumer/KafkaConsumerRunnableBasic.java | 0 .../consumer/KafkaMetricsConsumer.java | 0 .../consumer/KafkaMetricsConsumerFactory.java | 0 .../KafkaMetricsConsumerRunnableBasic.java | 0 ...kaMetricsConsumerRunnableBasicFactory.java | 0 .../persister/consumer/MetricsConsumer.java | 0 .../consumer/MetricsConsumerFactory.java | 0 .../monasca/persister/dbi/DBIProvider.java | 0 .../healthcheck/SimpleHealthCheck.java | 0 .../AlarmStateTransitionPipeline.java | 0 .../AlarmStateTransitionPipelineFactory.java | 0 .../persister/pipeline/ManagedPipeline.java | 0 .../persister/pipeline/MetricPipeline.java | 0 .../pipeline/MetricPipelineFactory.java | 0 .../AlarmStateTransitionedEventHandler.java | 0 ...mStateTransitionedEventHandlerFactory.java | 0 .../pipeline/event/FlushableHandler.java | 0 .../pipeline/event/MetricHandler.java | 0 .../pipeline/event/MetricHandlerFactory.java | 0 .../persister/repository/AlarmRepository.java | 0 .../repository/InfluxDBAlarmRepository.java | 0 .../repository/InfluxDBMetricRepository.java | 0 .../repository/InfluxRepository.java | 0 .../repository/MetricRepository.java | 0 .../persister/repository/Sha1HashId.java | 0 .../repository/VerticaAlarmRepository.java | 0 .../repository/VerticaMetricRepository.java | 0 .../repository/VerticaMetricsConstants.java | 0 .../repository/VerticaRepository.java | 0 .../persister/resource/PlaceHolder.java | 0 .../monasca/persister/resource/Resource.java | 0 {src => java/src}/main/resources/banner.txt | 0 .../src}/main/resources/persister-config.yml | 0 .../persister/MonPersisterConsumerTest.java | 0 pom.xml | 329 ++++-------------- 61 files changed, 436 insertions(+), 252 deletions(-) create mode 100755 download/download.sh create mode 100644 download/pom.xml create mode 100644 java/pom.xml rename {src => java/src}/assembly/tar.xml (100%) rename {src => java/src}/deb/control/control (100%) rename {src => java/src}/deb/control/postinst (100%) rename {src => java/src}/deb/control/postrm (100%) rename {src => java/src}/deb/control/prerm (100%) rename {src => java/src}/deb/etc/persister-config.yml-sample (100%) rename {src => java/src}/deb/init/monasca-persister.conf (100%) rename {src => java/src}/main/java/monasca/persister/MonPersisterApplication.java (100%) rename {src => java/src}/main/java/monasca/persister/MonPersisterModule.java (100%) rename {src => java/src}/main/java/monasca/persister/configuration/KafkaConfiguration.java (100%) rename {src => java/src}/main/java/monasca/persister/configuration/MonPersisterConfiguration.java (100%) rename {src => java/src}/main/java/monasca/persister/configuration/PipelineConfiguration.java (100%) rename {src => java/src}/main/java/monasca/persister/configuration/VerticaMetricRepositoryConfiguration.java (100%) rename {src => java/src}/main/java/monasca/persister/consumer/AlarmStateTransitionConsumer.java (100%) rename {src => java/src}/main/java/monasca/persister/consumer/AlarmStateTransitionConsumerFactory.java (100%) rename {src => java/src}/main/java/monasca/persister/consumer/Consumer.java (100%) rename {src => java/src}/main/java/monasca/persister/consumer/KafkaAlarmStateTransitionConsumer.java (100%) rename {src => java/src}/main/java/monasca/persister/consumer/KafkaAlarmStateTransitionConsumerFactory.java (100%) rename {src => java/src}/main/java/monasca/persister/consumer/KafkaAlarmStateTransitionConsumerRunnableBasic.java (100%) rename {src => java/src}/main/java/monasca/persister/consumer/KafkaAlarmStateTransitionConsumerRunnableBasicFactory.java (100%) rename {src => java/src}/main/java/monasca/persister/consumer/KafkaChannel.java (100%) rename {src => java/src}/main/java/monasca/persister/consumer/KafkaChannelFactory.java (100%) rename {src => java/src}/main/java/monasca/persister/consumer/KafkaConsumer.java (100%) rename {src => java/src}/main/java/monasca/persister/consumer/KafkaConsumerRunnableBasic.java (100%) rename {src => java/src}/main/java/monasca/persister/consumer/KafkaMetricsConsumer.java (100%) rename {src => java/src}/main/java/monasca/persister/consumer/KafkaMetricsConsumerFactory.java (100%) rename {src => java/src}/main/java/monasca/persister/consumer/KafkaMetricsConsumerRunnableBasic.java (100%) rename {src => java/src}/main/java/monasca/persister/consumer/KafkaMetricsConsumerRunnableBasicFactory.java (100%) rename {src => java/src}/main/java/monasca/persister/consumer/MetricsConsumer.java (100%) rename {src => java/src}/main/java/monasca/persister/consumer/MetricsConsumerFactory.java (100%) rename {src => java/src}/main/java/monasca/persister/dbi/DBIProvider.java (100%) rename {src => java/src}/main/java/monasca/persister/healthcheck/SimpleHealthCheck.java (100%) rename {src => java/src}/main/java/monasca/persister/pipeline/AlarmStateTransitionPipeline.java (100%) rename {src => java/src}/main/java/monasca/persister/pipeline/AlarmStateTransitionPipelineFactory.java (100%) rename {src => java/src}/main/java/monasca/persister/pipeline/ManagedPipeline.java (100%) rename {src => java/src}/main/java/monasca/persister/pipeline/MetricPipeline.java (100%) rename {src => java/src}/main/java/monasca/persister/pipeline/MetricPipelineFactory.java (100%) rename {src => java/src}/main/java/monasca/persister/pipeline/event/AlarmStateTransitionedEventHandler.java (100%) rename {src => java/src}/main/java/monasca/persister/pipeline/event/AlarmStateTransitionedEventHandlerFactory.java (100%) rename {src => java/src}/main/java/monasca/persister/pipeline/event/FlushableHandler.java (100%) rename {src => java/src}/main/java/monasca/persister/pipeline/event/MetricHandler.java (100%) rename {src => java/src}/main/java/monasca/persister/pipeline/event/MetricHandlerFactory.java (100%) rename {src => java/src}/main/java/monasca/persister/repository/AlarmRepository.java (100%) rename {src => java/src}/main/java/monasca/persister/repository/InfluxDBAlarmRepository.java (100%) rename {src => java/src}/main/java/monasca/persister/repository/InfluxDBMetricRepository.java (100%) rename {src => java/src}/main/java/monasca/persister/repository/InfluxRepository.java (100%) rename {src => java/src}/main/java/monasca/persister/repository/MetricRepository.java (100%) rename {src => java/src}/main/java/monasca/persister/repository/Sha1HashId.java (100%) rename {src => java/src}/main/java/monasca/persister/repository/VerticaAlarmRepository.java (100%) rename {src => java/src}/main/java/monasca/persister/repository/VerticaMetricRepository.java (100%) rename {src => java/src}/main/java/monasca/persister/repository/VerticaMetricsConstants.java (100%) rename {src => java/src}/main/java/monasca/persister/repository/VerticaRepository.java (100%) rename {src => java/src}/main/java/monasca/persister/resource/PlaceHolder.java (100%) rename {src => java/src}/main/java/monasca/persister/resource/Resource.java (100%) rename {src => java/src}/main/resources/banner.txt (100%) rename {src => java/src}/main/resources/persister-config.yml (100%) rename {src => java/src}/test/java/monasca/persister/MonPersisterConsumerTest.java (100%) diff --git a/download/download.sh b/download/download.sh new file mode 100755 index 00000000..02cf233b --- /dev/null +++ b/download/download.sh @@ -0,0 +1,68 @@ +#!/bin/sh +set -x +ME=`whoami` +echo "Running as user: $ME" +VERSION=$1 + +check_user() { + ME=$1 + if [ "${ME}" != "jenkins" ]; then + echo "\nERROR: Download monasca-common and do a mvn install to install the monasca-commom jars\n" 1>&2 + exit 1 + fi +} + +# TODO: Grep these out of the pom itself rather than have them explicitly listed +JARS=" +monasca-common-util +monasca-common-model +monasca-common-influxdb +" +for JAR in $JARS; do + JARFILE=~/.m2//repository/monasca-common/${JAR}/${VERSION}/${JAR}-${VERSION}.jar + if [ ! -r "$JARFILE" ]; then + check_user ${ME} + # Download it from stackforge + FILE=`basename $JARFILE` + curl http://tarballs.openstack.org/ci/monasca-common/${FILE} > ${FILE} + # Upload into the local repository + POM=META-INF/maven/monasca-common/${JAR}/pom.xml + jar -xvf ${FILE} ${POM} + TMPFILE=pom.$$ + sed -e "s/\${computedVersion}/${VERSION}/" ${POM} > ${TMPFILE} + mv ${TMPFILE} ${POM} + mvn install:install-file -Dfile=${FILE} -DgroupId=monasca-common \ + -DartifactId=${JAR} -Dversion=${VERSION} -Dpackaging=jar -DpomFile=${POM} + fi +done + +POM_FILE=~/.m2/repository/monasca-common/monasca-common/${VERSION}/monasca-common-${VERSION}.pom +if [ ! -r "${POM_FILE}" ]; then + check_user ${ME} + TMPDIR=pom_tmp.$$ + mkdir -p ${TMPDIR} + curl https://raw.githubusercontent.com/stackforge/monasca-common/master/java/pom.xml > ${TMPDIR}/pom.xml + mvn install:install-file -DgroupId=monasca-common -DartifactId=monasca-common -Dversion=${VERSION} -Dpackaging=pom -Dfile=${TMPDIR}/pom.xml + rm -fr ${TMPDIR} +fi + +TEST_JARS=" +monasca-common-streaming +" +for TEST_JAR in $TEST_JARS; do + JARFILE=~/.m2//repository/monasca-common/${TEST_JAR}/${VERSION}/${TEST_JAR}-${VERSION}-tests.jar + if [ ! -r "$JARFILE" ]; then + check_user ${ME} + # Download it from stackforge + FILE=`basename $JARFILE` + curl http://tarballs.openstack.org/ci/monasca-common/${FILE} > ${FILE} + # Upload into the local repository + POM=META-INF/maven/monasca-common/${TEST_JAR}/pom.xml + jar -xvf ${FILE} ${POM} + TMPFILE=pom.$$ + sed -e "s/\${computedVersion}/${VERSION}/" ${POM} > ${TMPFILE} + mv ${TMPFILE} ${POM} + mvn install:install-file -Dfile=${FILE} -DgroupId=monasca-common \ + -DartifactId=${TEST_JAR} -Dversion=${VERSION} -Dpackaging=test-jar -DpomFile=${POM} + fi +done diff --git a/download/pom.xml b/download/pom.xml new file mode 100644 index 00000000..197250f1 --- /dev/null +++ b/download/pom.xml @@ -0,0 +1,40 @@ + + 4.0.0 + + monasca-persister + monasca-persister-download + 1.0.0-SNAPSHOT + http://github.com/stackforge/monasca-persister + pom + + + + ${project.version} + true + UTF-8 + UTF-8 + + + + + + org.codehaus.mojo + exec-maven-plugin + 1.1.1 + + + package-execution + validate + + exec + + + + + ./download.sh + + + + + diff --git a/java/pom.xml b/java/pom.xml new file mode 100644 index 00000000..ff9f0177 --- /dev/null +++ b/java/pom.xml @@ -0,0 +1,251 @@ + + + 4.0.0 + + monasca-persister + monasca-persister + 1.0-SNAPSHOT + + + UTF-8 + UTF-8 + ${project.name}-${project.version}-${timestamp}-${buildNumber} + + 1.0.0-SNAPSHOT + + + + + scm:git:git@github.com:stackforge/monasca-persister + scm:git:git@github.com:stackforge/monasca-persister + + + + + + monasca-common + monasca-common-model + ${mon.common.version} + + + monasca-common + monasca-common-influxdb + ${mon.common.version} + + + org.apache.kafka + kafka_2.9.2 + 0.8.0 + + + com.sun.jmx + jmxri + + + com.sun.jdmk + jmxtools + + + org.slf4j + slf4j-simple + + + + + io.dropwizard + dropwizard-core + 0.7.0 + + + io.dropwizard + dropwizard-jdbi + 0.7.0 + + + com.google.inject + guice + 3.0 + + + com.google.inject.extensions + guice-assistedinject + 3.0 + + + org.mockito + mockito-all + 1.9.5 + test + + + junit + junit + 4.11 + test + + + commons-codec + commons-codec + 1.5 + + + org.influxdb + influxdb-java + 1.0 + + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.1 + + -Xlint:all + 1.7 + 1.7 + UTF-8 + + + + org.apache.maven.plugins + maven-shade-plugin + 1.2 + + ${artifactNamedVersion} + true + + + *:* + + META-INF/*.SF + META-INF/*.DSA + META-INF/*.RSA + + + + + + + package + + shade + + + + + + monasca.persister.MonPersisterApplication + + + + + + + + + org.apache.maven.plugins + maven-jar-plugin + 2.4 + + + + true + + + + + + maven-clean-plugin + 2.5 + + + + ${project.basedir}/debs + + + + + + org.codehaus.mojo + buildnumber-maven-plugin + 1.2 + + + validate + + create + + + + + false + 6 + + + + maven-assembly-plugin + 2.4.1 + + + src/assembly/tar.xml + + ${artifactNamedVersion} + + + + make-assembly + package + + single + + + + + + jdeb + org.vafer + 1.0.1 + + + package + + jdeb + + + ${project.basedir}/debs/binaries/${artifactNamedVersion}.deb + + + file + ${project.build.directory}/${artifactNamedVersion}.jar + + /opt/monasca/monasca-persister.jar + + + file + ${project.basedir}/src/deb/init/monasca-persister.conf + /etc/init/monasca-persister.conf + + + file + + ${project.basedir}/src/deb/etc/persister-config.yml-sample + + /etc/monasca/persister-config.yml-sample + + + + + + + + + + + diff --git a/src/assembly/tar.xml b/java/src/assembly/tar.xml similarity index 100% rename from src/assembly/tar.xml rename to java/src/assembly/tar.xml diff --git a/src/deb/control/control b/java/src/deb/control/control similarity index 100% rename from src/deb/control/control rename to java/src/deb/control/control diff --git a/src/deb/control/postinst b/java/src/deb/control/postinst similarity index 100% rename from src/deb/control/postinst rename to java/src/deb/control/postinst diff --git a/src/deb/control/postrm b/java/src/deb/control/postrm similarity index 100% rename from src/deb/control/postrm rename to java/src/deb/control/postrm diff --git a/src/deb/control/prerm b/java/src/deb/control/prerm similarity index 100% rename from src/deb/control/prerm rename to java/src/deb/control/prerm diff --git a/src/deb/etc/persister-config.yml-sample b/java/src/deb/etc/persister-config.yml-sample similarity index 100% rename from src/deb/etc/persister-config.yml-sample rename to java/src/deb/etc/persister-config.yml-sample diff --git a/src/deb/init/monasca-persister.conf b/java/src/deb/init/monasca-persister.conf similarity index 100% rename from src/deb/init/monasca-persister.conf rename to java/src/deb/init/monasca-persister.conf diff --git a/src/main/java/monasca/persister/MonPersisterApplication.java b/java/src/main/java/monasca/persister/MonPersisterApplication.java similarity index 100% rename from src/main/java/monasca/persister/MonPersisterApplication.java rename to java/src/main/java/monasca/persister/MonPersisterApplication.java diff --git a/src/main/java/monasca/persister/MonPersisterModule.java b/java/src/main/java/monasca/persister/MonPersisterModule.java similarity index 100% rename from src/main/java/monasca/persister/MonPersisterModule.java rename to java/src/main/java/monasca/persister/MonPersisterModule.java diff --git a/src/main/java/monasca/persister/configuration/KafkaConfiguration.java b/java/src/main/java/monasca/persister/configuration/KafkaConfiguration.java similarity index 100% rename from src/main/java/monasca/persister/configuration/KafkaConfiguration.java rename to java/src/main/java/monasca/persister/configuration/KafkaConfiguration.java diff --git a/src/main/java/monasca/persister/configuration/MonPersisterConfiguration.java b/java/src/main/java/monasca/persister/configuration/MonPersisterConfiguration.java similarity index 100% rename from src/main/java/monasca/persister/configuration/MonPersisterConfiguration.java rename to java/src/main/java/monasca/persister/configuration/MonPersisterConfiguration.java diff --git a/src/main/java/monasca/persister/configuration/PipelineConfiguration.java b/java/src/main/java/monasca/persister/configuration/PipelineConfiguration.java similarity index 100% rename from src/main/java/monasca/persister/configuration/PipelineConfiguration.java rename to java/src/main/java/monasca/persister/configuration/PipelineConfiguration.java diff --git a/src/main/java/monasca/persister/configuration/VerticaMetricRepositoryConfiguration.java b/java/src/main/java/monasca/persister/configuration/VerticaMetricRepositoryConfiguration.java similarity index 100% rename from src/main/java/monasca/persister/configuration/VerticaMetricRepositoryConfiguration.java rename to java/src/main/java/monasca/persister/configuration/VerticaMetricRepositoryConfiguration.java diff --git a/src/main/java/monasca/persister/consumer/AlarmStateTransitionConsumer.java b/java/src/main/java/monasca/persister/consumer/AlarmStateTransitionConsumer.java similarity index 100% rename from src/main/java/monasca/persister/consumer/AlarmStateTransitionConsumer.java rename to java/src/main/java/monasca/persister/consumer/AlarmStateTransitionConsumer.java diff --git a/src/main/java/monasca/persister/consumer/AlarmStateTransitionConsumerFactory.java b/java/src/main/java/monasca/persister/consumer/AlarmStateTransitionConsumerFactory.java similarity index 100% rename from src/main/java/monasca/persister/consumer/AlarmStateTransitionConsumerFactory.java rename to java/src/main/java/monasca/persister/consumer/AlarmStateTransitionConsumerFactory.java diff --git a/src/main/java/monasca/persister/consumer/Consumer.java b/java/src/main/java/monasca/persister/consumer/Consumer.java similarity index 100% rename from src/main/java/monasca/persister/consumer/Consumer.java rename to java/src/main/java/monasca/persister/consumer/Consumer.java diff --git a/src/main/java/monasca/persister/consumer/KafkaAlarmStateTransitionConsumer.java b/java/src/main/java/monasca/persister/consumer/KafkaAlarmStateTransitionConsumer.java similarity index 100% rename from src/main/java/monasca/persister/consumer/KafkaAlarmStateTransitionConsumer.java rename to java/src/main/java/monasca/persister/consumer/KafkaAlarmStateTransitionConsumer.java diff --git a/src/main/java/monasca/persister/consumer/KafkaAlarmStateTransitionConsumerFactory.java b/java/src/main/java/monasca/persister/consumer/KafkaAlarmStateTransitionConsumerFactory.java similarity index 100% rename from src/main/java/monasca/persister/consumer/KafkaAlarmStateTransitionConsumerFactory.java rename to java/src/main/java/monasca/persister/consumer/KafkaAlarmStateTransitionConsumerFactory.java diff --git a/src/main/java/monasca/persister/consumer/KafkaAlarmStateTransitionConsumerRunnableBasic.java b/java/src/main/java/monasca/persister/consumer/KafkaAlarmStateTransitionConsumerRunnableBasic.java similarity index 100% rename from src/main/java/monasca/persister/consumer/KafkaAlarmStateTransitionConsumerRunnableBasic.java rename to java/src/main/java/monasca/persister/consumer/KafkaAlarmStateTransitionConsumerRunnableBasic.java diff --git a/src/main/java/monasca/persister/consumer/KafkaAlarmStateTransitionConsumerRunnableBasicFactory.java b/java/src/main/java/monasca/persister/consumer/KafkaAlarmStateTransitionConsumerRunnableBasicFactory.java similarity index 100% rename from src/main/java/monasca/persister/consumer/KafkaAlarmStateTransitionConsumerRunnableBasicFactory.java rename to java/src/main/java/monasca/persister/consumer/KafkaAlarmStateTransitionConsumerRunnableBasicFactory.java diff --git a/src/main/java/monasca/persister/consumer/KafkaChannel.java b/java/src/main/java/monasca/persister/consumer/KafkaChannel.java similarity index 100% rename from src/main/java/monasca/persister/consumer/KafkaChannel.java rename to java/src/main/java/monasca/persister/consumer/KafkaChannel.java diff --git a/src/main/java/monasca/persister/consumer/KafkaChannelFactory.java b/java/src/main/java/monasca/persister/consumer/KafkaChannelFactory.java similarity index 100% rename from src/main/java/monasca/persister/consumer/KafkaChannelFactory.java rename to java/src/main/java/monasca/persister/consumer/KafkaChannelFactory.java diff --git a/src/main/java/monasca/persister/consumer/KafkaConsumer.java b/java/src/main/java/monasca/persister/consumer/KafkaConsumer.java similarity index 100% rename from src/main/java/monasca/persister/consumer/KafkaConsumer.java rename to java/src/main/java/monasca/persister/consumer/KafkaConsumer.java diff --git a/src/main/java/monasca/persister/consumer/KafkaConsumerRunnableBasic.java b/java/src/main/java/monasca/persister/consumer/KafkaConsumerRunnableBasic.java similarity index 100% rename from src/main/java/monasca/persister/consumer/KafkaConsumerRunnableBasic.java rename to java/src/main/java/monasca/persister/consumer/KafkaConsumerRunnableBasic.java diff --git a/src/main/java/monasca/persister/consumer/KafkaMetricsConsumer.java b/java/src/main/java/monasca/persister/consumer/KafkaMetricsConsumer.java similarity index 100% rename from src/main/java/monasca/persister/consumer/KafkaMetricsConsumer.java rename to java/src/main/java/monasca/persister/consumer/KafkaMetricsConsumer.java diff --git a/src/main/java/monasca/persister/consumer/KafkaMetricsConsumerFactory.java b/java/src/main/java/monasca/persister/consumer/KafkaMetricsConsumerFactory.java similarity index 100% rename from src/main/java/monasca/persister/consumer/KafkaMetricsConsumerFactory.java rename to java/src/main/java/monasca/persister/consumer/KafkaMetricsConsumerFactory.java diff --git a/src/main/java/monasca/persister/consumer/KafkaMetricsConsumerRunnableBasic.java b/java/src/main/java/monasca/persister/consumer/KafkaMetricsConsumerRunnableBasic.java similarity index 100% rename from src/main/java/monasca/persister/consumer/KafkaMetricsConsumerRunnableBasic.java rename to java/src/main/java/monasca/persister/consumer/KafkaMetricsConsumerRunnableBasic.java diff --git a/src/main/java/monasca/persister/consumer/KafkaMetricsConsumerRunnableBasicFactory.java b/java/src/main/java/monasca/persister/consumer/KafkaMetricsConsumerRunnableBasicFactory.java similarity index 100% rename from src/main/java/monasca/persister/consumer/KafkaMetricsConsumerRunnableBasicFactory.java rename to java/src/main/java/monasca/persister/consumer/KafkaMetricsConsumerRunnableBasicFactory.java diff --git a/src/main/java/monasca/persister/consumer/MetricsConsumer.java b/java/src/main/java/monasca/persister/consumer/MetricsConsumer.java similarity index 100% rename from src/main/java/monasca/persister/consumer/MetricsConsumer.java rename to java/src/main/java/monasca/persister/consumer/MetricsConsumer.java diff --git a/src/main/java/monasca/persister/consumer/MetricsConsumerFactory.java b/java/src/main/java/monasca/persister/consumer/MetricsConsumerFactory.java similarity index 100% rename from src/main/java/monasca/persister/consumer/MetricsConsumerFactory.java rename to java/src/main/java/monasca/persister/consumer/MetricsConsumerFactory.java diff --git a/src/main/java/monasca/persister/dbi/DBIProvider.java b/java/src/main/java/monasca/persister/dbi/DBIProvider.java similarity index 100% rename from src/main/java/monasca/persister/dbi/DBIProvider.java rename to java/src/main/java/monasca/persister/dbi/DBIProvider.java diff --git a/src/main/java/monasca/persister/healthcheck/SimpleHealthCheck.java b/java/src/main/java/monasca/persister/healthcheck/SimpleHealthCheck.java similarity index 100% rename from src/main/java/monasca/persister/healthcheck/SimpleHealthCheck.java rename to java/src/main/java/monasca/persister/healthcheck/SimpleHealthCheck.java diff --git a/src/main/java/monasca/persister/pipeline/AlarmStateTransitionPipeline.java b/java/src/main/java/monasca/persister/pipeline/AlarmStateTransitionPipeline.java similarity index 100% rename from src/main/java/monasca/persister/pipeline/AlarmStateTransitionPipeline.java rename to java/src/main/java/monasca/persister/pipeline/AlarmStateTransitionPipeline.java diff --git a/src/main/java/monasca/persister/pipeline/AlarmStateTransitionPipelineFactory.java b/java/src/main/java/monasca/persister/pipeline/AlarmStateTransitionPipelineFactory.java similarity index 100% rename from src/main/java/monasca/persister/pipeline/AlarmStateTransitionPipelineFactory.java rename to java/src/main/java/monasca/persister/pipeline/AlarmStateTransitionPipelineFactory.java diff --git a/src/main/java/monasca/persister/pipeline/ManagedPipeline.java b/java/src/main/java/monasca/persister/pipeline/ManagedPipeline.java similarity index 100% rename from src/main/java/monasca/persister/pipeline/ManagedPipeline.java rename to java/src/main/java/monasca/persister/pipeline/ManagedPipeline.java diff --git a/src/main/java/monasca/persister/pipeline/MetricPipeline.java b/java/src/main/java/monasca/persister/pipeline/MetricPipeline.java similarity index 100% rename from src/main/java/monasca/persister/pipeline/MetricPipeline.java rename to java/src/main/java/monasca/persister/pipeline/MetricPipeline.java diff --git a/src/main/java/monasca/persister/pipeline/MetricPipelineFactory.java b/java/src/main/java/monasca/persister/pipeline/MetricPipelineFactory.java similarity index 100% rename from src/main/java/monasca/persister/pipeline/MetricPipelineFactory.java rename to java/src/main/java/monasca/persister/pipeline/MetricPipelineFactory.java diff --git a/src/main/java/monasca/persister/pipeline/event/AlarmStateTransitionedEventHandler.java b/java/src/main/java/monasca/persister/pipeline/event/AlarmStateTransitionedEventHandler.java similarity index 100% rename from src/main/java/monasca/persister/pipeline/event/AlarmStateTransitionedEventHandler.java rename to java/src/main/java/monasca/persister/pipeline/event/AlarmStateTransitionedEventHandler.java diff --git a/src/main/java/monasca/persister/pipeline/event/AlarmStateTransitionedEventHandlerFactory.java b/java/src/main/java/monasca/persister/pipeline/event/AlarmStateTransitionedEventHandlerFactory.java similarity index 100% rename from src/main/java/monasca/persister/pipeline/event/AlarmStateTransitionedEventHandlerFactory.java rename to java/src/main/java/monasca/persister/pipeline/event/AlarmStateTransitionedEventHandlerFactory.java diff --git a/src/main/java/monasca/persister/pipeline/event/FlushableHandler.java b/java/src/main/java/monasca/persister/pipeline/event/FlushableHandler.java similarity index 100% rename from src/main/java/monasca/persister/pipeline/event/FlushableHandler.java rename to java/src/main/java/monasca/persister/pipeline/event/FlushableHandler.java diff --git a/src/main/java/monasca/persister/pipeline/event/MetricHandler.java b/java/src/main/java/monasca/persister/pipeline/event/MetricHandler.java similarity index 100% rename from src/main/java/monasca/persister/pipeline/event/MetricHandler.java rename to java/src/main/java/monasca/persister/pipeline/event/MetricHandler.java diff --git a/src/main/java/monasca/persister/pipeline/event/MetricHandlerFactory.java b/java/src/main/java/monasca/persister/pipeline/event/MetricHandlerFactory.java similarity index 100% rename from src/main/java/monasca/persister/pipeline/event/MetricHandlerFactory.java rename to java/src/main/java/monasca/persister/pipeline/event/MetricHandlerFactory.java diff --git a/src/main/java/monasca/persister/repository/AlarmRepository.java b/java/src/main/java/monasca/persister/repository/AlarmRepository.java similarity index 100% rename from src/main/java/monasca/persister/repository/AlarmRepository.java rename to java/src/main/java/monasca/persister/repository/AlarmRepository.java diff --git a/src/main/java/monasca/persister/repository/InfluxDBAlarmRepository.java b/java/src/main/java/monasca/persister/repository/InfluxDBAlarmRepository.java similarity index 100% rename from src/main/java/monasca/persister/repository/InfluxDBAlarmRepository.java rename to java/src/main/java/monasca/persister/repository/InfluxDBAlarmRepository.java diff --git a/src/main/java/monasca/persister/repository/InfluxDBMetricRepository.java b/java/src/main/java/monasca/persister/repository/InfluxDBMetricRepository.java similarity index 100% rename from src/main/java/monasca/persister/repository/InfluxDBMetricRepository.java rename to java/src/main/java/monasca/persister/repository/InfluxDBMetricRepository.java diff --git a/src/main/java/monasca/persister/repository/InfluxRepository.java b/java/src/main/java/monasca/persister/repository/InfluxRepository.java similarity index 100% rename from src/main/java/monasca/persister/repository/InfluxRepository.java rename to java/src/main/java/monasca/persister/repository/InfluxRepository.java diff --git a/src/main/java/monasca/persister/repository/MetricRepository.java b/java/src/main/java/monasca/persister/repository/MetricRepository.java similarity index 100% rename from src/main/java/monasca/persister/repository/MetricRepository.java rename to java/src/main/java/monasca/persister/repository/MetricRepository.java diff --git a/src/main/java/monasca/persister/repository/Sha1HashId.java b/java/src/main/java/monasca/persister/repository/Sha1HashId.java similarity index 100% rename from src/main/java/monasca/persister/repository/Sha1HashId.java rename to java/src/main/java/monasca/persister/repository/Sha1HashId.java diff --git a/src/main/java/monasca/persister/repository/VerticaAlarmRepository.java b/java/src/main/java/monasca/persister/repository/VerticaAlarmRepository.java similarity index 100% rename from src/main/java/monasca/persister/repository/VerticaAlarmRepository.java rename to java/src/main/java/monasca/persister/repository/VerticaAlarmRepository.java diff --git a/src/main/java/monasca/persister/repository/VerticaMetricRepository.java b/java/src/main/java/monasca/persister/repository/VerticaMetricRepository.java similarity index 100% rename from src/main/java/monasca/persister/repository/VerticaMetricRepository.java rename to java/src/main/java/monasca/persister/repository/VerticaMetricRepository.java diff --git a/src/main/java/monasca/persister/repository/VerticaMetricsConstants.java b/java/src/main/java/monasca/persister/repository/VerticaMetricsConstants.java similarity index 100% rename from src/main/java/monasca/persister/repository/VerticaMetricsConstants.java rename to java/src/main/java/monasca/persister/repository/VerticaMetricsConstants.java diff --git a/src/main/java/monasca/persister/repository/VerticaRepository.java b/java/src/main/java/monasca/persister/repository/VerticaRepository.java similarity index 100% rename from src/main/java/monasca/persister/repository/VerticaRepository.java rename to java/src/main/java/monasca/persister/repository/VerticaRepository.java diff --git a/src/main/java/monasca/persister/resource/PlaceHolder.java b/java/src/main/java/monasca/persister/resource/PlaceHolder.java similarity index 100% rename from src/main/java/monasca/persister/resource/PlaceHolder.java rename to java/src/main/java/monasca/persister/resource/PlaceHolder.java diff --git a/src/main/java/monasca/persister/resource/Resource.java b/java/src/main/java/monasca/persister/resource/Resource.java similarity index 100% rename from src/main/java/monasca/persister/resource/Resource.java rename to java/src/main/java/monasca/persister/resource/Resource.java diff --git a/src/main/resources/banner.txt b/java/src/main/resources/banner.txt similarity index 100% rename from src/main/resources/banner.txt rename to java/src/main/resources/banner.txt diff --git a/src/main/resources/persister-config.yml b/java/src/main/resources/persister-config.yml similarity index 100% rename from src/main/resources/persister-config.yml rename to java/src/main/resources/persister-config.yml diff --git a/src/test/java/monasca/persister/MonPersisterConsumerTest.java b/java/src/test/java/monasca/persister/MonPersisterConsumerTest.java similarity index 100% rename from src/test/java/monasca/persister/MonPersisterConsumerTest.java rename to java/src/test/java/monasca/persister/MonPersisterConsumerTest.java diff --git a/pom.xml b/pom.xml index faf7be34..bfcd0e3a 100644 --- a/pom.xml +++ b/pom.xml @@ -1,261 +1,86 @@ - - - 4.0.0 + + 4.0.0 - monasca-persister - monasca-persister - 1.0-SNAPSHOT + monasca + monasca-persister-base + ${computedVersion} + http://github.com/stackforge/monasca-common + pom - - UTF-8 - UTF-8 - ${project.name}-${project.version}-${timestamp}-${buildNumber} - - 1.0.0-SNAPSHOT - + - - - scm:git:git@github.com:stackforge/monasca-persister - scm:git:git@github.com:stackforge/monasca-persister - - + + + 1.0.0 + ${versionNumber}-SNAPSHOT - - - monasca-common - monasca-common-model - ${mon.common.version} - - - monasca-common - monasca-common-influxdb - ${mon.common.version} - - - org.apache.kafka - kafka_2.9.2 - 0.8.0 - - - com.sun.jmx - jmxri - - - com.sun.jdmk - jmxtools - - - org.slf4j - slf4j-simple - - - - - io.dropwizard - dropwizard-core - 0.7.0 - - - io.dropwizard - dropwizard-jdbi - 0.7.0 - - - com.google.inject - guice - 3.0 - - - com.google.inject.extensions - guice-assistedinject - 3.0 - - - org.mockito - mockito-all - 1.9.5 - test - - - junit - junit - 4.11 - test - - - org.codehaus.mojo - buildnumber-maven-plugin - 1.2 - - - org.vafer - jdeb - 1.0.1 - - - commons-codec - commons-codec - 1.5 - - - org.influxdb - influxdb-java - 1.0 - - + true + UTF-8 + UTF-8 + + + scm:git:git@github.com:stackforge/monasca-persister + scm:git:git@github.com:stackforge/monasca-persister + - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.1 - - -Xlint:all - 1.7 - 1.7 - UTF-8 - - - - org.apache.maven.plugins - maven-shade-plugin - 2.2 - - ${artifactNamedVersion} - true - - - *:* - - META-INF/*.SF - META-INF/*.DSA - META-INF/*.RSA - - - - - - - package - - shade - - - - - - monasca.persister.MonPersisterApplication - - - - - - - - - org.apache.maven.plugins - maven-jar-plugin - 2.4 - - - - true - - - - - - maven-clean-plugin - 2.5 - - - - ${project.basedir}/debs - - - - - - org.codehaus.mojo - buildnumber-maven-plugin - 1.2 - - - validate - - create - - - - - false - 6 - - - - maven-assembly-plugin - 2.4.1 - - - src/assembly/tar.xml - - ${artifactNamedVersion} - - - - make-assembly - package - - single - - - - - - jdeb - org.vafer - 1.0.1 - - - package - - jdeb - - - ${project.basedir}/debs/binaries/${artifactNamedVersion}.deb - - - file - ${project.build.directory}/${artifactNamedVersion}.jar - - /opt/monasca/monasca-persister.jar - - - file - ${project.basedir}/src/deb/init/monasca-persister.conf - /etc/init/monasca-persister.conf - - - file - - ${project.basedir}/src/deb/etc/persister-config.yml-sample - - /etc/monasca/persister-config.yml-sample - - - - - - - - + + download + java + + + + release-deploy-url-override + + + BUILD_NUM + + + + ${project.version} + + + + + + + + org.apache.maven.plugins + maven-scm-plugin + 1.9 + + ${project.version} + + + + org.codehaus.mojo + exec-maven-plugin + 1.1.1 + + + some-execution + package + + exec + + + + + ln + + -sf + java/target + target + + + + +