You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by rm...@apache.org on 2014/11/03 10:26:00 UTC
svn commit: r1636294 - in /commons/proper/jcs/trunk: commons-jcs-dist/
commons-jcs-dist/pom.xml commons-jcs-dist/src/
commons-jcs-dist/src/assembly/ commons-jcs-dist/src/assembly/bin.xml
commons-jcs-dist/src/assembly/src.xml pom.xml src/assembly/
Author: rmannibucau
Date: Mon Nov 3 09:26:00 2014
New Revision: 1636294
URL: http://svn.apache.org/r1636294
Log:
creating a dist module for src/bin assembly
Added:
commons/proper/jcs/trunk/commons-jcs-dist/
commons/proper/jcs/trunk/commons-jcs-dist/pom.xml
commons/proper/jcs/trunk/commons-jcs-dist/src/
commons/proper/jcs/trunk/commons-jcs-dist/src/assembly/
commons/proper/jcs/trunk/commons-jcs-dist/src/assembly/bin.xml
- copied, changed from r1635491, commons/proper/jcs/trunk/src/assembly/bin.xml
commons/proper/jcs/trunk/commons-jcs-dist/src/assembly/src.xml
- copied, changed from r1635491, commons/proper/jcs/trunk/src/assembly/src.xml
Removed:
commons/proper/jcs/trunk/src/assembly/
Modified:
commons/proper/jcs/trunk/pom.xml
Added: commons/proper/jcs/trunk/commons-jcs-dist/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-dist/pom.xml?rev=1636294&view=auto
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-dist/pom.xml (added)
+++ commons/proper/jcs/trunk/commons-jcs-dist/pom.xml Mon Nov 3 09:26:00 2014
@@ -0,0 +1,162 @@
+<?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">
+ <parent>
+ <artifactId>commons-jcs</artifactId>
+ <groupId>org.apache.commons</groupId>
+ <version>2.0-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+
+ <artifactId>dist</artifactId>
+ <packaging>pom</packaging>
+ <name>Apache Commons JCS :: Distribution</name>
+ <description>Creates the Apache Commons JCS multimodule distribution.</description>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-jcs-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-jcs-core</artifactId>
+ <version>${project.version}</version>
+ <classifier>sources</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-jcs-core</artifactId>
+ <version>${project.version}</version>
+ <classifier>javadoc</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-jcs-jcache</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-jcs-jcache</artifactId>
+ <version>${project.version}</version>
+ <classifier>sources</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-jcs-jcache</artifactId>
+ <version>${project.version}</version>
+ <classifier>javadoc</classifier>
+ </dependency>
+ <dependency> <!-- no sources or javadoc since src/main/java is empty -->
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-jcs-jcache-tck</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-jcs-jcache-extras</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-jcs-jcache-extras</artifactId>
+ <version>${project.version}</version>
+ <classifier>sources</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-jcs-jcache-extras</artifactId>
+ <version>${project.version}</version>
+ <classifier>javadoc</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-jcs-jcache-openjpa</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-jcs-jcache-openjpa</artifactId>
+ <version>${project.version}</version>
+ <classifier>sources</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-jcs-jcache-openjpa</artifactId>
+ <version>${project.version}</version>
+ <classifier>javadoc</classifier>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <profiles>
+ <profile>
+ <id>release</id>
+ <properties>
+ <!-- activate the JSR-107 TCK for the release-->
+ <jcache.tck>true</jcache.tck>
+ </properties>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.4</version>
+ <executions>
+ <execution>
+ <id>create-distribution</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+ <descriptor>src/assembly/bin.xml</descriptor>
+ <descriptor>src/assembly/src.xml</descriptor>
+ </descriptors>
+ <tarLongFileMode>gnu</tarLongFileMode>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-install-plugin</artifactId>
+ <configuration>
+ <createChecksum>true</createChecksum>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+</project>
Copied: commons/proper/jcs/trunk/commons-jcs-dist/src/assembly/bin.xml (from r1635491, commons/proper/jcs/trunk/src/assembly/bin.xml)
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-dist/src/assembly/bin.xml?p2=commons/proper/jcs/trunk/commons-jcs-dist/src/assembly/bin.xml&p1=commons/proper/jcs/trunk/src/assembly/bin.xml&r1=1635491&r2=1636294&rev=1636294&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/assembly/bin.xml (original)
+++ commons/proper/jcs/trunk/commons-jcs-dist/src/assembly/bin.xml Mon Nov 3 09:26:00 2014
@@ -20,9 +20,17 @@
<format>tar.gz</format>
<format>zip</format>
</formats>
+ <baseDirectory>${project.artifactId}-${project.version}</baseDirectory>
<includeSiteDirectory>false</includeSiteDirectory>
+ <dependencySets>
+ <dependencySet>
+ <useProjectArtifact>false</useProjectArtifact>
+ <useTransitiveDependencies>false</useTransitiveDependencies>
+ </dependencySet>
+ </dependencySets>
<fileSets>
<fileSet>
+ <directory>${project.basedir}/..</directory>
<includes>
<include>LICENSE.txt</include>
<include>LICENSE.xerox</include>
@@ -30,16 +38,5 @@
<include>RELEASE-NOTES.txt</include>
</includes>
</fileSet>
- <fileSet>
- <directory>target</directory>
- <outputDirectory></outputDirectory>
- <includes>
- <include>*.jar</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>target/site/apidocs</directory>
- <outputDirectory>apidocs</outputDirectory>
- </fileSet>
</fileSets>
</assembly>
Copied: commons/proper/jcs/trunk/commons-jcs-dist/src/assembly/src.xml (from r1635491, commons/proper/jcs/trunk/src/assembly/src.xml)
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-dist/src/assembly/src.xml?p2=commons/proper/jcs/trunk/commons-jcs-dist/src/assembly/src.xml&p1=commons/proper/jcs/trunk/src/assembly/src.xml&r1=1635491&r2=1636294&rev=1636294&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/assembly/src.xml (original)
+++ commons/proper/jcs/trunk/commons-jcs-dist/src/assembly/src.xml Mon Nov 3 09:26:00 2014
@@ -15,28 +15,24 @@
limitations under the License.
-->
<assembly>
- <id>src</id>
- <formats>
- <format>tar.gz</format>
- <format>zip</format>
- </formats>
- <baseDirectory>${project.artifactId}-${project.version}-src</baseDirectory>
- <fileSets>
- <fileSet>
- <includes>
- <include>checkstyle.xml</include>
- <include>default.properties</include>
- <include>LICENSE.txt</include>
- <include>LICENSE.xerox</include>
- <include>LICENSE-header.txt</include>
- <include>NOTICE.txt</include>
- <include>pom.xml</include>
- <include>RELEASE-NOTES*.txt</include>
- <include>TODO</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>src</directory>
- </fileSet>
- </fileSets>
+ <id>src</id>
+ <formats>
+ <format>tar.gz</format>
+ <format>zip</format>
+ </formats>
+ <baseDirectory>${project.artifactId}-${project.version}-src</baseDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>${project.basedir}/..</directory>
+ <excludes>
+ <exclude>${project.build.directory}/**</exclude>
+ <exclude>.*/**</exclude>
+ <exclude>**/${project.build.directory}/**</exclude>
+ <exclude>**/.*/**</exclude>
+ <exclude>${project.basedir}/../commons-jcs-sandbox/**</exclude>
+ <exclude>${project.basedir}/../auxiliary-builds/**</exclude>
+ <exclude>${project.basedir}/../src/experimental/**</exclude>
+ </excludes>
+ </fileSet>
+ </fileSets>
</assembly>
Modified: commons/proper/jcs/trunk/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/pom.xml?rev=1636294&r1=1636293&r2=1636294&view=diff
==============================================================================
--- commons/proper/jcs/trunk/pom.xml (original)
+++ commons/proper/jcs/trunk/pom.xml Mon Nov 3 09:26:00 2014
@@ -141,6 +141,7 @@
<module>commons-jcs-tck-tests</module>
<module>commons-jcs-jcache-extras</module>
<module>commons-jcs-jcache-openjpa</module>
+ <module>commons-jcs-dist</module>
</modules>
<developers>
@@ -403,34 +404,38 @@
<profiles>
<profile>
- <!-- Override Commons parent release profile -->
+ <id>sandbox</id>
+ <modules>
+ <module>commons-jcs-sandbox</module>
+ </modules>
+ </profile>
+ <profile>
<id>release</id>
- <properties>
- <!-- activate the JSR-107 TCK for the release-->
- <jcache.tck>true</jcache.tck>
- </properties>
-
<build>
<plugins>
<plugin>
- <!-- build the source and binary distribution packages -->
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
+ <inherited>false</inherited>
<executions>
<execution>
- <phase>package</phase>
<goals>
<goal>single</goal>
</goals>
- <configuration>
- <!-- only the parent has assembly descriptors -->
- <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot>
- <descriptors>
- <descriptor>src/assembly/bin.xml</descriptor>
- <descriptor>src/assembly/src.xml</descriptor>
- </descriptors>
- <tarLongFileFormat>gnu</tarLongFileFormat>
- </configuration>
+ <!-- disable assembly:single from commons-parent
+ release profile; multimodule assembly handled
+ by dist module -->
+ <phase />
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>create-source-jar</id>
+ <!-- suppress execution specified by parent profile -->
+ <phase />
</execution>
</executions>
</plugin>
@@ -438,10 +443,18 @@
</build>
</profile>
<profile>
- <id>sandbox</id>
- <modules>
- <module>commons-jcs-sandbox</module>
- </modules>
+ <id>site</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <aggregate>true</aggregate>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</profile>
</profiles>