Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ARTEMIS-2359 Upgrade to Guava 24.1 #2687

Merged
merged 1 commit into from May 31, 2019
Merged

ARTEMIS-2359 Upgrade to Guava 24.1 #2687

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 7 additions & 0 deletions artemis-hawtio/artemis-console/pom.xml
View file
Open in desktop
Expand Up @@ -67,6 +67,12 @@
<version>${hawtio.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>${guava.version}</version>
<!-- License: Apache 2.0 -->
</dependency>
</dependencies>

<build>
Expand Down Expand Up @@ -110,6 +116,7 @@
<exclude>bower_components/jquery/src/**/*</exclude>
<exclude>bower_components/jquery/test/**/*</exclude>
<exclude>bower_components/js-logger/src/**/*</exclude>
<excluse>WEB-INF/lib/guava*.jar</excluse>
<excluse>WEB-INF/lib/slf4j-api*.jar</excluse>
<excluse>lib/camelModel.js</excluse>
<exclude>app/activemq/**/*</exclude>
Expand Down
10 changes: 8 additions & 2 deletions pom.xml
View file
Open in desktop
Expand Up @@ -84,7 +84,7 @@
<commons.beanutils.version>1.9.3</commons.beanutils.version>
<commons.collections.version>3.2.2</commons.collections.version>
<fuse.mqtt.client.version>1.14</fuse.mqtt.client.version>
<guava.version>19.0</guava.version>
<guava.version>24.1-jre</guava.version>
<jboss.logging.version>3.4.0.Final</jboss.logging.version>
<jetty.version>9.4.3.v20170317</jetty.version>
<jgroups.version>3.6.13.Final</jgroups.version>
Expand All @@ -103,7 +103,7 @@
<jb.logmanager.version>2.1.10.Final</jb.logmanager.version>
<jb.slf4j-jboss-logmanager.version>1.0.4.GA</jb.slf4j-jboss-logmanager.version>
<version.org.wildfly.common.wildfly-common>1.5.1.Final</version.org.wildfly.common.wildfly-common>
<airlift.version>0.7</airlift.version>
<airlift.version>0.8</airlift.version>
<geronimo.annotation.1.1.spec.version>1.0.1</geronimo.annotation.1.1.spec.version>
<geronimo.ejb.3.0.spec.version>1.0.1</geronimo.ejb.3.0.spec.version>
<geronimo.jta.1.1.spec.version>1.1.1</geronimo.jta.1.1.spec.version>
Expand Down Expand Up @@ -800,6 +800,12 @@
<scope>provided</scope>
<!-- License: Apache 2.0 -->
</dependency>
<dependency>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Guava is only used by airlift.. Do we really need to add the dependency globally?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see your point but airlift/airline is added as global dependency and Guava is used by artemis-cli (XmlDataExporterUtil), by integrations-tests (MethodCalledVerifier) by airlift/airline and by hawtio/web.
Airlift/airline is added as global dependency, as artemis-cli dependency and as artemis-distribution dependency.
Hawtio/web is added as artemis-console dependency.

<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>${guava.version}</version>
<!-- License: Apache 2.0 -->
</dependency>
</dependencies>

</dependencyManagement>
Expand Down