You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wink.apache.org by ma...@apache.org on 2009/07/07 12:48:53 UTC
svn commit: r791788 - in /incubator/wink/trunk: pom.xml wink-client/pom.xml
wink-scripts/wink-dist/pom.xml
Author: martins
Date: Tue Jul 7 10:48:53 2009
New Revision: 791788
URL: http://svn.apache.org/viewvc?rev=791788&view=rev
Log:
Issue [WINK-44] - add distribution configuration to WINK build
Modified:
incubator/wink/trunk/pom.xml
incubator/wink/trunk/wink-client/pom.xml
incubator/wink/trunk/wink-scripts/wink-dist/pom.xml
Modified: incubator/wink/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/pom.xml?rev=791788&r1=791787&r2=791788&view=diff
==============================================================================
--- incubator/wink/trunk/pom.xml (original)
+++ incubator/wink/trunk/pom.xml Tue Jul 7 10:48:53 2009
@@ -503,49 +503,6 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jxr-plugin</artifactId>
</plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <!--additionalJOption>-J-Xmx512m</additionalJOption-->
- <configuration>
- <excludePackageNames>${javadoc.exclude.patterns}</excludePackageNames>
- <maxmemory>1024m</maxmemory>
- <minmemory>512m</minmemory>
- <aggregate>${javadoc.aggregate}</aggregate>
- <groups>
- <group>
- <title>Common Packages</title>
- <packages>org.apache.wink.common*</packages>
- </group>
- <group>
- <title>Server Packages</title>
- <packages>org.apache.wink.server*</packages>
- </group>
- <group>
- <title>Client Packages</title>
- <packages>org.apache.wink.client*</packages>
- </group>
- <group>
- <title>Spring Support Packages</title>
- <packages>org.apache.wink.spring*</packages>
- </group>
- <group>
- <title>WebDAV Packages</title>
- <packages>org.apache.wink.webdav*</packages>
- </group>
-
- </groups>
- </configuration>
- <reportSets>
- <reportSet>
- <reports>
- <report>javadoc</report>
- <!-- <report>test-javadoc</report> -->
- </reports>
- </reportSet>
- </reportSets>
- </plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
@@ -607,17 +564,77 @@
This profile should be activated when we want to deploy a release
-->
<profile>
- <id>release</id>
+ <id>Hudson-main</id>
<activation>
<activeByDefault>false</activeByDefault>
<property>
<name>buildType</name>
- <value>release</value>
+ <value>Hudson</value>
</property>
</activation>
- <properties>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-sources</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <!--additionalJOption>-J-Xmx512m</additionalJOption-->
+ <configuration>
+ <excludePackageNames>${javadoc.exclude.patterns}</excludePackageNames>
+ <maxmemory>1024m</maxmemory>
+ <minmemory>512m</minmemory>
+ <aggregate>${javadoc.aggregate}</aggregate>
+ <groups>
+ <group>
+ <title>Common Packages</title>
+ <packages>org.apache.wink.common*</packages>
+ </group>
+ <group>
+ <title>Server Packages</title>
+ <packages>org.apache.wink.server*</packages>
+ </group>
+ <group>
+ <title>Client Packages</title>
+ <packages>org.apache.wink.client*</packages>
+ </group>
+ <group>
+ <title>Spring Support Packages</title>
+ <packages>org.apache.wink.spring*</packages>
+ </group>
+ <group>
+ <title>WebDAV Packages</title>
+ <packages>org.apache.wink.webdav*</packages>
+ </group>
+ </groups>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>javadoc</goal>
+ </goals>
+ <phase>package</phase>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ <!--
+ properties>
<distribution.deploy.directory>ast</distribution.deploy.directory>
- </properties>
+ </properties
+ -->
</profile>
</profiles>
<distributionManagement>
Modified: incubator/wink/trunk/wink-client/pom.xml
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-client/pom.xml?rev=791788&r1=791787&r2=791788&view=diff
==============================================================================
--- incubator/wink/trunk/wink-client/pom.xml (original)
+++ incubator/wink/trunk/wink-client/pom.xml Tue Jul 7 10:48:53 2009
@@ -36,40 +36,7 @@
<relativePath>../pom.xml</relativePath>
</parent>
<build>
- <plugins>
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <excludePackageNames>${javadoc.exclude.patterns}</excludePackageNames>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>javadoc</goal>
- </goals>
- <phase>package</phase>
- </execution>
- </executions>
- </plugin>
- <!-- create distribution zip -->
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptors>
- <descriptor>src/assembly/dist.xml</descriptor>
- </descriptors>
- </configuration>
- <executions>
- <execution>
- <phase>verify</phase>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
+ </build>
<!-- depending on the following jars -->
<dependencies>
<dependency>
Modified: incubator/wink/trunk/wink-scripts/wink-dist/pom.xml
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-scripts/wink-dist/pom.xml?rev=791788&r1=791787&r2=791788&view=diff
==============================================================================
--- incubator/wink/trunk/wink-scripts/wink-dist/pom.xml (original)
+++ incubator/wink/trunk/wink-scripts/wink-dist/pom.xml Tue Jul 7 10:48:53 2009
@@ -1,136 +1,149 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
+ <!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to you under the Apache License, Version
+ 2.0 (the "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0 Unless required by
+ applicable law or agreed to in writing, software distributed under the
+ License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+ CONDITIONS OF ANY KIND, either express or implied. See the License for
+ the specific language governing permissions and limitations under the
+ License.
+ -->
<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>
- <groupId>org.apache.wink</groupId>
- <artifactId>wink-dist</artifactId>
- <packaging>pom</packaging>
- <name>Wink Scripts :: Dist</name>
- <properties>
- <target.zip>target/wink-${project.version}.zip</target.zip>
- <target.jar>target/dist/wink-${project.version}/dist/wink-${project.version}.jar</target.jar>
- <module.relative.path>../../</module.relative.path>
- </properties>
- <parent>
- <groupId>org.apache.wink</groupId>
- <artifactId>wink-scripts</artifactId>
- <version>0.1-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>ant.dist</id>
- <phase>deploy</phase>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- <inherited>false</inherited>
- <configuration>
- <tasks>
- <typedef resource="org/apache/maven/artifact/ant/antlib.xml">
- <classpath refid="maven.dependency.classpath" />
- </typedef>
-
- <property name="file.separator" value="${file.separator}" />
- <property name="project.name" value="${parent.artifactId}-${parent.version}" />
- <property name="project.version" value="${project.version}" />
- <property name="artifact.id" value="${artifactId}" />
- <property name="group.id" value="${groupId}" />
- <property name="title.name" value="${project.name}" />
- <property name="user.name" value="${user.name}" />
- <property name="java.version" value="${java.version}" />
-
- <property name="target.zip" value="${target.zip}" />
-
- <ant antfile="build.xml">
- <target name="dist" />
- </ant>
- </tasks>
- </configuration>
- </plugin>
- <plugin>
- <!-- Deploys the distribution zip to the repository -->
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- <executions>
- <execution>
- <id>deploy-zip</id>
- <configuration>
- <file>${target.zip}</file>
- <url>${distributionManagement.repository.url}</url>
- <packaging>zip</packaging>
- <groupId>${groupId}</groupId>
- <artifactId>${artifactId}</artifactId>
- <version>${version}</version>
- <uniqueVersion>${distributionManagement.repository.uniqueVersion}</uniqueVersion>
- </configuration>
- <phase>deploy</phase>
- <goals>
- <goal>deploy-file</goal>
- </goals>
- </execution>
- <execution>
- <id>deploy-jar</id>
- <configuration>
- <file>${target.jar}</file>
- <url>${distributionManagement.repository.url}</url>
- <pomFile>../../pom.xml</pomFile>
- <packaging>jar</packaging>
- <groupId>${groupId}</groupId>
- <artifactId>wink</artifactId>
- <version>${version}</version>
- <uniqueVersion>${distributionManagement.repository.uniqueVersion}</uniqueVersion>
- </configuration>
- <phase>deploy</phase>
- <goals>
- <goal>deploy-file</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
- <profiles>
- <profile>
- <!-- Populates the file separator for the ANT script.
- Needed, since when ANT runs from maven, it doesn't receives the file separator from the environment.
- -->
- <activation>
- <os>
- <family>Windows</family>
- </os>
- </activation>
- <properties>
- <file.separator>\</file.separator>
- </properties>
- </profile>
- </profiles>
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.wink</groupId>
+ <artifactId>wink-dist</artifactId>
+ <packaging>pom</packaging>
+ <name>Wink Scripts :: Dist</name>
+ <properties>
+ <target.zip>target/wink-${project.version}.zip</target.zip>
+ <target.jar>target/dist/wink-${project.version}/dist/wink-${project.version}.jar</target.jar>
+ <module.relative.path>../../</module.relative.path>
+ </properties>
+ <parent>
+ <groupId>org.apache.wink</groupId>
+ <artifactId>wink-scripts</artifactId>
+ <version>0.1-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+ <build>
+ <plugins>
+ <plugin>
+ <!-- Deploys the distribution zip to the repository -->
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>deploy-zip</id>
+ <configuration>
+ <file>${target.zip}</file>
+ <url>${distributionManagement.repository.url}</url>
+ <packaging>zip</packaging>
+ <groupId>${groupId}</groupId>
+ <artifactId>${artifactId}</artifactId>
+ <version>${version}</version>
+ <uniqueVersion>${distributionManagement.repository.uniqueVersion}</uniqueVersion>
+ </configuration>
+ <phase>deploy</phase>
+ <goals>
+ <goal>deploy-file</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>deploy-jar</id>
+ <configuration>
+ <file>${target.jar}</file>
+ <url>${distributionManagement.repository.url}</url>
+ <pomFile>../../pom.xml</pomFile>
+ <packaging>jar</packaging>
+ <groupId>${groupId}</groupId>
+ <artifactId>wink</artifactId>
+ <version>${version}</version>
+ <uniqueVersion>${distributionManagement.repository.uniqueVersion}</uniqueVersion>
+ </configuration>
+ <phase>deploy</phase>
+ <goals>
+ <goal>deploy-file</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+ <profiles>
+ <profile>
+ <!--
+ Populates the file separator for the ANT script. Needed, since when
+ ANT runs from maven, it doesn't receives the file separator from the
+ environment.
+ -->
+ <activation>
+ <os>
+ <family>Windows</family>
+ </os>
+ </activation>
+ <properties>
+ <file.separator>\</file.separator>
+ </properties>
+ </profile>
+
+ <profile>
+ <id>Hudson-dist</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ <property>
+ <name>buildType</name>
+ <value>Hudson</value>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>ant.dist</id>
+ <phase>install</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ <inherited>false</inherited>
+ <configuration>
+ <tasks>
+ <typedef resource="org/apache/maven/artifact/ant/antlib.xml">
+ <classpath refid="maven.dependency.classpath" />
+ </typedef>
+ <property name="file.separator" value="${file.separator}" />
+ <property name="project.name" value="${parent.artifactId}-${parent.version}" />
+ <property name="project.version" value="${project.version}" />
+ <property name="artifact.id" value="${artifactId}" />
+ <property name="group.id" value="${groupId}" />
+ <property name="title.name" value="${project.name}" />
+ <property name="user.name" value="${user.name}" />
+ <property name="java.version" value="${java.version}" />
+ <property name="target.zip" value="${target.zip}" />
+ <ant antfile="build.xml">
+ <target name="dist" />
+ </ant>
+ </tasks>
+ </configuration>
+ </plugin>
+ </plugins>
+
+ </build>
+ </profile>
+
+ </profiles>
</project>