Commit ad6da06
committed
Merge branch 'develop' of github.com:eXist-db/messaging-replication into prepare_release
* 'develop' of github.com:eXist-db/messaging-replication:
Bump activemq.version from 5.15.10 to 5.15.11
Update pom.xml for new eXist-db version
Bump maven-jar-plugin from 3.1.2 to 3.2.0
Bump exist.version from 5.0.0 to 5.1.0
# Conflicts:
# pom.xml1 file changed
+3
-3
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
48 | 48 | | |
49 | 49 | | |
50 | 50 | | |
51 | | - | |
52 | | - | |
| 51 | + | |
| 52 | + | |
53 | 53 | | |
54 | 54 | | |
55 | 55 | | |
| |||
171 | 171 | | |
172 | 172 | | |
173 | 173 | | |
174 | | - | |
| 174 | + | |
175 | 175 | | |
176 | 176 | | |
177 | 177 | | |
| |||
0 commit comments