You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by ju...@apache.org on 2008/02/28 10:54:45 UTC
svn commit: r631908 - in /jackrabbit/trunk: jackrabbit-core/pom.xml
jackrabbit-spi-commons/pom.xml
Author: jukka
Date: Thu Feb 28 01:54:43 2008
New Revision: 631908
URL: http://svn.apache.org/viewvc?rev=631908&view=rev
Log:
JCR-1430: mvn eclipse:eclipse inconsistent
- Use the the new jjtree-javacc goal in javacc-maven-plugin version 2.4
- Contributed by Stephane Landelle
Modified:
jackrabbit/trunk/jackrabbit-core/pom.xml
jackrabbit/trunk/jackrabbit-spi-commons/pom.xml
Modified: jackrabbit/trunk/jackrabbit-core/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/pom.xml?rev=631908&r1=631907&r2=631908&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/pom.xml (original)
+++ jackrabbit/trunk/jackrabbit-core/pom.xml Thu Feb 28 01:54:43 2008
@@ -66,30 +66,18 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>javacc-maven-plugin</artifactId>
- <version>2.1</version>
+ <version>2.4</version>
<executions>
<execution>
- <id>fulltext-jjtree</id>
+ <id>fulltext</id>
<configuration>
<sourceDirectory>${basedir}/src/main/javacc/fulltext</sourceDirectory>
- <outputDirectory>${project.build.directory}/generated-src/main/java/org/apache/jackrabbit/core/query/lucene/fulltext</outputDirectory>
- <timestampDirectory>${project.build.directory}/generated-src/javacc-timestamp</timestampDirectory>
- <packageName>org.apache.jackrabbit.core.query.lucene.fulltext</packageName>
- </configuration>
- <goals>
- <goal>jjtree</goal>
- </goals>
- </execution>
- <execution>
- <id>fulltext-javacc</id>
- <configuration>
- <sourceDirectory>${project.build.directory}/generated-src/main/java/org/apache/jackrabbit/core/query/lucene/fulltext</sourceDirectory>
<outputDirectory>${project.build.directory}/generated-src/main/java</outputDirectory>
<timestampDirectory>${project.build.directory}/generated-src/javacc-timestamp</timestampDirectory>
<packageName>org.apache.jackrabbit.core.query.lucene.fulltext</packageName>
</configuration>
<goals>
- <goal>javacc</goal>
+ <goal>jjtree-javacc</goal>
</goals>
</execution>
</executions>
Modified: jackrabbit/trunk/jackrabbit-spi-commons/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-spi-commons/pom.xml?rev=631908&r1=631907&r2=631908&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-spi-commons/pom.xml (original)
+++ jackrabbit/trunk/jackrabbit-spi-commons/pom.xml Thu Feb 28 01:54:43 2008
@@ -82,54 +82,30 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>javacc-maven-plugin</artifactId>
- <version>2.1</version>
+ <version>2.4</version>
<executions>
<execution>
- <id>sql-jjtree</id>
+ <id>sql</id>
<configuration>
<sourceDirectory>${basedir}/src/main/javacc/sql</sourceDirectory>
- <outputDirectory>${project.build.directory}/generated-src/main/java/org/apache/jackrabbit/spi/commons/query/sql</outputDirectory>
- <timestampDirectory>${project.build.directory}/generated-src/javacc-timestamp</timestampDirectory>
- <packageName>org.apache.jackrabbit.spi.commons.query.sql</packageName>
- </configuration>
- <goals>
- <goal>jjtree</goal>
- </goals>
- </execution>
- <execution>
- <id>sql-javacc</id>
- <configuration>
- <sourceDirectory>${project.build.directory}/generated-src/main/java/org/apache/jackrabbit/spi/commons/query/sql</sourceDirectory>
<outputDirectory>${project.build.directory}/generated-src/main/java</outputDirectory>
<timestampDirectory>${project.build.directory}/generated-src/javacc-timestamp</timestampDirectory>
<packageName>org.apache.jackrabbit.spi.commons.query.sql</packageName>
</configuration>
<goals>
- <goal>javacc</goal>
+ <goal>jjtree-javacc</goal>
</goals>
</execution>
<execution>
- <id>xpath-jjtree</id>
+ <id>xpath</id>
<configuration>
<sourceDirectory>${basedir}/src/main/javacc/xpath</sourceDirectory>
- <outputDirectory>${project.build.directory}/generated-src/main/java/org/apache/jackrabbit/spi/commons/query/xpath</outputDirectory>
- <timestampDirectory>${project.build.directory}/generated-src/javacc-timestamp</timestampDirectory>
- <packageName>org.apache.jackrabbit.spi.commons.query.xpath</packageName>
- </configuration>
- <goals>
- <goal>jjtree</goal>
- </goals>
- </execution>
- <execution>
- <id>xpath-javacc</id>
- <configuration>
- <sourceDirectory>${project.build.directory}/generated-src/main/java/org/apache/jackrabbit/spi/commons/query/xpath</sourceDirectory>
<outputDirectory>${project.build.directory}/generated-src/main/java</outputDirectory>
<timestampDirectory>${project.build.directory}/generated-src/javacc-timestamp</timestampDirectory>
<packageName>org.apache.jackrabbit.spi.commons.query.xpath</packageName>
</configuration>
<goals>
- <goal>javacc</goal>
+ <goal>jjtree-javacc</goal>
</goals>
</execution>
</executions>
Re: svn commit: r631908 - in /jackrabbit/trunk: jackrabbit-core/pom.xml jackrabbit-spi-commons/pom.xml
Posted by Jukka Zitting <ju...@gmail.com>.
Hi,
On Tue, Mar 4, 2008 at 4:52 PM, Julian Reschke <ju...@gmx.de> wrote:
> Julian Reschke wrote:
> > Hm. With this change, I am getting source generated both in
> > target/generated-src *and* in target/generated-sources.
>
> Does nobody have a idea what's going on here?
Seems to be caused by the interimDirectory setting in
JJTreeJavaCCMojo. I'll see if I can simplify the build settings
further to avoid extra directories.
BR,
Jukka Zitting
Re: svn commit: r631908 - in /jackrabbit/trunk: jackrabbit-core/pom.xml
jackrabbit-spi-commons/pom.xml
Posted by Julian Reschke <ju...@gmx.de>.
Julian Reschke wrote:
> jukka@apache.org wrote:
>> Author: jukka
>> Date: Thu Feb 28 01:54:43 2008
>> New Revision: 631908
>>
>> URL: http://svn.apache.org/viewvc?rev=631908&view=rev
>> Log:
>> JCR-1430: mvn eclipse:eclipse inconsistent
>> - Use the the new jjtree-javacc goal in javacc-maven-plugin
>> version 2.4
>> - Contributed by Stephane Landelle
>>
>> Modified:
>> jackrabbit/trunk/jackrabbit-core/pom.xml
>> jackrabbit/trunk/jackrabbit-spi-commons/pom.xml
>> ...
>
> Hm. With this change, I am getting source generated both in
> target/generated-src *and* in target/generated-sources.
>
> ???
Does nobody have a idea what's going on here?
BR, Julian
Re: svn commit: r631908 - in /jackrabbit/trunk: jackrabbit-core/pom.xml
jackrabbit-spi-commons/pom.xml
Posted by Julian Reschke <ju...@gmx.de>.
jukka@apache.org wrote:
> Author: jukka
> Date: Thu Feb 28 01:54:43 2008
> New Revision: 631908
>
> URL: http://svn.apache.org/viewvc?rev=631908&view=rev
> Log:
> JCR-1430: mvn eclipse:eclipse inconsistent
> - Use the the new jjtree-javacc goal in javacc-maven-plugin version 2.4
> - Contributed by Stephane Landelle
>
> Modified:
> jackrabbit/trunk/jackrabbit-core/pom.xml
> jackrabbit/trunk/jackrabbit-spi-commons/pom.xml
> ...
Hm. With this change, I am getting source generated both in
target/generated-src *and* in target/generated-sources.
???
BR, Julian