[maven-release-plugin] copy for tag jena-2.7.4
git-svn-id: https://svn.apache.org/repos/asf/jena/tags/jena-2.7.4@1400480 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/jena-arq/pom.xml b/jena-arq/pom.xml
index 1ee38e9..f8b9e1b 100644
--- a/jena-arq/pom.xml
+++ b/jena-arq/pom.xml
@@ -22,7 +22,6 @@
<artifactId>jena-arq</artifactId>
<packaging>jar</packaging>
<name>jena-arq</name>
- <!--<version>${ver.arq}</version>-->
<version>2.9.4</version>
<parent>
@@ -54,10 +53,6 @@
<properties>
<this.root>${project.artifactId}-${project.version}</this.root>
-
- <ver.iri>0.9.2</ver.iri>
- <ver.jena>2.7.2</ver.jena>
-
<ver.httpclient>4.1.2</ver.httpclient>
<ver.httpcore>4.1.3</ver.httpcore>
<ver.commons-codec>1.5</ver.commons-codec>
diff --git a/jena-core/pom.xml b/jena-core/pom.xml
index 345684d..96e6f8e 100644
--- a/jena-core/pom.xml
+++ b/jena-core/pom.xml
@@ -53,7 +53,6 @@
<properties>
<ver.xerces>2.10.0</ver.xerces>
- <ver.iri>0.9.2</ver.iri>
<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>
diff --git a/jena-examples/pom.xml b/jena-examples/pom.xml
index 298d03f..51de52c 100644
--- a/jena-examples/pom.xml
+++ b/jena-examples/pom.xml
@@ -31,6 +31,7 @@
<url>http://jena.apache.org/</url>
<properties>
+ <ver.jena-tdb>0.9.4</ver.jena-tdb>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
@@ -41,6 +42,11 @@
<dependencies>
<dependency>
+ <groupId>org.apache.jena</groupId>
+ <artifactId>jena-tdb</artifactId>
+ <version>${ver.jena-tdb}</version>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.10</version>
@@ -48,11 +54,6 @@
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>org.apache.jena</groupId>
- <artifactId>jena-tdb</artifactId>
- <version>0.9.3</version>
- </dependency>
- <dependency>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
<version>1.2</version>
diff --git a/jena-fuseki/fuseki-server b/jena-fuseki/fuseki-server
index 12f7706..d62a079 100755
--- a/jena-fuseki/fuseki-server
+++ b/jena-fuseki/fuseki-server
@@ -50,7 +50,8 @@
case "`uname`" in
CYGWIN*) cygwin=true;;
esac
-if [ "$cygwin" == "true" ]; then
+if [ "$cygwin" = "true" ]
+then
JAR=`cygpath -w "$JAR"`
FUSEKI_HOME=`cygpath -w "$FUSEKI_HOME"`
fi
diff --git a/jena-fuseki/pom.xml b/jena-fuseki/pom.xml
index bfe4cb9..06457ad 100644
--- a/jena-fuseki/pom.xml
+++ b/jena-fuseki/pom.xml
@@ -74,7 +74,6 @@
<assembly.soh.name>${this.root}</assembly.soh.name>
<assembly.zip.name>${this.root}</assembly.zip.name>
- <!-- 7.6.5.v20120716 -->
<!-- 8.1.5.v20120716 -->
<ver.jetty>7.6.5.v20120716</ver.jetty>
<ver.velocity>1.7</ver.velocity>
@@ -83,8 +82,6 @@
<ver.httpcore>4.1.3</ver.httpcore>
<ver.commons-fileupload>1.2.2</ver.commons-fileupload>
<ver.commons-codec>1.5</ver.commons-codec>
- <ver.slf4j>1.6.4</ver.slf4j>
- <ver.log4j>1.2.16</ver.log4j>
<maven.build.timestamp.format>yyyy-MM-dd'T'HH:mm:ssZ</maven.build.timestamp.format>
<build.time.xsd>${maven.build.timestamp}</build.time.xsd>
diff --git a/jena-fuseki/src/main/java/org/apache/jena/fuseki/server/SPARQLServer.java b/jena-fuseki/src/main/java/org/apache/jena/fuseki/server/SPARQLServer.java
index 80c4241..ad23bb1 100644
--- a/jena-fuseki/src/main/java/org/apache/jena/fuseki/server/SPARQLServer.java
+++ b/jena-fuseki/src/main/java/org/apache/jena/fuseki/server/SPARQLServer.java
@@ -84,8 +84,9 @@
String now = Utils.nowAsString() ;
//serverLog.info(format("%s %s", Fuseki.NAME, Fuseki.VERSION)) ;
serverLog.info(format("%s %s %s", Fuseki.NAME, Fuseki.VERSION, Fuseki.BUILD_DATE)) ;
- String jettyVersion = org.eclipse.jetty.server.Server.getVersion() ;
- serverLog.info(format("Jetty %s",jettyVersion)) ;
+ // This does not get set usefully for Jetty as we use it.
+// String jettyVersion = org.eclipse.jetty.server.Server.getVersion() ;
+// serverLog.info(format("Jetty %s",jettyVersion)) ;
String host = server.getConnectors()[0].getHost();
if (host != null)
serverLog.info("Incoming connections limited to " + host);
diff --git a/jena-iri/pom.xml b/jena-iri/pom.xml
index 2b23a52..fcb3356 100644
--- a/jena-iri/pom.xml
+++ b/jena-iri/pom.xml
@@ -24,7 +24,6 @@
<artifactId>jena-iri</artifactId>
<packaging>jar</packaging>
<name>jena-iri</name>
- <!--<version>${ver.iri}</version>-->
<version>0.9.4</version>
<description />
diff --git a/jena-larq/pom.xml b/jena-larq/pom.xml
index ba1da69..78688a5 100644
--- a/jena-larq/pom.xml
+++ b/jena-larq/pom.xml
@@ -55,8 +55,8 @@
<properties>
<ver.lucene>3.6.1</ver.lucene>
- <ver.arq>2.9.4-SNAPSHOT</ver.arq>
- <ver.tdb>0.9.4-SNAPSHOT</ver.tdb>
+ <ver.arq>2.9.4</ver.arq>
+ <ver.tdb>0.9.4</ver.tdb>
</properties>
<dependencies>
diff --git a/jena-parent/pom.xml b/jena-parent/pom.xml
index 94e9872..ebca09f 100644
--- a/jena-parent/pom.xml
+++ b/jena-parent/pom.xml
@@ -51,11 +51,13 @@
</scm>
<properties>
- <ver.junit>4.9</ver.junit>
<ver.slf4j>1.6.4</ver.slf4j>
<ver.log4j>1.2.16</ver.log4j>
+ <ver.junit>4.9</ver.junit>
+
<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>
diff --git a/jena-sdb/pom.xml b/jena-sdb/pom.xml
index 1d8c269..68892d7 100644
--- a/jena-sdb/pom.xml
+++ b/jena-sdb/pom.xml
@@ -16,7 +16,9 @@
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">
+<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>jena-sdb</artifactId>
@@ -27,7 +29,7 @@
<parent>
<groupId>org.apache.jena</groupId>
<artifactId>jena-parent</artifactId>
- <version>3</version>
+ <version>4</version>
<relativePath>../jena-parent</relativePath>
</parent>
@@ -41,8 +43,8 @@
<properties>
<this.root>${project.artifactId}-${project.version}</this.root>
- <ver.jena>2.7.4-SNAPSHOT</ver.jena>
- <ver.arq>2.9.4-SNAPSHOT</ver.arq>
+ <ver.jena>2.7.4</ver.jena>
+ <ver.arq>2.9.4</ver.arq>
<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>
diff --git a/jena-tdb/pom.xml b/jena-tdb/pom.xml
index c3432bc..7faf48a 100644
--- a/jena-tdb/pom.xml
+++ b/jena-tdb/pom.xml
@@ -53,28 +53,10 @@
<properties>
<this.root>${project.artifactId}-${project.version}</this.root>
-
- <ver.jena>2.7.2-SNAPSHOT</ver.jena>
- <ver.arq>2.9.2-SNAPSHOT</ver.arq>
-
<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>
- <!-- Testing against staged artifacts - ->
- <repositories>
- <repository>
- <id>apache.jena.staging</id>
- <name>Apache jena Staging Repository</name>
- <url>https://repository.apache.org/content/repositories/releases/</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
- </repositories>
- -->
-
<dependencies>
<dependency>
