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 2015/04/24 19:01:22 UTC
[1/3] jena git commit: Update references to repackaged source code
Repository: jena
Updated Branches:
refs/heads/jena3 7be89fbfc -> 72fd5768b
Update references to repackaged source code
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/a64096a3
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/a64096a3
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/a64096a3
Branch: refs/heads/jena3
Commit: a64096a3088112849af8c4b05e130b19736b84ca
Parents: 7be89fb
Author: Andy Seaborne <an...@apache.org>
Authored: Fri Apr 24 17:40:20 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Fri Apr 24 17:40:20 2015 +0100
----------------------------------------------------------------------
LICENSE | 6 +++---
apache-jena/LICENSE | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/a64096a3/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index 944080e..5f2c0fc 100644
--- a/LICENSE
+++ b/LICENSE
@@ -177,9 +177,9 @@
----------------------------------------------------------------------------------
The following files contain code contributed by Plugged In Software:
-src/main/java/com/hp/hpl/jena/rdf/arp/ExtendedHandler.java
-src/main/java/com/hp/hpl/jena/rdf/arp/impl/XMLHandler.java
-src/main/java/com/hp/hpl/jena/rdf/arp/ARP.java
+src/main/java/org/apache/jena/rdf/arp/ExtendedHandler.java
+src/main/java/org/apache/jena/rdf/arp/impl/XMLHandler.java
+src/main/java/org/apache/jena/rdf/arp/ARP.java
(c) Copyright 2003, Plugged In Software
http://git-wip-us.apache.org/repos/asf/jena/blob/a64096a3/apache-jena/LICENSE
----------------------------------------------------------------------
diff --git a/apache-jena/LICENSE b/apache-jena/LICENSE
index 49a0679..e4f7412 100644
--- a/apache-jena/LICENSE
+++ b/apache-jena/LICENSE
@@ -178,9 +178,9 @@
The following files contain code contributed by Plugged In Software:
-src/main/java/com/hp/hpl/jena/rdf/arp/ExtendedHandler.java
-src/main/java/com/hp/hpl/jena/rdf/arp/impl/XMLHandler.java
-src/main/java/com/hp/hpl/jena/rdf/arp/ARP.java
+src/main/java/org/apache/jena/rdf/arp/ExtendedHandler.java
+src/main/java/org/apache/jena/rdf/arp/impl/XMLHandler.java
+src/main/java/org/apache/jena/rdf/arp/ARP.java
(c) Copyright 2003, Plugged In Software
[3/3] jena git commit: Fixup jena-maven-tools build
Posted by an...@apache.org.
Fixup jena-maven-tools build
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/72fd5768
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/72fd5768
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/72fd5768
Branch: refs/heads/jena3
Commit: 72fd5768b2bf729a79708021ba4aba828f8989dc
Parents: 3ddf233
Author: Andy Seaborne <an...@apache.org>
Authored: Fri Apr 24 18:01:13 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Fri Apr 24 18:01:13 2015 +0100
----------------------------------------------------------------------
jena-maven-tools/pom.xml | 285 ++++++++++++++++++++----------------------
pom.xml | 6 -
2 files changed, 134 insertions(+), 157 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/72fd5768/jena-maven-tools/pom.xml
----------------------------------------------------------------------
diff --git a/jena-maven-tools/pom.xml b/jena-maven-tools/pom.xml
index a837f63..a9c259b 100644
--- a/jena-maven-tools/pom.xml
+++ b/jena-maven-tools/pom.xml
@@ -1,30 +1,30 @@
<?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
+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
+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.
+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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>jena-maven-tools</artifactId>
<packaging>maven-plugin</packaging>
- <version>0.9-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
<name>Apache Jena - Maven Plugins, including schemagen</name>
<description>Plugins for Apache Maven to perform source management activities,
- such as generating Java files from RDF vocabulary sources using
- Jena's schemagen tool</description>
+ such as generating Java files from RDF vocabulary sources using
+ Jena's schemagen tool</description>
<url>http://apache.jena.org</url>
<parent>
@@ -34,35 +34,19 @@
<relativePath>../jena-parent</relativePath>
</parent>
- <!-- Need if the parent is a snapshot -->
- <repositories>
- <repository>
- <id>apache.snapshots</id>
- <name>Apache Snapshot Repository</name>
- <url>http://repository.apache.org/snapshots</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- </repository>
- </repositories>
-
- <issueManagement>
- <system>Jira</system>
- <url>https://issues.apache.org/jira/browse/JENA</url>
- </issueManagement>
<developers>
<developer>
<id>ian</id>
<name>Ian Dickinson</name>
<email>ijd@apache.org</email>
<timezone>+0</timezone>
- </developer>
- <developer>
- <id>bimargulies</id>
- <name>Benson Margulies</name>
- <email>bimargulies@apache.org</email>
- <timezone>+5</timezone>
- </developer>
+ </developer>
+ <developer>
+ <id>bimargulies</id>
+ <name>Benson Margulies</name>
+ <email>bimargulies@apache.org</email>
+ <timezone>+5</timezone>
+ </developer>
</developers>
<licenses>
<license>
@@ -76,91 +60,92 @@
<name>Apache</name>
<url>http://www.apache.org</url>
</organization>
+
<properties>
- <jenaCoreVersion>3.0.0-SNAPSHOT</jenaCoreVersion>
- <version>${project.version}</version>
- <mavenVersion>3.0.4</mavenVersion>
+ <jenaCoreVersion>${project.version}</jenaCoreVersion>
+ <version>${project.version}</version>
+ <mavenVersion>3.0.4</mavenVersion>
</properties>
+
<build>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-plugin-plugin</artifactId>
- <configuration>
- <!-- see http://jira.codehaus.org/browse/MNG-5346 -->
- <skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
- </configuration>
- <executions>
- <execution>
- <id>mojo-descriptor</id>
- <goals>
- <goal>descriptor</goal>
- </goals>
- </execution>
- <!-- if you want to generate help goal -->
- <execution>
- <id>help-goal</id>
- <goals>
- <goal>helpmojo</goal>
- </goals>
- </execution>
- </executions>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-plugin-plugin</artifactId>
+ <configuration>
+ <!-- see http://jira.codehaus.org/browse/MNG-5346 -->
+ <skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
+ </configuration>
+ <executions>
+ <execution>
+ <id>mojo-descriptor</id>
+ <goals>
+ <goal>descriptor</goal>
+ </goals>
+ </execution>
+ <!-- if you want to generate help goal -->
+ <execution>
+ <id>help-goal</id>
+ <goals>
+ <goal>helpmojo</goal>
+ </goals>
+ </execution>
+ </executions>
</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>Apache Jena Maven Tools</windowtitle>
- <doctitle>Apache Jena Maven Tools ${project.version}</doctitle>
- <bottom>Licenced under the Apache License, Version 2.0</bottom>
- </configuration>
+ <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>Apache Jena Maven Tools</windowtitle>
+ <doctitle>Apache Jena Maven Tools ${project.version}</doctitle>
+ <bottom>Licenced under the Apache License, Version 2.0</bottom>
+ </configuration>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-invoker-plugin</artifactId>
- <configuration>
- <debug>true</debug>
- <localRepositoryPath>${project.build.directory}/it-repo</localRepositoryPath>
- <postBuildHookScript>verify</postBuildHookScript>
- <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
- </configuration>
- <executions>
- <execution>
- <id>integration-test</id>
- <goals>
- <goal>install</goal>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- <dependencies>
- <dependency>
- <groupId>org.apache.maven.shared</groupId>
- <artifactId>maven-verifier</artifactId>
- <version>1.2</version>
- <exclusions>
- <exclusion>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- </dependencies>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-invoker-plugin</artifactId>
+ <configuration>
+ <debug>true</debug>
+ <localRepositoryPath>${project.build.directory}/it-repo</localRepositoryPath>
+ <postBuildHookScript>verify</postBuildHookScript>
+ <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
+ </configuration>
+ <executions>
+ <execution>
+ <id>integration-test</id>
+ <goals>
+ <goal>install</goal>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.shared</groupId>
+ <artifactId>maven-verifier</artifactId>
+ <version>1.2</version>
+ <exclusions>
+ <exclusion>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ </dependencies>
</plugin>
<plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <version>0.10</version>
- <configuration>
- <excludes>
- <exclude>**/target/**/*</exclude>
- <exclude>**/*.log</exclude>
- </excludes>
- </configuration>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>**/target/**/*</exclude>
+ <exclude>**/*.log</exclude>
+ </excludes>
+ </configuration>
</plugin>
</plugins>
</build>
@@ -170,14 +155,14 @@
<artifactId>maven-plugin-annotations</artifactId>
<version>3.2</version>
<exclusions>
- <exclusion>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-utils</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-artifact</artifactId>
- </exclusion>
+ <exclusion>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-artifact</artifactId>
+ </exclusion>
</exclusions>
<scope>provided</scope>
</dependency>
@@ -186,14 +171,14 @@
<artifactId>maven-plugin-api</artifactId>
<version>${mavenVersion}</version>
<exclusions>
- <exclusion>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-utils</artifactId>
- </exclusion>
- <exclusion>
- <artifactId>org.eclipse.sisu.plexus</artifactId>
- <groupId>org.eclipse.sisu</groupId>
- </exclusion>
+ <exclusion>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ </exclusion>
+ <exclusion>
+ <artifactId>org.eclipse.sisu.plexus</artifactId>
+ <groupId>org.eclipse.sisu</groupId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -209,43 +194,41 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.8.1</version>
</dependency>
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-verifier</artifactId>
<version>1.2</version>
<exclusions>
- <exclusion>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </exclusion>
+ <exclusion>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-core</artifactId>
+ <version>${mavenVersion}</version>
+ <scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ </exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-core</artifactId>
- <version>${mavenVersion}</version>
- <scope>provided</scope>
- <exclusions>
- <exclusion>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-utils</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
</dependencies>
<reporting>
<plugins>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>jxr-maven-plugin</artifactId>
- <version>1.5</version>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>jxr-maven-plugin</artifactId>
+ <version>1.5</version>
</plugin>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>surefire-report-maven-plugin</artifactId>
- <version>2.16</version>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>surefire-report-maven-plugin</artifactId>
</plugin>
</plugins>
</reporting>
http://git-wip-us.apache.org/repos/asf/jena/blob/72fd5768/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 6495b7a..a4c49c9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -121,14 +121,8 @@
<module>jena-permissions</module>
<module>jena-jdbc</module>
- <!-- Jena3 note:
- "mvn release:update-versions" did not work
- cleanly on this module so skipped depending
- manual update
<module>jena-maven-tools</module>
- -->
<module>jena-elephas</module>
-
<module>apache-jena</module>
<module>apache-jena-osgi</module>
[2/3] jena git commit: Script tdbloader2worker uses code in main
codebase
Posted by an...@apache.org.
Script tdbloader2worker uses code in main codebase
Script tdbloader2worker uses code in main codebase
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/3ddf2334
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/3ddf2334
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/3ddf2334
Branch: refs/heads/jena3
Commit: 3ddf23342998840b65f6e69ea1a4143f38fce986
Parents: a64096a
Author: Andy Seaborne <an...@apache.org>
Authored: Fri Apr 24 17:43:45 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Fri Apr 24 17:45:17 2015 +0100
----------------------------------------------------------------------
apache-jena/bin/tdbloader2worker | 2 +-
jena-tdb/bin/tdbloader2worker | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/3ddf2334/apache-jena/bin/tdbloader2worker
----------------------------------------------------------------------
diff --git a/apache-jena/bin/tdbloader2worker b/apache-jena/bin/tdbloader2worker
index 52cffd7..ca26d82 100755
--- a/apache-jena/bin/tdbloader2worker
+++ b/apache-jena/bin/tdbloader2worker
@@ -42,7 +42,7 @@ then
fi
USAGE="Usage: tdbloader2 --loc location datafile ..."
-PKG=com.hp.hpl.jena.tdb.store.bulkloader2
+PKG=org.apache.jena.tdb.store.bulkloader2
if [ "$#" -lt 2 ] ; then echo "$USAGE" 1>&2 ; exit 1 ; fi
http://git-wip-us.apache.org/repos/asf/jena/blob/3ddf2334/jena-tdb/bin/tdbloader2worker
----------------------------------------------------------------------
diff --git a/jena-tdb/bin/tdbloader2worker b/jena-tdb/bin/tdbloader2worker
index 52cffd7..ca26d82 100755
--- a/jena-tdb/bin/tdbloader2worker
+++ b/jena-tdb/bin/tdbloader2worker
@@ -42,7 +42,7 @@ then
fi
USAGE="Usage: tdbloader2 --loc location datafile ..."
-PKG=com.hp.hpl.jena.tdb.store.bulkloader2
+PKG=org.apache.jena.tdb.store.bulkloader2
if [ "$#" -lt 2 ] ; then echo "$USAGE" 1>&2 ; exit 1 ; fi