Brion VIBBER has submitted this change and it was merged. Change subject: Get rid of tabs in the pom.xml files ......................................................................
Get rid of tabs in the pom.xml files - To be consistent with rest of the project, which uses 4 spaces - Also tabs suck Change-Id: Ifa59413fa88c0e64d7763b4e0cf1190c0d749836 --- M pom.xml M wikipedia-it/pom.xml M wikipedia/pom.xml 3 files changed, 153 insertions(+), 153 deletions(-) Approvals: Brion VIBBER: Verified; Looks good to me, approved diff --git a/pom.xml b/pom.xml index bbcb693..b77152b 100644 --- a/pom.xml +++ b/pom.xml @@ -1,26 +1,26 @@ <?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";> - <modelVersion>4.0.0</modelVersion> - <groupId>org.wikimedia</groupId> - <artifactId>wikipedia-parent</artifactId> - <version>1.0-SNAPSHOT</version> - <packaging>pom</packaging> - <name>wikipedia - Parent</name> + 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.wikimedia</groupId> + <artifactId>wikipedia-parent</artifactId> + <version>1.0-SNAPSHOT</version> + <packaging>pom</packaging> + <name>wikipedia - Parent</name> - <modules> - <module>wikipedia</module> - <module>wikipedia-it</module> - </modules> + <modules> + <module>wikipedia</module> + <module>wikipedia-it</module> + </modules> - <dependencyManagement> - <dependencies> - <dependency> - <groupId>android</groupId> - <artifactId>android</artifactId> - <version>4.4_r1</version> - <scope>provided</scope> - </dependency> + <dependencyManagement> + <dependencies> + <dependency> + <groupId>android</groupId> + <artifactId>android</artifactId> + <version>4.4_r1</version> + <scope>provided</scope> + </dependency> <dependency> <groupId>android.support</groupId> <artifactId>compatibility-v7-appcompat</artifactId> @@ -35,51 +35,51 @@ <type>jar</type> </dependency> - <dependency> - <groupId>com.google.android</groupId> - <artifactId>android-test</artifactId> - <version>4.1.1.4</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.11</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>android.support</groupId> - <artifactId>compatibility-v4</artifactId> - <version>19.0.0</version> - </dependency> - </dependencies> - </dependencyManagement> + <dependency> + <groupId>com.google.android</groupId> + <artifactId>android-test</artifactId> + <version>4.1.1.4</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.11</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>android.support</groupId> + <artifactId>compatibility-v4</artifactId> + <version>19.0.0</version> + </dependency> + </dependencies> + </dependencyManagement> - <repositories> - <repository> - <id>tools-repository</id> - <url>https://tools.wmflabs.org/android-maven-repo/</url> - </repository> - </repositories> + <repositories> + <repository> + <id>tools-repository</id> + <url>https://tools.wmflabs.org/android-maven-repo/</url> + </repository> + </repositories> - <build> - <pluginManagement> - <plugins> - <plugin> - <groupId>com.jayway.maven.plugins.android.generation2</groupId> - <artifactId>android-maven-plugin</artifactId> - <version>3.8.2</version> - <configuration> - <sdk> - <platform>19</platform> - </sdk> - </configuration> - </plugin> - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <version>3.1</version> - </plugin> - </plugins> - </pluginManagement> - </build> + <build> + <pluginManagement> + <plugins> + <plugin> + <groupId>com.jayway.maven.plugins.android.generation2</groupId> + <artifactId>android-maven-plugin</artifactId> + <version>3.8.2</version> + <configuration> + <sdk> + <platform>19</platform> + </sdk> + </configuration> + </plugin> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <version>3.1</version> + </plugin> + </plugins> + </pluginManagement> + </build> </project> diff --git a/wikipedia-it/pom.xml b/wikipedia-it/pom.xml index 324834c..fbf2d9e 100644 --- a/wikipedia-it/pom.xml +++ b/wikipedia-it/pom.xml @@ -1,40 +1,40 @@ <?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";> - <modelVersion>4.0.0</modelVersion> + 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.wikimedia</groupId> - <artifactId>wikipedia-parent</artifactId> - <version>1.0-SNAPSHOT</version> - </parent> + <parent> + <groupId>org.wikimedia</groupId> + <artifactId>wikipedia-parent</artifactId> + <version>1.0-SNAPSHOT</version> + </parent> - <groupId>org.wikimedia</groupId> - <artifactId>wikipedia-it</artifactId> - <version>1.0-SNAPSHOT</version> - <packaging>apk</packaging> - <name>wikipedia-it - Integration tests</name> + <groupId>org.wikimedia</groupId> + <artifactId>wikipedia-it</artifactId> + <version>1.0-SNAPSHOT</version> + <packaging>apk</packaging> + <name>wikipedia-it - Integration tests</name> - <dependencies> - <dependency> - <groupId>com.google.android</groupId> - <artifactId>android-test</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.wikimedia</groupId> - <artifactId>wikipedia</artifactId> - <type>apk</type> - <version>1.0-SNAPSHOT</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.wikimedia</groupId> - <artifactId>wikipedia</artifactId> - <type>jar</type> - <version>1.0-SNAPSHOT</version> - <scope>provided</scope> - </dependency> + <dependencies> + <dependency> + <groupId>com.google.android</groupId> + <artifactId>android-test</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.wikimedia</groupId> + <artifactId>wikipedia</artifactId> + <type>apk</type> + <version>1.0-SNAPSHOT</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.wikimedia</groupId> + <artifactId>wikipedia</artifactId> + <type>jar</type> + <version>1.0-SNAPSHOT</version> + <scope>provided</scope> + </dependency> <dependency> <groupId>com.squareup.picasso</groupId> <artifactId>picasso</artifactId> @@ -42,33 +42,33 @@ </dependency> </dependencies> - <build> - <finalName>${project.artifactId}</finalName> - <plugins> - <plugin> - <groupId>com.jayway.maven.plugins.android.generation2</groupId> - <artifactId>android-maven-plugin</artifactId> - <configuration> - <test> - <!--<skip>true|false|auto</skip> --> - <!--<instrumentationPackage>packageName</instrumentationPackage> --> - ` - <!--<instrumentationRunner>className</instrumentationRunner> --> - <!--<debug>true|false</debug> --> - <!--<coverage>true|false</coverage> --> - <!--<logonly>true|false</logonly> avd --> - <!--<testsize>small|medium|large</testsize> --> - <createReport>true</createReport> - <!--<classes> --> - <!--<class>your.package.name.YourTestClass</class> --> - <!--</classes> --> - <!--<packages> --> - <!--<package>your.package.name</package> --> - <!--</packages> --> - </test> - </configuration> - <extensions>true</extensions> - </plugin> - </plugins> - </build> + <build> + <finalName>${project.artifactId}</finalName> + <plugins> + <plugin> + <groupId>com.jayway.maven.plugins.android.generation2</groupId> + <artifactId>android-maven-plugin</artifactId> + <configuration> + <test> + <!--<skip>true|false|auto</skip> --> + <!--<instrumentationPackage>packageName</instrumentationPackage> --> + ` + <!--<instrumentationRunner>className</instrumentationRunner> --> + <!--<debug>true|false</debug> --> + <!--<coverage>true|false</coverage> --> + <!--<logonly>true|false</logonly> avd --> + <!--<testsize>small|medium|large</testsize> --> + <createReport>true</createReport> + <!--<classes> --> + <!--<class>your.package.name.YourTestClass</class> --> + <!--</classes> --> + <!--<packages> --> + <!--<package>your.package.name</package> --> + <!--</packages> --> + </test> + </configuration> + <extensions>true</extensions> + </plugin> + </plugins> + </build> </project> diff --git a/wikipedia/pom.xml b/wikipedia/pom.xml index 229bf44..aa51ee5 100644 --- a/wikipedia/pom.xml +++ b/wikipedia/pom.xml @@ -1,26 +1,26 @@ <?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";> - <modelVersion>4.0.0</modelVersion> + 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.wikimedia</groupId> - <artifactId>wikipedia-parent</artifactId> - <version>1.0-SNAPSHOT</version> - </parent> + <parent> + <groupId>org.wikimedia</groupId> + <artifactId>wikipedia-parent</artifactId> + <version>1.0-SNAPSHOT</version> + </parent> - <groupId>org.wikimedia</groupId> - <artifactId>wikipedia</artifactId> - <version>1.0-SNAPSHOT</version> - <packaging>apk</packaging> - <name>wikipedia - Application</name> + <groupId>org.wikimedia</groupId> + <artifactId>wikipedia</artifactId> + <version>1.0-SNAPSHOT</version> + <packaging>apk</packaging> + <name>wikipedia - Application</name> - <dependencies> - <dependency> - <groupId>android</groupId> - <artifactId>android</artifactId> - <version>4.4_r1</version> - </dependency> + <dependencies> + <dependency> + <groupId>android</groupId> + <artifactId>android</artifactId> + <version>4.4_r1</version> + </dependency> <dependency> <groupId>android.support</groupId> <artifactId>compatibility-v4</artifactId> @@ -62,14 +62,14 @@ <type>jar</type> </dependency> </dependencies> - <build> - <finalName>${project.artifactId}</finalName> - <plugins> - <plugin> - <groupId>com.jayway.maven.plugins.android.generation2</groupId> - <artifactId>android-maven-plugin</artifactId> - <extensions>true</extensions> - </plugin> - </plugins> - </build> + <build> + <finalName>${project.artifactId}</finalName> + <plugins> + <plugin> + <groupId>com.jayway.maven.plugins.android.generation2</groupId> + <artifactId>android-maven-plugin</artifactId> + <extensions>true</extensions> + </plugin> + </plugins> + </build> </project> -- To view, visit https://gerrit.wikimedia.org/r/110688 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ifa59413fa88c0e64d7763b4e0cf1190c0d749836 Gerrit-PatchSet: 2 Gerrit-Project: apps/android/wikipedia Gerrit-Branch: master Gerrit-Owner: Yuvipanda <[email protected]> Gerrit-Reviewer: Brion VIBBER <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
