You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@helix.apache.org by ol...@apache.org on 2012/10/23 22:03:02 UTC
[4/4] git commit: pom format
pom format
Project: http://git-wip-us.apache.org/repos/asf/incubator-helix/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-helix/commit/608253bb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-helix/tree/608253bb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-helix/diff/608253bb
Branch: refs/heads/master
Commit: 608253bb3d50907b3c86000cdce369eda388bdfe
Parents: 8c07eaa
Author: olivier lamy <ol...@apache.org>
Authored: Tue Oct 23 21:45:41 2012 +0200
Committer: olivier lamy <ol...@apache.org>
Committed: Tue Oct 23 21:45:41 2012 +0200
----------------------------------------------------------------------
helix-admin-webapp/pom.xml | 188 +++++++++++++++++++-------------------
helix-core/pom.xml | 34 ++++----
mockservice/pom.xml | 4 +-
pom.xml | 105 +++++++++++-----------
4 files changed, 166 insertions(+), 165 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/608253bb/helix-admin-webapp/pom.xml
----------------------------------------------------------------------
diff --git a/helix-admin-webapp/pom.xml b/helix-admin-webapp/pom.xml
index 0a43247..15c8c3e 100644
--- a/helix-admin-webapp/pom.xml
+++ b/helix-admin-webapp/pom.xml
@@ -1,103 +1,103 @@
<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">
- <parent>
- <groupId>com.linkedin.helix</groupId>
- <artifactId>helix</artifactId>
- <version>0.5.28</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <groupId>com.linkedin.helix</groupId>
- <artifactId>helix-admin-webapp</artifactId>
- <packaging>jar</packaging>
- <version>0.5.28</version>
- <name>helix-admin-webapp</name>
- <url>http://maven.apache.org</url>
- <repositories>
- <repository>
- <id>maven-restlet</id>
- <name>Public online Restlet repository</name>
- <url>http://maven.restlet.org</url>
- </repository>
- </repositories>
- <dependencies>
- <dependency>
- <groupId>com.linkedin.helix</groupId>
- <artifactId>helix-core</artifactId>
- <version>0.5.28</version>
- </dependency>
- <dependency>
- <groupId>org.restlet</groupId>
- <artifactId>org.restlet</artifactId>
- <version>1.1.10</version>
- </dependency>
- <dependency>
- <groupId>com.noelios.restlet</groupId>
- <artifactId>com.noelios.restlet</artifactId>
- <version>1.1.10</version>
- </dependency>
- <dependency>
- <groupId>com.thoughtworks.xstream</groupId>
- <artifactId>xstream</artifactId>
- <version>1.3.1</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-core-asl</artifactId>
- <version>1.8.5</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-mapper-asl</artifactId>
- <version>1.8.5</version>
- </dependency>
- <dependency>
- <groupId>commons-cli</groupId>
- <artifactId>commons-cli</artifactId>
- <version>1.2</version>
- </dependency>
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <version>6.0.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>com.linkedin.helix</groupId>
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>com.linkedin.helix</groupId>
+ <artifactId>helix</artifactId>
+ <version>0.5.28</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>com.linkedin.helix</groupId>
+ <artifactId>helix-admin-webapp</artifactId>
+ <packaging>jar</packaging>
+ <version>0.5.28</version>
+ <name>helix-admin-webapp</name>
+ <url>http://maven.apache.org</url>
+ <repositories>
+ <repository>
+ <id>maven-restlet</id>
+ <name>Public online Restlet repository</name>
+ <url>http://maven.restlet.org</url>
+ </repository>
+ </repositories>
+ <dependencies>
+ <dependency>
+ <groupId>com.linkedin.helix</groupId>
+ <artifactId>helix-core</artifactId>
+ <version>0.5.28</version>
+ </dependency>
+ <dependency>
+ <groupId>org.restlet</groupId>
+ <artifactId>org.restlet</artifactId>
+ <version>1.1.10</version>
+ </dependency>
+ <dependency>
+ <groupId>com.noelios.restlet</groupId>
+ <artifactId>com.noelios.restlet</artifactId>
+ <version>1.1.10</version>
+ </dependency>
+ <dependency>
+ <groupId>com.thoughtworks.xstream</groupId>
+ <artifactId>xstream</artifactId>
+ <version>1.3.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-core-asl</artifactId>
+ <version>1.8.5</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-mapper-asl</artifactId>
+ <version>1.8.5</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-cli</groupId>
+ <artifactId>commons-cli</artifactId>
+ <version>1.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <version>6.0.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.linkedin.helix</groupId>
<artifactId>helix-core</artifactId>
<version>0.5.28</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>appassembler-maven-plugin</artifactId>
- <version>1.1.1</version>
- <configuration>
- <platforms>
- <platform>windows</platform>
- <platform>unix</platform>
- </platforms>
- <programs>
- <program>
- <mainClass>com.linkedin.helix.webapp.RestAdminApplication</mainClass>
- <name>run-rest-admin</name>
- </program>
- </programs>
- </configuration>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>appassembler-maven-plugin</artifactId>
+ <version>1.1.1</version>
+ <configuration>
+ <platforms>
+ <platform>windows</platform>
+ <platform>unix</platform>
+ </platforms>
+ <programs>
+ <program>
+ <mainClass>com.linkedin.helix.webapp.RestAdminApplication</mainClass>
+ <name>run-rest-admin</name>
+ </program>
+ </programs>
+ </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptors>
- <descriptor>src/assemble/assembly.xml</descriptor>
- </descriptors>
- </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <descriptors>
+ <descriptor>src/assemble/assembly.xml</descriptor>
+ </descriptors>
+ </configuration>
- </plugin>
- </plugins>
- </build>
+ </plugin>
+ </plugins>
+ </build>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/608253bb/helix-core/pom.xml
----------------------------------------------------------------------
diff --git a/helix-core/pom.xml b/helix-core/pom.xml
index 02bcbc7..d02a842 100644
--- a/helix-core/pom.xml
+++ b/helix-core/pom.xml
@@ -1,5 +1,5 @@
<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">
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>com.linkedin.helix</groupId>
<artifactId>helix</artifactId>
@@ -17,7 +17,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <repo.dir>file://${project.basedir}/../repo</repo.dir>
+ <repo.dir>file://${project.basedir}/../repo</repo.dir>
</properties>
<repositories>
<repository>
@@ -127,27 +127,27 @@
<groupId>com.noelios.restlet</groupId>
<artifactId>com.noelios.restlet</artifactId>
<version>1.1.10</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>net.sf</groupId>
<artifactId>jsqlparser</artifactId>
<version>0.7.0</version>
- </dependency>
-</dependencies>
+ </dependency>
+ </dependencies>
<build>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <version>2.2</version>
- <executions>
- <execution>
- <goals>
- <goal>test-jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.2</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>appassembler-maven-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/608253bb/mockservice/pom.xml
----------------------------------------------------------------------
diff --git a/mockservice/pom.xml b/mockservice/pom.xml
index aed93c4..1b14377 100644
--- a/mockservice/pom.xml
+++ b/mockservice/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- 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"
+ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>helix</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/608253bb/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 04b3d2a..1ab715b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,14 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
-<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>
<groupId>com.linkedin.helix</groupId>
<artifactId>helix</artifactId>
<version>0.5.28</version>
<packaging>pom</packaging>
<name>Helix Modules Root</name>
- <properties>
- <applicationVersion>0.5.28</applicationVersion>
- </properties>
+ <properties>
+ <applicationVersion>0.5.28</applicationVersion>
+ </properties>
<modules>
<module>helix-core</module>
<module>helix-admin-webapp</module>
@@ -30,12 +31,12 @@
<artifactId>appassembler-maven-plugin</artifactId>
<version>1.1.1</version>
<configuration>
- <!-- Set the target configuration directory to be used in the bin scripts -->
- <configurationDirectory>conf</configurationDirectory>
- <!-- Copy the contents from "/src/main/config" to the target configuration directory in the assembled application -->
- <copyConfigurationDirectory>true</copyConfigurationDirectory>
- <!-- Include the target configuration directory in the beginning of the classpath declaration in the bin scripts -->
- <includeConfigurationDirectoryInClasspath>true</includeConfigurationDirectoryInClasspath>
+ <!-- Set the target configuration directory to be used in the bin scripts -->
+ <configurationDirectory>conf</configurationDirectory>
+ <!-- Copy the contents from "/src/main/config" to the target configuration directory in the assembled application -->
+ <copyConfigurationDirectory>true</copyConfigurationDirectory>
+ <!-- Include the target configuration directory in the beginning of the classpath declaration in the bin scripts -->
+ <includeConfigurationDirectoryInClasspath>true</includeConfigurationDirectoryInClasspath>
<assembleDirectory>${project.build.directory}/${project.name}-pkg</assembleDirectory>
<!-- Extra JVM arguments that will be included in the bin scripts -->
<extraJvmArguments>-Xms512m -Xmx512m</extraJvmArguments>
@@ -106,18 +107,18 @@
</executions>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-eclipse-plugin</artifactId>
- <configuration>
- <downloadSources>true</downloadSources>
- <downloadJavadocs>true</downloadJavadocs>
- </configuration>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-eclipse-plugin</artifactId>
+ <configuration>
+ <downloadSources>true</downloadSources>
+ <downloadJavadocs>true</downloadJavadocs>
+ </configuration>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <version>2.2</version>
- <executions>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.2</version>
+ <executions>
<execution>
<goals>
<goal>test-jar</goal>
@@ -143,51 +144,51 @@
</plugin>
</plugins>
</pluginManagement>
-<plugins>
-<plugin>
- <inherited>true</inherited>
- <groupId>com.mycila.maven-license-plugin</groupId>
- <artifactId>maven-license-plugin</artifactId>
- <version>1.9.0</version>
- <configuration>
- <header>${basedir}/header.txt</header>
- <failIfMissing>false</failIfMissing>
- <aggregate>false</aggregate>
- <properties>
+ <plugins>
+ <plugin>
+ <inherited>true</inherited>
+ <groupId>com.mycila.maven-license-plugin</groupId>
+ <artifactId>maven-license-plugin</artifactId>
+ <version>1.9.0</version>
+ <configuration>
+ <header>${basedir}/header.txt</header>
+ <failIfMissing>false</failIfMissing>
+ <aggregate>false</aggregate>
+ <properties>
<owner>LinkedIn Inc</owner>
<year>2012</year>
<email>opensource@linkedin.com</email>
- </properties>
- <excludes>
+ </properties>
+ <excludes>
<exclude>LICENSE.txt</exclude>
<exclude>**/src/test/resources/**</exclude>
<exclude>**/src/test/data/**</exclude>
- </excludes>
- </configuration>
- <executions>
- <execution>
+ </excludes>
+ </configuration>
+ <executions>
+ <execution>
<id>check-headers</id>
<phase>verify</phase>
<goals>
- <goal>check</goal>
+ <goal>check</goal>
</goals>
- </execution>
- </executions>
-</plugin>
+ </execution>
+ </executions>
+ </plugin>
-</plugins>
+ </plugins>
</build>
<reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.8</version>
- <configuration>
- <configLocation>file:///${project.parent.basedir}/li_checkstyle.xml</configLocation>
- <failOnError>true</failOnError>
- <violationSeverity>error</violationSeverity>
- </configuration>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <version>2.8</version>
+ <configuration>
+ <configLocation>file:///${project.parent.basedir}/li_checkstyle.xml</configLocation>
+ <failOnError>true</failOnError>
+ <violationSeverity>error</violationSeverity>
+ </configuration>
</plugin>
</plugins>
</reporting>