Return-Path: 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 363E371D6 for ; Wed, 31 Aug 2011 19:24:23 +0000 (UTC) Received: (qmail 4991 invoked by uid 500); 31 Aug 2011 19:24:23 -0000 Delivered-To: apmail-sling-commits-archive@sling.apache.org Received: (qmail 4950 invoked by uid 500); 31 Aug 2011 19:24:22 -0000 Mailing-List: contact commits-help@sling.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@sling.apache.org Delivered-To: mailing list commits@sling.apache.org Received: (qmail 4943 invoked by uid 99); 31 Aug 2011 19:24:22 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 31 Aug 2011 19:24:22 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 31 Aug 2011 19:24:18 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id D35F323889E3; Wed, 31 Aug 2011 19:23:56 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1163752 - in /sling/trunk: ./ bundles/api/ bundles/api/src/main/appended-resources/META-INF/ bundles/auth/core/ bundles/auth/form/ bundles/auth/openid/ bundles/auth/selector/ bundles/commons/classloader/ bundles/commons/json/ bundles/commo... Date: Wed, 31 Aug 2011 19:23:52 -0000 To: commits@sling.apache.org From: justin@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110831192356.D35F323889E3@eris.apache.org> Author: justin Date: Wed Aug 31 19:23:49 2011 New Revision: 1163752 URL: http://svn.apache.org/viewvc?rev=1163752&view=rev Log: SLING-2187 - adding new module to contain our custom notice file; adding remote-resources plugin configuration to parent pom and removing all existing appended-resources NOTICE files Added: sling/trunk/maven/apache-sling-jar-resource-bundle/ sling/trunk/maven/apache-sling-jar-resource-bundle/pom.xml sling/trunk/maven/apache-sling-jar-resource-bundle/src/ sling/trunk/maven/apache-sling-jar-resource-bundle/src/main/ sling/trunk/maven/apache-sling-jar-resource-bundle/src/main/resources/ sling/trunk/maven/apache-sling-jar-resource-bundle/src/main/resources/META-INF/ sling/trunk/maven/apache-sling-jar-resource-bundle/src/main/resources/META-INF/NOTICE.vm Modified: sling/trunk/bundles/api/pom.xml sling/trunk/bundles/api/src/main/appended-resources/META-INF/NOTICE sling/trunk/bundles/auth/core/pom.xml sling/trunk/bundles/auth/form/pom.xml sling/trunk/bundles/auth/openid/pom.xml sling/trunk/bundles/auth/selector/pom.xml sling/trunk/bundles/commons/classloader/pom.xml sling/trunk/bundles/commons/json/pom.xml sling/trunk/bundles/commons/log/pom.xml sling/trunk/bundles/commons/mime/pom.xml sling/trunk/bundles/commons/osgi/pom.xml sling/trunk/bundles/commons/scheduler/pom.xml sling/trunk/bundles/commons/testing/pom.xml sling/trunk/bundles/commons/threads/pom.xml sling/trunk/bundles/engine/pom.xml sling/trunk/bundles/engine/src/main/appended-resources/META-INF/NOTICE sling/trunk/bundles/extensions/adapter/pom.xml sling/trunk/bundles/extensions/adapter/src/main/appended-resources/META-INF/NOTICE sling/trunk/bundles/extensions/bundleresource/pom.xml sling/trunk/bundles/extensions/event/pom.xml sling/trunk/bundles/extensions/explorer/pom.xml sling/trunk/bundles/extensions/framework-extension-activation/pom.xml sling/trunk/bundles/extensions/framework-extension-transaction/pom.xml sling/trunk/bundles/extensions/framework-extension-xml/pom.xml sling/trunk/bundles/extensions/fsresource/pom.xml sling/trunk/bundles/extensions/groovy/pom.xml sling/trunk/bundles/extensions/settings/pom.xml sling/trunk/bundles/extensions/threaddump/pom.xml sling/trunk/bundles/extensions/webconsolebranding/pom.xml sling/trunk/bundles/extensions/webconsolesecurityprovider/pom.xml sling/trunk/bundles/jcr/api/pom.xml sling/trunk/bundles/jcr/base/pom.xml sling/trunk/bundles/jcr/classloader/pom.xml sling/trunk/bundles/jcr/contentloader/pom.xml sling/trunk/bundles/jcr/davex/pom.xml sling/trunk/bundles/jcr/jackrabbit-accessmanager/pom.xml sling/trunk/bundles/jcr/jackrabbit-server/pom.xml sling/trunk/bundles/jcr/jackrabbit-usermanager/pom.xml sling/trunk/bundles/jcr/ocm/pom.xml sling/trunk/bundles/jcr/resource/pom.xml sling/trunk/bundles/jcr/resource/src/main/appended-resources/META-INF/NOTICE sling/trunk/bundles/jcr/webconsole/pom.xml sling/trunk/bundles/jcr/webdav/pom.xml sling/trunk/bundles/scripting/api/pom.xml sling/trunk/bundles/scripting/core/pom.xml sling/trunk/bundles/scripting/javascript/pom.xml sling/trunk/bundles/scripting/javascript/src/main/appended-resources/META-INF/NOTICE sling/trunk/bundles/scripting/jsp-taglib/pom.xml sling/trunk/bundles/scripting/jsp/pom.xml sling/trunk/bundles/servlets/get/pom.xml sling/trunk/bundles/servlets/get/src/main/appended-resources/META-INF/NOTICE sling/trunk/bundles/servlets/post/pom.xml sling/trunk/bundles/servlets/resolver/pom.xml sling/trunk/installer/core/pom.xml sling/trunk/installer/factories/configuration/pom.xml sling/trunk/installer/factories/deploymentpck/pom.xml sling/trunk/installer/it/pom.xml sling/trunk/installer/providers/file/pom.xml sling/trunk/installer/providers/jcr/pom.xml sling/trunk/launchpad/api/pom.xml sling/trunk/launchpad/base/pom.xml sling/trunk/launchpad/base/src/main/appended-resources/META-INF/NOTICE sling/trunk/launchpad/builder/pom.xml sling/trunk/launchpad/builder/src/main/appended-resources/META-INF/NOTICE sling/trunk/launchpad/content/pom.xml sling/trunk/launchpad/content/src/main/appended-resources/META-INF/NOTICE sling/trunk/launchpad/installer/pom.xml sling/trunk/launchpad/integration-tests/pom.xml sling/trunk/launchpad/integration-tests/src/main/appended-resources/META-INF/NOTICE sling/trunk/launchpad/test-bundles/pom.xml sling/trunk/launchpad/test-services-war/pom.xml sling/trunk/launchpad/test-services-war/src/main/appended-resources/META-INF/NOTICE sling/trunk/launchpad/test-services/pom.xml sling/trunk/launchpad/test-services/src/main/appended-resources/META-INF/NOTICE sling/trunk/launchpad/testing-war/pom.xml sling/trunk/launchpad/testing-war/src/main/appended-resources/META-INF/NOTICE sling/trunk/launchpad/testing/pom.xml sling/trunk/launchpad/testing/src/main/appended-resources/META-INF/NOTICE sling/trunk/maven/archetypes/bundle-for-jcrinstall/pom.xml sling/trunk/maven/archetypes/bundle/pom.xml sling/trunk/maven/archetypes/initial-content/pom.xml sling/trunk/maven/archetypes/launchpad-standalone/pom.xml sling/trunk/maven/archetypes/launchpad-webapp/pom.xml sling/trunk/maven/archetypes/servlet/pom.xml sling/trunk/maven/maven-jcrocm-plugin/pom.xml sling/trunk/maven/maven-jspc-plugin/pom.xml sling/trunk/maven/maven-launchpad-plugin/pom.xml sling/trunk/maven/maven-sling-plugin/pom.xml sling/trunk/parent/pom.xml sling/trunk/pom.xml sling/trunk/testing/junit/core/pom.xml sling/trunk/testing/junit/remote/pom.xml sling/trunk/testing/junit/scriptable/pom.xml sling/trunk/testing/samples/failing-tests/pom.xml sling/trunk/testing/samples/integration-tests/pom.xml sling/trunk/testing/samples/sample-tests/pom.xml sling/trunk/testing/tools/pom.xml Modified: sling/trunk/bundles/api/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/api/pom.xml?rev=1163752&r1=1163751&r2=1163752&view=diff ============================================================================== --- sling/trunk/bundles/api/pom.xml (original) +++ sling/trunk/bundles/api/pom.xml Wed Aug 31 19:23:49 2011 @@ -23,7 +23,7 @@ org.apache.sling sling - 11 + 12-SNAPSHOT ../../parent/pom.xml Modified: sling/trunk/bundles/auth/core/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/auth/core/pom.xml?rev=1163752&r1=1163751&r2=1163752&view=diff ============================================================================== --- sling/trunk/bundles/auth/core/pom.xml (original) +++ sling/trunk/bundles/auth/core/pom.xml Wed Aug 31 19:23:49 2011 @@ -23,7 +23,7 @@ org.apache.sling sling - 11 + 12-SNAPSHOT ../../../parent/pom.xml Modified: sling/trunk/bundles/auth/form/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/auth/form/pom.xml?rev=1163752&r1=1163751&r2=1163752&view=diff ============================================================================== --- sling/trunk/bundles/auth/form/pom.xml (original) +++ sling/trunk/bundles/auth/form/pom.xml Wed Aug 31 19:23:49 2011 @@ -21,7 +21,7 @@ org.apache.sling sling - 11 + 12-SNAPSHOT ../../../parent/pom.xml Modified: sling/trunk/bundles/auth/openid/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/auth/openid/pom.xml?rev=1163752&r1=1163751&r2=1163752&view=diff ============================================================================== --- sling/trunk/bundles/auth/openid/pom.xml (original) +++ sling/trunk/bundles/auth/openid/pom.xml Wed Aug 31 19:23:49 2011 @@ -23,7 +23,7 @@ org.apache.sling sling - 11 + 12-SNAPSHOT ../../../parent/pom.xml Modified: sling/trunk/bundles/auth/selector/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/auth/selector/pom.xml?rev=1163752&r1=1163751&r2=1163752&view=diff ============================================================================== --- sling/trunk/bundles/auth/selector/pom.xml (original) +++ sling/trunk/bundles/auth/selector/pom.xml Wed Aug 31 19:23:49 2011 @@ -23,7 +23,7 @@ org.apache.sling sling - 11 + 12-SNAPSHOT ../../../parent/pom.xml Modified: sling/trunk/bundles/commons/classloader/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/commons/classloader/pom.xml?rev=1163752&r1=1163751&r2=1163752&view=diff ============================================================================== --- sling/trunk/bundles/commons/classloader/pom.xml (original) +++ sling/trunk/bundles/commons/classloader/pom.xml Wed Aug 31 19:23:49 2011 @@ -23,7 +23,7 @@ org.apache.sling sling - 11 + 12-SNAPSHOT ../../../parent/pom.xml Modified: sling/trunk/bundles/commons/json/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/commons/json/pom.xml?rev=1163752&r1=1163751&r2=1163752&view=diff ============================================================================== --- sling/trunk/bundles/commons/json/pom.xml (original) +++ sling/trunk/bundles/commons/json/pom.xml Wed Aug 31 19:23:49 2011 @@ -23,7 +23,7 @@ org.apache.sling sling - 11 + 12-SNAPSHOT ../../../parent/pom.xml Modified: sling/trunk/bundles/commons/log/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/commons/log/pom.xml?rev=1163752&r1=1163751&r2=1163752&view=diff ============================================================================== --- sling/trunk/bundles/commons/log/pom.xml (original) +++ sling/trunk/bundles/commons/log/pom.xml Wed Aug 31 19:23:49 2011 @@ -23,7 +23,7 @@ org.apache.sling sling - 11 + 12-SNAPSHOT ../../../parent/pom.xml Modified: sling/trunk/bundles/commons/mime/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/commons/mime/pom.xml?rev=1163752&r1=1163751&r2=1163752&view=diff ============================================================================== --- sling/trunk/bundles/commons/mime/pom.xml (original) +++ sling/trunk/bundles/commons/mime/pom.xml Wed Aug 31 19:23:49 2011 @@ -23,7 +23,7 @@ org.apache.sling sling - 11 + 12-SNAPSHOT ../../../parent/pom.xml Modified: sling/trunk/bundles/commons/osgi/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/commons/osgi/pom.xml?rev=1163752&r1=1163751&r2=1163752&view=diff ============================================================================== --- sling/trunk/bundles/commons/osgi/pom.xml (original) +++ sling/trunk/bundles/commons/osgi/pom.xml Wed Aug 31 19:23:49 2011 @@ -23,7 +23,7 @@ org.apache.sling sling - 11 + 12-SNAPSHOT ../../../parent/pom.xml Modified: sling/trunk/bundles/commons/scheduler/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/commons/scheduler/pom.xml?rev=1163752&r1=1163751&r2=1163752&view=diff ============================================================================== --- sling/trunk/bundles/commons/scheduler/pom.xml (original) +++ sling/trunk/bundles/commons/scheduler/pom.xml Wed Aug 31 19:23:49 2011 @@ -23,7 +23,7 @@ org.apache.sling sling - 11 + 12-SNAPSHOT ../../../parent/pom.xml Modified: sling/trunk/bundles/commons/testing/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/commons/testing/pom.xml?rev=1163752&r1=1163751&r2=1163752&view=diff ============================================================================== --- sling/trunk/bundles/commons/testing/pom.xml (original) +++ sling/trunk/bundles/commons/testing/pom.xml Wed Aug 31 19:23:49 2011 @@ -23,7 +23,7 @@ org.apache.sling sling - 11 + 12-SNAPSHOT ../../../parent/pom.xml Modified: sling/trunk/bundles/commons/threads/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/commons/threads/pom.xml?rev=1163752&r1=1163751&r2=1163752&view=diff ============================================================================== --- sling/trunk/bundles/commons/threads/pom.xml (original) +++ sling/trunk/bundles/commons/threads/pom.xml Wed Aug 31 19:23:49 2011 @@ -23,7 +23,7 @@ org.apache.sling sling - 11 + 12-SNAPSHOT ../../../parent/pom.xml Modified: sling/trunk/bundles/engine/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/engine/pom.xml?rev=1163752&r1=1163751&r2=1163752&view=diff ============================================================================== --- sling/trunk/bundles/engine/pom.xml (original) +++ sling/trunk/bundles/engine/pom.xml Wed Aug 31 19:23:49 2011 @@ -23,7 +23,7 @@ org.apache.sling sling - 11 + 12-SNAPSHOT ../../parent/pom.xml Modified: sling/trunk/bundles/extensions/adapter/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/adapter/pom.xml?rev=1163752&r1=1163751&r2=1163752&view=diff ============================================================================== --- sling/trunk/bundles/extensions/adapter/pom.xml (original) +++ sling/trunk/bundles/extensions/adapter/pom.xml Wed Aug 31 19:23:49 2011 @@ -23,7 +23,7 @@ org.apache.sling sling - 11 + 12-SNAPSHOT ../../../parent/pom.xml Modified: sling/trunk/bundles/extensions/bundleresource/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/bundleresource/pom.xml?rev=1163752&r1=1163751&r2=1163752&view=diff ============================================================================== --- sling/trunk/bundles/extensions/bundleresource/pom.xml (original) +++ sling/trunk/bundles/extensions/bundleresource/pom.xml Wed Aug 31 19:23:49 2011 @@ -22,7 +22,7 @@ org.apache.sling sling - 11 + 12-SNAPSHOT ../../../parent/pom.xml Modified: sling/trunk/bundles/extensions/event/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/pom.xml?rev=1163752&r1=1163751&r2=1163752&view=diff ============================================================================== --- sling/trunk/bundles/extensions/event/pom.xml (original) +++ sling/trunk/bundles/extensions/event/pom.xml Wed Aug 31 19:23:49 2011 @@ -23,7 +23,7 @@ org.apache.sling sling - 11 + 12-SNAPSHOT ../../../parent/pom.xml Modified: sling/trunk/bundles/extensions/explorer/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/explorer/pom.xml?rev=1163752&r1=1163751&r2=1163752&view=diff ============================================================================== --- sling/trunk/bundles/extensions/explorer/pom.xml (original) +++ sling/trunk/bundles/extensions/explorer/pom.xml Wed Aug 31 19:23:49 2011 @@ -21,7 +21,7 @@ org.apache.sling sling - 11 + 12-SNAPSHOT ../../../parent/pom.xml Modified: sling/trunk/bundles/extensions/framework-extension-activation/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/framework-extension-activation/pom.xml?rev=1163752&r1=1163751&r2=1163752&view=diff ============================================================================== --- sling/trunk/bundles/extensions/framework-extension-activation/pom.xml (original) +++ sling/trunk/bundles/extensions/framework-extension-activation/pom.xml Wed Aug 31 19:23:49 2011 @@ -23,7 +23,7 @@ org.apache.sling sling - 11 + 12-SNAPSHOT ../../../parent/pom.xml Modified: sling/trunk/bundles/extensions/framework-extension-transaction/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/framework-extension-transaction/pom.xml?rev=1163752&r1=1163751&r2=1163752&view=diff ============================================================================== --- sling/trunk/bundles/extensions/framework-extension-transaction/pom.xml (original) +++ sling/trunk/bundles/extensions/framework-extension-transaction/pom.xml Wed Aug 31 19:23:49 2011 @@ -23,7 +23,7 @@ org.apache.sling sling - 11 + 12-SNAPSHOT ../../../parent/pom.xml Modified: sling/trunk/bundles/extensions/framework-extension-xml/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/framework-extension-xml/pom.xml?rev=1163752&r1=1163751&r2=1163752&view=diff ============================================================================== --- sling/trunk/bundles/extensions/framework-extension-xml/pom.xml (original) +++ sling/trunk/bundles/extensions/framework-extension-xml/pom.xml Wed Aug 31 19:23:49 2011 @@ -23,7 +23,7 @@ org.apache.sling sling - 11 + 12-SNAPSHOT ../../../parent/pom.xml Modified: sling/trunk/bundles/extensions/fsresource/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/fsresource/pom.xml?rev=1163752&r1=1163751&r2=1163752&view=diff ============================================================================== --- sling/trunk/bundles/extensions/fsresource/pom.xml (original) +++ sling/trunk/bundles/extensions/fsresource/pom.xml Wed Aug 31 19:23:49 2011 @@ -22,7 +22,7 @@ org.apache.sling sling - 11 + 12-SNAPSHOT ../../../parent/pom.xml Modified: sling/trunk/bundles/extensions/groovy/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/groovy/pom.xml?rev=1163752&r1=1163751&r2=1163752&view=diff ============================================================================== --- sling/trunk/bundles/extensions/groovy/pom.xml (original) +++ sling/trunk/bundles/extensions/groovy/pom.xml Wed Aug 31 19:23:49 2011 @@ -23,7 +23,7 @@ sling org.apache.sling - 11 + 12-SNAPSHOT ../../../parent/pom.xml Modified: sling/trunk/bundles/extensions/settings/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/settings/pom.xml?rev=1163752&r1=1163751&r2=1163752&view=diff ============================================================================== --- sling/trunk/bundles/extensions/settings/pom.xml (original) +++ sling/trunk/bundles/extensions/settings/pom.xml Wed Aug 31 19:23:49 2011 @@ -23,7 +23,7 @@ org.apache.sling sling - 11 + 12-SNAPSHOT ../../../parent/pom.xml Modified: sling/trunk/bundles/extensions/threaddump/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/threaddump/pom.xml?rev=1163752&r1=1163751&r2=1163752&view=diff ============================================================================== --- sling/trunk/bundles/extensions/threaddump/pom.xml (original) +++ sling/trunk/bundles/extensions/threaddump/pom.xml Wed Aug 31 19:23:49 2011 @@ -23,7 +23,7 @@ org.apache.sling sling - 11 + 12-SNAPSHOT ../../../parent/pom.xml Modified: sling/trunk/bundles/extensions/webconsolebranding/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/webconsolebranding/pom.xml?rev=1163752&r1=1163751&r2=1163752&view=diff ============================================================================== --- sling/trunk/bundles/extensions/webconsolebranding/pom.xml (original) +++ sling/trunk/bundles/extensions/webconsolebranding/pom.xml Wed Aug 31 19:23:49 2011 @@ -23,7 +23,7 @@ sling org.apache.sling - 11 + 12-SNAPSHOT ../../../parent/pom.xml Modified: sling/trunk/bundles/extensions/webconsolesecurityprovider/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/webconsolesecurityprovider/pom.xml?rev=1163752&r1=1163751&r2=1163752&view=diff ============================================================================== --- sling/trunk/bundles/extensions/webconsolesecurityprovider/pom.xml (original) +++ sling/trunk/bundles/extensions/webconsolesecurityprovider/pom.xml Wed Aug 31 19:23:49 2011 @@ -21,7 +21,7 @@ sling org.apache.sling - 11 + 12-SNAPSHOT ../../../parent/pom.xml Modified: sling/trunk/bundles/jcr/api/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/api/pom.xml?rev=1163752&r1=1163751&r2=1163752&view=diff ============================================================================== --- sling/trunk/bundles/jcr/api/pom.xml (original) +++ sling/trunk/bundles/jcr/api/pom.xml Wed Aug 31 19:23:49 2011 @@ -23,7 +23,7 @@ org.apache.sling sling - 11 + 12-SNAPSHOT ../../../parent/pom.xml Modified: sling/trunk/bundles/jcr/base/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/base/pom.xml?rev=1163752&r1=1163751&r2=1163752&view=diff ============================================================================== --- sling/trunk/bundles/jcr/base/pom.xml (original) +++ sling/trunk/bundles/jcr/base/pom.xml Wed Aug 31 19:23:49 2011 @@ -23,7 +23,7 @@ org.apache.sling sling - 11 + 12-SNAPSHOT ../../../parent/pom.xml Modified: sling/trunk/bundles/jcr/classloader/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/classloader/pom.xml?rev=1163752&r1=1163751&r2=1163752&view=diff ============================================================================== --- sling/trunk/bundles/jcr/classloader/pom.xml (original) +++ sling/trunk/bundles/jcr/classloader/pom.xml Wed Aug 31 19:23:49 2011 @@ -22,7 +22,7 @@ org.apache.sling sling - 11 + 12-SNAPSHOT ../../../parent/pom.xml Modified: sling/trunk/bundles/jcr/contentloader/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/contentloader/pom.xml?rev=1163752&r1=1163751&r2=1163752&view=diff ============================================================================== --- sling/trunk/bundles/jcr/contentloader/pom.xml (original) +++ sling/trunk/bundles/jcr/contentloader/pom.xml Wed Aug 31 19:23:49 2011 @@ -22,7 +22,7 @@ org.apache.sling sling - 11 + 12-SNAPSHOT ../../../parent/pom.xml Modified: sling/trunk/bundles/jcr/davex/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/davex/pom.xml?rev=1163752&r1=1163751&r2=1163752&view=diff ============================================================================== --- sling/trunk/bundles/jcr/davex/pom.xml (original) +++ sling/trunk/bundles/jcr/davex/pom.xml Wed Aug 31 19:23:49 2011 @@ -13,7 +13,7 @@ org.apache.sling sling - 11 + 12-SNAPSHOT ../../../parent/pom.xml Modified: sling/trunk/bundles/jcr/jackrabbit-accessmanager/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/jackrabbit-accessmanager/pom.xml?rev=1163752&r1=1163751&r2=1163752&view=diff ============================================================================== --- sling/trunk/bundles/jcr/jackrabbit-accessmanager/pom.xml (original) +++ sling/trunk/bundles/jcr/jackrabbit-accessmanager/pom.xml Wed Aug 31 19:23:49 2011 @@ -23,7 +23,7 @@ org.apache.sling sling - 11 + 12-SNAPSHOT ../../../parent/pom.xml Modified: sling/trunk/bundles/jcr/jackrabbit-server/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/jackrabbit-server/pom.xml?rev=1163752&r1=1163751&r2=1163752&view=diff ============================================================================== --- sling/trunk/bundles/jcr/jackrabbit-server/pom.xml (original) +++ sling/trunk/bundles/jcr/jackrabbit-server/pom.xml Wed Aug 31 19:23:49 2011 @@ -22,7 +22,7 @@ org.apache.sling sling - 11 + 12-SNAPSHOT ../../../parent/pom.xml Modified: sling/trunk/bundles/jcr/jackrabbit-usermanager/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/jackrabbit-usermanager/pom.xml?rev=1163752&r1=1163751&r2=1163752&view=diff ============================================================================== --- sling/trunk/bundles/jcr/jackrabbit-usermanager/pom.xml (original) +++ sling/trunk/bundles/jcr/jackrabbit-usermanager/pom.xml Wed Aug 31 19:23:49 2011 @@ -23,7 +23,7 @@ org.apache.sling sling - 11 + 12-SNAPSHOT ../../../parent/pom.xml Modified: sling/trunk/bundles/jcr/ocm/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/ocm/pom.xml?rev=1163752&r1=1163751&r2=1163752&view=diff ============================================================================== --- sling/trunk/bundles/jcr/ocm/pom.xml (original) +++ sling/trunk/bundles/jcr/ocm/pom.xml Wed Aug 31 19:23:49 2011 @@ -23,7 +23,7 @@ org.apache.sling sling - 11 + 12-SNAPSHOT ../../../parent/pom.xml Modified: sling/trunk/bundles/jcr/resource/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/resource/pom.xml?rev=1163752&r1=1163751&r2=1163752&view=diff ============================================================================== --- sling/trunk/bundles/jcr/resource/pom.xml (original) +++ sling/trunk/bundles/jcr/resource/pom.xml Wed Aug 31 19:23:49 2011 @@ -22,7 +22,7 @@ org.apache.sling sling - 11 + 12-SNAPSHOT ../../../parent/pom.xml Modified: sling/trunk/bundles/jcr/webconsole/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/webconsole/pom.xml?rev=1163752&r1=1163751&r2=1163752&view=diff ============================================================================== --- sling/trunk/bundles/jcr/webconsole/pom.xml (original) +++ sling/trunk/bundles/jcr/webconsole/pom.xml Wed Aug 31 19:23:49 2011 @@ -23,7 +23,7 @@ org.apache.sling sling - 11 + 12-SNAPSHOT ../../../parent/pom.xml Modified: sling/trunk/bundles/jcr/webdav/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/webdav/pom.xml?rev=1163752&r1=1163751&r2=1163752&view=diff ============================================================================== --- sling/trunk/bundles/jcr/webdav/pom.xml (original) +++ sling/trunk/bundles/jcr/webdav/pom.xml Wed Aug 31 19:23:49 2011 @@ -23,7 +23,7 @@ org.apache.sling sling - 11 + 12-SNAPSHOT ../../../parent/pom.xml Modified: sling/trunk/bundles/scripting/api/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/api/pom.xml?rev=1163752&r1=1163751&r2=1163752&view=diff ============================================================================== --- sling/trunk/bundles/scripting/api/pom.xml (original) +++ sling/trunk/bundles/scripting/api/pom.xml Wed Aug 31 19:23:49 2011 @@ -23,7 +23,7 @@ org.apache.sling sling - 11 + 12-SNAPSHOT ../../../parent/pom.xml Modified: sling/trunk/bundles/scripting/core/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/core/pom.xml?rev=1163752&r1=1163751&r2=1163752&view=diff ============================================================================== --- sling/trunk/bundles/scripting/core/pom.xml (original) +++ sling/trunk/bundles/scripting/core/pom.xml Wed Aug 31 19:23:49 2011 @@ -23,7 +23,7 @@ org.apache.sling sling - 11 + 12-SNAPSHOT ../../../parent/pom.xml Modified: sling/trunk/bundles/scripting/javascript/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/javascript/pom.xml?rev=1163752&r1=1163751&r2=1163752&view=diff ============================================================================== --- sling/trunk/bundles/scripting/javascript/pom.xml (original) +++ sling/trunk/bundles/scripting/javascript/pom.xml Wed Aug 31 19:23:49 2011 @@ -23,7 +23,7 @@ org.apache.sling sling - 11 + 12-SNAPSHOT ../../../parent/pom.xml Modified: sling/trunk/bundles/scripting/jsp-taglib/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/jsp-taglib/pom.xml?rev=1163752&r1=1163751&r2=1163752&view=diff ============================================================================== --- sling/trunk/bundles/scripting/jsp-taglib/pom.xml (original) +++ sling/trunk/bundles/scripting/jsp-taglib/pom.xml Wed Aug 31 19:23:49 2011 @@ -23,7 +23,7 @@ org.apache.sling sling - 11 + 12-SNAPSHOT ../../../parent/pom.xml Modified: sling/trunk/bundles/scripting/jsp/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/jsp/pom.xml?rev=1163752&r1=1163751&r2=1163752&view=diff ============================================================================== --- sling/trunk/bundles/scripting/jsp/pom.xml (original) +++ sling/trunk/bundles/scripting/jsp/pom.xml Wed Aug 31 19:23:49 2011 @@ -23,7 +23,7 @@ org.apache.sling sling - 11 + 12-SNAPSHOT ../../../parent/pom.xml Modified: sling/trunk/bundles/servlets/get/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/servlets/get/pom.xml?rev=1163752&r1=1163751&r2=1163752&view=diff ============================================================================== --- sling/trunk/bundles/servlets/get/pom.xml (original) +++ sling/trunk/bundles/servlets/get/pom.xml Wed Aug 31 19:23:49 2011 @@ -23,7 +23,7 @@ org.apache.sling sling - 11 + 12-SNAPSHOT ../../../parent/pom.xml Modified: sling/trunk/bundles/servlets/post/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/servlets/post/pom.xml?rev=1163752&r1=1163751&r2=1163752&view=diff ============================================================================== --- sling/trunk/bundles/servlets/post/pom.xml (original) +++ sling/trunk/bundles/servlets/post/pom.xml Wed Aug 31 19:23:49 2011 @@ -22,7 +22,7 @@ org.apache.sling sling - 11 + 12-SNAPSHOT ../../../parent/pom.xml Modified: sling/trunk/bundles/servlets/resolver/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/servlets/resolver/pom.xml?rev=1163752&r1=1163751&r2=1163752&view=diff ============================================================================== --- sling/trunk/bundles/servlets/resolver/pom.xml (original) +++ sling/trunk/bundles/servlets/resolver/pom.xml Wed Aug 31 19:23:49 2011 @@ -23,7 +23,7 @@ org.apache.sling sling - 11 + 12-SNAPSHOT ../../../parent/pom.xml Modified: sling/trunk/installer/core/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/installer/core/pom.xml?rev=1163752&r1=1163751&r2=1163752&view=diff ============================================================================== --- sling/trunk/installer/core/pom.xml (original) +++ sling/trunk/installer/core/pom.xml Wed Aug 31 19:23:49 2011 @@ -23,7 +23,7 @@ org.apache.sling sling - 11 + 12-SNAPSHOT ../../parent/pom.xml Modified: sling/trunk/installer/factories/configuration/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/installer/factories/configuration/pom.xml?rev=1163752&r1=1163751&r2=1163752&view=diff ============================================================================== --- sling/trunk/installer/factories/configuration/pom.xml (original) +++ sling/trunk/installer/factories/configuration/pom.xml Wed Aug 31 19:23:49 2011 @@ -21,7 +21,7 @@ org.apache.sling sling - 11 + 12-SNAPSHOT ../../../parent/pom.xml Modified: sling/trunk/installer/factories/deploymentpck/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/installer/factories/deploymentpck/pom.xml?rev=1163752&r1=1163751&r2=1163752&view=diff ============================================================================== --- sling/trunk/installer/factories/deploymentpck/pom.xml (original) +++ sling/trunk/installer/factories/deploymentpck/pom.xml Wed Aug 31 19:23:49 2011 @@ -21,7 +21,7 @@ org.apache.sling sling - 11 + 12-SNAPSHOT ../../../parent/pom.xml Modified: sling/trunk/installer/it/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/installer/it/pom.xml?rev=1163752&r1=1163751&r2=1163752&view=diff ============================================================================== --- sling/trunk/installer/it/pom.xml (original) +++ sling/trunk/installer/it/pom.xml Wed Aug 31 19:23:49 2011 @@ -21,7 +21,7 @@ org.apache.sling sling - 11 + 12-SNAPSHOT ../../parent/pom.xml Modified: sling/trunk/installer/providers/file/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/installer/providers/file/pom.xml?rev=1163752&r1=1163751&r2=1163752&view=diff ============================================================================== --- sling/trunk/installer/providers/file/pom.xml (original) +++ sling/trunk/installer/providers/file/pom.xml Wed Aug 31 19:23:49 2011 @@ -23,7 +23,7 @@ org.apache.sling sling - 11 + 12-SNAPSHOT ../../../parent/pom.xml Modified: sling/trunk/installer/providers/jcr/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/installer/providers/jcr/pom.xml?rev=1163752&r1=1163751&r2=1163752&view=diff ============================================================================== --- sling/trunk/installer/providers/jcr/pom.xml (original) +++ sling/trunk/installer/providers/jcr/pom.xml Wed Aug 31 19:23:49 2011 @@ -23,7 +23,7 @@ org.apache.sling sling - 11 + 12-SNAPSHOT ../../../parent/pom.xml Modified: sling/trunk/launchpad/api/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/api/pom.xml?rev=1163752&r1=1163751&r2=1163752&view=diff ============================================================================== --- sling/trunk/launchpad/api/pom.xml (original) +++ sling/trunk/launchpad/api/pom.xml Wed Aug 31 19:23:49 2011 @@ -16,7 +16,7 @@ org.apache.sling sling - 11 + 12-SNAPSHOT ../../parent/pom.xml Modified: sling/trunk/launchpad/base/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/base/pom.xml?rev=1163752&r1=1163751&r2=1163752&view=diff ============================================================================== --- sling/trunk/launchpad/base/pom.xml (original) +++ sling/trunk/launchpad/base/pom.xml Wed Aug 31 19:23:49 2011 @@ -23,7 +23,7 @@ org.apache.sling sling - 11 + 12-SNAPSHOT ../../parent/pom.xml Modified: sling/trunk/launchpad/builder/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/builder/pom.xml?rev=1163752&r1=1163751&r2=1163752&view=diff ============================================================================== --- sling/trunk/launchpad/builder/pom.xml (original) +++ sling/trunk/launchpad/builder/pom.xml Wed Aug 31 19:23:49 2011 @@ -16,7 +16,7 @@ org.apache.sling sling - 11 + 12-SNAPSHOT ../../parent/pom.xml Modified: sling/trunk/launchpad/content/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/content/pom.xml?rev=1163752&r1=1163751&r2=1163752&view=diff ============================================================================== --- sling/trunk/launchpad/content/pom.xml (original) +++ sling/trunk/launchpad/content/pom.xml Wed Aug 31 19:23:49 2011 @@ -23,7 +23,7 @@ org.apache.sling sling - 11 + 12-SNAPSHOT ../../parent/pom.xml Modified: sling/trunk/launchpad/installer/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/installer/pom.xml?rev=1163752&r1=1163751&r2=1163752&view=diff ============================================================================== --- sling/trunk/launchpad/installer/pom.xml (original) +++ sling/trunk/launchpad/installer/pom.xml Wed Aug 31 19:23:49 2011 @@ -16,7 +16,7 @@ org.apache.sling sling - 11 + 12-SNAPSHOT ../../parent/pom.xml org.apache.sling Modified: sling/trunk/launchpad/integration-tests/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/integration-tests/pom.xml?rev=1163752&r1=1163751&r2=1163752&view=diff ============================================================================== --- sling/trunk/launchpad/integration-tests/pom.xml (original) +++ sling/trunk/launchpad/integration-tests/pom.xml Wed Aug 31 19:23:49 2011 @@ -20,7 +20,7 @@ org.apache.sling sling - 11 + 12-SNAPSHOT ../../parent/pom.xml Modified: sling/trunk/launchpad/test-bundles/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/test-bundles/pom.xml?rev=1163752&r1=1163751&r2=1163752&view=diff ============================================================================== --- sling/trunk/launchpad/test-bundles/pom.xml (original) +++ sling/trunk/launchpad/test-bundles/pom.xml Wed Aug 31 19:23:49 2011 @@ -23,7 +23,7 @@ org.apache.sling sling - 11 + 12-SNAPSHOT ../../parent/pom.xml Modified: sling/trunk/launchpad/test-services-war/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/test-services-war/pom.xml?rev=1163752&r1=1163751&r2=1163752&view=diff ============================================================================== --- sling/trunk/launchpad/test-services-war/pom.xml (original) +++ sling/trunk/launchpad/test-services-war/pom.xml Wed Aug 31 19:23:49 2011 @@ -23,7 +23,7 @@ org.apache.sling sling - 11 + 12-SNAPSHOT ../../parent/pom.xml Modified: sling/trunk/launchpad/test-services/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/test-services/pom.xml?rev=1163752&r1=1163751&r2=1163752&view=diff ============================================================================== --- sling/trunk/launchpad/test-services/pom.xml (original) +++ sling/trunk/launchpad/test-services/pom.xml Wed Aug 31 19:23:49 2011 @@ -23,7 +23,7 @@ org.apache.sling sling - 11 + 12-SNAPSHOT ../../parent/pom.xml Modified: sling/trunk/launchpad/testing-war/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/testing-war/pom.xml?rev=1163752&r1=1163751&r2=1163752&view=diff ============================================================================== --- sling/trunk/launchpad/testing-war/pom.xml (original) +++ sling/trunk/launchpad/testing-war/pom.xml Wed Aug 31 19:23:49 2011 @@ -23,7 +23,7 @@ org.apache.sling sling - 11 + 12-SNAPSHOT ../../parent/pom.xml Modified: sling/trunk/launchpad/testing/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/testing/pom.xml?rev=1163752&r1=1163751&r2=1163752&view=diff ============================================================================== --- sling/trunk/launchpad/testing/pom.xml (original) +++ sling/trunk/launchpad/testing/pom.xml Wed Aug 31 19:23:49 2011 @@ -23,7 +23,7 @@ org.apache.sling sling - 11 + 12-SNAPSHOT ../../parent/pom.xml Added: sling/trunk/maven/apache-sling-jar-resource-bundle/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/maven/apache-sling-jar-resource-bundle/pom.xml?rev=1163752&view=auto ============================================================================== --- sling/trunk/maven/apache-sling-jar-resource-bundle/pom.xml (added) +++ sling/trunk/maven/apache-sling-jar-resource-bundle/pom.xml Wed Aug 31 19:23:49 2011 @@ -0,0 +1,40 @@ + + + + + + 4.0.0 + + + org.apache + apache + 9 + + + + org.apache.sling + apache-sling-jar-resource-bundle + 1.0.0-SNAPSHOT + + Apache Sling JAR Resource Bundle + + An archive which contains templates for generating the necessary Sling notice file. + + Added: sling/trunk/maven/apache-sling-jar-resource-bundle/src/main/resources/META-INF/NOTICE.vm URL: http://svn.apache.org/viewvc/sling/trunk/maven/apache-sling-jar-resource-bundle/src/main/resources/META-INF/NOTICE.vm?rev=1163752&view=auto ============================================================================== --- sling/trunk/maven/apache-sling-jar-resource-bundle/src/main/resources/META-INF/NOTICE.vm (added) +++ sling/trunk/maven/apache-sling-jar-resource-bundle/src/main/resources/META-INF/NOTICE.vm Wed Aug 31 19:23:49 2011 @@ -0,0 +1,31 @@ +## +## Licensed to the Apache Software Foundation (ASF) under one +## or more contributor license agreements. See the NOTICE file +## distributed with this work for additional information +## regarding copyright ownership. The ASF licenses this file +## to you under the Apache License, Version 2.0 (the +## "License"); you may not use this file except in compliance +## with the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, +## software distributed under the License is distributed on an +## "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +## KIND, either express or implied. See the License for the +## specific language governing permissions and limitations +## under the License. +## + +#if ($projectName)$projectName#else${project.name}#end + +Copyright ${projectTimespan}#if($project.organization.name) $project.organization.name#else The Apache Software Foundation#end + + +Apache Sling is based on source code originally developed +by Day Software (http://www.day.com/). + +This product includes software developed at +The Apache Software Foundation (http://www.apache.org/). + + Modified: sling/trunk/maven/archetypes/bundle-for-jcrinstall/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/maven/archetypes/bundle-for-jcrinstall/pom.xml?rev=1163752&r1=1163751&r2=1163752&view=diff ============================================================================== --- sling/trunk/maven/archetypes/bundle-for-jcrinstall/pom.xml (original) +++ sling/trunk/maven/archetypes/bundle-for-jcrinstall/pom.xml Wed Aug 31 19:23:49 2011 @@ -22,7 +22,7 @@ org.apache.sling sling - 11 + 12-SNAPSHOT ../../../parent/pom.xml Modified: sling/trunk/maven/archetypes/bundle/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/maven/archetypes/bundle/pom.xml?rev=1163752&r1=1163751&r2=1163752&view=diff ============================================================================== --- sling/trunk/maven/archetypes/bundle/pom.xml (original) +++ sling/trunk/maven/archetypes/bundle/pom.xml Wed Aug 31 19:23:49 2011 @@ -22,7 +22,7 @@ org.apache.sling sling - 11 + 12-SNAPSHOT ../../../parent/pom.xml Modified: sling/trunk/maven/archetypes/initial-content/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/maven/archetypes/initial-content/pom.xml?rev=1163752&r1=1163751&r2=1163752&view=diff ============================================================================== --- sling/trunk/maven/archetypes/initial-content/pom.xml (original) +++ sling/trunk/maven/archetypes/initial-content/pom.xml Wed Aug 31 19:23:49 2011 @@ -22,7 +22,7 @@ org.apache.sling sling - 11 + 12-SNAPSHOT ../../../parent/pom.xml Modified: sling/trunk/maven/archetypes/launchpad-standalone/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/maven/archetypes/launchpad-standalone/pom.xml?rev=1163752&r1=1163751&r2=1163752&view=diff ============================================================================== --- sling/trunk/maven/archetypes/launchpad-standalone/pom.xml (original) +++ sling/trunk/maven/archetypes/launchpad-standalone/pom.xml Wed Aug 31 19:23:49 2011 @@ -16,7 +16,7 @@ org.apache.sling sling - 11 + 12-SNAPSHOT ../../../parent/pom.xml sling-launchpad-standalone-archetype Modified: sling/trunk/maven/archetypes/launchpad-webapp/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/maven/archetypes/launchpad-webapp/pom.xml?rev=1163752&r1=1163751&r2=1163752&view=diff ============================================================================== --- sling/trunk/maven/archetypes/launchpad-webapp/pom.xml (original) +++ sling/trunk/maven/archetypes/launchpad-webapp/pom.xml Wed Aug 31 19:23:49 2011 @@ -16,7 +16,7 @@ org.apache.sling sling - 11 + 12-SNAPSHOT ../../../parent/pom.xml sling-launchpad-webapp-archetype Modified: sling/trunk/maven/archetypes/servlet/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/maven/archetypes/servlet/pom.xml?rev=1163752&r1=1163751&r2=1163752&view=diff ============================================================================== --- sling/trunk/maven/archetypes/servlet/pom.xml (original) +++ sling/trunk/maven/archetypes/servlet/pom.xml Wed Aug 31 19:23:49 2011 @@ -22,7 +22,7 @@ org.apache.sling sling - 11 + 12-SNAPSHOT ../../../parent/pom.xml Modified: sling/trunk/maven/maven-jcrocm-plugin/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/maven/maven-jcrocm-plugin/pom.xml?rev=1163752&r1=1163751&r2=1163752&view=diff ============================================================================== --- sling/trunk/maven/maven-jcrocm-plugin/pom.xml (original) +++ sling/trunk/maven/maven-jcrocm-plugin/pom.xml Wed Aug 31 19:23:49 2011 @@ -23,7 +23,7 @@ org.apache.sling sling - 11 + 12-SNAPSHOT ../../parent/pom.xml Modified: sling/trunk/maven/maven-jspc-plugin/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/maven/maven-jspc-plugin/pom.xml?rev=1163752&r1=1163751&r2=1163752&view=diff ============================================================================== --- sling/trunk/maven/maven-jspc-plugin/pom.xml (original) +++ sling/trunk/maven/maven-jspc-plugin/pom.xml Wed Aug 31 19:23:49 2011 @@ -23,7 +23,7 @@ org.apache.sling sling - 11 + 12-SNAPSHOT ../../parent/pom.xml Modified: sling/trunk/maven/maven-launchpad-plugin/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/maven/maven-launchpad-plugin/pom.xml?rev=1163752&r1=1163751&r2=1163752&view=diff ============================================================================== --- sling/trunk/maven/maven-launchpad-plugin/pom.xml (original) +++ sling/trunk/maven/maven-launchpad-plugin/pom.xml Wed Aug 31 19:23:49 2011 @@ -17,7 +17,7 @@ org.apache.sling sling - 11 + 12-SNAPSHOT ../../parent/pom.xml Modified: sling/trunk/maven/maven-sling-plugin/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/maven/maven-sling-plugin/pom.xml?rev=1163752&r1=1163751&r2=1163752&view=diff ============================================================================== --- sling/trunk/maven/maven-sling-plugin/pom.xml (original) +++ sling/trunk/maven/maven-sling-plugin/pom.xml Wed Aug 31 19:23:49 2011 @@ -23,7 +23,7 @@ org.apache.sling sling - 11 + 12-SNAPSHOT ../../parent/pom.xml Modified: sling/trunk/parent/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/parent/pom.xml?rev=1163752&r1=1163751&r2=1163752&view=diff ============================================================================== --- sling/trunk/parent/pom.xml (original) +++ sling/trunk/parent/pom.xml Wed Aug 31 19:23:49 2011 @@ -199,6 +199,27 @@ on 64bit platforms: MAVEN_OPTS="-Xmx512M + + + + maven-remote-resources-plugin + + + + process + + + + org.apache.sling:apache-sling-jar-resource-bundle:1.0.0-SNAPSHOT + org.apache:apache-jar-resource-bundle:1.4 + + + + + Modified: sling/trunk/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/pom.xml?rev=1163752&r1=1163751&r2=1163752&view=diff ============================================================================== --- sling/trunk/pom.xml (original) +++ sling/trunk/pom.xml Wed Aug 31 19:23:49 2011 @@ -81,6 +81,8 @@ + maven/apache-sling-jar-resource-bundle + parent Modified: sling/trunk/testing/junit/core/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/testing/junit/core/pom.xml?rev=1163752&r1=1163751&r2=1163752&view=diff ============================================================================== --- sling/trunk/testing/junit/core/pom.xml (original) +++ sling/trunk/testing/junit/core/pom.xml Wed Aug 31 19:23:49 2011 @@ -23,7 +23,7 @@ org.apache.sling sling - 11 + 12-SNAPSHOT ../../../parent/pom.xml Modified: sling/trunk/testing/junit/remote/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/testing/junit/remote/pom.xml?rev=1163752&r1=1163751&r2=1163752&view=diff ============================================================================== --- sling/trunk/testing/junit/remote/pom.xml (original) +++ sling/trunk/testing/junit/remote/pom.xml Wed Aug 31 19:23:49 2011 @@ -23,7 +23,7 @@ org.apache.sling sling - 11 + 12-SNAPSHOT ../../../parent/pom.xml Modified: sling/trunk/testing/junit/scriptable/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/testing/junit/scriptable/pom.xml?rev=1163752&r1=1163751&r2=1163752&view=diff ============================================================================== --- sling/trunk/testing/junit/scriptable/pom.xml (original) +++ sling/trunk/testing/junit/scriptable/pom.xml Wed Aug 31 19:23:49 2011 @@ -23,7 +23,7 @@ org.apache.sling sling - 11 + 12-SNAPSHOT ../../../parent/pom.xml Modified: sling/trunk/testing/samples/failing-tests/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/testing/samples/failing-tests/pom.xml?rev=1163752&r1=1163751&r2=1163752&view=diff ============================================================================== --- sling/trunk/testing/samples/failing-tests/pom.xml (original) +++ sling/trunk/testing/samples/failing-tests/pom.xml Wed Aug 31 19:23:49 2011 @@ -23,7 +23,7 @@ org.apache.sling sling - 11 + 12-SNAPSHOT ../../../parent/pom.xml Modified: sling/trunk/testing/samples/integration-tests/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/testing/samples/integration-tests/pom.xml?rev=1163752&r1=1163751&r2=1163752&view=diff ============================================================================== --- sling/trunk/testing/samples/integration-tests/pom.xml (original) +++ sling/trunk/testing/samples/integration-tests/pom.xml Wed Aug 31 19:23:49 2011 @@ -23,7 +23,7 @@ org.apache.sling sling - 11 + 12-SNAPSHOT ../../../parent/pom.xml Modified: sling/trunk/testing/samples/sample-tests/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/testing/samples/sample-tests/pom.xml?rev=1163752&r1=1163751&r2=1163752&view=diff ============================================================================== --- sling/trunk/testing/samples/sample-tests/pom.xml (original) +++ sling/trunk/testing/samples/sample-tests/pom.xml Wed Aug 31 19:23:49 2011 @@ -23,7 +23,7 @@ org.apache.sling sling - 11 + 12-SNAPSHOT ../../../parent/pom.xml Modified: sling/trunk/testing/tools/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/testing/tools/pom.xml?rev=1163752&r1=1163751&r2=1163752&view=diff ============================================================================== --- sling/trunk/testing/tools/pom.xml (original) +++ sling/trunk/testing/tools/pom.xml Wed Aug 31 19:23:49 2011 @@ -23,7 +23,7 @@ org.apache.sling sling - 11 + 12-SNAPSHOT ../../parent/pom.xml