Return-Path: Delivered-To: apmail-felix-commits-archive@www.apache.org Received: (qmail 93205 invoked from network); 25 Sep 2010 06:22:53 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 25 Sep 2010 06:22:53 -0000 Received: (qmail 82985 invoked by uid 500); 25 Sep 2010 06:22:53 -0000 Delivered-To: apmail-felix-commits-archive@felix.apache.org Received: (qmail 82892 invoked by uid 500); 25 Sep 2010 06:22:51 -0000 Mailing-List: contact commits-help@felix.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@felix.apache.org Delivered-To: mailing list commits@felix.apache.org Received: (qmail 82885 invoked by uid 99); 25 Sep 2010 06:22:50 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 25 Sep 2010 06:22:50 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Sat, 25 Sep 2010 06:22:49 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 606AE23889B9; Sat, 25 Sep 2010 06:22:29 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1001137 - in /felix/trunk/ipojo/junit4osgi: junit4osgi/pom.xml maven-junit4osgi-plugin/pom.xml Date: Sat, 25 Sep 2010 06:22:29 -0000 To: commits@felix.apache.org From: clement@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100925062229.606AE23889B9@eris.apache.org> Author: clement Date: Sat Sep 25 06:22:29 2010 New Revision: 1001137 URL: http://svn.apache.org/viewvc?rev=1001137&view=rev Log: fix osgi core dependency, reenable internal junit4osgi tests Modified: felix/trunk/ipojo/junit4osgi/junit4osgi/pom.xml felix/trunk/ipojo/junit4osgi/maven-junit4osgi-plugin/pom.xml Modified: felix/trunk/ipojo/junit4osgi/junit4osgi/pom.xml URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/junit4osgi/junit4osgi/pom.xml?rev=1001137&r1=1001136&r2=1001137&view=diff ============================================================================== --- felix/trunk/ipojo/junit4osgi/junit4osgi/pom.xml (original) +++ felix/trunk/ipojo/junit4osgi/junit4osgi/pom.xml Sat Sep 25 06:22:29 2010 @@ -43,6 +43,11 @@ junit 3.8.1 + + org.osgi + org.osgi.core + 4.2.0 + @@ -77,12 +82,12 @@ junit.* !javax.swing*, * - + META-INF/LICENSE=LICENSE, META-INF/LICENSE.junit=LICENSE.junit, @@ -94,7 +99,7 @@ org.apache.felix maven-ipojo-plugin - 1.5.0-SNAPSHOT + 1.7.0-SNAPSHOT Modified: felix/trunk/ipojo/junit4osgi/maven-junit4osgi-plugin/pom.xml URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/junit4osgi/maven-junit4osgi-plugin/pom.xml?rev=1001137&r1=1001136&r2=1001137&view=diff ============================================================================== --- felix/trunk/ipojo/junit4osgi/maven-junit4osgi-plugin/pom.xml (original) +++ felix/trunk/ipojo/junit4osgi/maven-junit4osgi-plugin/pom.xml Sat Sep 25 06:22:29 2010 @@ -6,9 +6,9 @@ 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 @@ -36,7 +36,8 @@ org.apache.felix org.apache.felix.framework - 3.1.0-SNAPSHOT + + 3.0.3 org.apache.maven