Re: Problems with bundle version strings produced by maven-osgi-plugin

2006-12-08 Thread Richard S. Hall
Steven E. Harris wrote: Find one more candidate change attached, conceived after thinking about it more last night. It avoids some spurious String creation. Ok, I just committed it. I didn't test this one, so I will trust your changes... :-) Thanks. -> richard

Re: Problems with bundle version strings produced by maven-osgi-plugin

2006-12-08 Thread Richard S. Hall
This is sort of terse. Was there an issue with your last patch that you are fixing here? -> richard Steven E. Harris wrote: Index: OsgiJarMojo.java === --- OsgiJarMojo.java(revision 484659) +++ OsgiJarMojo.java(working cop

Re: Problems with bundle version strings produced by maven-osgi-plugin

2006-12-08 Thread Steven E. Harris
[The mailing list software seems to cut out any text content the comes alongside an attachment, so here is the actual body of the last message that contained a patch.] "Richard S. Hall" <[EMAIL PROTECTED]> writes: > Ok, I applied the patch...modified it slightly to get rid of its > dependencie

Re: Problems with bundle version strings produced by maven-osgi-plugin

2006-12-08 Thread Steven E. Harris
Index: OsgiJarMojo.java === --- OsgiJarMojo.java (revision 484659) +++ OsgiJarMojo.java (working copy) @@ -692,17 +692,15 @@ if (!matcher.lookingAt()) return version; -final StringBuffer sb = new StringB

Re: Problems with bundle version strings produced by maven-osgi-plugin

2006-12-08 Thread Richard S. Hall
Ok, I applied the patch...modified it slightly to get rid of its dependencies on JDK 1.5... I tested it out a bit and it appears to work. Thanks a lot. -> richard Steven E. Harris wrote: Index: OsgiJarMojo.java === --- OsgiJarMo

Re: Problems with bundle version strings produced by maven-osgi-plugin

2006-12-07 Thread Steven E. Harris
Index: OsgiJarMojo.java === --- OsgiJarMojo.java (revision 483556) +++ OsgiJarMojo.java (working copy) @@ -42,6 +42,11 @@ * @description build an OSGi bundle jar */ public class OsgiJarMojo extends AbstractMojo { +private stat

Re: Problems with bundle version strings produced by maven-osgi-plugin

2006-12-07 Thread Richard S. Hall
Steven E. Harris wrote: "Richard S. Hall" <[EMAIL PROTECTED]> writes: I won't claim to completely understand the regex, but looking at this is it completely correct? Apparently not. The OSGi version must "...". I took all but the first number to be optional, but you're rig

Re: Problems with bundle version strings produced by maven-osgi-plugin

2006-12-07 Thread Steven E. Harris
"Richard S. Hall" <[EMAIL PROTECTED]> writes: > I won't claim to completely understand the regex, but looking at this > is it completely correct? Apparently not. > The OSGi version must "...". I took all but the first number to be optional, but you're right, my regex would cause problems due to

Re: Problems with bundle version strings produced by maven-osgi-plugin

2006-12-07 Thread Richard S. Hall
Steven E. Harris wrote: Here's a fix: private void addBundleVersion() { // Maven uses a '-' to separate the version qualifier, // while OSGi uses a '.', so we need to convert the first '-' to a '.' final String version = project.getVersion().replaceF

Re: Problems with bundle version strings produced by maven-osgi-plugin

2006-12-07 Thread Richard S. Hall
Steven E. Harris wrote: "Richard S. Hall" <[EMAIL PROTECTED]> writes: Ok, thanks. I will add this to the old plugin now. Sorry to have to introduce a regex, but it seemed most expedient, given that we're intending to abandon the old plugin (eventually). I think the new plugin uses a

Re: Problems with bundle version strings produced by maven-osgi-plugin

2006-12-07 Thread Steven E. Harris
"Richard S. Hall" <[EMAIL PROTECTED]> writes: > Ok, thanks. I will add this to the old plugin now. Sorry to have to introduce a regex, but it seemed most expedient, given that we're intending to abandon the old plugin (eventually). -- Steven E. Harris

Re: Problems with bundle version strings produced by maven-osgi-plugin

2006-12-07 Thread Richard S. Hall
Steven E. Harris wrote: "Steven E. Harris" <[EMAIL PROTECTED]> writes: apparently the older Maven plugin doesn't generate proper version strings Here's the problem from tools/maven2/maven-osgi-plugin/ src/main/java/org.apache.felix.tools/maven/plugin/OsgiJarMojo.java: , |

Re: Problems with bundle version strings produced by maven-osgi-plugin

2006-12-07 Thread Steven E. Harris
"Steven E. Harris" <[EMAIL PROTECTED]> writes: > apparently the older Maven plugin doesn't generate proper version > strings Here's the problem from tools/maven2/maven-osgi-plugin/ src/main/java/org.apache.felix.tools/maven/plugin/OsgiJarMojo.java: , | private void addBundleVers

Re: Problems with bundle version strings produced by maven-osgi-plugin

2006-12-07 Thread Richard S. Hall
Steven E. Harris wrote: After rebuilding the Felix bundles yesterday with POM version 0.9.0-incubator-SNAPSHOT, some bundles are getting Bundle-Version headers of 0.9.0.incubator-SNAPSHOT while others get 0.9.0.incubator.SNAPSHOT Per the OSGi R4 3.2.4 grammar, the period in the latter st