Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Revert "Revert "updated to renamed plugin""

This reverts commit 3d07981,
renaming the plugin to android-maven-plugin as discussed in
https://groups.google.com/d/msg/maven-android-developers/KS1xPtNlHEk/w78RJjo-3ngJ
  • Loading branch information...
commit 95336903e4d5adb292a592ad159af6bab373f16f 1 parent 0780932
Hugo Josefson hugojosefson authored
2  apidemos-15/apidemos-15-app/pom.xml
@@ -45,7 +45,7 @@
45 45 <plugins>
46 46 <plugin>
47 47 <groupId>com.jayway.maven.plugins.android.generation2</groupId>
48   - <artifactId>maven-android-plugin</artifactId>
  48 + <artifactId>android-maven-plugin</artifactId>
49 49 <executions>
50 50 <execution>
51 51 <id>startemulator</id>
2  apidemos-15/apidemos-15-instrumentationtest/pom.xml
@@ -62,7 +62,7 @@
62 62 <plugins>
63 63 <plugin>
64 64 <groupId>com.jayway.maven.plugins.android.generation2</groupId>
65   - <artifactId>maven-android-plugin</artifactId>
  65 + <artifactId>android-maven-plugin</artifactId>
66 66 </plugin>
67 67 </plugins>
68 68 </build>
2  apidemos-15/pom.xml
@@ -46,7 +46,7 @@
46 46 <plugins>
47 47 <plugin>
48 48 <groupId>com.jayway.maven.plugins.android.generation2</groupId>
49   - <artifactId>maven-android-plugin</artifactId>
  49 + <artifactId>android-maven-plugin</artifactId>
50 50 <version>3.0.0-SNAPSHOT</version>
51 51 <configuration>
52 52 <sdk>
2  helloflashlight/README.txt
... ... @@ -1,6 +1,6 @@
1 1 HelloFlashlight is a simple sample application written by Manfred Moser <manfred@simpligility.com>
2 2
3   -It was created to demonstrate the minimal pom.xml setup needed to use the maven-android-plugin
  3 +It was created to demonstrate the minimal pom.xml setup needed to use the android-maven-plugin
4 4 and is used as an example in the book Maven: The Complete Reference
5 5
6 6 See the book chapter for more details.
4 helloflashlight/pom.xml
@@ -22,7 +22,7 @@
22 22 <plugins>
23 23 <plugin>
24 24 <groupId>com.jayway.maven.plugins.android.generation2</groupId>
25   - <artifactId>maven-android-plugin</artifactId>
  25 + <artifactId>android-maven-plugin</artifactId>
26 26 <version>3.0.0-SNAPSHOT</version>
27 27 <configuration>
28 28 <run>
@@ -36,7 +36,7 @@
36 36 <plugins>
37 37 <plugin>
38 38 <groupId>com.jayway.maven.plugins.android.generation2</groupId>
39   - <artifactId>maven-android-plugin</artifactId>
  39 + <artifactId>android-maven-plugin</artifactId>
40 40 <version>3.0.0-SNAPSHOT</version>
41 41 <configuration>
42 42 <run>
2  libraryprojects/libraryprojects-lib1/pom.xml
@@ -30,7 +30,7 @@
30 30 <plugins>
31 31 <plugin>
32 32 <groupId>com.jayway.maven.plugins.android.generation2</groupId>
33   - <artifactId>maven-android-plugin</artifactId>
  33 + <artifactId>android-maven-plugin</artifactId>
34 34 <extensions>true</extensions>
35 35 </plugin>
36 36 </plugins>
2  libraryprojects/libraryprojects-lib2/pom.xml
@@ -37,7 +37,7 @@
37 37 <plugins>
38 38 <plugin>
39 39 <groupId>com.jayway.maven.plugins.android.generation2</groupId>
40   - <artifactId>maven-android-plugin</artifactId>
  40 + <artifactId>android-maven-plugin</artifactId>
41 41 <extensions>true</extensions>
42 42 </plugin>
43 43 </plugins>
2  libraryprojects/libraryprojects-mainapp/pom.xml
@@ -44,7 +44,7 @@
44 44 <plugins>
45 45 <plugin>
46 46 <groupId>com.jayway.maven.plugins.android.generation2</groupId>
47   - <artifactId>maven-android-plugin</artifactId>
  47 + <artifactId>android-maven-plugin</artifactId>
48 48 <extensions>true</extensions>
49 49 </plugin>
50 50 </plugins>
2  libraryprojects/libraryprojects-tests/pom.xml
@@ -51,7 +51,7 @@
51 51 <plugins>
52 52 <plugin>
53 53 <groupId>com.jayway.maven.plugins.android.generation2</groupId>
54   - <artifactId>maven-android-plugin</artifactId>
  54 + <artifactId>android-maven-plugin</artifactId>
55 55 <extensions>true</extensions>
56 56 </plugin>
57 57 </plugins>
2  libraryprojects/pom.xml
@@ -50,7 +50,7 @@
50 50
51 51 <plugin>
52 52 <groupId>com.jayway.maven.plugins.android.generation2</groupId>
53   - <artifactId>maven-android-plugin</artifactId>
  53 + <artifactId>android-maven-plugin</artifactId>
54 54 <version>3.0.0-SNAPSHOT</version>
55 55 <configuration>
56 56 <sdk>
2  morseflash/README.txt
@@ -2,7 +2,7 @@ MorseFlash
2 2
3 3 MorseFlash is a (very) simple sample application written by Manfred Moser <manfred@simpligility.com>
4 4
5   -It was created to demonstrate the project setup needed to use the maven-android-plugin in a more complex project
  5 +It was created to demonstrate the project setup needed to use the android-maven-plugin in a more complex project
