Spring/spring-tools
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

extracted repo creation into separate project and reduced unnecessary zip work

Browse Source
This commit is contained in:
Martin Lippert
2016-12-05 14:51:57 +01:00
parent 65352534e1
commit 2ef4f82c3d
4 changed files with 236 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

120
eclipse-distribution/org.springframework.boot.ide.product.e47/pom.xml
View File

@@ -22,6 +22,26 @@
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
<executions>
<execution>
<id>default-install</id>
<phase>none</phase>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-p2-repository-plugin</artifactId>
<version>${tycho-version}</version>
<configuration>
<includeAllDependencies>false</includeAllDependencies>
</configuration>
</plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-p2-publisher-plugin</artifactId>
@@ -100,78 +120,6 @@
</goals>
</execution>
<execution>
<id>zip-sts-repository</id>
<phase>install</phase>
<configuration>
<target>
<taskdef resource="net/sf/antcontrib/antcontrib.properties" />
<taskdef resource="org/springframework/build/aws/ant/antlib.xml" />
<property name="dist.full.version" value="${unqualifiedVersion}.${p2.qualifier}-${dist.target}" />
<property name="dist.file.name" value="${dist.project}-${dist.full.version}-updatesite.zip" />
<zip zipfile="${project.build.directory}/repository/${dist.file.name}" filesonly="true">
<zipfileset
dir="${project.build.directory}/repository">
<exclude name="*.zip" />
<exclude name="**/*.gz" />
</zipfileset>
</zip>
<checksum file="${project.build.directory}/repository/${dist.file.name}" algorithm="SHA1" fileext=".sha1" />
<checksum file="${project.build.directory}/repository/${dist.file.name}" algorithm="MD5" fileext=".md5" />
</target>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
<execution>
<id>upload-sts-repository</id>
<phase>deploy</phase>
<configuration>
<target>
<taskdef resource="net/sf/antcontrib/antcontrib.properties" />
<taskdef resource="org/springframework/build/aws/ant/antlib.xml" />
<s3 accessKey="${dist.accessKey}" secretKey="${dist.secretKey}">
<delete bucketName="${dist.bucket}">
<fileset dir="${dist.path.repo}">
<include name="site.xml" />
<include name="content.jar" />
<include name="artifacts.jar" />
<include name="plugins/**" />
<include name="features/**" />
<include name="binary/**" />
<include name="*.zip" />
<include name="*.sha1" />
<include name="*.md5" />
</fileset>
</delete>
<upload bucketName="${dist.bucket}" toDir="${dist.path.repo}" publicRead="true">
<fileset
dir="${project.build.directory}/repository">
<include name="**/*" />
<include name="**" />
</fileset>
</upload>
</s3>
</target>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
<execution>
<id>upload-product-bundles</id>
<phase>deploy</phase>
@@ -181,8 +129,6 @@
<taskdef resource="net/sf/antcontrib/antcontrib.properties" />
<taskdef resource="org/springframework/build/aws/ant/antlib.xml" />
<property name="site.target.dir" value="${project.build.directory}" />
<s3 accessKey="${dist.accessKey}" secretKey="${dist.secretKey}">
<delete bucketName="${dist.bucket}">
@@ -198,7 +144,7 @@
<upload bucketName="${dist.bucket}" toDir="${dist.path.product}"
publicRead="true">
<fileset dir="${site.target.dir}">
<fileset dir="${project.build.directory}/products">
<include name="spring-boot-ide*.zip" />
<include name="spring-boot-ide*.zip.md5" />
<include name="spring-boot-ide*.zip.sha1" />
@@ -226,14 +172,14 @@
<taskdef resource="net/sf/antcontrib/antcontrib.properties" />
<taskdef resource="org/springframework/build/aws/ant/antlib.xml" />
<copy file="../../common/html/nightly-generic-snippet.html" tofile="../../common/html/sts4-nightly-${dist.target.major}.html"/>
<copy file="${project.build.directory}/../../common/html/nightly-generic-snippet.html" tofile="${project.build.directory}/../../common/html/sts4-nightly-${dist.target.major}.html"/>
<replace file="../../common/html/sts4-nightly-${dist.target.major}.html" token="@QUALIFIER@" value="${unqualifiedVersion}.${p2.qualifier}" summary="yes" />
<replace file="../../common/html/sts4-nightly-${dist.target.major}.html" token="@TARGET@" value="${dist.target}" summary="yes" />
<replace file="../../common/html/sts4-nightly-${dist.target.major}.html" token="@MAJOR-TARGET@" value="${dist.target.major}" summary="yes" />
<replace file="${project.build.directory}/../../common/html/sts4-nightly-${dist.target.major}.html" token="@QUALIFIER@" value="${unqualifiedVersion}.${p2.qualifier}" summary="yes" />
<replace file="${project.build.directory}/../../common/html/sts4-nightly-${dist.target.major}.html" token="@TARGET@" value="${dist.target}" summary="yes" />
<replace file="${project.build.directory}/../../common/html/sts4-nightly-${dist.target.major}.html" token="@MAJOR-TARGET@" value="${dist.target.major}" summary="yes" />
<s3 accessKey="${accessKey}" secretKey="${secretKey}">
<upload bucketName="${dist.bucket}" file="../../common/html/sts4-nightly-${dist.target.major}.html"
<upload bucketName="${dist.bucket}" file="${project.build.directory}/../../common/html/sts4-nightly-${dist.target.major}.html"
toFile="snapshot/STS4/sts4-nightly-${dist.target.major}.html" publicRead="true">
</upload>
</s3>
@@ -266,19 +212,5 @@
</plugins>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-packaging-plugin</artifactId>
<version>${tycho-version}</version>
<configuration>
<format>yyyyMMddHHmm-'${p2.qualifier}'-'${package.qualifierPrefix}'</format>
<archiveSite>true</archiveSite>
</configuration>
</plugin>
</plugins>
</pluginManagement>
</build>
</project>

