Return-Path: 
 <jena-commits-return-1072-apmail-incubator-jena-commits-archive=incubator.apache.org@incubator.apache.org>
X-Original-To: apmail-incubator-jena-commits-archive@minotaur.apache.org
Delivered-To: apmail-incubator-jena-commits-archive@minotaur.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 102017C69
	for <apmail-incubator-jena-commits-archive@minotaur.apache.org>;
 Sat, 24 Sep 2011 20:38:06 +0000 (UTC)
Received: (qmail 6626 invoked by uid 500); 24 Sep 2011 20:38:06 -0000
Delivered-To: apmail-incubator-jena-commits-archive@incubator.apache.org
Received: (qmail 6605 invoked by uid 500); 24 Sep 2011 20:38:06 -0000
Mailing-List: contact jena-commits-help@incubator.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:jena-commits-help@incubator.apache.org>
List-Unsubscribe: <mailto:jena-commits-unsubscribe@incubator.apache.org>
List-Post: <mailto:jena-commits@incubator.apache.org>
List-Id: <jena-commits.incubator.apache.org>
Reply-To: jena-dev@incubator.apache.org
Delivered-To: mailing list jena-commits@incubator.apache.org
Received: (qmail 6598 invoked by uid 99); 24 Sep 2011 20:38:06 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 24 Sep 2011 20:38:05 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 24 Sep 2011 20:38:02 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 008FB2388900;
	Sat, 24 Sep 2011 20:37:40 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1175250 - in /incubator/jena/Jena2/ARQ/trunk: ./
 assembly-testing.xml assembly.xml pom2.xml
Date: Sat, 24 Sep 2011 20:37:40 -0000
To: jena-commits@incubator.apache.org
From: andy@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20110924203741.008FB2388900@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: andy
Date: Sat Sep 24 20:37:40 2011
New Revision: 1175250

URL: http://svn.apache.org/viewvc?rev=1175250&view=rev
Log:
WIP: Draft Apache-compatible release process for ARQ

Added:
    incubator/jena/Jena2/ARQ/trunk/pom2.xml   (with props)
Modified:
    incubator/jena/Jena2/ARQ/trunk/   (props changed)
    incubator/jena/Jena2/ARQ/trunk/assembly-testing.xml
    incubator/jena/Jena2/ARQ/trunk/assembly.xml

Propchange: incubator/jena/Jena2/ARQ/trunk/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Sep 24 20:37:40 2011
@@ -23,3 +23,5 @@ build
 target
 
 I
+
+LOG

Modified: incubator/jena/Jena2/ARQ/trunk/assembly-testing.xml
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/assembly-testing.xml?rev=1175250&r1=1175249&r2=1175250&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/assembly-testing.xml (original)
+++ incubator/jena/Jena2/ARQ/trunk/assembly-testing.xml Sat Sep 24 20:37:40 2011
@@ -31,9 +31,9 @@
     <fileSet>
       <includes>
         <include>README*</include>
-        <include>DISCLAIMER</include>
-        <include>LICENSE</include>
-        <include>NOTICE</include>
+        <include>DISCLAIMER*</include>
+        <include>LICENSE*</include>
+        <include>NOTICE*</include>
         <include>ChangeLog.txt</include>
         <include>pom.xml</include>
       </includes>

Modified: incubator/jena/Jena2/ARQ/trunk/assembly.xml
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/assembly.xml?rev=1175250&r1=1175249&r2=1175250&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/assembly.xml (original)
+++ incubator/jena/Jena2/ARQ/trunk/assembly.xml Sat Sep 24 20:37:40 2011
@@ -28,9 +28,9 @@
     <fileSet>
       <includes>
         <include>README*</include>
-        <include>DISCLAIMER</include>
-        <include>LICENSE</include>
-        <include>NOTICE</include>
+        <include>DISCLAIMER*</include>
+        <include>LICENSE*</include>
+        <include>NOTICE*</include>
         <include>ChangeLog.txt</include>
         <include>pom.xml</include>
       </includes>

