Feature/java11 build (#1280)
* hawkBit on Java 11 Signed-off-by: Dominic Schabel <dominic.schabel@bosch.io> * Preparing java 11 build - Update eclipse-link maven plugin dependencies - Fixing warnings, adopt to java-11 style Signed-off-by: Peter Vigier <Peter.Vigier@bosch.io> * Preparing java 11 build - Fixing warnings, adapt to java-11 style - Added since to deprecated Signed-off-by: Peter Vigier <Peter.Vigier@bosch.io> * Fixing sonar warnings - removed deprecated API Signed-off-by: Peter Vigier <Peter.Vigier@bosch.io> * Fixing sonar warnings & failing test - Added suppressWarning - added WithSpringAuthorityRule to clean-up listener Signed-off-by: Peter Vigier <Peter.Vigier@bosch.io> * Compile warnings - Test if final causes issues in tests Signed-off-by: Peter Vigier <Peter.Vigier@bosch.io> * Removed deprecated code Signed-off-by: Peter Vigier <Peter.Vigier@bosch.io> * Reverted changes Signed-off-by: Peter Vigier <Peter.Vigier@bosch.io> * Removed final as this causes invalid reflective access exceptions - The eclipselink generated classes seem to modify the field directly - update plugin version Signed-off-by: Peter Vigier <Peter.Vigier@bosch.io> * Upgrade eclipselink from 2.7.9 to 2.7.10 * Remove @deprecated endpoints from MgmtTargetTagResource * Remove dependencies already defined in eclipselink-maven-plugin * Try eclipselink 2.7.11-RC1 * Set project encoding to UTF-8 * Upgrade surefire and failsafe plugins to 3.0.0-M7 * Try fixed string instead of a random generated one * Replace JsonBuilder by Jackson ObjectMapper usage * Use JsonBuilder again * Use APPLICATION_JSON_UTF8 instead of APPLICATION_JSON * Try to replace com.vaadin.external.google:android-json by org.json:json * Add debugging outputs * Improve debugging outputs * Improve debugging outputs * Use Jackson instead of JsonBuilder * Use Jackson instead of JsonBuilder 2nd part * Use Spring json dependency * Use eclipselink 2.7.11 * Fix RootControllerDocumentationTest * Improve helper methods of AbstractDDiApiIntegrationTest * Upgrade SpringBoot and SpringCloud versions * Improve deprecation notice for 0.3.0M8 * Fix BaseAmqpServiceTest * Fix SpecificationsBuilderTest * Removed deprecated code * Define maven-enforcer-plugin version * Remove com.google.code.findbugs.jsr305 Signed-off-by: Florian Ruschbaschan <florian.ruschbaschan@bosch.io> * Update circleci image to openjdk:openjdk:11.0.13-jdk-buster Signed-off-by: Florian Ruschbaschan <florian.ruschbaschan@bosch.io> * Fix javadoc generation and license check Signed-off-by: Florian Ruschbaschan <florian.ruschbaschan@bosch.io> * Fix review findings Signed-off-by: Florian Ruschbaschan <florian.ruschbaschan@bosch.io> Signed-off-by: Dominic Schabel <dominic.schabel@bosch.io> Signed-off-by: Peter Vigier <Peter.Vigier@bosch.io> Signed-off-by: Florian Ruschbaschan <florian.ruschbaschan@bosch.io> Co-authored-by: Dominic Schabel <dominic.schabel@bosch.io> Co-authored-by: Peter Vigier <Peter.Vigier@bosch.io> Co-authored-by: Markus Block <markus.block@bosch-si.com>
This commit is contained in:
Florian Ruschbaschan
committed by
GitHub
GitHub
parent
537548defb
commit
32718676a4
57
pom.xml
57
pom.xml
@@ -16,7 +16,7 @@
|
||||
<parent>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-parent</artifactId>
|
||||
<version>2.3.7.RELEASE</version>
|
||||
<version>2.3.12.RELEASE</version>
|
||||
</parent>
|
||||
|
||||
<groupId>org.eclipse.hawkbit</groupId>
|
||||
@@ -128,12 +128,11 @@
|
||||
|
||||
<properties>
|
||||
|
||||
<java.version>1.8</java.version>
|
||||
<!-- Developer preview: java.version = 11 -->
|
||||
<java.version>11</java.version>
|
||||
|
||||
<spring.boot.version>2.3.7.RELEASE</spring.boot.version>
|
||||
<spring-framework.version>5.2.20.RELEASE</spring-framework.version>
|
||||
<spring.cloud.version>Hoxton.SR7</spring.cloud.version>
|
||||
<spring.boot.version>2.3.12.RELEASE</spring.boot.version>
|
||||
<spring-framework.version>5.2.22.RELEASE</spring-framework.version>
|
||||
<spring.cloud.version>Hoxton.SR12</spring.cloud.version>
|
||||
<spring.plugin.core.version>2.0.0.RELEASE</spring.plugin.core.version>
|
||||
|
||||
<snapshotDependencyAllowed>true</snapshotDependencyAllowed>
|
||||
@@ -155,15 +154,27 @@
|
||||
<vaadin.gwt-user.version>2.8.2</vaadin.gwt-user.version>
|
||||
<!-- Vaadin versions - END -->
|
||||
|
||||
<!-- ************************ -->
|
||||
<!-- Maven Plugins -->
|
||||
<!-- ************************ -->
|
||||
<maven.processor.plugin.version>3.3.3</maven.processor.plugin.version>
|
||||
<maven.scm.plugin.version>1.11.1</maven.scm.plugin.version>
|
||||
<maven.site.plugin.version>3.9.0</maven.site.plugin.version>
|
||||
<maven.site.plugin.version>3.9.1</maven.site.plugin.version>
|
||||
<maven.surefire.plugin.version>3.0.0-M7</maven.surefire.plugin.version>
|
||||
<maven.failsafe.plugin.version>3.0.0-M7</maven.failsafe.plugin.version>
|
||||
<maven.enforcer.plugin.version>3.1.0</maven.enforcer.plugin.version>
|
||||
<!-- ************************ -->
|
||||
<!-- Maven Surefire settings -->
|
||||
<!-- ************************ -->
|
||||
<surefire.forkcount>1</surefire.forkcount>
|
||||
|
||||
<!-- Misc libraries versions - START -->
|
||||
<!-- Misc libraries versions - START -->
|
||||
<cron-utils.version>9.1.6</cron-utils.version>
|
||||
<jsoup.version>1.15.3</jsoup.version>
|
||||
<allure.version>2.13.6</allure.version>
|
||||
<eclipselink.version>2.7.9</eclipselink.version>
|
||||
<eclipselink.version>2.7.11</eclipselink.version>
|
||||
<eclipselink.maven.plugin.version>2.7.9.1</eclipselink.maven.plugin.version>
|
||||
<jaxb-api.version>2.3.0</jaxb-api.version>
|
||||
<gwtmockito.version>1.1.8</gwtmockito.version>
|
||||
<guava.version>30.1.1-jre</guava.version>
|
||||
<javax.el-api.version>2.2.4</javax.el-api.version>
|
||||
@@ -198,13 +209,7 @@
|
||||
${project.basedir}/../hawkbit-test-report/target/jacoco-aggregate/jacoco.xml,
|
||||
${project.basedir}/../../hawkbit-test-report/target/jacoco-aggregate/jacoco.xml
|
||||
</sonar.coverage.jacoco.xmlReportPaths>
|
||||
|
||||
<!-- Sonar - END -->
|
||||
|
||||
<!-- ************************ -->
|
||||
<!-- Maven Surefire settings -->
|
||||
<!-- ************************ -->
|
||||
<surefire.forkcount>1</surefire.forkcount>
|
||||
</properties>
|
||||
|
||||
<build>
|
||||
@@ -225,6 +230,7 @@
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-enforcer-plugin</artifactId>
|
||||
<version>${maven.enforcer.plugin.version}</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<!-- Make sure that only non-snapshot versions are used
|
||||
@@ -404,6 +410,7 @@
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-surefire-plugin</artifactId>
|
||||
<version>${maven.surefire.plugin.version}</version>
|
||||
<configuration>
|
||||
<systemPropertyVariables>
|
||||
<!-- Set output directory according to allure-framework recommendation -->
|
||||
@@ -415,9 +422,7 @@
|
||||
<useSystemClassLoader>false</useSystemClassLoader>
|
||||
<reuseForks>true</reuseForks>
|
||||
<forkCount>${surefire.forkcount}</forkCount>
|
||||
<argLine>
|
||||
${jacoco.agent.ut.arg}
|
||||
</argLine>
|
||||
<argLine>${jacoco.agent.ut.arg}</argLine>
|
||||
<properties>
|
||||
<property>
|
||||
<name>listener</name>
|
||||
@@ -437,6 +442,7 @@
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-failsafe-plugin</artifactId>
|
||||
<version>${maven.failsafe.plugin.version}</version>
|
||||
<configuration>
|
||||
<reuseForks>false</reuseForks>
|
||||
<forkCount>${surefire.forkcount}</forkCount>
|
||||
@@ -477,6 +483,11 @@
|
||||
<artifactId>maven-processor-plugin</artifactId>
|
||||
<version>${maven.processor.plugin.version}</version>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>com.ethlo.persistence.tools</groupId>
|
||||
<artifactId>eclipselink-maven-plugin</artifactId>
|
||||
<version>${eclipselink.maven.plugin.version}</version>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</pluginManagement>
|
||||
</build>
|
||||
@@ -653,9 +664,15 @@
|
||||
<exclusion>
|
||||
<groupId>javax.validation</groupId>
|
||||
<artifactId>validation-api</artifactId>
|
||||
</exclusion>
|
||||
</exclusion>
|
||||
</exclusions>
|
||||
</dependency>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>javax.xml.bind</groupId>
|
||||
<artifactId>jaxb-api</artifactId>
|
||||
<version>${jaxb-api.version}</version>
|
||||
</dependency>
|
||||
|
||||
<!-- Spring -->
|
||||
<dependency>
|
||||
<groupId>org.springframework.cloud</groupId>
|
||||
|
||||
Reference in New Issue
Block a user