killbill-memoizeit
Changes
osgi/pom.xml 42(+32 -10)
osgi-bundles/bundles/jruby/pom.xml 107(+53 -54)
osgi-bundles/bundles/jruby/src/main/java/org/killbill/billing/osgi/bundles/jruby/JRubyCurrencyPlugin.java 4(+2 -2)
osgi-bundles/bundles/jruby/src/main/java/org/killbill/billing/osgi/bundles/jruby/JRubyPaymentPlugin.java 4(+2 -2)
osgi-bundles/bundles/logger/pom.xml 8(+6 -2)
osgi-bundles/defaultbundles/pom.xml 22(+0 -22)
osgi-bundles/libs/killbill/pom.xml 6(+0 -6)
osgi-bundles/libs/slf4j-osgi/pom.xml 5(+0 -5)
osgi-bundles/tests/beatrix/pom.xml 16(+8 -8)
osgi-bundles/tests/payment/pom.xml 20(+10 -10)
pom.xml 2(+1 -1)
server/pom.xml 25(+24 -1)
Details
osgi/pom.xml 42(+32 -10)
diff --git a/osgi/pom.xml b/osgi/pom.xml
index 73ca219..af183c5 100644
--- a/osgi/pom.xml
+++ b/osgi/pom.xml
@@ -27,6 +27,10 @@
<name>Killbill billing platform: OSGI framework</name>
<dependencies>
<dependency>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>jsr305</artifactId>
+ </dependency>
+ <dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
@@ -41,20 +45,42 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>com.jolbox</groupId>
+ <artifactId>bonecp</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.mchange</groupId>
+ <artifactId>c3p0</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.inject</groupId>
+ <artifactId>javax.inject</artifactId>
+ </dependency>
+ <dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
</dependency>
<dependency>
- <groupId>joda-time</groupId>
- <artifactId>joda-time</artifactId>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.framework</artifactId>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.framework</artifactId>
+ <artifactId>org.osgi.compendium</artifactId>
+ <exclusions>
+ <exclusion>
+ <artifactId>javax.servlet</artifactId>
+ <groupId>org.apache.felix</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <artifactId>org.osgi.foundation</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jdbi</groupId>
+ <artifactId>jdbi</artifactId>
</dependency>
<dependency>
<groupId>org.kill-bill.billing</groupId>
@@ -96,10 +122,6 @@
<dependency>
<groupId>org.kill-bill.commons</groupId>
<artifactId>killbill-clock</artifactId>
- </dependency>
- <dependency>
- <groupId>org.kill-bill.commons</groupId>
- <artifactId>killbill-clock</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -114,8 +136,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
+ <groupId>org.kill-bill.commons</groupId>
+ <artifactId>killbill-queue</artifactId>
</dependency>
<dependency>
<groupId>org.skife.config</groupId>
diff --git a/osgi/src/main/java/org/killbill/billing/osgi/glue/OSGIDataSourceConfig.java b/osgi/src/main/java/org/killbill/billing/osgi/glue/OSGIDataSourceConfig.java
index 1bbfc21..29148d1 100644
--- a/osgi/src/main/java/org/killbill/billing/osgi/glue/OSGIDataSourceConfig.java
+++ b/osgi/src/main/java/org/killbill/billing/osgi/glue/OSGIDataSourceConfig.java
@@ -27,17 +27,17 @@ public interface OSGIDataSourceConfig {
@Description("The jdbc url for the database")
@Config(DATA_SOURCE_PROP_PREFIX + "jdbc.url")
- @Default("jdbc:mysql://127.0.0.1:3306/killbill")
+ @Default("jdbc:h2:file:killbill;MODE=MYSQL;DB_CLOSE_DELAY=-1;MVCC=true;DB_CLOSE_ON_EXIT=FALSE")
String getJdbcUrl();
@Description("The jdbc user name for the database")
@Config(DATA_SOURCE_PROP_PREFIX + "jdbc.user")
- @Default("root")
+ @Default("killbill")
String getUsername();
@Description("The jdbc password for the database")
@Config(DATA_SOURCE_PROP_PREFIX + "jdbc.password")
- @Default("root")
+ @Default("killbill")
String getPassword();
@Description("The minimum allowed number of idle connections to the database")
@@ -47,7 +47,7 @@ public interface OSGIDataSourceConfig {
@Description("The maximum allowed number of active connections to the database")
@Config(DATA_SOURCE_PROP_PREFIX + "jdbc.maxActive")
- @Default("10")
+ @Default("30")
int getMaxActive();
@Description("How long to wait before a connection attempt to the database is considered timed out")
diff --git a/osgi/src/main/java/org/killbill/billing/osgi/KillbillEventObservable.java b/osgi/src/main/java/org/killbill/billing/osgi/KillbillEventObservable.java
index 777527f..27da364 100644
--- a/osgi/src/main/java/org/killbill/billing/osgi/KillbillEventObservable.java
+++ b/osgi/src/main/java/org/killbill/billing/osgi/KillbillEventObservable.java
@@ -32,7 +32,6 @@ import com.google.common.eventbus.Subscribe;
public class KillbillEventObservable extends Observable {
-
private Logger logger = LoggerFactory.getLogger(KillbillEventObservable.class);
private final PersistentBus externalBus;
osgi-bundles/bundles/jruby/pom.xml 107(+53 -54)
diff --git a/osgi-bundles/bundles/jruby/pom.xml b/osgi-bundles/bundles/jruby/pom.xml
index 2a19d82..6497030 100644
--- a/osgi-bundles/bundles/jruby/pom.xml
+++ b/osgi-bundles/bundles/jruby/pom.xml
@@ -14,80 +14,79 @@
~ 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">
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.kill-bill.billing</groupId>
<artifactId>killbill-osgi-bundles</artifactId>
+ <groupId>org.kill-bill.billing</groupId>
<version>0.9.3-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>killbill-osgi-bundles-jruby</artifactId>
- <name>Killbill billing platform: OSGI JRuby bundle</name>
<packaging>bundle</packaging>
+ <name>Killbill billing platform: OSGI JRuby bundle</name>
<dependencies>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
+ <scope>compile</scope>
</dependency>
<dependency>
- <groupId>org.kill-bill.billing</groupId>
- <artifactId>killbill-api</artifactId>
-<!--
- <scope>provided</scope>
- -->
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
</dependency>
<dependency>
- <groupId>org.kill-bill.billing.plugin</groupId>
- <artifactId>killbill-plugin-api-notification</artifactId>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
</dependency>
<dependency>
- <groupId>org.kill-bill.billing.plugin</groupId>
- <artifactId>killbill-plugin-api-payment</artifactId>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.core</artifactId>
</dependency>
<dependency>
- <groupId>org.kill-bill.billing.plugin</groupId>
- <artifactId>killbill-plugin-api-currency</artifactId>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.foundation</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jruby</groupId>
+ <artifactId>jruby-complete</artifactId>
</dependency>
<dependency>
<groupId>org.kill-bill.billing</groupId>
- <artifactId>killbill-osgi-bundles-lib-killbill</artifactId>
+ <artifactId>killbill-api</artifactId>
</dependency>
<dependency>
- <groupId>org.kill-bill.commons</groupId>
- <artifactId>killbill-concurrent</artifactId>
+ <groupId>org.kill-bill.billing</groupId>
+ <artifactId>killbill-osgi-bundles-lib-killbill</artifactId>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
+ <groupId>org.kill-bill.billing.plugin</groupId>
+ <artifactId>killbill-plugin-api-currency</artifactId>
</dependency>
<dependency>
- <groupId>org.jruby</groupId>
- <artifactId>jruby-complete</artifactId>
- <version>1.7.10</version>
+ <groupId>org.kill-bill.billing.plugin</groupId>
+ <artifactId>killbill-plugin-api-notification</artifactId>
</dependency>
<dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <scope>compile</scope>
+ <groupId>org.kill-bill.billing.plugin</groupId>
+ <artifactId>killbill-plugin-api-payment</artifactId>
</dependency>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <groupId>org.kill-bill.commons</groupId>
+ <artifactId>killbill-concurrent</artifactId>
</dependency>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-all</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>osgi-over-slf4j</artifactId>
</dependency>
<dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
- <scope>test</scope>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
<groupId>org.testng</groupId>
@@ -98,34 +97,21 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
<executions>
<execution>
+ <phase>process-classes</phase>
<goals>
- <goal>jar</goal>
- <goal>test-jar</goal>
+ <goal>manifest</goal>
</goals>
- <configuration>
- <archive>
- <!-- use the manifest file created by the bundle plugin -->
- <!--<useDefaultManifestFile>true</useDefaultManifestFile>-->
- <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
- <!-- bundle plugin already generated the maven descriptor -->
- <addMavenDescriptor>false</addMavenDescriptor>
- </archive>
- </configuration>
</execution>
</executions>
- </plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
<configuration>
<instructions>
<Bundle-Activator>org.killbill.billing.osgi.bundles.jruby.JRubyActivator</Bundle-Activator>
- <Export-Package />
+ <Export-Package></Export-Package>
<Private-Package>org.killbill.billing.osgi.bundles.jruby.*</Private-Package>
<!-- Optional resolution because exported by the Felix system bundle -->
<Import-Package>*;resolution:=optional,
@@ -187,12 +173,25 @@
javax.security.auth.x500.*;resolution:=optional</Import-Package>
</instructions>
</configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
<executions>
<execution>
- <phase>process-classes</phase>
<goals>
- <goal>manifest</goal>
+ <goal>jar</goal>
+ <goal>test-jar</goal>
</goals>
+ <configuration>
+ <archive>
+ <!-- use the manifest file created by the bundle plugin -->
+ <!--<useDefaultManifestFile>true</useDefaultManifestFile>-->
+ <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+ <!-- bundle plugin already generated the maven descriptor -->
+ <addMavenDescriptor>false</addMavenDescriptor>
+ </archive>
+ </configuration>
</execution>
</executions>
</plugin>
@@ -202,10 +201,10 @@
<executions>
<execution>
<id>assemble-killbill-osgi-bundles-jruby</id>
+ <phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
- <phase>package</phase>
<configuration>
<createSourcesJar>true</createSourcesJar>
<shadedArtifactAttached>false</shadedArtifactAttached>
diff --git a/osgi-bundles/bundles/jruby/src/main/java/org/killbill/billing/osgi/bundles/jruby/JRubyCurrencyPlugin.java b/osgi-bundles/bundles/jruby/src/main/java/org/killbill/billing/osgi/bundles/jruby/JRubyCurrencyPlugin.java
index 4c22c32..c6d5291 100644
--- a/osgi-bundles/bundles/jruby/src/main/java/org/killbill/billing/osgi/bundles/jruby/JRubyCurrencyPlugin.java
+++ b/osgi-bundles/bundles/jruby/src/main/java/org/killbill/billing/osgi/bundles/jruby/JRubyCurrencyPlugin.java
@@ -36,7 +36,7 @@ import org.killbill.billing.payment.plugin.api.PaymentPluginApiException;
public class JRubyCurrencyPlugin extends JRubyPlugin implements CurrencyPluginApi {
- private volatile ServiceRegistration<CurrencyPluginApi> currencyPluginRegistration;
+ private volatile ServiceRegistration currencyPluginRegistration;
public JRubyCurrencyPlugin(final PluginRubyConfig config, final BundleContext bundleContext, final LogService logger) {
super(config, bundleContext, logger);
@@ -50,7 +50,7 @@ public class JRubyCurrencyPlugin extends JRubyPlugin implements CurrencyPluginAp
final Dictionary<String, Object> props = new Hashtable<String, Object>();
props.put("name", pluginMainClass);
props.put(OSGIPluginProperties.PLUGIN_NAME_PROP, pluginGemName);
- currencyPluginRegistration = (ServiceRegistration<CurrencyPluginApi>) context.registerService(CurrencyPluginApi.class.getName(), this, props);
+ currencyPluginRegistration = context.registerService(CurrencyPluginApi.class.getName(), this, props);
}
@Override
diff --git a/osgi-bundles/bundles/jruby/src/main/java/org/killbill/billing/osgi/bundles/jruby/JRubyPaymentPlugin.java b/osgi-bundles/bundles/jruby/src/main/java/org/killbill/billing/osgi/bundles/jruby/JRubyPaymentPlugin.java
index e6bf8ca..6a88c2f 100644
--- a/osgi-bundles/bundles/jruby/src/main/java/org/killbill/billing/osgi/bundles/jruby/JRubyPaymentPlugin.java
+++ b/osgi-bundles/bundles/jruby/src/main/java/org/killbill/billing/osgi/bundles/jruby/JRubyPaymentPlugin.java
@@ -42,7 +42,7 @@ import org.killbill.billing.util.entity.Pagination;
public class JRubyPaymentPlugin extends JRubyPlugin implements PaymentPluginApi {
- private volatile ServiceRegistration<PaymentPluginApi> paymentInfoPluginRegistration;
+ private volatile ServiceRegistration paymentInfoPluginRegistration;
public JRubyPaymentPlugin(final PluginRubyConfig config, final BundleContext bundleContext, final LogService logger) {
super(config, bundleContext, logger);
@@ -56,7 +56,7 @@ public class JRubyPaymentPlugin extends JRubyPlugin implements PaymentPluginApi
final Dictionary<String, Object> props = new Hashtable<String, Object>();
props.put("name", pluginMainClass);
props.put(OSGIPluginProperties.PLUGIN_NAME_PROP, pluginGemName);
- paymentInfoPluginRegistration = (ServiceRegistration<PaymentPluginApi>) context.registerService(PaymentPluginApi.class.getName(), this, props);
+ paymentInfoPluginRegistration = context.registerService(PaymentPluginApi.class.getName(), this, props);
}
@Override
osgi-bundles/bundles/logger/pom.xml 8(+6 -2)
diff --git a/osgi-bundles/bundles/logger/pom.xml b/osgi-bundles/bundles/logger/pom.xml
index 344ffef..085aefe 100644
--- a/osgi-bundles/bundles/logger/pom.xml
+++ b/osgi-bundles/bundles/logger/pom.xml
@@ -27,14 +27,18 @@
<name>Killbill billing platform: OSGI logger bundle</name>
<dependencies>
<dependency>
- <groupId>org.osgi</groupId>
+ <groupId>org.apache.felix</groupId>
<artifactId>org.osgi.compendium</artifactId>
</dependency>
<dependency>
- <groupId>org.osgi</groupId>
+ <groupId>org.apache.felix</groupId>
<artifactId>org.osgi.core</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.foundation</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
osgi-bundles/defaultbundles/pom.xml 22(+0 -22)
diff --git a/osgi-bundles/defaultbundles/pom.xml b/osgi-bundles/defaultbundles/pom.xml
index 35f3577..1d12bd4 100644
--- a/osgi-bundles/defaultbundles/pom.xml
+++ b/osgi-bundles/defaultbundles/pom.xml
@@ -29,92 +29,70 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.bundlerepository</artifactId>
- <version>1.6.6</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.configadmin</artifactId>
- <version>1.6.0</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.dependencymanager</artifactId>
- <version>3.1.0</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.dependencymanager.annotation</artifactId>
- <version>3.1.0</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.dependencymanager.compat</artifactId>
- <version>3.0.1</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.dependencymanager.runtime</artifactId>
- <version>3.1.0</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.dependencymanager.shell</artifactId>
- <version>3.0.1</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.deploymentadmin</artifactId>
- <version>0.9.0</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.gogo.runtime</artifactId>
- <version>0.10.0</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.log</artifactId>
- <version>1.0.1</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.metatype</artifactId>
- <version>1.0.6</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.scr</artifactId>
- <version>1.6.2</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.scr.annotations</artifactId>
- <version>1.7.0</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.scr.ds-annotations</artifactId>
- <version>1.2.0</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.shell</artifactId>
- <version>1.4.3</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.shell.remote</artifactId>
- <version>1.1.2</version>
</dependency>
- <!--
- TODO PIERRE Update to 4.0.1 or above when released.
- 4.0.0 is missing various dependencies, see https://issues.apache.org/jira/browse/FELIX-3778
- See also https://issues.apache.org/jira/browse/FELIX-3666
- -->
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.webconsole</artifactId>
- <version>3.1.8</version>
</dependency>
<dependency>
<groupId>org.kill-bill.billing</groupId>
osgi-bundles/libs/killbill/pom.xml 6(+0 -6)
diff --git a/osgi-bundles/libs/killbill/pom.xml b/osgi-bundles/libs/killbill/pom.xml
index 83726a3..4236c28 100644
--- a/osgi-bundles/libs/killbill/pom.xml
+++ b/osgi-bundles/libs/killbill/pom.xml
@@ -29,7 +29,6 @@
<dependency>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
- <version>1.3.9</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -54,11 +53,6 @@
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
</dependency>
osgi-bundles/libs/slf4j-osgi/pom.xml 5(+0 -5)
diff --git a/osgi-bundles/libs/slf4j-osgi/pom.xml b/osgi-bundles/libs/slf4j-osgi/pom.xml
index 08d3230..9d048d7 100644
--- a/osgi-bundles/libs/slf4j-osgi/pom.xml
+++ b/osgi-bundles/libs/slf4j-osgi/pom.xml
@@ -31,11 +31,6 @@
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
</dependency>
osgi-bundles/tests/beatrix/pom.xml 16(+8 -8)
diff --git a/osgi-bundles/tests/beatrix/pom.xml b/osgi-bundles/tests/beatrix/pom.xml
index da84393..3bdc976 100644
--- a/osgi-bundles/tests/beatrix/pom.xml
+++ b/osgi-bundles/tests/beatrix/pom.xml
@@ -27,6 +27,14 @@
<name>Killbill billing platform: OSGI Beatrix Test bundle</name>
<dependencies>
<dependency>
+ <groupId>joda-time</groupId>
+ <artifactId>joda-time</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.jdbi</groupId>
<artifactId>jdbi</artifactId>
</dependency>
@@ -52,14 +60,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- </dependency>
- <dependency>
<groupId>org.slf4j</groupId>
<artifactId>osgi-over-slf4j</artifactId>
</dependency>
osgi-bundles/tests/payment/pom.xml 20(+10 -10)
diff --git a/osgi-bundles/tests/payment/pom.xml b/osgi-bundles/tests/payment/pom.xml
index 4b158f0..90f6366 100644
--- a/osgi-bundles/tests/payment/pom.xml
+++ b/osgi-bundles/tests/payment/pom.xml
@@ -27,8 +27,12 @@
<name>Killbill billing platform: OSGI Beatrix Test payment</name>
<dependencies>
<dependency>
- <groupId>org.jdbi</groupId>
- <artifactId>jdbi</artifactId>
+ <groupId>joda-time</groupId>
+ <artifactId>joda-time</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.core</artifactId>
</dependency>
<dependency>
<groupId>org.kill-bill.billing</groupId>
@@ -46,19 +50,15 @@
<scope>compile</scope>
</dependency>
<dependency>
+ <groupId>org.kill-bill.billing.plugin</groupId>
+ <artifactId>killbill-plugin-api-payment</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- </dependency>
- <dependency>
<groupId>org.slf4j</groupId>
<artifactId>osgi-over-slf4j</artifactId>
</dependency>
pom.xml 2(+1 -1)
diff --git a/pom.xml b/pom.xml
index eb74d3e..0afffd7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,7 +19,7 @@
<parent>
<artifactId>killbill-oss-parent</artifactId>
<groupId>org.kill-bill.billing</groupId>
- <version>0.5.30-usage</version>
+ <version>0.5.30-SNAPSHOT</version>
</parent>
<artifactId>killbill</artifactId>
<version>0.9.3-SNAPSHOT</version>
server/pom.xml 25(+24 -1)
diff --git a/server/pom.xml b/server/pom.xml
index 74c6e91..935610c 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -128,6 +128,25 @@
<scope>runtime</scope>
</dependency>
<dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.framework</artifactId>
+ <version>4.4.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ <exclusions>
+ <exclusion>
+ <artifactId>javax.servlet</artifactId>
+ <groupId>org.apache.felix</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-web</artifactId>
</dependency>
@@ -367,7 +386,11 @@
<shadedClassifierName>jar-with-dependencies</shadedClassifierName>
<filters>
<filter>
- <artifact>${project.groupId}:${project.artifactId}</artifact>
+ <artifact>*</artifact>
+ <excludes>
+ <exclude>META-INF/LICENSE</exclude>
+ <!-- conflicts on OS X with license/ -->
+ </excludes>
</filter>
</filters>
</configuration>