58
eclipse-distribution/org.springframework.boot.ide.repository.e47/category.xml Normal file
View File

@@ -0,0 +1,58 @@
<?xml version="1.0" encoding="UTF-8"?>
<site pack200="true">
<description url="http://www.springsource.com/products/sts">
The Spring Boot Tool Suite description
</description>
<!-- Eclipse Integration Commons -->
<category-def name="Uncategorized" label="Uncategorized"/>
<category-def name="Core / Eclipse Integration Commons" label="Core / Eclipse Integration Commons"/>
<category-def name="Resources / Eclipse Integration Commons" label="Resources / Eclipse Integration Commons"/>
<feature
id="org.springsource.ide.eclipse.commons.quicksearch.feature"
version="0.0.0">
<category name="Core / Eclipse Integration Commons" />
</feature>
<!-- Spring IDE -->
<category-def name="Core / Spring IDE" label="Core / Spring IDE" />
<category-def name="Extensions / Spring IDE" label="Extensions / Spring IDE" />
<category-def name="Extensions (Incubation) / Spring IDE" label="Extensions (Incubation) / Spring IDE" />
<category-def name="Integrations / Spring IDE" label="Integrations / Spring IDE" />
<category-def name="Resources / Spring IDE" label="Resources / Spring IDE" />
<feature
id="org.springframework.ide.eclipse.boot.feature" version="0.0.0">
<category name="Extensions / Spring IDE" />
</feature>
<feature
id="org.springframework.ide.eclipse.boot.dash.feature" version="0.0.0">
<category name="Extensions / Spring IDE" />
</feature>
<feature
id="org.springframework.ide.eclipse.boot.feature.source" version="0.0.0">
<category name="Resources / Spring IDE" />
</feature>
<feature
id="org.springframework.ide.eclipse.boot.dash.feature.source" version="0.0.0">
<category name="Resources / Spring IDE" />
</feature>
<!-- Language Server -->
<category-def name="Spring Boot IDE Language Servers for Eclipse" label="Spring Boot IDE Language Servers for Eclipse"/>
<feature
id="org.springframework.boot.ide.cloudfoundry.server.feature" version="0.0.0">
<category name="Spring Boot IDE Language Servers for Eclipse" />
</feature>
<feature
id="org.springframework.boot.ide.properties.servers.feature" version="0.0.0">
<category name="Spring Boot IDE Language Servers for Eclipse" />
</feature>
</site>

140
eclipse-distribution/org.springframework.boot.ide.repository.e47/pom.xml Normal file
View File

