From f5605db41bb11f6a9517fc66a420b6711611bb95 Mon Sep 17 00:00:00 2001 From: Martijn van Groningen Date: Mon, 26 Jan 2015 09:35:21 +0100 Subject: [PATCH] Share all libraries and noop-ed quartz logging Original commit: elastic/x-pack-elasticsearch@88228b7f46783c8fff64dd0df6f8bc1a4b03b508 --- pom.xml | 53 ++++++++++++++++++- src/main/assemblies/plugin.xml | 13 ----- .../java/org/quartz/CronExpression.java | 0 3 files changed, 52 insertions(+), 14 deletions(-) rename src/{main => test}/java/org/quartz/CronExpression.java (100%) diff --git a/pom.xml b/pom.xml index d6144a386c3..8f073c45ad3 100644 --- a/pom.xml +++ b/pom.xml @@ -128,7 +128,7 @@ org.slf4j - slf4j-log4j12 + slf4j-nop 1.7.7 @@ -175,6 +175,57 @@ + + org.apache.maven.plugins + maven-shade-plugin + 2.3 + + + package + + shade + + + + + false + + false + true + + + org.quartz-scheduler:quartz + org.slf4j:slf4j-api + org.slf4j:slf4j-nop + javax.mail:mail + javax.activation:activation + + + + + org.quartz + org.elasticsearch.cronrunner + + + + + *:* + + META-INF/license/** + META-INF/* + META-INF/maven/** + LICENSE + NOTICE + /*.txt + build.properties + + + + + maven-assembly-plugin 2.4 diff --git a/src/main/assemblies/plugin.xml b/src/main/assemblies/plugin.xml index 144c90b7281..9e3ccb3348c 100644 --- a/src/main/assemblies/plugin.xml +++ b/src/main/assemblies/plugin.xml @@ -14,18 +14,5 @@ org.elasticsearch:elasticsearch - - / - true - true - - org.quartz-scheduler:quartz - org.quartz-scheduler:quartz-jobs - org.slf4j:slf4j-api - org.slf4j:slf4j-log4j12 - javax.mail:mail - javax.activation:activation - - diff --git a/src/main/java/org/quartz/CronExpression.java b/src/test/java/org/quartz/CronExpression.java similarity index 100% rename from src/main/java/org/quartz/CronExpression.java rename to src/test/java/org/quartz/CronExpression.java