You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ma...@apache.org on 2014/05/07 22:44:39 UTC
git commit: Removing unnecessary files
Repository: ambari
Updated Branches:
refs/heads/trunk f830293bf -> 6f609990a
Removing unnecessary files
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/6f609990
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/6f609990
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/6f609990
Branch: refs/heads/trunk
Commit: 6f609990aaa41aeb719b4e7a60ed61da5336fe42
Parents: f830293
Author: Mahadev Konar <ma...@apache.org>
Authored: Wed May 7 13:44:27 2014 -0700
Committer: Mahadev Konar <ma...@apache.org>
Committed: Wed May 7 13:44:27 2014 -0700
----------------------------------------------------------------------
contrib/views/pom.xml.rej | 136 -----------------------------------------
1 file changed, 136 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/6f609990/contrib/views/pom.xml.rej
----------------------------------------------------------------------
diff --git a/contrib/views/pom.xml.rej b/contrib/views/pom.xml.rej
deleted file mode 100644
index 5a77cbd..0000000
--- a/contrib/views/pom.xml.rej
+++ /dev/null
@@ -1,136 +0,0 @@
-***************
-*** 0 ****
---- 1,133 ----
-+ <!--
-+ 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>
-+ <groupId>org.apache.ambari.views</groupId>
-+ <artifactId>ambari-views-poc</artifactId>
-+ <packaging>pom</packaging>
-+ <version>0.1.0-SNAPSHOT</version>
-+ <name>Ambari Views Proof of Concept</name>
-+ <modules>
-+ <module>files</module>
-+ <module>pig</module>
-+ </modules>
-+ <build>
-+ <pluginManagement>
-+ <plugins>
-+ <plugin>
-+ <groupId>org.apache.rat</groupId>
-+ <artifactId>apache-rat-plugin</artifactId>
-+ <version>0.8</version>
-+ </plugin>
-+ </plugins>
-+ </pluginManagement>
-+ <plugins>
-+ <plugin>
-+ <groupId>org.apache.rat</groupId>
-+ <artifactId>apache-rat-plugin</artifactId>
-+ <configuration>
-+ <excludes>
-+ <!--GIT files-->
-+ <exclude>.git/</exclude>
-+ <exclude>**/.gitignore</exclude>
-+ <exclude>**/.gitattributes</exclude>
-+ <!--gitignore content-->
-+ <exclude>.idea/</exclude>
-+ <exclude>pass.txt</exclude>
-+ <exclude>.DS_Store</exclude>
-+ <exclude>.iml/</exclude>
-+ <exclude>.classpath</exclude>
-+ <exclude>.project</exclude>
-+ <exclude>.settings</exclude>
-+ <!--license files-->
-+ <exclude>MSPL-LICENSE</exclude>
-+ <!--VS generated files-->
-+ <exclude>**/*.resources</exclude>
-+ <exclude>**/*.rtf</exclude>
-+ <exclude>**/*.snk</exclude>
-+ <exclude>**/*.cs</exclude>
-+ </excludes>
-+ </configuration>
-+ </plugin>
-+ <plugin>
-+ <artifactId>maven-assembly-plugin</artifactId>
-+ <executions>
-+ <execution>
-+ <phase>package</phase>
-+ <goals>
-+ <goal>attached</goal>
-+ </goals>
-+ </execution>
-+ </executions>
-+ <configuration>
-+ <descriptorRefs>
-+ <descriptorRef>jar-with-dependencies</descriptorRef>
-+ </descriptorRefs>
-+ <outputDirectory>${basedir}/target</outputDirectory>
-+ </configuration>
-+ </plugin>
-+ <plugin>
-+ <groupId>org.apache.maven.plugins</groupId>
-+ <artifactId>maven-compiler-plugin</artifactId>
-+ <version>3.1</version>
-+ <configuration>
-+ <source>1.6</source>
-+ <target>1.6</target>
-+ </configuration>
-+ </plugin>
-+ </plugins>
-+
-+ </build>
-+ <dependencyManagement>
-+ <dependencies>
-+ <dependency>
-+ <groupId>org.glassfish.jersey.containers</groupId>
-+ <artifactId>jersey-container-servlet</artifactId>
-+ <version>2.6</version>
-+ </dependency>
-+ <dependency>
-+ <groupId>junit</groupId>
-+ <artifactId>junit</artifactId>
-+ <version>4.11</version>
-+ <scope>test</scope>
-+ </dependency>
-+ <dependency>
-+ <groupId>com.google.inject</groupId>
-+ <artifactId>guice</artifactId>
-+ <version>4.0-beta</version>
-+ </dependency>
-+ <dependency>
-+ <groupId>org.easymock</groupId>
-+ <artifactId>easymock</artifactId>
-+ <version>3.2</version>
-+ <scope>test</scope>
-+ </dependency>
-+ <dependency>
-+ <groupId>com.googlecode.json-simple</groupId>
-+ <artifactId>json-simple</artifactId>
-+ <version>1.1.1</version>
-+ </dependency>
-+ <dependency>
-+ <groupId>org.apache.ambari</groupId>
-+ <artifactId>ambari-views</artifactId>
-+ <version>[1.5.0.1,)</version>
-+ </dependency>
-+ </dependencies>
-+ </dependencyManagement>
-+
-+ </project>