From 685d3a46654e2a534dc16819710a0c0ae3a725b3 Mon Sep 17 00:00:00 2001 From: Filip Hrisafov Date: Sat, 14 Jul 2018 17:40:03 +0200 Subject: [PATCH 1/6] Add travis configuration for the examples --- .travis.yml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 00000000..86ef1e3c --- /dev/null +++ b/.travis.yml @@ -0,0 +1,22 @@ +language: java + +sudo: false +dist: trusty + +install: true + +matrix: + include: + - jdk: openjdk8 + - jdk: oraclejdk8 + - jdk: openjdk10 + - jdk: openjdk11 + - jdk: openjdk-ea + allow_failures: + - jdk: openjdk-ea + +script: mvn clean verify -B -V -U + +cache: + directories: + - $HOME/.m2 From 6a4c816557040309db71512cb4e829bd3be7096d Mon Sep 17 00:00:00 2001 From: Filip Hrisafov Date: Sat, 14 Jul 2018 17:46:24 +0200 Subject: [PATCH 2/6] Add explicit Maven compiler source and target --- mapstruct-iterable-to-non-iterable/pom.xml | 5 +++++ mapstruct-jpa-child-parent/pom.xml | 2 ++ 2 files changed, 7 insertions(+) diff --git a/mapstruct-iterable-to-non-iterable/pom.xml b/mapstruct-iterable-to-non-iterable/pom.xml index fdd000ab..d597a1d9 100644 --- a/mapstruct-iterable-to-non-iterable/pom.xml +++ b/mapstruct-iterable-to-non-iterable/pom.xml @@ -25,6 +25,11 @@ mapstruct-examples-iterable-non-iterable 1.0-SNAPSHOT + + 1.7 + 1.7 + + diff --git a/mapstruct-jpa-child-parent/pom.xml b/mapstruct-jpa-child-parent/pom.xml index 26c17ed0..6f051342 100644 --- a/mapstruct-jpa-child-parent/pom.xml +++ b/mapstruct-jpa-child-parent/pom.xml @@ -27,6 +27,8 @@ 1.2.0.Final + 1.7 + 1.7 From 369ad262c87b46f7950b2c95f5349e8140016eb5 Mon Sep 17 00:00:00 2001 From: Filip Hrisafov Date: Sat, 14 Jul 2018 17:58:14 +0200 Subject: [PATCH 3/6] Use latest version of Lombok that works on Java 10 --- mapstruct-lombok/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mapstruct-lombok/pom.xml b/mapstruct-lombok/pom.xml index 223c3bf9..07c4c233 100644 --- a/mapstruct-lombok/pom.xml +++ b/mapstruct-lombok/pom.xml @@ -32,7 +32,7 @@ 1.7 1.7 1.2.0.Final - 1.16.14 + 1.18.0 From 0aa58d2ae496642c388e3278aa69cfc7d6d241c4 Mon Sep 17 00:00:00 2001 From: Filip Hrisafov Date: Sat, 14 Jul 2018 18:09:37 +0200 Subject: [PATCH 4/6] Use latest version of Kotlin that works on Java 10 --- mapstruct-kotlin/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mapstruct-kotlin/pom.xml b/mapstruct-kotlin/pom.xml index aff62a79..40a662d3 100644 --- a/mapstruct-kotlin/pom.xml +++ b/mapstruct-kotlin/pom.xml @@ -14,7 +14,7 @@ UTF-8 - 1.1.3-2 + 1.2.51 1.8 1.2.0.Final From 1d812379116252231ea0b67b7ace3ce6304f9fba Mon Sep 17 00:00:00 2001 From: Filip Hrisafov Date: Sat, 14 Jul 2018 18:15:10 +0200 Subject: [PATCH 5/6] Use mapstruct 1.3.0-SNAPSHOT in the examples --- mapstruct-field-mapping/pom.xml | 2 +- mapstruct-iterable-to-non-iterable/pom.xml | 4 ++-- mapstruct-jpa-child-parent/pom.xml | 2 +- mapstruct-kotlin/pom.xml | 2 +- mapstruct-lombok/pom.xml | 2 +- mapstruct-lookup-entity-with-id/pom.xml | 2 +- mapstruct-mapping-from-map/pom.xml | 2 +- mapstruct-mapping-with-cycles/pom.xml | 2 +- mapstruct-nested-bean-mappings/pom.xml | 2 +- mapstruct-protobuf3/pom.xml | 2 +- mapstruct-rounding/pom.xml | 2 +- mapstruct-spi-accessor-naming/pom.xml | 2 +- mapstruct-updatemethods-1/pom.xml | 2 +- 13 files changed, 14 insertions(+), 14 deletions(-) diff --git a/mapstruct-field-mapping/pom.xml b/mapstruct-field-mapping/pom.xml index 698f322e..4731d9b7 100644 --- a/mapstruct-field-mapping/pom.xml +++ b/mapstruct-field-mapping/pom.xml @@ -27,7 +27,7 @@ 1.0.0 - 1.2.0.Final + 1.3.0-SNAPSHOT diff --git a/mapstruct-iterable-to-non-iterable/pom.xml b/mapstruct-iterable-to-non-iterable/pom.xml index d597a1d9..f316d1ce 100644 --- a/mapstruct-iterable-to-non-iterable/pom.xml +++ b/mapstruct-iterable-to-non-iterable/pom.xml @@ -35,13 +35,13 @@ org.mapstruct mapstruct - 1.2.0.Final + 1.3.0-SNAPSHOT org.mapstruct mapstruct-processor - 1.2.0.Final + 1.3.0-SNAPSHOT provided diff --git a/mapstruct-jpa-child-parent/pom.xml b/mapstruct-jpa-child-parent/pom.xml index 6f051342..527e7380 100644 --- a/mapstruct-jpa-child-parent/pom.xml +++ b/mapstruct-jpa-child-parent/pom.xml @@ -26,7 +26,7 @@ 1.0-SNAPSHOT - 1.2.0.Final + 1.3.0-SNAPSHOT 1.7 1.7 diff --git a/mapstruct-kotlin/pom.xml b/mapstruct-kotlin/pom.xml index 40a662d3..6e57c14e 100644 --- a/mapstruct-kotlin/pom.xml +++ b/mapstruct-kotlin/pom.xml @@ -16,7 +16,7 @@ 1.2.51 1.8 - 1.2.0.Final + 1.3.0-SNAPSHOT diff --git a/mapstruct-lombok/pom.xml b/mapstruct-lombok/pom.xml index 07c4c233..9da73c6d 100644 --- a/mapstruct-lombok/pom.xml +++ b/mapstruct-lombok/pom.xml @@ -31,7 +31,7 @@ UTF-8 1.7 1.7 - 1.2.0.Final + 1.3.0-SNAPSHOT 1.18.0 diff --git a/mapstruct-lookup-entity-with-id/pom.xml b/mapstruct-lookup-entity-with-id/pom.xml index b9a59849..c6044e16 100644 --- a/mapstruct-lookup-entity-with-id/pom.xml +++ b/mapstruct-lookup-entity-with-id/pom.xml @@ -26,7 +26,7 @@ 1.0-SNAPSHOT - 1.2.0.Final + 1.3.0-SNAPSHOT diff --git a/mapstruct-mapping-from-map/pom.xml b/mapstruct-mapping-from-map/pom.xml index 825718f5..c0dc4fa8 100644 --- a/mapstruct-mapping-from-map/pom.xml +++ b/mapstruct-mapping-from-map/pom.xml @@ -26,7 +26,7 @@ 1.0.0 - 1.2.0.Final + 1.3.0-SNAPSHOT diff --git a/mapstruct-mapping-with-cycles/pom.xml b/mapstruct-mapping-with-cycles/pom.xml index 092a3d0f..e7079fc7 100644 --- a/mapstruct-mapping-with-cycles/pom.xml +++ b/mapstruct-mapping-with-cycles/pom.xml @@ -27,7 +27,7 @@ 1.0.0 - 1.2.0.Final + 1.3.0-SNAPSHOT diff --git a/mapstruct-nested-bean-mappings/pom.xml b/mapstruct-nested-bean-mappings/pom.xml index c4fc4cc3..2133caf0 100644 --- a/mapstruct-nested-bean-mappings/pom.xml +++ b/mapstruct-nested-bean-mappings/pom.xml @@ -27,7 +27,7 @@ 1.0.0 - 1.2.0.Final + 1.3.0-SNAPSHOT diff --git a/mapstruct-protobuf3/pom.xml b/mapstruct-protobuf3/pom.xml index 1455557c..89b13a5e 100644 --- a/mapstruct-protobuf3/pom.xml +++ b/mapstruct-protobuf3/pom.xml @@ -32,7 +32,7 @@ 1.4.0.Final 0.5.0 3.2.0 - 1.2.0.Final + 1.3.0-SNAPSHOT 1.8 1.8 diff --git a/mapstruct-rounding/pom.xml b/mapstruct-rounding/pom.xml index 52b70333..193bbe99 100644 --- a/mapstruct-rounding/pom.xml +++ b/mapstruct-rounding/pom.xml @@ -26,7 +26,7 @@ 1.0.0 - 1.2.0.Final + 1.3.0-SNAPSHOT diff --git a/mapstruct-spi-accessor-naming/pom.xml b/mapstruct-spi-accessor-naming/pom.xml index ad3d506a..cb10cfda 100644 --- a/mapstruct-spi-accessor-naming/pom.xml +++ b/mapstruct-spi-accessor-naming/pom.xml @@ -28,7 +28,7 @@ pom - 1.2.0.Final + 1.3.0-SNAPSHOT 1.8 1.8 diff --git a/mapstruct-updatemethods-1/pom.xml b/mapstruct-updatemethods-1/pom.xml index 5b037715..b403f72d 100644 --- a/mapstruct-updatemethods-1/pom.xml +++ b/mapstruct-updatemethods-1/pom.xml @@ -26,7 +26,7 @@ 1.0.0 - 1.2.0.Final + 1.3.0-SNAPSHOT From a9085c55c80e8b2a26745c737bcc9ec46111d4c2 Mon Sep 17 00:00:00 2001 From: Filip Hrisafov Date: Sun, 15 Jul 2018 10:04:24 +0200 Subject: [PATCH 6/6] Manually symlink CA certs for openjdk10 to solve problem with https connections with sonatype_snapshots --- .travis.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.travis.yml b/.travis.yml index 86ef1e3c..32ae4287 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,6 +10,11 @@ matrix: - jdk: openjdk8 - jdk: oraclejdk8 - jdk: openjdk10 + # For some reason pulling from sonatype_snapshots does not work for openjdk10 and we have to manually symlink + # See https://github.com/travis-ci/travis-ci/issues/9368#issuecomment-405070163 + before_install: + - rm "${JAVA_HOME}/lib/security/cacerts" + - ln -s /etc/ssl/certs/java/cacerts "${JAVA_HOME}/lib/security/cacerts" - jdk: openjdk11 - jdk: openjdk-ea allow_failures: