Skip to content
This repository has been archived by the owner on Jul 13, 2022. It is now read-only.

Commit

Permalink
adapt to new s3 global vars
Browse files Browse the repository at this point in the history
  • Loading branch information
@martinlippert
martinlippert committed Dec 1, 2021
1 parent 58c9082 commit 590de53
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 80 deletions.
52 changes: 12 additions & 40 deletions org.springsource.ide.eclipse.commons.site-e44/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,44 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<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 https://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.springsource.ide.eclipse.commons</groupId>
<artifactId>org.springsource.ide.eclipse.commons.parent</artifactId>
<version>3.9.19-SNAPSHOT</version>
</parent>
<artifactId>org.springsource.ide.eclipse.commons.site</artifactId>
<packaging>eclipse-repository</packaging>
<name>Eclipse Integration Commons</name>

<properties>
<dist.accessKey>${accessKey}</dist.accessKey>
<dist.secretKey>${secretKey}</dist.secretKey>
</properties>
<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 https://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.springsource.ide.eclipse.commons</groupId>
<artifactId>org.springsource.ide.eclipse.commons.parent</artifactId>
<version>3.9.19-SNAPSHOT</version>
</parent>
<artifactId>org.springsource.ide.eclipse.commons.site</artifactId>
<packaging>eclipse-repository</packaging>
<name>Eclipse Integration Commons</name>

<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>properties-maven-plugin</artifactId>
<version>1.0-alpha-2</version>
<executions>
<execution>
<phase>initialize</phase>
<goals>
<goal>read-project-properties</goal>
</goals>
<configuration>
<quiet>true</quiet>
<files>
<file>${dist.properties}</file>
</files>
</configuration>
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
Expand Down Expand Up @@ -89,8 +62,7 @@
</fileset>
</upload>

<upload bucketName="${dist.bucket}" file="${dist.full.path}" toFile="${dist.path}/${dist.file.name}"
publicRead="true">
<upload bucketName="${dist.bucket}" file="${dist.full.path}" toFile="${dist.path}/${dist.file.name}" publicRead="true">
<metadata name="project.name" value="${dist.name}" />
<metadata name="release.type" value="${dist.type}" />
<metadata name="bundle.version" value="${dist.full.version}" />
Expand Down Expand Up @@ -126,4 +98,4 @@
</plugins>
</build>

</project>
</project>
51 changes: 12 additions & 39 deletions org.springsource.ide.eclipse.commons.site/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,43 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<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 https://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.springsource.ide.eclipse.commons</groupId>
<artifactId>org.springsource.ide.eclipse.commons.parent</artifactId>
<version>3.9.19-SNAPSHOT</version>
</parent>
<artifactId>org.springsource.ide.eclipse.commons.site</artifactId>
<packaging>eclipse-repository</packaging>
<name>Eclipse Integration Commons</name>

<properties>
<dist.accessKey>${accessKey}</dist.accessKey>
<dist.secretKey>${secretKey}</dist.secretKey>
</properties>
<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 https://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.springsource.ide.eclipse.commons</groupId>
<artifactId>org.springsource.ide.eclipse.commons.parent</artifactId>
<version>3.9.19-SNAPSHOT</version>
</parent>
<artifactId>org.springsource.ide.eclipse.commons.site</artifactId>
<packaging>eclipse-repository</packaging>
<name>Eclipse Integration Commons</name>

<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>properties-maven-plugin</artifactId>
<version>1.0-alpha-2</version>
<executions>
<execution>
<phase>initialize</phase>
<goals>
<goal>read-project-properties</goal>
</goals>
<configuration>
<quiet>true</quiet>
<files>
<file>${dist.properties}</file>
</files>
</configuration>
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand Down Expand Up @@ -89,8 +63,7 @@
</fileset>
</upload>

<upload bucketName="${dist.bucket}" file="${dist.full.path}" toFile="${dist.path}/${dist.file.name}"
publicRead="true">
<upload bucketName="${dist.bucket}" file="${dist.full.path}" toFile="${dist.path}/${dist.file.name}" publicRead="true">
<metadata name="project.name" value="${dist.name}" />
<metadata name="release.type" value="${dist.type}" />
<metadata name="bundle.version" value="${dist.full.version}" />
Expand Down Expand Up @@ -126,4 +99,4 @@
</plugins>
</build>

</project>
</project>
4 changes: 3 additions & 1 deletion pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,9 @@
<dist.platform.version></dist.platform.version>
<dist.platform.id></dist.platform.id>
<dist.target></dist.target>
<dist.properties>dist.properties</dist.properties>

<dist.accessKey>${env.bamboo_tools_s3_accesskey_password}</dist.accessKey>
<dist.secretKey>${env.bamboo_tools_s3_secretkey_password}</dist.secretKey>

<dist.pathpostfix>nightly</dist.pathpostfix>
<dist.path>${dist.type}/${dist.key}/${dist.project}/${dist.pathpostfix}</dist.path>
Expand Down

0 comments on commit 590de53

Please sign in to comment.