Skip to content

Commit

Permalink
Merge pull request #884 from rax-maas/test-dependencies-fix
Browse files Browse the repository at this point in the history 
moves common test dependencies to top level
  • Loading branch information
@iWebi
iWebi committed Jun 23, 2022
2 parents e3a7a00 + 0b75197 commit a535edc
Show file tree
Hide file tree
Showing 5 changed files with 48 additions and 77 deletions.
32 changes: 0 additions & 32 deletions blueflood-core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,6 @@
<name>Blueflood Core Engine</name>
<artifactId>blueflood-core</artifactId>

<properties>
<powermock.version>1.6.4</powermock.version>
</properties>

<build>
<plugins>
<!-- bundle -->
Expand Down Expand Up @@ -225,45 +221,17 @@
</dependency>

<!-- testing dependencies -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
<version>1.10.19</version>
</dependency>

<dependency>
<groupId>bigml</groupId>
<artifactId>histogram</artifactId>
<version>3.2.1</version>
</dependency>
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-api-mockito</artifactId>
<version>${powermock.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-module-junit4</artifactId>
<version>${powermock.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.javassist</groupId>
<artifactId>javassist</artifactId>
<version>3.18.2-GA</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-library</artifactId>
</dependency>
<dependency>
<groupId>com.google.code.tempus-fugit</groupId>
<artifactId>tempus-fugit</artifactId>
Expand Down
4 changes: 0 additions & 4 deletions blueflood-elasticsearch/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,10 +90,6 @@
<artifactId>httpmime</artifactId>
<version>4.3.1</version>
</dependency>
<dependency>
<groupId>pl.pragmatists</groupId>
<artifactId>JUnitParams</artifactId>
</dependency>
</dependencies>

</project>
33 changes: 0 additions & 33 deletions blueflood-http/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,39 +87,6 @@
</dependency>

<!-- testing dependencies -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
<optional>true</optional>
</dependency>

<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
<version>1.10.19</version>
<scope>test</scope>
<optional>true</optional>
</dependency>

<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-module-junit4</artifactId>
<version>1.6.4</version>
</dependency>

<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-api-mockito</artifactId>
<version>1.6.4</version>
</dependency>

<dependency>
<groupId>com.github.tlrx</groupId>
<artifactId>elasticsearch-test</artifactId>
Expand Down
6 changes: 0 additions & 6 deletions blueflood-integration-tests/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,12 +54,6 @@
<scope>test</scope>
<optional>true</optional>
</dependency>

<dependency>
<groupId>pl.pragmatists</groupId>
<artifactId>JUnitParams</artifactId>
</dependency>

</dependencies>

<build>
Expand Down
50 changes: 48 additions & 2 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,8 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<version>4.13.2</version>
<scope>test</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
Expand All @@ -81,6 +80,24 @@
<version>1.3</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>1.10.19</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-module-junit4</artifactId>
<version>1.6.4</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-api-mockito</artifactId>
<version>1.6.4</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-all</artifactId>
Expand All @@ -89,6 +106,35 @@
</dependencies>
</dependencyManagement>

<dependencies>
<!-- Standardized test dependencies available to all modules. It's better to put them here than to repeat them in
each submodule's pom. -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>
<dependency>
<groupId>pl.pragmatists</groupId>
<artifactId>JUnitParams</artifactId>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-library</artifactId>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
</dependency>
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-module-junit4</artifactId>
</dependency>
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-api-mockito</artifactId>
</dependency>
</dependencies>

<build>
<pluginManagement>
<plugins>
Expand Down

0 comments on commit a535edc

Please sign in to comment.