You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by dk...@apache.org on 2011/11/15 20:30:53 UTC
svn commit: r1202391 - /aries/trunk/blueprint/blueprint-core/pom.xml
Author: dkulp
Date: Tue Nov 15 19:30:53 2011
New Revision: 1202391
URL: http://svn.apache.org/viewvc?rev=1202391&view=rev
Log:
Copy the blueprint.xsd into blueprint core so eclipse:eclipse actually
will work. (still cannot just checkout blueprint-core and build though)
Modified:
aries/trunk/blueprint/blueprint-core/pom.xml
Modified: aries/trunk/blueprint/blueprint-core/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-core/pom.xml?rev=1202391&r1=1202390&r2=1202391&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-core/pom.xml (original)
+++ aries/trunk/blueprint/blueprint-core/pom.xml Tue Nov 15 19:30:53 2011
@@ -172,11 +172,7 @@
<directory>src/main/resources</directory>
</resource>
<resource>
- <directory>../blueprint-api/src/main/resources/org/osgi/service/blueprint</directory>
- <targetPath>org/apache/aries/blueprint</targetPath>
- <includes>
- <include>blueprint.xsd</include>
- </includes>
+ <directory>${basedir}/target/extra-resources</directory>
</resource>
<resource>
<directory>${project.build.sourceDirectory}</directory>
@@ -185,6 +181,29 @@
</includes>
</resource>
</resources>
+ <plugins>
+ <plugin>
+ <artifactId>maven-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-resources</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${basedir}/target/extra-resources/org/apache/aries/blueprint</outputDirectory>
+ <resources>
+ <resource>
+ <directory>../blueprint-api/src/main/resources/org/osgi/service/blueprint</directory>
+ <filtering>false</filtering>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
</build>
</project>
Re: svn commit: r1202391 - /aries/trunk/blueprint/blueprint-core/pom.xml
Posted by Daniel Kulp <dk...@apache.org>.
On Tuesday, November 15, 2011 3:19:32 PM David Jencks wrote:
> This looks to me as if it has one project referring to anothers' source.
> Wasn't this solved in rev. 1188776?
Uhg..... Just logged:
https://issues.apache.org/jira/browse/INFRA-4126
as I didn't see any changes on the release branch since Oct 21st due to it.
:-(
That said, as far as I'm concerned, if it's not on trunk, it's not done.
Also, it uses the sources jar (not the normal jar) which isn't built by
default which could cause the builds to fail for people if they switch to
snapshots and such (like on trunk). Thus, it's not a good solution. I
THINK just using the normal jar should work, but I need to test that more.
Dan
>
> thanks
> david jencks
>
> On Nov 15, 2011, at 11:30 AM, dkulp@apache.org wrote:
> > Author: dkulp
> > Date: Tue Nov 15 19:30:53 2011
> > New Revision: 1202391
> >
> > URL: http://svn.apache.org/viewvc?rev=1202391&view=rev
> > Log:
> > Copy the blueprint.xsd into blueprint core so eclipse:eclipse actually
> > will work. (still cannot just checkout blueprint-core and build though)
> >
> > Modified:
> > aries/trunk/blueprint/blueprint-core/pom.xml
> >
> > Modified: aries/trunk/blueprint/blueprint-core/pom.xml
> > URL:
> > http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-core/pom.x
> > ml?rev=1202391&r1=1202390&r2=1202391&view=diff
> > =======================================================================
> > ======= --- aries/trunk/blueprint/blueprint-core/pom.xml (original)
> > +++ aries/trunk/blueprint/blueprint-core/pom.xml Tue Nov 15 19:30:53
> > 2011
> > @@ -172,11 +172,7 @@
> >
> > <directory>src/main/resources</directory
> > >
> >
> > </resource>
> > <resource>
> >
> > -
> > <directory>../blueprint-api/src/main/resources/org/osgi/service/bluepri
> > nt</directory> -
> > <targetPath>org/apache/aries/blueprint</targetPath> -
> > <includes>
> > - <include>blueprint.xsd</include>
> > - </includes>
> > +
> > <directory>${basedir}/target/extra-resources</directory>
> >
> > </resource>
> > <resource>
> >
> > <directory>${project.build.sourceDir
> > ectory}</directory>
> >
> > @@ -185,6 +181,29 @@
> >
> > </includes>
> >
> > </resource>
> >
> > </resources>
> >
> > + <plugins>
> > + <plugin>
> > + <artifactId>maven-resources-plugin</artifactId>
> > + <executions>
> > + <execution>
> > + <id>copy-resources</id>
> > + <phase>validate</phase>
> > + <goals>
> > + <goal>copy-resources</goal>
> > + </goals>
> > + <configuration>
> > +
> > <outputDirectory>${basedir}/target/extra-resources/org/apache/aries/blu
> > eprint</outputDirectory> + <resources>
> > + <resource>
> > +
> > <directory>../blueprint-api/src/main/resources/org/osgi/service/bluepri
> > nt</directory> +
> > <filtering>false</filtering> +
> > </resource>
> > + </resources>
> > + </configuration>
> > + </execution>
> > + </executions>
> > + </plugin>
> > + </plugins>
> >
> > </build>
> >
> > </project>
--
Daniel Kulp
dkulp@apache.org
http://dankulp.com/blog
Talend - http://www.talend.com
Re: svn commit: r1202391 - /aries/trunk/blueprint/blueprint-core/pom.xml
Posted by David Jencks <da...@yahoo.com>.
This looks to me as if it has one project referring to anothers' source. Wasn't this solved in rev. 1188776?
thanks
david jencks
On Nov 15, 2011, at 11:30 AM, dkulp@apache.org wrote:
> Author: dkulp
> Date: Tue Nov 15 19:30:53 2011
> New Revision: 1202391
>
> URL: http://svn.apache.org/viewvc?rev=1202391&view=rev
> Log:
> Copy the blueprint.xsd into blueprint core so eclipse:eclipse actually
> will work. (still cannot just checkout blueprint-core and build though)
>
> Modified:
> aries/trunk/blueprint/blueprint-core/pom.xml
>
> Modified: aries/trunk/blueprint/blueprint-core/pom.xml
> URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-core/pom.xml?rev=1202391&r1=1202390&r2=1202391&view=diff
> ==============================================================================
> --- aries/trunk/blueprint/blueprint-core/pom.xml (original)
> +++ aries/trunk/blueprint/blueprint-core/pom.xml Tue Nov 15 19:30:53 2011
> @@ -172,11 +172,7 @@
> <directory>src/main/resources</directory>
> </resource>
> <resource>
> - <directory>../blueprint-api/src/main/resources/org/osgi/service/blueprint</directory>
> - <targetPath>org/apache/aries/blueprint</targetPath>
> - <includes>
> - <include>blueprint.xsd</include>
> - </includes>
> + <directory>${basedir}/target/extra-resources</directory>
> </resource>
> <resource>
> <directory>${project.build.sourceDirectory}</directory>
> @@ -185,6 +181,29 @@
> </includes>
> </resource>
> </resources>
> + <plugins>
> + <plugin>
> + <artifactId>maven-resources-plugin</artifactId>
> + <executions>
> + <execution>
> + <id>copy-resources</id>
> + <phase>validate</phase>
> + <goals>
> + <goal>copy-resources</goal>
> + </goals>
> + <configuration>
> + <outputDirectory>${basedir}/target/extra-resources/org/apache/aries/blueprint</outputDirectory>
> + <resources>
> + <resource>
> + <directory>../blueprint-api/src/main/resources/org/osgi/service/blueprint</directory>
> + <filtering>false</filtering>
> + </resource>
> + </resources>
> + </configuration>
> + </execution>
> + </executions>
> + </plugin>
> + </plugins>
> </build>
>
> </project>
>
>