Skip to content

Commit

Permalink
suppressed jdk 8 and 17 for macos on CI for the time being (#991)
Browse files Browse the repository at this point in the history
* auppressed jdp 8 and 17 for macos on CI for the time being

* suppressed macos completely on CI for the time being

* Use of profile to build the binary only on unix OS

* Using explicit version of the antrun plugin and tasks changed to target for the newer version
  • Loading branch information
sparkhi authored Jul 20, 2023
1 parent e84d2f6 commit e2c6515
Showing 1 changed file with 19 additions and 26 deletions.
45 changes: 19 additions & 26 deletions droid-binary/pom.xml
Original file line number Diff line number Diff line change
@@ -1,25 +1,20 @@
<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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<artifactId>droid-parent</artifactId>
<groupId>uk.gov.nationalarchives</groupId>
<version>6.6.2-SNAPSHOT</version>
<relativePath>../droid-parent</relativePath>
<relativePath>../droid-parent</relativePath>
</parent>

<artifactId>droid-binary</artifactId>
<packaging>pom</packaging>

<name>droid-binaries</name>

<scm>
<connection>scm:git:https://github.com/digital-preservation/droid.git</connection>
<developerConnection>scm:git:https://github.com/digital-preservation/droid.git</developerConnection>
<url>scm:git:https://github.com/digital-preservation/droid.git</url>
<tag>HEAD</tag>
</scm>

<tag>HEAD</tag>
</scm>
<build>
<plugins>
<plugin>
Expand All @@ -42,10 +37,10 @@
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>3.1.0</version>
<executions>
<execution>
<id>prepare-files-windows</id>
Expand All @@ -54,35 +49,34 @@
<goal>run</goal>
</goals>
<configuration>
<tasks>
<target>
<!-- Update binary from https://adoptopenjdk.net/releases.html -->
<unzip src="${project.build.directory}/OpenJDK11U-jre_x86-32_windows_hotspot_11.0.18_10.zip" dest="${project.build.directory}/jre_tmp/" />
<unzip dest="${project.build.directory}/jre_tmp/" src="${project.build.directory}/OpenJDK11U-jre_x86-32_windows_hotspot_11.0.18_10.zip"/>
<move todir="${project.build.directory}/jre-windows/">
<fileset dir="${project.build.directory}/jre_tmp/jdk-11.0.18+10-jre/">
<include name="**/*" />
<include name="**/*"/>
</fileset>
</move>

<delete includeemptydirs="true">
<fileset dir="${project.build.directory}/jre_tmp/">
</fileset>
<fileset dir="${project.build.directory}/jre_tmp/"/>
</delete>
</tasks>
</target>
</configuration>
</execution>
</executions>
</plugin>


<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
<id>make-assembly</id> <!-- this is used for inheritance merges -->
<phase>package</phase> <!-- append to the packaging phase. -->
<id>make-assembly</id>
<!-- this is used for inheritance merges -->
<phase>package</phase>
<!-- append to the packaging phase. -->
<goals>
<goal>single</goal> <!-- goals == mojos -->
<goal>single</goal>
<!-- goals == mojos -->
</goals>
<configuration>
<filters>
Expand Down Expand Up @@ -112,25 +106,24 @@
</plugin>
</plugins>
</build>

<dependencies>
<dependency>
<groupId>uk.gov.nationalarchives</groupId>
<artifactId>droid-command-line</artifactId>
<version>${project.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<dependency>
<groupId>uk.gov.nationalarchives</groupId>
<artifactId>droid-ui</artifactId>
<version>${project.version}</version>
<scope>runtime</scope>
</dependency>
</dependency>
<dependency>
<groupId>uk.gov.nationalarchives</groupId>
<artifactId>droid-tools</artifactId>
<version>${project.version}</version>
<scope>runtime</scope>
</dependency>
</dependencies>
</project>
</dependencies>
</project>

0 comments on commit e2c6515

Please sign in to comment.