SLING-7803 introduce parent pom
diff --git a/core/pom.xml b/core/pom.xml
index 4684c68..cdc223e 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -22,37 +22,19 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.sling</groupId>
- <artifactId>sling</artifactId>
- <version>34-SNAPSHOT</version>
- <relativePath />
+ <artifactId>org.apache.sling.testing.osgi-mock.parent</artifactId>
+ <version>2.4.0-SNAPSHOT</version>
+ <relativePath>../parent/pom.xml</relativePath>
</parent>
<artifactId>org.apache.sling.testing.osgi-mock.core</artifactId>
- <version>2.4.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache Sling Testing OSGi Mock Core</name>
- <description>Mock implementation of selected OSGi APIs.</description>
<dependencies>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.annotation.versioning</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi.core</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi.cmpn</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>15.0</version>
@@ -141,17 +123,9 @@
</exclusions>
</dependency>
- <!-- Nullability annotations -->
- <dependency>
- <groupId>org.jetbrains</groupId>
- <artifactId>annotations</artifactId>
- <scope>provided</scope>
- </dependency>
-
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
- <version>2.19.1</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -162,7 +136,6 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.testing.logging-mock</artifactId>
- <version>2.0.0</version>
<scope>test</scope>
</dependency>
diff --git a/junit4/pom.xml b/junit4/pom.xml
index b7c196c..008a108 100644
--- a/junit4/pom.xml
+++ b/junit4/pom.xml
@@ -22,37 +22,19 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.sling</groupId>
- <artifactId>sling</artifactId>
- <version>34-SNAPSHOT</version>
- <relativePath />
+ <artifactId>org.apache.sling.testing.osgi-mock.parent</artifactId>
+ <version>2.4.0-SNAPSHOT</version>
+ <relativePath>../parent/pom.xml</relativePath>
</parent>
<artifactId>org.apache.sling.testing.osgi-mock.junit4</artifactId>
- <version>2.4.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache Sling Testing OSGi Mock JUnit 4</name>
- <description>Mock implementation of selected OSGi APIs.</description>
<dependencies>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.annotation.versioning</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi.core</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi.cmpn</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.testing.osgi-mock.core</artifactId>
<version>2.4.0-SNAPSHOT</version>
@@ -66,28 +48,19 @@
<scope>test</scope>
</dependency>
- <!-- Nullability annotations -->
<dependency>
- <groupId>org.jetbrains</groupId>
- <artifactId>annotations</artifactId>
- <scope>provided</scope>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ <scope>test</scope>
</dependency>
-
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
- <version>2.19.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.testing.logging-mock</artifactId>
- <version>2.0.0</version>
<scope>test</scope>
</dependency>
diff --git a/junit5/pom.xml b/junit5/pom.xml
index c3e45c8..ba9c30b 100644
--- a/junit5/pom.xml
+++ b/junit5/pom.xml
@@ -22,37 +22,19 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.sling</groupId>
- <artifactId>sling</artifactId>
- <version>34-SNAPSHOT</version>
- <relativePath />
+ <artifactId>org.apache.sling.testing.osgi-mock.parent</artifactId>
+ <version>2.4.0-SNAPSHOT</version>
+ <relativePath>../parent/pom.xml</relativePath>
</parent>
<artifactId>org.apache.sling.testing.osgi-mock.junit5</artifactId>
- <version>2.4.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache Sling Testing OSGi Mock JUnit 5</name>
- <description>Mock implementation of selected OSGi APIs.</description>
<dependencies>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.annotation.versioning</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi.core</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi.cmpn</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.testing.osgi-mock.core</artifactId>
<version>2.4.0-SNAPSHOT</version>
@@ -66,17 +48,14 @@
<scope>test</scope>
</dependency>
-
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
- <version>2.19.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.testing.logging-mock</artifactId>
- <version>2.0.0</version>
<scope>test</scope>
</dependency>
diff --git a/parent/pom.xml b/parent/pom.xml
new file mode 100644
index 0000000..07a5dcf
--- /dev/null
+++ b/parent/pom.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>sling</artifactId>
+ <version>34-SNAPSHOT</version>
+ <relativePath />
+ </parent>
+
+ <artifactId>org.apache.sling.testing.osgi-mock.parent</artifactId>
+ <version>2.4.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+
+ <name>Apache Sling Testing OSGi Mock Parent</name>
+ <description>Mock implementation of selected OSGi APIs.</description>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.annotation.versioning</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>osgi.core</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>osgi.cmpn</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- Nullability annotations -->
+ <dependency>
+ <groupId>org.jetbrains</groupId>
+ <artifactId>annotations</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ </dependencies>
+
+ <dependencyManagement>
+ <dependencies>
+
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ <version>2.21.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.testing.logging-mock</artifactId>
+ <version>2.0.0</version>
+ </dependency>
+
+ </dependencies>
+ </dependencyManagement>
+
+</project>
diff --git a/pom.xml b/pom.xml
index db478ce..fe86d43 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,17 +22,15 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.sling</groupId>
- <artifactId>sling</artifactId>
- <version>34-SNAPSHOT</version>
- <relativePath />
+ <artifactId>org.apache.sling.testing.osgi-mock.parent</artifactId>
+ <version>2.4.0-SNAPSHOT</version>
+ <relativePath>parent/pom.xml</relativePath>
</parent>
<artifactId>org.apache.sling.testing.osgi-mock.root</artifactId>
- <version>2.4.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Apache Sling Testing OSGi Mock</name>
- <description>Mock implementation of selected OSGi APIs.</description>
<scm>
<connection>scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-osgi-mock.git</connection>
@@ -42,6 +40,7 @@
</scm>
<modules>
+ <module>parent</module>
<module>core</module>
<module>junit4</module>
<module>junit5</module>
diff --git a/relocate/pom.xml b/relocate/pom.xml
index a5c0ed8..9d7b006 100644
--- a/relocate/pom.xml
+++ b/relocate/pom.xml
@@ -22,13 +22,12 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.sling</groupId>
- <artifactId>sling</artifactId>
- <version>34-SNAPSHOT</version>
- <relativePath />
+ <artifactId>org.apache.sling.testing.osgi-mock.parent</artifactId>
+ <version>2.4.0-SNAPSHOT</version>
+ <relativePath>../parent/pom.xml</relativePath>
</parent>
<artifactId>org.apache.sling.testing.osgi-mock</artifactId>
- <version>2.4.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Apache Sling Testing OSGi Mock Relocation</name>
