HSEARCH-1286 Update integration tests to JBoss AS 7.2 alpha1

hibernate · Apr 2, 2013 · 6769368 · 6769368
1 parent 6390397
commit 6769368
Show file tree

Hide file tree

Showing 8 changed files with 39 additions and 18 deletions.
diff --git a/hibernate-search-integrationtest/pom.xml b/hibernate-search-integrationtest/pom.xml
@@ -41,8 +41,8 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <spring-release-version>3.0.6.RELEASE</spring-release-version>
-        <version.jboss.as>7.1.1.Final</version.jboss.as>
-        <version.arquillian>1.0.0.Final</version.arquillian>
+        <version.jboss.as>7.2.0.Alpha1-redhat-4</version.jboss.as>
+        <version.arquillian>1.0.3.Final</version.arquillian>
         <version.shrinkwrapResolver>2.0.0-alpha-1</version.shrinkwrapResolver>
     </properties>
 
@@ -141,7 +141,7 @@
                                     <classifier>jbossas-71-dist</classifier>
                                     <type>zip</type>
                                     <overWrite>false</overWrite>
-                                    <outputDirectory>${project.build.directory}/jboss-as-${version.jboss.as}</outputDirectory>
+                                    <outputDirectory>${project.build.directory}/jboss-eap-6.1/modules</outputDirectory>
                                 </artifactItem>
                             </artifactItems>
                         </configuration>
@@ -160,7 +160,7 @@
                             <goal>copy-resources</goal>
                         </goals>
                         <configuration>
-                            <outputDirectory>${basedir}/target/jboss-as-${version.jboss.as}</outputDirectory>
+                            <outputDirectory>${basedir}/target/jboss-eap-6.1</outputDirectory>
                             <overwrite>true</overwrite>
                             <resources>
                                 <resource>
@@ -349,7 +349,7 @@
         <dependency>
             <groupId>org.jboss.as</groupId>
             <artifactId>jboss-as-arquillian-container-managed</artifactId>
-            <version>${version.jboss.as}</version>
+            <version>7.2.0.Final</version>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/...st/src/test/java/org/hibernate/search/test/integration/jbossas7/MemberRegistrationIT.java b/...st/src/test/java/org/hibernate/search/test/integration/jbossas7/MemberRegistrationIT.java
@@ -74,7 +74,6 @@ public static Archive<?> createTestArchive() {
 								.exclusion( "org.hibernate:hibernate-entitymanager" )
 								.exclusion( "org.hibernate:hibernate-core" )
 								.exclusion( "org.hibernate:hibernate-search-analyzers" )
-								.exclusion( "org.hibernate.common:hibernate-commons-annotations" )
 								.exclusion( "org.jboss.logging:jboss-logging" )
 								.resolveAs( JavaArchive.class ) )
 				.addAsWebInfResource( EmptyAsset.INSTANCE, "beans.xml" );

