Commit f669624d authored by Matija Obreza's avatar Matija Obreza

Mavenizing

parent 1edcfb70
...@@ -19,13 +19,37 @@ ...@@ -19,13 +19,37 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 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> <modelVersion>4.0.0</modelVersion>
<groupId>org.genesys2</groupId> <groupId>org.genesys-pgr</groupId>
<artifactId>genesys2-server</artifactId> <artifactId>genesys2-server</artifactId>
<name>Genesys 2 Server</name> <name>Genesys 2 Server</name>
<packaging>war</packaging> <packaging>war</packaging>
<version>0.9.1</version>
<url>https://www.genesys-pgr.org</url>
<description>Genesys 2 Server</description>
<licenses>
<license>
<name>The Apache License, Version 2.0</name>
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
</license>
</licenses>
<scm>
<connection>https://bitbucket.org/genesys2/genesys2-server.git</connection>
<developerConnection>scm:git:git@bitbucket.org:genesys2/genesys2-server.git</developerConnection>
<url>git@bitbucket.org:genesys2/genesys2-server.git</url>
</scm>
<organization>
<name>Global Crop Diversity Trust</name>
<url>https://www.croptrust.org</url>
</organization>
<issueManagement>
<url>https://bitbucket.org/genesys2/genesys2-server/issues</url>
</issueManagement>
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<jdk.target>1.7</jdk.target> <jdk.target>1.7</jdk.target>
...@@ -65,7 +89,7 @@ ...@@ -65,7 +89,7 @@
<oval.version>1.81</oval.version> <oval.version>1.81</oval.version>
<jackson.version>2.2.1</jackson.version> <jackson.version>2.2.1</jackson.version>
<jaxb-api.version>2.1</jaxb-api.version> <jaxb-api.version>2.1</jaxb-api.version>
<!--Container --> <!--Container -->
<jetty.version>9.2.9.v20150224</jetty.version> <jetty.version>9.2.9.v20150224</jetty.version>
...@@ -80,37 +104,18 @@ ...@@ -80,37 +104,18 @@
<id>central</id> <id>central</id>
<url>http://repo.maven.apache.org/maven2</url> <url>http://repo.maven.apache.org/maven2</url>
</repository> </repository>
<!-- <repository> <!-- <repository> <id>JBOSS</id> <url>http://repository.jboss.org/nexus/content/groups/public</url>
<id>JBOSS</id> </repository> <repository> <id>ibiblio.mirrors</id> <name>ibiblio.mirrors</name>
<url>http://repository.jboss.org/nexus/content/groups/public</url> <url>http://mirrors.ibiblio.org/pub/mirrors/maven2</url> </repository> -->
</repository> <!-- <repository> <id>spring-social-google</id> <name>Spring Social Google</name>
<repository> <url>http://gabiaxel.github.io/maven/</url> </repository> -->
<id>ibiblio.mirrors</id> <!-- <repository> <id>sonatype-oss</id> <url>https://oss.sonatype.org/content/groups/public</url>
<name>ibiblio.mirrors</name> </repository> <repository> <id>releases</id> <name>Releases</name> <url>https://oss.sonatype.org/content/repositories/releases</url>
<url>http://mirrors.ibiblio.org/pub/mirrors/maven2</url> </repository> -->
</repository> -->
<!-- <repository>
<id>spring-social-google</id>
<name>Spring Social Google</name>
<url>http://gabiaxel.github.io/maven/</url>
</repository> -->
<!-- <repository>
<id>sonatype-oss</id>
<url>https://oss.sonatype.org/content/groups/public</url>
</repository>
<repository>
<id>releases</id>
<name>Releases</name>
<url>https://oss.sonatype.org/content/repositories/releases</url>
</repository> -->
</repositories> </repositories>
<!-- <pluginRepositories> <!-- <pluginRepositories> <pluginRepository> <id>sonatype mirror</id> <url>http://search.maven.org/remotecontent?filepath=</url>
<pluginRepository> </pluginRepository> </pluginRepositories> -->
<id>sonatype mirror</id>
<url>http://search.maven.org/remotecontent?filepath=</url>
</pluginRepository>
</pluginRepositories> -->
<dependencies> <dependencies>
...@@ -152,12 +157,12 @@ ...@@ -152,12 +157,12 @@
<artifactId>commons-logging</artifactId> <artifactId>commons-logging</artifactId>
<version>${commons.logging.version}</version> <version>${commons.logging.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>commons-codec</groupId> <groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId> <artifactId>commons-codec</artifactId>
<version>1.10</version> <version>1.10</version>
</dependency> </dependency>
<!-- Logging dependencies --> <!-- Logging dependencies -->
<dependency> <dependency>
...@@ -224,7 +229,7 @@ ...@@ -224,7 +229,7 @@
<artifactId>spring-aop</artifactId> <artifactId>spring-aop</artifactId>
<version>${spring.framework.version}</version> <version>${spring.framework.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework</groupId> <groupId>org.springframework</groupId>
<artifactId>spring-aspects</artifactId> <artifactId>spring-aspects</artifactId>
...@@ -312,16 +317,16 @@ ...@@ -312,16 +317,16 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.fasterxml.jackson.core</groupId> <groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId> <artifactId>jackson-databind</artifactId>
<version>${jackson.version}</version> <version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<version>${jaxb-api.version}</version>
<scope>runtime</scope>
</dependency> </dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<version>${jaxb-api.version}</version>
<scope>runtime</scope>
</dependency>
<!--Jetty --> <!--Jetty -->
...@@ -416,7 +421,7 @@ ...@@ -416,7 +421,7 @@
<artifactId>org.bioversityinternational.ontology</artifactId> <artifactId>org.bioversityinternational.ontology</artifactId>
<version>0.6.2</version> <version>0.6.2</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.jamel.dbf</groupId> <groupId>org.jamel.dbf</groupId>
<artifactId>dbf-reader</artifactId> <artifactId>dbf-reader</artifactId>
...@@ -429,19 +434,19 @@ ...@@ -429,19 +434,19 @@
<version>${jetty.version}</version> <version>${jetty.version}</version>
<scope>runtime</scope> <scope>runtime</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.elasticsearch</groupId> <groupId>org.elasticsearch</groupId>
<artifactId>elasticsearch</artifactId> <artifactId>elasticsearch</artifactId>
<version>1.3.2</version> <version>1.3.2</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.data</groupId> <groupId>org.springframework.data</groupId>
<artifactId>spring-data-elasticsearch</artifactId> <artifactId>spring-data-elasticsearch</artifactId>
<version>1.0.4.RELEASE</version> <version>1.0.4.RELEASE</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.jayway.jsonpath</groupId> <groupId>com.jayway.jsonpath</groupId>
<artifactId>json-path</artifactId> <artifactId>json-path</artifactId>
...@@ -484,11 +489,6 @@ ...@@ -484,11 +489,6 @@
<version>4.0.4</version> <version>4.0.4</version>
</dependency> </dependency>
<dependency>
<groupId>org.genesys2</groupId>
<artifactId>transifex-client</artifactId>
<version>0.2-SNAPSHOT</version>
</dependency>
<dependency> <dependency>
<groupId>org.apache.poi</groupId> <groupId>org.apache.poi</groupId>
<artifactId>poi-ooxml</artifactId> <artifactId>poi-ooxml</artifactId>
...@@ -505,9 +505,14 @@ ...@@ -505,9 +505,14 @@
<version>4.3.6</version> <version>4.3.6</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.genesys</groupId> <groupId>org.genesys-pgr</groupId>
<artifactId>transifex-client</artifactId>
<version>0.4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.genesys-pgr</groupId>
<artifactId>worldclim-reader</artifactId> <artifactId>worldclim-reader</artifactId>
<version>0.0.1-SNAPSHOT</version> <version>0.0.3-SNAPSHOT</version>
</dependency> </dependency>
</dependencies> </dependencies>
...@@ -709,19 +714,4 @@ ...@@ -709,19 +714,4 @@
</plugins> </plugins>
</pluginManagement> </pluginManagement>
</build> </build>
<version>0.9.1</version>
<url>http://genesys-pgr.org</url>
<description>Genesys 2 Server</description>
<organization>
<name>Global Crop Diversity Trust</name>
<url>https://www.croptrust.org</url>
</organization>
<scm>
<connection>scm:git:git@bitbucket.org:genesys2/genesys2-server.git</connection>
<url>git@bitbucket.org:genesys2/genesys2-server.git</url>
</scm>
<issueManagement>
<url>https://bitbucket.org/genesys2/genesys2-server/issues</url>
</issueManagement>
</project> </project>
...@@ -233,11 +233,11 @@ public class WorldClimUpdater implements InitializingBean { ...@@ -233,11 +233,11 @@ public class WorldClimUpdater implements InitializingBean {
Double lon = geo.getLongitude(); Double lon = geo.getLongitude();
if (lat != null && lon != null) { if (lat != null && lon != null) {
Integer tileIndex = WorldClimUtil.getTileIndex(5, lon, lat); Long tileIndex = WorldClimUtil.getTileIndex(5, lon, lat);
if (tileIndex != null) { if (tileIndex != null) {
tileIndexSet.add((long) tileIndex); tileIndexSet.add(tileIndex);
if (geo.getTileIndex() == null) { if (geo.getTileIndex() == null) {
geo.setTileIndex((long) tileIndex); geo.setTileIndex(tileIndex);
toSave.add(geo); toSave.add(geo);
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment