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/06/26 05:09:58 UTC
svn commit: r1139702 - in /incubator/gora/trunk: gora-core/pom.xml
gora-hbase/pom.xml gora-sql/pom.xml gora-tutorial/pom.xml pom.xml
Author: mattmann
Date: Sun Jun 26 03:09:58 2011
New Revision: 1139702
URL: http://svn.apache.org/viewvc?rev=1139702&view=rev
Log:
- forward port working POMS from 0.1.1-incubating
- update to 0.2-SNAPSHOT
Modified:
incubator/gora/trunk/gora-core/pom.xml
incubator/gora/trunk/gora-hbase/pom.xml
incubator/gora/trunk/gora-sql/pom.xml
incubator/gora/trunk/gora-tutorial/pom.xml
incubator/gora/trunk/pom.xml
Modified: incubator/gora/trunk/gora-core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/gora/trunk/gora-core/pom.xml?rev=1139702&r1=1139701&r2=1139702&view=diff
==============================================================================
--- incubator/gora/trunk/gora-core/pom.xml (original)
+++ incubator/gora/trunk/gora-core/pom.xml Sun Jun 26 03:09:58 2011
@@ -1,7 +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">
+<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
@@ -22,8 +20,8 @@
<parent>
<groupId>org.apache.gora</groupId>
- <artifactId>apache-gora</artifactId>
- <version>0.1-incubating</version>
+ <artifactId>gora</artifactId>
+ <version>0.2-SNAPSHOT</version>
</parent>
<artifactId>gora-core</artifactId>
<packaging>jar</packaging>
@@ -95,12 +93,19 @@
<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>
Modified: incubator/gora/trunk/gora-hbase/pom.xml
URL: http://svn.apache.org/viewvc/incubator/gora/trunk/gora-hbase/pom.xml?rev=1139702&r1=1139701&r2=1139702&view=diff
==============================================================================
--- incubator/gora/trunk/gora-hbase/pom.xml (original)
+++ incubator/gora/trunk/gora-hbase/pom.xml Sun Jun 26 03:09:58 2011
@@ -1,7 +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">
+<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
@@ -22,8 +20,8 @@
<parent>
<groupId>org.apache.gora</groupId>
- <artifactId>apache-gora</artifactId>
- <version>0.1-incubating</version>
+ <artifactId>gora</artifactId>
+ <version>0.2-SNAPSHOT</version>
</parent>
<artifactId>gora-hbase</artifactId>
<packaging>jar</packaging>
@@ -66,15 +64,25 @@
<groupId>org.apache.gora</groupId>
<artifactId>gora-core</artifactId>
<version>${project.version}</version>
- <classifier>tests</classifier>
+ <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>
@@ -100,6 +108,13 @@
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.jms</groupId>
+ <artifactId>jms</artifactId>
+ </exclusion>
+ </exclusions>
+
</dependency>
<!-- Testing Dependencies -->
@@ -113,12 +128,6 @@
<artifactId>hadoop-test</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.hbase</groupId>
- <artifactId>hbase</artifactId>
- <classifier>tests</classifier>
- </dependency>
-
</dependencies>
</project>
Modified: incubator/gora/trunk/gora-sql/pom.xml
URL: http://svn.apache.org/viewvc/incubator/gora/trunk/gora-sql/pom.xml?rev=1139702&r1=1139701&r2=1139702&view=diff
==============================================================================
--- incubator/gora/trunk/gora-sql/pom.xml (original)
+++ incubator/gora/trunk/gora-sql/pom.xml Sun Jun 26 03:09:58 2011
@@ -1,7 +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">
+<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
@@ -22,8 +20,8 @@
<parent>
<groupId>org.apache.gora</groupId>
- <artifactId>apache-gora</artifactId>
- <version>0.1-incubating</version>
+ <artifactId>gora</artifactId>
+ <version>0.2-SNAPSHOT</version>
</parent>
<artifactId>gora-sql</artifactId>
<packaging>jar</packaging>
@@ -63,13 +61,6 @@
</dependency>
<dependency>
- <groupId>org.apache.gora</groupId>
- <artifactId>gora-core</artifactId>
- <version>${project.version}</version>
- <classifier>tests</classifier>
- </dependency>
-
- <dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>avro</artifactId>
</dependency>
@@ -98,6 +89,12 @@
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.jms</groupId>
+ <artifactId>jms</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<!-- Testing Dependencies -->
Modified: incubator/gora/trunk/gora-tutorial/pom.xml
URL: http://svn.apache.org/viewvc/incubator/gora/trunk/gora-tutorial/pom.xml?rev=1139702&r1=1139701&r2=1139702&view=diff
==============================================================================
--- incubator/gora/trunk/gora-tutorial/pom.xml (original)
+++ incubator/gora/trunk/gora-tutorial/pom.xml Sun Jun 26 03:09:58 2011
@@ -1,7 +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">
+<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
@@ -22,8 +20,8 @@
<parent>
<groupId>org.apache.gora</groupId>
- <artifactId>apache-gora</artifactId>
- <version>0.1-incubating</version>
+ <artifactId>gora</artifactId>
+ <version>0.2-SNAPSHOT</version>
</parent>
<artifactId>gora-tutorial</artifactId>
<packaging>jar</packaging>
@@ -66,7 +64,6 @@
<groupId>org.apache.gora</groupId>
<artifactId>gora-sql</artifactId>
<version>${project.version}</version>
- <classifier>tests</classifier>
</dependency>
<dependency>
Modified: incubator/gora/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/gora/trunk/pom.xml?rev=1139702&r1=1139701&r2=1139702&view=diff
==============================================================================
--- incubator/gora/trunk/pom.xml (original)
+++ incubator/gora/trunk/pom.xml Sun Jun 26 03:09:58 2011
@@ -1,7 +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">
+<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
@@ -19,25 +17,28 @@
limitations under the License.
-->
<modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache</groupId>
- <artifactId>apache</artifactId>
- <version>9</version>
- <relativePath />
- </parent>
+ <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-incubating</version>
+ <version>0.2-SNAPSHOT</version>
<name>Apache Gora</name>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/gora/trunk/</connection>
- <developerConnection>scm:svn:http://svn.apache.org/repos/asf/incubator/gora/trunk/</developerConnection>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/gora/trunk</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/gora/trunk</developerConnection>
+ <url>http://svn.apache.org/viewvc/incubator/gora/trunk</url>
</scm>
<build>
+ <testSourceDirectory>${basedir}/src/test/java</testSourceDirectory>
+ <sourceDirectory>${basedir}/src/main/java</sourceDirectory>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -78,12 +79,24 @@
</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>scm:svn:http://svn.apache.org/repos/asf/incubator/gora/tags/</tagBase>
+ <tagBase>https://svn.apache.org/repos/asf/incubator/gora/tags/</tagBase>
</configuration>
</plugin>
</plugins>
@@ -91,10 +104,10 @@
<modules>
<module>gora-core</module>
- <!--<module>gora-hbase</module>-->
+ <module>gora-hbase</module>
<!--<module>gora-cassandra</module>-->
<module>gora-sql</module>
- <!--<module>gora-tutorial</module>-->
+ <module>gora-tutorial</module>
</modules>
<properties>
@@ -269,10 +282,6 @@
<groupId>com.sun.jmx</groupId>
<artifactId>jmxri</artifactId>
</exclusion>
- <exclusion>
- <groupId>javax.jms</groupId>
- <artifactId>jms</artifactId>
- </exclusion>
</exclusions>
</dependency>
@@ -292,5 +301,4 @@
</dependencies>
</dependencyManagement>
-
</project>