BearND has uploaded a new change for review. https://gerrit.wikimedia.org/r/217423
Change subject: Hygiene: remove Maven pom.xml files ...................................................................... Hygiene: remove Maven pom.xml files We've switched to Gradle builds on Jenkins, too. So, no need for pom.xml files anymore. The extra pom.xml files also caused warnings when importing the project into AS. Change-Id: If19aab7153c0cb9e202e93c872e5f65a3925f4bc --- D pom.xml D wikipedia-it/pom.xml D wikipedia/pom.xml 3 files changed, 0 insertions(+), 328 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia refs/changes/23/217423/1 diff --git a/pom.xml b/pom.xml deleted file mode 100644 index e64eb7d..0000000 --- a/pom.xml +++ /dev/null @@ -1,150 +0,0 @@ -<?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> - - <modules> - <module>wikipedia</module> - <module>wikipedia-it</module> - </modules> - - <dependencyManagement> - <dependencies> - <dependency> - <groupId>android</groupId> - <artifactId>android</artifactId> - <version>4.4.2_r3</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>android.support</groupId> - <artifactId>compatibility-v7-appcompat</artifactId> - <version>20.0.0</version> - <type>apklib</type> - </dependency> - - <dependency> - <groupId>android.support</groupId> - <artifactId>compatibility-v7-appcompat</artifactId> - <version>20.0.0</version> - <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>20.0.0</version> - </dependency> - - <dependency> - <groupId>de.keyboardsurfer.android.widget</groupId> - <artifactId>crouton</artifactId> - <version>1.8.3</version> - <exclusions> - <exclusion> - <groupId>com.android.support</groupId> - <artifactId>support-v4</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>com.mobsandgeeks</groupId> - <artifactId>android-saripaar</artifactId> - <version>1.0.3</version> - </dependency> - </dependencies> - </dependencyManagement> - - <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> - <profiles> - <profile> - <id>sign</id> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jarsigner-plugin</artifactId> - <version>1.2</version> - <executions> - <execution> - <id>signing</id> - <goals> - <goal>sign</goal> - </goals> - <phase>package</phase> - <inherited>true</inherited> - <configuration> - <archiveDirectory></archiveDirectory> - <includes> - <include>target/*.apk</include> - </includes> - <keystore>${KEYPATH}</keystore> - <storepass>${KEYPASS}</storepass> - <keypass>${KEYPASS}</keypass> - <alias>google_android_market</alias> - <arguments> - <argument>-sigalg</argument><argument>MD5withRSA</argument> - <argument>-digestalg</argument><argument>SHA1</argument> - </arguments> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>com.jayway.maven.plugins.android.generation2</groupId> - <artifactId>android-maven-plugin</artifactId> - <inherited>true</inherited> - <configuration> - <sign> - <debug>false</debug> - </sign> - </configuration> - </plugin> - </plugins> - </build> - </profile> - </profiles> -</project> diff --git a/wikipedia-it/pom.xml b/wikipedia-it/pom.xml deleted file mode 100644 index 039dfd6..0000000 --- a/wikipedia-it/pom.xml +++ /dev/null @@ -1,85 +0,0 @@ -<?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> - - <parent> - <groupId>org.wikimedia</groupId> - <artifactId>wikipedia-parent</artifactId> - <version>1.0-SNAPSHOT</version> - </parent> - - <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> - <exclusions> - <exclusion> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>compile</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> - <version>2.1.1</version> - </dependency> - </dependencies> - - <build> - <finalName>${project.artifactId}</finalName> - <plugins> - <plugin> - <groupId>com.jayway.maven.plugins.android.generation2</groupId> - <artifactId>android-maven-plugin</artifactId> - <configuration> - <extractDuplicates>true</extractDuplicates> - <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 deleted file mode 100644 index 900412d..0000000 --- a/wikipedia/pom.xml +++ /dev/null @@ -1,93 +0,0 @@ -<?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> - - <parent> - <groupId>org.wikimedia</groupId> - <artifactId>wikipedia-parent</artifactId> - <version>1.0-SNAPSHOT</version> - </parent> - - <artifactId>wikipedia</artifactId> - <version>1.0-SNAPSHOT</version> - <packaging>apk</packaging> - <name>wikipedia - Application</name> - - <dependencies> - <dependency> - <groupId>android</groupId> - <artifactId>android</artifactId> - </dependency> - <dependency> - <groupId>android.support</groupId> - <artifactId>compatibility-v4</artifactId> - </dependency> - <dependency> - <groupId>org.mediawiki.api</groupId> - <artifactId>json</artifactId> - <version>1.3.0</version> - </dependency> - <dependency> - <groupId>com.squareup</groupId> - <artifactId>otto</artifactId> - <version>1.3.4</version> - </dependency> - <dependency> - <groupId>com.squareup.picasso</groupId> - <artifactId>picasso</artifactId> - <version>2.1.1</version> - </dependency> - <dependency> - <groupId>ch.acra</groupId> - <artifactId>acra</artifactId> - <version>4.5.0</version> - </dependency> - <dependency> - <groupId>com.squareup.okhttp</groupId> - <artifactId>okhttp</artifactId> - <version>1.3.0</version> - </dependency> - <dependency> - <groupId>android.support</groupId> - <artifactId>compatibility-v7-appcompat</artifactId> - <type>apklib</type> - </dependency> - <dependency> - <groupId>android.support</groupId> - <artifactId>compatibility-v7-appcompat</artifactId> - <type>jar</type> - </dependency> - <dependency> - <groupId>de.keyboardsurfer.android.widget</groupId> - <artifactId>crouton</artifactId> - <version>1.8.4</version> - <exclusions> - <exclusion> - <groupId>com.android.support</groupId> - <artifactId>support-v4</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>com.mobsandgeeks</groupId> - <artifactId>android-saripaar</artifactId> - <version>1.0.3</version> - </dependency> - <dependency> - <groupId>com.nineoldandroids</groupId> - <artifactId>library</artifactId> - <version>2.4.0</version> - </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> -</project> -- To view, visit https://gerrit.wikimedia.org/r/217423 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If19aab7153c0cb9e202e93c872e5f65a3925f4bc Gerrit-PatchSet: 1 Gerrit-Project: apps/android/wikipedia Gerrit-Branch: master Gerrit-Owner: BearND <bsitzm...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
