From e174572a3b78426f3f0f783720f475950298d4af Mon Sep 17 00:00:00 2001 From: Tadgh Date: Wed, 11 Dec 2024 07:51:50 -0800 Subject: [PATCH] Pom fixes (#6552) * Collapse multiple plugin definitions. cut over to spring framework bom * Remove Eclipse M2E plugin * licenses * Strip errorprone * Strip errorprone * Remove commented errorprone config, update maven-assembly-plugin * fix prev hapi-version * Attempt to remove dep on previous hapi * Revert prev ver removal * remove comment --- hapi-fhir-android-realm/.project | 23 --- hapi-fhir-docs/pom.xml | 6 - hapi-fhir-jpaserver-base/pom.xml | 146 ++++++++---------- .../model/entity/EntityIndexStatusEnum.java | 19 +++ hapi-fhir-jpaserver-uhnfhirtest/pom.xml | 27 ---- hapi-fhir-structures-dstu2/pom.xml | 29 ---- hapi-fhir-test-utilities/pom.xml | 13 -- hapi-tinder-plugin/pom.xml | 42 +---- hapi-tinder-test/pom.xml | 55 ------- pom.xml | 130 ++++++---------- 10 files changed, 131 insertions(+), 359 deletions(-) delete mode 100644 hapi-fhir-android-realm/.project diff --git a/hapi-fhir-android-realm/.project b/hapi-fhir-android-realm/.project deleted file mode 100644 index 13005c6b849..00000000000 --- a/hapi-fhir-android-realm/.project +++ /dev/null @@ -1,23 +0,0 @@ - - - hapi-fhir-android-realm - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.jdt.core.javanature - org.eclipse.m2e.core.maven2Nature - - diff --git a/hapi-fhir-docs/pom.xml b/hapi-fhir-docs/pom.xml index ad72b81abb3..20756e49cc3 100644 --- a/hapi-fhir-docs/pom.xml +++ b/hapi-fhir-docs/pom.xml @@ -129,12 +129,6 @@ com.fasterxml.jackson.core jackson-databind - - ca.uhn.hapi.fhir - hapi-fhir-client-apache-http5 - ${project.version} - compile - diff --git a/hapi-fhir-jpaserver-base/pom.xml b/hapi-fhir-jpaserver-base/pom.xml index 25a1afcd16e..4e812d0350c 100644 --- a/hapi-fhir-jpaserver-base/pom.xml +++ b/hapi-fhir-jpaserver-base/pom.xml @@ -410,7 +410,6 @@ - ca.uhn.hapi.fhir hapi-tinder-plugin @@ -424,12 +423,9 @@ dstu2 ca.uhn.fhir.jpa.config ca.uhn.fhir.jpa.rp.dstu2 - hapi-fhir-server-resourceproviders-dstu2.xml - + hapi-fhir-server-resourceproviders-dstu2.xml - - - + @@ -441,11 +437,9 @@ dstu3 ca.uhn.fhir.jpa.config ca.uhn.fhir.jpa.rp.dstu3 - hapi-fhir-server-resourceproviders-dstu3.xml - - - - + hapi-fhir-server-resourceproviders-dstu3.xml + + @@ -457,11 +451,9 @@ r4 ca.uhn.fhir.jpa.config ca.uhn.fhir.jpa.rp.r4 - hapi-fhir-server-resourceproviders-r4.xml - - - - + hapi-fhir-server-resourceproviders-r4.xml + + @@ -473,11 +465,9 @@ r4b ca.uhn.fhir.jpa.config ca.uhn.fhir.jpa.rp.r4b - hapi-fhir-server-resourceproviders-r4b.xml - - - - + hapi-fhir-server-resourceproviders-r4b.xml + + @@ -489,13 +479,61 @@ r5 ca.uhn.fhir.jpa.config ca.uhn.fhir.jpa.rp.r5 - hapi-fhir-server-resourceproviders-r5.xml - - + hapi-fhir-server-resourceproviders-r5.xml + + + + + + generate-ddl + + generate-ddl + + + false + + ca.uhn.fhir.jpa.entity + ca.uhn.fhir.jpa.model.entity + + + + ca.uhn.fhir.jpa.model.dialect.HapiFhirDerbyDialect + derby.sql + + + ca.uhn.fhir.jpa.model.dialect.HapiFhirMySQLDialect + mysql.sql + + + ca.uhn.fhir.jpa.model.dialect.HapiFhirMariaDBDialect + mariadb.sql + + + ca.uhn.fhir.jpa.model.dialect.HapiFhirOracleDialect + oracle.sql + + + ca.uhn.fhir.jpa.model.dialect.HapiFhirSQLServerDialect + sqlserver.sql + + + ca.uhn.fhir.jpa.model.dialect.HapiFhirCockroachDialect + cockroachdb.sql + + + ca.uhn.fhir.jpa.model.dialect.HapiFhirH2Dialect + h2.sql + + + ca.uhn.fhir.jpa.model.dialect.HapiFhirPostgresDialect + postgres.sql + classpath:ca/uhn/fhir/jpa/docs/database/hapifhirpostgres94-init01.sql + + + ${project.build.directory}/classes/ca/uhn/hapi/fhir/jpa/docs/database - ca.uhn.hapi.fhir @@ -512,69 +550,11 @@ hapi-fhir-structures-r4 ${project.version} - ca.uhn.hapi.fhir hapi-fhir-validation-resources-dstu3 ${project.version} - - - - - ca.uhn.hapi.fhir - hapi-tinder-plugin - - - - generate-ddl - - - - - false - - ca.uhn.fhir.jpa.entity - ca.uhn.fhir.jpa.model.entity - - - - ca.uhn.fhir.jpa.model.dialect.HapiFhirDerbyDialect - derby.sql - - - ca.uhn.fhir.jpa.model.dialect.HapiFhirMySQLDialect - mysql.sql - - - ca.uhn.fhir.jpa.model.dialect.HapiFhirMariaDBDialect - mariadb.sql - - - ca.uhn.fhir.jpa.model.dialect.HapiFhirOracleDialect - oracle.sql - - - ca.uhn.fhir.jpa.model.dialect.HapiFhirSQLServerDialect - sqlserver.sql - - - ca.uhn.fhir.jpa.model.dialect.HapiFhirCockroachDialect - cockroachdb.sql - - - ca.uhn.fhir.jpa.model.dialect.HapiFhirH2Dialect - h2.sql - - - ca.uhn.fhir.jpa.model.dialect.HapiFhirPostgresDialect - postgres.sql - classpath:ca/uhn/fhir/jpa/docs/database/hapifhirpostgres94-init01.sql - - - ${project.build.directory}/classes/ca/uhn/hapi/fhir/jpa/docs/database - - ca.uhn.hapi.fhir hapi-fhir-jpaserver-model diff --git a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/EntityIndexStatusEnum.java b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/EntityIndexStatusEnum.java index 524d66c372f..16db6d3dcc6 100644 --- a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/EntityIndexStatusEnum.java +++ b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/EntityIndexStatusEnum.java @@ -1,3 +1,22 @@ +/*- + * #%L + * HAPI FHIR JPA Model + * %% + * Copyright (C) 2014 - 2024 Smile CDR, Inc. + * %% + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * #L% + */ package ca.uhn.fhir.jpa.model.entity; public enum EntityIndexStatusEnum { diff --git a/hapi-fhir-jpaserver-uhnfhirtest/pom.xml b/hapi-fhir-jpaserver-uhnfhirtest/pom.xml index e302f81ab08..458c5467000 100644 --- a/hapi-fhir-jpaserver-uhnfhirtest/pom.xml +++ b/hapi-fhir-jpaserver-uhnfhirtest/pom.xml @@ -156,32 +156,6 @@ - - - org.eclipse.m2e - lifecycle-mapping - 1.0.0 - - - - - - - - [0.4,) - - - - - - - - - - - - @@ -195,7 +169,6 @@ hapi-fhir-jpaserver - DIST diff --git a/hapi-fhir-structures-dstu2/pom.xml b/hapi-fhir-structures-dstu2/pom.xml index 685cd767523..95129881980 100644 --- a/hapi-fhir-structures-dstu2/pom.xml +++ b/hapi-fhir-structures-dstu2/pom.xml @@ -349,35 +349,6 @@ - - - - - org.eclipse.m2e - lifecycle-mapping - 1.0.0 - - - - - - ca.uhn.hapi.fhir - hapi-tinder-plugin - [0.4-SNAPSHOT,) - - generate-structures - - - - - - - - - - - - ${basedir}/src/main/resources diff --git a/hapi-fhir-test-utilities/pom.xml b/hapi-fhir-test-utilities/pom.xml index fbf798fb4cd..e48e08de468 100644 --- a/hapi-fhir-test-utilities/pom.xml +++ b/hapi-fhir-test-utilities/pom.xml @@ -161,11 +161,6 @@ junit-jupiter compile - - org.assertj - assertj-core - compile - net.javacrumbs.json-unit json-unit-assertj @@ -214,14 +209,6 @@ org.assertj assertj-core - diff --git a/hapi-tinder-plugin/pom.xml b/hapi-tinder-plugin/pom.xml index fa868a09061..1956c5d7147 100644 --- a/hapi-tinder-plugin/pom.xml +++ b/hapi-tinder-plugin/pom.xml @@ -12,15 +12,11 @@ hapi-tinder-plugin maven-plugin - HAPI Tinder Plugin - 6.1.0 - + 7.6.0 @@ -255,42 +251,6 @@ - - - - - org.eclipse.m2e - lifecycle-mapping - 1.0.0 - - - - - - - org.apache.maven.plugins - - - maven-plugin-plugin - - - [3.2,) - - - descriptor - - - - - - - - - - - - diff --git a/hapi-tinder-test/pom.xml b/hapi-tinder-test/pom.xml index 64a3c161626..1e9c38c3b97 100644 --- a/hapi-tinder-test/pom.xml +++ b/hapi-tinder-test/pom.xml @@ -533,61 +533,6 @@ - - - - - org.eclipse.m2e - lifecycle-mapping - 1.0.0 - - - - - - ca.uhn.hapi.fhir - hapi-tinder-plugin - [0.4-SNAPSHOT,) - - generate-structures - - - - - - - - - ca.uhn.hapi.fhir - hapi-tinder-plugin - [0.4-SNAPSHOT,) - - generate-multi-files - - - - - - - - - ca.uhn.hapi.fhir - hapi-tinder-plugin - [0.4-SNAPSHOT,) - - generate-single-file - - - - - - - - - - - - ${basedir}/src/main/resources diff --git a/pom.xml b/pom.xml index 7472ab8a289..50a195ff760 100644 --- a/pom.xml +++ b/pom.xml @@ -1071,6 +1071,7 @@ 2.24.1 6.1.14 2024.0.5 + 6.1.15 3.3.5 2.0.10 2.9.0 @@ -1104,7 +1105,7 @@ 3.3.0 3.2.1 0.8.12 - 3.3.0 + 3.7.1 2.5.0 3.5.0 3.4.0 @@ -1131,6 +1132,13 @@ pom import + + org.springframework + spring-framework-bom + ${spring_framework_bom_version} + pom + import + aopalliance aopalliance @@ -1965,11 +1973,6 @@ hibernate-envers ${hibernate_version} - - org.springframework.data - spring-data-envers - ${spring_boot_version} - org.hibernate.validator hibernate-validator @@ -2493,29 +2496,6 @@ true 500m 2000m - true - - -XDcompilePolicy=simple - --should-stop=ifError=FLOW - -Xplugin:ErrorProne -Xep:MissingSummary:OFF -Xep:JavaUtilDate:OFF -XepExcludedPaths:.*/src/test/java/.*|.*/hapi-fhir-docs/src/main/java/.* - -J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED - -J--add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED - -J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED - -J--add-exports=jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED - -J--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED - -J--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED - -J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED - -J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED - -J--add-opens=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED - -J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED - - - - com.google.errorprone - error_prone_core - ${error_prone_core_version} - - @@ -2676,59 +2656,6 @@ true - - - - org.eclipse.m2e - lifecycle-mapping - 1.0.0 - - - - - - - ca.uhn.hapi.fhir - - - hapi-tinder-plugin - - - [0.8-SNAPSHOT,) - - - - generate-jparest-server - - - - - - - - - - - org.apache.maven.plugins - - - maven-antrun-plugin - - - [1.7,) - - - run - - - - - - - - - - org.apache.maven.plugins maven-install-plugin @@ -3130,6 +3057,45 @@ + + ERRORPRONE + + + + org.apache.maven.plugins + maven-compiler-plugin + + UTF-8 + true + 500m + 2000m + true + + -XDcompilePolicy=simple + --should-stop=ifError=FLOW + -Xplugin:ErrorProne -Xep:MissingSummary:OFF -Xep:JavaUtilDate:OFF -XepExcludedPaths:.*/src/test/java/.*|.*/hapi-fhir-docs/src/main/java/.* + -J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED + -J--add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED + -J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED + -J--add-exports=jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED + -J--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED + -J--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED + -J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED + -J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED + -J--add-opens=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED + -J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED + + + + com.google.errorprone + error_prone_core + ${error_prone_core_version} + + + + + + DIST