6 6 including separate libraries as well as instrumentation testing.
7 7
8 8 In the following are a couple of pointers to building the project.
4 morseflash/morseflash-app/pom.xml
@@ -85,7 +85,7 @@
85 85 </plugin>
86 86 <plugin>
87 87 <groupId>com.jayway.maven.plugins.android.generation2</groupId>
88   - <artifactId>maven-android-plugin</artifactId>
  88 + <artifactId>android-maven-plugin</artifactId>
89 89 <extensions>true</extensions>
90 90 <configuration>
91 91 <androidManifestFile>${project.build.directory}/filtered-manifest/AndroidManifest.xml</androidManifestFile>
@@ -260,7 +260,7 @@
260 260 <!-- the signed apk then needs to be zipaligned -->
261 261 <plugin>
262 262 <groupId>com.jayway.maven.plugins.android.generation2</groupId>
263   - <artifactId>maven-android-plugin</artifactId>
  263 + <artifactId>android-maven-plugin</artifactId>
264 264 <inherited>true</inherited>
265 265 <configuration>
266 266 <sign>
2  morseflash/morseflash-instrumentation/pom.xml
@@ -42,7 +42,7 @@
42 42 <plugins>
43 43 <plugin>
44 44 <groupId>com.jayway.maven.plugins.android.generation2</groupId>
45   - <artifactId>maven-android-plugin</artifactId>
  45 + <artifactId>android-maven-plugin</artifactId>
46 46 <configuration>
47 47 <test>
48 48 <skip>false</skip>
2  morseflash/pom.xml
@@ -57,7 +57,7 @@
57 57
58 58 <plugin>
59 59 <groupId>com.jayway.maven.plugins.android.generation2</groupId>
60   - <artifactId>maven-android-plugin</artifactId>
  60 + <artifactId>android-maven-plugin</artifactId>
61 61 <version>3.0.0-SNAPSHOT</version>
62 62 <configuration>
63 63 <sdk>
2  native/java-with-native-dependency/pom.xml
@@ -40,7 +40,7 @@
40 40 <plugins>
41 41 <plugin>
42 42 <groupId>com.jayway.maven.plugins.android.generation2</groupId>
43   - <artifactId>maven-android-plugin</artifactId>
  43 + <artifactId>android-maven-plugin</artifactId>
44 44 <extensions>true</extensions>
45 45 </plugin>
46 46 </plugins>
2  native/java-with-native-library/pom.xml
@@ -31,7 +31,7 @@
31 31 <plugins>
32 32 <plugin>
33 33 <groupId>com.jayway.maven.plugins.android.generation2</groupId>
34   - <artifactId>maven-android-plugin</artifactId>
  34 + <artifactId>android-maven-plugin</artifactId>
35 35 <extensions>true</extensions>
36 36 </plugin>
37 37 </plugins>
2  native/mixed-java-native-code/pom.xml
@@ -33,7 +33,7 @@
33 33
34 34 <plugin>
35 35 <groupId>com.jayway.maven.plugins.android.generation2</groupId>
36   - <artifactId>maven-android-plugin</artifactId>
  36 + <artifactId>android-maven-plugin</artifactId>
37 37 <executions>
38 38 <!--
39 39 Add the execution of the ndk-build goal - this will compile the native code in addition
2  native/native-code/pom.xml
@@ -25,7 +25,7 @@
25 25 <plugins>
26 26 <plugin>
27 27 <groupId>com.jayway.maven.plugins.android.generation2</groupId>
28   - <artifactId>maven-android-plugin</artifactId>
  28 + <artifactId>android-maven-plugin</artifactId>
29 29 <extensions>true</extensions>
30 30 </plugin>
31 31 </plugins>
2  native/pom.xml
@@ -22,7 +22,7 @@
22 22 <plugins>
23 23 <plugin>
24 24 <groupId>com.jayway.maven.plugins.android.generation2</groupId>
25   - <artifactId>maven-android-plugin</artifactId>
  25 + <artifactId>android-maven-plugin</artifactId>
26 26 <version>3.0.0-SNAPSHOT</version>
27 27 </plugin>
28 28 </plugins>
4 pom.xml
@@ -20,7 +20,7 @@
20 20 <artifactId>samples</artifactId>
21 21 <version>1.0.0-SNAPSHOT</version>
22 22 <packaging>pom</packaging>
23   - <name>Maven Android Plugin - samples</name>
  23 + <name>Android Maven Plugin - Samples</name>
24 24
25 25 <modules>
26 26 <module>apidemos-15</module>
@@ -83,7 +83,7 @@
83 83 <plugins>
84 84 <plugin>
85 85 <groupId>com.jayway.maven.plugins.android.generation2</groupId>
86   - <artifactId>maven-android-plugin</artifactId>
  86 + <artifactId>android-maven-plugin</artifactId>
87 87 <version>3.0.0-SNAPSHOT</version>
88 88 </plugin>
89 89 <plugin>
2  scala/pom.xml
@@ -116,7 +116,7 @@
116 116 </plugin>
117 117 <plugin>
118 118 <groupId>com.jayway.maven.plugins.android.generation2</groupId>
119   - <artifactId>maven-android-plugin</artifactId>
  119 + <artifactId>android-maven-plugin</artifactId>
120 120 <version>3.0.0-SNAPSHOT</version>
121 121 <configuration>
122 122 <sdk>

0 comments on commit 9533690

Please sign in to comment.
Something went wrong with that request. Please try again.