killbill-memoizeit

Update oss parent to 0.4.15

10/11/2013 9:17:23 PM

stephane brossier

Commit: 66caa63

Tree: 57507c9

Parents: 0ff6e62

Changes

.idea/libraries/Maven__com_ning_billing_commons_killbill_clock_0_2_7.xml 13(+0 -13)

.idea/libraries/Maven__com_ning_billing_commons_killbill_clock_test_jar_tests_0_2_7.xml 13(+0 -13)

.idea/libraries/Maven__com_ning_billing_commons_killbill_concurrent_0_2_7.xml 13(+0 -13)

.idea/libraries/Maven__com_ning_billing_commons_killbill_embeddeddb_0_2_7.xml 13(+0 -13)

.idea/libraries/Maven__com_ning_billing_commons_killbill_jdbi_0_2_7.xml 13(+0 -13)

.idea/libraries/Maven__com_ning_billing_commons_killbill_locker_0_2_7.xml 13(+0 -13)

.idea/libraries/Maven__com_ning_billing_commons_killbill_queue_0_2_7.xml 13(+0 -13)

.idea/libraries/Maven__com_ning_billing_commons_killbill_queue_test_jar_tests_0_2_7.xml 13(+0 -13)

.idea/libraries/Maven__com_ning_billing_killbill_account_test_jar_tests_0_6_15_SNAPSHOT.xml 13(+0 -13)

.idea/libraries/Maven__com_ning_billing_killbill_beatrix_test_jar_tests_0_6_15_SNAPSHOT.xml 13(+0 -13)

.idea/libraries/Maven__com_ning_billing_killbill_catalog_test_jar_tests_0_6_15_SNAPSHOT.xml 13(+0 -13)

.idea/libraries/Maven__com_ning_billing_killbill_entitlement_test_jar_tests_0_6_15_SNAPSHOT.xml 13(+0 -13)

.idea/libraries/Maven__com_ning_billing_killbill_invoice_test_jar_tests_0_6_15_SNAPSHOT.xml 13(+0 -13)

.idea/libraries/Maven__com_ning_billing_killbill_junction_test_jar_tests_0_6_15_SNAPSHOT.xml 13(+0 -13)

.idea/libraries/Maven__com_ning_billing_killbill_payment_test_jar_tests_0_6_15_SNAPSHOT.xml 13(+0 -13)

.idea/libraries/Maven__com_ning_billing_killbill_util_test_jar_tests_0_6_15_SNAPSHOT.xml 13(+0 -13)

beatrix/pom.xml 6(+3 -3)

osgi-bundles/bundles/logger/pom.xml 2(+1 -1)

pom.xml 2(+1 -1)

server/pom.xml 4(+1 -3)

Details

beatrix/pom.xml 6(+3 -3)

diff --git a/beatrix/pom.xml b/beatrix/pom.xml
index a5260c9..87034f6 100644
--- a/beatrix/pom.xml
+++ b/beatrix/pom.xml
@@ -236,9 +236,9 @@
                         </goals>
                         <configuration>
                             <tasks>
-                                <copy file="${basedir}/../osgi-bundles/tests/beatrix/target/killbill-osgi-bundles-test-beatrix-${project.version}-jar-with-dependencies.jar" tofile="${basedir}/src/test/resources/killbill-osgi-bundles-test-beatrix-${project.version}-jar-with-dependencies.jar" />
-                                <copy file="${basedir}/../osgi-bundles/tests/payment/target/killbill-osgi-bundles-test-payment-${project.version}-jar-with-dependencies.jar" tofile="${basedir}/src/test/resources/killbill-osgi-bundles-test-payment-${project.version}-jar-with-dependencies.jar" />
-                                <copy file="${basedir}/../osgi-bundles/bundles/jruby/target/killbill-osgi-bundles-jruby-${project.version}.jar" tofile="${basedir}/src/test/resources/killbill-osgi-bundles-jruby-${project.version}.jar" />
+                                <copy file="${basedir}/../osgi-bundles/tests/beatrix/target/killbill-osgi-bundles-test-beatrix-${project.version}-jar-with-dependencies.jar" tofile="${basedir}/src/test/resources/killbill-osgi-bundles-test-beatrix-${project.version}-jar-with-dependencies.jar"></copy>
+                                <copy file="${basedir}/../osgi-bundles/tests/payment/target/killbill-osgi-bundles-test-payment-${project.version}-jar-with-dependencies.jar" tofile="${basedir}/src/test/resources/killbill-osgi-bundles-test-payment-${project.version}-jar-with-dependencies.jar"></copy>
+                                <copy file="${basedir}/../osgi-bundles/bundles/jruby/target/killbill-osgi-bundles-jruby-${project.version}.jar" tofile="${basedir}/src/test/resources/killbill-osgi-bundles-jruby-${project.version}.jar"></copy>
                             </tasks>
                         </configuration>
                     </execution>

osgi-bundles/bundles/logger/pom.xml 2(+1 -1)

diff --git a/osgi-bundles/bundles/logger/pom.xml b/osgi-bundles/bundles/logger/pom.xml
index 2a964ab..887cc8a 100644
--- a/osgi-bundles/bundles/logger/pom.xml
+++ b/osgi-bundles/bundles/logger/pom.xml
@@ -56,7 +56,7 @@
                 <configuration>
                     <instructions>
                         <Bundle-Activator>com.ning.billing.osgi.bundles.logger.Activator</Bundle-Activator>
-                        <Export-Package />
+                        <Export-Package></Export-Package>
                         <Private-Package>com.ning.billing.osgi.bundles.logger.*</Private-Package>
                         <!-- Optional resolution because exported by the Felix system bundle -->
                         <Import-Package>*;resolution:=optional</Import-Package>

pom.xml 2(+1 -1)

diff --git a/pom.xml b/pom.xml
index 30653f3..5fafeb6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>killbill-oss-parent</artifactId>
         <groupId>com.ning.billing</groupId>
-        <version>0.4.14</version>
+        <version>0.4.15</version>
     </parent>
     <artifactId>killbill</artifactId>
     <version>0.6.16-SNAPSHOT</version>

server/pom.xml 4(+1 -3)

diff --git a/server/pom.xml b/server/pom.xml
index 0657503..f79e6e6 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -462,9 +462,7 @@
 
                                         <!-- Kill Bill specific files -->
                                         <data>
-                                            <src>
-                                                ${project.build.directory}/${project.name}-${project.version}-jetty-console.war
-                                            </src>
+                                            <src>${project.build.directory}/${project.name}-${project.version}-jetty-console.war</src>
                                             <type>file</type>
                                             <dst>/usr/share/killbill/${project.name}-standalone.war</dst>
                                         </data>