This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag org.apache.sling.testing.osgi-mock-2.1.0 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-osgi-mock.git
commit 9e41f2c068ffd1686f7897d0cbdf3f4c4e2d2d02 Author: Stefan Seifert <[email protected]> AuthorDate: Tue Jul 26 20:37:00 2016 +0000 SLING-5905 osgi-mock: Shade and relocate Sling and Felix Dependencies git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/mocks/osgi-mock@1754175 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 112 +++++++++++++++++++++++++++++++++++++++++++++++----------------- 1 file changed, 83 insertions(+), 29 deletions(-) diff --git a/pom.xml b/pom.xml index ec4f891..e261538 100644 --- a/pom.xml +++ b/pom.xml @@ -55,27 +55,6 @@ <version>6.0.0</version> <scope>compile</scope> </dependency> - - <dependency> - <groupId>org.apache.sling</groupId> - <artifactId>org.apache.sling.commons.osgi</artifactId> - <version>2.4.0</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>org.apache.felix</groupId> - <artifactId>org.apache.felix.framework</artifactId> - <version>5.0.0</version> - <scope>compile</scope> - </dependency> - <!-- The required classes o.a.f.scr.impl.helper.Annotations and o.a.f.scr.impl.helper.Coercions are inlined --> - <dependency> - <groupId>org.apache.felix</groupId> - <artifactId>org.apache.felix.scr</artifactId> - <version>2.0.4</version> - <scope>provided</scope> - </dependency> <dependency> <groupId>com.google.guava</groupId> @@ -103,6 +82,28 @@ <scope>compile</scope> </dependency> + <!-- Artifact is shaded and inlined, only some classes included (see below) --> + <dependency> + <groupId>org.apache.sling</groupId> + <artifactId>org.apache.sling.commons.osgi</artifactId> + <version>2.4.0</version> + <scope>compile</scope> + </dependency> + <!-- Artifact is shaded and inlined, only some classes included (see below) --> + <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.framework</artifactId> + <version>5.0.0</version> + <scope>compile</scope> + </dependency> + <!-- Artifact is shaded and inlined, only some classes included (see below) --> + <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.scr</artifactId> + <version>2.0.4</version> + <scope>compile</scope> + </dependency> + <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-all</artifactId> @@ -130,13 +131,6 @@ <groupId>org.apache.felix</groupId> <artifactId>maven-bundle-plugin</artifactId> <extensions>true</extensions> - <configuration> - <instructions> - <Embed-Dependency> - org.apache.felix.scr;inline="org/apache/felix/scr/impl/inject/Annotations*|org/apache/felix/scr/impl/helper/Coercions*" - </Embed-Dependency> - </instructions> - </configuration> </plugin> <plugin> @@ -152,10 +146,70 @@ <exclude>src/test/resources/META-INF/test.txt</exclude> <exclude>src/test/resources/bundleData/nested/first.txt</exclude> <exclude>src/test/resources/bundleData/nested/second.txt</exclude> + <exclude>dependency-reduced-pom.xml</exclude> </excludes> </configuration> </plugin> - + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-shade-plugin</artifactId> + <version>2.4.3</version> + <executions> + <execution> + <phase>package</phase> + <goals> + <goal>shade</goal> + </goals> + <configuration> + <artifactSet> + <includes> + <include>org.apache.sling:org.apache.sling.commons.osgi</include> + <include>org.apache.felix:org.apache.felix.framework</include> + <include>org.apache.felix:org.apache.felix.scr</include> + </includes> + </artifactSet> + <relocations> + <relocation> + <pattern>org.apache.sling.commons.osgi</pattern> + <shadedPattern>osgimock.org.apache.sling.commons.osgi</shadedPattern> + </relocation> + <relocation> + <pattern>org.apache.felix.framework</pattern> + <shadedPattern>osgimock.org.apache.felix.framework</shadedPattern> + </relocation> + <relocation> + <pattern>org.apache.felix.scr.impl</pattern> + <shadedPattern>osgimock.org.apache.felix.scr.impl</shadedPattern> + </relocation> + </relocations> + <filters> + <filter> + <artifact>org.apache.sling:org.apache.sling.commons.osgi</artifact> + <includes> + <include>org/apache/sling/commons/osgi/ServiceUtil*</include> + <include>org/apache/sling/commons/osgi/Order*</include> + </includes> + </filter> + <filter> + <artifact>org.apache.felix:org.apache.felix.framework</artifact> + <includes> + <include>org/apache/felix/framework/FilterImpl*</include> + </includes> + </filter> + <filter> + <artifact>org.apache.felix:org.apache.felix.scr</artifact> + <includes> + <include>org/apache/felix/scr/impl/inject/Annotations*</include> + <include>org/apache/felix/scr/impl/helper/Coercions*</include> + </includes> + </filter> + </filters> + </configuration> + </execution> + </executions> + </plugin> + </plugins> </build> -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
