Skip to content

Commit

Permalink
Gh-2968: Spring REST has multiple occurrences of org.json.JSONObject …
Browse files Browse the repository at this point in the history
…on the class path (#2969)

* Exclude dependency which adds duplicate org.json.JSONObject to the class path

* Improve demo profile to run the demo always
  • Loading branch information
GCHQDeveloper314 authored Jun 8, 2023
1 parent ad0bdf6 commit 09bf351
Showing 1 changed file with 18 additions and 0 deletions.
18 changes: 18 additions & 0 deletions rest-api/spring-rest/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,13 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
<exclusions>
<!-- Removed because it introduces duplicate org.json.JSONObject on the class path -->
<exclusion>
<groupId>com.vaadin.external.google</groupId>
<artifactId>android-json</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- Already defined in parent POM but required for surefire to discover tests -->
<dependency>
Expand Down Expand Up @@ -164,6 +171,9 @@
<profiles>
<profile>
<id>demo</id>
<properties>
<maven.test.skip>true</maven.test.skip>
</properties>
<build>
<plugins>
<plugin>
Expand All @@ -177,6 +187,14 @@
-Dgaffer.schemas=${project.build.outputDirectory}/schemas
</jvmArguments>
</configuration>
<executions>
<execution>
<id>run</id>
<goals>
<goal>run</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
Expand Down

0 comments on commit 09bf351

Please sign in to comment.