jena-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rve...@apache.org
Subject jena git commit: Revert "First pass at creating a webapp distribution package"
Date Thu, 11 Feb 2016 14:42:14 GMT
Repository: jena
Updated Branches:
  refs/heads/master f06e8ecc9 -> 9c4a0f86e


Revert "First pass at creating a webapp distribution package"

This reverts commit f06e8ecc94e1bf408f9973b43c78622a4be33bd8.


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

Branch: refs/heads/master
Commit: 9c4a0f86ecc7f17f8a30302e2a737dc7ff4ae509
Parents: f06e8ec
Author: Rob Vesse <rvesse@apache.org>
Authored: Thu Feb 11 14:41:53 2016 +0000
Committer: Rob Vesse <rvesse@apache.org>
Committed: Thu Feb 11 14:41:53 2016 +0000

----------------------------------------------------------------------
 .../jena-fuseki-core/assembly-webapp.xml        | 53 --------------------
 jena-fuseki2/jena-fuseki-core/pom.xml           | 23 +--------
 2 files changed, 2 insertions(+), 74 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jena/blob/9c4a0f86/jena-fuseki2/jena-fuseki-core/assembly-webapp.xml
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-core/assembly-webapp.xml b/jena-fuseki2/jena-fuseki-core/assembly-webapp.xml
deleted file mode 100644
index 9ef8117..0000000
--- a/jena-fuseki2/jena-fuseki-core/assembly-webapp.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?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.
--->
-
-<assembly
-  xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0
http://maven.apache.org/xsd/assembly-1.1.0.xsd">
-
-  <id>webapp</id>
-
-  <formats>
-    <format>zip</format>
-    <format>tar.gz</format>
-  </formats>
-  
-  <!-- TODO Figure out what LICENSE and NOTICE are need -->
-  <!-- 
-  <files>
-    <file>
-      <source>dist/LICENSE</source>
-      <destName>LICENSE</destName>
-    </file>
-    <file>
-      <source>dist/NOTICE</source>
-      <destName>NOTICE</destName>
-    </file>
-  </files>
-  -->
-
-  <fileSets>
-
-    <fileSet>
-      <directory>../jena-fuseki-core/src/main/webapp</directory>
-      <outputDirectory>webapp</outputDirectory>
-    </fileSet>
-
-  </fileSets>
-</assembly>

http://git-wip-us.apache.org/repos/asf/jena/blob/9c4a0f86/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 d76517f..1d9ce8c 100644
--- a/jena-fuseki2/jena-fuseki-core/pom.xml
+++ b/jena-fuseki2/jena-fuseki-core/pom.xml
@@ -16,8 +16,7 @@
    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>
   <parent>
     <groupId>org.apache.jena</groupId>
@@ -54,7 +53,7 @@
       <type>pom</type>
     </dependency>
 
-    <dependency>
+      <dependency>
       <groupId>org.apache.jena</groupId>
       <artifactId>jena-cmds</artifactId>
       <version>3.1.0-SNAPSHOT</version>
@@ -273,24 +272,6 @@
         </configuration>
       </plugin>
 
-      <plugin>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <version>2.6</version>
-        <configuration>
-          <descriptors>
-            <descriptor>assembly-webapp.xml</descriptor>
-          </descriptors>
-        </configuration>
-        <executions>
-          <execution>
-            <phase>package</phase>
-            <goals>
-              <goal>single</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-
     </plugins>
 
   </build>


Mime
View raw message