Messing around with the POM to try and get android working
This commit is contained in:
James Agnew
parent
826fa1d7c1
commit
29dab8bad9
|
|
@ -1,4 +1,5 @@
|
||||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||||
|
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
<parent>
|
<parent>
|
||||||
|
|
@ -37,22 +38,11 @@
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<!-- Only required for OpenID Connect Support -->
|
<!-- Only required for OpenID Connect Support -->
|
||||||
<!--
|
<!-- <dependency> <groupId>org.mitre</groupId> <artifactId>openid-connect-client</artifactId>
|
||||||
<dependency>
|
<version>${mitreid-connect-version}</version> <optional>true</optional> </dependency>
|
||||||
<groupId>org.mitre</groupId>
|
<dependency> <groupId>org.springframework.security.oauth</groupId> <artifactId>spring-security-oauth2</artifactId>
|
||||||
<artifactId>openid-connect-client</artifactId>
|
<version>2.0.2.RELEASE</version> <optional>true</optional> </dependency> -->
|
||||||
<version>${mitreid-connect-version}</version>
|
<!-- -->
|
||||||
<optional>true</optional>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.springframework.security.oauth</groupId>
|
|
||||||
<artifactId>spring-security-oauth2</artifactId>
|
|
||||||
<version>2.0.2.RELEASE</version>
|
|
||||||
<optional>true</optional>
|
|
||||||
</dependency>
|
|
||||||
-->
|
|
||||||
<!--
|
|
||||||
-->
|
|
||||||
|
|
||||||
<!-- Only required for narrative generator support -->
|
<!-- Only required for narrative generator support -->
|
||||||
<dependency>
|
<dependency>
|
||||||
|
|
@ -68,14 +58,8 @@
|
||||||
<artifactId>cors-filter</artifactId>
|
<artifactId>cors-filter</artifactId>
|
||||||
<version>${ebay_cors_filter_version}</version>
|
<version>${ebay_cors_filter_version}</version>
|
||||||
<optional>true</optional>
|
<optional>true</optional>
|
||||||
<!--
|
<!-- <exclusions> <exclusion> <artifactId>servlet-api</artifactId> <groupId>javax.servlet</groupId>
|
||||||
<exclusions>
|
</exclusion> </exclusions> -->
|
||||||
<exclusion>
|
|
||||||
<artifactId>servlet-api</artifactId>
|
|
||||||
<groupId>javax.servlet</groupId>
|
|
||||||
</exclusion>
|
|
||||||
</exclusions>
|
|
||||||
-->
|
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<!-- Only required for Schematron Validator Support -->
|
<!-- Only required for Schematron Validator Support -->
|
||||||
|
|
@ -92,14 +76,8 @@
|
||||||
<optional>true</optional>
|
<optional>true</optional>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<!--
|
<!-- <dependency> <groupId>xerces</groupId> <artifactId>xercesImpl</artifactId>
|
||||||
<dependency>
|
<version>2.11.0</version> <optional>true</optional> </dependency> -->
|
||||||
<groupId>xerces</groupId>
|
|
||||||
<artifactId>xercesImpl</artifactId>
|
|
||||||
<version>2.11.0</version>
|
|
||||||
<optional>true</optional>
|
|
||||||
</dependency>
|
|
||||||
-->
|
|
||||||
|
|
||||||
<!-- General -->
|
<!-- General -->
|
||||||
<dependency>
|
<dependency>
|
||||||
|
|
@ -202,50 +180,18 @@
|
||||||
<id>SITE</id>
|
<id>SITE</id>
|
||||||
<reporting>
|
<reporting>
|
||||||
<plugins>
|
<plugins>
|
||||||
<!--
|
<!-- <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>findbugs-maven-plugin</artifactId>
|
||||||
<plugin>
|
<version>3.0.0</version> <configuration> </configuration> </plugin> <plugin>
|
||||||
<groupId>org.codehaus.mojo</groupId>
|
<groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jxr-plugin</artifactId>
|
||||||
<artifactId>findbugs-maven-plugin</artifactId>
|
<version>2.4</version> <reportSets> <reportSet> <id>normal</id> <reports>
|
||||||
<version>3.0.0</version>
|
<report>jxr</report> </reports> </reportSet> <reportSet> <id>restful-server-example</id>
|
||||||
<configuration>
|
<reports> <report>jxr</report> </reports> <configuration> <sourcePath>../restful-server-example/src/main/java</sourcePath>
|
||||||
</configuration>
|
<destDir>${project.reporting.outputDirectory}/rse-xref</destDir> <outputDirectory>tmp</outputDirectory>
|
||||||
</plugin>
|
<reportOutputDirectory>rse-xref</reportOutputDirectory> </configuration>
|
||||||
<plugin>
|
</reportSet> </reportSets> </plugin> -->
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<!-- <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-linkcheck-plugin</artifactId>
|
||||||
<artifactId>maven-jxr-plugin</artifactId>
|
<version>1.1</version> <configuration> <forceSite>false</forceSite> </configuration>
|
||||||
<version>2.4</version>
|
</plugin> -->
|
||||||
<reportSets>
|
|
||||||
<reportSet>
|
|
||||||
<id>normal</id>
|
|
||||||
<reports>
|
|
||||||
<report>jxr</report>
|
|
||||||
</reports>
|
|
||||||
</reportSet>
|
|
||||||
<reportSet>
|
|
||||||
<id>restful-server-example</id>
|
|
||||||
<reports>
|
|
||||||
<report>jxr</report>
|
|
||||||
</reports>
|
|
||||||
<configuration>
|
|
||||||
<sourcePath>../restful-server-example/src/main/java</sourcePath>
|
|
||||||
<destDir>${project.reporting.outputDirectory}/rse-xref</destDir>
|
|
||||||
<outputDirectory>tmp</outputDirectory>
|
|
||||||
<reportOutputDirectory>rse-xref</reportOutputDirectory>
|
|
||||||
</configuration>
|
|
||||||
</reportSet>
|
|
||||||
</reportSets>
|
|
||||||
</plugin>
|
|
||||||
-->
|
|
||||||
<!--
|
|
||||||
<plugin>
|
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
|
||||||
<artifactId>maven-linkcheck-plugin</artifactId>
|
|
||||||
<version>1.1</version>
|
|
||||||
<configuration>
|
|
||||||
<forceSite>false</forceSite>
|
|
||||||
</configuration>
|
|
||||||
</plugin>
|
|
||||||
-->
|
|
||||||
</plugins>
|
</plugins>
|
||||||
</reporting>
|
</reporting>
|
||||||
</profile>
|
</profile>
|
||||||
|
|
@ -275,6 +221,41 @@
|
||||||
</plugins>
|
</plugins>
|
||||||
</build>
|
</build>
|
||||||
</profile>
|
</profile>
|
||||||
|
<profile>
|
||||||
|
<id>ANDROID</id>
|
||||||
|
<build>
|
||||||
|
<plugins>
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
|
<artifactId>maven-shade-plugin</artifactId>
|
||||||
|
<version>1.4</version>
|
||||||
|
<executions>
|
||||||
|
<execution>
|
||||||
|
<phase>package</phase>
|
||||||
|
<goals>
|
||||||
|
<goal>shade</goal>
|
||||||
|
</goals>
|
||||||
|
<configuration>
|
||||||
|
<shadedArtifactAttached>false</shadedArtifactAttached>
|
||||||
|
<createDependencyReducedPom>true</createDependencyReducedPom>
|
||||||
|
<relocations>
|
||||||
|
<relocation>
|
||||||
|
<pattern>javax.xml.stream</pattern>
|
||||||
|
<shadedPattern>ca.uhn.fhir.repackage.javax.xml.stream</shadedPattern>
|
||||||
|
</relocation>
|
||||||
|
<relocation>
|
||||||
|
<pattern>javax.json</pattern>
|
||||||
|
<shadedPattern>ca.uhn.fhir.repackage.javax.json</shadedPattern>
|
||||||
|
</relocation>
|
||||||
|
</relocations>
|
||||||
|
</configuration>
|
||||||
|
</execution>
|
||||||
|
</executions>
|
||||||
|
</plugin>
|
||||||
|
</plugins>
|
||||||
|
</build>
|
||||||
|
</profile>
|
||||||
|
|
||||||
</profiles>
|
</profiles>
|
||||||
|
|
||||||
</project>
|
</project>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue