jena-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a...@apache.org
Subject [4/6] jena git commit: Tidy POMs
Date Tue, 21 Nov 2017 10:06:17 GMT
Tidy POMs

* Remove unmecessary <repositories> sections
* Remove unnecessary plugin configurations
* Reword apache-jena-libs description
* Reformat license in apache-jena-libs/pom.xml and jena-extras/pom.xml


Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/00f2bc25
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/00f2bc25
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/00f2bc25

Branch: refs/heads/master
Commit: 00f2bc250d25b42a54702f4fd598a8a364a16be6
Parents: d290a11
Author: Andy Seaborne <andy@apache.org>
Authored: Sat Nov 18 11:27:03 2017 +0000
Committer: Andy Seaborne <andy@apache.org>
Committed: Sat Nov 18 11:27:03 2017 +0000

----------------------------------------------------------------------
 apache-jena-libs/pom.xml                | 50 +++++++-------
 apache-jena-osgi/jena-osgi-test/pom.xml | 11 ----
 apache-jena-osgi/pom.xml                | 11 ----
 jena-arq/pom.xml                        | 12 ----
 jena-cmds/pom.xml                       | 11 ----
 jena-csv/pom.xml                        | 19 ------
 jena-examples/pom.xml                   | 21 ------
 jena-extras/pom.xml                     | 98 ++++------------------------
 jena-fuseki1/pom.xml                    | 12 ----
 jena-fuseki2/jena-fuseki-core/pom.xml   | 11 ----
 jena-fuseki2/jena-fuseki-server/pom.xml | 11 ----
 jena-fuseki2/jena-fuseki-war/pom.xml    | 12 ----
 jena-fuseki2/pom.xml                    | 11 ----
 jena-jdbc/pom.xml                       | 12 ----
 jena-tdb/pom.xml                        | 12 ----
 15 files changed, 39 insertions(+), 275 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jena/blob/00f2bc25/apache-jena-libs/pom.xml
----------------------------------------------------------------------
diff --git a/apache-jena-libs/pom.xml b/apache-jena-libs/pom.xml
index 9fc141b..8c17070 100644
--- a/apache-jena-libs/pom.xml
+++ b/apache-jena-libs/pom.xml
@@ -1,17 +1,27 @@
 <?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 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. -->
-
-<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">
+<!--
+   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
+
+   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>apache-jena-libs</artifactId>
   <packaging>pom</packaging>
   <name>Apache Jena - Libraries POM</name>
@@ -24,19 +34,9 @@
     <relativePath>..</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>
-
-  <description>A convenience POM artifact that may be referenced to pull in all the
standard Jena Libraries (Core, ARQ, IRI, and TDB) with a single dependency.</description>
+  <description>
+    A POM artifact that references all the standard Jena Libraries with a single dependency.
+  </description>
 
   <dependencies>
 

http://git-wip-us.apache.org/repos/asf/jena/blob/00f2bc25/apache-jena-osgi/jena-osgi-test/pom.xml
----------------------------------------------------------------------
diff --git a/apache-jena-osgi/jena-osgi-test/pom.xml b/apache-jena-osgi/jena-osgi-test/pom.xml
index 1267d3d..eb3e457 100644
--- a/apache-jena-osgi/jena-osgi-test/pom.xml
+++ b/apache-jena-osgi/jena-osgi-test/pom.xml
@@ -37,17 +37,6 @@
     <pax.exam.version>4.4.0</pax.exam.version>
   </properties>
 
-  <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>
-
   <dependencies>
     <dependency>
       <groupId>org.apache.jena</groupId>

http://git-wip-us.apache.org/repos/asf/jena/blob/00f2bc25/apache-jena-osgi/pom.xml
----------------------------------------------------------------------
diff --git a/apache-jena-osgi/pom.xml b/apache-jena-osgi/pom.xml
index efbcae7..6bbc82b 100644
--- a/apache-jena-osgi/pom.xml
+++ b/apache-jena-osgi/pom.xml
@@ -32,17 +32,6 @@
   <description>Apache Jena OSGi distribution and test</description>
   <packaging>pom</packaging>
 
-  <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>
-
   <modules>
     <module>jena-osgi</module>
     <module>jena-osgi-features</module>

http://git-wip-us.apache.org/repos/asf/jena/blob/00f2bc25/jena-arq/pom.xml
----------------------------------------------------------------------
diff --git a/jena-arq/pom.xml b/jena-arq/pom.xml
index fb81613..49871e3 100644
--- a/jena-arq/pom.xml
+++ b/jena-arq/pom.xml
@@ -30,18 +30,6 @@
     <relativePath>..</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>
