diff options
| author | Andrew Johnson | 2020-11-01 10:18:51 +0000 |
|---|---|---|
| committer | Andrew Johnson | 2020-11-01 10:18:51 +0000 |
| commit | db97c0814ac4b080c5bfa6040ead085f13a8fb12 (patch) | |
| tree | d3a99f27b37b8954e15fe227f876762ff427f01c | |
| parent | ae9460ce61112d8d31ced4a99711bef74ffe1560 (diff) | |
| download | org.eclipse.mat-db97c0814ac4b080c5bfa6040ead085f13a8fb12.tar.gz org.eclipse.mat-db97c0814ac4b080c5bfa6040ead085f13a8fb12.tar.xz org.eclipse.mat-db97c0814ac4b080c5bfa6040ead085f13a8fb12.zip | |
568417: Build changes for migration of MAT JIPP to new CI infrastructure
Try using Maven Wagon
Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=568417
Change-Id: I4c5c69a99fbcdc3214bff1d3bf6bea5b7d25c800
| -rw-r--r-- | org.eclipse.mat.product/pom.xml | 36 | ||||
| -rw-r--r-- | org.eclipse.mat.updatesite/pom.xml | 34 | ||||
| -rw-r--r-- | parent/pom.xml | 11 |
3 files changed, 79 insertions, 2 deletions
diff --git a/org.eclipse.mat.product/pom.xml b/org.eclipse.mat.product/pom.xml index bb870390..1b1eb43d 100644 --- a/org.eclipse.mat.product/pom.xml +++ b/org.eclipse.mat.product/pom.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (c) 2010, 2011 SAP AG. All rights reserved. This program and the
+<!-- Copyright (c) 2010, 2020 SAP AG and IBM Corporation. All rights reserved. This program and the
accompanying materials are made available under the terms of the Eclipse
Public License v1.0 which accompanies this distribution, and is available
at http://www.eclipse.org/legal/epl-v10.html Contributors: SAP AG - initial
@@ -96,6 +96,7 @@ </target>
</configuration>
</execution>
+ <!--
<execution>
<id>publish</id>
<phase>install</phase>
@@ -118,6 +119,7 @@ </target>
</configuration>
</execution>
+ -->
</executions>
</plugin>
<plugin>
@@ -179,6 +181,38 @@ </execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>wagon-maven-plugin</artifactId>
+ <version>2.0.0</version>
+ <executions>
+ <execution>
+ <id>publish-prepare</id>
+ <phase>install</phase>
+ <goals>
+ <goal>sshexec</goal>
+ </goals>
+ <configuration>
+ <url>scpexe://${download-remote-publish-rcp-path}</url>
+ <commands>
+ <command>rm ${download-publish-rcp-path}/*</command>
+ </commands>
+ </configuration>
+ </execution>
+ <execution>
+ <id>publish</id>
+ <phase>install</phase>
+ <goals>
+ <goal>upload</goal>
+ </goals>
+ <configuration>
+ <fromDir>target/products</fromDir>
+ <includes>*.zip,*.dmg</includes>
+ <url>scpexe://${${download-remote-publish-rcp-path}</url>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</profile>
diff --git a/org.eclipse.mat.updatesite/pom.xml b/org.eclipse.mat.updatesite/pom.xml index b662d53e..6e6be249 100644 --- a/org.eclipse.mat.updatesite/pom.xml +++ b/org.eclipse.mat.updatesite/pom.xml @@ -18,6 +18,7 @@ <id>build-server</id>
<build>
<plugins>
+ <!--
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
@@ -46,6 +47,39 @@ </execution>
</executions>
</plugin>
+ -->
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>wagon-maven-plugin</artifactId>
+ <version>2.0.0</version>
+ <executions>
+ <execution>
+ <id>deploy-prepare</id>
+ <phase>install</phase>
+ <goals>
+ <goal>sshexec</goal>
+ </goals>
+ <configuration>
+ <url>scpexe://${download-remote-publish-path}</url>
+ <commands>
+ <command>rm ${download-publish-path}/*</command>
+ </commands>
+ </configuration>
+ </execution>
+ <execution>
+ <id>deploy</id>
+ <phase>install</phase>
+ <goals>
+ <goal>upload</goal>
+ </goals>
+ <configuration>
+ <fromDir>target/repository</fromDir>
+ <includes>**</includes>
+ <url>scpexe://${${download-remote-publish-path}</url>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</profile>
diff --git a/parent/pom.xml b/parent/pom.xml index 49e4f4fd..e29a7c6f 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -19,7 +19,9 @@ <tycho-version>1.7.0</tycho-version>
<signer-input-directory>/home/data/httpd/download-staging.priv/tools/mat</signer-input-directory>
<download-publish-path>/home/data/httpd/download.eclipse.org/mat/snapshots/update-site</download-publish-path>
- <download-publish-rcp-path>/home/data/httpd/download.eclipse.org/mat/snapshots/rcp</download-publish-rcp-path>
+ <download-remote-publish-path>genie.mat@projects-storage.eclipse.org:/home/data/httpd/download.eclipse.org/mat/snapshots/update-site</download-remote-publish-path>
+ <download-publish-rcp-path>genie.mat@projects-storage.eclipse.org:/home/data/httpd/download.eclipse.org/mat/snapshots/rcp</download-publish-rcp-path>
+ <download-remote-publish-rcp-path>/home/data/httpd/download.eclipse.org/mat/snapshots/rcp</download-remote-publish-rcp-path>
<!-- mat-target specifies which .target definition file will be used -->
<mat-target>mat-2020-03</mat-target>
<!-- mat-release-repo-url specifies from which p2 repo the MAT bundles
@@ -340,6 +342,13 @@ </plugin>
</plugins>
</pluginManagement>
+ <extensions>
+ <extension>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-ssh-external</artifactId>
+ <version>3.4.1</version>
+ </extension>
+ </extensions>
</build>
</project>
|