You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ss...@apache.org on 2018/08/18 12:46:02 UTC
[sling-org-apache-sling-testing-osgi-mock] branch master updated
(70ae7cf -> 840cd34)
This is an automated email from the ASF dual-hosted git repository.
sseifert pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-osgi-mock.git.
from 70ae7cf Merge branch 'feature/SLING-7803-junit5'
new dd5b58d auto-version sub modules
new 2949017 fix javadoc error
new 840cd34 [maven-release-plugin] prepare release org.apache.sling.testing.osgi-mock.reactor-2.4.0
The 3 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:
core/pom.xml | 2 +-
.../testing/mock/osgi/context/OsgiContextImpl.java | 4 ++--
junit4/pom.xml | 6 +++---
junit5/pom.xml | 6 +++---
parent/pom.xml | 22 +++++++++++++++++++++-
pom.xml | 4 ++--
relocate/pom.xml | 2 +-
7 files changed, 33 insertions(+), 13 deletions(-)
[sling-org-apache-sling-testing-osgi-mock] 02/03: fix javadoc error
Posted by ss...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sseifert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-osgi-mock.git
commit 2949017b5f9eb5760478801ca74c037c4106ad5d
Author: sseifert <ss...@pro-vision.de>
AuthorDate: Sat Aug 18 14:45:22 2018 +0200
fix javadoc error
---
.../org/apache/sling/testing/mock/osgi/context/OsgiContextImpl.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/core/src/main/java/org/apache/sling/testing/mock/osgi/context/OsgiContextImpl.java b/core/src/main/java/org/apache/sling/testing/mock/osgi/context/OsgiContextImpl.java
index c6e7849..d2b87a6 100644
--- a/core/src/main/java/org/apache/sling/testing/mock/osgi/context/OsgiContextImpl.java
+++ b/core/src/main/java/org/apache/sling/testing/mock/osgi/context/OsgiContextImpl.java
@@ -34,8 +34,8 @@ import org.osgi.framework.ServiceReference;
import org.osgi.service.component.ComponentContext;
/**
- * Defines OSGi context objects and helper methods. Should not be used directly
- * but via the {@link org.apache.sling.testing.mock.osgi.junit.OsgiContext} JUnit rule.
+ * Defines OSGi context objects and helper methods.
+ * Should not be used directly but via the OsgiContext JUnit rule or extension.
*/
@ConsumerType
public class OsgiContextImpl {
[sling-org-apache-sling-testing-osgi-mock] 01/03: auto-version sub
modules
Posted by ss...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sseifert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-osgi-mock.git
commit dd5b58dd31f3faacbae5ab8b4b43fcd611018c9f
Author: sseifert <ss...@pro-vision.de>
AuthorDate: Sat Aug 18 14:42:03 2018 +0200
auto-version sub modules
---
parent/pom.xml | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/parent/pom.xml b/parent/pom.xml
index ea8ce05..d087934 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -77,5 +77,21 @@
</dependencies>
</dependencyManagement>
+
+ <build>
+ <pluginManagement>
+ <plugins>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-release-plugin</artifactId>
+ <configuration>
+ <autoVersionSubmodules>true</autoVersionSubmodules>
+ </configuration>
+ </plugin>
+
+ </plugins>
+ </pluginManagement>
+ </build>
</project>
[sling-org-apache-sling-testing-osgi-mock] 03/03:
[maven-release-plugin] prepare release
org.apache.sling.testing.osgi-mock.reactor-2.4.0
Posted by ss...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sseifert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-osgi-mock.git
commit 840cd344fdd8b764bb04d3df761afdaa44fcb627
Author: sseifert <ss...@pro-vision.de>
AuthorDate: Sat Aug 18 14:46:00 2018 +0200
[maven-release-plugin] prepare release org.apache.sling.testing.osgi-mock.reactor-2.4.0
---
core/pom.xml | 2 +-
junit4/pom.xml | 6 +++---
junit5/pom.xml | 6 +++---
parent/pom.xml | 6 +++++-
pom.xml | 4 ++--
relocate/pom.xml | 2 +-
6 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/core/pom.xml b/core/pom.xml
index cdc223e..e837b6f 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.testing.osgi-mock.parent</artifactId>
- <version>2.4.0-SNAPSHOT</version>
+ <version>2.4.0</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
diff --git a/junit4/pom.xml b/junit4/pom.xml
index 008a108..5b6a077 100644
--- a/junit4/pom.xml
+++ b/junit4/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.testing.osgi-mock.parent</artifactId>
- <version>2.4.0-SNAPSHOT</version>
+ <version>2.4.0</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
@@ -37,13 +37,13 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.testing.osgi-mock.core</artifactId>
- <version>2.4.0-SNAPSHOT</version>
+ <version>2.4.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.testing.osgi-mock.core</artifactId>
- <version>2.4.0-SNAPSHOT</version>
+ <version>2.4.0</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
diff --git a/junit5/pom.xml b/junit5/pom.xml
index c6989ad..8edabf1 100644
--- a/junit5/pom.xml
+++ b/junit5/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.testing.osgi-mock.parent</artifactId>
- <version>2.4.0-SNAPSHOT</version>
+ <version>2.4.0</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
@@ -37,13 +37,13 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.testing.osgi-mock.core</artifactId>
- <version>2.4.0-SNAPSHOT</version>
+ <version>2.4.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.testing.osgi-mock.core</artifactId>
- <version>2.4.0-SNAPSHOT</version>
+ <version>2.4.0</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
diff --git a/parent/pom.xml b/parent/pom.xml
index d087934..abdf385 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -28,7 +28,7 @@
</parent>
<artifactId>org.apache.sling.testing.osgi-mock.parent</artifactId>
- <version>2.4.0-SNAPSHOT</version>
+ <version>2.4.0</version>
<packaging>pom</packaging>
<name>Apache Sling Testing OSGi Mock Parent</name>
@@ -94,4 +94,8 @@
</pluginManagement>
</build>
+
+ <scm>
+ <tag>org.apache.sling.testing.osgi-mock.reactor-2.4.0</tag>
+ </scm>
</project>
diff --git a/pom.xml b/pom.xml
index 1995024..ef70f74 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.testing.osgi-mock.parent</artifactId>
- <version>2.4.0-SNAPSHOT</version>
+ <version>2.4.0</version>
<relativePath>parent/pom.xml</relativePath>
</parent>
@@ -36,7 +36,7 @@
<connection>scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-osgi-mock.git</connection>
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-osgi-mock.git</developerConnection>
<url>https://gitbox.apache.org/repos/asf?p=sling-org-apache-sling-testing-osgi-mock.git</url>
- <tag>HEAD</tag>
+ <tag>org.apache.sling.testing.osgi-mock.reactor-2.4.0</tag>
</scm>
<modules>
diff --git a/relocate/pom.xml b/relocate/pom.xml
index 9d7b006..4e71ef2 100644
--- a/relocate/pom.xml
+++ b/relocate/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.testing.osgi-mock.parent</artifactId>
- <version>2.4.0-SNAPSHOT</version>
+ <version>2.4.0</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>