diff options
| author | Arnstein Ressem <aressem@gmail.com> | 2017-08-31 09:02:05 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-31 09:02:05 +0200 |
| commit | e923734575b7edfa99ffd1951d318086a220eed6 (patch) | |
| tree | 9d13cfa7b26a414e9c37589f05255291b5d265ba | |
| parent | 8ad5f7d60172ed7b981553bebb0354fc3aad57d7 (diff) | |
Revert "Make antlr and antlr4 invisible for customer projects."
| -rw-r--r-- | application/pom.xml | 12 | ||||
| -rw-r--r-- | container-dev/pom.xml | 22 | ||||
| -rw-r--r-- | container-search/pom.xml | 3 | ||||
| -rw-r--r-- | pom.xml | 11 |
4 files changed, 4 insertions, 44 deletions
diff --git a/application/pom.xml b/application/pom.xml index 2d9096e49f1..3fd9e8054e7 100644 --- a/application/pom.xml +++ b/application/pom.xml @@ -75,18 +75,6 @@ <version>${project.version}</version> <scope>test</scope> </dependency> - - <!-- All dependencies that should be visible in test classpath, but not compile classpath, - for user projects must be added in compile scope here. - These dependencies are explicitly excluded (or set to non-compile scope) in the container-dev module. --> - <dependency> - <groupId>org.antlr</groupId> - <artifactId>antlr-runtime</artifactId> - </dependency> - <dependency> - <groupId>org.antlr</groupId> - <artifactId>antlr4-runtime</artifactId> - </dependency> </dependencies> <build> diff --git a/container-dev/pom.xml b/container-dev/pom.xml index e858ba1c50b..7ac2eb03016 100644 --- a/container-dev/pom.xml +++ b/container-dev/pom.xml @@ -112,33 +112,11 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>container-search-and-docproc</artifactId> <version>${project.version}</version> - <exclusions> - <exclusion> - <groupId>org.antlr</groupId> - <artifactId>antlr4-runtime</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>com.yahoo.vespa</groupId> <artifactId>config-bundle</artifactId> <version>${project.version}</version> </dependency> - - <!-- Dependencies below are added explicitly to exclude transitive deps that are not provided runtime by the container, - and hence make them invisible to user projects' build classpath. - Excluded artifacts should be added explicitly to the application module to make then visible in users' test classpath. --> - <dependency> - <groupId>com.yahoo.vespa</groupId> - <artifactId>predicate-search-core</artifactId> - <version>${project.version}</version> - <exclusions> - <exclusion> - <groupId>org.antlr</groupId> - <artifactId>antlr-runtime</artifactId> - </exclusion> - </exclusions> - </dependency> - </dependencies> </project> diff --git a/container-search/pom.xml b/container-search/pom.xml index f622567acde..837629c44b9 100644 --- a/container-search/pom.xml +++ b/container-search/pom.xml @@ -143,6 +143,7 @@ <dependency> <groupId>org.antlr</groupId> <artifactId>antlr4-runtime</artifactId> + <version>4.5</version> </dependency> <dependency> <groupId>org.mockito</groupId> @@ -210,7 +211,7 @@ <plugin> <!-- For the YQL query language --> <groupId>org.antlr</groupId> <artifactId>antlr4-maven-plugin</artifactId> - <version>${antlr4.version}</version> + <version>4.5</version> <executions> <execution> <configuration> @@ -56,7 +56,7 @@ <plugin> <groupId>org.antlr</groupId> <artifactId>antlr3-maven-plugin</artifactId> - <version>${antlr.version}</version> + <version>3.5.2</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -574,12 +574,7 @@ <dependency> <groupId>org.antlr</groupId> <artifactId>antlr-runtime</artifactId> - <version>${antlr.version}</version> - </dependency> - <dependency> - <groupId>org.antlr</groupId> - <artifactId>antlr4-runtime</artifactId> - <version>${antlr4.version}</version> + <version>3.5.2</version> </dependency> <dependency> <groupId>org.apache.aries.spifly</groupId> @@ -894,8 +889,6 @@ <properties> <javax.ws.rs-api.version>2.0.1</javax.ws.rs-api.version> <!-- must be kept in sync with version used by current jersey2.version --> - <antlr.version>3.5.2</antlr.version> - <antlr4.version>4.5</antlr4.version> <aries.spifly.version>1.0.8</aries.spifly.version> <aries.util.version>1.0.0</aries.util.version> <asm-debug-all.version>5.0.3</asm-debug-all.version> |