#101 - Removed build steps to create a distribution ZIP.
This commit is contained in:
Oliver Gierke
@@ -83,25 +83,9 @@
|
||||
<bundlor.enabled>true</bundlor.enabled>
|
||||
<bundlor.failOnWarnings>true</bundlor.failOnWarnings>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
<project.type>single</project.type>
|
||||
<project.root>${basedir}</project.root>
|
||||
<source.level>1.6</source.level>
|
||||
|
||||
<dist.id>${project.artifactId}</dist.id>
|
||||
<dist.name>${project.name}</dist.name>
|
||||
<dist.releaseType>snapshot</dist.releaseType>
|
||||
<dist.bucketName>dist.springframework.org</dist.bucketName>
|
||||
<dist.assemblyName>${dist.id}-${project.version}</dist.assemblyName>
|
||||
<dist.fileName>${dist.assemblyName}.zip</dist.fileName>
|
||||
<dist.filePath>${project.build.directory}/${dist.assemblyName}-distribution.zip</dist.filePath>
|
||||
<dist.version>${project.version}</dist.version>
|
||||
|
||||
<!-- Additional properties required to be set by child projects -->
|
||||
<!-- dist.key: the distribution key (e.g. DATACMNS) -->
|
||||
|
||||
<!-- Additional properties required to be set in settings.xml -->
|
||||
<!-- dist.accessKey -->
|
||||
<!-- dist.secretKey -->
|
||||
|
||||
<apt>1.1.2</apt>
|
||||
<aspectj>1.8.1</aspectj>
|
||||
@@ -282,18 +266,6 @@
|
||||
<plugin>
|
||||
<artifactId>maven-antrun-plugin</artifactId>
|
||||
<version>1.7</version>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>org.springframework.build</groupId>
|
||||
<artifactId>org.springframework.build.aws.ant</artifactId>
|
||||
<version>3.0.6.RELEASE</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.jets3t</groupId>
|
||||
<artifactId>com.springsource.org.jets3t</artifactId>
|
||||
<version>0.8.1</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
<executions>
|
||||
|
||||
<execution>
|
||||
@@ -359,21 +331,6 @@
|
||||
<goal>run</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
<execution>
|
||||
<id>upload-distribution</id>
|
||||
<phase>deploy</phase>
|
||||
<goals>
|
||||
<goal>run</goal>
|
||||
</goals>
|
||||
<configuration>
|
||||
<target>
|
||||
<ant antfile="${shared.resources}/ant/upload-dist.xml">
|
||||
<target name="upload-distribution"/>
|
||||
</ant>
|
||||
</target>
|
||||
<failOnError>false</failOnError>
|
||||
</configuration>
|
||||
</execution>
|
||||
</executions>
|
||||
|
||||
</plugin>
|
||||
@@ -448,19 +405,6 @@
|
||||
<artifactId>maven-assembly-plugin</artifactId>
|
||||
<version>2.4</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>distribution</id>
|
||||
<goals>
|
||||
<goal>single</goal>
|
||||
</goals>
|
||||
<phase>package</phase>
|
||||
<configuration>
|
||||
<descriptors>
|
||||
<descriptor>${shared.resources}/assemblies/distribution-${project.type}.xml</descriptor>
|
||||
</descriptors>
|
||||
<finalName>${dist.assemblyName}</finalName>
|
||||
</configuration>
|
||||
</execution>
|
||||
<execution>
|
||||
<id>static</id>
|
||||
<goals>
|
||||
@@ -530,20 +474,6 @@
|
||||
</build>
|
||||
</profile>
|
||||
|
||||
<profile>
|
||||
<id>milestone</id>
|
||||
<properties>
|
||||
<dist.releaseType>milestone</dist.releaseType>
|
||||
</properties>
|
||||
</profile>
|
||||
|
||||
<profile>
|
||||
<id>release</id>
|
||||
<properties>
|
||||
<dist.releaseType>release</dist.releaseType>
|
||||
</properties>
|
||||
</profile>
|
||||
|
||||
<profile>
|
||||
|
||||
<id>spring4-next</id>
|
||||
|
||||
@@ -1,19 +0,0 @@
|
||||
<?xml version="1.0"?>
|
||||
<project name="upload-dist-tasks">
|
||||
<taskdef resource="org/springframework/build/aws/ant/antlib.xml" />
|
||||
<target name="upload-distribution">
|
||||
<checksum file="${dist.filePath}" algorithm="sha1"/>
|
||||
<s3 accessKey="${dist.accessKey}" secretKey="${dist.secretKey}">
|
||||
<upload bucketName="${dist.bucketName}" file="${dist.filePath}"
|
||||
toFile="${dist.releaseType}/${dist.key}/${dist.fileName}" publicRead="true">
|
||||
<metadata name="project.name" value="${dist.name}"/>
|
||||
<metadata name="release.type" value="${dist.releaseType}"/>
|
||||
<metadata name="bundle.version" value="${dist.version}"/>
|
||||
<metadata name="package.file.name" value="${dist.fileName}"/>
|
||||
</upload>
|
||||
<upload bucketName="${dist.bucketName}" file="${dist.filePath}.sha1"
|
||||
toFile="${dist.releaseType}/${dist.key}/${dist.fileName}.sha1" publicRead="true">
|
||||
</upload>
|
||||
</s3>
|
||||
</target>
|
||||
</project>
|
||||
@@ -1,30 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
|
||||
<id>distribution</id>
|
||||
<formats>
|
||||
<format>zip</format>
|
||||
</formats>
|
||||
<includeBaseDirectory>true</includeBaseDirectory>
|
||||
<componentDescriptors>
|
||||
<componentDescriptor>resources.xml</componentDescriptor>
|
||||
</componentDescriptors>
|
||||
<moduleSets>
|
||||
<moduleSet>
|
||||
<useAllReactorProjects>true</useAllReactorProjects>
|
||||
<binaries>
|
||||
<outputDirectory>dist</outputDirectory>
|
||||
<includeDependencies>false</includeDependencies>
|
||||
<unpack>false</unpack>
|
||||
</binaries>
|
||||
</moduleSet>
|
||||
<moduleSet>
|
||||
<useAllReactorProjects>true</useAllReactorProjects>
|
||||
<binaries>
|
||||
<attachmentClassifier>sources</attachmentClassifier>
|
||||
<outputDirectory>src</outputDirectory>
|
||||
<includeDependencies>false</includeDependencies>
|
||||
<unpack>false</unpack>
|
||||
</binaries>
|
||||
</moduleSet>
|
||||
</moduleSets>
|
||||
</assembly>
|
||||
@@ -1,24 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
|
||||
<id>distribution</id>
|
||||
<formats>
|
||||
<format>zip</format>
|
||||
</formats>
|
||||
<includeBaseDirectory>true</includeBaseDirectory>
|
||||
<componentDescriptors>
|
||||
<componentDescriptor>resources.xml</componentDescriptor>
|
||||
</componentDescriptors>
|
||||
<files>
|
||||
<file>
|
||||
<source>target/${project.artifactId}-${project.version}.jar</source>
|
||||
<outputDirectory>dist</outputDirectory>
|
||||
<fileMode>0644</fileMode>
|
||||
</file>
|
||||
<file>
|
||||
<source>target/${project.artifactId}-${project.version}-sources.jar</source>
|
||||
<outputDirectory>sources</outputDirectory>
|
||||
<fileMode>0644</fileMode>
|
||||
</file>
|
||||
</files>
|
||||
|
||||
</assembly>
|
||||
@@ -2,8 +2,8 @@
|
||||
<component xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/component/1.1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/component/1.1.2 http://maven.apache.org/xsd/component-1.1.2.xsd">
|
||||
<fileSets>
|
||||
<fileSet>
|
||||
<!--
|
||||
Adds readme and other textfiles to the root of the distribution archive.
|
||||
<!--
|
||||
Adds readme and other textfiles to the root of the distribution archive.
|
||||
-->
|
||||
<directory>${project.root}/src/main/resources</directory>
|
||||
<includes>
|
||||
@@ -16,16 +16,16 @@
|
||||
<lineEnding>dos</lineEnding>
|
||||
</fileSet>
|
||||
<fileSet>
|
||||
<!--
|
||||
Adds reference manual (html and pdf) to the distribution archive
|
||||
under the 'docs/reference' directory see pom.xml 'maven-javadoc-plugin' declaration.
|
||||
<!--
|
||||
Adds reference manual (html and pdf) to the distribution archive
|
||||
under the 'docs/reference' directory see pom.xml 'maven-javadoc-plugin' declaration.
|
||||
-->
|
||||
<directory>${project.root}/target/site/reference</directory>
|
||||
<outputDirectory>docs/reference</outputDirectory>
|
||||
</fileSet>
|
||||
<fileSet>
|
||||
<!--
|
||||
Adds javadoc html to the distribution archive under the 'docs/javadoc'
|
||||
<!--
|
||||
Adds javadoc html to the distribution archive under the 'docs/javadoc'
|
||||
directory see pom.xml 'maven-javadoc-plugin' declaration.
|
||||
-->
|
||||
<directory>${project.root}/target/site/apidocs</directory>
|
||||
|
||||
@@ -7,8 +7,8 @@
|
||||
<includeBaseDirectory>false</includeBaseDirectory>
|
||||
<fileSets>
|
||||
<fileSet>
|
||||
<!--
|
||||
Adds readme and other textfiles to the root of the distribution archive.
|
||||
<!--
|
||||
Adds readme and other textfiles to the root of the distribution archive.
|
||||
-->
|
||||
<directory>${project.root}/src/main/resources</directory>
|
||||
<includes>
|
||||
@@ -18,16 +18,16 @@
|
||||
<lineEnding>dos</lineEnding>
|
||||
</fileSet>
|
||||
<fileSet>
|
||||
<!--
|
||||
Adds reference manual (html and pdf) to the distribution archive
|
||||
under the 'docs/reference' directory see pom.xml 'maven-javadoc-plugin' declaration.
|
||||
<!--
|
||||
Adds reference manual (html and pdf) to the distribution archive
|
||||
under the 'docs/reference' directory see pom.xml 'maven-javadoc-plugin' declaration.
|
||||
-->
|
||||
<directory>${project.root}/target/site/reference</directory>
|
||||
<outputDirectory>reference</outputDirectory>
|
||||
</fileSet>
|
||||
<fileSet>
|
||||
<!--
|
||||
Adds javadoc html to the distribution archive under the 'docs/javadoc'
|
||||
<!--
|
||||
Adds javadoc html to the distribution archive under the 'docs/javadoc'
|
||||
directory see pom.xml 'maven-javadoc-plugin' declaration.
|
||||
-->
|
||||
<directory>${project.root}/target/site/apidocs</directory>
|
||||
|
||||
Reference in New Issue
Block a user