150 lines
5.8 KiB
Diff
150 lines
5.8 KiB
Diff
diff -up ./gunit-maven-plugin/pom.xml.pomfix ./gunit-maven-plugin/pom.xml
|
|
--- ./gunit-maven-plugin/pom.xml.pomfix 2010-10-12 17:09:19.304549001 -0400
|
|
+++ ./gunit-maven-plugin/pom.xml 2010-10-12 17:09:52.489549017 -0400
|
|
@@ -163,6 +163,12 @@
|
|
</dependency>
|
|
|
|
<dependency>
|
|
+ <groupId>org.apache.maven</groupId>
|
|
+ <artifactId>maven-artifact</artifactId>
|
|
+ <version>2.2.1</version>
|
|
+ </dependency>
|
|
+
|
|
+ <dependency>
|
|
<groupId>org.codehaus.plexus</groupId>
|
|
<artifactId>plexus-compiler-api</artifactId>
|
|
<version>1.5.3</version>
|
|
diff -up ./gunit/pom.xml.pomfix ./gunit/pom.xml
|
|
--- ./gunit/pom.xml.pomfix 2009-09-23 14:50:28.000000000 -0400
|
|
+++ ./gunit/pom.xml 2010-10-12 17:05:12.000000000 -0400
|
|
@@ -142,16 +142,6 @@
|
|
<artifactId>maven-surefire-plugin</artifactId>
|
|
</plugin>
|
|
|
|
- <plugin>
|
|
- <groupId>org.codehaus.mojo</groupId>
|
|
- <artifactId>findbugs-maven-plugin</artifactId>
|
|
- <configuration>
|
|
- <findbugsXmlOutput>true</findbugsXmlOutput>
|
|
- <findbugsXmlWithMessages>true</findbugsXmlWithMessages>
|
|
- <xmlOutput>true</xmlOutput>
|
|
- </configuration>
|
|
- </plugin>
|
|
-
|
|
</plugins>
|
|
|
|
<extensions>
|
|
diff -up ./pom.xml.pomfix ./pom.xml
|
|
--- ./pom.xml.pomfix 2009-09-23 14:46:18.000000000 -0400
|
|
+++ ./pom.xml 2010-10-12 17:05:12.770549001 -0400
|
|
@@ -146,25 +146,6 @@
|
|
|
|
<plugins>
|
|
|
|
- <plugin>
|
|
- <groupId>org.codehaus.mojo</groupId>
|
|
- <artifactId>buildnumber-maven-plugin</artifactId>
|
|
- <configuration>
|
|
- <format>{0,date,MMM dd, yyyy} {0,time,kk:mm:ss}</format>
|
|
- <items>
|
|
- <item>timestamp</item>
|
|
- </items>
|
|
- </configuration>
|
|
- <executions>
|
|
- <execution>
|
|
- <phase>validate</phase>
|
|
- <goals>
|
|
- <goal>create</goal>
|
|
- </goals>
|
|
- </execution>
|
|
- </executions>
|
|
- </plugin>
|
|
-
|
|
<plugin>
|
|
<artifactId>maven-compiler-plugin</artifactId>
|
|
<configuration>
|
|
@@ -179,16 +160,6 @@
|
|
</plugin>
|
|
|
|
<plugin>
|
|
- <groupId>org.codehaus.mojo</groupId>
|
|
- <artifactId>findbugs-maven-plugin</artifactId>
|
|
- <configuration>
|
|
- <findbugsXmlOutput>true</findbugsXmlOutput>
|
|
- <findbugsXmlWithMessages>true</findbugsXmlWithMessages>
|
|
- <xmlOutput>true</xmlOutput>
|
|
- </configuration>
|
|
- </plugin>
|
|
-
|
|
- <plugin>
|
|
|
|
<!--
|
|
|
|
diff -up ./runtime/Java/pom.xml.pomfix ./runtime/Java/pom.xml
|
|
--- ./runtime/Java/pom.xml.pomfix 2009-09-23 14:50:28.000000000 -0400
|
|
+++ ./runtime/Java/pom.xml 2010-10-12 17:05:12.000000000 -0400
|
|
@@ -105,14 +105,38 @@
|
|
</plugin>
|
|
|
|
<plugin>
|
|
- <groupId>org.codehaus.mojo</groupId>
|
|
- <artifactId>findbugs-maven-plugin</artifactId>
|
|
+ <artifactId>maven-jar-plugin</artifactId>
|
|
<configuration>
|
|
- <findbugsXmlOutput>true</findbugsXmlOutput>
|
|
- <findbugsXmlWithMessages>true</findbugsXmlWithMessages>
|
|
- <xmlOutput>true</xmlOutput>
|
|
+ <archive>
|
|
+ <manifestFile>target/osgi/MANIFEST.MF</manifestFile>
|
|
+ </archive>
|
|
</configuration>
|
|
</plugin>
|
|
+ <plugin>
|
|
+ <groupId>org.apache.felix</groupId>
|
|
+ <artifactId>maven-bundle-plugin</artifactId>
|
|
+ <configuration>
|
|
+ <excludeDependencies>true</excludeDependencies>
|
|
+ <manifestLocation>target/osgi</manifestLocation>
|
|
+ <instructions>
|
|
+ <!-- stops the "uses" clauses being added to "Export-Package" manifest entry -->
|
|
+ <_nouses>true</_nouses>
|
|
+ <Bundle-Vendor>antlr.org</Bundle-Vendor>
|
|
+ <Bundle-SymbolicName>org.antlr.runtime</Bundle-SymbolicName>
|
|
+ <Export-Package>org.antlr.*;version=${project.version}</Export-Package>
|
|
+ <Import-Package></Import-Package>
|
|
+ </instructions>
|
|
+ </configuration>
|
|
+ <executions>
|
|
+ <execution>
|
|
+ <id>bundle-manifest</id>
|
|
+ <phase>process-classes</phase>
|
|
+ <goals>
|
|
+ <goal>manifest</goal>
|
|
+ </goals>
|
|
+ </execution>
|
|
+ </executions>
|
|
+ </plugin>
|
|
</plugins>
|
|
</build>
|
|
|
|
diff -up ./tool/pom.xml.pomfix ./tool/pom.xml
|
|
--- ./tool/pom.xml.pomfix 2009-09-23 14:50:28.000000000 -0400
|
|
+++ ./tool/pom.xml 2010-10-12 17:05:12.000000000 -0400
|
|
@@ -59,7 +59,7 @@
|
|
|
|
<groupId>org.antlr</groupId>
|
|
<artifactId>antlr3-maven-plugin</artifactId>
|
|
- <version>3.1.3-1</version>
|
|
+ <version>3.2</version>
|
|
<configuration>
|
|
<libDirectory>target/generated-sources/antlr/org/antlr/grammar/v3</libDirectory>
|
|
</configuration>
|
|
@@ -77,6 +77,7 @@
|
|
<plugin>
|
|
<groupId>org.codehaus.mojo</groupId>
|
|
<artifactId>antlr-maven-plugin</artifactId>
|
|
+ <version>2.1</version>
|
|
<configuration>
|
|
<sourceDirectory>src/main/antlr2/org/antlr/grammar/v2</sourceDirectory>
|
|
<grammars>antlr.g codegen.g, antlr.print.g, assign.types.g, buildnfa.g, define.g</grammars>
|