Return-Path: 
 <commits-return-22052-apmail-sling-commits-archive=sling.apache.org@sling.apache.org>
X-Original-To: apmail-sling-commits-archive@www.apache.org
Delivered-To: apmail-sling-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 1535D17A5B
	for <apmail-sling-commits-archive@www.apache.org>;
 Mon, 11 May 2015 20:53:35 +0000 (UTC)
Received: (qmail 51353 invoked by uid 500); 11 May 2015 20:53:35 -0000
Delivered-To: apmail-sling-commits-archive@sling.apache.org
Received: (qmail 51289 invoked by uid 500); 11 May 2015 20:53:35 -0000
Mailing-List: contact commits-help@sling.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@sling.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@sling.apache.org>
List-Post: <mailto:commits@sling.apache.org>
List-Id: <commits.sling.apache.org>
Reply-To: dev@sling.apache.org
Delivered-To: mailing list commits@sling.apache.org
Received: (qmail 51280 invoked by uid 99); 11 May 2015 20:53:34 -0000
Received: from eris.apache.org (HELO hades.apache.org) (140.211.11.105)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 11 May 2015 20:53:34 +0000
Received: from hades.apache.org (localhost [127.0.0.1])
	by hades.apache.org (ASF Mail Server at hades.apache.org) with ESMTP id
 D3CF0AC09F8
	for <commits@sling.apache.org>; Mon, 11 May 2015 20:53:34 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1678823 - in /sling/trunk:
 bundles/extensions/models/api/pom.xml
 bundles/extensions/models/integration-tests/pom.xml
 launchpad/builder/src/main/provisioning/boot.txt
Date: Mon, 11 May 2015 20:53:34 -0000
To: commits@sling.apache.org
From: sseifert@apache.org
X-Mailer: svnmailer-1.0.9
Message-Id: <20150511205334.D3CF0AC09F8@hades.apache.org>

Author: sseifert
Date: Mon May 11 20:53:34 2015
New Revision: 1678823

URL: http://svn.apache.org/r1678823
Log:
SLING-4710 do not export javax.inject in sling models API bundle
add javax.inject dependency in launchpad from org.apache.geronimo.specs/geronimo-atinject_1.0_spec/1.0 because the original javax.inject jar is not an osgi bundle

Modified:
    sling/trunk/bundles/extensions/models/api/pom.xml
    sling/trunk/bundles/extensions/models/integration-tests/pom.xml
    sling/trunk/launchpad/builder/src/main/provisioning/boot.txt

Modified: sling/trunk/bundles/extensions/models/api/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/models/api/pom.xml?rev=1678823&r1=1678822&r2=1678823&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/models/api/pom.xml (original)
+++ sling/trunk/bundles/extensions/models/api/pom.xml Mon May 11 20:53:34 2015
@@ -48,7 +48,7 @@
                 <extensions>true</extensions>
                 <configuration>
                    <instructions>
-                        <Export-Package>org.apache.sling.models.*,javax.inject;version=0</Export-Package>
+                        <Export-Package>org.apache.sling.models.*</Export-Package>
                         <DynamicImport-Package>org.apache.sling.validation.api.*</DynamicImport-Package>
                    </instructions>
                 </configuration>

Modified: sling/trunk/bundles/extensions/models/integration-tests/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/models/integration-tests/pom.xml?rev=1678823&r1=1678822&r2=1678823&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/models/integration-tests/pom.xml (original)
+++ sling/trunk/bundles/extensions/models/integration-tests/pom.xml Mon May 11 20:53:34 2015
@@ -329,8 +329,7 @@
         <dependency>
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.launchpad</artifactId>
-            <classifier>standalone</classifier>
-            <version>7</version>
+            <version>8-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>

Modified: sling/trunk/launchpad/builder/src/main/provisioning/boot.txt
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/builder/src/main/provisioning/boot.txt?rev=1678823&r1=1678822&r2=1678823&view=diff
==============================================================================
--- sling/trunk/launchpad/builder/src/main/provisioning/boot.txt (original)
+++ sling/trunk/launchpad/builder/src/main/provisioning/boot.txt Mon May 11 20:53:34 2015
@@ -45,3 +45,5 @@
     org.apache.sling/org.apache.sling.installer.provider.file/1.1.0
     org.apache.felix/org.apache.felix.configadmin/1.8.4
     org.apache.felix/org.apache.felix.eventadmin/1.4.2
+    # dependency with javax.inject - required for Sling Models (SLING-4710)
+    org.apache.geronimo.specs/geronimo-atinject_1.0_spec/1.0