Return-Path: X-Original-To: apmail-felix-commits-archive@www.apache.org Delivered-To: apmail-felix-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 E85181114D for ; Fri, 20 Jun 2014 11:41:29 +0000 (UTC) Received: (qmail 20654 invoked by uid 500); 20 Jun 2014 11:41:29 -0000 Delivered-To: apmail-felix-commits-archive@felix.apache.org Received: (qmail 20615 invoked by uid 500); 20 Jun 2014 11:41:29 -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 20606 invoked by uid 99); 20 Jun 2014 11:41:29 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 20 Jun 2014 11:41:29 +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; Fri, 20 Jun 2014 11:41:27 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 583C42388A4A; Fri, 20 Jun 2014 11:41:02 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1604145 [5/5] - in /felix/trunk/bundleplugin: doc/site/ doc/site/xref/org/apache/felix/bundleplugin/ src/main/java/org/apache/felix/bundleplugin/ Date: Fri, 20 Jun 2014 11:41:01 -0000 To: commits@felix.apache.org From: mcculls@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140620114102.583C42388A4A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Modified: felix/trunk/bundleplugin/doc/site/xref/org/apache/felix/bundleplugin/VersionCleanerPlugin.html URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/doc/site/xref/org/apache/felix/bundleplugin/VersionCleanerPlugin.html?rev=1604145&r1=1604144&r2=1604145&view=diff ============================================================================== --- felix/trunk/bundleplugin/doc/site/xref/org/apache/felix/bundleplugin/VersionCleanerPlugin.html (original) +++ felix/trunk/bundleplugin/doc/site/xref/org/apache/felix/bundleplugin/VersionCleanerPlugin.html Fri Jun 20 11:41:00 2014 @@ -41,55 +41,57 @@ 31 32 33 /** -34 * @goal cleanVersions -35 * @description clean OSGi versions -36 * @threadSafe -37 */ -38 public class VersionCleanerPlugin extends AbstractMojo -39 { -40 -41 /** -42 * The BND instructions for the bundle. -43 * -44 * @parameter -45 */ -46 private Map versions = new LinkedHashMap(); -47 -48 /** -49 * The Maven project. -50 * -51 * @parameter expression="${project}" -52 * @required -53 * @readonly -54 */ -55 private MavenProject project; -56 -57 private Maven2OsgiConverter maven2OsgiConverter = new DefaultMaven2OsgiConverter(); +34 * Convert a group of versions to OSGi format. +35 * +36 * @goal cleanVersions +37 * @description clean OSGi versions +38 * @threadSafe +39 */ +40 public class VersionCleanerPlugin extends AbstractMojo +41 { +42 +43 /** +44 * The BND instructions for the bundle. +45 * +46 * @parameter +47 */ +48 private Map versions = new LinkedHashMap(); +49 +50 /** +51 * The Maven project. +52 * +53 * @parameter expression="${project}" +54 * @required +55 * @readonly +56 */ +57 private MavenProject project; 58 -59 -60 public Maven2OsgiConverter getMaven2OsgiConverter() -61 { -62 return maven2OsgiConverter; -63 } -64 -65 -66 public void setMaven2OsgiConverter( Maven2OsgiConverter maven2OsgiConverter ) -67 { -68 this.maven2OsgiConverter = maven2OsgiConverter; -69 } -70 -71 -72 public void execute() throws MojoExecutionException, MojoFailureException -73 { -74 for ( Object key : versions.keySet() ) -75 { -76 String name = ( String ) key; -77 String version = ( String ) versions.get( key ); -78 String osgi = maven2OsgiConverter.getVersion( version ); -79 project.getProperties().put( name, osgi ); -80 } -81 } -82 } +59 private Maven2OsgiConverter maven2OsgiConverter = new DefaultMaven2OsgiConverter(); +60 +61 +62 public Maven2OsgiConverter getMaven2OsgiConverter() +63 { +64 return maven2OsgiConverter; +65 } +66 +67 +68 public void setMaven2OsgiConverter( Maven2OsgiConverter maven2OsgiConverter ) +69 { +70 this.maven2OsgiConverter = maven2OsgiConverter; +71 } +72 +73 +74 public void execute() throws MojoExecutionException, MojoFailureException +75 { +76 for ( Object key : versions.keySet() ) +77 { +78 String name = ( String ) key; +79 String version = ( String ) versions.get( key ); +80 String osgi = maven2OsgiConverter.getVersion( version ); +81 project.getProperties().put( name, osgi ); +82 } +83 } +84 }

