HSEARCH-2434 Test on ES5 by default (instead of ES2)

hibernate · Mar 21, 2017 · 867f49f · 867f49f
1 parent 3cd9b46
commit 867f49f
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 31 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -48,8 +48,8 @@ script:
     "mariadb") BUILD_OPTIONS+=' -Pci-mariadb' ;;
     esac
   - case $ELASTICSEARCH in
-    2.0) BUILD_OPTIONS+=' -P!elasticsearch-2.2,elasticsearch-2.0' ;;
-    2.2) ;;
-    5.0) BUILD_OPTIONS+=' -P!elasticsearch-2.2,elasticsearch-5.0' ;;
+    2.0) BUILD_OPTIONS+=' -P!elasticsearch-5.0,elasticsearch-2.0' ;;
+    2.2) BUILD_OPTIONS+=' -P!elasticsearch-5.0,elasticsearch-2.2' ;;
+    5.0) ;;
     esac
   - ./mvnw -s settings-example.xml -Pdocs,dist $BUILD_OPTIONS clean install
diff --git a/README.md b/README.md
@@ -83,8 +83,8 @@ You may redefine the version to use by specifying the right profile and using th
 The following profiles are available:
 
  * `elasticsearch-2.0` for 2.0.x and 2.1.x
- * `elasticsearch-2.2` for 2.2.x and later 2.x (the default)
- * `elasticsearch-5.0` for 5.x
+ * `elasticsearch-2.2` for 2.2.x and later 2.x
+ * `elasticsearch-5.0` for 5.x (the default)
 
 A list of available versions for `testElasticsearchVersion` can be found on
 [Maven Central](http://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22org.elasticsearch%22%20AND%20a%3A%22elasticsearch%22).

diff --git a/backends/jgroups/pom.xml b/backends/jgroups/pom.xml
@@ -227,12 +227,6 @@
         </profile>
         <profile>
             <id>elasticsearch-2.2</id>
-            <!-- Activation rules are not inherited from the profile definition in the parent, so we must copy them here -->
-            <activation>
-                <property>
-                    <name>!testElasticsearchVersion</name>
-                </property>
-            </activation>
             <build>
                 <plugins>
                     <plugin>
@@ -263,6 +257,12 @@
         </profile>
         <profile>
             <id>elasticsearch-5.0</id>
+            <!-- Activation rules are not inherited from the profile definition in the parent, so we must copy them here -->
+            <activation>
+                <property>
+                    <name>!testElasticsearchVersion</name>
+                </property>
+            </activation>
             <build>
                 <plugins>
                     <plugin>

diff --git a/elasticsearch/pom.xml b/elasticsearch/pom.xml
@@ -373,12 +373,6 @@
         </profile>
         <profile>
             <id>elasticsearch-2.2</id>
-            <!-- Activation rules are not inherited from the profile definition in the parent, so we must copy them here -->
-            <activation>
-                <property>
-                    <name>!testElasticsearchVersion</name>
-                </property>
-            </activation>
             <build>
                 <plugins>
                     <plugin>
@@ -458,6 +452,12 @@
         </profile>
         <profile>
             <id>elasticsearch-5.0</id>
+            <!-- Activation rules are not inherited from the profile definition in the parent, so we must copy them here -->
+            <activation>
+                <property>
+                    <name>!testElasticsearchVersion</name>
+                </property>
+            </activation>
             <build>
                 <plugins>
                     <plugin>

diff --git a/integrationtest/wildfly/pom.xml b/integrationtest/wildfly/pom.xml
@@ -395,12 +395,6 @@
         </profile>
         <profile>
             <id>elasticsearch-2.2</id>
-            <!-- Activation rules are not inherited from the profile definition in the parent, so we must copy them here -->
-            <activation>
-                <property>
-                    <name>!testElasticsearchVersion</name>
-                </property>
-            </activation>
             <build>
                 <plugins>
                     <plugin>
@@ -434,6 +428,12 @@
         </profile>
         <profile>
             <id>elasticsearch-5.0</id>
+            <!-- Activation rules are not inherited from the profile definition in the parent, so we must copy them here -->
+            <activation>
+                <property>
+                    <name>!testElasticsearchVersion</name>
+                </property>
+            </activation>
             <build>
                 <plugins>
                     <plugin>

diff --git a/pom.xml b/pom.xml
@@ -1529,15 +1529,9 @@ org.jboss.logging.BasicLogger#debugf(java.lang.Throwable, java.lang.String, long
             </build>
         </profile>
 
-        <!-- Elasticsearch 2.2+ test environment (default) -->
+        <!-- Elasticsearch 2.2+ test environment -->
         <profile>
             <id>elasticsearch-2.2</id>
-            <activation>
-                <!-- Activate by default, i.e. if testElasticsearchVersion has not been defined explicitly -->
-                <property>
-                    <name>!testElasticsearchVersion</name>
-                </property>
-            </activation>
             <properties>
                 <testElasticsearchMavenPluginVersion>2.2</testElasticsearchMavenPluginVersion>
                 <testElasticsearchVersion>2.4.4</testElasticsearchVersion>
@@ -1569,9 +1563,15 @@ org.jboss.logging.BasicLogger#debugf(java.lang.Throwable, java.lang.String, long
             </build>
         </profile>
 
-        <!-- Elasticsearch 5.x test environment -->
+        <!-- Elasticsearch 5.x test environment (default) -->
         <profile>
             <id>elasticsearch-5.0</id>
+            <activation>
+                <!-- Activate by default, i.e. if testElasticsearchVersion has not been defined explicitly -->
+                <property>
+                    <name>!testElasticsearchVersion</name>
+                </property>
+            </activation>
             <properties>
                 <testElasticsearchMavenPluginVersion>5.7</testElasticsearchMavenPluginVersion>
                 <testElasticsearchVersion>5.2.1</testElasticsearchVersion>