Skip to content

Commit 221e0f9

Browse files
committed
# WARNING: head commit changed in the meantime
191: Allow non-double arguments for some Unit operations Task-Url: https://github.com/unitsofmeasurement/unit-api/issues/issues/191
1 parent eb7395f commit 221e0f9

1 file changed

Lines changed: 22 additions & 42 deletions

File tree

pom.xml

Lines changed: 22 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -683,7 +683,6 @@
683683
<report>team</report>
684684
<report>mailing-lists</report>
685685
<report>issue-management</report>
686-
687686
</reports>
688687
</reportSet>
689688
</reportSets>
@@ -784,55 +783,36 @@
784783
</activation>
785784
<build>
786785
<plugins>
787-
<!-- plugin>
788-
<groupId>org.codehaus.mojo</groupId>
789-
<artifactId>build-helper-maven-plugin</artifactId>
790-
<version>1.7</version>
786+
<plugin>
787+
<groupId>org.apache.maven.plugins</groupId>
788+
<artifactId>maven-antrun-plugin</artifactId>
791789
<executions>
792790
<execution>
793-
<id>add-source</id>
794-
<phase>generate-sources</phase>
791+
<phase>prepare-package</phase>
795792
<goals>
796-
<goal>add-source</goal>
793+
<goal>run</goal>
797794
</goals>
798795
<configuration>
799-
<sources>
800-
<source>src/etc/modules/core/jdk9</source>
801-
</sources>
796+
<target>
797+
<mkdir
798+
dir="${project.build.directory}/classes/META-INF/versions/${jdkOptionalVersion}" />
799+
<javac
800+
destdir="${project.build.directory}/classes/META-INF/versions/${jdkOptionalVersion}"
801+
srcdir="${project.basedir}/src/etc/modules/core/jdk${jdkOptionalVersion}"
802+
includeAntRuntime="false">
803+
804+
<!-- TODO: use release attribute instead after next plugin release.
805+
https://issues.apache.org/jira/browse/MANTRUN-214 -->
806+
<compilerarg
807+
line="--release=${jdkOptionalVersion} --patch-module java.measure.base=${project.build.directory}/classes" />
808+
</javac>
809+
</target>
802810
</configuration>
803811
</execution>
804812
</executions>
805-
</plugin -->
806-
<plugin>
807-
<groupId>org.apache.maven.plugins</groupId>
808-
<artifactId>maven-antrun-plugin</artifactId>
809-
<executions>
810-
<execution>
811-
<phase>prepare-package</phase>
812-
<goals>
813-
<goal>run</goal>
814-
</goals>
815-
<configuration>
816-
<target>
817-
<mkdir
818-
dir="${project.build.directory}/classes/META-INF/versions/${jdkOptionalVersion}" />
819-
<javac
820-
destdir="${project.build.directory}/classes/META-INF/versions/${jdkOptionalVersion}"
821-
srcdir="${project.basedir}/src/etc/modules/core/jdk${jdkOptionalVersion}"
822-
includeAntRuntime="false">
823-
824-
<!-- TODO: use release attribute instead after next plugin release.
825-
https://issues.apache.org/jira/browse/MANTRUN-214 -->
826-
<compilerarg
827-
line="--release=${jdkOptionalVersion} --patch-module java.measure.base=${project.build.directory}/classes" />
828-
</javac>
829-
</target>
830-
</configuration>
831-
</execution>
832-
</executions>
833-
</plugin>
834-
835-
<plugin>
813+
</plugin>
814+
815+
<plugin>
836816
<artifactId>maven-jar-plugin</artifactId>
837817
<configuration>
838818
<archive>

0 commit comments

Comments
 (0)