You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by ca...@apache.org on 2011/11/21 16:48:37 UTC
svn commit: r1204552 - in /incubator/jena/Scratch/PC/JenaDist/trunk:
assembly-binary.xml assembly-sources.xml assembly.xml pom.xml
Author: castagna
Date: Mon Nov 21 15:48:37 2011
New Revision: 1204552
URL: http://svn.apache.org/viewvc?rev=1204552&view=rev
Log:
Separate assembly files for binaries and sources.
However, "every ASF release must contain a source package, which must be sufficient for a user to build and test the release provided they have access to the appropriate platform and tools." -- http://www.apache.org/dev/release.html
The source package must be sufficient for a user to build and test the release...
Added:
incubator/jena/Scratch/PC/JenaDist/trunk/assembly-binary.xml (contents, props changed)
- copied, changed from r1204516, incubator/jena/Scratch/PC/JenaDist/trunk/assembly.xml
incubator/jena/Scratch/PC/JenaDist/trunk/assembly-sources.xml (with props)
Removed:
incubator/jena/Scratch/PC/JenaDist/trunk/assembly.xml
Modified:
incubator/jena/Scratch/PC/JenaDist/trunk/pom.xml
Copied: incubator/jena/Scratch/PC/JenaDist/trunk/assembly-binary.xml (from r1204516, incubator/jena/Scratch/PC/JenaDist/trunk/assembly.xml)
URL: http://svn.apache.org/viewvc/incubator/jena/Scratch/PC/JenaDist/trunk/assembly-binary.xml?p2=incubator/jena/Scratch/PC/JenaDist/trunk/assembly-binary.xml&p1=incubator/jena/Scratch/PC/JenaDist/trunk/assembly.xml&r1=1204516&r2=1204552&rev=1204552&view=diff
==============================================================================
--- incubator/jena/Scratch/PC/JenaDist/trunk/assembly.xml (original)
+++ incubator/jena/Scratch/PC/JenaDist/trunk/assembly-binary.xml Mon Nov 21 15:48:37 2011
@@ -4,7 +4,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="xmlns=http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1 http://maven.apache.org/xsd/assembly-1.1.1.xsd">
- <id>distribution</id>
+ <id>bin</id>
<baseDirectory>apache-jena-${project.version}</baseDirectory>
<formats>
@@ -20,12 +20,17 @@
</includes>
<sources>
- <includeModuleDirectory>true</includeModuleDirectory>
- <!--
- We can use this if we want to aggregate all sources:
- <outputDirectoryMapping>src</outputDirectoryMapping>
- -->
- <outputDirectoryMapping>src/${module.artifactId}</outputDirectoryMapping>
+ <outputDirectoryMapping></outputDirectoryMapping>
+ <fileSets>
+ <fileSet>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>bat/*</include>
+ <include>bin/*</include>
+ <include>bin2/*</include>
+ </includes>
+ </fileSet>
+ </fileSets>
</sources>
<binaries>
Propchange: incubator/jena/Scratch/PC/JenaDist/trunk/assembly-binary.xml
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: incubator/jena/Scratch/PC/JenaDist/trunk/assembly-sources.xml
URL: http://svn.apache.org/viewvc/incubator/jena/Scratch/PC/JenaDist/trunk/assembly-sources.xml?rev=1204552&view=auto
==============================================================================
--- incubator/jena/Scratch/PC/JenaDist/trunk/assembly-sources.xml (added)
+++ incubator/jena/Scratch/PC/JenaDist/trunk/assembly-sources.xml Mon Nov 21 15:48:37 2011
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="xmlns=http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1 http://maven.apache.org/xsd/assembly-1.1.1.xsd">
+
+ <id>src</id>
+ <baseDirectory>apache-jena-${project.version}</baseDirectory>
+
+ <formats>
+ <format>zip</format>
+ </formats>
+
+ <moduleSets>
+ <moduleSet>
+ <useAllReactorProjects>false</useAllReactorProjects>
+
+ <includes>
+ <include>*:jena-*</include>
+ </includes>
+
+ <sources>
+ <outputDirectoryMapping>${module.artifactId}</outputDirectoryMapping>
+ </sources>
+
+ </moduleSet>
+ </moduleSets>
+
+ <fileSets>
+ <fileSet>
+ <includes>
+ <include>README*</include>
+ <include>DISCLAIMER*</include>
+ <include>LICENSE*</include>
+ <include>NOTICE*</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>${project.build.directory}/META-INF/</directory>
+ <outputDirectory></outputDirectory>
+ <includes>
+ <include>DEPENDENCIES*</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+
+</assembly>
Propchange: incubator/jena/Scratch/PC/JenaDist/trunk/assembly-sources.xml
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: incubator/jena/Scratch/PC/JenaDist/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/jena/Scratch/PC/JenaDist/trunk/pom.xml?rev=1204552&r1=1204551&r2=1204552&view=diff
==============================================================================
--- incubator/jena/Scratch/PC/JenaDist/trunk/pom.xml (original)
+++ incubator/jena/Scratch/PC/JenaDist/trunk/pom.xml Mon Nov 21 15:48:37 2011
@@ -45,9 +45,10 @@
<goals><goal>single</goal></goals>
<configuration>
<finalName>apache-jena-${project.version}</finalName>
- <appendAssemblyId>false</appendAssemblyId>
+ <appendAssemblyId>true</appendAssemblyId>
<descriptors>
- <descriptor>assembly.xml</descriptor>
+ <descriptor>assembly-binary.xml</descriptor>
+ <descriptor>assembly-sources.xml</descriptor>
</descriptors>
</configuration>
</execution>