METAMODEL-170: Removed any Java 6 specifics from build files Project: http://git-wip-us.apache.org/repos/asf/metamodel/repo Commit: http://git-wip-us.apache.org/repos/asf/metamodel/commit/26a64bdb Tree: http://git-wip-us.apache.org/repos/asf/metamodel/tree/26a64bdb Diff: http://git-wip-us.apache.org/repos/asf/metamodel/diff/26a64bdb
Branch: refs/heads/master Commit: 26a64bdbba1b23d0cafa9b4712dcada92e5a804c Parents: 808b09b Author: Kasper Sørensen <i.am.kasper.soren...@gmail.com> Authored: Sat Aug 15 19:52:49 2015 +0200 Committer: Kasper Sørensen <i.am.kasper.soren...@gmail.com> Committed: Sat Aug 15 19:52:49 2015 +0200 ---------------------------------------------------------------------- cassandra/pom.xml | 23 ----------------------- elasticsearch/pom.xml | 43 +++++++++---------------------------------- pom.xml | 4 ++-- 3 files changed, 11 insertions(+), 59 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/metamodel/blob/26a64bdb/cassandra/pom.xml ---------------------------------------------------------------------- diff --git a/cassandra/pom.xml b/cassandra/pom.xml index 2f53d6e..473cf30 100644 --- a/cassandra/pom.xml +++ b/cassandra/pom.xml @@ -57,27 +57,4 @@ <scope>test</scope> </dependency> </dependencies> - - <profiles> - <profile> - <id>jdk6</id> - <activation> - <jdk>1.6</jdk> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <version>2.18.1</version> - <configuration> - <excludes> - <exclude>**/CassandraDataContextTest.java</exclude> - </excludes> - </configuration> - </plugin> - </plugins> - </build> - </profile> - </profiles> </project> http://git-wip-us.apache.org/repos/asf/metamodel/blob/26a64bdb/elasticsearch/pom.xml ---------------------------------------------------------------------- diff --git a/elasticsearch/pom.xml b/elasticsearch/pom.xml index 8c1cb4a..7114a8d 100644 --- a/elasticsearch/pom.xml +++ b/elasticsearch/pom.xml @@ -20,8 +20,7 @@ <name>MetaModel module for Elasticsearch analytics engine</name> <properties> - <elasticsearch.latest.version>1.4.4</elasticsearch.latest.version> - <elasticsearch.jdk6.version>0.90.13</elasticsearch.jdk6.version> + <elasticsearch.version>1.4.4</elasticsearch.version> </properties> <dependencies> @@ -34,6 +33,14 @@ <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> </dependency> + + <!-- elasticsearch --> + <dependency> + <groupId>org.elasticsearch</groupId> + <artifactId>elasticsearch</artifactId> + <version>${elasticsearch.version}</version> + </dependency> + <!-- test --> <dependency> <groupId>org.slf4j</groupId> @@ -47,36 +54,4 @@ </dependency> </dependencies> - <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> - - <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> - - </profiles> </project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/metamodel/blob/26a64bdb/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index acc73f2..d45c8b3 100644 --- a/pom.xml +++ b/pom.xml @@ -168,8 +168,8 @@ under the License. <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> <configuration> - <source>1.6</source> - <target>1.6</target> + <source>1.7</source> + <target>1.7</target> <encoding>utf-8</encoding> </configuration> </plugin>
