Apache/activemq-artemis
1
0
Fork 0
mirror of https://github.com/apache/activemq-artemis.git synced 2025-02-22 18:30:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

NO-JIRA: use various versions from parent to be consistent, remove some duplicate yet incomplete plugin config

Browse Source
This commit is contained in:
Robbie Gemmell 2022-01-28 11:34:20 +00:00
parent b9243cc999
commit 4a6a74e1c3
10 changed files with 40 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
tests/activemq5-unit-tests/pom.xml
View File

@ -29,7 +29,6 @@
<properties>
<activemq.basedir>${project.basedir}/../..</activemq.basedir>
<activemq5.project.version>5.14.0</activemq5.project.version>
<jmdns-version>3.4.1</jmdns-version>
<ftpserver-version>1.0.6</ftpserver-version>
<jmock-version>2.5.1</jmock-version>
@ -39,7 +38,6 @@
<xbean-version>3.18</xbean-version>
<hamcrest-version>1.3</hamcrest-version>
<jasypt-version>1.9.3</jasypt-version>
<directory-version>2.0.0-M6</directory-version>
<activeio-core-version>3.1.4</activeio-core-version>
</properties>
@ -59,7 +57,6 @@
<type>test-jar</type>
</dependency>
<!-- I imported this to get a mock of a class -->
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
@ -69,31 +66,31 @@
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-client</artifactId>
<version>${activemq5.project.version}</version>
<version>${activemq5-version}</version>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-jaas</artifactId>
<version>${activemq5.project.version}</version>
<version>${activemq5-version}</version>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-jdbc-store</artifactId>
<version>${activemq5.project.version}</version>
<version>${activemq5-version}</version>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-kahadb-store</artifactId>
<version>${activemq5.project.version}</version>
<version>${activemq5-version}</version>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-leveldb-store</artifactId>
<version>${activemq5.project.version}</version>
<version>${activemq5-version}</version>
<exclusions>
<exclusion>
<groupId>commons-beanutils</groupId>
@ -105,31 +102,31 @@
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-pool</artifactId>
<version>${activemq5.project.version}</version>
<version>${activemq5-version}</version>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-spring</artifactId>
<version>${activemq5.project.version}</version>
<version>${activemq5-version}</version>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-partition</artifactId>
<version>${activemq5.project.version}</version>
<version>${activemq5-version}</version>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-stomp</artifactId>
<version>${activemq5.project.version}</version>
<version>${activemq5-version}</version>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-console</artifactId>
<version>${activemq5.project.version}</version>
<version>${activemq5-version}</version>
</dependency>
<dependency>
@ -141,7 +138,6 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.11</version>
<scope>compile</scope>
</dependency>
@ -243,19 +239,6 @@
<artifactId>apacheds-core-integ</artifactId>
<version>${directory-version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>bouncycastle</groupId>
<artifactId>bcprov-jdk15</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15</artifactId>
<version>1.46</version>
<scope>test</scope>
</dependency>
<dependency>
@ -380,38 +363,9 @@
<build>
<plugins>
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
<version>0.12</version>
<configuration>
<reportFile>${activemq.basedir}/ratReport.txt</reportFile>
<skip>${skipLicenseCheck}</skip>
<excludes>
<exclude>**/*.data</exclude>
<exclude>**/*.bin</exclude>
<exclude>**/*.log</exclude>
<exclude>**/*.redo</exclude>
<exclude>**/src/test/resources/keystore</exclude>
<exclude>**/META-INF/services/*</exclude>
<exclude>**/*/*.txt</exclude>
<exclude>**/*.md</exclude>
</excludes>
</configuration>
<executions>
<execution>
<phase>compile</phase>
<goals>
<goal>check</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>2.17</version>
<configuration>
<skip>true</skip>
</configuration>
@ -446,11 +400,7 @@
<systemPropertyVariables>
<org.apache.activemq.AutoFailTestSupport.disableSystemExit>true</org.apache.activemq.AutoFailTestSupport.disableSystemExit>
</systemPropertyVariables>
<!--
<additionalClasspathElements>
<additionalClasspathElement>src/main/resources/stomp</additionalClasspathElement>
</additionalClasspathElements>
-->
<argLine>${activemq-surefire-argline} -Dorg.apache.activemq.SERIALIZABLE_PACKAGES="java.lang,javax.security,java.util,org.apache.activemq,org.fusesource.hawtbuf"</argLine>
<includes>
<!-- included packages -->
<include>**/org/apache/activemq/*Test.java</include>

8
tests/activemq5-unit-tests/src/main/java/org/apache/activemq/broker/region/policy/DestinationProxy.java
View File

@ -33,6 +33,7 @@ import org.apache.activemq.command.ProducerInfo;
import org.apache.activemq.management.CountStatisticImpl;
import org.apache.activemq.store.MessageStore;
import org.apache.activemq.usage.MemoryUsage;
import org.apache.activemq.usage.TempUsage;
import org.apache.activemq.usage.Usage;
import org.apache.activemq.usage.UsageCapacity;
import org.apache.activemq.usage.UsageListener;
@ -352,6 +353,11 @@ public class DestinationProxy implements Destination {
}
@Override
public TempUsage getTempUsage() {
throw new UnsupportedOperationException("Not implemented yet");
}
@Override
public void dispose(ConnectionContext context) throws IOException {
throw new UnsupportedOperationException("Not implemented yet");
@ -640,7 +646,7 @@ public class DestinationProxy implements Destination {
}
@Override
public void clearPendingMessages() {
public void clearPendingMessages(int pendingAdditionsCount) {
throw new UnsupportedOperationException("Not implemented yet");
}

5
tests/activemq5-unit-tests/src/test/java/org/apache/activemq/JMSXAConsumerTest.java
View File

@ -17,6 +17,7 @@
package org.apache.activemq;
import javax.jms.ConnectionFactory;
import javax.jms.Session;
import junit.framework.Test;
@ -32,7 +33,9 @@ public class JMSXAConsumerTest extends JMSConsumerTest {
@Override
protected ConnectionFactory createConnectionFactory() throws Exception {
return new ActiveMQXAConnectionFactory("vm://localhost");
ActiveMQXAConnectionFactory activeMQXAConnectionFactory = new ActiveMQXAConnectionFactory("vm://localhost?jms.xaAckMode=1");
activeMQXAConnectionFactory.setXaAckMode(Session.AUTO_ACKNOWLEDGE);
return activeMQXAConnectionFactory;
}
// some tests use transactions, these will not work unless an XA transaction is in place

4
tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/RedeliveryRestartWithExceptionTest.java
View File

@ -405,6 +405,10 @@ public class RedeliveryRestartWithExceptionTest extends TestSupport {
return kahaDB.getLastProducerSequenceId(id);
}
@Override
public void allowIOResumption() {
kahaDB.allowIOResumption();
}
}
private class ProxyMessageStoreWithUpdateException extends ProxyMessageStore {

12
tests/activemq5-unit-tests/src/test/java/org/apache/activemq/security/AbstractCachedLDAPAuthorizationMapLegacyTest.java
View File

@ -33,14 +33,14 @@ import org.apache.activemq.command.ActiveMQQueue;
import org.apache.activemq.command.ActiveMQTopic;
import org.apache.activemq.jaas.GroupPrincipal;
import org.apache.activemq.util.Wait;
import org.apache.directory.api.ldap.model.ldif.LdifEntry;
import org.apache.directory.api.ldap.model.ldif.LdifReader;
import org.apache.directory.api.ldap.model.message.ModifyRequest;
import org.apache.directory.api.ldap.model.message.ModifyRequestImpl;
import org.apache.directory.api.ldap.model.name.Dn;
import org.apache.directory.api.ldap.model.name.Rdn;
import org.apache.directory.ldap.client.api.LdapConnection;
import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
import org.apache.directory.shared.ldap.model.ldif.LdifEntry;
import org.apache.directory.shared.ldap.model.ldif.LdifReader;
import org.apache.directory.shared.ldap.model.message.ModifyRequest;
import org.apache.directory.shared.ldap.model.message.ModifyRequestImpl;
import org.apache.directory.shared.ldap.model.name.Dn;
import org.apache.directory.shared.ldap.model.name.Rdn;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;

2
tests/activemq5-unit-tests/src/test/java/org/apache/activemq/security/AbstractCachedLDAPAuthorizationModuleTest.java
View File

@ -20,7 +20,7 @@ import java.util.Set;
import org.apache.activemq.command.ActiveMQQueue;
import org.apache.activemq.jaas.UserPrincipal;
import org.apache.directory.shared.ldap.model.message.ModifyRequest;
import org.apache.directory.api.ldap.model.message.ModifyRequest;
import org.junit.Test;
import static org.junit.Assert.assertEquals;

4
tests/activemq5-unit-tests/src/test/java/org/apache/activemq/security/CachedLDAPAuthorizationModuleLegacyOpenLDAPTest.java
View File

@ -19,10 +19,10 @@ package org.apache.activemq.security;
import java.io.IOException;
import java.io.InputStream;
import org.apache.directory.api.ldap.model.exception.LdapException;
import org.apache.directory.api.ldap.model.name.Dn;
import org.apache.directory.ldap.client.api.LdapConnection;
import org.apache.directory.ldap.client.api.LdapNetworkConnection;
import org.apache.directory.shared.ldap.model.exception.LdapException;
import org.apache.directory.shared.ldap.model.name.Dn;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;

4
tests/activemq5-unit-tests/src/test/java/org/apache/activemq/security/CachedLDAPAuthorizationModuleLegacyTest.java
View File

@ -19,14 +19,14 @@ package org.apache.activemq.security;
import java.io.IOException;
import java.io.InputStream;
import org.apache.directory.api.ldap.model.exception.LdapException;
import org.apache.directory.api.ldap.model.name.Dn;
import org.apache.directory.ldap.client.api.LdapConnection;
import org.apache.directory.ldap.client.api.LdapNetworkConnection;
import org.apache.directory.server.annotations.CreateLdapServer;
import org.apache.directory.server.annotations.CreateTransport;
import org.apache.directory.server.core.annotations.ApplyLdifFiles;
import org.apache.directory.server.core.integ.FrameworkRunner;
import org.apache.directory.shared.ldap.model.exception.LdapException;
import org.apache.directory.shared.ldap.model.name.Dn;
import org.junit.runner.RunWith;
@RunWith(FrameworkRunner.class)

4
tests/activemq5-unit-tests/src/test/java/org/apache/activemq/security/CachedLDAPAuthorizationModuleOpenLDAPTest.java
View File

@ -19,10 +19,10 @@ package org.apache.activemq.security;
import java.io.IOException;
import java.io.InputStream;
import org.apache.directory.api.ldap.model.exception.LdapException;
import org.apache.directory.api.ldap.model.name.Dn;
import org.apache.directory.ldap.client.api.LdapConnection;
import org.apache.directory.ldap.client.api.LdapNetworkConnection;
import org.apache.directory.shared.ldap.model.exception.LdapException;
import org.apache.directory.shared.ldap.model.name.Dn;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;

2
tests/activemq5-unit-tests/src/test/java/org/apache/activemq/security/CachedLDAPAuthorizationModuleTest.java
View File

@ -18,13 +18,13 @@ package org.apache.activemq.security;
import java.io.InputStream;
import org.apache.directory.api.ldap.model.name.Dn;
import org.apache.directory.ldap.client.api.LdapConnection;
import org.apache.directory.ldap.client.api.LdapNetworkConnection;
import org.apache.directory.server.annotations.CreateLdapServer;
import org.apache.directory.server.annotations.CreateTransport;
import org.apache.directory.server.core.annotations.ApplyLdifFiles;
import org.apache.directory.server.core.integ.FrameworkRunner;
import org.apache.directory.shared.ldap.model.name.Dn;
import org.junit.runner.RunWith;
@RunWith(FrameworkRunner.class)