honeymoose/hapi-fhir
1
0
Fork 0
mirror of https://github.com/hapifhir/hapi-fhir.git synced 2025-02-08 05:58:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Android compatibility checks (#4070)

Browse Source 
* Adding plugin to investigate compatibility with Android APIs:
Run with:
- mvn animal-sniffer:check

* No need to declare woodstox here

* Moving the Android check to the Plugin Management and activating it in all projects being used on the platform: base + android + converter + structures + validation.

* Removing `List.of` and `Optional.isEmpty` for Android compatibility.

* Moving animal-sniffer to the CI profile.

* Adding Android check to structures-r4b as well

* Removing Xml-apis from Xerces to see if CI passes.

* Activating Android check in the client lib

* Moving Xerces to the base-lib, the only place needed for Animal Sniffer

* Applying Xerces as a dependency only on CI

* Removing xml-apis from shexjava
This commit is contained in:
Vitor Pamplona 2022-12-23 14:23:36 -05:00 committed by GitHub
parent f32bc8f67a
commit f5133dd59c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
20 changed files with 274 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
hapi-fhir-android/pom.xml
View File

@ -152,6 +152,17 @@
</build> </build>
<profiles> <profiles>
<profile>
<id>CI</id>
<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>animal-sniffer-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
</profile>
</profiles> </profiles>
</project> </project>

24
hapi-fhir-base/pom.xml
View File

@ -137,7 +137,6 @@
<artifactId>system-stubs-jupiter</artifactId> <artifactId>system-stubs-jupiter</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>
<build> <build>
@ -210,4 +209,27 @@
</resources> </resources>
</build> </build>
<profiles>
<profile>
<id>CI</id>
<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>animal-sniffer-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
<dependencies>
<!-- dependencies required for Android -->
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
<scope>provided</scope>
<optional>true</optional>
</dependency>
</dependencies>
</profile>
</profiles>
</project> </project>

4
hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/CompositeParam.java
View File

@ -29,6 +29,8 @@ import org.apache.commons.lang3.Validate;
import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle; import org.apache.commons.lang3.builder.ToStringStyle;
import java.util.Arrays;
import java.util.Collections;
import java.util.List; import java.util.List;
import static org.apache.commons.lang3.StringUtils.isBlank; import static org.apache.commons.lang3.StringUtils.isBlank;
@ -115,7 +117,7 @@ public class CompositeParam<A extends IQueryParameterType, B extends IQueryParam
* Get the values of the subcomponents, in order. * Get the values of the subcomponents, in order.
*/ */
public List<IQueryParameterType> getValues() { public List<IQueryParameterType> getValues() {
return List.of(myLeftType, myRightType); return Collections.unmodifiableList(Arrays.asList(myLeftType, myRightType));
} }
@Override @Override

15
hapi-fhir-client/pom.xml
View File

@ -34,7 +34,6 @@
<groupId>org.apache.httpcomponents</groupId> <groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore</artifactId> <artifactId>httpcore</artifactId>
</dependency> </dependency>
</dependencies> </dependencies>
<build> <build>
@ -65,4 +64,18 @@
</plugins> </plugins>
</build> </build>
<profiles>
<profile>
<id>CI</id>
<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>animal-sniffer-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project> </project>

2
hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/tls/TlsAuthenticationSvc.java
View File

