Author: gk
Date: Fri Mar 28 08:53:51 2014
New Revision: 1582639
URL: http://svn.apache.org/r1582639
Log:
Prepared modules-src artifact; using dependencySets in dist.xml; typo in README
Added:
turbine/fulcrum/trunk/json/dist/src/assembly/src.xml (with props)
Modified:
turbine/fulcrum/trunk/json/README
turbine/fulcrum/trunk/json/dist/pom.xml
turbine/fulcrum/trunk/json/dist/src/assembly/dist.xml
Modified: turbine/fulcrum/trunk/json/README
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/json/README?rev=1582639&r1=1582638&r2=1582639&view=diff
==============================================================================
--- turbine/fulcrum/trunk/json/README (original)
+++ turbine/fulcrum/trunk/json/README Fri Mar 28 08:53:51 2014
@@ -71,7 +71,7 @@ Steps
// Helpful hint from Apache Website: If you're located in Europe then
release:prepare may fail with 'Unable to tag SCM' and ' svn: No such revision X
'. Wait 10 seconds and run mvn release:prepare again.
4) Release Preparing
- // performs an upload to
repository.apache.org/service/local/staging/depoly/maven2/org/apache/fulcrum
+ // performs an upload to
repository.apache.org/service/local/staging/deploy/maven2/
mvn release:perform
More Information
Modified: turbine/fulcrum/trunk/json/dist/pom.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/json/dist/pom.xml?rev=1582639&r1=1582638&r2=1582639&view=diff
==============================================================================
--- turbine/fulcrum/trunk/json/dist/pom.xml (original)
+++ turbine/fulcrum/trunk/json/dist/pom.xml Fri Mar 28 08:53:51 2014
@@ -73,6 +73,7 @@
<configuration>
<descriptors>
<descriptor>src/assembly/dist.xml</descriptor>
+ <descriptor>src/assembly/src.xml</descriptor>
</descriptors>
</configuration>
</execution>
Modified: turbine/fulcrum/trunk/json/dist/src/assembly/dist.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/json/dist/src/assembly/dist.xml?rev=1582639&r1=1582638&r2=1582639&view=diff
==============================================================================
--- turbine/fulcrum/trunk/json/dist/src/assembly/dist.xml (original)
+++ turbine/fulcrum/trunk/json/dist/src/assembly/dist.xml Fri Mar 28 08:53:51
2014
@@ -26,19 +26,22 @@
<format>zip</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
- <moduleSets>
+ <dependencySets>
+ <dependencySet>
+ <includes>
+ <include>org.apache.fulcrum:fulcrum-json-*:jar:*</include>
+ </includes>
+ </dependencySet>
+ </dependencySets>
+ <!--moduleSets>
<moduleSet>
- <!-- Include all projects in the current multimodule build -->
<useAllReactorProjects>true</useAllReactorProjects>
- <!-- Select default -->
- <!--includes>
- </includes-->
<binaries>
<outputDirectory>/</outputDirectory>
<unpack>false</unpack>
</binaries>
</moduleSet>
- </moduleSets>
+ </moduleSets-->
<fileSets>
<fileSet>
<directory>${project.build.directory}/maven-shared-archive-resources/META-INF</directory>
Added: turbine/fulcrum/trunk/json/dist/src/assembly/src.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/json/dist/src/assembly/src.xml?rev=1582639&view=auto
==============================================================================
--- turbine/fulcrum/trunk/json/dist/src/assembly/src.xml (added)
+++ turbine/fulcrum/trunk/json/dist/src/assembly/src.xml Fri Mar 28 08:53:51
2014
@@ -0,0 +1,63 @@
+<?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
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0
http://maven.apache.org/xsd/assembly-1.1.0.xsd";>
+ <id>modules-src</id>
+ <formats>
+ <format>tar.gz</format>
+ <format>zip</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <moduleSets>
+ <moduleSet>
+ <useAllReactorProjects>true</useAllReactorProjects>
+ <excludes>
+ <exclude>org.apache.fulcrum:fulcrum-json-dist</exclude>
+ </excludes>
+ <sources>
+ <fileSets>
+ <fileSet>
+ <excludes>
+ <exclude>target/**</exclude>
+ </excludes>
+ </fileSet>
+ </fileSets>
+ </sources>
+ </moduleSet>
+ </moduleSets>
+ <fileSets>
+ <fileSet>
+
<directory>${project.build.directory}/maven-shared-archive-resources/META-INF</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>LICENSE*</include>
+ <include>NOTICE*</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>${basedir}</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>pom.xml</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+</assembly>
\ No newline at end of file
Propchange: turbine/fulcrum/trunk/json/dist/src/assembly/src.xml
------------------------------------------------------------------------------
svn:eol-style = native
