Alon Bar-Lev has uploaded a new change for review. Change subject: util: osinfo: downgrade antlr-2.7 ......................................................................
util: osinfo: downgrade antlr-2.7 antlr-2 is provided by jboss. antlr-4 is not, and requires additional resources. This is draft only partial work. Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1164547 Change-Id: Ie8aafb32578509590af1555a93ea6d6a99f6ae1c Signed-off-by: Alon Bar-Lev <[email protected]> --- M backend/manager/dependencies/common/pom.xml D backend/manager/dependencies/common/src/main/modules/org/antlr/antlr4-runtime/main/module.xml M backend/manager/modules/utils/pom.xml M backend/manager/modules/utils/src/main/modules/org/ovirt/engine/core/utils/main/module.xml M pom.xml 5 files changed, 15 insertions(+), 34 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/96/35196/1 diff --git a/backend/manager/dependencies/common/pom.xml b/backend/manager/dependencies/common/pom.xml index 055d5f6..2e5edd6 100644 --- a/backend/manager/dependencies/common/pom.xml +++ b/backend/manager/dependencies/common/pom.xml @@ -346,11 +346,6 @@ <artifactId>jaxb-xjc</artifactId> <version>${jaxb-impl.version}</version> </dependency> - - <dependency> - <groupId>org.antlr</groupId> - <artifactId>antlr4-runtime</artifactId> - </dependency> </dependencies> <build> @@ -680,12 +675,6 @@ <groupId>com.sun.xml.bind</groupId> <artifactId>jaxb-xjc</artifactId> <moduleName>com.sun.xml.bind</moduleName> - </module> - - <module> - <groupId>org.antlr</groupId> - <artifactId>antlr4-runtime</artifactId> - <moduleName>org.antlr.antlr4-runtime</moduleName> </module> </modules> diff --git a/backend/manager/dependencies/common/src/main/modules/org/antlr/antlr4-runtime/main/module.xml b/backend/manager/dependencies/common/src/main/modules/org/antlr/antlr4-runtime/main/module.xml deleted file mode 100644 index f665c8c..0000000 --- a/backend/manager/dependencies/common/src/main/modules/org/antlr/antlr4-runtime/main/module.xml +++ /dev/null @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<module xmlns="urn:jboss:module:1.1" name="org.antlr.antlr4-runtime"> - - <resources> - <resource-root path="antlr4-runtime.jar"/> - </resources> - - <dependencies> - <module name="org.slf4j"/> - </dependencies> - -</module> diff --git a/backend/manager/modules/utils/pom.xml b/backend/manager/modules/utils/pom.xml index 274e62b..e2cde4f 100644 --- a/backend/manager/modules/utils/pom.xml +++ b/backend/manager/modules/utils/pom.xml @@ -147,8 +147,9 @@ </dependency> <dependency> - <groupId>org.antlr</groupId> - <artifactId>antlr4-runtime</artifactId> + <groupId>antlr</groupId> + <artifactId>antlr</artifactId> + <scope>provided</scope> </dependency> </dependencies> @@ -171,14 +172,17 @@ <!-- Generate osinfo parser from grammer file--> <plugin> - <groupId>org.antlr</groupId> - <artifactId>antlr4-maven-plugin</artifactId> - <version>${antlr.version}</version> + <groupId>org.codehaus.mojo</groupId> + <artifactId>antlr-maven-plugin</artifactId> + <version>2.2</version> + <configuration> + <grammars>*.g4</grammars> + </configuration> <executions> <execution> <id>antlr</id> <goals> - <goal>antlr4</goal> + <goal>generate</goal> </goals> </execution> </executions> diff --git a/backend/manager/modules/utils/src/main/modules/org/ovirt/engine/core/utils/main/module.xml b/backend/manager/modules/utils/src/main/modules/org/ovirt/engine/core/utils/main/module.xml index 84c71d4..bd65af8 100644 --- a/backend/manager/modules/utils/src/main/modules/org/ovirt/engine/core/utils/main/module.xml +++ b/backend/manager/modules/utils/src/main/modules/org/ovirt/engine/core/utils/main/module.xml @@ -29,7 +29,7 @@ <module name="org.postgresql"/> <module name="org.springframework"/> <module name="org.slf4j"/> - <module name="org.antlr.antlr4-runtime"/> + <module name="org.antlr"/> </dependencies> </module> diff --git a/pom.xml b/pom.xml index ef57986..b96731d 100644 --- a/pom.xml +++ b/pom.xml @@ -110,7 +110,7 @@ <!-- https://jira.codehaus.org/browse/MGWT-350 --> <gwt-maven-plugin.workingRefresh.version>2.4.0</gwt-maven-plugin.workingRefresh.version> <cdi.api.version>1.0-SP4</cdi.api.version> - <antlr.version>4.2.2</antlr.version> + <antlr.version>2.7.7</antlr.version> </properties> <dependencyManagement> <dependencies> @@ -321,9 +321,10 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>org.antlr</groupId> - <artifactId>antlr4-runtime</artifactId> + <groupId>antlr</groupId> + <artifactId>antlr</artifactId> <version>${antlr.version}</version> + <scope>provided</scope> </dependency> </dependencies> </dependencyManagement> -- To view, visit http://gerrit.ovirt.org/35196 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie8aafb32578509590af1555a93ea6d6a99f6ae1c Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Alon Bar-Lev <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