Modified: felix/trunk/bundleplugin/doc/site/xref/org/apache/felix/bundleplugin/WrapPlugin.html URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/doc/site/xref/org/apache/felix/bundleplugin/WrapPlugin.html?rev=1604145&r1=1604144&r2=1604145&view=diff ============================================================================== --- felix/trunk/bundleplugin/doc/site/xref/org/apache/felix/bundleplugin/WrapPlugin.html (original) +++ felix/trunk/bundleplugin/doc/site/xref/org/apache/felix/bundleplugin/WrapPlugin.html Fri Jun 20 11:41:00 2014 @@ -33,25 +33,27 @@ 23 24 25 /** -26 * @goal wrap -27 * @phase package -28 * @requiresDependencyResolution test -29 * @description build an OSGi bundle jar for direct dependencies -30 * @deprecated The wrap goal is no longer supported and may be removed in a future release -31 */ -32 @Deprecated -33 public final class WrapPlugin extends BundleAllPlugin -34 { -35 public void execute() throws MojoExecutionException -36 { -37 getLog().warn( "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~" ); -38 getLog().warn( "! The wrap goal is no longer supported and may be removed in a future release !" ); +26 * Create OSGi bundles from the direct dependencies of the Maven project. +27 * +28 * @goal wrap +29 * @phase package +30 * @requiresDependencyResolution test +31 * @description build an OSGi bundle jar for direct dependencies +32 * @deprecated The wrap goal is no longer supported and may be removed in a future release +33 */ +34 @Deprecated +35 public final class WrapPlugin extends BundleAllPlugin +36 { +37 public void execute() throws MojoExecutionException +38 { 39 getLog().warn( "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~" ); -40 -41 BundleInfo bundleInfo = bundleAll( getProject(), 1 ); -42 logDuplicatedPackages( bundleInfo ); -43 } -44 } +40 getLog().warn( "! The wrap goal is no longer supported and may be removed in a future release !" ); +41 getLog().warn( "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~" ); +42 +43 BundleInfo bundleInfo = bundleAll( getProject(), 1 ); +44 logDuplicatedPackages( bundleInfo ); +45 } +46 }

Modified: felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java?rev=1604145&r1=1604144&r2=1604145&view=diff ============================================================================== --- felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java (original) +++ felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java Fri Jun 20 11:41:00 2014 @@ -226,6 +226,8 @@ public class BundlePlugin extends Abstra private MavenSession m_mavenSession; /** + * Output a nicely formatted manifest that still respects the 72 character line limit. + * * @parameter */ private boolean niceManifest = false; Modified: felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/VersionCleanerPlugin.java URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/VersionCleanerPlugin.java?rev=1604145&r1=1604144&r2=1604145&view=diff ============================================================================== --- felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/VersionCleanerPlugin.java (original) +++ felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/VersionCleanerPlugin.java Fri Jun 20 11:41:00 2014 @@ -31,6 +31,8 @@ import org.apache.maven.shared.osgi.Mave /** + * Convert a group of versions to OSGi format. + * * @goal cleanVersions * @description clean OSGi versions * @threadSafe Modified: felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/WrapPlugin.java URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/WrapPlugin.java?rev=1604145&r1=1604144&r2=1604145&view=diff ============================================================================== --- felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/WrapPlugin.java (original) +++ felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/WrapPlugin.java Fri Jun 20 11:41:00 2014 @@ -23,6 +23,8 @@ import org.apache.maven.plugin.MojoExecu /** + * Create OSGi bundles from the direct dependencies of the Maven project. + * * @goal wrap * @phase package * @requiresDependencyResolution test