@@ -0,0 +1,140 @@
<?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 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.springframework.boot.ide</groupId>
<artifactId>org.springframework.boot.ide</artifactId>
<version>4.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>org.springframework.boot.ide.repository</artifactId>
<packaging>eclipse-repository</packaging>
<properties>
<dist.accessKey>${accessKey}</dist.accessKey>
<dist.secretKey>${secretKey}</dist.secretKey>
</properties>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
<executions>
<execution>
<id>default-install</id>
<phase>none</phase>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.7</version>
<executions>
<execution>
<id>zip-sts-repository</id>
<phase>install</phase>
<configuration>
<target>
<taskdef resource="net/sf/antcontrib/antcontrib.properties" />
<taskdef resource="org/springframework/build/aws/ant/antlib.xml" />
<property name="dist.full.version" value="${unqualifiedVersion}.${p2.qualifier}-${dist.target}" />
<property name="dist.file.name" value="${dist.project}-${dist.full.version}-updatesite.zip" />
<zip zipfile="${project.build.directory}/repository/${dist.file.name}" filesonly="true">
<zipfileset
dir="${project.build.directory}/repository">
<exclude name="*.zip" />
<exclude name="**/*.gz" />
</zipfileset>
</zip>
<checksum file="${project.build.directory}/repository/${dist.file.name}" algorithm="SHA1" fileext=".sha1" />
<checksum file="${project.build.directory}/repository/${dist.file.name}" algorithm="MD5" fileext=".md5" />
</target>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
<execution>
<id>upload-sts-repository</id>
<phase>deploy</phase>
<configuration>
<target>
<taskdef resource="net/sf/antcontrib/antcontrib.properties" />
<taskdef resource="org/springframework/build/aws/ant/antlib.xml" />
<s3 accessKey="${dist.accessKey}" secretKey="${dist.secretKey}">
<delete bucketName="${dist.bucket}">
<fileset dir="${dist.path.repo}">
<include name="p2.index" />
<include name="site.xml" />
<include name="content.jar" />
<include name="artifacts.xml.xz" />
<include name="content.jar" />
<include name="content.xml.xz" />
<include name="plugins/**" />
<include name="features/**" />
<include name="binary/**" />
<include name="*.zip" />
<include name="*.sha1" />
<include name="*.md5" />
</fileset>
</delete>
<upload bucketName="${dist.bucket}" toDir="${dist.path.repo}" publicRead="true">
<fileset
dir="${project.build.directory}/repository">
<include name="**/*" />
<include name="**" />
</fileset>
</upload>
</s3>
</target>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
</executions>
<dependencies>
<dependency>
<groupId>org.springframework.build</groupId>
<artifactId>org.springframework.build.aws.ant</artifactId>
<version>3.1.0.RELEASE</version>
</dependency>
<dependency>
<groupId>net.java.dev.jets3t</groupId>
<artifactId>jets3t</artifactId>
<version>0.8.1</version>
</dependency>
<dependency>
<groupId>ant-contrib</groupId>
<artifactId>ant-contrib</artifactId>
<version>20020829</version>
</dependency>
</dependencies>
</plugin>
</plugins>
</build>
</project>

14
eclipse-distribution/pom.xml
View File

@@ -56,7 +56,7 @@
<dist.springide-pathpostfix>${dist.dependencies-version-path}</dist.springide-pathpostfix>
<dist.eclipse-integration-commons-version>${dist.dependencies-version-path}</dist.eclipse-integration-commons-version>
<tycho-version>0.25.0</tycho-version>
<tycho-version>0.26.0</tycho-version>
<encoding>UTF-8</encoding>
</properties>
@@ -153,6 +153,7 @@
</repositories>
<modules>
<module>org.springframework.boot.ide.product.e47</module>
<module>org.springframework.boot.ide.repository.e47</module>
</modules>
</profile>
@@ -263,6 +264,15 @@
</configuration>
</plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-p2-repository-plugin</artifactId>
<version>${tycho-version}</version>
<configuration>
<skipArchive>true</skipArchive>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jarsigner-plugin</artifactId>
@@ -342,7 +352,7 @@
<version>${tycho-version}</version>
<configuration>
<format>yyyyMMddHHmm-'${p2.qualifier}'</format>
<archiveSite>true</archiveSite>
<archiveSite>false</archiveSite>
<archive>
<addMavenDescriptor>false</addMavenDescriptor>
</archive>