-
   <description>ARQ is a SPARQL 1.1 query engine for Apache Jena</description>
 
   <properties>

http://git-wip-us.apache.org/repos/asf/jena/blob/00f2bc25/jena-cmds/pom.xml
----------------------------------------------------------------------
diff --git a/jena-cmds/pom.xml b/jena-cmds/pom.xml
index 626bb64..093bbff 100644
--- a/jena-cmds/pom.xml
+++ b/jena-cmds/pom.xml
@@ -35,17 +35,6 @@
   
   <url>http://jena.apache.org/</url>
 
-  <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>
-
   <organization>
     <name>Apache Jena</name>
     <url>http://jena.apache.org/</url>

http://git-wip-us.apache.org/repos/asf/jena/blob/00f2bc25/jena-csv/pom.xml
----------------------------------------------------------------------
diff --git a/jena-csv/pom.xml b/jena-csv/pom.xml
index 50cf494..08be5dc 100644
--- a/jena-csv/pom.xml
+++ b/jena-csv/pom.xml
@@ -30,18 +30,6 @@
     <relativePath>..</relativePath>
   </parent>
   
-  
-  <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>
-  
   <description>jena-csv is for getting CSVs into a form that is amenable to Jena SPARQL
processing, and doing so in a way that is not specific to CSV files. It includes getting the
right architecture in place for regular table shaped data, using the core abstraction of PropertyTable.</description>

   
   <properties>
@@ -151,13 +139,6 @@
         </configuration>
       </plugin>
 
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-release-plugin</artifactId>
-        <configuration>
-          <tagBase>https://svn.apache.org/repos/asf/jena/tags/</tagBase>
-        </configuration>
-      </plugin>
     </plugins>
 
   </build>

http://git-wip-us.apache.org/repos/asf/jena/blob/00f2bc25/jena-examples/pom.xml
----------------------------------------------------------------------
diff --git a/jena-examples/pom.xml b/jena-examples/pom.xml
index 92a2533..efd2549 100644
--- a/jena-examples/pom.xml
+++ b/jena-examples/pom.xml
@@ -61,25 +61,4 @@
     </dependency>
   </dependencies>
 
-  <repositories>
-    <repository>
-      <id>apache-repo-snapshots</id>
-      <url>http://repository.apache.org/content/repositories/snapshots/</url>
-      <releases>
-        <enabled>false</enabled>
-      </releases>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-    </repository>
-
-    <repository>
-      <id>apache-repo-releases</id>
-      <url>http://repository.apache.org/content/repositories/releases/</url>
-      <releases>
-       <enabled>true</enabled>
-      </releases>
-    </repository>
-  </repositories>
-
 </project>

http://git-wip-us.apache.org/repos/asf/jena/blob/00f2bc25/jena-extras/pom.xml
----------------------------------------------------------------------
diff --git a/jena-extras/pom.xml b/jena-extras/pom.xml
index 248705e..40d61ed 100644
--- a/jena-extras/pom.xml
+++ b/jena-extras/pom.xml
@@ -1,20 +1,21 @@
 <?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/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <artifactId>jena-extras</artifactId>
@@ -33,18 +34,6 @@ limitations under the License.
     <relativePath>..</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>
-
   <modules>
     <module>jena-querybuilder</module>
   </modules>
@@ -55,66 +44,6 @@ limitations under the License.
     <jena-version>${project.version}</jena-version>
   </properties>
 
-  <build>
-    <plugins>
-      <!-- Compiler Plugin -->
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <source>${jdk.version}</source>
-          <target>${jdk.version}</target>
-          <encoding>${project.build.sourceEncoding}</encoding>
-        </configuration>
-      </plugin>
-      <!-- License Plugin -->
-      <!--  
-        <plugin>
-        <groupId>com.mycila.maven-license-plugin</groupId>
-        <artifactId>maven-license-plugin</artifactId>
-        <version>${plugin.license.version}</version>
-        <executions>
-        <execution>
-        <phase>package</phase>
-        <goals>
-        <goal>check</goal>
-        </goals>
-        </execution>
-        </executions>
-        <configuration>
-        <header>${plugin.license.headerPath}/license-header.txt</header>
-        <failIfMissing>true</failIfMissing>
-        <aggregate>true</aggregate>
-        <excludes>
-        <exclude>**/*.git*</exclude>
-        <exclude>**/*.md</exclude>
-        <exclude>**/*.xml</exclude>
-        <exclude>**/*.properties</exclude>
-        <exclude>**/LICENSE</exclude>
-        <exclude>**/NOTICE</exclude>
-        </excludes>
-        <useDefaultMapping>true</useDefaultMapping>
-        <strictCheck>true</strictCheck>
-        </configuration>
-        </plugin>
-      -->
-      <!-- Sources Plugin -->
-      <plugin>
-        <artifactId>maven-source-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>bundle-sources</id>
-            <phase>package</phase>
-            <goals>
-              <!-- produce source artifact for main project sources -->
-              <goal>jar-no-fork</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-
-    </plugins>
-  </build>
   <dependencyManagement>
     <dependencies>
       <dependency>
