Skip to content
This repository was archived by the owner on Nov 29, 2022. It is now read-only.

update libraries #9

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

update libraries #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a0d5e16
update deps to scala 2.12.10
hanoch Dec 6, 2021
4bc67be
Starting at version 10.9.0, GeoEvent Server is built with Scala versi…
hanoch Dec 6, 2021
69919ed
build to Java 11. updated 3rd party lib versions. updated maven plugi…
hanoch Dec 11, 2021
98ec8f1
added maven-shade-plugin for shading akka's reference.comf file, as i…
hanoch Dec 15, 2021
fb89d80
switch java version back to 1.8
hanoch Dec 15, 2021
41cd7c9
build Scala code to target java 1.8 as well
hanoch Dec 15, 2021
1ffd4a8
switch Scala version back to 2.11 (2.11.12) and akka version to 2.4.1…
hanoch Dec 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions azure-device-transport/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,16 +35,16 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.3</version>
<version>${maven.compler.plugin.version}</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
<source>${java.version}</source>
<target>${java.version}</target>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>3.0.0</version>
<version>${maven.bundle.plugin.version}</version>
<extensions>true</extensions>
<configuration>
<instructions>
Expand Down
8 changes: 4 additions & 4 deletions azure-event-hub-transport/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,16 +35,16 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.3</version>
<version>${maven.compler.plugin.version}</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
<source>${java.version}</source>
<target>${java.version}</target>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>3.0.0</version>
<version>${maven.bundle.plugin.version}</version>
<extensions>true</extensions>
<configuration>
<instructions>
Expand Down
81 changes: 71 additions & 10 deletions azure-iot-hub-transport/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,38 @@
<packaging>bundle</packaging>

<properties>
<scala.version>2.11.8</scala.version>
<scala.maven.plugin.version>4.4.1</scala.maven.plugin.version>
<scala.version>2.11.12</scala.version>
<scala.dep.version>2.11</scala.dep.version>
<akka.version>2.4.17</akka.version>
<jackson.version>2.10.5</jackson.version>
<jackson.databind.version>2.10.5.1</jackson.databind.version>
</properties>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>scala-library</artifactId>
<version>${scala.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>com.typesafe.akka</groupId>
<artifactId>akka-stream_${scala.dep.version}</artifactId>
<version>${akka.version}</version>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>
<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>scala-library</artifactId>
<version>${scala.version}</version>
</dependency>

<!-- Azure IoT Hub React SDK - using IoTHub to Receive (and Send) events from IoT Hubs -->
Expand All @@ -46,16 +69,36 @@
<dependency>
<groupId>com.typesafe.akka</groupId>
<artifactId>akka-stream_${scala.dep.version}</artifactId>
<version>2.4.17</version>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.scala-tools</groupId>
<artifactId>maven-scala-plugin</artifactId>
<version>2.15.2</version>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>${maven.compler.plugin.version}</version>
<configuration>
<source>${java.version}</source>
<target>${java.version}</target>
</configuration>
</plugin>
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
<version>${scala.maven.plugin.version}</version>
<configuration>
<checkMultipleScalaVersions>false</checkMultipleScalaVersions>
<recompileMode>incremental</recompileMode>
<args>
<arg>-target:jvm-1.8</arg>
</args>
<jvmArgs>
<jvmArg>-Xss1024k</jvmArg>
<jvmArg>-Xms64m</jvmArg>
<jvmArg>-Xmx2048m</jvmArg>
</jvmArgs>
</configuration>
<executions>
<execution>
<goals>
Expand All @@ -70,11 +113,30 @@
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.2.4</version>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
<configuration>
<transformers>
<transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
<resource>reference.conf</resource>
</transformer>
</transformers>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>3.0.0</version>
<version>${maven.bundle.plugin.version}</version>
<extensions>true</extensions>
<configuration>
<instructions>
Expand All @@ -88,15 +150,14 @@
<Private-Package>
com.esri.geoevent.transport.azure
</Private-Package>
<Export-Package />
<Export-Package/>
<Embed-Dependency>
*;scope=compile|runtime;inline=true
</Embed-Dependency>
<Embed-Transitive>true</Embed-Transitive>
</instructions>
</configuration>
</plugin>

</plugins>
</build>
</project>
10 changes: 6 additions & 4 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,10 @@
<properties>
<contact.address>geoevent@esri.com</contact.address>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.bundle.plugin.version>2.3.6</maven.bundle.plugin.version>
<maven.compler.plugin.version>3.8.0</maven.compler.plugin.version>
<maven.bundle.plugin.version>5.1.2</maven.bundle.plugin.version>

<java.version>1.8</java.version>
<iot.device.client.version>1.1.24</iot.device.client.version>
<iot.service.client.version>1.2.18</iot.service.client.version>
<azure.eventhubs.version>0.13.1</azure.eventhubs.version>
Expand Down Expand Up @@ -50,10 +52,10 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.5.1</version>
<version>${maven.compler.plugin.version}</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
<source>${java.version}</source>
<target>${java.version}</target>
</configuration>
</plugin>
</plugins>
Expand Down