Author: tv
Date: Sun Nov 27 11:46:20 2016
New Revision: 1771566
URL: http://svn.apache.org/viewvc?rev=1771566&view=rev
Log:
Adjust project layout to new Fulcrum standard
Added:
turbine/fulcrum/trunk/factory/src/assembly/
turbine/fulcrum/trunk/factory/src/assembly/binaries.xml (with props)
turbine/fulcrum/trunk/factory/src/assembly/source.xml (with props)
turbine/fulcrum/trunk/factory/src/changes/
Removed:
turbine/fulcrum/trunk/factory/NOTICE.txt
Modified:
turbine/fulcrum/trunk/factory/pom.xml
Modified: turbine/fulcrum/trunk/factory/pom.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/factory/pom.xml?rev=1771566&r1=1771565&r2=1771566&view=diff
==============================================================================
--- turbine/fulcrum/trunk/factory/pom.xml (original)
+++ turbine/fulcrum/trunk/factory/pom.xml Sun Nov 27 11:46:20 2016
@@ -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
Added: turbine/fulcrum/trunk/factory/src/assembly/binaries.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/factory/src/assembly/binaries.xml?rev=1771566&view=auto
==============================================================================
--- turbine/fulcrum/trunk/factory/src/assembly/binaries.xml (added)
+++ turbine/fulcrum/trunk/factory/src/assembly/binaries.xml Sun Nov 27 11:46:20
2016
@@ -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>
Propchange: turbine/fulcrum/trunk/factory/src/assembly/binaries.xml
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: turbine/fulcrum/trunk/factory/src/assembly/source.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/factory/src/assembly/source.xml?rev=1771566&view=auto
==============================================================================
--- turbine/fulcrum/trunk/factory/src/assembly/source.xml (added)
+++ turbine/fulcrum/trunk/factory/src/assembly/source.xml Sun Nov 27 11:46:20
2016
@@ -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
Propchange: turbine/fulcrum/trunk/factory/src/assembly/source.xml
------------------------------------------------------------------------------
svn:mime-type = text/plain
