Skip to content

Commit

Permalink
Merge pull request #7 from CJSCommonPlatform/fix-dependency-management
Browse files Browse the repository at this point in the history
Move all maven dependency versions into dependency management
  • Loading branch information
mapingo committed May 15, 2020
2 parents 9b2631d + 4fc0625 commit 42289bd
Show file tree
Hide file tree
Showing 35 changed files with 67 additions and 75 deletions.
1 change: 0 additions & 1 deletion aggregate/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
<dependency>
<groupId>uk.gov.justice.services</groupId>
<artifactId>core</artifactId>
<version>${project.version}</version>
</dependency>

<!-- Test Dependencies -->
Expand Down
1 change: 0 additions & 1 deletion common-rest/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@
<dependency>
<groupId>uk.gov.justice.services</groupId>
<artifactId>core</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
1 change: 0 additions & 1 deletion common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@
<dependency>
<groupId>uk.gov.justice.services</groupId>
<artifactId>test-utils-common</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
3 changes: 0 additions & 3 deletions components/custom/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,14 @@
<dependency>
<groupId>uk.gov.justice.services</groupId>
<artifactId>common</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>uk.gov.justice.services</groupId>
<artifactId>core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>uk.gov.justice.schema</groupId>
<artifactId>schema-service</artifactId>
<version>${framework-libraries.version}</version>
</dependency>
</dependencies>
</project>
5 changes: 0 additions & 5 deletions core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,17 +29,14 @@
<dependency>
<groupId>uk.gov.justice.services</groupId>
<artifactId>messaging-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>uk.gov.justice.services</groupId>
<artifactId>messaging-jms</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>uk.gov.justice.schema</groupId>
<artifactId>schema-service</artifactId>
<version>${framework-libraries.version}</version>
</dependency>
<dependency>
<groupId>javax.enterprise</groupId>
Expand Down Expand Up @@ -80,7 +77,6 @@
<groupId>uk.gov.justice.utils</groupId>
<artifactId>test-utils-core</artifactId>
<scope>test</scope>
<version>${framework-utilities.version}</version>
</dependency>
<dependency>
<groupId>uk.gov.justice.services</groupId>
Expand Down Expand Up @@ -141,7 +137,6 @@
<dependency>
<groupId>uk.gov.justice.services</groupId>
<artifactId>test-utils-common</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
2 changes: 0 additions & 2 deletions framework-generators/direct-adapter-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
<dependency>
<groupId>uk.gov.justice.services</groupId>
<artifactId>core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
Expand Down Expand Up @@ -72,7 +71,6 @@
<dependency>
<groupId>uk.gov.justice.services</groupId>
<artifactId>test-utils-core</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
2 changes: 0 additions & 2 deletions framework-generators/direct-client-generator/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
<dependency>
<groupId>uk.gov.justice.framework-generators</groupId>
<artifactId>generators-commons</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>uk.gov.justice.framework-generators</groupId>
Expand Down Expand Up @@ -77,7 +76,6 @@
<dependency>
<groupId>uk.gov.justice.services</groupId>
<artifactId>test-utils-core</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
2 changes: 0 additions & 2 deletions framework-generators/generators-commons/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -94,13 +94,11 @@
<dependency>
<groupId>uk.gov.justice.services</groupId>
<artifactId>test-utils-common</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>uk.gov.justice.services</groupId>
<artifactId>core</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
1 change: 0 additions & 1 deletion framework-generators/generators-subscription/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
<dependency>
<groupId>uk.gov.justice.framework-generators</groupId>
<artifactId>generators-commons</artifactId>
<version>${project.version}</version>
</dependency>

