Author: lewismc
Date: Wed Aug 15 21:00:55 2012
New Revision: 1373630
URL: http://svn.apache.org/viewvc?rev=1373630&view=rev
Log:
GORA-160 Ed Kohlwey
Modified:
gora/trunk/CHANGES.txt
gora/trunk/gora-accumulo/pom.xml
gora/trunk/gora-cassandra/pom.xml
gora/trunk/gora-core/pom.xml
gora/trunk/gora-hbase/pom.xml
gora/trunk/gora-sql/pom.xml
gora/trunk/gora-tutorial/pom.xml
gora/trunk/pom.xml
Modified: gora/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/gora/trunk/CHANGES.txt?rev=1373630&r1=1373629&r2=1373630&view=diff
==============================================================================
--- gora/trunk/CHANGES.txt (original)
+++ gora/trunk/CHANGES.txt Wed Aug 15 21:00:55 2012
@@ -6,6 +6,8 @@ Gora Change Log
trunk (current development)
+* GORA-160 Gora Fails to Import Into Recent Versions of Eclipse (Ed Kohlwey
via lewismc)
+
* GORA-85 Implement "Usage" messages for SpecificCompiler and LogAnalytics
(lewismc)
* GORA-164 Use <type> instead of <classifier> configuration for test
dependencies (lewismc)
Modified: gora/trunk/gora-accumulo/pom.xml
URL:
http://svn.apache.org/viewvc/gora/trunk/gora-accumulo/pom.xml?rev=1373630&r1=1373629&r2=1373630&view=diff
==============================================================================
--- gora/trunk/gora-accumulo/pom.xml (original)
+++ gora/trunk/gora-accumulo/pom.xml Wed Aug 15 21:00:55 2012
@@ -93,24 +93,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <version>${maven-jar-plugin.version}</version>
- <executions>
- <execution>
- <goals>
- <goal>jar</goal>
- <goal>test-jar</goal>
- </goals>
- <configuration>
- <archive>
-
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
- </archive>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
Modified: gora/trunk/gora-cassandra/pom.xml
URL:
http://svn.apache.org/viewvc/gora/trunk/gora-cassandra/pom.xml?rev=1373630&r1=1373629&r2=1373630&view=diff
==============================================================================
--- gora/trunk/gora-cassandra/pom.xml (original)
+++ gora/trunk/gora-cassandra/pom.xml Wed Aug 15 21:00:55 2012
@@ -92,24 +92,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <version>${maven-jar-plugin.version}</version>
- <executions>
- <execution>
- <goals>
- <goal>jar</goal>
- <goal>test-jar</goal>
- </goals>
- <configuration>
- <archive>
-
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
- </archive>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
Modified: gora/trunk/gora-core/pom.xml
URL:
http://svn.apache.org/viewvc/gora/trunk/gora-core/pom.xml?rev=1373630&r1=1373629&r2=1373630&view=diff
==============================================================================
--- gora/trunk/gora-core/pom.xml (original)
+++ gora/trunk/gora-core/pom.xml Wed Aug 15 21:00:55 2012
@@ -91,24 +91,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <version>${maven-jar-plugin.version}</version>
- <executions>
- <execution>
- <goals>
- <goal>jar</goal>
- <goal>test-jar</goal>
- </goals>
- <configuration>
- <archive>
-
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
- </archive>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
Modified: gora/trunk/gora-hbase/pom.xml
URL:
http://svn.apache.org/viewvc/gora/trunk/gora-hbase/pom.xml?rev=1373630&r1=1373629&r2=1373630&view=diff
==============================================================================
--- gora/trunk/gora-hbase/pom.xml (original)
+++ gora/trunk/gora-hbase/pom.xml Wed Aug 15 21:00:55 2012
@@ -92,24 +92,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <version>${maven-jar-plugin.version}</version>
- <executions>
- <execution>
- <goals>
- <goal>jar</goal>
- <goal>test-jar</goal>
- </goals>
- <configuration>
- <archive>
-
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
- </archive>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
Modified: gora/trunk/gora-sql/pom.xml
URL:
http://svn.apache.org/viewvc/gora/trunk/gora-sql/pom.xml?rev=1373630&r1=1373629&r2=1373630&view=diff
==============================================================================
--- gora/trunk/gora-sql/pom.xml (original)
+++ gora/trunk/gora-sql/pom.xml Wed Aug 15 21:00:55 2012
@@ -118,24 +118,6 @@
<testFailureIgnore>true</testFailureIgnore>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <version>${maven-jar-plugin.version}</version>
- <executions>
- <execution>
- <goals>
- <goal>jar</goal>
- <goal>test-jar</goal>
- </goals>
- <configuration>
- <archive>
-
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
- </archive>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
Modified: gora/trunk/gora-tutorial/pom.xml
URL:
http://svn.apache.org/viewvc/gora/trunk/gora-tutorial/pom.xml?rev=1373630&r1=1373629&r2=1373630&view=diff
==============================================================================
--- gora/trunk/gora-tutorial/pom.xml (original)
+++ gora/trunk/gora-tutorial/pom.xml Wed Aug 15 21:00:55 2012
@@ -91,24 +91,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <version>${maven-jar-plugin.version}</version>
- <executions>
- <execution>
- <goals>
- <goal>jar</goal>
- <!-- goal>test-jar</goal-->
- </goals>
- <configuration>
- <archive>
-
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
- </archive>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
Modified: gora/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/gora/trunk/pom.xml?rev=1373630&r1=1373629&r2=1373630&view=diff
==============================================================================
--- gora/trunk/pom.xml (original)
+++ gora/trunk/pom.xml Wed Aug 15 21:00:55 2012
@@ -310,7 +310,45 @@
<autoVersionSubmodules>true</autoVersionSubmodules>
</configuration>
</plugin>
- </plugins>
+ <!--This plugin's configuration is used to store Eclipse m2e
settings only. It has no influence on the Maven build itself.-->
+ <plugin>
+ <groupId>org.eclipse.m2e</groupId>
+ <artifactId>lifecycle-mapping</artifactId>
+ <version>1.0.0</version>
+ <configuration>
+ <lifecycleMappingMetadata>
+ <pluginExecutions>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <versionRange>[2.4,)</versionRange>
+ <goals>
+ <goal>copy-dependencies</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore></ignore>
+ </action>
+ </pluginExecution>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <versionRange>[1.7,)</versionRange>
+ <goals>
+ <goal>reserve-network-port</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore></ignore>
+ </action>
+ </pluginExecution>
+ </pluginExecutions>
+ </lifecycleMappingMetadata>
+ </configuration>
+ </plugin>
+ </plugins>
</pluginManagement>
<plugins>
<plugin>
@@ -319,7 +357,7 @@
<version>${maven-compiler-plugin.version}</version>
<inherited>true</inherited>
<configuration>
- <source>${javac.source.version}</source>
+ <source>${javac.src.version}</source>
<target>${javac.target.version}</target>
</configuration>
</plugin>
@@ -355,19 +393,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <version>${maven-jar-plugin.version}</version>
- <executions>
- <execution>
- <goals>
- <goal>jar</goal>
- <goal>test-jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
@@ -392,15 +417,6 @@
</supportedProjectTypes>
<unpackBundle>true</unpackBundle>
</configuration>
- <executions>
- <execution>
- <id>bundle-manifest</id>
- <phase>process-classes</phase>
- <goals>
- <goal>manifest</goal>
- </goals>
- </execution>
- </executions>
</plugin>
</plugins>
</build>
