Browse Source

Fix publishing of POM-only modules (#17025)

Change-Id: I22c015cc333fd08a1bc3207ef51bcfc67399398c
tags/7.5.0.beta1
Henri Sara 9 years ago
parent
commit
7ee98ed43e
1 changed files with 48 additions and 16 deletions
  1. 48
    16
      publish.xml

+ 48
- 16
publish.xml View File

@@ -57,15 +57,33 @@
<property name="jar.file" location="result/artifacts/${vaadin.version}/vaadin-${module}/vaadin-${module}-${vaadin.version}.jar" />
<property name="pom.file" location="result/artifacts/${vaadin.version}/vaadin-${module}/vaadin-${module}-${vaadin.version}.pom" />

<artifact:mvn failonerror="true">
<arg value="gpg:sign-and-deploy-file" />
<sysproperty key="file" value="${jar.file}" />
<sysproperty key="pomFile" value="${pom.file}" />
<sysproperty key="repositoryId" value="${maven.snapshot.repository.id}" />
<sysproperty key="url" value="${maven.snapshot.repository.url}" />
<sysproperty key="gpg.passphrase" value="${gpg.passphrase}" />
<sysproperty key="retryFailedDeploymentCount" value="10" />
</artifact:mvn>
<antcontrib:if>
<available file="${jar.file}"/>
<then>
<artifact:mvn failonerror="true">
<arg value="gpg:sign-and-deploy-file" />
<sysproperty key="file" value="${jar.file}" />
<sysproperty key="pomFile" value="${pom.file}" />
<sysproperty key="repositoryId" value="${maven.snapshot.repository.id}" />
<sysproperty key="url" value="${maven.snapshot.repository.url}" />
<sysproperty key="gpg.passphrase" value="${gpg.passphrase}" />
<sysproperty key="retryFailedDeploymentCount" value="10" />
</artifact:mvn>
</then>
<else>
<artifact:mvn failonerror="true">
<arg value="gpg:sign-and-deploy-file" />
<sysproperty key="file" value="${pom.file}" />
<sysproperty key="pomFile" value="${pom.file}" />
<sysproperty key="generatePom" value="false" />
<sysproperty key="packaging" value="pom" />
<sysproperty key="repositoryId" value="${maven.snapshot.repository.id}" />
<sysproperty key="url" value="${maven.snapshot.repository.url}" />
<sysproperty key="gpg.passphrase" value="${gpg.passphrase}" />
<sysproperty key="retryFailedDeploymentCount" value="10" />
</artifact:mvn>
</else>
</antcontrib:if>
</target>

<!-- Use this to publish to local Maven repo -->
@@ -87,12 +105,26 @@
<property name="sources.file" location="result/artifacts/${vaadin.version}/vaadin-${module}/vaadin-${module}-${vaadin.version}-sources.jar" />
<property name="pom.file" location="result/artifacts/${vaadin.version}/vaadin-${module}/vaadin-${module}-${vaadin.version}.pom" />

<artifact:mvn failonerror="true">
<arg value="install:install-file" />
<sysproperty key="file" value="${jar.file}" />
<sysproperty key="pomFile" value="${pom.file}" />
<sysproperty key="javadoc" value="${javadoc.file}" />
<sysproperty key="sources" value="${sources.file}" />
</artifact:mvn>
<antcontrib:if>
<available file="${jar.file}"/>
<then>
<artifact:mvn failonerror="true">
<arg value="install:install-file" />
<sysproperty key="file" value="${jar.file}" />
<sysproperty key="pomFile" value="${pom.file}" />
<sysproperty key="javadoc" value="${javadoc.file}" />
<sysproperty key="sources" value="${sources.file}" />
</artifact:mvn>
</then>
<else>
<artifact:mvn failonerror="true">
<arg value="install:install-file" />
<sysproperty key="file" value="${pom.file}" />
<sysproperty key="pomFile" value="${pom.file}" />
<sysproperty key="generatePom" value="false" />
<sysproperty key="packaging" value="pom" />
</artifact:mvn>
</else>
</antcontrib:if>
</target>
</project>

Loading…
Cancel
Save