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/02/28 21:20:47 UTC
[2/3] jena git commit: Simplify and clean up POMs
Simplify and clean up POMs
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/4b1046fe
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/4b1046fe
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/4b1046fe
Branch: refs/heads/master
Commit: 4b1046feb127ef47bfbdf145c7882f7c1d71ca86
Parents: bd8b9a8
Author: Andy Seaborne <an...@apache.org>
Authored: Sat Feb 28 20:15:43 2015 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Sat Feb 28 20:15:43 2015 +0000
----------------------------------------------------------------------
jena-fuseki2/apache-jena-fuseki/pom.xml | 18 -------------
jena-fuseki2/jena-fuseki-core/pom.xml | 38 ----------------------------
jena-fuseki2/jena-fuseki-server/pom.xml | 25 +-----------------
jena-fuseki2/jena-fuseki-war/pom.xml | 27 --------------------
jena-fuseki2/pom.xml | 5 ----
5 files changed, 1 insertion(+), 112 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/4b1046fe/jena-fuseki2/apache-jena-fuseki/pom.xml
----------------------------------------------------------------------
diff --git a/jena-fuseki2/apache-jena-fuseki/pom.xml b/jena-fuseki2/apache-jena-fuseki/pom.xml
index fb2db6c..a060b1c 100644
--- a/jena-fuseki2/apache-jena-fuseki/pom.xml
+++ b/jena-fuseki2/apache-jena-fuseki/pom.xml
@@ -32,24 +32,6 @@
</parent>
<description>Fuseki distribution</description>
- <url>http://jena.apache.org/</url>
-
- <organization>
- <name>Apache Jena</name>
- <url>http://jena.apache.org/</url>
- </organization>
-
- <licenses>
- <license>
- <name>Apache 2.0 License</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0</url>
- </license>
- </licenses>
-
- <properties>
- <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>
<dependencies>
http://git-wip-us.apache.org/repos/asf/jena/blob/4b1046fe/jena-fuseki2/jena-fuseki-core/pom.xml
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-core/pom.xml b/jena-fuseki2/jena-fuseki-core/pom.xml
index 19adb01..82a200d 100644
--- a/jena-fuseki2/jena-fuseki-core/pom.xml
+++ b/jena-fuseki2/jena-fuseki-core/pom.xml
@@ -32,11 +32,7 @@
The war:war goal is added to the package phase.
-->
<packaging>jar</packaging>
- <description>Fuseki is a SPARQL 1.1 Server which provides query, update and graph store protocol endpoints that can be used to expose triple stores over HTTP</description>
- <url>http://jena.apache.org/</url>
-
- <!-- Need if the parent is a snapshot -->
<repositories>
<repository>
<id>apache.snapshots</id>
@@ -48,30 +44,6 @@
</repository>
</repositories>
- <organization>
- <name>Apache Jena</name>
- <url>http://jena.apache.org/</url>
- </organization>
-
- <licenses>
- <license>
- <name>Apache 2.0 License</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0</url>
- </license>
- </licenses>
-
- <properties>
- <this.root>${project.artifactId}-${project.version}</this.root>
-
- <server.jar.name>${this.root}-server</server.jar.name>
- <!-- Eventually, move to jena-parent -->
- <ver.jetty>9.1.1.v20140108</ver.jetty>
- <ver.shiro>1.2.2</ver.shiro>
-
- <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>
-
<dependencies>
<dependency>
@@ -100,15 +72,6 @@
<version>1.1.2-SNAPSHOT</version>
</dependency>
- <!--
- <dependency>
- <groupId>org.apache.jena</groupId>
- <artifactId>sdb</artifactId>
- <version>${ver.sdb}</version>
- <optional>true</optional>
- </dependency>
- -->
-
<dependency>
<groupId>org.apache.jena</groupId>
<artifactId>jena-text</artifactId>
@@ -171,7 +134,6 @@
<version>${ver.jetty}</version>
</dependency>
-
<!--
<dependency>
<groupId>org.eclipse.jetty</groupId>
http://git-wip-us.apache.org/repos/asf/jena/blob/4b1046fe/jena-fuseki2/jena-fuseki-server/pom.xml
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-server/pom.xml b/jena-fuseki2/jena-fuseki-server/pom.xml
index 33deeb5..2e4e9d2 100644
--- a/jena-fuseki2/jena-fuseki-server/pom.xml
+++ b/jena-fuseki2/jena-fuseki-server/pom.xml
@@ -31,9 +31,7 @@
<packaging>jar</packaging>
<description>Fuseki server - combined jar with built-in webserver.</description>
- <url>http://jena.apache.org/</url>
- <!-- Need if the parent is a snapshot -->
<repositories>
<repository>
<id>apache.snapshots</id>
@@ -45,24 +43,6 @@
</repository>
</repositories>
- <organization>
- <name>Apache Jena</name>
- <url>http://jena.apache.org/</url>
- </organization>
-
- <licenses>
- <license>
- <name>Apache 2.0 License</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0</url>
- </license>
- </licenses>
-
- <properties>
- <this.root>${project.artifactId}-${project.version}</this.root>
- <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>
-
<dependencies>
<dependency>
@@ -81,10 +61,7 @@
<artifactId>maven-shade-plugin</artifactId>
<version>2.1</version>
<configuration>
- <shadedArtifactAttached>false</shadedArtifactAttached>
- <!--
- <shadedClassifierName>server</shadedClassifierName>
- -->
+ <shadedArtifactAttached>false</shadedArtifactAttached>
<transformers>
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<mainClass>org.apache.jena.fuseki.cmd.FusekiCmd</mainClass>
http://git-wip-us.apache.org/repos/asf/jena/blob/4b1046fe/jena-fuseki2/jena-fuseki-war/pom.xml
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-war/pom.xml b/jena-fuseki2/jena-fuseki-war/pom.xml
index 4b0cc37..d622355 100644
--- a/jena-fuseki2/jena-fuseki-war/pom.xml
+++ b/jena-fuseki2/jena-fuseki-war/pom.xml
@@ -32,9 +32,6 @@
<packaging>war</packaging>
- <description>WAR file for Fuseki</description>
- <url>http://jena.apache.org/</url>
-
<!-- Need if the parent is a snapshot -->
<repositories>
<repository>
@@ -47,30 +44,6 @@
</repository>
</repositories>
- <organization>
- <name>Apache Jena</name>
- <url>http://jena.apache.org/</url>
- </organization>
-
- <licenses>
- <license>
- <name>Apache 2.0 License</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0</url>
- </license>
- </licenses>
-
- <properties>
- <this.root>${project.artifactId}-${project.version}</this.root>
-
- <server.jar.name>${this.root}-server</server.jar.name>
- <!-- Eventually, move to jena-parent -->
- <ver.jetty>9.1.1.v20140108</ver.jetty>
- <ver.shiro>1.2.2</ver.shiro>
-
- <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>
-
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/jena/blob/4b1046fe/jena-fuseki2/pom.xml
----------------------------------------------------------------------
diff --git a/jena-fuseki2/pom.xml b/jena-fuseki2/pom.xml
index f089dd1..2cc3f1f 100644
--- a/jena-fuseki2/pom.xml
+++ b/jena-fuseki2/pom.xml
@@ -58,13 +58,8 @@
</licenses>
<properties>
- <this.root>${project.artifactId}-${project.version}</this.root>
-
- <server.jar.name>${this.root}-server</server.jar.name>
- <!-- Eventually, move to jena-parent -->
<ver.jetty>9.1.1.v20140108</ver.jetty>
<ver.shiro>1.2.2</ver.shiro>
-
<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>