killbill-uncached
Changes
account/pom.xml 9(+5 -4)
analytics/pom.xml 10(+5 -5)
api/pom.xml 4(+0 -4)
beatrix/pom.xml 5(+5 -0)
catalog/pom.xml 9(+5 -4)
entitlement/pom.xml 3(+2 -1)
invoice/pom.xml 9(+5 -4)
jaxrs/pom.xml 4(+2 -2)
junction/pom.xml 6(+5 -1)
payment/pom.xml 5(+5 -0)
pom.xml 21(+8 -13)
server/pom.xml 82(+51 -31)
util/pom.xml 5(+5 -0)
Details
account/pom.xml 9(+5 -4)
diff --git a/account/pom.xml b/account/pom.xml
index 80a593a..498e332 100644
--- a/account/pom.xml
+++ b/account/pom.xml
@@ -56,10 +56,6 @@
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- </dependency>
- <dependency>
<groupId>org.antlr</groupId>
<artifactId>stringtemplate</artifactId>
<scope>runtime</scope>
@@ -69,6 +65,11 @@
<artifactId>guava</artifactId>
</dependency>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-mxj</artifactId>
<scope>test</scope>
analytics/pom.xml 10(+5 -5)
diff --git a/analytics/pom.xml b/analytics/pom.xml
index 4e93bec..ee4897b 100644
--- a/analytics/pom.xml
+++ b/analytics/pom.xml
@@ -35,11 +35,6 @@
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>com.ning.billing</groupId>
<artifactId>killbill-api</artifactId>
</dependency>
@@ -49,6 +44,11 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
</dependency>
api/pom.xml 4(+0 -4)
diff --git a/api/pom.xml b/api/pom.xml
index ad7c13d..00e694d 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -43,10 +43,6 @@
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- </dependency>
- <dependency>
<groupId>org.skife.config</groupId>
<artifactId>config-magic</artifactId>
</dependency>
beatrix/pom.xml 5(+5 -0)
diff --git a/beatrix/pom.xml b/beatrix/pom.xml
index 13909a5..4d035b1 100644
--- a/beatrix/pom.xml
+++ b/beatrix/pom.xml
@@ -67,6 +67,11 @@
</dependency>
<!-- TEST SCOPE -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>com.jayway.awaitility</groupId>
<artifactId>awaitility</artifactId>
catalog/pom.xml 9(+5 -4)
diff --git a/catalog/pom.xml b/catalog/pom.xml
index 70e6947..a3660cf 100644
--- a/catalog/pom.xml
+++ b/catalog/pom.xml
@@ -53,13 +53,14 @@
<artifactId>joda-time</artifactId>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- </dependency>
- <dependency>
<groupId>org.skife.config</groupId>
<artifactId>config-magic</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
<plugins>
entitlement/pom.xml 3(+2 -1)
diff --git a/entitlement/pom.xml b/entitlement/pom.xml
index 5862541..5f1d461 100644
--- a/entitlement/pom.xml
+++ b/entitlement/pom.xml
@@ -60,7 +60,8 @@
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
+ <artifactId>slf4j-simple</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.antlr</groupId>
invoice/pom.xml 9(+5 -4)
diff --git a/invoice/pom.xml b/invoice/pom.xml
index fe46a1d..8c48cc8 100644
--- a/invoice/pom.xml
+++ b/invoice/pom.xml
@@ -60,15 +60,16 @@
<artifactId>joda-time</artifactId>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- </dependency>
- <dependency>
<groupId>org.skife.config</groupId>
<artifactId>config-magic</artifactId>
</dependency>
<!-- TEST SCOPE -->
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>com.ning.billing</groupId>
<artifactId>killbill-util</artifactId>
<type>test-jar</type>
jaxrs/pom.xml 4(+2 -2)
diff --git a/jaxrs/pom.xml b/jaxrs/pom.xml
index d6189f8..fa2b247 100644
--- a/jaxrs/pom.xml
+++ b/jaxrs/pom.xml
@@ -28,7 +28,6 @@
<dependency>
<groupId>javax.ws.rs</groupId>
<artifactId>jsr311-api</artifactId>
- <!-- WHY DO WE NEED VESRION HERE ?? -->
<version>1.1.1</version>
</dependency>
<dependency>
@@ -64,7 +63,8 @@
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
+ <artifactId>slf4j-simple</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
junction/pom.xml 6(+5 -1)
diff --git a/junction/pom.xml b/junction/pom.xml
index abd5b42..a249b80 100644
--- a/junction/pom.xml
+++ b/junction/pom.xml
@@ -57,6 +57,11 @@
</dependency>
<!-- TEST SCOPE -->
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>com.ning.billing</groupId>
<artifactId>killbill-util</artifactId>
<type>test-jar</type>
@@ -99,7 +104,6 @@
<artifactId>guava</artifactId>
<scope>test</scope>
</dependency>
-
</dependencies>
<build>
<plugins>
payment/pom.xml 5(+5 -0)
diff --git a/payment/pom.xml b/payment/pom.xml
index e8a9390..eb013d5 100644
--- a/payment/pom.xml
+++ b/payment/pom.xml
@@ -85,6 +85,11 @@
<!-- TEST SCOPE -->
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
<scope>test</scope>
pom.xml 21(+8 -13)
diff --git a/pom.xml b/pom.xml
index 8f0c4c4..4daf876 100644
--- a/pom.xml
+++ b/pom.xml
@@ -35,6 +35,7 @@
</scm>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <slf4j.version>1.6.5</slf4j.version>
</properties>
<modules>
<module>account</module>
@@ -290,12 +291,6 @@
<version>2.0</version>
</dependency>
<dependency>
- <!-- For dependencies resolution -->
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.16</version>
- </dependency>
- <dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>5.1.17</version>
@@ -320,22 +315,22 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.6.4</version>
+ <version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
- <version>1.6.4</version>
+ <artifactId>slf4j-simple</artifactId>
+ <version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>jul-to-slf4j</artifactId>
- <version>1.6.4</version>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>1.6.4</version>
+ <artifactId>jul-to-slf4j</artifactId>
+ <version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>org.testng</groupId>
server/pom.xml 82(+51 -31)
diff --git a/server/pom.xml b/server/pom.xml
index 2208eec..6d5007c 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -8,7 +8,8 @@
OR CONDITIONS OF ANY KIND, either express or implied. See the ~ License for
the specific language governing permissions and limitations ~ under the License. -->
-<project xmlns="http://maven.apache.org/POM/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">
+<project xmlns="http://maven.apache.org/POM/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">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.ning.billing</groupId>
@@ -27,36 +28,35 @@
<jetty.version>8.1.2.v20120308</jetty.version>
<logback.version>1.0.1</logback.version>
<metrics.version>2.1.2</metrics.version>
- <slf4j.version>1.6.4</slf4j.version>
<skeleton.version>0.1.2</skeleton.version>
<async-http-client.version>1.6.5</async-http-client.version>
</properties>
<dependencies>
- <!-- Jetty provided scope -->
+ <!-- Jetty test scope -->
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-http</artifactId>
<version>${jetty.version}</version>
- <scope>provided</scope>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-io</artifactId>
<version>${jetty.version}</version>
- <scope>provided</scope>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-util</artifactId>
<version>${jetty.version}</version>
- <scope>provided</scope>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
<version>${jetty.version}</version>
- <scope>provided</scope>
+ <scope>test</scope>
</dependency>
<dependency>
@@ -113,6 +113,7 @@
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>3.0.1</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>com.ning.jetty</groupId>
@@ -125,16 +126,8 @@
<version>${skeleton.version}</version>
</dependency>
<dependency>
- <groupId>com.ning.jetty</groupId>
- <artifactId>ning-service-skeleton-log4j</artifactId>
- <version>${skeleton.version}</version>
- <classifier>selfcontained</classifier>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
@@ -146,22 +139,24 @@
<groupId>ch.qos.logback</groupId>
<artifactId>logback-core</artifactId>
<version>${logback.version}</version>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>${logback.version}</version>
+ <scope>runtime</scope>
</dependency>
<!-- FROM MASTER POM / LIBRARY -->
- <dependency>
- <groupId>com.ning.billing</groupId>
- <artifactId>killbill-api</artifactId>
- </dependency>
- <dependency>
- <groupId>com.ning.billing</groupId>
- <artifactId>killbill-account</artifactId>
- </dependency>
+ <dependency>
+ <groupId>com.ning.billing</groupId>
+ <artifactId>killbill-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.ning.billing</groupId>
+ <artifactId>killbill-account</artifactId>
+ </dependency>
<dependency>
<groupId>com.ning.billing</groupId>
<artifactId>killbill-jaxrs</artifactId>
@@ -194,10 +189,10 @@
<groupId>com.ning.billing</groupId>
<artifactId>killbill-analytics</artifactId>
</dependency>
- <dependency>
- <groupId>com.ning.billing</groupId>
- <artifactId>killbill-junction</artifactId>
- </dependency>
+ <dependency>
+ <groupId>com.ning.billing</groupId>
+ <artifactId>killbill-junction</artifactId>
+ </dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
@@ -236,10 +231,10 @@
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
</dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ </dependency>
<dependency>
<groupId>com.ning</groupId>
<artifactId>async-http-client</artifactId>
@@ -288,6 +283,31 @@
</resources>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <version>1.4</version>
+ <executions>
+ <execution>
+ <id>assemble-killbill</id>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ <phase>package</phase>
+ <configuration>
+ <createSourcesJar>true</createSourcesJar>
+ <shadedArtifactAttached>true</shadedArtifactAttached>
+ <shadedClassifierName>jar-with-dependencies</shadedClassifierName>
+ <filters>
+ <filter>
+ <artifact>${project.groupId}:${project.artifactId}</artifact>
+ </filter>
+ </filters>
+ <minimizeJar>true</minimizeJar>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>com.ning.maven.plugins</groupId>
<artifactId>maven-dependency-versions-check-plugin</artifactId>
<version>2.0.2</version>
util/pom.xml 5(+5 -0)
diff --git a/util/pom.xml b/util/pom.xml
index d2cc0d5..7598097 100644
--- a/util/pom.xml
+++ b/util/pom.xml
@@ -33,6 +33,11 @@
<artifactId>jdbi</artifactId>
</dependency>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<scope>test</scope>
diff --git a/util/src/test/java/com/ning/billing/dbi/DBIProvider.java b/util/src/test/java/com/ning/billing/dbi/DBIProvider.java
index 1f22d5d..90015ce 100644
--- a/util/src/test/java/com/ning/billing/dbi/DBIProvider.java
+++ b/util/src/test/java/com/ning/billing/dbi/DBIProvider.java
@@ -22,11 +22,7 @@ import com.jolbox.bonecp.BoneCPConfig;
import com.jolbox.bonecp.BoneCPDataSource;
import org.skife.jdbi.v2.DBI;
import org.skife.jdbi.v2.IDBI;
-import org.skife.jdbi.v2.TimingCollector;
-import org.skife.jdbi.v2.logging.Log4JLog;
-import org.skife.jdbi.v2.tweak.SQLLog;
-import java.util.concurrent.TimeUnit;
public class DBIProvider implements Provider<IDBI>
{
@@ -55,8 +51,8 @@ public class DBIProvider implements Provider<IDBI>
final BoneCPDataSource ds = new BoneCPDataSource(dbConfig);
final DBI dbi = new DBI(ds);
- final SQLLog log = new Log4JLog();
- dbi.setSQLLog(log);
+ //final SQLLog log = new Log4JLog();
+ //dbi.setSQLLog(log);
return dbi;
}