Skip to content

Commit

Permalink
WFLY-10237: Upgrade HAL to 3.0.0.Alpha3
Browse files Browse the repository at this point in the history
  • Loading branch information
@hpehl
hpehl committed Apr 18, 2018
1 parent e6438a4 commit 3fa8de2
Show file tree
Hide file tree
Showing 4 changed files with 70 additions and 26 deletions.
86 changes: 65 additions & 21 deletions component-matrix/pom.xml
View file
Expand Up @@ -155,7 +155,7 @@
<version.org.jboss.ejb-client-legacy>3.0.2.Final</version.org.jboss.ejb-client-legacy>
<version.org.jboss.ejb3.ext-api>2.2.0.Final</version.org.jboss.ejb3.ext-api>
<version.org.jboss.genericjms>2.0.1.Final</version.org.jboss.genericjms>
<version.org.jboss.hal.release-stream>2.9.16.Final</version.org.jboss.hal.release-stream>
<version.org.jboss.hal.console>3.0.0.Alpha3</version.org.jboss.hal.console>
<version.org.jboss.iiop-client>1.0.1.Final</version.org.jboss.iiop-client>
<version.org.jboss.ironjacamar>1.4.8.Final</version.org.jboss.ironjacamar>
<version.org.jboss.jboss-transaction-spi>7.6.0.Final</version.org.jboss.jboss-transaction-spi>
Expand Down Expand Up @@ -3949,45 +3949,89 @@

<dependency>
<groupId>org.jboss.hal</groupId>
<artifactId>release-stream</artifactId>
<version>${version.org.jboss.hal.release-stream}</version>
<artifactId>hal-console</artifactId>
<version>${version.org.jboss.hal.console}</version>
<classifier>resources</classifier>
<exclusions>
<exclusion>
<artifactId>gin</artifactId>
<groupId>com.google.gwt.inject</groupId>
<artifactId>hal-ballroom</artifactId>
<groupId>org.jboss.hal</groupId>
</exclusion>
<exclusion>
<artifactId>guice</artifactId>
<groupId>com.google.inject</groupId>
<artifactId>hal-config</artifactId>
<groupId>org.jboss.hal</groupId>
</exclusion>
<exclusion>
<artifactId>gwtp-all</artifactId>
<groupId>com.gwtplatform</groupId>
<artifactId>hal-core</artifactId>
<groupId>org.jboss.hal</groupId>
</exclusion>
<exclusion>
<artifactId>hal-dmr</artifactId>
<groupId>org.jboss.hal</groupId>
</exclusion>
<exclusion>
<artifactId>hal-flow</artifactId>
<groupId>org.jboss.hal</groupId>
</exclusion>
<exclusion>
<artifactId>hal-js</artifactId>
<groupId>org.jboss.hal</groupId>
</exclusion>
<exclusion>
<artifactId>hal-meta</artifactId>
<groupId>org.jboss.hal</groupId>
</exclusion>
<exclusion>
<artifactId>hal-processors</artifactId>
<groupId>org.jboss.hal</groupId>
</exclusion>
<exclusion>
<artifactId>hal-resources</artifactId>
<groupId>org.jboss.hal</groupId>
</exclusion>
<exclusion>
<artifactId>hal-spi</artifactId>
<groupId>org.jboss.hal</groupId>
</exclusion>
<exclusion>
<artifactId>hal-theme-hal</artifactId>
<groupId>org.jboss.hal</groupId>
</exclusion>
<exclusion>
<artifactId>elemento-core</artifactId>
<groupId>org.jboss.gwt.elemento</groupId>
</exclusion>
<exclusion>
<artifactId>gwt-visualization</artifactId>
<groupId>com.google.code</groupId>
<artifactId>elemento-widget</artifactId>
<groupId>org.jboss.gwt.elemento</groupId>
</exclusion>
<exclusion>
<artifactId>elemento-template-api</artifactId>
<groupId>org.jboss.gwt.elemento</groupId>
</exclusion>
<exclusion>
<artifactId>gwtp-all</artifactId>
<groupId>com.gwtplatform</groupId>
</exclusion>
<exclusion>
<artifactId>gwt-log</artifactId>
<groupId>com.google.code.gwt-log</groupId>
<artifactId>gwt-elemental</artifactId>
<groupId>com.google.gwt</groupId>
</exclusion>
<exclusion>
<artifactId>guice-assistedinject</artifactId>
<groupId>com.google.inject.extensions</groupId>
<artifactId>guava-gwt</artifactId>
<groupId>com.google.guava</groupId>
</exclusion>
<exclusion>
<artifactId>guice-assisted-inject</artifactId>
<groupId>com.mycila.com.google.inject.extensions</groupId>
<artifactId>rxgwt</artifactId>
<groupId>com.intendia.gwt.rxgwt</groupId>
</exclusion>
<exclusion>
<artifactId>jboss-as-console-dialogs</artifactId>
<groupId>org.jboss.as</groupId>
<artifactId>slf4j-gwt</artifactId>
<groupId>ru.finam</groupId>
</exclusion>
<exclusion>
<artifactId>jboss-as-console-resources</artifactId>
<groupId>org.jboss.as</groupId>
<artifactId>gwt-user</artifactId>
<groupId>com.google.gwt</groupId>
</exclusion>
</exclusions>
</dependency>
Expand Down
2 changes: 1 addition & 1 deletion feature-pack/pom.xml
View file
Expand Up @@ -2607,7 +2607,7 @@
</dependency>
<dependency>
<groupId>org.jboss.hal</groupId>
<artifactId>release-stream</artifactId>
<artifactId>hal-console</artifactId>
<classifier>resources</classifier>
</dependency>

Expand Down
6 changes: 3 additions & 3 deletions feature-pack/src/license/full-feature-pack-licenses.xml
View file
Expand Up @@ -2720,11 +2720,11 @@
</dependency>
<dependency>
<groupId>org.jboss.hal</groupId>
<artifactId>release-stream</artifactId>
<artifactId>hal-console</artifactId>
<licenses>
<license>
<name>GNU Lesser General Public License v2.1 only</name>
<url>http://www.gnu.org/licenses/old-licenses/lgpl-2.1-standalone.html</url>
<name>Apache License 2.0</name>
<url>http://www.apache.org/licenses/LICENSE-2.0</url>
<distribution>repo</distribution>
</license>
</licenses>
Expand Down
2 changes: 1 addition & 1 deletion ...e-pack/src/main/resources/modules/system/layers/base/org/jboss/as/console/main/module.xml
View file
Expand Up @@ -28,7 +28,7 @@
</properties>

<resources>
<artifact name="${org.jboss.hal:release-stream::resources}"/>
<artifact name="${org.jboss.hal:hal-console::resources}"/>
</resources>

<dependencies>
Expand Down

0 comments on commit 3fa8de2

Please sign in to comment.