Skip to content

Commit

Permalink
HSEARCH-3194 Upgrade feature packs and integration tests to WildFly 13
Browse files Browse the repository at this point in the history
  • Loading branch information
@yrodiere
yrodiere committed Nov 22, 2018
1 parent 3f807bb commit d8a69d9
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 134 deletions.
2 changes: 1 addition & 1 deletion documentation/src/main/asciidoc/configuration.asciidoc
View file
Expand Up @@ -1408,7 +1408,7 @@ configuration.
Hibernate Search is included in the WildFly application server, and since WildFly 10 the module
is automatically activated (added to the classpath of your deployment) if you are using Hibernate ORM and have any indexed entities.

WildFly 11 and 12 include an older version of Hibernate Search; if you want to use that then you won't need to download anything else and you can stop reading this chapter; however you might miss out on several new features and improvements.
WildFly 12 and 13 include an older version of Hibernate Search; if you want to use that then you won't need to download anything else and you can stop reading this chapter; however you might miss out on several new features and improvements.
When deciding to use the older version make sure to read the version of this guide matching the version of Hibernate Search included in your application server: this guide applies to `{hibernateSearchVersion}` exclusively.

We strongly suggest using the latest version. Doing so is not much harder: provision a WildFly server using the dedicated tool,
Expand Down
48 changes: 0 additions & 48 deletions integrationtest/performance/orm/pom.xml
View file
Expand Up @@ -272,54 +272,6 @@
</artifactItems>
</configuration>
</execution>
<execution>
<id>fetch-jpa-patch</id>
<!-- Must execute after "generate-test-resources", during which we create the WildFly directory -->
<phase>process-test-resources</phase>
<goals>
<goal>copy</goal>
</goals>
<configuration>
<skip>${skipWildFlyPreparation}</skip>
<artifactItems>
<artifactItem>
<groupId>org.hibernate.javax.persistence</groupId>
<artifactId>hibernate-jpa-api-2.2-wildflymodules</artifactId>
<classifier>wildfly-${version.wildfly}-patch</classifier>
<version>${version.jpa22.wildfly-patch}</version>
<type>zip</type>
<outputDirectory>${project.build.directory}</outputDirectory>
<overWrite>true</overWrite>
<destFileName>${test.jpa22.wildfly-patch.filename}</destFileName>
</artifactItem>
</artifactItems>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.wildfly.plugins</groupId>
<artifactId>wildfly-maven-plugin</artifactId>
<executions>
<!-- Install JPA 2.2 patch -->
<execution>
<id>apply-wildfly-patch-file</id>
<phase>process-test-classes</phase>
<goals>
<goal>execute-commands</goal>
</goals>
<configuration>
<skip>${skipWildFlyPreparation}</skip>
<offline>true</offline>
<jbossHome>${jbosshome}</jbossHome>
<javaOpts>${test.container.jbossmodules.args}</javaOpts>
<!-- The CLI script below will fail if the patch was already applied in a previous build -->
<fail-on-error>false</fail-on-error>
<commands>
<command>patch apply --override-all ${project.build.directory}/${test.jpa22.wildfly-patch.filename}</command>
</commands>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
Expand Down
73 changes: 0 additions & 73 deletions integrationtest/wildfly/pom.xml
View file
Expand Up @@ -463,79 +463,6 @@
</dependency>
</dependencies>
</plugin>
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
<id>fetch-jpa-patch</id>
<phase>generate-test-resources</phase>
<goals>
<goal>copy</goal>
</goals>
<configuration>
<skip>${skipWildFlyPreparation}</skip>
<artifactItems>
<artifactItem>
<groupId>org.hibernate.javax.persistence</groupId>
<artifactId>hibernate-jpa-api-2.2-wildflymodules</artifactId>
<classifier>wildfly-${version.wildfly}-patch</classifier>
<version>${version.jpa22.wildfly-patch}</version>
<type>zip</type>
<outputDirectory>${project.build.directory}</outputDirectory>
<overWrite>true</overWrite>
<destFileName>${test.jpa22.wildfly-patch.filename}</destFileName>
</artifactItem>
</artifactItems>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.wildfly.plugins</groupId>
<artifactId>wildfly-maven-plugin</artifactId>
<executions>
<!-- Install JPA 2.2 patch on node1 -->
<execution>
<id>apply-wildfly-node1-jpa22-patch-file</id>
<!-- Must execute after "generate-test-resources", during which we create the WildFly directory -->
<phase>process-test-resources</phase>
<goals>
<goal>execute-commands</goal>
</goals>
<configuration>
<skip>${skipWildFlyPreparation}</skip>
<offline>true</offline>
<jbossHome>${jbossHome.node1}</jbossHome>
<javaOpts>${test.container.jbossmodules.args}</javaOpts>
<!-- The CLI script below will fail if the patch was already applied in a previous build -->
<fail-on-error>false</fail-on-error>
<commands>
<command>patch apply --override-all ${project.build.directory}/${test.jpa22.wildfly-patch.filename}</command>
</commands>
</configuration>
</execution>
<!-- Install JPA 2.2 patch on node2 -->
<execution>
<id>apply-wildfly-node2-jpa22-patch-file</id>
<!-- Must execute after "generate-test-resources", during which we create the WildFly directory -->
<phase>process-test-resources</phase>
<goals>
<goal>execute-commands</goal>
</goals>
<configuration>
<skip>${skipWildFlyPreparation}</skip>
<offline>true</offline>
<jbossHome>${jbossHome.node2}</jbossHome>
<javaOpts>${test.container.jbossmodules.args}</javaOpts>
<!-- The CLI script below will fail if the patch was already applied in a previous build -->
<fail-on-error>false</fail-on-error>
<commands>
<command>patch apply --override-all ${project.build.directory}/${test.jpa22.wildfly-patch.filename}</command>
</commands>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
Expand Down
16 changes: 4 additions & 12 deletions pom.xml
View file
Expand Up @@ -190,7 +190,7 @@

