Skip to content

Commit 0225cc8

Browse files
committed
Bump up dependency versions, use apline image with java8 for travis ci
1 parent 4991cee commit 0225cc8

File tree

6 files changed

+79
-30
lines changed

6 files changed

+79
-30
lines changed

.sbtopts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
-J-Xmx4G
2+
-Djava.awt.headless=true
3+
-Dsun.io.serialization.extendedDebugInfo=true

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ cache:
1313
- $HOME/.ivy2
1414
- $HOME/.sbt
1515
script:
16-
- docker run -it --net=host -v $HOME/.ivy2:/root/.ivy2 -v $HOME/.sbt:/root/.sbt -v $TRAVIS_BUILD_DIR:/pdal-java -e TRAVIS_SCALA_VERSION=$TRAVIS_SCALA_VERSION -e TRAVIS_COMMIT=$TRAVIS_COMMIT -e TRAVIS_JDK_VERSION=$TRAVIS_JDK_VERSION daunnc/pdal:1.6-ubuntu /bin/bash -c "cd /pdal-java; ./sbt test"
16+
- docker run -it --net=host -v $HOME/.ivy2:/root/.ivy2 -v $HOME/.sbt:/root/.sbt -v $TRAVIS_BUILD_DIR:/pdal-java -e TRAVIS_SCALA_VERSION=$TRAVIS_SCALA_VERSION -e TRAVIS_COMMIT=$TRAVIS_COMMIT -e TRAVIS_JDK_VERSION=$TRAVIS_JDK_VERSION daunnc/pdal:1.7.1 /bin/bash -c "cd /pdal-java; ./sbt test"
1717
notifications:
1818
email:
1919
recipients:

core-scala/src/main/scala/io/pdal/pipeline/json/Implicits.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ object Implicits extends Implicits
2727

2828
trait Implicits extends Serializable {
2929
implicit val customConfig: Configuration =
30-
Configuration.default.withSnakeCaseKeys.withDiscriminator("class_type")
30+
Configuration.default.withSnakeCaseMemberNames.withDiscriminator("class_type")
3131

32-
val pipelinePrettyPrinter: Printer = Printer.spaces2.copy(dropNullKeys = true)
32+
val pipelinePrettyPrinter: Printer = Printer.spaces2.copy(dropNullValues = true)
3333

3434
implicit def exprTypeEncoder[T <: ExprType]: Encoder[T] = Encoder.instance { _.toString.asJson }
3535
implicit def exprTypeDecoder[T <: ExprType]: Decoder[T] = Decoder.decodeString.emap { str =>

project/Version.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
object Version {
2-
val circe = "0.8.0"
2+
val circe = "0.9.2"
33
val scalaTest = "3.0.4"
44
val jtsCore = "1.14.0"
55
}

scripts/docker/1.6-maintenance/ubuntu/Dockerfile

Lines changed: 0 additions & 26 deletions
This file was deleted.
Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
FROM pdal/pdal:1.7
2+
MAINTAINER Grigory Pomadchin <[email protected]>
3+
4+
# A few reasons for installing distribution-provided OpenJDK:
5+
#
6+
# 1. Oracle. Licensing prevents us from redistributing the official JDK.
7+
#
8+
# 2. Compiling OpenJDK also requires the JDK to be installed, and it gets
9+
# really hairy.
10+
#
11+
# For some sample build times, see Debian's buildd logs:
12+
# https://buildd.debian.org/status/logs.php?pkg=openjdk-8
13+
14+
# Default to UTF-8 file.encoding
15+
ENV LANG C.UTF-8
16+
17+
# add a simple script that can auto-detect the appropriate JAVA_HOME value
18+
# based on whether the JDK or only the JRE is installed
19+
RUN { \
20+
echo '#!/bin/sh'; \
21+
echo 'set -e'; \
22+
echo; \
23+
echo 'dirname "$(dirname "$(readlink -f "$(which javac || which java)")")"'; \
24+
} > /usr/local/bin/docker-java-home \
25+
&& chmod +x /usr/local/bin/docker-java-home
26+
ENV JAVA_HOME /usr/lib/jvm/java-1.8-openjdk
27+
ENV PATH $PATH:/usr/lib/jvm/java-1.8-openjdk/jre/bin:/usr/lib/jvm/java-1.8-openjdk/bin
28+
29+
ENV JAVA_VERSION 8u151
30+
ENV JAVA_ALPINE_VERSION 8.151.12-r0
31+
32+
RUN set -x \
33+
&& apk add --no-cache \
34+
openjdk8="$JAVA_ALPINE_VERSION" \
35+
&& [ "$JAVA_HOME" = "$(docker-java-home)" ]
36+
37+
# If you're reading this and have any feedback on how this image could be
38+
# improved, please open an issue or a pull request so we can discuss it!
39+
#
40+
# https://github.com/docker-library/openjdk/issues
41+
42+
# Install deleted deps
43+
RUN apk add --no-cache \
44+
bash \
45+
alpine-sdk \
46+
unzip \
47+
cmake \
48+
hexer-dev \
49+
nitro-dev \
50+
gdal-dev \
51+
geos-dev \
52+
laz-perf-dev \
53+
libexecinfo-dev \
54+
libgeotiff-dev \
55+
libxml2-dev \
56+
python-dev \
57+
py-numpy-dev \
58+
hdf5-dev \
59+
cpd-dev \
60+
fgt-dev \
61+
sqlite-dev \
62+
postgresql-dev \
63+
curl-dev \
64+
linux-headers \
65+
libspatialite-dev \
66+
cython-dev \
67+
py-packaging \
68+
clang \
69+
libharu-dev \
70+
poppler-dev \
71+
boost-dev \
72+
zlib-dev

0 commit comments

Comments
 (0)