diff --git a/...est/src/test/java/org/hibernate/search/test/integration/jms/DeploymentJmsMasterSlave.java b/...est/src/test/java/org/hibernate/search/test/integration/jms/DeploymentJmsMasterSlave.java
@@ -159,7 +159,6 @@ private static void addLibraries(WebArchive archive) {
 					.exclusion( "org.hibernate:hibernate-entitymanager" )
 					.exclusion( "org.hibernate:hibernate-core" )
 					.exclusion( "org.hibernate:hibernate-search-analyzers" )
-					.exclusion( "org.hibernate.common:hibernate-commons-annotations" )
 					.exclusion( "org.jboss.logging:jboss-logging" )
 					.exclusion( "org.slf4j:slf4j-api" )
 					.resolveAsFiles();

diff --git a/hibernate-search-integrationtest/src/test/resources/arquillian.xml b/hibernate-search-integrationtest/src/test/resources/arquillian.xml
@@ -13,7 +13,7 @@
             <property name="executionType">REMOTE</property>
         </protocol>
         <configuration>
-            <property name="jbossHome">${basedir}/target/jboss-as-${version.jboss.as}</property>
+            <property name="jbossHome">${basedir}/target/jboss-eap-6.1</property>
             <!-- Needed for JMS tests -->
             <property name="serverConfig">standalone-securedjms.xml</property>
             <!-- To debug the Arquillian managed application server: -->

diff --git a/hibernate-search-modules/src/main/assembly/dist.xml b/hibernate-search-modules/src/main/assembly/dist.xml
@@ -32,35 +32,35 @@
     <files>
         <file>
             <source>${module.xml.basedir}/lucene/module.xml</source>
-            <outputDirectory>/modules/org/apache/lucene/${luceneVersion}</outputDirectory>
+            <outputDirectory>/org/apache/lucene/${luceneVersion}</outputDirectory>
             <filtered>true</filtered>
         </file>
         <file>
             <source>${module.xml.basedir}/solr/module.xml</source>
-            <outputDirectory>/modules/org/apache/solr/${luceneVersion}</outputDirectory>
+            <outputDirectory>/org/apache/solr/${luceneVersion}</outputDirectory>
             <filtered>true</filtered>
         </file>
         <file>
             <source>${module.xml.basedir}/search/engine/module.xml</source>
-            <outputDirectory>/modules/org/hibernate/search/engine/${hibernate.search.module.slot}</outputDirectory>
+            <outputDirectory>/org/hibernate/search/engine/${hibernate.search.module.slot}</outputDirectory>
             <filtered>true</filtered>
         </file>
         <file>
             <source>${module.xml.basedir}/search/orm/module.xml</source>
-            <outputDirectory>/modules/org/hibernate/search/orm/${hibernate.search.module.slot}</outputDirectory>
+            <outputDirectory>/org/hibernate/search/orm/${hibernate.search.module.slot}</outputDirectory>
             <filtered>true</filtered>
         </file>
         <file>
             <source>${module.xml.basedir}/infinispan/lucene-directory/module.xml</source>
-            <outputDirectory>/modules/org/infinispan/lucene-directory/${infinispanVersion}</outputDirectory>
+            <outputDirectory>/org/infinispan/lucene-directory/${infinispanVersion}</outputDirectory>
             <filtered>true</filtered>
         </file>
     </files>
 
     <dependencySets>
         <dependencySet>
             <useProjectArtifact>false</useProjectArtifact>
-            <outputDirectory>modules/org/hibernate/search/engine/${hibernate.search.module.slot}</outputDirectory>
+            <outputDirectory>org/hibernate/search/engine/${hibernate.search.module.slot}</outputDirectory>
             <useTransitiveFiltering>true</useTransitiveFiltering>
             <unpack>false</unpack>
             <includes>
@@ -79,7 +79,7 @@
 
         <dependencySet>
             <useProjectArtifact>false</useProjectArtifact>
-            <outputDirectory>modules/org/hibernate/search/orm/${hibernate.search.module.slot}</outputDirectory>
+            <outputDirectory>org/hibernate/search/orm/${hibernate.search.module.slot}</outputDirectory>
             <useTransitiveFiltering>false</useTransitiveFiltering>
             <unpack>false</unpack>
             <includes>
@@ -89,7 +89,7 @@
 
         <dependencySet>
             <useProjectArtifact>false</useProjectArtifact>
-            <outputDirectory>/modules/org/infinispan/lucene-directory/${infinispanVersion}</outputDirectory>
+            <outputDirectory>org/infinispan/lucene-directory/${infinispanVersion}</outputDirectory>
             <useTransitiveFiltering>false</useTransitiveFiltering>
             <unpack>false</unpack>
             <includes>
@@ -99,7 +99,7 @@
 
         <dependencySet>
             <useProjectArtifact>false</useProjectArtifact>
-            <outputDirectory>modules/org/apache/lucene/${luceneVersion}</outputDirectory>
+            <outputDirectory>org/apache/lucene/${luceneVersion}</outputDirectory>
             <useTransitiveFiltering>false</useTransitiveFiltering>
             <unpack>false</unpack>
             <includes>
@@ -110,7 +110,7 @@
 
         <dependencySet>
             <useProjectArtifact>false</useProjectArtifact>
-            <outputDirectory>modules/org/apache/solr/${luceneVersion}</outputDirectory>
+            <outputDirectory>org/apache/solr/${luceneVersion}</outputDirectory>
             <useTransitiveFiltering>true</useTransitiveFiltering>
             <unpack>false</unpack>
             <includes>

diff --git a/hibernate-search-modules/src/main/modules/search/engine/module.xml b/hibernate-search-modules/src/main/modules/search/engine/module.xml
@@ -36,6 +36,7 @@
     <dependencies>
         <module name="javax.transaction.api" />
         <module name="org.hibernate" />
+        <module name="org.hibernate.commons-annotations" />
         <module name="org.apache.lucene" export="true" slot="${luceneVersion}" />
         <module name="org.apache.solr" export="true" optional="true" slot="${luceneVersion}" />
         <module name="org.infinispan.lucene-directory" slot="${infinispanVersion}" />

diff --git a/hibernate-search-modules/src/main/modules/search/orm/module.xml b/hibernate-search-modules/src/main/modules/search/orm/module.xml
@@ -29,6 +29,7 @@
     <dependencies>
         <module name="javax.transaction.api" />
         <module name="org.hibernate" />
+        <module name="org.hibernate.commons-annotations" />
         <module name="org.hibernate.search.engine" export="true" services="import" slot="${hibernate.search.module.slot}" />
         <module name="org.jboss.logging" />
         <module name="javax.persistence.api" />

diff --git a/settings-example.xml b/settings-example.xml
@@ -288,6 +288,26 @@ under the License.
             </pluginRepositories>
         </profile>
 
+        <!-- Include early access of application server and other products -->
+        <profile>
+            <id>redhat-earlyaccess-repository</id>
+            <repositories>
+                <repository>
+                    <id>redhat-earlyaccess-repository-group</id>
+                    <name>Red Hat early access repository</name>
+                    <url>http://maven.repository.redhat.com/earlyaccess/all/</url>
+                    <layout>default</layout>
+                    <releases>
+                        <enabled>true</enabled>
+                        <updatePolicy>never</updatePolicy>
+                    </releases>
+                    <snapshots>
+                        <enabled>true</enabled>
+                        <updatePolicy>never</updatePolicy>
+                    </snapshots>
+                </repository>
+            </repositories>
+        </profile>
 
         <profile>
             <id>jboss-deprecated-repository</id>
@@ -315,6 +335,7 @@ under the License.
     <!-- jboss.org config start -->
     <activeProfiles>
         <activeProfile>jboss-public-repository</activeProfile>
+        <activeProfile>redhat-earlyaccess-repository</activeProfile>
     </activeProfiles>
     <!-- jboss.org config end -->