SLING-6409 switch back to bnd embend for commons-beanutils
authorStefan Seifert <sseifert@apache.org>
Sat, 17 Dec 2016 21:05:59 +0000 (21:05 +0000)
committerStefan Seifert <sseifert@apache.org>
Sat, 17 Dec 2016 21:05:59 +0000 (21:05 +0000)
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1774808 13f79535-47bb-0310-9956-ffa450edef68

pom.xml

diff --git a/pom.xml b/pom.xml
index f903b8f..73d26f4 100644 (file)
--- a/pom.xml
+++ b/pom.xml
                 <extensions>true</extensions>
                 <configuration>
                   <instructions>
+                    <Embed-Dependency>
+                      *;artifactId=commons-beanutils;groupId=commons-beanutils
+                    </Embed-Dependency>
                     <!-- Remove those package imports because embedded and relocated via shade plugin (see below) -->
                     <Import-Package>
                       !org.apache.sling.commons.osgi,
                       !org.apache.sling.scripting.core.impl.helper,
-                      !org.apache.commons.beanutils,
                       *
                     </Import-Package>
                   </instructions>
@@ -78,7 +80,6 @@
                                 <includes>
                                     <include>org.apache.sling:org.apache.sling.commons.osgi</include>
                                     <include>org.apache.sling:org.apache.sling.scripting.core</include>
-                                    <include>commons-beanutils:commons-beanutils</include>
                                 </includes>
                             </artifactSet>
                             <relocations>
                                     <pattern>org.apache.sling.scripting.core</pattern>
                                     <shadedPattern>slingmodelsimpl.org.apache.sling.scripting.core</shadedPattern>
                                 </relocation>
-                                <relocation>
-                                    <pattern>org.apache.commons.beanutils</pattern>
-                                    <shadedPattern>slingmodelsimpl.org.apache.commons.beanutils</shadedPattern>
-                                </relocation>
                             </relocations>
                             <filters>
                                 <filter>
                                         <include>org/apache/sling/scripting/core/impl/helper/ProtectedBindings*</include>
                                     </includes>
                                 </filter>
-                                <filter>
-                                    <artifact>commons-beanutils:commons-beanutils</artifact>
-                                    <includes>
-                                        <include>org/apache/commons/beanutils/**</include>
-                                    </includes>
-                                </filter>
                             </filters>
                         </configuration>
                     </execution>