You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2012/05/14 22:20:50 UTC

svn commit: r1338384 - in /jena/trunk: ./ apache-jena/assembly-jena-zip.xml apache-jena/pom.xml jena-core/pom.xml jena-examples/pom.xml jena-parent/pom.xml pom.xml

Author: andy
Date: Mon May 14 20:20:49 2012
New Revision: 1338384

URL: http://svn.apache.org/viewvc?rev=1338384&view=rev
Log:
Tidy up POMs

Modified:
    jena/trunk/   (props changed)
    jena/trunk/apache-jena/assembly-jena-zip.xml
    jena/trunk/apache-jena/pom.xml
    jena/trunk/jena-core/pom.xml
    jena/trunk/jena-examples/pom.xml
    jena/trunk/jena-parent/pom.xml
    jena/trunk/pom.xml

Propchange: jena/trunk/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon May 14 20:20:49 2012
@@ -1 +1,2 @@
 .metadata
+target

Modified: jena/trunk/apache-jena/assembly-jena-zip.xml
URL: http://svn.apache.org/viewvc/jena/trunk/apache-jena/assembly-jena-zip.xml?rev=1338384&r1=1338383&r2=1338384&view=diff
==============================================================================
--- jena/trunk/apache-jena/assembly-jena-zip.xml (original)
+++ jena/trunk/apache-jena/assembly-jena-zip.xml Mon May 14 20:20:49 2012
@@ -23,7 +23,7 @@
   <formats>
     <format>zip</format>
     <format>tar.gz</format>
-    <format>tar.bz2</format>
+    <!--<format>tar.bz2</format>-->
   </formats>
 
   <dependencySets>

Modified: jena/trunk/apache-jena/pom.xml
URL: http://svn.apache.org/viewvc/jena/trunk/apache-jena/pom.xml?rev=1338384&r1=1338383&r2=1338384&view=diff
==============================================================================
--- jena/trunk/apache-jena/pom.xml (original)
+++ jena/trunk/apache-jena/pom.xml Mon May 14 20:20:49 2012
@@ -29,8 +29,9 @@
 
   <parent>
     <groupId>org.apache.jena</groupId>
-    <artifactId>jena-top</artifactId>
-    <version>0-incubating</version>
+    <artifactId>jena-parent</artifactId>
+    <version>1-SNAPSHOT</version>
+    <relativePath>../jena-parent</relativePath>
   </parent> 
 
   <organization>
@@ -52,9 +53,9 @@
   </scm>
 
   <properties>
-    <ver.jena>2.7.1-incubating-SNAPSHOT</ver.jena>
-    <ver.arq>2.9.1-incubating-SNAPSHOT</ver.arq>
-    <ver.iri>0.9.1-incubating-SNAPSHOT</ver.iri>
+    <ver.jena>2.7.1-SNAPSHOT</ver.jena>
+    <ver.arq>2.9.1-SNAPSHOT</ver.arq>
+    <ver.iri>0.9.1-SNAPSHOT</ver.iri>
   </properties>
 
   <dependencies>

Modified: jena/trunk/jena-core/pom.xml
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/pom.xml?rev=1338384&r1=1338383&r2=1338384&view=diff
==============================================================================
--- jena/trunk/jena-core/pom.xml (original)
+++ jena/trunk/jena-core/pom.xml Mon May 14 20:20:49 2012
@@ -53,7 +53,6 @@
   </scm>
 
   <properties>
-    <this.root>${project.artifactId}-${project.version}</this.root>
     <ver.xerces>2.10.0</ver.xerces>
     <ver.iri>0.9.1-SNAPSHOT</ver.iri>
     <maven.build.timestamp.format>yyyy-MM-dd'T'HH:mm:ssZ</maven.build.timestamp.format>

Modified: jena/trunk/jena-examples/pom.xml
URL: http://svn.apache.org/viewvc/jena/trunk/jena-examples/pom.xml?rev=1338384&r1=1338383&r2=1338384&view=diff
==============================================================================
--- jena/trunk/jena-examples/pom.xml (original)
+++ jena/trunk/jena-examples/pom.xml Mon May 14 20:20:49 2012
@@ -31,7 +31,7 @@
     <dependency>
       <groupId>org.apache.jena</groupId>
       <artifactId>jena-tdb</artifactId>
-      <version>0.9.0-incubating-SNAPSHOT</version>
+      <version>0.9.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>commons-cli</groupId>

Modified: jena/trunk/jena-parent/pom.xml
URL: http://svn.apache.org/viewvc/jena/trunk/jena-parent/pom.xml?rev=1338384&r1=1338383&r2=1338384&view=diff
==============================================================================
--- jena/trunk/jena-parent/pom.xml (original)
+++ jena/trunk/jena-parent/pom.xml Mon May 14 20:20:49 2012
@@ -51,16 +51,14 @@
   </scm>
 
   <properties>
