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 2022/05/09 11:05:20 UTC

[sling-org-apache-sling-jcr-oak-server] branch master updated (b33a4a4 -> ef9b869)

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-jcr-oak-server.git


    from b33a4a4  SLING-11051 - Fixing JavaDoc badge
     new a4138bf  update test dependencies
     new ef9b869  SLING-11308 Update to Sling Bundle Parent 47

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 | 32 +++-----------------------------
 1 file changed, 3 insertions(+), 29 deletions(-)


[sling-org-apache-sling-jcr-oak-server] 02/02: SLING-11308 Update to Sling Bundle Parent 47

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-jcr-oak-server.git

commit ef9b8696d9c54aed913b02f9b3a9e6bbd4f7cb34
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Mon May 9 12:37:57 2022 +0200

    SLING-11308 Update to Sling Bundle Parent 47
---
 pom.xml | 30 ++----------------------------
 1 file changed, 2 insertions(+), 28 deletions(-)

diff --git a/pom.xml b/pom.xml
index 23eaf4d..b1f433e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.sling</groupId>
     <artifactId>sling-bundle-parent</artifactId>
-    <version>41</version>
+    <version>47</version>
     <relativePath />
   </parent>
 
@@ -38,7 +38,7 @@
     <connection>scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-oak-server.git</connection>
     <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-oak-server.git</developerConnection>
     <url>https://gitbox.apache.org/repos/asf?p=sling-org-apache-sling-jcr-oak-server.git</url>
-    <tag>org.apache.sling.jcr.oak.server-1.2.4</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <properties>
@@ -76,35 +76,9 @@
               <name>bundle.filename</name>
               <value>${basedir}/target/${project.build.finalName}.jar</value>
             </property>
-            <property>
-              <name>jacoco.command</name>
-              <value>${jacoco.command}</value>
-            </property>
           </systemProperties>
         </configuration>
       </plugin>
-      <plugin>
-        <groupId>org.jacoco</groupId>
-        <artifactId>jacoco-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>prepare-agent</id>
-            <configuration>
-              <propertyName>jacoco.command</propertyName>
-            </configuration>
-            <goals>
-              <goal>prepare-agent</goal>
-            </goals>
-          </execution>
-          <execution>
-            <id>report</id>
-            <phase>post-integration-test</phase>
-            <goals>
-              <goal>report</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
       <plugin>
         <groupId>org.apache.servicemix.tooling</groupId>
         <artifactId>depends-maven-plugin</artifactId>


[sling-org-apache-sling-jcr-oak-server] 01/02: update test dependencies

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-jcr-oak-server.git

commit a4138bfb66528bcdbd589bf325245691ef62ecb4
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Mon May 9 11:13:53 2022 +0200

    update test dependencies
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index a02d9b0..23eaf4d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -128,7 +128,7 @@
     <dependency>
       <groupId>org.apache.felix</groupId>
       <artifactId>org.apache.felix.framework</artifactId>
-      <version>6.0.3</version>
+      <version>7.0.3</version>
       <scope>test</scope>
     </dependency>
     <!-- Apache Jackrabbit -->