Skip to content

Commit 0f0dda7

Browse files
Christoffer-CortesChristoffer-Cortes
authored
Revert "Functional tests for subscription triggering (#121)" (#122)
This reverts commit 7cb26f9.
1 parent 7cb26f9 commit 0f0dda7

File tree

11 files changed

+93
-2129
lines changed

11 files changed

+93
-2129
lines changed

‎pom.xml

Lines changed: 47 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<groupId>org.springframework.boot</groupId>
1111
<artifactId>spring-boot-starter-parent</artifactId>
1212
<version>2.0.1.RELEASE</version>
13-
<relativePath /> <!-- .. lookup parent from repository -->
13+
<relativePath/> <!-- .. lookup parent from repository -->
1414
</parent>
1515

1616
<properties>
@@ -49,10 +49,10 @@
4949
<groupId>org.springframework.boot</groupId>
5050
<artifactId>spring-boot-starter-web</artifactId>
5151
<exclusions>
52-
<exclusion>
53-
<groupId>org.springframework.boot</groupId>
54-
<artifactId>spring-boot-starter-tomcat</artifactId>
55-
</exclusion>
52+
<exclusion>
53+
<groupId>org.springframework.boot</groupId>
54+
<artifactId>spring-boot-starter-tomcat</artifactId>
55+
</exclusion>
5656
</exclusions>
5757
</dependency>
5858

@@ -77,7 +77,7 @@
7777
<scope>test</scope>
7878
</dependency>
7979

80-
<dependency>
80+
<dependency>
8181
<groupId>org.springframework.boot</groupId>
8282
<artifactId>spring-boot-starter-tomcat</artifactId>
8383
<scope>compile</scope>
@@ -148,7 +148,7 @@
148148
<version>2.6</version>
149149
</dependency>
150150

151-
<!-- <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId>
151+
<!-- <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId>
152152
<version>1.7.25</version> </dependency> -->
153153

154154
<!-- https://mvnrepository.com/artifact/org.json/json -->
@@ -159,103 +159,73 @@
159159
</dependency>
160160

161161
<!-- https://mvnrepository.com/artifact/com.github.wnameless/json-flattener -->
162-
<dependency>
163-
<groupId>com.github.wnameless</groupId>
164-
<artifactId>json-flattener</artifactId>
165-
<version>0.4.1</version>
166-
</dependency>
162+
<dependency>
163+
<groupId>com.github.wnameless</groupId>
164+
<artifactId>json-flattener</artifactId>
165+
<version>0.4.1</version>
166+
</dependency>
167167

168168
<dependency>
169169
<groupId>org.mongodb</groupId>
170170
<artifactId>mongo-java-driver</artifactId>
171171
<version>3.5.0</version>
172172
</dependency>
173-
174173
<dependency>
175174
<groupId>joda-time</groupId>
176175
<artifactId>joda-time</artifactId>
177176
</dependency>
178-
179177
<dependency>
180178
<groupId>org.apache.commons</groupId>
181179
<artifactId>commons-lang3</artifactId>
182180
<version>3.7</version>
183181
</dependency>
184-
185182
<dependency>
186183
<groupId>io.springfox</groupId>
187184
<artifactId>springfox-swagger-ui</artifactId>
188185
<version>2.6.1</version>
189186
<scope>compile</scope>
190187
</dependency>
191-
192188
<dependency>
193189
<groupId>io.springfox</groupId>
194190
<artifactId>springfox-swagger2</artifactId>
195191
<version>2.6.1</version>
196192
<scope>compile</scope>
197193
</dependency>
198-
199-
<dependency>
200-
<groupId>org.powermock</groupId>
201-
<artifactId>powermock-module-junit4</artifactId>
202-
<version>1.7.3</version>
203-
<scope>test</scope>
204-
</dependency>
205-
206-
<dependency>
207-
<groupId>org.projectlombok</groupId>
208-
<artifactId>lombok</artifactId>
209-
<version>1.16.20</version>
210-
<scope>provided</scope>
211-
</dependency>
212-
213-
<dependency>
214-
<groupId>org.jongo</groupId>
215-
<artifactId>jongo</artifactId>
216-
<version>1.3.0</version>
217-
</dependency>
218-
219-
<!-- Embedded -->
220194
<dependency>
221195
<groupId>org.apache.qpid</groupId>
222196
<artifactId>qpid-broker</artifactId>
223197
<version>6.1.3</version>
224198
<scope>test</scope>
225199
</dependency>
226-
227200
<dependency>
228201
<groupId>de.flapdoodle.embed</groupId>
229202
<artifactId>de.flapdoodle.embed.mongo</artifactId>
230203
<version>2.0.0</version>
231204
<scope>test</scope>
232205
</dependency>
233-
234206
<dependency>
235-
<groupId>com.github.kirviq</groupId>
236-
<artifactId>dumbster</artifactId>
237-
<version>1.7.1</version>
207+
<groupId>org.powermock</groupId>
208+
<artifactId>powermock-module-junit4</artifactId>
209+
<version>1.7.3</version>
238210
<scope>test</scope>
239211
</dependency>
240-
241212
<dependency>
242-
<groupId>org.mock-server</groupId>
243-
<artifactId>mockserver-netty</artifactId>
244-
<version>5.3.0</version>
213+
<groupId>org.projectlombok</groupId>
214+
<artifactId>lombok</artifactId>
215+
<version>1.16.20</version>
216+
<scope>provided</scope>
245217
</dependency>
246-
247218
<dependency>
248-
<groupId>org.mock-server</groupId>
249-
<artifactId>mockserver-client-java</artifactId>
250-
<version>5.3.0</version>
251-
</dependency>
219+
<groupId>org.jongo</groupId>
220+
<artifactId>jongo</artifactId>
221+
<version>1.3.0</version>
222+
</dependency>
252223

253-
<!-- Cucumber -->
254224
<dependency>
255-
<groupId>info.cukes</groupId>
256-
<artifactId>cucumber-junit</artifactId>
257-
<version>1.2.5</version>
258-
<scope>test</scope>
225+
<groupId>info.cukes</groupId>
226+
<artifactId>cucumber-junit</artifactId>
227+
<version>1.2.5</version>
228+
<scope>test</scope>
259229
</dependency>
260230

261231
<dependency>
@@ -282,7 +252,7 @@
282252

283253
<!-- PhoenixNAP RAML Code Generator plugin used to generate sources
284254
from raml -->
285-
<plugin>
255+
<plugin>
286256
<groupId>com.phoenixnap.oss</groupId>
287257
<artifactId>springmvc-raml-plugin</artifactId>
288258
<version>${plugin-version}</version>
@@ -331,19 +301,19 @@
331301
</configuration>
332302
</execution>
333303

334-
<execution>
335-
<id>add-test-source</id>
336-
<phase>process-resources</phase>
337-
<goals>
338-
<goal>add-test-source</goal>
339-
</goals>
340-
<configuration>
341-
<sources>
342-
<source>src/functionaltests/java</source>
343-
<source>src/functionaltests/resources</source>
344-
</sources>
345-
</configuration>
346-
</execution>
304+
<execution>
305+
<id>add-test-source</id>
306+
<phase>process-resources</phase>
307+
<goals>
308+
<goal>add-test-source</goal>
309+
</goals>
310+
<configuration>
311+
<sources>
312+
<source>src/functionaltests/java</source>
313+
<source>src/functionaltests/resources</source>
314+
</sources>
315+
</configuration>
316+
</execution>
347317
</executions>
348318
</plugin>
349319

@@ -364,12 +334,12 @@
364334
</plugin>
365335

366336
<plugin>
367-
<groupId>org.apache.maven.plugins</groupId>
368-
<artifactId>maven-war-plugin</artifactId>
369-
<configuration>
370-
<failOnMissingWebXml>false</failOnMissingWebXml>
371-
</configuration>
372-
</plugin>
337+
<groupId>org.apache.maven.plugins</groupId>
338+
<artifactId>maven-war-plugin</artifactId>
339+
<configuration>
340+
<failOnMissingWebXml>false</failOnMissingWebXml>
341+
</configuration>
342+
</plugin>
373343

374344
</plugins>
375345
</build>

0 commit comments

Comments
 (0)