Permalink
Browse files

RESOLVED - bug 370420: remove assembly from site packaging

  • Loading branch information...
1 parent 93d8be5 commit c6319fc45c7552bd5c18dbc696e382257556ca3a @spingel spingel committed Mar 1, 2012
Showing with 51 additions and 84 deletions.
  1. +0 −13 org.eclipse.mylyn-site/assembly.xml
  2. +51 −71 org.eclipse.mylyn-site/pom.xml
@@ -1,13 +0,0 @@
-<assembly>
- <id>site</id>
- <formats>
- <format>zip</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <fileSets>
- <fileSet>
- <directory>${project.build.directory}/site</directory>
- <outputDirectory>/</outputDirectory>
- </fileSet>
- </fileSets>
-</assembly>
@@ -1,7 +1,7 @@
<?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">
+ 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.eclipse.mylyn</groupId>
@@ -22,38 +22,19 @@
<profile>
<id>hudson.eclipse.org</id>
<activation>
- <property>
+ <property>
<name>user.name</name>
<value>hudsonbuild</value>
- </property>
+ </property>
</activation>
- <properties>
- <dist.archive>/home/data/httpd/download.eclipse.org/mylyn/drops</dist.archive>
+ <properties>
+ <dist.archive>/home/data/httpd/download.eclipse.org/mylyn/drops</dist.archive>
</properties>
- </profile>
+ </profile>
</profiles>
<build>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-4</version>
- <configuration>
- <descriptors>
- <descriptor>assembly.xml</descriptor>
- </descriptors>
- </configuration>
- <executions>
- <execution>
- <id>make-assembly</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
<artifactId>maven-resources-plugin</artifactId>
<executions>
<execution>
@@ -69,60 +50,59 @@
<directory>.</directory>
<includes>
<include>index.html</include>
- <include>web/*</include>
+ <include>web/*</include>
</includes>
</resource>
</resources>
</configuration>
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <version>1.6</version>
- <executions>
- <execution>
- <id>pack-and-sign</id>
- <phase>install</phase>
- <configuration>
- <target>
- <ant antfile="pack-and-sign/build.xml">
- <property name="localRepository" value="${settings.localRepository}"/>
- <property name="projectDir" value="${project.build.directory}"/>
- <property name="signDir" value="${sign-dir}"/>
- <property name="archiveDir" value="${dist.archive}"/>
- <property name="siteDir" value="${dist.site}"/>
-
- <property name="mirrorsUrl" value="${mirrors-url}"/>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.6</version>
+ <executions>
+ <execution>
+ <id>pack-and-sign</id>
+ <phase>install</phase>
+ <configuration>
+ <target>
+ <ant antfile="pack-and-sign/build.xml">
+ <property name="localRepository" value="${settings.localRepository}"/>
+ <property name="projectDir" value="${project.build.directory}"/>
+ <property name="signDir" value="${sign-dir}"/>
+ <property name="archiveDir" value="${dist.archive}"/>
+ <property name="siteDir" value="${dist.site}"/>
- <property name="dist" value="mylyn"/>
- <property name="filter" value="mylyn"/>
- <property name="repositoryName" value="${dist.repository}"/>
- <property name="pack200" value="${dist.pack200}"/>
-
- <property name="skipSign" value="${sign.skip}"/>
- <property name="skipPack" value="${pack.skip}"/>
- <property name="skipPromote" value="${promote.skip}"/>
-
- <property name="version" value="${unqualifiedVersion}"/>
- <property name="qualifier" value="${buildQualifier}"/>
- </ant>
- <echo file="${project.build.directory}/version.properties">
- <![CDATA[
-${unqualifiedVersion}
-${buildQualifier}
-]]>
- </echo>
- </target>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
+ <property name="mirrorsUrl" value="${mirrors-url}"/>
+ <property name="dist" value="mylyn"/>
+ <property name="filter" value="mylyn"/>
+ <property name="repositoryName" value="${dist.repository}"/>
+ <property name="pack200" value="${dist.pack200}"/>
+
+ <property name="skipSign" value="${sign.skip}"/>
+ <property name="skipPack" value="${pack.skip}"/>
+ <property name="skipPromote" value="${promote.skip}"/>
+
+ <property name="version" value="${unqualifiedVersion}"/>
+ <property name="qualifier" value="${buildQualifier}"/>
+ </ant>
+ <echo file="${project.build.directory}/version.properties">
+ <![CDATA[
+ ${unqualifiedVersion}
+ ${buildQualifier}
+ ]]>
+ </echo>
+ </target>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</project>

0 comments on commit c6319fc

Please sign in to comment.