You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@metamodel.apache.org by ka...@apache.org on 2014/09/24 09:47:25 UTC

[3/3] git commit: METAMODEL-77: Added separate dependency for JDK6 since latest ES requires Java 7.

METAMODEL-77: Added separate dependency for JDK6 since latest ES
requires Java 7.

Project: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/commit/6aeb3507
Tree: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/tree/6aeb3507
Diff: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/diff/6aeb3507

Branch: refs/heads/master
Commit: 6aeb35073d065df6847c3a8eb0378d799ef32d78
Parents: 83c43cb
Author: Kasper Sørensen <i....@gmail.com>
Authored: Wed Sep 24 09:47:19 2014 +0200
Committer: Kasper Sørensen <i....@gmail.com>
Committed: Wed Sep 24 09:47:19 2014 +0200

----------------------------------------------------------------------
 elasticsearch/pom.xml | 134 +++++++++++++++++++++++++--------------------
 1 file changed, 76 insertions(+), 58 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/6aeb3507/elasticsearch/pom.xml
----------------------------------------------------------------------
diff --git a/elasticsearch/pom.xml b/elasticsearch/pom.xml
index 4471f1f..1ab40a4 100644
--- a/elasticsearch/pom.xml
+++ b/elasticsearch/pom.xml
@@ -1,65 +1,83 @@
 <?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
+<!-- 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/maven-v4_0_0.xsd">
+	<parent>
+		<artifactId>MetaModel</artifactId>
+		<groupId>org.apache.metamodel</groupId>
+		<version>4.3-incubating-SNAPSHOT</version>
+	</parent>
+	<modelVersion>4.0.0</modelVersion>
+	<artifactId>MetaModel-elasticsearch</artifactId>
+	<name>MetaModel module for Elasticsearch analytics engine</name>
 
-  http://www.apache.org/licenses/LICENSE-2.0
+	<properties>
+		<elasticsearch.latest.version>1.3.2</elasticsearch.latest.version>
+		<elasticsearch.jdk6.version>0.90.13</elasticsearch.jdk6.version>
+	</properties>
 
-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/maven-v4_0_0.xsd">
-    <parent>
-        <artifactId>MetaModel</artifactId>
-        <groupId>org.apache.metamodel</groupId>
-        <version>4.3-incubating-SNAPSHOT</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>MetaModel-elasticsearch</artifactId>
-    <name>MetaModel module for Elasticsearch analytics engine</name>
+	<dependencies>
+		<dependency>
+			<groupId>org.apache.metamodel</groupId>
+			<artifactId>MetaModel-core</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>commons-io</groupId>
+			<artifactId>commons-io</artifactId>
+		</dependency>
+		<!-- test -->
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-log4j12</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<scope>test</scope>
+		</dependency>
+	</dependencies>
 
-    <properties>
-        <elasticsearch.version>1.3.2</elasticsearch.version>
-        <commons-io.version>2.4</commons-io.version>
-    </properties>
+	<profiles>
+		<profile>
+			<id>latest</id>
+			<activation>
+				<jdk>!1.6</jdk>
+			</activation>
+			<dependencies>
+				<!-- elasticsearch -->
+				<dependency>
+					<groupId>org.elasticsearch</groupId>
+					<artifactId>elasticsearch</artifactId>
+					<version>${elasticsearch.latest.version}</version>
+				</dependency>
+			</dependencies>
+		</profile>
 
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.metamodel</groupId>
-            <artifactId>MetaModel-core</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <!-- elasticsearch -->
-        <dependency>
-            <groupId>org.elasticsearch</groupId>
-            <artifactId>elasticsearch</artifactId>
-            <version>${elasticsearch.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>commons-io</groupId>
-            <artifactId>commons-io</artifactId>
-            <version>${commons-io.version}</version>
-        </dependency>
-        <!-- test -->
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-log4j12</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
+		<profile>
+			<id>jdk6</id>
+			<activation>
+				<jdk>1.6</jdk>
+			</activation>
+			<dependencies>
+				<!-- elasticsearch -->
+				<dependency>
+					<groupId>org.elasticsearch</groupId>
+					<artifactId>elasticsearch</artifactId>
+					<version>${elasticsearch.jdk6.version}</version>
+				</dependency>
+			</dependencies>
+		</profile>
 
-    </dependencies>
+	</profiles>
 </project>
\ No newline at end of file