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:26 UTC

[sling-org-apache-sling-karaf-integration-tests] branch master updated (5cf4d04 -> 066dc47)

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

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


    from 5cf4d04  SLING-9837 Use OSGi R7 HTTP Service
     new e233a03  pull build section up and drop profile it
     new 066dc47  SLING-3027 Improve Launchpad Karaf Features

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 pom.xml                                            | 75 +++++++++-------------
 .../karaf/tests/bootstrap/ComposumNodesIT.java     | 20 +++---
 2 files changed, 41 insertions(+), 54 deletions(-)


[sling-org-apache-sling-karaf-integration-tests] 02/02: SLING-3027 Improve Launchpad Karaf Features

Posted by ol...@apache.org.
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-integration-tests.git

commit 066dc472f40d6e96ae87828932e7e8491dd43949
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Wed Nov 25 10:41:17 2020 +0100

    SLING-3027 Improve Launchpad Karaf Features
    
    update Composum Nodes
---
 .../sling/karaf/tests/bootstrap/ComposumNodesIT.java | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/test/java/org/apache/sling/karaf/tests/bootstrap/ComposumNodesIT.java b/src/test/java/org/apache/sling/karaf/tests/bootstrap/ComposumNodesIT.java
index 97bf5be..7209eb7 100644
--- a/src/test/java/org/apache/sling/karaf/tests/bootstrap/ComposumNodesIT.java
+++ b/src/test/java/org/apache/sling/karaf/tests/bootstrap/ComposumNodesIT.java
@@ -45,36 +45,36 @@ public class ComposumNodesIT extends KarafTestSupport {
     }
 
     @Test
-    public void testComComposumCoreCommons() {
-        final Bundle bundle = findBundle("com.composum.core.commons");
+    public void testComComposumNodesCommons() {
+        final Bundle bundle = findBundle("com.composum.nodes.commons");
         assertNotNull(bundle);
         assertEquals(Bundle.ACTIVE, bundle.getState());
     }
 
     @Test
-    public void testComComposumCoreConsole() {
-        final Bundle bundle = findBundle("com.composum.core.console");
+    public void testComComposumNodesConsole() {
+        final Bundle bundle = findBundle("com.composum.nodes.console");
         assertNotNull(bundle);
         assertEquals(Bundle.ACTIVE, bundle.getState());
     }
 
     @Test
-    public void testComComposumCoreJslibs() {
-        final Bundle bundle = findBundle("com.composum.core.jslibs");
+    public void testComComposumNodesJslibs() {
+        final Bundle bundle = findBundle("com.composum.nodes.jslibs");
         assertNotNull(bundle);
         assertEquals(Bundle.ACTIVE, bundle.getState());
     }
 
     @Test
-    public void testComComposumCoreUsermgnt() {
-        final Bundle bundle = findBundle("com.composum.core.usermgnt");
+    public void testComComposumNodesUsermgr() {
+        final Bundle bundle = findBundle("com.composum.nodes.usermgr");
         assertNotNull(bundle);
         assertEquals(Bundle.ACTIVE, bundle.getState());
     }
 
     @Test
-    public void testComComposumCorePckgmgr() {
-        final Bundle bundle = findBundle("com.composum.core.pckgmgr");
+    public void testComComposumNodesPckgmgr() {
+        final Bundle bundle = findBundle("com.composum.nodes.pckgmgr");
         assertNotNull(bundle);
         assertEquals(Bundle.ACTIVE, bundle.getState());
     }


[sling-org-apache-sling-karaf-integration-tests] 01/02: pull build section up and drop profile it

Posted by ol...@apache.org.
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-integration-tests.git

commit e233a036c1ce7b36bdc0d8fb4a7fb68451243f2c
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Sun Nov 1 20:04:24 2020 +0100

    pull build section up and drop profile it
---
 pom.xml | 75 +++++++++++++++++++++++++++--------------------------------------
 1 file changed, 31 insertions(+), 44 deletions(-)

diff --git a/pom.xml b/pom.xml
index 61aa57b..55f1a53 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,6 +44,37 @@
     <url>https://gitbox.apache.org/repos/asf?p=sling-org-apache-sling-karaf-integration-tests.git</url>
   </scm>
 
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>biz.aQute.bnd</groupId>
+        <artifactId>bnd-baseline-maven-plugin</artifactId>
+        <configuration>
+          <failOnMissing>false</failOnMissing>
+        </configuration>
+      </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>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
   <dependencies>
     <!-- javax -->
     <dependency>
@@ -170,48 +201,4 @@
     </dependency>
   </dependencies>
 
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>biz.aQute.bnd</groupId>
-        <artifactId>bnd-baseline-maven-plugin</artifactId>
-        <configuration>
-          <failOnMissing>false</failOnMissing>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.servicemix.tooling</groupId>
-        <artifactId>depends-maven-plugin</artifactId>
-      </plugin>
-    </plugins>
-  </build>
-
-  <profiles>
-    <profile>
-      <id>it</id>
-      <activation>
-        <jdk>[1.8,)</jdk>
-      </activation>
-      <build>
-        <plugins>
-          <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>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
-
 </project>