Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Genesys PGR
Genesys Backend
Commits
f669624d
Commit
f669624d
authored
Mar 13, 2015
by
Matija Obreza
Browse files
Mavenizing
parent
1edcfb70
Changes
2
Hide whitespace changes
Inline
Side-by-side
pom.xml
View file @
f669624d
...
...
@@ -19,13 +19,37 @@
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>
<groupId>
org.genesys
2
</groupId>
<groupId>
org.genesys
-pgr
</groupId>
<artifactId>
genesys2-server
</artifactId>
<name>
Genesys 2 Server
</name>
<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>
<project.build.sourceEncoding>
UTF-8
</project.build.sourceEncoding>
<jdk.target>
1.7
</jdk.target>
...
...
@@ -65,7 +89,7 @@
<oval.version>
1.81
</oval.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 -->
<jetty.version>
9.2.9.v20150224
</jetty.version>
...
...
@@ -80,37 +104,18 @@
<id>
central
</id>
<url>
http://repo.maven.apache.org/maven2
</url>
</repository>
<!-- <repository>
<id>JBOSS</id>
<url>http://repository.jboss.org/nexus/content/groups/public</url>
</repository>
<repository>
<id>ibiblio.mirrors</id>
<name>ibiblio.mirrors</name>
<url>http://mirrors.ibiblio.org/pub/mirrors/maven2</url>
</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> -->
<!-- <repository> <id>JBOSS</id> <url>http://repository.jboss.org/nexus/content/groups/public</url>
</repository> <repository> <id>ibiblio.mirrors</id> <name>ibiblio.mirrors</name>
<url>http://mirrors.ibiblio.org/pub/mirrors/maven2</url> </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>
<!-- <pluginRepositories>
<pluginRepository>
<id>sonatype mirror</id>
<url>http://search.maven.org/remotecontent?filepath=</url>
</pluginRepository>
</pluginRepositories> -->
<!-- <pluginRepositories> <pluginRepository> <id>sonatype mirror</id> <url>http://search.maven.org/remotecontent?filepath=</url>
</pluginRepository> </pluginRepositories> -->
<dependencies>
...
...
@@ -152,12 +157,12 @@
<artifactId>
commons-logging
</artifactId>
<version>
${commons.logging.version}
</version>
</dependency>
<dependency>
<groupId>
commons-codec
</groupId>
<artifactId>
commons-codec
</artifactId>
<version>
1.10
</version>
</dependency>
<groupId>
commons-codec
</groupId>
<artifactId>
commons-codec
</artifactId>
<version>
1.10
</version>
</dependency>
<!-- Logging dependencies -->
<dependency>
...
...
@@ -224,7 +229,7 @@
<artifactId>
spring-aop
</artifactId>
<version>
${spring.framework.version}
</version>
</dependency>
<dependency>
<groupId>
org.springframework
</groupId>
<artifactId>
spring-aspects
</artifactId>
...
...
@@ -312,16 +317,16 @@
</dependency>
<dependency>
<groupId>
com.fasterxml.jackson.core
</groupId>
<artifactId>
jackson-databind
</artifactId>
<version>
${jackson.version}
</version>
<groupId>
com.fasterxml.jackson.core
</groupId>
<artifactId>
jackson-databind
</artifactId>
<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>
<groupId>
javax.xml.bind
</groupId>
<artifactId>
jaxb-api
</artifactId>
<version>
${jaxb-api.version}
</version>
<scope>
runtime
</scope>
</dependency>
<!--Jetty -->
...
...
@@ -416,7 +421,7 @@
<artifactId>
org.bioversityinternational.ontology
</artifactId>
<version>
0.6.2
</version>
</dependency>
<dependency>
<groupId>
org.jamel.dbf
</groupId>
<artifactId>
dbf-reader
</artifactId>
...
...
@@ -429,19 +434,19 @@
<version>
${jetty.version}
</version>
<scope>
runtime
</scope>
</dependency>
<dependency>
<groupId>
org.elasticsearch
</groupId>
<artifactId>
elasticsearch
</artifactId>
<version>
1.3.2
</version>
</dependency>
<dependency>
<groupId>
org.springframework.data
</groupId>
<artifactId>
spring-data-elasticsearch
</artifactId>
<version>
1.0.4.RELEASE
</version>
</dependency>
<dependency>
<groupId>
com.jayway.jsonpath
</groupId>
<artifactId>
json-path
</artifactId>
...
...
@@ -484,11 +489,6 @@
<version>
4.0.4
</version>
</dependency>
<dependency>
<groupId>
org.genesys2
</groupId>
<artifactId>
transifex-client
</artifactId>
<version>
0.2-SNAPSHOT
</version>
</dependency>
<dependency>
<groupId>
org.apache.poi
</groupId>
<artifactId>
poi-ooxml
</artifactId>
...
...
@@ -505,9 +505,14 @@
<version>
4.3.6
</version>
</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>
<version>
0.0.
1
-SNAPSHOT
</version>
<version>
0.0.
3
-SNAPSHOT
</version>
</dependency>
</dependencies>
...
...
@@ -709,19 +714,4 @@
</plugins>
</pluginManagement>
</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>
src/main/java/org/genesys2/server/service/worker/WorldClimUpdater.java
View file @
f669624d
...
...
@@ -233,11 +233,11 @@ public class WorldClimUpdater implements InitializingBean {
Double
lon
=
geo
.
getLongitude
();
if
(
lat
!=
null
&&
lon
!=
null
)
{
Integer
tileIndex
=
WorldClimUtil
.
getTileIndex
(
5
,
lon
,
lat
);
Long
tileIndex
=
WorldClimUtil
.
getTileIndex
(
5
,
lon
,
lat
);
if
(
tileIndex
!=
null
)
{
tileIndexSet
.
add
(
(
long
)
tileIndex
);
tileIndexSet
.
add
(
tileIndex
);
if
(
geo
.
getTileIndex
()
==
null
)
{
geo
.
setTileIndex
(
(
long
)
tileIndex
);
geo
.
setTileIndex
(
tileIndex
);
toSave
.
add
(
geo
);
}
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment