On 21/12/2007, Richard S. Hall <[EMAIL PROTECTED]> wrote: > > So, do we have POM files that need to be patched?
my first pass (using find+grep) found the following poms using the 1.0.0release: configadmin/pom.xml eventadmin/impl/pom.xml examples/dictionaryclient2/pom.xml examples/spellcheckservice/pom.xml examples/dictionaryservice/pom.xml examples/servicebased.square/pom.xml examples/dictionaryclient/pom.xml examples/eventlistener/pom.xml examples/servicebased.host/pom.xml examples/dictionaryservice.itest/pom.xml examples/servicebased.circle/pom.xml examples/extenderbased.circle/pom.xml examples/frenchdictionary/pom.xml examples/extenderbased.square/pom.xml examples/spellcheckscr/pom.xml examples/servicebased.triangle/pom.xml examples/spellcheckclient/pom.xml examples/extenderbased.triangle/pom.xml examples/extenderbased.host/pom.xml examples/spellcheckbinder/pom.xml framework/pom.xml jmood/pom.xml main/pom.xml metatype/pom.xml prefs/pom.xml scr/pom.xml when building the whole tree from scratch Maven seems to prefer to use the release rather than the snapshot (even if the pom says use the snapshot) - which is why the core bundle ends up with those extra files. if you build the core bundle from it's own folder it uses the bundleplugin snapshot... it's probably something to do with Maven favouring plugin releases over snapshots I'll try changing the above poms to use the snapshot and see if anything breaks ;) -> richard > > Stuart McCulloch wrote: > > FYI, because several of the Felix sub-projects use the released > 1.0.0version > > of the bundleplugin, which doesn't fully support includes/excludes > resource > > filtering, you will now find unwanted files appearing in these > bundles... > > > > for example, the org.osgi.core bundle compiled from trunk now contains > the > > entire build directory under META-INF - btw, the latest bundleplugin > > snapshot > > fixes this issue (see FELIX-400) > > > > ---------- Forwarded message ---------- > > From: [EMAIL PROTECTED] <[EMAIL PROTECTED]> > > Date: 20 Dec 2007 17:30 > > Subject: svn commit: r605845 - /felix/trunk/pom/pom.xml > > To: [EMAIL PROTECTED] > > > > Author: cziegeler > > Date: Thu Dec 20 01:30:29 2007 > > New Revision: 605845 > > > > URL: http://svn.apache.org/viewvc?rev=605845&view=rev > > Log: > > Add definition to include NOTICE and LICENSE in binary artifacts. > > > > Modified: > > felix/trunk/pom/pom.xml > > > > Modified: felix/trunk/pom/pom.xml > > URL: > > > http://svn.apache.org/viewvc/felix/trunk/pom/pom.xml?rev=605845&r1=605844&r2=605845&view=diff > > > ============================================================================== > > --- felix/trunk/pom/pom.xml (original) > > +++ felix/trunk/pom/pom.xml Thu Dec 20 01:30:29 2007 > > @@ -394,6 +394,19 @@ > > </configuration> > > </plugin> > > </plugins> > > + <resources> > > + <resource> > > + <directory>src/main/resources</directory> > > + </resource> > > + <resource> > > + <directory>.</directory> > > + <targetPath>META-INF</targetPath> > > + <includes> > > + <include>LICENSE</include> > > + <include>NOTICE</include> > > + </includes> > > + </resource> > > + </resources> > > </build> > > <reporting> > > <plugins> > > > > > > > > > > > -- Cheers, Stuart
