This is an automated email from the ASF dual-hosted git repository. gk pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/turbine-fulcrum-factory.git
commit ccbf436d29ed2aa8bb7fd5b8d659566dde30a3c8 Author: Thomas Vandahl <[email protected]> AuthorDate: Sun Nov 27 11:46:20 2016 +0000 Adjust project layout to new Fulcrum standard git-svn-id: https://svn.apache.org/repos/asf/turbine/fulcrum/trunk/factory@1771566 13f79535-47bb-0310-9956-ffa450edef68 --- NOTICE.txt | 6 ------ pom.xml | 51 +++++++++++++++++++++++++-------------------- src/assembly/binaries.xml | 52 ++++++++++++++++++++++++++++++++++++++++++++++ src/assembly/source.xml | 53 +++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 134 insertions(+), 28 deletions(-) diff --git a/NOTICE.txt b/NOTICE.txt deleted file mode 100644 index 25533de..0000000 --- a/NOTICE.txt +++ /dev/null @@ -1,6 +0,0 @@ -Turbine Fulcrum Factory Component -Copyright 2005-2009 The Apache Software Foundation. - -This product includes software developed at -The Apache Software Foundation (http://www.apache.org/). - diff --git a/pom.xml b/pom.xml index 4e86546..431f7d6 100644 --- a/pom.xml +++ b/pom.xml @@ -37,14 +37,6 @@ <url>http://svn.apache.org/viewvc/turbine/fulcrum/trunk/factory/</url> </scm> - <distributionManagement> - <site> - <id>apache.website</id> - <name>Fulcrum Website</name> - <url>${fulcrum.deployment.protocol}://people.apache.org/www/turbine.apache.org/fulcrum/fulcrum-factory/</url> - </site> - </distributionManagement> - <developers> <developer> <name>Eric Pugh</name> @@ -108,23 +100,38 @@ <profiles> <profile> - <id>rc</id> - <distributionManagement> - <!-- Cannot define in parent ATM, see COMMONSSITE-26 --> - <site> - <id>apache.website</id> - <name>Apache Fulcrum Release Candidate Staging Site</name> - <url>${fulcrum.deployment.protocol}://people.apache.org/www/turbine.apache.org/builds/fulcrum/${fulcrum.componentid}/${fulcrum.release.version}/${fulcrum.rc.version}/site</url> - </site> - </distributionManagement> + <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> + <descriptors> + <descriptor>src/assembly/binaries.xml</descriptor> + <descriptor>src/assembly/source.xml</descriptor> + </descriptors> + <tarLongFileFormat>gnu</tarLongFileFormat> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> </profile> </profiles> - + <properties> - <!-- This bits are used for the staging directory --> - <fulcrum.release.version>1.0.4</fulcrum.release.version> - <fulcrum.rc.version>RC1</fulcrum.rc.version> - <fulcrum.deployment.protocol>scpexe</fulcrum.deployment.protocol> + <turbine.site.path>fulcrum/fulcrum-factory</turbine.site.path> </properties> </project> \ No newline at end of file diff --git a/src/assembly/binaries.xml b/src/assembly/binaries.xml new file mode 100644 index 0000000..2eda8b7 --- /dev/null +++ b/src/assembly/binaries.xml @@ -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>bin</id> + <formats> + <format>tar.gz</format> + <format>zip</format> + </formats> + <fileSets> + <fileSet> + <directory>${project.basedir}</directory> + <outputDirectory>/</outputDirectory> + <includes> + <include>README*</include> + </includes> + </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.build.directory}</directory> + <outputDirectory>/</outputDirectory> + <includes> + <include>*.jar</include> + </includes> + </fileSet> + </fileSets> +</assembly> diff --git a/src/assembly/source.xml b/src/assembly/source.xml new file mode 100644 index 0000000..c06deb6 --- /dev/null +++ b/src/assembly/source.xml @@ -0,0 +1,53 @@ +<?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>src</id> + <formats> + <format>tar.gz</format> + <format>zip</format> + </formats> + <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> + </fileSet> + <fileSet> + <directory>${project.basedir}/xdocs</directory> + </fileSet> + </fileSets> +</assembly> \ No newline at end of file
