This is an automated email from the ASF dual-hosted git repository. sseifert pushed a commit to branch feature/SLING-7803-junit5 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock.git
commit 8e71b9c633f632b2c947901c7e596fc46d310018 Author: sseifert <[email protected]> AuthorDate: Mon Aug 6 16:10:12 2018 +0200 SLING-7803 introduce parent pom --- core/pom.xml | 41 ++++++--------------------------- junit4/pom.xml | 34 ++++++---------------------- junit5/pom.xml | 34 ++++++---------------------- {junit5 => parent}/pom.xml | 56 ++++++++++++++++++---------------------------- pom.xml | 9 ++++---- relocate/pom.xml | 7 +++--- 6 files changed, 50 insertions(+), 131 deletions(-) diff --git a/core/pom.xml b/core/pom.xml index 4e8e14a..0335625 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -22,58 +22,40 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.sling</groupId> - <artifactId>sling</artifactId> - <version>34-SNAPSHOT</version> - <relativePath /> + <artifactId>org.apache.sling.testing.sling-mock.parent</artifactId> + <version>2.3.0-SNAPSHOT</version> + <relativePath>../parent/pom.xml</relativePath> </parent> <artifactId>org.apache.sling.testing.sling-mock.core</artifactId> - <version>2.3.0-SNAPSHOT</version> <packaging>bundle</packaging> <name>Apache Sling Testing Sling Mock Core</name> - <description>Mock implementation of selected Sling 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> + <version>${osgi-mock.version}</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.sling</groupId> <artifactId>org.apache.sling.testing.jcr-mock</artifactId> - <version>1.3.5-SNAPSHOT</version> + <version>${jcr-mock.version}</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.sling</groupId> <artifactId>org.apache.sling.testing.resourceresolver-mock</artifactId> - <version>1.1.21-SNAPSHOT</version> + <version>${resourceresolver-mock.version}</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.sling</groupId> <artifactId>org.apache.sling.servlet-helpers</artifactId> - <version>1.1.8</version> + <version>${servlet-helpers.version}</version> <scope>compile</scope> </dependency> @@ -232,13 +214,6 @@ <scope>compile</scope> </dependency> - <!-- Nullability annotations --> - <dependency> - <groupId>org.jetbrains</groupId> - <artifactId>annotations</artifactId> - <scope>provided</scope> - </dependency> - <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> @@ -247,13 +222,11 @@ <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/junit4/pom.xml b/junit4/pom.xml index 1d6c7c6..3f6a16d 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.sling-mock.parent</artifactId> + <version>2.3.0-SNAPSHOT</version> + <relativePath>../parent/pom.xml</relativePath> </parent> <artifactId>org.apache.sling.testing.sling-mock.junit4</artifactId> - <version>2.3.0-SNAPSHOT</version> <packaging>bundle</packaging> <name>Apache Sling Testing Sling Mock JUnit 4</name> - <description>Mock implementation of selected Sling 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.sling-mock.core</artifactId> <version>2.3.0-SNAPSHOT</version> @@ -66,11 +48,11 @@ <scope>test</scope> </dependency> - <!-- Nullability annotations --> <dependency> - <groupId>org.jetbrains</groupId> - <artifactId>annotations</artifactId> - <scope>provided</scope> + <groupId>org.apache.sling</groupId> + <artifactId>org.apache.sling.testing.osgi-mock.junit4</artifactId> + <version>${osgi-mock.version}</version> + <scope>compile</scope> </dependency> <dependency> @@ -81,13 +63,11 @@ <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 c461f67..dd8930d 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.sling-mock.parent</artifactId> + <version>2.3.0-SNAPSHOT</version> + <relativePath>../parent/pom.xml</relativePath> </parent> <artifactId>org.apache.sling.testing.sling-mock.junit5</artifactId> - <version>2.3.0-SNAPSHOT</version> <packaging>bundle</packaging> <name>Apache Sling Testing Sling Mock JUnit 5</name> - <description>Mock implementation of selected Sling 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.sling-mock.core</artifactId> <version>2.3.0-SNAPSHOT</version> @@ -66,23 +48,21 @@ <scope>test</scope> </dependency> - <!-- Nullability annotations --> <dependency> - <groupId>org.jetbrains</groupId> - <artifactId>annotations</artifactId> - <scope>provided</scope> + <groupId>org.apache.sling</groupId> + <artifactId>org.apache.sling.testing.osgi-mock.junit5</artifactId> + <version>${osgi-mock.version}</version> + <scope>compile</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/parent/pom.xml similarity index 69% copy from junit5/pom.xml copy to parent/pom.xml index c461f67..4e7c5ab 100644 --- a/junit5/pom.xml +++ b/parent/pom.xml @@ -27,12 +27,22 @@ <relativePath /> </parent> - <artifactId>org.apache.sling.testing.sling-mock.junit5</artifactId> + <artifactId>org.apache.sling.testing.sling-mock.parent</artifactId> <version>2.3.0-SNAPSHOT</version> - <packaging>bundle</packaging> + <packaging>pom</packaging> - <name>Apache Sling Testing Sling Mock JUnit 5</name> + <name>Apache Sling Testing Sling Mock Parent</name> <description>Mock implementation of selected Sling APIs.</description> + + <properties> + + <osgi-mock.version>2.4.0-SNAPSHOT</osgi-mock.version> + <jcr-mock.version>1.3.5-SNAPSHOT</jcr-mock.version> + <resourceresolver-mock.version>1.1.21-SNAPSHOT</resourceresolver-mock.version> + <logging-mock.version>2.0.0</logging-mock.version> + <servlet-helpers.version>1.1.8</servlet-helpers.version> + + </properties> <dependencies> @@ -52,20 +62,6 @@ <scope>provided</scope> </dependency> - <dependency> - <groupId>org.apache.sling</groupId> - <artifactId>org.apache.sling.testing.sling-mock.core</artifactId> - <version>2.3.0-SNAPSHOT</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.sling</groupId> - <artifactId>org.apache.sling.testing.sling-mock.core</artifactId> - <version>2.3.0-SNAPSHOT</version> - <classifier>tests</classifier> - <scope>test</scope> - </dependency> - <!-- Nullability annotations --> <dependency> <groupId>org.jetbrains</groupId> @@ -73,31 +69,23 @@ <scope>provided</scope> </dependency> + </dependencies> + + <dependencyManagement> + <dependencies> + <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> - <version>2.19.1</version> - <scope>test</scope> + <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> - <scope>test</scope> + <version>${logging-mock.version}</version> </dependency> - </dependencies> - - <build> - <plugins> - - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> - </plugin> - - </plugins> - </build> + </dependencies> + </dependencyManagement> </project> diff --git a/pom.xml b/pom.xml index 3fd1dcb..74fc1b2 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.sling-mock.parent</artifactId> + <version>2.3.0-SNAPSHOT</version> + <relativePath>parent/pom.xml</relativePath> </parent> <artifactId>org.apache.sling.testing.sling-mock.root</artifactId> - <version>2.3.0-SNAPSHOT</version> <packaging>pom</packaging> <name>Apache Sling Testing Sling Mock</name> - <description>Mock implementation of selected Sling APIs.</description> <scm> <connection>scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-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 ac2e021..9db07ee 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.sling-mock.parent</artifactId> + <version>2.3.0-SNAPSHOT</version> + <relativePath>../parent/pom.xml</relativePath> </parent> <artifactId>org.apache.sling.testing.sling-mock</artifactId> - <version>2.3.0-SNAPSHOT</version> <packaging>pom</packaging> <name>Apache Sling Testing Sling Mock Relocation</name>