<!-- Test Dependencies -->
Expand Down
1 change: 0 additions & 1 deletion framework-generators/generators-test-utils/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
<dependency>
<groupId>uk.gov.justice.utils</groupId>
<artifactId>test-utils-core</artifactId>
<version>${framework-libraries.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.resteasy</groupId>
Expand Down
1 change: 0 additions & 1 deletion framework-generators/messaging-adapter-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@
<dependency>
<groupId>uk.gov.justice.services</groupId>
<artifactId>test-utils-core</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
4 changes: 0 additions & 4 deletions framework-generators/messaging-adapter-generator/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
<dependency>
<groupId>uk.gov.justice.framework-generators</groupId>
<artifactId>generators-commons</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.ejb3</groupId>
Expand All @@ -50,7 +49,6 @@
<dependency>
<groupId>uk.gov.justice.utils</groupId>
<artifactId>utilities-core</artifactId>
<version>${framework-utilities.version}</version>
</dependency>
<dependency>
<groupId>uk.gov.justice.framework-generators</groupId>
Expand All @@ -68,7 +66,6 @@
<dependency>
<groupId>uk.gov.justice.services</groupId>
<artifactId>test-utils-core</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -150,7 +147,6 @@
<groupId>uk.gov.justice.services</groupId>
<artifactId>test-utils-common</artifactId>
<scope>test</scope>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
Expand Down
3 changes: 0 additions & 3 deletions framework-generators/messaging-client-generator/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
<dependency>
<groupId>uk.gov.justice.framework-generators</groupId>
<artifactId>generators-commons</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>uk.gov.justice.framework-generators</groupId>
Expand Down Expand Up @@ -61,7 +60,6 @@
<dependency>
<groupId>uk.gov.justice.services</groupId>
<artifactId>test-utils-core</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -94,7 +92,6 @@
<dependency>
<groupId>uk.gov.justice.services</groupId>
<artifactId>core</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
3 changes: 0 additions & 3 deletions framework-generators/rest-adapter-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
<dependency>
<groupId>uk.gov.justice.services</groupId>
<artifactId>common-rest</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>uk.gov.justice.utils</groupId>
Expand Down Expand Up @@ -114,13 +113,11 @@
<dependency>
<groupId>uk.gov.justice.services</groupId>
<artifactId>test-utils-common</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>uk.gov.justice.services</groupId>
<artifactId>test-utils-core</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
1 change: 0 additions & 1 deletion framework-generators/rest-adapter-file-service/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@
<dependency>
<groupId>uk.gov.justice.services</groupId>
<artifactId>test-utils-core</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
4 changes: 0 additions & 4 deletions framework-generators/rest-adapter-generator/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
<dependency>
<groupId>uk.gov.justice.framework-generators</groupId>
<artifactId>generators-commons</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.raml</groupId>
Expand Down Expand Up @@ -96,13 +95,11 @@
<dependency>
<groupId>uk.gov.justice.services</groupId>
<artifactId>test-utils-common</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>uk.gov.justice.services</groupId>
<artifactId>test-utils-core</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
Expand All @@ -129,7 +126,6 @@
<dependency>
<groupId>uk.gov.justice.services</groupId>
<artifactId>core</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
3 changes: 0 additions & 3 deletions framework-generators/rest-client-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -37,14 +37,12 @@
<dependency>
<groupId>uk.gov.justice.services</groupId>
<artifactId>messaging-core</artifactId>
<version>${project.version}</version>
</dependency>

<!-- Test Dependencies -->
<dependency>
<groupId>uk.gov.justice.services</groupId>
<artifactId>common</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
Expand All @@ -70,7 +68,6 @@
<dependency>
<groupId>uk.gov.justice.services</groupId>
<artifactId>test-utils-core</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
3 changes: 0 additions & 3 deletions framework-generators/rest-client-generator/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
<dependency>
<groupId>uk.gov.justice.framework-generators</groupId>
<artifactId>generators-commons</artifactId>
<version>${project.version}</version>
</dependency>

<!-- Test Dependencies -->
Expand All @@ -44,13 +43,11 @@
<dependency>
<groupId>uk.gov.justice.services</groupId>
<artifactId>common</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>uk.gov.justice.services</groupId>
<artifactId>test-utils-core</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,6 @@
<dependency>
<groupId>uk.gov.justice.services</groupId>
<artifactId>test-utils-core</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
1 change: 0 additions & 1 deletion framework-generators/unifiedsearch-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
<dependency>
<groupId>uk.gov.justice.framework-generators</groupId>
<artifactId>generators-commons</artifactId>
<version>${project.version}</version>
</dependency>


Expand Down
2 changes: 1 addition & 1 deletion framework-jmx-command-client/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
<dependency>
<groupId>uk.gov.justice.services</groupId>
<artifactId>jmx-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>uk.gov.justice.services</groupId>
Expand Down Expand Up @@ -74,6 +73,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<!--suppress UnresolvedMavenProperty -->
<argLine>${argLine} -Xmx64m</argLine>
</configuration>
</plugin>
Expand Down
4 changes: 0 additions & 4 deletions framework-system/framework-management/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
<dependency>
<groupId>uk.gov.justice.services</groupId>
<artifactId>messaging-jms</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>uk.gov.justice.utils</groupId>
Expand All @@ -34,7 +33,6 @@
<dependency>
<groupId>uk.gov.justice.services</groupId>
<artifactId>framework-utilities</artifactId>
<version>${project.version}</version>
</dependency>

<!-- Test Dependencies -->
Expand All @@ -56,13 +54,11 @@
<dependency>
<groupId>uk.gov.justice.services</groupId>
<artifactId>test-utils-common</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>uk.gov.justice.services</groupId>
<artifactId>test-utils-core</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
1 change: 0 additions & 1 deletion framework-system/shuttering-persistence/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@
<dependency>
<groupId>uk.gov.justice.services</groupId>
<artifactId>test-utils-framework-persistence</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
2 changes: 0 additions & 2 deletions jmx/jmx-command-client/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
<dependency>
<groupId>uk.gov.justice.services</groupId>
<artifactId>jmx-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>javax</groupId>
Expand Down Expand Up @@ -47,7 +46,6 @@
<dependency>
<groupId>uk.gov.justice.utils</groupId>
<artifactId>test-utils-core</artifactId>
<version>${framework-utilities.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
Loading

0 comments on commit 42289bd

Please sign in to comment.