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/22 16:55:48 UTC

svn commit: r1205048 - in /incubator/jena/Jena2/JenaDist/trunk: assembly-binary.xml assembly-distribution.xml assembly-jar-with-dependencies.xml assembly-one-jar.xml assembly-onejar.xml assembly-source-release.xml assembly-sources.xml pom.xml

Author: castagna
Date: Tue Nov 22 15:55:46 2011
New Revision: 1205048

URL: http://svn.apache.org/viewvc?rev=1205048&view=rev
Log:
Better names and one-jar added (no dependencies, just Jena modules).

Added:
    incubator/jena/Jena2/JenaDist/trunk/assembly-distribution.xml   (contents, props changed)
      - copied, changed from r1204926, incubator/jena/Jena2/JenaDist/trunk/assembly-binary.xml
    incubator/jena/Jena2/JenaDist/trunk/assembly-jar-with-dependencies.xml   (props changed)
      - copied unchanged from r1205001, incubator/jena/Jena2/JenaDist/trunk/assembly-onejar.xml
    incubator/jena/Jena2/JenaDist/trunk/assembly-one-jar.xml   (with props)
    incubator/jena/Jena2/JenaDist/trunk/assembly-source-release.xml   (props changed)
      - copied unchanged from r1204926, incubator/jena/Jena2/JenaDist/trunk/assembly-sources.xml
Removed:
    incubator/jena/Jena2/JenaDist/trunk/assembly-binary.xml
    incubator/jena/Jena2/JenaDist/trunk/assembly-onejar.xml
    incubator/jena/Jena2/JenaDist/trunk/assembly-sources.xml
Modified:
    incubator/jena/Jena2/JenaDist/trunk/pom.xml

Copied: incubator/jena/Jena2/JenaDist/trunk/assembly-distribution.xml (from r1204926, incubator/jena/Jena2/JenaDist/trunk/assembly-binary.xml)
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/JenaDist/trunk/assembly-distribution.xml?p2=incubator/jena/Jena2/JenaDist/trunk/assembly-distribution.xml&p1=incubator/jena/Jena2/JenaDist/trunk/assembly-binary.xml&r1=1204926&r2=1205048&rev=1205048&view=diff
==============================================================================
--- incubator/jena/Jena2/JenaDist/trunk/assembly-binary.xml (original)
+++ incubator/jena/Jena2/JenaDist/trunk/assembly-distribution.xml Tue Nov 22 15:55:46 2011
@@ -71,7 +71,7 @@
           <dependencySet>
             <outputDirectory>lib-src</outputDirectory>
             <includes>
-              <include>org.apache.jena:jena-*:*:*:sources</include>
+              <include>org.apache.jena:jena-*:*:sources</include>
             </includes>
           </dependencySet>
         </dependencySets>

Propchange: incubator/jena/Jena2/JenaDist/trunk/assembly-distribution.xml
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: incubator/jena/Jena2/JenaDist/trunk/assembly-jar-with-dependencies.xml
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: incubator/jena/Jena2/JenaDist/trunk/assembly-one-jar.xml
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/JenaDist/trunk/assembly-one-jar.xml?rev=1205048&view=auto
==============================================================================
--- incubator/jena/Jena2/JenaDist/trunk/assembly-one-jar.xml (added)
+++ incubator/jena/Jena2/JenaDist/trunk/assembly-one-jar.xml Tue Nov 22 15:55:46 2011
@@ -0,0 +1,76 @@
+<?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.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>one-jar</id>
+  <baseDirectory>apache-jena-${project.version}</baseDirectory>
+  <includeBaseDirectory>false</includeBaseDirectory>
+
+  <formats>
+    <format>jar</format>
+  </formats>
+
+  <moduleSets>
+    <moduleSet>
+      <useAllReactorProjects>false</useAllReactorProjects>
+
+      <binaries>
+        <dependencySets>
+          <dependencySet>
+            <outputDirectory>/</outputDirectory>
+            <unpack>true</unpack>
+            <includes>
+              <include>*:jena-*</include>
+            </includes>
+            <unpackOptions>
+              <excludes>
+                <exclude>META-INF/**</exclude>
+	            <exclude>DEPENDENCIES*</exclude>
+	            <exclude>LICENSE*</exclude>
+	            <exclude>NOTICE*</exclude>
+                <exclude>ASL*</exclude>
+              </excludes>
+            </unpackOptions>
+          </dependencySet>
+        </dependencySets>
+      </binaries>
+
+    </moduleSet>
+  </moduleSets>
+
+  <files>
+    <file>
+      <source>LICENSE.txt</source>
+      <outputDirectory>META-INF</outputDirectory>
+      <destName>LICENSE</destName>
+    </file>
+    <file>
+      <source>NOTICE.txt</source>
+      <outputDirectory>META-INF</outputDirectory>
+      <destName>NOTICE</destName>
+    </file>
+    <file>
+      <source>DISCLAIMER.txt</source>
+      <outputDirectory>META-INF</outputDirectory>
+      <destName>DISCLAIMER</destName>
+    </file>
+  </files>
+
+</assembly>

Propchange: incubator/jena/Jena2/JenaDist/trunk/assembly-one-jar.xml
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: incubator/jena/Jena2/JenaDist/trunk/assembly-source-release.xml
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: incubator/jena/Jena2/JenaDist/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/JenaDist/trunk/pom.xml?rev=1205048&r1=1205047&r2=1205048&view=diff
==============================================================================
--- incubator/jena/Jena2/JenaDist/trunk/pom.xml (original)
+++ incubator/jena/Jena2/JenaDist/trunk/pom.xml Tue Nov 22 15:55:46 2011
@@ -58,9 +58,10 @@
                 </manifest>
               </archive>
               <descriptors>
-                <descriptor>assembly-binary.xml</descriptor>
-                <descriptor>assembly-sources.xml</descriptor>
-                <descriptor>assembly-onejar.xml</descriptor>
+                <descriptor>assembly-distribution.xml</descriptor>
+                <descriptor>assembly-source-release.xml</descriptor>
+                <descriptor>assembly-jar-with-dependencies.xml</descriptor>
+                <descriptor>assembly-one-jar.xml</descriptor>
               </descriptors>
             </configuration>
           </execution>
@@ -137,9 +138,10 @@
                     </manifest>
                   </archive>
 	              <descriptors>
-	                <descriptor>assembly-binary.xml</descriptor>
-	                <descriptor>assembly-sources.xml</descriptor>
-                    <descriptor>assembly-onejar.xml</descriptor>
+	                <descriptor>assembly-distribution.xml</descriptor>
+	                <descriptor>assembly-source-release.xml</descriptor>
+                    <descriptor>assembly-jar-with-dependencies.xml</descriptor>
+                    <descriptor>assembly-one-jar.xml</descriptor>
 	              </descriptors>
 	            </configuration>
 	          </execution>