Skip to content

Commit 45043c8

Browse files
authored
Merge pull request #1463 from mattrpav/AMQ-9734
[AMQ-9734] Task: Remove support for deprecated Axion JDBC Support
2 parents c2ebea7 + f542568 commit 45043c8

File tree

6 files changed

+0
-215
lines changed

6 files changed

+0
-215
lines changed

activemq-jdbc-store/src/main/java/org/apache/activemq/store/jdbc/adapter/AxionJDBCAdapter.java

Lines changed: 0 additions & 64 deletions
This file was deleted.

activemq-jdbc-store/src/main/java/org/apache/activemq/store/jdbc/adapter/StreamJDBCAdapter.java

Lines changed: 0 additions & 73 deletions
This file was deleted.

activemq-jdbc-store/src/main/resources/META-INF/services/org/apache/activemq/store/jdbc/axion_jdbc_driver

Lines changed: 0 additions & 17 deletions
This file was deleted.

activemq-rar/pom.xml

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -73,10 +73,6 @@
7373
<groupId>geronimo</groupId>
7474
<artifactId>geronimo-j2ee</artifactId>
7575
</exclusion>
76-
<exclusion>
77-
<groupId>axion</groupId>
78-
<artifactId>axion</artifactId>
79-
</exclusion>
8076
<exclusion>
8177
<groupId>${project.groupId}</groupId>
8278
<artifactId>activemq-jaas</artifactId>
@@ -109,10 +105,6 @@
109105
<groupId>junit</groupId>
110106
<artifactId>junit</artifactId>
111107
</exclusion>
112-
<exclusion>
113-
<groupId>jakarta-regexp</groupId>
114-
<artifactId>jakarta-regexp</artifactId>
115-
</exclusion>
116108
<exclusion>
117109
<groupId>org.jmdns</groupId>
118110
<artifactId>jmdns</artifactId>
@@ -145,10 +137,6 @@
145137
<groupId>commons-collections</groupId>
146138
<artifactId>commons-collections</artifactId>
147139
</exclusion>
148-
<exclusion>
149-
<groupId>commons-primitives</groupId>
150-
<artifactId>commons-primitives</artifactId>
151-
</exclusion>
152140
<exclusion>
153141
<groupId>org.apache.commons</groupId>
154142
<artifactId>commons-pool2</artifactId>
@@ -195,10 +183,6 @@
195183
<groupId>geronimo</groupId>
196184
<artifactId>geronimo-j2ee</artifactId>
197185
</exclusion>
198-
<exclusion>
199-
<groupId>axion</groupId>
200-
<artifactId>axion</artifactId>
201-
</exclusion>
202186
<exclusion>
203187
<groupId>${project.groupId}</groupId>
204188
<artifactId>activemq-jaas</artifactId>
@@ -239,10 +223,6 @@
239223
<groupId>junit</groupId>
240224
<artifactId>junit</artifactId>
241225
</exclusion>
242-
<exclusion>
243-
<groupId>regexp</groupId>
244-
<artifactId>regexp</artifactId>
245-
</exclusion>
246226
<exclusion>
247227
<groupId>javax.jmdns</groupId>
248228
<artifactId>jmdns</artifactId>
@@ -275,10 +255,6 @@
275255
<groupId>commons-collections</groupId>
276256
<artifactId>commons-collections</artifactId>
277257
</exclusion>
278-
<exclusion>
279-
<groupId>commons-primitives</groupId>
280-
<artifactId>commons-primitives</artifactId>
281-
</exclusion>
282258
<exclusion>
283259
<groupId>org.apache.commons</groupId>
284260
<artifactId>commons-pool2</artifactId>

activemq-unit-tests/pom.xml

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -216,21 +216,6 @@
216216
<artifactId>commons-collections</artifactId>
217217
<scope>test</scope>
218218
</dependency>
219-
<dependency>
220-
<groupId>commons-primitives</groupId>
221-
<artifactId>commons-primitives</artifactId>
222-
<scope>test</scope>
223-
</dependency>
224-
<dependency>
225-
<groupId>axion</groupId>
226-
<artifactId>axion</artifactId>
227-
<scope>test</scope>
228-
</dependency>
229-
<dependency>
230-
<groupId>jakarta-regexp</groupId>
231-
<artifactId>jakarta-regexp</artifactId>
232-
<scope>test</scope>
233-
</dependency>
234219
<dependency>
235220
<groupId>org.apache.commons</groupId>
236221
<artifactId>commons-dbcp2</artifactId>

pom.xml

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -44,15 +44,13 @@
4444
<annogen-version>0.1.0</annogen-version>
4545
<ant-version>1.10.15</ant-version>
4646
<aries-version>1.1.0</aries-version>
47-
<axion-version>1.0-M3-dev</axion-version>
4847
<camel-version>4.10.5</camel-version>
4948
<commons-beanutils-version>1.11.0</commons-beanutils-version>
5049
<commons-collections-version>3.2.2</commons-collections-version>
5150
<commons-dbcp2-version>2.13.0</commons-dbcp2-version>
5251
<commons-io-version>2.19.0</commons-io-version>
5352
<commons-logging-version>1.3.5</commons-logging-version>
5453
<commons-pool2-version>2.12.1</commons-pool2-version>
55-
<commons-primitives-version>1.0</commons-primitives-version>
5654
<directory-version>2.0.0.AM25</directory-version>
5755
<ecj.version>3.17.0</ecj.version>
5856
<ftpserver-version>1.1.1</ftpserver-version>
@@ -87,7 +85,6 @@
8785
<qpid-proton-version>0.34.1</qpid-proton-version>
8886
<qpid-jms-version>2.4.0</qpid-jms-version>
8987
<netty-version>4.1.94.Final</netty-version>
90-
<regexp-version>1.4</regexp-version>
9188
<rome-version>2.1.0</rome-version>
9289
<shiro-version>1.13.0</shiro-version>
9390
<slf4j-version>2.0.16</slf4j-version>
@@ -768,25 +765,6 @@
768765
<version>${org-apache-derby-version}</version>
769766
</dependency>
770767

771-
<!-- Optional Axion support -->
772-
<dependency>
773-
<groupId>axion</groupId>
774-
<artifactId>axion</artifactId>
775-
<version>${axion-version}</version>
776-
</dependency>
777-
778-
<dependency>
779-
<groupId>commons-primitives</groupId>
780-
<artifactId>commons-primitives</artifactId>
781-
<version>${commons-primitives-version}</version>
782-
</dependency>
783-
784-
<dependency>
785-
<groupId>jakarta-regexp</groupId>
786-
<artifactId>jakarta-regexp</artifactId>
787-
<version>${regexp-version}</version>
788-
</dependency>
789-
790768
<dependency>
791769
<groupId>org.apache.commons</groupId>
792770
<artifactId>commons-dbcp2</artifactId>

0 commit comments

Comments
 (0)