-    <!-- Versions of other things -->
     <ver.junit>4.9</ver.junit>
     <ver.slf4j>1.6.4</ver.slf4j>
     <ver.log4j>1.2.16</ver.log4j>
-
-    <!-- Other properties -->
     <jdk.version>1.6</jdk.version>
     <targetJdk>${jdk.version}</targetJdk> <!-- MPMD-86 workaround -->
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-
+    <maven.build.timestamp.format>yyyy-MM-dd'T'HH:mm:ssZ</maven.build.timestamp.format>
+    <build.time.xsd>${maven.build.timestamp}</build.time.xsd>
   </properties>
 
   <!-- General dependencies for all systems -->
@@ -282,29 +280,5 @@
     </plugins>
 
   </reporting>
-
-  <issueManagement>
-    <system>JIRA</system>
-    <url>http://issues.apache.org/jira/browse/JENA</url>
-  </issueManagement>
   
-  <!-- Temporary for testing : file:REPO-->
-
-  <!--
-  <distributionManagement>
-    <repository>
-      <id>jena-repo</id>
-      <name>Jena repo</name>
-      <url>file:REPO</url>
-      <layout>default</layout>
-    </repository> 
-    <snapshotRepository>
-      <id>jena-repo-dev</id>
-      <name>Jena development repo</name>
-      <url>file:REPO</url>
-      <layout>default</layout>
-    </snapshotRepository>
-  </distributionManagement>
-  -->
-
 </project>

Modified: jena/trunk/pom.xml
URL: http://svn.apache.org/viewvc/jena/trunk/pom.xml?rev=1338384&r1=1338383&r2=1338384&view=diff
==============================================================================
--- jena/trunk/pom.xml (original)
+++ jena/trunk/pom.xml Mon May 14 20:20:49 2012
@@ -18,12 +18,19 @@
 <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">
   <modelVersion>4.0.0</modelVersion>
 
-  <name>jena</name>
+  <name>Apache Jena Main</name>
   <groupId>org.apache.jena</groupId>
   <artifactId>jena</artifactId>
   <packaging>pom</packaging>
   <url>http://jena.apache.org/</url>
-  <version>1-SNAPSHOT</version>
+  <version>2.7.X-SNAPSHOT</version>
+
+  <!-- Needed for -Psource-release -->
+  <parent>
+    <groupId>org.apache</groupId>
+    <artifactId>apache</artifactId>
+    <version>10</version>
+  </parent>
 
   <licenses>
     <license>
@@ -50,10 +57,48 @@
     <module>jena-arq</module>
     <!--
     <module>jena-tdb</module>
-    <module>jena-sdb</module>
     <module>jena-fuseki</module>
+    <module>jena-sdb</module>
     <module>jena-larq</module>
     -->
   </modules>
 
+  <mailingLists>
+    <mailingList>
+      <name>Jena Users Mailing List</name>
+      <post>users@jena.apache.org</post>
+      <subscribe>users-subscribe@jena.apache.org</subscribe>
+      <unsubscribe>users-unsubscribe@jena.apache.org</unsubscribe>
+      <archive>http://mail-archives.apache.org/mod_mbox/jena-users/</archive>
+      <otherArchives>
+	<otherArchive>http://www.mail-archive.com/users@jena.apache.org/</otherArchive>
+	<otherArchive>http://markmail.org/search/?q=list%3Aorg.apache.jena.users</otherArchive>
+      </otherArchives>
+    </mailingList>
+    <mailingList>
+      <name>Jena Developers Mailing List</name>
+      <post>dev@jena.apache.org</post>
+      <subscribe>dev-subscribe@jena.apache.org</subscribe>
+      <unsubscribe>dev-unsubscribe@jena.apache.org</unsubscribe>
+      <archive>http://mail-archives.apache.org/mod_mbox/jena-dev/</archive>
+      <otherArchives>
+	<otherArchive>http://www.mail-archive.com/dev@jena.apache.org/</otherArchive>
+	<otherArchive>http://markmail.org/search/?q=list%3Aorg.apache.jena.dev</otherArchive>
+      </otherArchives>
+    </mailingList>
+    <mailingList>
+      <name>Jena Commits</name>
+      <post>commits@jena.apache.org</post>
+      <subscribe>commits-subscribe@jena.apache.org</subscribe>
+      <unsubscribe>commits-unsubscribe@jena.apache.org</unsubscribe>
+      <archive>http://mail-archives.apache.org/mod_mbox/jena-commits/</archive>
+    </mailingList>
+  </mailingLists>
+  
+
+  <issueManagement>
+    <system>JIRA</system>
+    <url>http://issues.apache.org/jira/browse/JENA</url>
+  </issueManagement>
+  
 </project>