diff options
| author |   Dan Timoney <dtimoney@att.com> | 2021-03-22 15:09:59 -0400 |
|---|---|---|
| committer | Dan Timoney <dtimoney@att.com> | 2021-03-22 15:09:59 -0400 |
| commit | 4b9f4f2172ef327b18b8ad859f39f609a99f6e7d (patch) | |
| tree | 0d046bd0b711ee7d03a5faf49bb5f48dda7d45e2 | |
| parent | ac582d980f6616ff8b14e084af11698c111e0d10 (diff) | |
Inconsistent antlr versions specified
Fixed incorrect specifications of antlr version. Also, updated oparent
pom.xml to use latest released oparent
Change-Id: Iaa18032d89bd86916bc7739a71598ab495333795
Issue-ID: CCSDK-3231
Signed-off-by: Dan Timoney <dtimoney@att.com>
| -rw-r--r-- | dependencies-bom/pom.xml | 2 | ||||
| -rwxr-xr-x | oparent/pom.xml | 12 | ||||
| -rw-r--r-- | springboot/spring-boot-setup/src/main/resources/pom-template.xml | 2 | ||||
| -rw-r--r-- | springboot/springboot1/pom.xml | 2 | ||||
| -rw-r--r-- | springboot/springboot2/pom.xml | 2 |
5 files changed, 13 insertions, 7 deletions
diff --git a/dependencies-bom/pom.xml b/dependencies-bom/pom.xml index 84393ffd..74bf2a45 100644 --- a/dependencies-bom/pom.xml +++ b/dependencies-bom/pom.xml @@ -156,7 +156,7 @@ <dependency> <groupId>org.antlr</groupId> <artifactId>antlr4-runtime</artifactId> - <version>4.7.2</version> + <version>4.8-1</version> </dependency> <dependency> <groupId>org.apache.commons</groupId> diff --git a/oparent/pom.xml b/oparent/pom.xml index 8b1aa497..1713ea42 100755 --- a/oparent/pom.xml +++ b/oparent/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.oparent</groupId> <artifactId>oparent</artifactId> - <version>3.1.0</version> + <version>3.2.0</version> <relativePath/> </parent> @@ -75,6 +75,8 @@ <sdc.client.version>1.4.1</sdc.client.version> <sdc.tosca.version>1.6.5</sdc.tosca.version> + <antlr.version>4.8-1</antlr.version> + </properties> <dependencyManagement> @@ -93,7 +95,11 @@ <scope>import</scope> <type>pom</type> </dependency> - + <dependency> + <groupId>org.antlr</groupId> + <artifactId>antlr4-runtime</artifactId> + <version>${antlr.version}</version> + </dependency> <dependency> <groupId>org.onap.sdc.sdc-distribution-client</groupId> <artifactId>sdc-distribution-client</artifactId> @@ -231,7 +237,7 @@ <plugin> <groupId>org.antlr</groupId> <artifactId>antlr4-maven-plugin</artifactId> - <version>4.7.2</version> + <version>${antlr.version}</version> </plugin> </plugins> </pluginManagement> diff --git a/springboot/spring-boot-setup/src/main/resources/pom-template.xml b/springboot/spring-boot-setup/src/main/resources/pom-template.xml index 696f56b2..c11ec005 100644 --- a/springboot/spring-boot-setup/src/main/resources/pom-template.xml +++ b/springboot/spring-boot-setup/src/main/resources/pom-template.xml @@ -116,7 +116,7 @@ <mockk.version>1.9.3</mockk.version> <!-- Managed dependency versions --> - <antlr.version>4.7.2</antlr.version> + <antlr.version>4.8-1</antlr.version> <commons.lang.version>2.6</commons.lang.version> <apache.httpcomponents.core.version>4.4.12</apache.httpcomponents.core.version> <apache.httpcomponents.client.version>4.5.10</apache.httpcomponents.client.version> diff --git a/springboot/springboot1/pom.xml b/springboot/springboot1/pom.xml index 125baba9..057f9cc7 100644 --- a/springboot/springboot1/pom.xml +++ b/springboot/springboot1/pom.xml @@ -116,7 +116,7 @@ <mockk.version>1.9.3</mockk.version> <!-- Managed dependency versions --> - <antlr.version>4.7.2</antlr.version> + <antlr.version>4.8-1</antlr.version> <commons.lang.version>2.6</commons.lang.version> <apache.httpcomponents.core.version>4.4.12</apache.httpcomponents.core.version> <apache.httpcomponents.client.version>4.5.10</apache.httpcomponents.client.version> diff --git a/springboot/springboot2/pom.xml b/springboot/springboot2/pom.xml index 57ec5675..21cbda95 100644 --- a/springboot/springboot2/pom.xml +++ b/springboot/springboot2/pom.xml @@ -116,7 +116,7 @@ <mockk.version>1.9.3</mockk.version> <!-- Managed dependency versions --> - <antlr.version>4.7.2</antlr.version> + <antlr.version>4.8-1</antlr.version> <commons.lang.version>2.6</commons.lang.version> <apache.httpcomponents.core.version>4.4.12</apache.httpcomponents.core.version> <apache.httpcomponents.client.version>4.5.10</apache.httpcomponents.client.version> |