olingo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sklev...@apache.org
Subject [48/51] [abbrv] git commit: [OLINGO-175] removed parent's license dependency
Date Fri, 04 Apr 2014 05:26:52 GMT
[OLINGO-175] removed parent's license dependency


Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/8888b051
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/8888b051
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/8888b051

Branch: refs/heads/olingo-206-validator
Commit: 8888b051bb4844e20e93ad1ed9fc19adaa53b5be
Parents: 809519f
Author: fmartelli <fabio.martelli@gmail.com>
Authored: Thu Apr 3 10:58:06 2014 +0200
Committer: fmartelli <fabio.martelli@gmail.com>
Committed: Thu Apr 3 10:58:06 2014 +0200

----------------------------------------------------------------------
 fit/pom.xml | 18 ------------------
 1 file changed, 18 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8888b051/fit/pom.xml
----------------------------------------------------------------------
diff --git a/fit/pom.xml b/fit/pom.xml
index b0c1d0a..6e53597 100644
--- a/fit/pom.xml
+++ b/fit/pom.xml
@@ -100,23 +100,12 @@
         <version>${war.maven.plugin.version}</version>
         <configuration>
           <webResources>
-            <!--
-                 HACK: Include legal files explicity, otherwise they will end up in the wrong
path
-                       or in another jar file in the war.
-            -->
             <resource>
               <directory>${project.build.outputDirectory}</directory>
               <includes>
                 <include>META-INF/DEPENDENCIES*</include>
               </includes>
             </resource>
-            <resource>
-              <directory>${basedir}/../</directory>
-              <targetPath>META-INF</targetPath>
-              <includes>
-                <include>LICENSE</include>
-              </includes>
-            </resource>
           </webResources>
           <packagingExcludes>WEB-INF/classes/esigate.properties,WEB-INF/classes/META-INF/LICENSE*,WEB-INF/classes/META-INF/DEPENDENCIES*</packagingExcludes>
         </configuration>
@@ -163,13 +152,6 @@
         <directory>src/main/resources</directory>
         <filtering>true</filtering>
       </resource>
-      <resource>
-        <directory>..</directory>
-        <targetPath>META-INF</targetPath>
-        <includes>
-          <include>LICENSE</include>
-        </includes>
-      </resource>
     </resources>
   </build>
 </project>


Mime
View raw message