Author: gk Date: Wed Mar 26 14:38:36 2014 New Revision: 1581866 URL: http://svn.apache.org/r1581866 Log: Reverse Merged revision(s) 1579916 from turbine/fulcrum/trunk/json: [maven-release-plugin] prepare release fulcrum-json-1.0.0 ........ Added dist module for generating jar binaries, Added LICENCE in generated artefacts and new resources, Fixed project packaging Removed ANT task
Added: turbine/fulcrum/trunk/json/dist/ turbine/fulcrum/trunk/json/dist/pom.xml (with props) turbine/fulcrum/trunk/json/dist/src/ turbine/fulcrum/trunk/json/dist/src/assembly/ turbine/fulcrum/trunk/json/dist/src/assembly/dist.xml (with props) turbine/fulcrum/trunk/json/src/assembly/ turbine/fulcrum/trunk/json/src/assembly/project.xml (with props) Removed: turbine/fulcrum/trunk/json/.tasks.properties turbine/fulcrum/trunk/json/tasks-build-clean-asc.xml Modified: turbine/fulcrum/trunk/json/README (contents, props changed) turbine/fulcrum/trunk/json/api/pom.xml turbine/fulcrum/trunk/json/gson/pom.xml turbine/fulcrum/trunk/json/jackson/pom.xml turbine/fulcrum/trunk/json/jackson2/pom.xml turbine/fulcrum/trunk/json/pom.xml Modified: turbine/fulcrum/trunk/json/README URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/json/README?rev=1581866&r1=1581865&r2=1581866&view=diff ============================================================================== --- turbine/fulcrum/trunk/json/README (original) +++ turbine/fulcrum/trunk/json/README Wed Mar 26 14:38:36 2014 @@ -1,4 +1,52 @@ -Publishing Workflow: +-------------------------------------------------------------------------- + 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. + + $Id$ +-------------------------------------------------------------------------- + + +-------------------------------------------------------------------------- +Component Description +-------------------------------------------------------------------------- +Usage Information + +This is the Fulcrum JSON Component. For more information about this component, look at the HTML documentation in the site/ directory or +generate the documentation using + +mvn site:site + + +Top level directories + +dist/target/ contains the zipped binary jars * +gson, jackson, jackson2 / contains the different JSON implementation project files +src/ contains the interface project files +xdoc / contains the documentation +target/ contains the packaged project files, which allow to build the project ** + +* after running mvn install +** after running mvn clean site install -P apache-release, see below + + +-------------------------------------------------------------------------- +Component Development +-------------------------------------------------------------------------- +Publishing Workflow Prerequisites // jars @@ -14,7 +62,7 @@ More Information Steps 1) Local Testing // Verify gpg.homedir, gpg.useagent - mvn clean install -Papache-release -Dgpg.useagent=false -Dgpg.passphrase=<xx> + mvn clean site install -Papache-release -Dgpg.useagent=false -Dgpg.passphrase=<xx> mvn release:prepare -DdryRun=true -DautoVersionSubmodules=true -Papache-release 2) Remote Testing @@ -37,14 +85,15 @@ More Information https://www.apache.org/dev/publishing-maven-artifacts.html#close-stage https://docs.sonatype.org/display/Repository/Closing+a+Staging+Repository -3) Prepare Voting Information and Voting +6) Prepare Voting Information and Voting .... -5) a) +7) a) //Promote / Publish https://docs.sonatype.org/display/Repository/Releasing+a+Staging+Repository b) //Drop and Restage https://docs.sonatype.org/display/Repository/Dropping+a+Staging+Repository + - Reverse merge the release prepare, manually delete tag in svn repo and drop staged repository in nexus and start again with step 1. \ No newline at end of file Propchange: turbine/fulcrum/trunk/json/README ------------------------------------------------------------------------------ svn:keywords = Id Modified: turbine/fulcrum/trunk/json/api/pom.xml URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/json/api/pom.xml?rev=1581866&r1=1581865&r2=1581866&view=diff ============================================================================== --- turbine/fulcrum/trunk/json/api/pom.xml (original) +++ turbine/fulcrum/trunk/json/api/pom.xml Wed Mar 26 14:38:36 2014 @@ -15,18 +15,18 @@ 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/xsd/maven-4.0.0.xsd"> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <parent> <artifactId>fulcrum-json-parent</artifactId> <groupId>org.apache.fulcrum</groupId> - <version>1.0.1-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.apache.fulcrum</groupId> <artifactId>fulcrum-json-api</artifactId> <name>Fulcrum JSON API</name> - <version>1.0.1-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> <description>Fulcrum JSON Basic API</description> <url>http://turbine.apache.org/fulcrum/fulcrum-json/fulcrum-json-api</url> Added: turbine/fulcrum/trunk/json/dist/pom.xml URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/json/dist/pom.xml?rev=1581866&view=auto ============================================================================== --- turbine/fulcrum/trunk/json/dist/pom.xml (added) +++ turbine/fulcrum/trunk/json/dist/pom.xml Wed Mar 26 14:38:36 2014 @@ -0,0 +1,89 @@ +<?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. + +--> +<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/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.apache.fulcrum</groupId> + <artifactId>fulcrum-json-parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + </parent> + <groupId>org.apache.fulcrum</groupId> + <artifactId>fulcrum-json-dist</artifactId> + <packaging>pom</packaging> + + <name>Fulcrum JSON Jar Distribution</name> + + <!-- NOTE: These dependency declarations are only required to sort this project to the + end of the line in the multimodule build ensuring that this + distribution project builds AFTER them ... + --> + <dependencies> + <dependency> + <groupId>org.apache.fulcrum</groupId> + <artifactId>fulcrum-json-api</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.fulcrum</groupId> + <artifactId>fulcrum-json-gson</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.fulcrum</groupId> + <artifactId>fulcrum-json-jackson</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.fulcrum</groupId> + <artifactId>fulcrum-json-jackson2</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> + + <build> + <plugins> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <id>jar-dist-assembly</id> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + <configuration> + <descriptors> + <descriptor>src/assembly/dist.xml</descriptor> + </descriptors> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <artifactId>maven-site-plugin</artifactId> + <configuration> + <skip>true</skip> + </configuration> + </plugin> + </plugins> + </build> +</project> \ No newline at end of file Propchange: turbine/fulcrum/trunk/json/dist/pom.xml ------------------------------------------------------------------------------ svn:eol-style = native Added: 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=1581866&view=auto ============================================================================== --- turbine/fulcrum/trunk/json/dist/src/assembly/dist.xml (added) +++ turbine/fulcrum/trunk/json/dist/src/assembly/dist.xml Wed Mar 26 14:38:36 2014 @@ -0,0 +1,52 @@ +<?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>jars</id> + <formats> + <format>tar.gz</format> + <format>zip</format> + </formats> + <includeBaseDirectory>false</includeBaseDirectory> + <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> + <fileSets> + <fileSet> + <directory>${project.build.directory}/maven-shared-archive-resources/META-INF</directory> + <outputDirectory>/</outputDirectory> + <includes> + <include>LICENSE*</include> + <include>NOTICE*</include> + </includes> + </fileSet> + </fileSets> +</assembly> \ No newline at end of file Propchange: turbine/fulcrum/trunk/json/dist/src/assembly/dist.xml ------------------------------------------------------------------------------ svn:eol-style = native Modified: turbine/fulcrum/trunk/json/gson/pom.xml URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/json/gson/pom.xml?rev=1581866&r1=1581865&r2=1581866&view=diff ============================================================================== --- turbine/fulcrum/trunk/json/gson/pom.xml (original) +++ turbine/fulcrum/trunk/json/gson/pom.xml Wed Mar 26 14:38:36 2014 @@ -15,18 +15,18 @@ 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/xsd/maven-4.0.0.xsd"> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <parent> <artifactId>fulcrum-json-parent</artifactId> <groupId>org.apache.fulcrum</groupId> - <version>1.0.1-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.apache.fulcrum</groupId> <artifactId>fulcrum-json-gson</artifactId> <name>Fulcrum JSON GSON Impl</name> - <version>1.0.1-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> <url>http://turbine.apache.org/fulcrum/fulcrum-json/fulcrum-json-gson</url> <scm> Modified: turbine/fulcrum/trunk/json/jackson/pom.xml URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/json/jackson/pom.xml?rev=1581866&r1=1581865&r2=1581866&view=diff ============================================================================== --- turbine/fulcrum/trunk/json/jackson/pom.xml (original) +++ turbine/fulcrum/trunk/json/jackson/pom.xml Wed Mar 26 14:38:36 2014 @@ -15,18 +15,18 @@ 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/xsd/maven-4.0.0.xsd"> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <parent> <artifactId>fulcrum-json-parent</artifactId> <groupId>org.apache.fulcrum</groupId> - <version>1.0.1-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.apache.fulcrum</groupId> <artifactId>fulcrum-json-jackson</artifactId> <name>Fulcrum JSON Jackson Impl</name> - <version>1.0.1-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> <url>http://turbine.apache.org/fulcrum/fulcrum-json/fulcrum-json-jackson</url> <scm> Modified: turbine/fulcrum/trunk/json/jackson2/pom.xml URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/json/jackson2/pom.xml?rev=1581866&r1=1581865&r2=1581866&view=diff ============================================================================== --- turbine/fulcrum/trunk/json/jackson2/pom.xml (original) +++ turbine/fulcrum/trunk/json/jackson2/pom.xml Wed Mar 26 14:38:36 2014 @@ -15,18 +15,18 @@ 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/xsd/maven-4.0.0.xsd"> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <parent> <artifactId>fulcrum-json-parent</artifactId> <groupId>org.apache.fulcrum</groupId> - <version>1.0.1-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.apache.fulcrum</groupId> <artifactId>fulcrum-json-jackson2</artifactId> <name>Fulcrum JSON Jackson 2.x Impl</name> - <version>1.0.1-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> <url>http://turbine.apache.org/fulcrum/fulcrum-json/fulcrum-json-jackson2</url> <scm> Modified: turbine/fulcrum/trunk/json/pom.xml URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/json/pom.xml?rev=1581866&r1=1581865&r2=1581866&view=diff ============================================================================== --- turbine/fulcrum/trunk/json/pom.xml (original) +++ turbine/fulcrum/trunk/json/pom.xml Wed Mar 26 14:38:36 2014 @@ -17,7 +17,9 @@ 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/xsd/maven-4.0.0.xsd"> +<project + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" + xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <parent> <artifactId>turbine-parent</artifactId> <groupId>org.apache.turbine</groupId> @@ -26,7 +28,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.apache.fulcrum</groupId> <artifactId>fulcrum-json-parent</artifactId> - <version>1.0.1-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> <packaging>pom</packaging> <name>Fulcrum JSON Master Build</name> <url>http://turbine.apache.org/fulcrum/fulcrum-json/</url> @@ -74,7 +76,8 @@ <module>api</module> <module>gson</module> <module>jackson</module> - <module>jackson2</module> + <module>jackson2</module> + <module>dist</module> </modules> <build> @@ -89,33 +92,6 @@ <tryUpdate>false</tryUpdate> </configuration> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-release-plugin</artifactId> - <configuration> - <preparationGoals>antrun:run</preparationGoals> - </configuration> - </plugin> - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <id>clean-asc-hashes</id> - <!--phase>verify</phase--><!-- a lifecycle phase --> - <inherited>false</inherited> - <configuration> - <target> - <ant antfile="${basedir}/tasks-build-clean-asc.xml" target="tasks"> - <property name="build.path" value="${basedir}" /> - </ant> - </target> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - </executions> - </plugin> </plugins> </build> @@ -124,29 +100,27 @@ <id>apache-release</id> <build> <plugins> - <plugin> - <!-- build the source and binary distribution packages --> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-assembly-plugin</artifactId> - <executions> - <execution> - <id>fulcrum-source-release-assembly</id> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - <configuration> - <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot> - <descriptorRefs> - <descriptorRef>bin</descriptorRef> - <descriptorRef>project</descriptorRef> - <descriptorRef>src</descriptorRef> - </descriptorRefs> - <tarLongFileFormat>gnu</tarLongFileFormat> - </configuration> - </execution> - </executions> - </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-assembly-plugin</artifactId> + <version>2.4</version> + <executions> + <execution> + <id>fulcrum-source-release-assembly</id> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + <configuration> + <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot> + <descriptors> + <descriptor>src/assembly/project.xml</descriptor> + </descriptors> + <tarLongFileFormat>gnu</tarLongFileFormat> + </configuration> + </execution> + </executions> + </plugin> </plugins> </build> </profile> Added: turbine/fulcrum/trunk/json/src/assembly/project.xml URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/json/src/assembly/project.xml?rev=1581866&view=auto ============================================================================== --- turbine/fulcrum/trunk/json/src/assembly/project.xml (added) +++ turbine/fulcrum/trunk/json/src/assembly/project.xml Wed Mar 26 14:38:36 2014 @@ -0,0 +1,116 @@ +<?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>project</id> + <formats> + <format>tar.gz</format> + <format>zip</format> + </formats> + <includeSiteDirectory>true</includeSiteDirectory> + <fileSets> + <fileSet> + <directory>${project.basedir}</directory> + <includes> + <include>README*</include> + <include>pom.xml</include> + </includes> + <useDefaultExcludes>true</useDefaultExcludes> + </fileSet> + <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>${project.basedir}/src</directory> + <useDefaultExcludes>true</useDefaultExcludes> + <includes> + <include>assembly/*</include> + <include>changes/*</include> + <include>site/**/*</include> + </includes> + </fileSet> + <fileSet> + <directory>${project.basedir}/api</directory> + <useDefaultExcludes>true</useDefaultExcludes> + <includes> + <include>**/*</include> + </includes> + <excludes> + <exclude>target/**</exclude> + </excludes> + </fileSet> + <fileSet> + <directory>${project.basedir}/gson</directory> + <useDefaultExcludes>true</useDefaultExcludes> + <includes> + <include>**/*</include> + </includes> + <excludes> + <exclude>target/**</exclude> + </excludes> + </fileSet> + <fileSet> + <directory>${project.basedir}/jackson</directory> + <useDefaultExcludes>true</useDefaultExcludes> + <includes> + <include>**/*</include> + </includes> + <excludes> + <exclude>target/**</exclude> + </excludes> + </fileSet> + <fileSet> + <directory>${project.basedir}/jackson2</directory> + <useDefaultExcludes>true</useDefaultExcludes> + <includes> + <include>**/*</include> + </includes> + <excludes> + <exclude>target/**</exclude> + </excludes> + </fileSet> + <fileSet> + <directory>${project.basedir}/dist</directory> + <useDefaultExcludes>true</useDefaultExcludes> + <includes> + <include>**/*</include> + </includes> + <excludes> + <exclude>target/**</exclude> + </excludes> + </fileSet> + <fileSet> + <directory>${project.basedir}/xdocs</directory> + <useDefaultExcludes>true</useDefaultExcludes> + <includes> + <include>**/*</include> + </includes> + <excludes> + <exclude>target/**</exclude> + </excludes> + </fileSet> + </fileSets> +</assembly> \ No newline at end of file Propchange: turbine/fulcrum/trunk/json/src/assembly/project.xml ------------------------------------------------------------------------------ svn:eol-style = native