Apache/activemq-artemis
1
0
Fork 0
mirror of https://github.com/apache/activemq-artemis.git synced 2025-03-08 18:29:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

update osgi bundle and make postgres dependency optional

Browse Source
This commit is contained in:
Dejan Bosanac 2016-06-03 18:59:41 +02:00 committed by Clebert Suconic
parent a3efafd975
commit eaeba6f809
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
artemis-server-osgi/pom.xml
View File

@ -116,6 +116,10 @@
<configuration> <configuration>
<instructions> <instructions>
<Embed-Dependency>*;scope=compile|runtime</Embed-Dependency> <Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
<Import-Package>
org.postgresql*;resolution:=optional,
*
</Import-Package>
<_exportcontents>*</_exportcontents> <_exportcontents>*</_exportcontents>
</instructions> </instructions>
</configuration> </configuration>

4
tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/karaf/ArtemisFeatureTest.java
View File

@ -16,13 +16,13 @@
*/ */
package org.apache.activemq.artemis.tests.integration.karaf; package org.apache.activemq.artemis.tests.integration.karaf;
import org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
import org.apache.karaf.jaas.boot.principal.RolePrincipal; import org.apache.karaf.jaas.boot.principal.RolePrincipal;
import org.apache.karaf.jaas.boot.principal.UserPrincipal; import org.apache.karaf.jaas.boot.principal.UserPrincipal;
import org.apache.karaf.shell.api.console.Session; import org.apache.karaf.shell.api.console.Session;
import org.apache.karaf.shell.api.console.SessionFactory; import org.apache.karaf.shell.api.console.SessionFactory;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;
import org.apache.qpid.jms.JmsConnectionFactory; import org.apache.qpid.jms.JmsConnectionFactory;
import org.junit.Assert;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Configuration; import org.ops4j.pax.exam.Configuration;
@ -66,7 +66,7 @@ import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.karafDist
import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.logLevel; import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.logLevel;
@RunWith(PaxExam.class) @RunWith(PaxExam.class)
public class ArtemisFeatureTest extends Assert { public class ArtemisFeatureTest extends ActiveMQTestBase {
private static Logger LOG = Logger.getLogger(ArtemisFeatureTest.class.getName()); private static Logger LOG = Logger.getLogger(ArtemisFeatureTest.class.getName());