<version.org.infinispan>9.2.2.Final</version.org.infinispan>

<version.wildfly>12.0.0.Final</version.wildfly>
<version.wildfly>13.0.0.Final</version.wildfly>

<version.org.jboss.spec.javax.jms.jboss-jms-api_2.0_spec>1.0.2.Final</version.org.jboss.spec.javax.jms.jboss-jms-api_2.0_spec>
<version.org.apache.activemq.broker>5.13.3</version.org.apache.activemq.broker>
Expand All @@ -209,11 +209,11 @@
<version.xml-apis>1.3.03</version.xml-apis>

<version.org.jboss.spec.javax.annotation.jboss-annotations-api_1.2_spec>1.0.2.Final</version.org.jboss.spec.javax.annotation.jboss-annotations-api_1.2_spec>
<version.org.jboss.spec.javax.ejb.jboss-ejb-api_3.2_spec>1.0.0.Final</version.org.jboss.spec.javax.ejb.jboss-ejb-api_3.2_spec>
<version.org.jboss.spec.javax.ejb.jboss-ejb-api_3.2_spec>1.0.1.Final</version.org.jboss.spec.javax.ejb.jboss-ejb-api_3.2_spec>
<version.org.jboss.ejb3.ext-api>2.2.0.Final</version.org.jboss.ejb3.ext-api>
<version.javax.inject>1</version.javax.inject>
<version.javax.enterprise>2.0</version.javax.enterprise>
<version.org.jboss.narayana>5.5.31.Final</version.org.jboss.narayana>
<version.org.jboss.narayana>5.8.1.Final</version.org.jboss.narayana>
<version.org.jboss.spec.javax.transaction.jboss-transaction-api_1.2_spec>1.1.1.Final</version.org.jboss.spec.javax.transaction.jboss-transaction-api_1.2_spec>
<version.org.jboss.jboss-transaction-spi>7.6.0.Final</version.org.jboss.jboss-transaction-spi>

Expand All @@ -229,7 +229,7 @@

<!-- JSR 352 -->
<version.javax.batch>1.0</version.javax.batch>
<!-- in line with the version used in WildFly 11 -->
<!-- in line with the version used in WildFly 13 -->
<version.org.jberet>1.2.4.Final</version.org.jberet>
<!-- they didn't publish the javadoc for the other 1.2.x -->
<version.org.jberet.javadoc>1.2.0.Final</version.org.jberet.javadoc>
Expand Down Expand Up @@ -274,8 +274,6 @@
<version.org.apache.karaf>4.2.1</version.org.apache.karaf>
<version.org.ops4j.pax.exam>4.12.0</version.org.ops4j.pax.exam>
<version.org.ops4j.pax.url>2.5.4</version.org.ops4j.pax.url>
<version.jpa22.wildfly-patch>1.0.0.Beta2</version.jpa22.wildfly-patch>
<test.jpa22.wildfly-patch.filename>hibernate-jpa-api-2.2-wildflymodules-${version.jpa22.wildfly-patch}-wildfly-${version.wildfly}-patch.zip</test.jpa22.wildfly-patch.filename>

<!-- OSGi ranges for some primary dependencies -->

Expand Down Expand Up @@ -332,7 +330,6 @@
<!-- Surefire versions are a minefield of bugs: be careful with upgrades -->
<version.surefire.plugin>2.21.0</version.surefire.plugin>
<version.failsafe.plugin>${version.surefire.plugin}</version.failsafe.plugin>
<version.wildfly.plugin>1.2.1.Final</version.wildfly.plugin>
<version.org.wildfly.build-tools>1.2.9.Final</version.org.wildfly.build-tools>
<version.jacoco.plugin>0.8.0</version.jacoco.plugin>
<version.coveralls.plugin>4.3.0</version.coveralls.plugin>
Expand Down Expand Up @@ -1366,11 +1363,6 @@
<artifactId>wildfly-server-provisioning-maven-plugin</artifactId>
<version>${version.org.wildfly.build-tools}</version>
</plugin>
<plugin>
<groupId>org.wildfly.plugins</groupId>
<artifactId>wildfly-maven-plugin</artifactId>
<version>${version.wildfly.plugin}</version>
</plugin>
<plugin>
<groupId>com.github.marschall</groupId>
<artifactId>jdeps-maven-plugin</artifactId>
Expand Down

0 comments on commit d8a69d9

Please sign in to comment.