You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@gora.apache.org by ma...@apache.org on 2011/09/12 00:45:07 UTC
svn commit: r1169560 - in /incubator/gora/branches/0.1.1-incubating:
gora-cassandra/ gora-cassandra/pom.xml gora-core/ gora-core/pom.xml
gora-hbase/ gora-hbase/pom.xml gora-sql/ gora-sql/pom.xml gora-tutorial/
gora-tutorial/pom.xml pom.xml target/
Author: mattmann
Date: Sun Sep 11 22:45:07 2011
New Revision: 1169560
URL: http://svn.apache.org/viewvc?rev=1169560&view=rev
Log:
- get branch ready for release staging for 0.1.1 RC4
Added:
incubator/gora/branches/0.1.1-incubating/gora-cassandra/pom.xml
incubator/gora/branches/0.1.1-incubating/target/
Modified:
incubator/gora/branches/0.1.1-incubating/gora-cassandra/ (props changed)
incubator/gora/branches/0.1.1-incubating/gora-core/ (props changed)
incubator/gora/branches/0.1.1-incubating/gora-core/pom.xml
incubator/gora/branches/0.1.1-incubating/gora-hbase/ (props changed)
incubator/gora/branches/0.1.1-incubating/gora-hbase/pom.xml
incubator/gora/branches/0.1.1-incubating/gora-sql/ (props changed)
incubator/gora/branches/0.1.1-incubating/gora-sql/pom.xml
incubator/gora/branches/0.1.1-incubating/gora-tutorial/ (props changed)
incubator/gora/branches/0.1.1-incubating/gora-tutorial/pom.xml
incubator/gora/branches/0.1.1-incubating/pom.xml
Propchange: incubator/gora/branches/0.1.1-incubating/gora-cassandra/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sun Sep 11 22:45:07 2011
@@ -11,3 +11,4 @@ lib
ivy/ivy*.jar
/conf/*-site.xml
**/conf/*-site.xml
+target
Added: incubator/gora/branches/0.1.1-incubating/gora-cassandra/pom.xml
URL: http://svn.apache.org/viewvc/incubator/gora/branches/0.1.1-incubating/gora-cassandra/pom.xml?rev=1169560&view=auto
==============================================================================
--- incubator/gora/branches/0.1.1-incubating/gora-cassandra/pom.xml (added)
+++ incubator/gora/branches/0.1.1-incubating/gora-cassandra/pom.xml Sun Sep 11 22:45:07 2011
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.gora</groupId>
+ <artifactId>gora</artifactId>
+ <version>0.1.1-incubating-SNAPSHOT</version>
+ </parent>
+ <artifactId>gora-cassandra</artifactId>
+ <packaging>jar</packaging>
+
+ <name>Apache Gora :: Cassandra</name>
+
+ <build>
+ <sourceDirectory>src/main/java</sourceDirectory>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>add-source</goal>
+ </goals>
+ <configuration>
+ <sources>
+ <source>src/examples/java</source>
+ </sources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.gora</groupId>
+ <artifactId>gora-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.gora</groupId>
+ <artifactId>gora-core</artifactId>
+ <version>${project.version}</version>
+ <classifier>tests</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.thrift</groupId>
+ <artifactId>libthrift</artifactId>
+ <version>r917130</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cassandra</groupId>
+ <artifactId>apache-cassandra</artifactId>
+ <version>0.6.4</version>
+ </dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>r06</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jdom</groupId>
+ <artifactId>jdom</artifactId>
+ <version>1.1</version>
+ </dependency>
+ </dependencies>
+
+</project>
Propchange: incubator/gora/branches/0.1.1-incubating/gora-core/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sun Sep 11 22:45:07 2011
@@ -11,3 +11,4 @@ lib
ivy/ivy*.jar
/conf/*-site.xml
**/conf/*-site.xml
+target
Modified: incubator/gora/branches/0.1.1-incubating/gora-core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/gora/branches/0.1.1-incubating/gora-core/pom.xml?rev=1169560&r1=1169559&r2=1169560&view=diff
==============================================================================
--- incubator/gora/branches/0.1.1-incubating/gora-core/pom.xml (original)
+++ incubator/gora/branches/0.1.1-incubating/gora-core/pom.xml Sun Sep 11 22:45:07 2011
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <!--
+<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
@@ -15,111 +14,159 @@
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
- -->
- <modelVersion>4.0.0</modelVersion>
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.gora</groupId>
+ <artifactId>gora</artifactId>
+ <version>0.1.1-incubating-SNAPSHOT</version>
+ </parent>
+ <artifactId>gora-core</artifactId>
+ <packaging>jar</packaging>
+
+ <name>Apache Gora :: Core</name>
+
+ <build>
+ <sourceDirectory>src/main/java</sourceDirectory>
+ <testResources>
+ <testResource>
+ <directory>src/test/conf/</directory>
+ <includes>
+ <include>**</include>
+ </includes>
+ </testResource>
+ </testResources>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>add-source</goal>
+ </goals>
+ <configuration>
+ <sources>
+ <source>src/examples/java</source>
+ </sources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.5</version>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.15</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>jmxtools</artifactId>
+ <groupId>com.sun.jdmk</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>jmxri</artifactId>
+ <groupId>com.sun.jmx</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>jms</artifactId>
+ <groupId>javax.jms</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-core</artifactId>
+ <version>0.20.2</version>
+ <exclusions>
+ <exclusion>
+ <groupId>hsqldb</groupId>
+ <artifactId>hsqldb</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>net.sf.kosmosfs</groupId>
+ <artifactId>kfs</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>net.java.dev.jets3t</groupId>
+ <artifactId>jets3t</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jsp</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.jdt</groupId>
+ <artifactId>core</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-test</artifactId>
+ <version>0.20.2</version>
+ <exclusions>
+ <exclusion>
+ <groupId>hsqldb</groupId>
+ <artifactId>hsqldb</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>net.sf.kosmosfs</groupId>
+ <artifactId>kfs</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>net.java.dev.jets3t</groupId>
+ <artifactId>jets3t</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jsp</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.jdt</groupId>
+ <artifactId>core</artifactId>
+ </exclusion>
+ </exclusions>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>1.5.11</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>avro</artifactId>
+ <version>1.3.2</version>
+ </dependency>
- <parent>
- <groupId>org.apache.gora</groupId>
- <artifactId>gora</artifactId>
- <version>0.1.2-incubating-SNAPSHOT</version>
- </parent>
- <artifactId>gora-core</artifactId>
- <packaging>jar</packaging>
-
- <name>Apache Gora :: Core</name>
-
- <build>
- <sourceDirectory>src/main/java</sourceDirectory>
- <testResources>
- <testResource>
- <directory>src/test/conf/</directory>
- <includes>
- <include>**</include>
- </includes>
- </testResource>
- </testResources>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <version>${build-helper-maven-plugin.version}</version>
- <executions>
- <execution>
- <phase>generate-sources</phase>
- <goals>
- <goal>add-source</goal>
- </goals>
- <configuration>
- <sources>
- <source>src/examples/java</source>
- </sources>
- </configuration>
- </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>test-jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
- <!-- Hadoop Dependencies -->
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-core</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>avro</artifactId>
- </dependency>
-
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- </dependency>
-
- <!-- Logging Dependencies -->
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <exclusions>
- <exclusion>
- <groupId>javax.jms</groupId>
- <artifactId>jms</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <!-- Testing Dependencies -->
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-test</artifactId>
- <scope>test</scope>
- </dependency>
-
- </dependencies>
+ </dependencies>
</project>
Propchange: incubator/gora/branches/0.1.1-incubating/gora-hbase/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sun Sep 11 22:45:07 2011
@@ -11,3 +11,4 @@ lib
ivy/ivy*.jar
/conf/*-site.xml
**/conf/*-site.xml
+target
Modified: incubator/gora/branches/0.1.1-incubating/gora-hbase/pom.xml
URL: http://svn.apache.org/viewvc/incubator/gora/branches/0.1.1-incubating/gora-hbase/pom.xml?rev=1169560&r1=1169559&r2=1169560&view=diff
==============================================================================
--- incubator/gora/branches/0.1.1-incubating/gora-hbase/pom.xml (original)
+++ incubator/gora/branches/0.1.1-incubating/gora-hbase/pom.xml Sun Sep 11 22:45:07 2011
@@ -1,133 +1,82 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.gora</groupId>
- <artifactId>gora</artifactId>
- <version>0.1.2-incubating-SNAPSHOT</version>
- </parent>
- <artifactId>gora-hbase</artifactId>
- <packaging>jar</packaging>
-
- <name>Apache Gora :: Hbase</name>
-
- <build>
- <sourceDirectory>src/main/java</sourceDirectory>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <version>${build-helper-maven-plugin.version}</version>
- <executions>
- <execution>
- <phase>generate-sources</phase>
- <goals>
- <goal>add-source</goal>
- </goals>
- <configuration>
- <sources>
- <source>src/examples/java</source>
- </sources>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
- <!-- Gora Internal Dependencies -->
- <dependency>
- <groupId>org.apache.gora</groupId>
- <artifactId>gora-core</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.gora</groupId>
- <artifactId>gora-core</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
-
- <!-- Hadoop Dependencies -->
- <dependency>
- <groupId>org.apache.hbase</groupId>
- <artifactId>hbase</artifactId>
- <version>0.90.0</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.hbase</groupId>
- <artifactId>hbase</artifactId>
- <version>0.90.0</version>
- <classifier>tests</classifier>
- </dependency>
-
-
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>avro</artifactId>
- </dependency>
-
- <!-- Misc Dependencies -->
- <dependency>
- <groupId>org.jdom</groupId>
- <artifactId>jdom</artifactId>
- </dependency>
-
- <!-- Logging Dependencies -->
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- </dependency>
-
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <exclusions>
- <exclusion>
- <groupId>javax.jms</groupId>
- <artifactId>jms</artifactId>
- </exclusion>
- </exclusions>
-
- </dependency>
-
- <!-- Testing Dependencies -->
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-test</artifactId>
- </dependency>
-
- </dependencies>
+<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor
+ license agreements. See the NOTICE file distributed with this work for additional
+ information regarding copyright ownership. The ASF licenses this file to
+ You under the Apache License, Version 2.0 (the "License"); you may not use
+ this file except in compliance with the License. You may obtain a copy of
+ the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required
+ by applicable law or agreed to in writing, software distributed under the
+ License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
+ OF ANY KIND, either express or implied. See the License for the specific
+ language governing permissions and limitations under the License. -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.gora</groupId>
+ <artifactId>gora</artifactId>
+ <version>0.1.1-incubating-SNAPSHOT</version>
+ </parent>
+ <artifactId>gora-hbase</artifactId>
+ <packaging>jar</packaging>
+
+ <name>Apache Gora :: Hbase</name>
+
+ <build>
+ <sourceDirectory>src/main/java</sourceDirectory>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>add-source</goal>
+ </goals>
+ <configuration>
+ <sources>
+ <source>src/examples/java</source>
+ </sources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.gora</groupId>
+ <artifactId>gora-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.gora</groupId>
+ <artifactId>gora-core</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hbase</groupId>
+ <artifactId>hbase</artifactId>
+ <version>0.90.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hbase</groupId>
+ <artifactId>hbase</artifactId>
+ <version>0.90.0</version>
+ <classifier>tests</classifier>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jdom</groupId>
+ <artifactId>jdom</artifactId>
+ <version>1.1</version>
+ </dependency>
+ </dependencies>
</project>
Propchange: incubator/gora/branches/0.1.1-incubating/gora-sql/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sun Sep 11 22:45:07 2011
@@ -11,3 +11,4 @@ lib
ivy/ivy*.jar
/conf/*-site.xml
**/conf/*-site.xml
+target
Modified: incubator/gora/branches/0.1.1-incubating/gora-sql/pom.xml
URL: http://svn.apache.org/viewvc/incubator/gora/branches/0.1.1-incubating/gora-sql/pom.xml?rev=1169560&r1=1169559&r2=1169560&view=diff
==============================================================================
--- incubator/gora/branches/0.1.1-incubating/gora-sql/pom.xml (original)
+++ incubator/gora/branches/0.1.1-incubating/gora-sql/pom.xml Sun Sep 11 22:45:07 2011
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <!--
+<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
@@ -15,105 +14,72 @@
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
- -->
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.gora</groupId>
- <artifactId>gora</artifactId>
- <version>0.1.2-incubating-SNAPSHOT</version>
- </parent>
- <artifactId>gora-sql</artifactId>
- <packaging>jar</packaging>
-
- <name>Apache Gora :: SQL</name>
-
- <build>
- <sourceDirectory>src/main/java</sourceDirectory>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <version>${build-helper-maven-plugin.version}</version>
- <executions>
- <execution>
- <phase>generate-sources</phase>
- <goals>
- <goal>add-source</goal>
- </goals>
- <configuration>
- <sources>
- <source>src/examples/java</source>
- </sources>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
- <!-- Gora Internal Dependencies -->
- <dependency>
- <groupId>org.apache.gora</groupId>
- <artifactId>gora-core</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>avro</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.jdom</groupId>
- <artifactId>jdom</artifactId>
- </dependency>
-
- <dependency>
- <groupId>com.healthmarketscience.sqlbuilder</groupId>
- <artifactId>sqlbuilder</artifactId>
- </dependency>
-
- <!-- Logging Dependencies -->
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-jdk14</artifactId>
- </dependency>
-
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <exclusions>
- <exclusion>
- <groupId>javax.jms</groupId>
- <artifactId>jms</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <!-- Testing Dependencies -->
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-test</artifactId>
- </dependency>
-
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.gora</groupId>
+ <artifactId>gora</artifactId>
+ <version>0.1.1-incubating-SNAPSHOT</version>
+ </parent>
+ <artifactId>gora-sql</artifactId>
+ <packaging>jar</packaging>
+
+ <name>Apache Gora :: SQL</name>
+
+ <build>
+ <sourceDirectory>src/main/java</sourceDirectory>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>add-source</goal>
+ </goals>
+ <configuration>
+ <sources>
+ <source>src/examples/java</source>
+ </sources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.gora</groupId>
+ <artifactId>gora-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.gora</groupId>
+ <artifactId>gora-core</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.healthmarketscience.sqlbuilder</groupId>
+ <artifactId>sqlbuilder</artifactId>
+ <version>2.0.6</version>
+ </dependency>
<dependency>
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
- <scope>test</scope>
- </dependency>
-
- </dependencies>
+ <version>2.2.4</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jdom</groupId>
+ <artifactId>jdom</artifactId>
+ <version>1.1</version>
+ </dependency>
+ </dependencies>
</project>
Propchange: incubator/gora/branches/0.1.1-incubating/gora-tutorial/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sun Sep 11 22:45:07 2011
@@ -12,7 +12,6 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-
*~
.classpath
.externalToolBuilders
@@ -27,3 +26,4 @@ lib
ivy/ivy*.jar
/conf/*-site.xml
**/conf/*-site.xml
+target
Modified: incubator/gora/branches/0.1.1-incubating/gora-tutorial/pom.xml
URL: http://svn.apache.org/viewvc/incubator/gora/branches/0.1.1-incubating/gora-tutorial/pom.xml?rev=1169560&r1=1169559&r2=1169560&view=diff
==============================================================================
--- incubator/gora/branches/0.1.1-incubating/gora-tutorial/pom.xml (original)
+++ incubator/gora/branches/0.1.1-incubating/gora-tutorial/pom.xml Sun Sep 11 22:45:07 2011
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <!--
+<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
@@ -15,66 +14,54 @@
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
- -->
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.gora</groupId>
- <artifactId>gora</artifactId>
- <version>0.1.2-incubating-SNAPSHOT</version>
- </parent>
- <artifactId>gora-tutorial</artifactId>
- <packaging>jar</packaging>
-
- <name>Apache Gora :: Tutorial</name>
-
- <build>
- <sourceDirectory>src/main/java</sourceDirectory>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <version>${build-helper-maven-plugin.version}</version>
- <executions>
- <execution>
- <phase>generate-sources</phase>
- <goals>
- <goal>add-source</goal>
- </goals>
- <configuration>
- <sources>
- <source>src/examples/java</source>
- </sources>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
- <!-- Gora Internal Dependencies -->
- <dependency>
- <groupId>org.apache.gora</groupId>
- <artifactId>gora-hbase</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.gora</groupId>
- <artifactId>gora-sql</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
- </dependency>
-
- <dependency>
- <groupId>mysql</groupId>
- <artifactId>mysql-connector-java</artifactId>
- </dependency>
- </dependencies>
-
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.gora</groupId>
+ <artifactId>gora</artifactId>
+ <version>0.1.1-incubating-SNAPSHOT</version>
+ </parent>
+ <artifactId>gora-tutorial</artifactId>
+ <packaging>jar</packaging>
+
+ <name>Apache Gora :: Tutorial</name>
+
+ <build>
+ <sourceDirectory>src/main/java</sourceDirectory>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>add-source</goal>
+ </goals>
+ <configuration>
+ <sources>
+ <source>src/examples/java</source>
+ </sources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.gora</groupId>
+ <artifactId>gora-hbase</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.gora</groupId>
+ <artifactId>gora-sql</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
</project>
Modified: incubator/gora/branches/0.1.1-incubating/pom.xml
URL: http://svn.apache.org/viewvc/incubator/gora/branches/0.1.1-incubating/pom.xml?rev=1169560&r1=1169559&r2=1169560&view=diff
==============================================================================
--- incubator/gora/branches/0.1.1-incubating/pom.xml (original)
+++ incubator/gora/branches/0.1.1-incubating/pom.xml Sun Sep 11 22:45:07 2011
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <!--
+<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
@@ -15,290 +14,95 @@
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
- -->
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache</groupId>
- <artifactId>apache</artifactId>
- <version>9</version>
- <relativePath />
- </parent>
-
- <groupId>org.apache.gora</groupId>
- <artifactId>gora</artifactId>
- <packaging>pom</packaging>
- <version>0.1.2-incubating-SNAPSHOT</version>
- <name>Apache Gora</name>
-
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/gora/branches/0.1.1-incubating/</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/gora/branches/0.1.1-incubating/</developerConnection>
- <url>http://svn.apache.org/viewvc/incubator/gora/branches/0.1.1-incubating</url>
- </scm>
-
- <build>
- <testSourceDirectory>${basedir}/src/test/java</testSourceDirectory>
- <sourceDirectory>${basedir}/src/main/java</sourceDirectory>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>${maven-compiler-plugin.version}</version>
- <inherited>true</inherited>
- <configuration>
- <source>1.6</source>
- <target>1.6</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${maven-surfire-plugin.version}</version>
- <inherited>true</inherited>
- <configuration>
- <argLine>-Dhadoop.log.dir=${project.basedir}/build/test/logs/
- -Dtest.build.data=${project.basedir}/build/test/data
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache</groupId>
+ <artifactId>apache</artifactId>
+ <version>9</version>
+ <relativePath />
+ </parent>
+
+ <groupId>org.apache.gora</groupId>
+ <artifactId>gora</artifactId>
+ <packaging>pom</packaging>
+ <version>0.1.1-incubating-SNAPSHOT</version>
+ <name>Apache Gora</name>
+
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/gora/branches/0.1.1-incubating/</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/gora/branches/0.1.1-incubating/</developerConnection>
+ <url>http://svn.apache.org/viewvc/incubator/gora/branches/0.1.1-incubating</url>
+ </scm>
+
+ <build>
+ <testSourceDirectory>${basedir}/src/test/java</testSourceDirectory>
+ <sourceDirectory>${basedir}/src/main/java</sourceDirectory>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <inherited>true</inherited>
+ <configuration>
+ <source>1.6</source>
+ <target>1.6</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <inherited>true</inherited>
+ <configuration>
+ <argLine>-Dhadoop.log.dir=${project.basedir}/build/test/logs/
+ -Dtest.build.data=${project.basedir}/build/test/data
</argLine>
- <testFailureIgnore>true</testFailureIgnore>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <version>${maven-dependency-plugin.version}</version>
- <inherited>true</inherited>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>copy-dependencies</goal>
- </goals>
- <configuration>
- <outputDirectory>lib</outputDirectory>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <version>2.2</version>
- <executions>
- <execution>
- <goals>
- <goal>test-jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-release-plugin</artifactId>
- <version>${maven-release-plugin.version}</version>
- <configuration>
- <tagBase>https://svn.apache.org/repos/asf/incubator/gora/tags/</tagBase>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <modules>
- <module>gora-core</module>
- <module>gora-hbase</module>
- <!--<module>gora-cassandra</module>-->
- <module>gora-sql</module>
- <module>gora-tutorial</module>
- </modules>
-
- <properties>
- <osgi.version>4.2.0</osgi.version>
- <!-- Hadoop Dependencies -->
- <hadoop.version>0.20.2</hadoop.version>
- <hbase.version>0.90.0</hbase.version>
- <avro.version>1.3.2</avro.version>
- <!-- Cassandra Dependencies -->
- <cassandra.version>0.7.3</cassandra.version>
- <libthrift.version>0.5.0</libthrift.version>
- <!-- Misc Dependencies -->
- <guava.version>r06</guava.version>
- <commons-lang.version>2.5</commons-lang.version>
- <jdom.version>1.1</jdom.version>
- <sqlbuilder.version>2.0.6</sqlbuilder.version>
- <hsqldb.version>2.0.0</hsqldb.version>
- <mysql.version>5.1.13</mysql.version>
- <!-- Logging Dependencies -->
- <commons-logging.version>1.1.1</commons-logging.version>
- <slf4j.version>1.5.8</slf4j.version>
- <log4j.version>1.2.15</log4j.version>
-
- <!-- Testing Dependencies -->
- <junit.version>4.6</junit.version>
-
- <!-- Maven Plugin Dependencies -->
- <maven-compiler-plugin.version>2.0.2</maven-compiler-plugin.version>
- <maven-resources-plugin.version>2.4.3</maven-resources-plugin.version>
- <maven-jar-plugin.version>2.3.1</maven-jar-plugin.version>
- <maven-dependency-plugin.version>2.1</maven-dependency-plugin.version>
- <build-helper-maven-plugin.version>1.5</build-helper-maven-plugin.version>
- <maven-surfire-plugin.version>2.3.1</maven-surfire-plugin.version>
- <maven-release-plugin.version>2.1</maven-release-plugin.version>
- </properties>
-
- <dependencyManagement>
- <dependencies>
- <!-- Hadoop Dependencies -->
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-core</artifactId>
- <version>${hadoop.version}</version>
- <exclusions>
- <exclusion>
- <groupId>hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
- </exclusion>
- <exclusion>
- <groupId>net.sf.kosmos</groupId>
- <artifactId>kfs</artifactId>
- </exclusion>
- <exclusion>
- <groupId>net.java.dev.jets3t</groupId>
- <artifactId>jets3t</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.eclipse.jdt</groupId>
- <artifactId>core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jsp-*</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>avro</artifactId>
- <version>${avro.version}</version>
- <exclusions>
- <exclusion>
- <groupId>ant</groupId>
- <artifactId>ant</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.apache.hbase</groupId>
- <artifactId>hbase</artifactId>
- <version>${hbase.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.hbase</groupId>
- <artifactId>hbase</artifactId>
- <version>${hbase.version}</version>
- <classifier>tests</classifier>
- </dependency>
-
- <!-- Cassandra Dependencies -->
- <dependency>
- <groupId>org.apache.cassandra</groupId>
- <artifactId>cassandra</artifactId>
- <version>${cassandra.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.cassandra.deps</groupId>
- <artifactId>libthrift</artifactId>
- <version>${libthrift.version}</version>
- </dependency>
-
- <!-- Misc Dependencies -->
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>${guava.version}</version>
- </dependency>
-
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>${commons-lang.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.jdom</groupId>
- <artifactId>jdom</artifactId>
- <version>${jdom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>com.healthmarketscience.sqlbuilder</groupId>
- <artifactId>sqlbuilder</artifactId>
- <version>${sqlbuilder.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
- <version>${hsqldb.version}</version>
- </dependency>
-
- <dependency>
- <groupId>mysql</groupId>
- <artifactId>mysql-connector-java</artifactId>
- <version>${mysql.version}</version>
- </dependency>
-
- <!-- Logging Dependencies -->
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>${slf4j.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <version>${slf4j.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-jdk14</artifactId>
- <version>${slf4j.version}</version>
- </dependency>
-
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>${log4j.version}</version>
- <exclusions>
- <exclusion>
- <groupId>com.sun.jdmk</groupId>
- <artifactId>jmxtools</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.sun.jmx</groupId>
- <artifactId>jmxri</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <!-- Testing Dependencies -->
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-test</artifactId>
- <version>${hadoop.version}</version>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${junit.version}</version>
- </dependency>
-
- </dependencies>
- </dependencyManagement>
-
+ <testFailureIgnore>true</testFailureIgnore>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <inherited>true</inherited>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>copy-dependencies</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>lib</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.2</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-release-plugin</artifactId>
+ <configuration>
+ <tagBase>https://svn.apache.org/repos/asf/incubator/gora/tags/</tagBase>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <modules>
+ <module>gora-core</module>
+ <module>gora-hbase</module>
+ <module>gora-cassandra</module>
+ <module>gora-sql</module><!-- <module>gora-tutorial</module> -->
+ </modules>
</project>