- Ported the changes from compiler to here ...
diff --git a/pom.xml b/pom.xml
index b2719f2..bc8b3b4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,7 +38,6 @@
<connection>scm:git:https://github.com/apache/royale-typedefs.git</connection>
<developerConnection>scm:git:https://github.com/apache/royale-typedefs.git</developerConnection>
<url>scm:git:https://github.com/apache/royale-typedefs.git</url>
- <tag>release/0.9.6</tag>
</scm>
<properties>
@@ -51,6 +50,8 @@
<royale.build-tools.version>1.1.0</royale.build-tools.version>
<royale.compiler.version>0.9.7-SNAPSHOT</royale.compiler.version>
+
+ <release-profiles>apache-release</release-profiles>
</properties>
<!-- Only configure the site distribution as the rest is handled by the apache parent -->
@@ -126,6 +127,28 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-release-plugin</artifactId>
+ <configuration>
+ <providerImplementations>
+ <git>jgit</git>
+ </providerImplementations>
+ <arguments combine.self="override">-P${release-profiles}</arguments>
+ </configuration>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.scm</groupId>
+ <artifactId>maven-scm-provider-jgit</artifactId>
+ <version>1.11.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.scm</groupId>
+ <artifactId>maven-scm-api</artifactId>
+ <version>1.11.2</version>
+ </dependency>
+ </dependencies>
+ </plugin>
</plugins>
<pluginManagement>
@@ -154,27 +177,17 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-release-plugin</artifactId>
- <version>2.5.3</version>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <version>2.8.2</version>
+ <!-- If deploying fails due to repo or network problems, retry the given number of times (1-10) -->
<configuration>
- <providerImplementations>
- <git>jgit</git>
- </providerImplementations>
- <!-- In case of a maven release, we want to build the distribution as well as the swfs -->
- <arguments>-Papache-release,royale-release ${arguments}</arguments>
+ <retryFailedDeploymentCount>6</retryFailedDeploymentCount>
</configuration>
- <dependencies>
- <dependency>
- <groupId>org.apache.maven.scm</groupId>
- <artifactId>maven-scm-provider-jgit</artifactId>
- <version>1.11.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.scm</groupId>
- <artifactId>maven-scm-api</artifactId>
- <version>1.11.2</version>
- </dependency>
- </dependencies>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-release-plugin</artifactId>
+ <version>3.0.0-M1</version>
</plugin>
<plugin>
<groupId>com.theoryinpractise</groupId>
@@ -220,7 +233,47 @@
-->
<profile>
<id>royale-release</id>
+ <properties>
+ <!-- Ensure the royale-release plugin is enabled when running release:perform -->
+ <release-profiles>apache-release,royale-release</release-profiles>
+ </properties>
+
+ <!-- Redirect the deployment to a local directory -->
+ <!-- Note: using the 'altReleaseDeploymentRepository' and alike were ignored in the release:perform phase -->
+ <distributionManagement>
+ <repository>
+ <id>apache.releases.https</id>
+ <name>Apache Release Distribution Repository</name>
+ <!--
+ 'maven.multiModuleProjectDirectory' is a property introduced with maven 3.3.1 ...
+ don't worry if your IDE is complaining.
+ Also this will be set to the 'target/checkout' directory the output will be in
+ 'target/local-release-dir'.
+ -->
+ <url>file://${maven.multiModuleProjectDirectory}/../local-release-dir</url>
+ </repository>
+ </distributionManagement>
+
<build>
+ <plugins>
+ <!-- Generate the effective poms for this build -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-help-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>generate-effective-pom</id>
+ <phase>compile</phase>
+ <goals>
+ <goal>effective-pom</goal>
+ </goals>
+ <configuration>
+ <output>${project.build.directory}/effective.pom</output>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
<pluginManagement>
<plugins>
<!-- We require the release manager to manually login an sign using his credentials -->
@@ -259,7 +312,6 @@
<configuration>
<preparationGoals>clean com.theoryinpractise:reproducible-maven-plugin:apply install</preparationGoals>
<completionGoals>com.theoryinpractise:reproducible-maven-plugin:clear</completionGoals>
- <goals>deploy</goals>
</configuration>
</plugin>
</plugins>