@ -112,7 +112,7 @@ public class TlsAuthenticationSvc {
public static X509TrustManager createTrustManager(Optional<TrustStoreInfo> theTrustStoreInfo) { public static X509TrustManager createTrustManager(Optional<TrustStoreInfo> theTrustStoreInfo) {
try { try {
TrustManagerFactory trustManagerFactory = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm()); TrustManagerFactory trustManagerFactory = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
if (theTrustStoreInfo.isEmpty()) { if (!theTrustStoreInfo.isPresent()) {
trustManagerFactory.init((KeyStore) null); // Load Trust Manager Factory with default Java truststore trustManagerFactory.init((KeyStore) null); // Load Trust Manager Factory with default Java truststore
} }
else { else {

14
hapi-fhir-converter/pom.xml
View File

@ -217,4 +217,18 @@
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
<profiles>
<profile>
<id>CI</id>
<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>animal-sniffer-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project> </project>

14
hapi-fhir-structures-dstu2.1/pom.xml
View File

@ -295,4 +295,18 @@
</plugins> </plugins>
</build> </build>
<profiles>
<profile>
<id>CI</id>
<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>animal-sniffer-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project> </project>

14
hapi-fhir-structures-dstu2/pom.xml
View File

@ -420,6 +420,20 @@
</resources> </resources>
</build> </build>
<profiles>
<profile>
<id>CI</id>
<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>animal-sniffer-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
</profile>
</profiles>
<reporting> <reporting>
<plugins> <plugins>
<plugin> <plugin>

14
hapi-fhir-structures-dstu3/pom.xml
View File

@ -79,6 +79,20 @@
</plugins> </plugins>
</build> </build>
<profiles>
<profile>
<id>CI</id>
<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>animal-sniffer-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
</profile>
</profiles>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>ca.uhn.hapi.fhir</groupId> <groupId>ca.uhn.hapi.fhir</groupId>

14
hapi-fhir-structures-hl7org-dstu2/pom.xml
View File

@ -316,4 +316,18 @@
</plugins> </plugins>
</build> </build>
<profiles>
<profile>
<id>CI</id>
<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>animal-sniffer-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project> </project>

15
hapi-fhir-structures-r4/pom.xml
View File

@ -132,6 +132,10 @@
<groupId>org.apache.commons</groupId> <groupId>org.apache.commons</groupId>
<artifactId>commons-rdf-jena</artifactId> <artifactId>commons-rdf-jena</artifactId>
</exclusion> </exclusion>
<exclusion>
<artifactId>xml-apis</artifactId>
<groupId>xml-apis</groupId>
</exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
@ -410,6 +414,17 @@
</dependency> </dependency>
</dependencies> </dependencies>
</profile> </profile>
<profile>
<id>CI</id>
<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>animal-sniffer-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
</profile>
</profiles> </profiles>
</project> </project>

14
hapi-fhir-structures-r4b/pom.xml
View File

@ -399,4 +399,18 @@
</plugins> </plugins>
</build> </build>
<profiles>
<profile>
<id>CI</id>
<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>animal-sniffer-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project> </project>

13
hapi-fhir-structures-r5/pom.xml
View File

@ -383,4 +383,17 @@
</plugins> </plugins>
</build> </build>
<profiles>
<profile>
<id>CI</id>
<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>animal-sniffer-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project> </project>

14
hapi-fhir-validation-resources-dstu2.1/pom.xml
View File

@ -47,4 +47,18 @@
</plugins> </plugins>
</build> </build>
<profiles>
<profile>
<id>CI</id>
<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>animal-sniffer-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project> </project>

13
hapi-fhir-validation-resources-dstu2/pom.xml
View File

@ -47,4 +47,17 @@
</plugins> </plugins>
</build> </build>
<profiles>
<profile>
<id>CI</id>
<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>animal-sniffer-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project> </project>

14
hapi-fhir-validation-resources-dstu3/pom.xml
View File

@ -62,4 +62,18 @@
</plugins> </plugins>
</build> </build>
<profiles>
<profile>
<id>CI</id>
<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>animal-sniffer-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project> </project>

13
hapi-fhir-validation-resources-r4/pom.xml
View File

@ -62,4 +62,17 @@
</plugins> </plugins>
</build> </build>
<profiles>
<profile>
<id>CI</id>
<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>animal-sniffer-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project> </project>

14
hapi-fhir-validation-resources-r5/pom.xml
View File

@ -61,4 +61,18 @@
</plugins> </plugins>
</build> </build>
<profiles>
<profile>
<id>CI</id>
<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>animal-sniffer-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project> </project>

13
hapi-fhir-validation/pom.xml
View File

@ -402,4 +402,17 @@
</plugins> </plugins>
</build> </build>
<profiles>
<profile>
<id>CI</id>
<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>animal-sniffer-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project> </project>

29
pom.xml
View File

@ -2090,6 +2090,14 @@
<artifactId>system-stubs-jupiter</artifactId> <artifactId>system-stubs-jupiter</artifactId>
<version>2.0.1</version> <version>2.0.1</version>
</dependency> </dependency>
<!-- dependencies required for Android -->
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
<version>2.12.2</version>
<scope>provided</scope>
<optional>true</optional>
</dependency>
</dependencies> </dependencies>
</dependencyManagement> </dependencyManagement>
@ -2401,6 +2409,27 @@
<artifactId>maven-install-plugin</artifactId> <artifactId>maven-install-plugin</artifactId>
<version>2.5.2</version> <version>2.5.2</version>
</plugin> </plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>animal-sniffer-maven-plugin</artifactId>
<version>1.22</version>
<configuration>
<signature>
<groupId>net.sf.androidscents.signature</groupId>
<artifactId>android-api-level-26</artifactId>
<version>8.0.0_r2</version>
</signature>
</configuration>
<executions>
<execution>
<id>check-android-26-compliance</id>
<phase>test</phase>
<goals>
<goal>check</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins> </plugins>
</pluginManagement> </pluginManagement>
<plugins> <plugins>