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/03/28 08:59:55 UTC
[sling-org-apache-sling-resource-presence] branch master updated
(efc0daf -> e1e56fe)
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-resource-presence.git.
from efc0daf SLING-9104 Update Pax Exam to 4.13.2
new 9962231 style
new 986a4f5 SLING-9281 Update to Sling Bundle Parent 38
new 2353587 SLING-9282 Update Pax Exam to 4.13.3
new e1e56fe pull build section up
The 4 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 | 88 +++++++++++-----------
.../apache/sling/resource/presence/SimpleIT.java | 5 +-
2 files changed, 47 insertions(+), 46 deletions(-)
[sling-org-apache-sling-resource-presence] 04/04: pull build
section up
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-resource-presence.git
commit e1e56fe29149a9efccbaf62382bef6d461a407c6
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Sat Mar 28 09:59:20 2020 +0100
pull build section up
---
pom.xml | 76 ++++++++++++++++++++++++++++++++---------------------------------
1 file changed, 38 insertions(+), 38 deletions(-)
diff --git a/pom.xml b/pom.xml
index 0667e8b..c4af963 100644
--- a/pom.xml
+++ b/pom.xml
@@ -47,6 +47,44 @@
<url>https://gitbox.apache.org/repos/asf?p=sling-org-apache-sling-resource-presence.git</url>
</scm>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>biz.aQute.bnd</groupId>
+ <artifactId>bnd-maven-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>biz.aQute.bnd</groupId>
+ <artifactId>bnd-baseline-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>
+ <systemProperties>
+ <property>
+ <name>bundle.filename</name>
+ <value>${basedir}/target/${project.build.finalName}.jar</value>
+ </property>
+ </systemProperties>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.servicemix.tooling</groupId>
+ <artifactId>depends-maven-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+
<dependencies>
<!-- javax -->
<dependency>
@@ -162,42 +200,4 @@
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>biz.aQute.bnd</groupId>
- <artifactId>bnd-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>biz.aQute.bnd</groupId>
- <artifactId>bnd-baseline-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>
- <systemProperties>
- <property>
- <name>bundle.filename</name>
- <value>${basedir}/target/${project.build.finalName}.jar</value>
- </property>
- </systemProperties>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.servicemix.tooling</groupId>
- <artifactId>depends-maven-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-
</project>
[sling-org-apache-sling-resource-presence] 03/04: SLING-9282 Update
Pax Exam to 4.13.3
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-resource-presence.git
commit 2353587507e5876db1e1377799abcbc1d69aa69e
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Sat Mar 28 09:58:48 2020 +0100
SLING-9282 Update Pax Exam to 4.13.3
* Update Pax Exam
* Use proper OSGi dependencies
---
pom.xml | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/pom.xml b/pom.xml
index f6d0359..0667e8b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,7 +38,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<sling.java.version>8</sling.java.version>
- <org.ops4j.pax.exam.version>4.13.2</org.ops4j.pax.exam.version>
+ <org.ops4j.pax.exam.version>4.13.3</org.ops4j.pax.exam.version>
</properties>
<scm>
@@ -57,17 +57,17 @@
<!-- OSGi -->
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>osgi.cmpn</artifactId>
- <scope>test</scope>
+ <artifactId>osgi.core</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>osgi.core</artifactId>
+ <artifactId>org.osgi.annotation.versioning</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.annotation.versioning</artifactId>
+ <artifactId>org.osgi.service.cm</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
[sling-org-apache-sling-resource-presence] 02/04: SLING-9281 Update
to Sling Bundle Parent 38
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-resource-presence.git
commit 986a4f54c503748dbdcabd1c430601900cde391e
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Sat Mar 28 09:57:02 2020 +0100
SLING-9281 Update to Sling Bundle Parent 38
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 8902059..f6d0359 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling-bundle-parent</artifactId>
- <version>35</version>
+ <version>38</version>
<relativePath />
</parent>
[sling-org-apache-sling-resource-presence] 01/04: style
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-resource-presence.git
commit 9962231b9596c59c646ece235ed1ef28bee762a3
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Sat Mar 28 09:55:49 2020 +0100
style
---
src/test/java/org/apache/sling/resource/presence/SimpleIT.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/test/java/org/apache/sling/resource/presence/SimpleIT.java b/src/test/java/org/apache/sling/resource/presence/SimpleIT.java
index 46d3ec3..470779a 100644
--- a/src/test/java/org/apache/sling/resource/presence/SimpleIT.java
+++ b/src/test/java/org/apache/sling/resource/presence/SimpleIT.java
@@ -31,6 +31,7 @@ import org.ops4j.pax.exam.util.Filter;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
+import static org.ops4j.pax.exam.CoreOptions.options;
import static org.ops4j.pax.exam.cm.ConfigurationAdminOptions.factoryConfiguration;
@RunWith(PaxExam.class)
@@ -47,7 +48,7 @@ public class SimpleIT extends ResourcePresenterTestSupport {
@Configuration
public Option[] configuration() {
- return new Option[]{
+ return options(
baseConfiguration(),
factoryConfiguration(FACTORY_PID)
.put("path", "/apps")
@@ -55,7 +56,7 @@ public class SimpleIT extends ResourcePresenterTestSupport {
factoryConfiguration(FACTORY_PID)
.put("path", "/libs")
.asOption()
- };
+ );
}
@Test