Added: incubator/jena/Jena2/ARQ/trunk/pom2.xml
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/pom2.xml?rev=1175250&view=auto
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/pom2.xml (added)
+++ incubator/jena/Jena2/ARQ/trunk/pom2.xml Sat Sep 24 20:37:40 2011
@@ -0,0 +1,263 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<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/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>org.apache.jena</groupId>
+  <artifactId>arq</artifactId>
+  <packaging>jar</packaging>
+  <name>ARQ</name>
+  <version>${ver.arq}</version>
+  <!-- <version>2.8.9-incubating-SNAPSHOT</version> -->
+
+  <parent>
+    <groupId>org.apache.jena</groupId>
+    <artifactId>jena-top</artifactId>
+    <version>0-SNAPSHOT</version>
+    <relativePath>../JenaTop/pom.xml</relativePath>
+  </parent> 
+
+  <description>ARQ is a SPARQL 1.1 query engine for Jena</description>
+
+  <scm>
+    <connection>scm:svn:https://svn.apache.org/repos/asf/incubator/jena/Jena2/ARQ/</connection>
+    <url>https://svn.apache.org/repos/asf/incubator/jena/Jena2/ARQ/</url>
+  </scm>
+  
+  <properties>
+    <this.root>${project.artifactId}-${project.version}</this.root>
+    <ver.wstx-asl>3.2.9</ver.wstx-asl>
+    <ver.lucene>2.3.1</ver.lucene>
+    <ver.http-client>4.1.2</ver.http-client>
+    <ver.commons-codec>1.5</ver.commons-codec>
+    <assembly.root.name>apache-jena-${project.artifactId}-${project.version}</assembly.root.name>
+
+  </properties>
+
+  <dependencies>
+
+    <dependency>
+      <groupId>com.hp.hpl.jena</groupId>
+      <artifactId>jena</artifactId>
+      <version>${ver.jena}</version>
+    </dependency>
+
+    <dependency>
+      <groupId>com.hp.hpl.jena</groupId>
+      <artifactId>jena</artifactId>
+      <classifier>tests</classifier>
+      <version>${ver.jena}</version>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.codehaus.woodstox</groupId>
+      <artifactId>wstx-asl</artifactId>
+      <version>${ver.wstx-asl}</version>
+      <!--
+	And recode XMLInputStax to use STaX2 as still have the same problems of STaX1 if just upgrade woodstox.
+      <groupId>org.codehaus.woodstox</groupId>
+      <artifactId>woodstox-core-asl</artifactId>
+      <version>4.0.0</version>
+      -->
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.lucene</groupId>
+      <artifactId>lucene-core</artifactId>
+      <version>${ver.lucene}</version>
+    </dependency>
+
+    <dependency>
+      <groupId>commons-codec</groupId>
+      <artifactId>commons-codec</artifactId>
+      <version>${ver.commons-codec}</version>
+    </dependency>
+      
+    <dependency>
+      <groupId>org.apache.httpcomponents</groupId>
+      <artifactId>httpclient</artifactId>
+      <version>${ver.http-client}</version>
+      <scope>compile</scope>
+      <exclusions>
+	<!-- Replace with slf4j adapter -->
+	<exclusion>
+	  <groupId>commons-logging</groupId>
+	  <artifactId>commons-logging</artifactId>
+	</exclusion>
+      </exclusions>      
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.httpcomponents</groupId>
+      <artifactId>httpcore</artifactId>
+      <version>${ver.http-client}</version>
+      <scope>compile</scope>
+    </dependency>
+
+  </dependencies>
+
+  <build>
+    <sourceDirectory>src</sourceDirectory>
+    <testSourceDirectory>src-test</testSourceDirectory>
+    
+    <!-- The filter file is written by antrun -->
+    <filters>
+      <filter>${project.basedir}/target/filter.properties</filter>
+    </filters>
+
+    <resources>
+      <resource>
+        <targetPath>com/hp/hpl/jena/sparql/</targetPath>
+        <filtering>true</filtering>
+        <directory>resources</directory>
+      </resource>
+    </resources>
+
+    <plugins>
+      <plugin>
+	<groupId>org.apache.maven.plugins</groupId>
+	<artifactId>maven-compiler-plugin</artifactId>
+      </plugin>
+
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <includes>
+            <include>**/TS_*.java</include>
+          </includes>
+        </configuration>
+      </plugin>
+
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-javadoc-plugin</artifactId>
+        <configuration>
+          <version>true</version>
+          <show>public</show>
+          <quiet>true</quiet>
+          <encoding>UTF-8</encoding>
+          <windowtitle>${project.name} ${project.version}</windowtitle>
+          <doctitle>${project.name} ${project.version}</doctitle>
+	  <excludePackageNames>arq:arq.*:riotcmd:riotcmd.*</excludePackageNames>
+	  <groups>
+	    <group>
+              <title>SPARQL Query and Update</title>
+              <packages>com.hp.hpl.jena.query:com.hp.hpl.jena.update</packages>
+            </group>
+            <group>
+              <title>LARQ -- Lucene Search for ARQ</title>
+              <packages>com.hp.hpl.jena.query.larq</packages>
+            </group>
+	    <!--
+            <group>
+              <title>RIOT</title>
+              <packages>org.openjena.riot</packages>
+            </group>
+	    -->
+	    <!-- "Other packages" catches everything else unless excluded -->
+	  </groups>
+          <bottom>
+	    Licenced under the Apache License, Version 2.0
+	  </bottom>
+        </configuration>
+      </plugin>
+
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-resources-plugin</artifactId>
+      </plugin>
+      
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-antrun-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>ant-timestamp</id>
+            <phase>generate-resources</phase>
+            <configuration>
+              <tasks>
+                <mkdir dir="${project.basedir}/target"/>
+                <tstamp>
+                  <format property="build.time.xsd"  pattern="yyyy-MM-dd'T'HH:mm:ssZ"/>
+                  <format property="build.time.txt"  pattern="yyyy-MM-dd HH:mm z"/>
+                </tstamp>
+                <!-- Do not indent (it does not work) -->
+                <echo file="${project.basedir}/target/filter.properties">
+#begin
+build.time.xsd=${build.time.xsd}
+build.time.txt=${build.time.txt}
+#end
+                </echo>
+                <echo message="version=${project.version}"/>
+                <echo message="build.time=${build.time.txt}"/>
+              </tasks>
+            </configuration>
+            <goals>
+              <goal>run</goal>
+            </goals>
+          </execution>
+          <!-- Another task, another execution -->
+        </executions>
+      </plugin>
+
+      <plugin>
+        <!-- This must be the last plug-in attached to the package phase 
+             because it replies on the packaging of the jar to happen first.
+        -->
+        <!-- We want one with appendAssemblyId=false and one with it defaulting to true.
+        hence two executions configured -->
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <!--  But we want one with appendAssemblyId=false and one with it defaulting to true.
+        <configuration>
+          <descriptors>
+            <descriptor>assembly.xml</descriptor>
+            <descriptor>assembly-testing.xml</descriptor>
+          </descriptors>
+        </configuration>
+        -->
+	<executions>
+	  <execution>
+	    <id>create-assembly</id>
+	    <phase>package</phase>
+	    <goals>
+	      <goal>single</goal>
+	    </goals>
+	    <configuration>
+	      <finalName>${assembly.root.name}</finalName>
+	      <appendAssemblyId>false</appendAssemblyId>
+	      <descriptors>
+		<descriptor>assembly.xml</descriptor>
+	      </descriptors>
+	    </configuration>
+	  </execution>
+	  <execution>
+	    <id>create-assembly-test</id>
+	    <phase>package</phase>
+	    <goals>
+	      <goal>single</goal>
+	    </goals>
+	    <configuration>
+	      <finalName>${assembly.root.name}-tests</finalName>
+	      <appendAssemblyId>false</appendAssemblyId>
+	      <descriptors>
+		<descriptor>assembly-testing.xml</descriptor>
+          	  </descriptors>
+	    </configuration>
+	  </execution>
+	</executions>
+      </plugin>
+
+    </plugins>
+  </build>
+
+  <reporting>
+    <!-- <outputDirectory>${project.build.directory}/site</outputDirectory> -->
+  </reporting>
+
+
+</project>

Propchange: incubator/jena/Jena2/ARQ/trunk/pom2.xml
------------------------------------------------------------------------------
    svn:mime-type = text/plain