@@ -131,4 +60,5 @@ limitations under the License.
       </dependency>   
     </dependencies>
   </dependencyManagement>
+
 </project>

http://git-wip-us.apache.org/repos/asf/jena/blob/00f2bc25/jena-fuseki1/pom.xml
----------------------------------------------------------------------
diff --git a/jena-fuseki1/pom.xml b/jena-fuseki1/pom.xml
index e31c9fb..376f342 100644
--- a/jena-fuseki1/pom.xml
+++ b/jena-fuseki1/pom.xml
@@ -32,18 +32,6 @@
     <relativePath>..</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>
-
   <organization>
     <name>Apache Jena</name>
     <url>http://jena.apache.org/</url>

http://git-wip-us.apache.org/repos/asf/jena/blob/00f2bc25/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 ff76c47..9303ce2 100644
--- a/jena-fuseki2/jena-fuseki-core/pom.xml
+++ b/jena-fuseki2/jena-fuseki-core/pom.xml
@@ -29,17 +29,6 @@
   <artifactId>jena-fuseki-core</artifactId>
   <packaging>jar</packaging>
 
-  <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>
-
   <dependencies>
 
     <dependency>

http://git-wip-us.apache.org/repos/asf/jena/blob/00f2bc25/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 d69816b..92167cf 100644
--- a/jena-fuseki2/jena-fuseki-server/pom.xml
+++ b/jena-fuseki2/jena-fuseki-server/pom.xml
@@ -32,17 +32,6 @@
   <packaging>jar</packaging>
   <description>Fuseki server - combined jar with built-in webserver.</description>
 
-  <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>
-
   <dependencies>
 
     <dependency>

http://git-wip-us.apache.org/repos/asf/jena/blob/00f2bc25/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 17092d9..81d1b9a 100644
--- a/jena-fuseki2/jena-fuseki-war/pom.xml
+++ b/jena-fuseki2/jena-fuseki-war/pom.xml
@@ -31,18 +31,6 @@
 
   <packaging>war</packaging>
 
-  <!-- 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>
-
   <dependencies>
 
     <dependency>

http://git-wip-us.apache.org/repos/asf/jena/blob/00f2bc25/jena-fuseki2/pom.xml
----------------------------------------------------------------------
diff --git a/jena-fuseki2/pom.xml b/jena-fuseki2/pom.xml
index b8f9efd..f2ce638 100644
--- a/jena-fuseki2/pom.xml
+++ b/jena-fuseki2/pom.xml
@@ -37,17 +37,6 @@
   
   <url>http://jena.apache.org/</url>
 
-  <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>
-
   <organization>
     <name>Apache Jena</name>
     <url>http://jena.apache.org/</url>

http://git-wip-us.apache.org/repos/asf/jena/blob/00f2bc25/jena-jdbc/pom.xml
----------------------------------------------------------------------
diff --git a/jena-jdbc/pom.xml b/jena-jdbc/pom.xml
index 435a8c4..9fe1025 100644
--- a/jena-jdbc/pom.xml
+++ b/jena-jdbc/pom.xml
@@ -33,18 +33,6 @@
 		<relativePath>..</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>
-
 	<modules>
 		<module>jena-jdbc-core</module>
 		<module>jena-jdbc-driver-remote</module>

http://git-wip-us.apache.org/repos/asf/jena/blob/00f2bc25/jena-tdb/pom.xml
----------------------------------------------------------------------
diff --git a/jena-tdb/pom.xml b/jena-tdb/pom.xml
index c515935..fe1b554 100644
--- a/jena-tdb/pom.xml
+++ b/jena-tdb/pom.xml
@@ -30,18 +30,6 @@
     <relativePath>..</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>
-
   <description>TDB is a storage subsystem for Jena and ARQ, it is a native triple store
providing persisent disk based storage of triples/quads.</description>
 
   <properties>


Mime
View raw message