killbill-uncached

Merge branch 'master' of github.com:killbill/killbill

3/27/2013 11:07:06 PM

stephane brossier

Commit: 7a3a1f7

Tree: 1240348

Parents: 864d5a5
83c0d46

Changes

.gitignore 1(+1 -0)

beatrix/pom.xml 2(+1 -1)

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

Details

.gitignore 1(+1 -0)

diff --git a/.gitignore b/.gitignore
index 041eea5..548fba2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,4 @@ catalog/src/test/resources/CatalogSchema.xsd
 */test-output/
 */src/test/resources/*.jar
 server/load
+dependency-reduced-pom.xml

beatrix/pom.xml 2(+1 -1)

diff --git a/beatrix/pom.xml b/beatrix/pom.xml
index 58a2506..feb8bdc 100644
--- a/beatrix/pom.xml
+++ b/beatrix/pom.xml
@@ -203,7 +203,7 @@
                             <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-with-dependencies.jar" tofile="${basedir}/src/test/resources/killbill-osgi-bundles-jruby-${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" />
                             </tasks>
                         </configuration>
                         <goals>

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

diff --git a/osgi-bundles/bundles/jruby/pom.xml b/osgi-bundles/bundles/jruby/pom.xml
index 0ecfda5..eb32fdf 100644
--- a/osgi-bundles/bundles/jruby/pom.xml
+++ b/osgi-bundles/bundles/jruby/pom.xml
@@ -128,7 +128,7 @@
                         <phase>package</phase>
                         <configuration>
                             <createSourcesJar>true</createSourcesJar>
-                            <shadedArtifactAttached>true</shadedArtifactAttached>
+                            <shadedArtifactAttached>false</shadedArtifactAttached>
                             <shadedClassifierName>jar-with-dependencies</shadedClassifierName>
                             <filters>
                                 <filter>