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/26 10:38:53 UTC
svn commit: r797878 - in /incubator/wink/trunk: pom.xml src.xml
wink-scripts/wink-dist/bin.xml wink-scripts/wink-dist/dist.xml
wink-scripts/wink-dist/pom.xml wink-scripts/wink-dist/src.xml
Author: martins
Date: Sun Jul 26 08:38:52 2009
New Revision: 797878
URL: http://svn.apache.org/viewvc?rev=797878&view=rev
Log:
Build Wink sources and binaries archives from distribution module, that will be deployed under
new artifact called apache-wink
Added:
incubator/wink/trunk/wink-scripts/wink-dist/bin.xml
- copied unchanged from r797002, incubator/wink/trunk/wink-scripts/wink-dist/dist.xml
incubator/wink/trunk/wink-scripts/wink-dist/src.xml
Removed:
incubator/wink/trunk/src.xml
incubator/wink/trunk/wink-scripts/wink-dist/dist.xml
Modified:
incubator/wink/trunk/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=797878&r1=797877&r2=797878&view=diff
==============================================================================
--- incubator/wink/trunk/pom.xml (original)
+++ incubator/wink/trunk/pom.xml Sun Jul 26 08:38:52 2009
@@ -621,25 +621,7 @@
</execution>
</executions>
</plugin>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <inherited>false</inherited>
- <configuration>
- <finalName>${artifactId}-${version}-src</finalName>
- <descriptors>
- <descriptor>src.xml</descriptor>
- </descriptors>
- </configuration>
- <executions>
- <execution>
- <phase>verify</phase>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
+ </plugins>
</build>
<!--
properties>
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=797878&r1=797877&r2=797878&view=diff
==============================================================================
--- incubator/wink/trunk/wink-scripts/wink-dist/pom.xml (original)
+++ incubator/wink/trunk/wink-scripts/wink-dist/pom.xml Sun Jul 26 08:38:52 2009
@@ -20,12 +20,12 @@
<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>
- <artifactId>wink-dist</artifactId>
+ <artifactId>apache-wink</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>
+ <target.zip>target/apache-wink-${project.version}.zip</target.zip>
+ <target.jar>target/dist/apache-wink-${project.version}/dist/apache-wink-${project.version}.jar</target.jar>
</properties>
<parent>
<groupId>org.apache.wink</groupId>
@@ -139,10 +139,13 @@
</configuration>
</plugin>
<plugin>
- <artifactId>maven-assembly-plugin</artifactId>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.2-beta-3</version>
<configuration>
<descriptors>
- <descriptor>dist.xml</descriptor>
+ <descriptor>bin.xml</descriptor>
+ <descriptor>src.xml</descriptor>
</descriptors>
</configuration>
<executions>
Added: incubator/wink/trunk/wink-scripts/wink-dist/src.xml
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-scripts/wink-dist/src.xml?rev=797878&view=auto
==============================================================================
--- incubator/wink/trunk/wink-scripts/wink-dist/src.xml (added)
+++ incubator/wink/trunk/wink-scripts/wink-dist/src.xml Sun Jul 26 08:38:52 2009
@@ -0,0 +1,55 @@
+<?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.
+-->
+
+
+<assembly>
+ <id>src</id>
+ <formats>
+ <format>zip</format>
+ <format>tar.gz</format>
+ </formats>
+ <fileSets>
+ <fileSet>
+ <directory>../..</directory>
+ <useDefaultExcludes>true</useDefaultExcludes>
+ <outputDirectory>apache-wink-${project.version}-src</outputDirectory>
+ <excludes>
+ <exclude>**/target</exclude>
+ <exclude>**/target/**</exclude>
+ <exclude>**/site</exclude>
+ <exclude>**/site/**</exclude>
+ <exclude>**/assembly</exclude>
+ <exclude>**/assembly/**</exclude>
+ <exclude>**/wink-scripts</exclude>
+ <exclude>src/**</exclude>
+ </excludes>
+ </fileSet>
+ <fileSet>
+ <directory>../../src/doc</directory>
+ <useDefaultExcludes>true</useDefaultExcludes>
+ <outputDirectory>apache-wink-${project.version}-src</outputDirectory>
+ <includes>
+ <include>DISCLAIMER.txt</include>
+ <include>LICENSE.txt</include>
+ <include>NOTICE.txt</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+</assembly>
\ No newline at end of file