lingwei.kong/hawkbit
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Java 11 support for hawkBit (#1038)

Browse Source 
* hawkBit on Java 11
* Reference to created GH issue added

Signed-off-by: Dominic Schabel <dominic.schabel@bosch.io>
This commit is contained in:
Dominic Schabel
2020-10-29 16:36:55 +01:00
committed by GitHub
parent 929f09a0c1
commit ed9a4b1bb3
3 changed files with 22 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
hawkbit-repository/hawkbit-repository-jpa/pom.xml
View File

@@ -20,10 +20,9 @@
<name>hawkBit :: Repository :: JPA Implementation</name> <name>hawkBit :: Repository :: JPA Implementation</name>
<properties> <properties>
<javassist.version>3.20.0-GA</javassist.version>
<jaxb.api.version>2.3.0</jaxb.api.version>
<javax.annotation.version>1.3.1</javax.annotation.version>
<apt.source.dir>${project.build.directory}/generated-sources/apt/</apt.source.dir> <apt.source.dir>${project.build.directory}/generated-sources/apt/</apt.source.dir>
<classgraph.version>4.8.90</classgraph.version>
<eclipselink.maven.plugin.version>2.7.5.1</eclipselink.maven.plugin.version>
</properties> </properties>
<dependencies> <dependencies>
@@ -97,7 +96,7 @@
<plugin> <plugin>
<groupId>com.ethlo.persistence.tools</groupId> <groupId>com.ethlo.persistence.tools</groupId>
<artifactId>eclipselink-maven-plugin</artifactId> <artifactId>eclipselink-maven-plugin</artifactId>
<version>2.7.1.1</version> <version>${eclipselink.maven.plugin.version}</version>
<executions> <executions>
<execution> <execution>
<id>modelgen</id> <id>modelgen</id>
@@ -118,25 +117,24 @@
</configuration> </configuration>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>javax.xml.bind</groupId> <!--
<artifactId>jaxb-api</artifactId> Required for Java 11 since plugin version is build on
<version>${jaxb.api.version}</version> EclipseLink 2.7.5 (which doesn't have latest fixes for Java 11)
</dependency> -->
<dependency>
<groupId>org.eclipse.persistence</groupId> <groupId>org.eclipse.persistence</groupId>
<artifactId>org.eclipse.persistence.jpa</artifactId> <artifactId>org.eclipse.persistence.jpa</artifactId>
<version>${eclipselink.version}</version> <version>${eclipselink.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.javassist</groupId> <!--
<artifactId>javassist</artifactId> Required for Java 11 since plugin uses older version (4.8.21)
<version>${javassist.version}</version> which suffer from NPE while weaving. We require at least 4.8.48
</dependency> see: https://github.com/ethlo/eclipselink-maven-plugin/issues/31
<dependency> -->
<groupId>javax.annotation</groupId> <groupId>io.github.classgraph</groupId>
<artifactId>javax.annotation-api</artifactId> <artifactId>classgraph</artifactId>
<version>${javax.annotation.version}</version> <version>${classgraph.version}</version>
</dependency> </dependency>
</dependencies> </dependencies>
</plugin> </plugin>
<plugin> <plugin>

3
hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaTarget.java
View File

@@ -16,7 +16,6 @@ import java.time.ZoneId;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collections; import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@@ -161,7 +160,7 @@ public class JpaTarget extends AbstractJpaNamedEntity implements Target, EventAw
@MapKeyColumn(name = "attribute_key", nullable = false, length = Target.CONTROLLER_ATTRIBUTE_KEY_SIZE) @MapKeyColumn(name = "attribute_key", nullable = false, length = Target.CONTROLLER_ATTRIBUTE_KEY_SIZE)
@CollectionTable(name = "sp_target_attributes", joinColumns = { @CollectionTable(name = "sp_target_attributes", joinColumns = {
@JoinColumn(name = "target_id", nullable = false, updatable = false) }, foreignKey = @ForeignKey(value = ConstraintMode.CONSTRAINT, name = "fk_targ_attrib_target")) @JoinColumn(name = "target_id", nullable = false, updatable = false) }, foreignKey = @ForeignKey(value = ConstraintMode.CONSTRAINT, name = "fk_targ_attrib_target"))
private final Map<String, String> controllerAttributes = Collections.synchronizedMap(new HashMap<String, String>()); private Map<String, String> controllerAttributes;
// set default request controller attributes to true, because we want to // set default request controller attributes to true, because we want to
// request them the first // request them the first

6
pom.xml
View File

@@ -127,7 +127,11 @@
</repositories> </repositories>
<properties> <properties>
<java.version>1.8</java.version> <java.version>1.8</java.version>
<!-- Developer preview -->
<!-- <java.version>11</java.version> -->
<spring.boot.version>2.1.4.RELEASE</spring.boot.version> <spring.boot.version>2.1.4.RELEASE</spring.boot.version>
<spring.cloud.version>Greenwich.RELEASE</spring.cloud.version> <spring.cloud.version>Greenwich.RELEASE</spring.cloud.version>
@@ -163,7 +167,7 @@
<cron-utils.version>5.0.5</cron-utils.version> <cron-utils.version>5.0.5</cron-utils.version>
<jsoup.version>1.11.2</jsoup.version> <jsoup.version>1.11.2</jsoup.version>
<allure.version>2.13.6</allure.version> <allure.version>2.13.6</allure.version>
<eclipselink.version>2.7.3</eclipselink.version> <eclipselink.version>2.7.7</eclipselink.version>
<gwtmockito.version>1.1.8</gwtmockito.version> <gwtmockito.version>1.1.8</gwtmockito.version>
<guava.version>25.0-jre</guava.version> <guava.version>25.0-jre</guava.version>
<javax.el-api.version>2.2.4</javax.el-api.version> <javax.el-api.version>2.2.4</javax.el-api.version>