You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ol...@apache.org on 2020/11/25 09:42:38 UTC

[sling-org-apache-sling-karaf-launchpad-oak-tar-integration-tests] branch master updated: drop profile it

This is an automated email from the ASF dual-hosted git repository.

olli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-karaf-launchpad-oak-tar-integration-tests.git


The following commit(s) were added to refs/heads/master by this push:
     new 3903b6b  drop profile it
3903b6b is described below

commit 3903b6b8b4ff00b7a6e564f879746c3060ce323c
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Sun Nov 1 20:06:20 2020 +0100

    drop profile it
---
 pom.xml | 177 ++++++++++++++++++++++++++++++----------------------------------
 1 file changed, 82 insertions(+), 95 deletions(-)

diff --git a/pom.xml b/pom.xml
index 312a79e..73aa754 100644
--- a/pom.xml
+++ b/pom.xml
@@ -198,102 +198,89 @@
           <failOnMissing>false</failOnMissing>
         </configuration>
       </plugin>
-    </plugins>
-  </build>
-
-  <profiles>
-    <profile>
-      <id>it</id>
-      <activation>
-        <jdk>[1.8,)</jdk>
-      </activation>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.ops4j.pax.exam</groupId>
-            <artifactId>exam-maven-plugin</artifactId>
-            <configuration>
-              <configClass>org.apache.sling.karaf.tests.configuration.SlingQuickstartOakTarConfiguration</configClass>
-              <propagatedProperties>
-                http.port
-              </propagatedProperties>
-            </configuration>
-            <executions>
-              <execution>
-                <goals>
-                  <goal>start-container</goal>
-                  <goal>stop-container</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-          <plugin>
-            <groupId>org.apache.servicemix.tooling</groupId>
-            <artifactId>depends-maven-plugin</artifactId>
-          </plugin>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-failsafe-plugin</artifactId>
-            <executions>
-              <execution>
-                <goals>
-                  <goal>integration-test</goal>
-                  <goal>verify</goal>
-                </goals>
-              </execution>
-            </executions>
+      <plugin>
+        <groupId>org.ops4j.pax.exam</groupId>
+        <artifactId>exam-maven-plugin</artifactId>
+        <configuration>
+          <configClass>org.apache.sling.karaf.tests.configuration.SlingQuickstartOakTarConfiguration</configClass>
+          <propagatedProperties>
+            http.port
+          </propagatedProperties>
+        </configuration>
+        <executions>
+          <execution>
+            <goals>
+              <goal>start-container</goal>
+              <goal>stop-container</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.servicemix.tooling</groupId>
+        <artifactId>depends-maven-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-failsafe-plugin</artifactId>
+        <executions>
+          <execution>
+            <goals>
+              <goal>integration-test</goal>
+              <goal>verify</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <redirectTestOutputToFile>true</redirectTestOutputToFile>
+          <systemPropertyVariables>
+            <launchpad.http.server.url>http://localhost:${http.port}</launchpad.http.server.url>
+            <server.ready.path.1>/:script src="/system/sling.js"</server.ready.path.1>
+            <server.ready.path.2>/bin/browser.html</server.ready.path.2>
+            <server.ready.path.3>/sling-test/sling/sling-test.html:Sling client library tests</server.ready.path.3>
+            <server.ready.path.4>/org.apache.sling.launchpad.testservices.repository.FirstRepositoryInitializer/SecondRepositoryInitializer.txt</server.ready.path.4>
+            <server.ready.timeout.seconds>120</server.ready.timeout.seconds>
+          </systemPropertyVariables>
+          <dependenciesToScan>
+            <dependency>org.apache.sling:org.apache.sling.launchpad.integration-tests</dependency>
+          </dependenciesToScan>
+          <includes>
+            <include>**/*Test.class</include>
+          </includes>
+          <excludes>
+            <exclude>org/apache/sling/launchpad/webapp/integrationtest/servlets/resolution/WarSelectorServletTest.*</exclude>
+            <!-- SLING-5414 Launchpad/Provisioning Model only -->
+            <exclude>org/apache/sling/launchpad/webapp/integrationtest/provisioning/EmbeddedModelTest.*</exclude>
+          </excludes>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>build-helper-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <goals>
+              <goal>reserve-network-port</goal>
+            </goals>
             <configuration>
-              <redirectTestOutputToFile>true</redirectTestOutputToFile>
-              <systemPropertyVariables>
-                <launchpad.http.server.url>http://localhost:${http.port}</launchpad.http.server.url>
-                <server.ready.path.1>/:script src="/system/sling.js"</server.ready.path.1>
-                <server.ready.path.2>/bin/browser.html</server.ready.path.2>
-                <server.ready.path.3>/sling-test/sling/sling-test.html:Sling client library tests</server.ready.path.3>
-                <server.ready.path.4>/org.apache.sling.launchpad.testservices.repository.FirstRepositoryInitializer/SecondRepositoryInitializer.txt</server.ready.path.4>
-                <server.ready.timeout.seconds>120</server.ready.timeout.seconds>
-              </systemPropertyVariables>
-              <dependenciesToScan>
-                <dependency>org.apache.sling:org.apache.sling.launchpad.integration-tests</dependency>
-              </dependenciesToScan>
-              <includes>
-                <include>**/*Test.class</include>
-              </includes>
-              <excludes>
-                <exclude>org/apache/sling/launchpad/webapp/integrationtest/servlets/resolution/WarSelectorServletTest.*</exclude>
-                <!-- SLING-5414 Launchpad/Provisioning Model only -->
-                <exclude>org/apache/sling/launchpad/webapp/integrationtest/provisioning/EmbeddedModelTest.*</exclude>
-              </excludes>
+              <portNames>
+                <portName>http.port</portName>
+              </portNames>
             </configuration>
-          </plugin>
-          <plugin>
-            <groupId>org.codehaus.mojo</groupId>
-            <artifactId>build-helper-maven-plugin</artifactId>
-            <executions>
-              <execution>
-                <goals>
-                  <goal>reserve-network-port</goal>
-                </goals>
-                <configuration>
-                  <portNames>
-                    <portName>http.port</portName>
-                  </portNames>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-enforcer-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>ban-felix-scr-annotations</id>
-                <phase>none</phase>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-enforcer-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>ban-felix-scr-annotations</id>
+            <phase>none</phase>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
 
 </project>