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-osgi-mock.git
commit d1c1d345b236047c58c4a64aeeeff563907a5020 Author: sseifert <[email protected]> AuthorDate: Mon Aug 6 15:55:01 2018 +0200 SLING-7803 introduce parent pom --- core/pom.xml | 33 +++------------------------------ junit4/pom.xml | 39 ++++++--------------------------------- junit5/pom.xml | 27 +++------------------------ {junit5 => parent}/pom.xml | 44 ++++++++++++++------------------------------ pom.xml | 9 ++++----- relocate/pom.xml | 7 +++---- 6 files changed, 33 insertions(+), 126 deletions(-) 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/junit5/pom.xml b/parent/pom.xml similarity index 69% copy from junit5/pom.xml copy to parent/pom.xml index c3e45c8..07a5dcf 100644 --- a/junit5/pom.xml +++ b/parent/pom.xml @@ -27,11 +27,11 @@ <relativePath /> </parent> - <artifactId>org.apache.sling.testing.osgi-mock.junit5</artifactId> + <artifactId>org.apache.sling.testing.osgi-mock.parent</artifactId> <version>2.4.0-SNAPSHOT</version> - <packaging>bundle</packaging> + <packaging>pom</packaging> - <name>Apache Sling Testing OSGi Mock JUnit 5</name> + <name>Apache Sling Testing OSGi Mock Parent</name> <description>Mock implementation of selected OSGi APIs.</description> <dependencies> @@ -52,46 +52,30 @@ <scope>provided</scope> </dependency> + <!-- Nullability annotations --> <dependency> - <groupId>org.apache.sling</groupId> - <artifactId>org.apache.sling.testing.osgi-mock.core</artifactId> - <version>2.4.0-SNAPSHOT</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> - <classifier>tests</classifier> - <scope>test</scope> + <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.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> </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 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>
