Skip to content
This repository
Browse code

Merge pull request #23 from dtmilano/dtmilano-1.0.5

Plugin renamed to android-maven-plugin.
  • Loading branch information...
commit 0b40216317050f67bcb5660b32b5a2185882995f 2 parents 9a24afe + 674b767
Clement Escoffier authored December 26, 2011
2  README.md
Source Rendered
@@ -4,7 +4,7 @@ android-archetypes
4 4
 This projects provides several Maven archetypes for Android. Those archetypes allows to quickly bootstrap a Maven project
5 5
 to develop an android application.
6 6
 
7  
-These artifacts are based on the maven-android-plugin (http://code.google.com/p/maven-android-plugin/). It currently uses the 2.8.3 version.
  7
+These artifacts are based on the android-maven-plugin (http://code.google.com/p/maven-android-plugin/). It currently uses the 3.0.0 version.
8 8
 
9 9
 The android-quickstart archetype
10 10
 --------------------------------
8  android-archetypes-it/src/test/java/de/akquinet/android/archetypes/QuickstartArchetypeTest.java
@@ -72,7 +72,7 @@ public void testQuickStartDefault() throws VerificationException, IOException {
72 72
         verifier.assertFilePresent("android-test/src/main/java/android/archetypes/test/HelloAndroidActivity.java");
73 73
 
74 74
 
75  
-        Helper.assertContains(new File("target/it/quickstart-default/android-test/pom.xml"), "<artifactId>maven-android-plugin</artifactId>");
  75
+        Helper.assertContains(new File("target/it/quickstart-default/android-test/pom.xml"), "<artifactId>android-maven-plugin</artifactId>");
76 76
         Helper.assertContains(new File("target/it/quickstart-default/android-test/pom.xml"), "<platform>7</platform>");
77 77
         Helper.assertContains(new File("target/it/quickstart-default/android-test/AndroidManifest.xml"), "<activity android:name=\".HelloAndroidActivity\">");
78 78
         Helper.assertContains(new File("target/it/quickstart-default/android-test/AndroidManifest.xml"), "package=\"android.archetypes.test\"");
@@ -121,7 +121,7 @@ public void testQuickStartWithPlatform() throws VerificationException, IOExcepti
121 121
         verifier.assertFilePresent("android-test/src/main/java/android/archetypes/test/HelloAndroidActivity.java");
122 122
 
123 123
 
124  
-        Helper.assertContains(new File("target/it/quickstart-with-platform/android-test/pom.xml"), "<artifactId>maven-android-plugin</artifactId>");
  124
+        Helper.assertContains(new File("target/it/quickstart-with-platform/android-test/pom.xml"), "<artifactId>android-maven-plugin</artifactId>");
125 125
         Helper.assertContains(new File("target/it/quickstart-with-platform/android-test/pom.xml"), "<platform>8</platform>");
126 126
         Helper.assertContains(new File("target/it/quickstart-with-platform/android-test/AndroidManifest.xml"), "<activity android:name=\".HelloAndroidActivity\">");
127 127
         Helper.assertContains(new File("target/it/quickstart-with-platform/android-test/AndroidManifest.xml"), "package=\"android.archetypes.test\"");
@@ -171,7 +171,7 @@ public void testQuickStartWithPlatformAndPackage() throws VerificationException,
171 171
         verifier.assertFilePresent("android-test/src/main/java/foo/HelloAndroidActivity.java");
172 172
 
173 173
 
174  
-        Helper.assertContains(new File("target/it/quickstart-with-platform-and-package/android-test/pom.xml"), "<artifactId>maven-android-plugin</artifactId>");
  174
+        Helper.assertContains(new File("target/it/quickstart-with-platform-and-package/android-test/pom.xml"), "<artifactId>android-maven-plugin</artifactId>");
175 175
         Helper.assertContains(new File("target/it/quickstart-with-platform-and-package/android-test/pom.xml"), "<platform>4</platform>");
176 176
         Helper.assertContains(new File("target/it/quickstart-with-platform-and-package/android-test/pom.xml"), "1.6_r2"); // Android lib version
177 177
         Helper.assertContains(new File("target/it/quickstart-with-platform-and-package/android-test/AndroidManifest.xml"), "<activity android:name=\".HelloAndroidActivity\">");
@@ -220,7 +220,7 @@ public void testQuickStartWithEmulator() throws VerificationException, IOExcepti
220 220
         verifier.assertFilePresent("android-test/src/main/java/android/archetypes/test/HelloAndroidActivity.java");
221 221
 
222 222
 
223  
-        Helper.assertContains(new File("target/it/quickstart-default/android-test/pom.xml"), "<artifactId>maven-android-plugin</artifactId>");
  223
+        Helper.assertContains(new File("target/it/quickstart-default/android-test/pom.xml"), "<artifactId>android-maven-plugin</artifactId>");
224 224
         Helper.assertContains(new File("target/it/quickstart-default/android-test/pom.xml"), "<platform>7</platform>");
225 225
         Helper.assertContains(new File("target/it/quickstart-default/android-test/AndroidManifest.xml"), "<activity android:name=\".HelloAndroidActivity\">");
226 226
         Helper.assertContains(new File("target/it/quickstart-default/android-test/AndroidManifest.xml"), "package=\"android.archetypes.test\"");
16  android-archetypes-it/src/test/java/de/akquinet/android/archetypes/ReleaseArchetypeTest.java
@@ -87,12 +87,12 @@ public void testWithTestDefault() throws VerificationException, IOException {
87 87
         Helper.assertContains(new File("target/it/release-default/android-test/pom.xml"), "<id>release</id>");
88 88
         Helper.assertContains(new File("target/it/release-default/android-test/pom.xml"),"<artifactId>maven-enforcer-plugin</artifactId>");
89 89
 
90  
-        Helper.assertContains(new File("target/it/release-default/android-test/"+ Constants.TEST_ARTIFACT_ID + "/pom.xml"), "<artifactId>maven-android-plugin</artifactId>");
  90
+        Helper.assertContains(new File("target/it/release-default/android-test/"+ Constants.TEST_ARTIFACT_ID + "/pom.xml"), "<artifactId>android-maven-plugin</artifactId>");
91 91
         Helper.assertContains(new File("target/it/release-default/android-test/pom.xml"), "<platform>7</platform>");
92 92
         Helper.assertContains(new File("target/it/release-default/android-test/"+ Constants.TEST_ARTIFACT_ID + "/AndroidManifest.xml"), "<activity android:name=\".HelloAndroidActivity\">");
93 93
         Helper.assertContains(new File("target/it/release-default/android-test/"+ Constants.TEST_ARTIFACT_ID + "/AndroidManifest.xml"), "package=\"android.archetypes.test\"");
94 94
 
95  
-        Helper.assertContains(new File("target/it/release-default/android-test/"+ Constants.TEST_ARTIFACT_ID + "-it/pom.xml"), "<artifactId>maven-android-plugin</artifactId>");
  95
+        Helper.assertContains(new File("target/it/release-default/android-test/"+ Constants.TEST_ARTIFACT_ID + "-it/pom.xml"), "<artifactId>android-maven-plugin</artifactId>");
96 96
         Helper.assertContains(new File("target/it/release-default/android-test/"+ Constants.TEST_ARTIFACT_ID + "-it/AndroidManifest.xml"), "<uses-library android:name=\"android.test.runner\" />");
97 97
         Helper.assertContains(new File("target/it/release-default/android-test/"+ Constants.TEST_ARTIFACT_ID + "-it/AndroidManifest.xml"), "<instrumentation android:targetPackage=\"android.archetypes.test\"");
98 98
 
@@ -151,12 +151,12 @@ public void testWithTestWithPlatform() throws VerificationException, IOException
151 151
         verifier.assertFilePresent("android-test/"+ Constants.TEST_ARTIFACT_ID + "-it/src/main/java/android/archetypes/test/test/HelloAndroidActivityTest.java");
152 152
 
153 153
 
154  
-        Helper.assertContains(new File("target/it/release-with-platform/android-test/"+ Constants.TEST_ARTIFACT_ID + "/pom.xml"), "<artifactId>maven-android-plugin</artifactId>");
  154
+        Helper.assertContains(new File("target/it/release-with-platform/android-test/"+ Constants.TEST_ARTIFACT_ID + "/pom.xml"), "<artifactId>android-maven-plugin</artifactId>");
155 155
         Helper.assertContains(new File("target/it/release-with-platform/android-test/pom.xml"), "<platform>8</platform>");
156 156
         Helper.assertContains(new File("target/it/release-with-platform/android-test/"+ Constants.TEST_ARTIFACT_ID + "/AndroidManifest.xml"), "<activity android:name=\".HelloAndroidActivity\">");
157 157
         Helper.assertContains(new File("target/it/release-with-platform/android-test/"+ Constants.TEST_ARTIFACT_ID + "/AndroidManifest.xml"), "package=\"android.archetypes.test\"");
158 158
 
159  
-        Helper.assertContains(new File("target/it/release-with-platform/android-test/"+ Constants.TEST_ARTIFACT_ID + "-it/pom.xml"), "<artifactId>maven-android-plugin</artifactId>");
  159
+        Helper.assertContains(new File("target/it/release-with-platform/android-test/"+ Constants.TEST_ARTIFACT_ID + "-it/pom.xml"), "<artifactId>android-maven-plugin</artifactId>");
160 160
         Helper.assertContains(new File("target/it/release-with-platform/android-test/"+ Constants.TEST_ARTIFACT_ID + "-it/AndroidManifest.xml"), "<uses-library android:name=\"android.test.runner\" />");
161 161
         Helper.assertContains(new File("target/it/release-with-platform/android-test/"+ Constants.TEST_ARTIFACT_ID + "-it/AndroidManifest.xml"), "<instrumentation android:targetPackage=\"android.archetypes.test\"");
162 162
 
@@ -211,13 +211,13 @@ public void testWithTestWithPlatformAndPackage() throws VerificationException, I
211 211
         verifier.assertFilePresent("android-test/"+ Constants.TEST_ARTIFACT_ID + "-it/src/main/java/foo/test/HelloAndroidActivityTest.java");
212 212
 
213 213
 
214  
-        Helper.assertContains(new File("target/it/release-with-platform-and-package/android-test/"+ Constants.TEST_ARTIFACT_ID + "/pom.xml"), "<artifactId>maven-android-plugin</artifactId>");
  214
+        Helper.assertContains(new File("target/it/release-with-platform-and-package/android-test/"+ Constants.TEST_ARTIFACT_ID + "/pom.xml"), "<artifactId>android-maven-plugin</artifactId>");
215 215
         Helper.assertContains(new File("target/it/release-with-platform-and-package/android-test/pom.xml"), "<platform>3</platform>");
216 216
         Helper.assertContains(new File("target/it/release-with-platform-and-package/android-test/pom.xml"), "1.5_r4");
217 217
         Helper.assertContains(new File("target/it/release-with-platform-and-package/android-test/"+ Constants.TEST_ARTIFACT_ID + "/AndroidManifest.xml"), "<activity android:name=\".HelloAndroidActivity\">");
218 218
         Helper.assertContains(new File("target/it/release-with-platform-and-package/android-test/"+ Constants.TEST_ARTIFACT_ID + "/AndroidManifest.xml"), "package=\"foo\"");
219 219
 
220  
-        Helper.assertContains(new File("target/it/release-with-platform-and-package/android-test/"+ Constants.TEST_ARTIFACT_ID + "-it/pom.xml"), "<artifactId>maven-android-plugin</artifactId>");
  220
+        Helper.assertContains(new File("target/it/release-with-platform-and-package/android-test/"+ Constants.TEST_ARTIFACT_ID + "-it/pom.xml"), "<artifactId>android-maven-plugin</artifactId>");
221 221
         Helper.assertContains(new File("target/it/release-with-platform-and-package/android-test/"+ Constants.TEST_ARTIFACT_ID + "-it/AndroidManifest.xml"), "<uses-library android:name=\"android.test.runner\" />");
222 222
         Helper.assertContains(new File("target/it/release-with-platform-and-package/android-test/"+ Constants.TEST_ARTIFACT_ID + "-it/AndroidManifest.xml"), "<instrumentation android:targetPackage=\"foo\"");
223 223
 
@@ -283,12 +283,12 @@ public void testWithTestWithEmulator() throws VerificationException, IOException
283 283
         Helper.assertContains(new File("target/it/release-default/android-test/pom.xml"), "<id>release</id>");
284 284
         Helper.assertContains(new File("target/it/release-default/android-test/pom.xml"),"<artifactId>maven-enforcer-plugin</artifactId>");
285 285
 
286  
-        Helper.assertContains(new File("target/it/release-default/android-test/"+ Constants.TEST_ARTIFACT_ID + "/pom.xml"), "<artifactId>maven-android-plugin</artifactId>");
  286
+        Helper.assertContains(new File("target/it/release-default/android-test/"+ Constants.TEST_ARTIFACT_ID + "/pom.xml"), "<artifactId>android-maven-plugin</artifactId>");
287 287
         Helper.assertContains(new File("target/it/release-default/android-test/pom.xml"), "<platform>7</platform>");
288 288
         Helper.assertContains(new File("target/it/release-default/android-test/"+ Constants.TEST_ARTIFACT_ID + "/AndroidManifest.xml"), "<activity android:name=\".HelloAndroidActivity\">");
289 289
         Helper.assertContains(new File("target/it/release-default/android-test/"+ Constants.TEST_ARTIFACT_ID + "/AndroidManifest.xml"), "package=\"android.archetypes.test\"");
290 290
 
291  
-        Helper.assertContains(new File("target/it/release-default/android-test/"+ Constants.TEST_ARTIFACT_ID + "-it/pom.xml"), "<artifactId>maven-android-plugin</artifactId>");
  291
+        Helper.assertContains(new File("target/it/release-default/android-test/"+ Constants.TEST_ARTIFACT_ID + "-it/pom.xml"), "<artifactId>android-maven-plugin</artifactId>");
292 292
         Helper.assertContains(new File("target/it/release-default/android-test/"+ Constants.TEST_ARTIFACT_ID + "-it/AndroidManifest.xml"), "<uses-library android:name=\"android.test.runner\" />");
293 293
         Helper.assertContains(new File("target/it/release-default/android-test/"+ Constants.TEST_ARTIFACT_ID + "-it/AndroidManifest.xml"), "<instrumentation android:targetPackage=\"android.archetypes.test\"");
294 294
 
16  android-archetypes-it/src/test/java/de/akquinet/android/archetypes/WithTestsArchetypeTest.java
@@ -78,12 +78,12 @@ public void testWithTestDefault() throws VerificationException, IOException {
78 78
         verifier.assertFilePresent("android-test/" + Constants.TEST_ARTIFACT_ID + "-it/src/main/java/android/archetypes/test/test/HelloAndroidActivityTest.java");
79 79
 
80 80
 
81  
-        Helper.assertContains(new File("target/it/with-test-default/android-test/" + Constants.TEST_ARTIFACT_ID + "/pom.xml"), "<artifactId>maven-android-plugin</artifactId>");
  81
+        Helper.assertContains(new File("target/it/with-test-default/android-test/" + Constants.TEST_ARTIFACT_ID + "/pom.xml"), "<artifactId>android-maven-plugin</artifactId>");
82 82
         Helper.assertContains(new File("target/it/with-test-default/android-test/" + Constants.TEST_ARTIFACT_ID + "/pom.xml"), "<platform>7</platform>");
83 83
         Helper.assertContains(new File("target/it/with-test-default/android-test/" + Constants.TEST_ARTIFACT_ID + "/AndroidManifest.xml"), "<activity android:name=\".HelloAndroidActivity\">");
84 84
         Helper.assertContains(new File("target/it/with-test-default/android-test/" + Constants.TEST_ARTIFACT_ID + "/AndroidManifest.xml"), "package=\"android.archetypes.test\"");
85 85
 
86  
-        Helper.assertContains(new File("target/it/with-test-default/android-test/" + Constants.TEST_ARTIFACT_ID + "-it/pom.xml"), "<artifactId>maven-android-plugin</artifactId>");
  86
+        Helper.assertContains(new File("target/it/with-test-default/android-test/" + Constants.TEST_ARTIFACT_ID + "-it/pom.xml"), "<artifactId>android-maven-plugin</artifactId>");
87 87
         Helper.assertContains(new File("target/it/with-test-default/android-test/" + Constants.TEST_ARTIFACT_ID + "-it/pom.xml"), "<platform>7</platform>");
88 88
         Helper.assertContains(new File("target/it/with-test-default/android-test/" + Constants.TEST_ARTIFACT_ID + "-it/AndroidManifest.xml"), "<uses-library android:name=\"android.test.runner\" />");
89 89
         Helper.assertContains(new File("target/it/with-test-default/android-test/" + Constants.TEST_ARTIFACT_ID + "-it/AndroidManifest.xml"), "<instrumentation android:targetPackage=\"android.archetypes.test\"");
@@ -143,12 +143,12 @@ public void testWithTestWithPlatform() throws VerificationException, IOException
143 143
         verifier.assertFilePresent("android-test/" + Constants.TEST_ARTIFACT_ID + "-it/src/main/java/android/archetypes/test/test/HelloAndroidActivityTest.java");
144 144
 
145 145
 
146  
-        Helper.assertContains(new File("target/it/with-test-with-platform/android-test/" + Constants.TEST_ARTIFACT_ID + "/pom.xml"), "<artifactId>maven-android-plugin</artifactId>");
  146
+        Helper.assertContains(new File("target/it/with-test-with-platform/android-test/" + Constants.TEST_ARTIFACT_ID + "/pom.xml"), "<artifactId>android-maven-plugin</artifactId>");
147 147
         Helper.assertContains(new File("target/it/with-test-with-platform/android-test/" + Constants.TEST_ARTIFACT_ID + "/pom.xml"), "<platform>8</platform>");
148 148
         Helper.assertContains(new File("target/it/with-test-with-platform/android-test/" + Constants.TEST_ARTIFACT_ID + "/AndroidManifest.xml"), "<activity android:name=\".HelloAndroidActivity\">");
149 149
         Helper.assertContains(new File("target/it/with-test-with-platform/android-test/" + Constants.TEST_ARTIFACT_ID + "/AndroidManifest.xml"), "package=\"android.archetypes.test\"");
150 150
 
151  
-        Helper.assertContains(new File("target/it/with-test-with-platform/android-test/" + Constants.TEST_ARTIFACT_ID + "-it/pom.xml"), "<artifactId>maven-android-plugin</artifactId>");
  151
+        Helper.assertContains(new File("target/it/with-test-with-platform/android-test/" + Constants.TEST_ARTIFACT_ID + "-it/pom.xml"), "<artifactId>android-maven-plugin</artifactId>");
152 152
         Helper.assertContains(new File("target/it/with-test-with-platform/android-test/" + Constants.TEST_ARTIFACT_ID + "-it/pom.xml"), "<platform>8</platform>");
153 153
         Helper.assertContains(new File("target/it/with-test-with-platform/android-test/" + Constants.TEST_ARTIFACT_ID + "-it/AndroidManifest.xml"), "<uses-library android:name=\"android.test.runner\" />");
154 154
         Helper.assertContains(new File("target/it/with-test-with-platform/android-test/" + Constants.TEST_ARTIFACT_ID + "-it/AndroidManifest.xml"), "<instrumentation android:targetPackage=\"android.archetypes.test\"");
@@ -205,12 +205,12 @@ public void testWithTestWithPlatformAndPackage() throws VerificationException, I
205 205
 
206 206
         Helper.assertContains(new File("target/it/with-test-with-platform-and-package/android-test/pom.xml"), "2.1.2");
207 207
 
208  
-        Helper.assertContains(new File("target/it/with-test-with-platform-and-package/android-test/" + Constants.TEST_ARTIFACT_ID + "/pom.xml"), "<artifactId>maven-android-plugin</artifactId>");
  208
+        Helper.assertContains(new File("target/it/with-test-with-platform-and-package/android-test/" + Constants.TEST_ARTIFACT_ID + "/pom.xml"), "<artifactId>android-maven-plugin</artifactId>");
209 209
         Helper.assertContains(new File("target/it/with-test-with-platform-and-package/android-test/" + Constants.TEST_ARTIFACT_ID + "/pom.xml"), "<platform>7</platform>");
210 210
         Helper.assertContains(new File("target/it/with-test-with-platform-and-package/android-test/" + Constants.TEST_ARTIFACT_ID + "/AndroidManifest.xml"), "<activity android:name=\".HelloAndroidActivity\">");
211 211
         Helper.assertContains(new File("target/it/with-test-with-platform-and-package/android-test/" + Constants.TEST_ARTIFACT_ID + "/AndroidManifest.xml"), "package=\"foo\"");
212 212
 
213  
-        Helper.assertContains(new File("target/it/with-test-with-platform-and-package/android-test/" + Constants.TEST_ARTIFACT_ID + "-it/pom.xml"), "<artifactId>maven-android-plugin</artifactId>");
  213
+        Helper.assertContains(new File("target/it/with-test-with-platform-and-package/android-test/" + Constants.TEST_ARTIFACT_ID + "-it/pom.xml"), "<artifactId>android-maven-plugin</artifactId>");
214 214
         Helper.assertContains(new File("target/it/with-test-with-platform-and-package/android-test/" + Constants.TEST_ARTIFACT_ID + "-it/pom.xml"), "<platform>7</platform>");
215 215
         Helper.assertContains(new File("target/it/with-test-with-platform-and-package/android-test/" + Constants.TEST_ARTIFACT_ID + "-it/AndroidManifest.xml"), "<uses-library android:name=\"android.test.runner\" />");
216 216
         Helper.assertContains(new File("target/it/with-test-with-platform-and-package/android-test/" + Constants.TEST_ARTIFACT_ID + "-it/AndroidManifest.xml"), "<instrumentation android:targetPackage=\"foo\"");
@@ -268,12 +268,12 @@ public void testWithTestWithEmulator() throws VerificationException, IOException
268 268
         verifier.assertFilePresent("android-test/" + Constants.TEST_ARTIFACT_ID + "-it/src/main/java/android/archetypes/test/test/HelloAndroidActivityTest.java");
269 269
 
270 270
 
271  
-        Helper.assertContains(new File("target/it/with-test-default/android-test/" + Constants.TEST_ARTIFACT_ID + "/pom.xml"), "<artifactId>maven-android-plugin</artifactId>");
  271
+        Helper.assertContains(new File("target/it/with-test-default/android-test/" + Constants.TEST_ARTIFACT_ID + "/pom.xml"), "<artifactId>android-maven-plugin</artifactId>");
272 272
         Helper.assertContains(new File("target/it/with-test-default/android-test/" + Constants.TEST_ARTIFACT_ID + "/pom.xml"), "<platform>7</platform>");
273 273
         Helper.assertContains(new File("target/it/with-test-default/android-test/" + Constants.TEST_ARTIFACT_ID + "/AndroidManifest.xml"), "<activity android:name=\".HelloAndroidActivity\">");
274 274
         Helper.assertContains(new File("target/it/with-test-default/android-test/" + Constants.TEST_ARTIFACT_ID + "/AndroidManifest.xml"), "package=\"android.archetypes.test\"");
275 275
 
276  
-        Helper.assertContains(new File("target/it/with-test-default/android-test/" + Constants.TEST_ARTIFACT_ID + "-it/pom.xml"), "<artifactId>maven-android-plugin</artifactId>");
  276
+        Helper.assertContains(new File("target/it/with-test-default/android-test/" + Constants.TEST_ARTIFACT_ID + "-it/pom.xml"), "<artifactId>android-maven-plugin</artifactId>");
277 277
         Helper.assertContains(new File("target/it/with-test-default/android-test/" + Constants.TEST_ARTIFACT_ID + "-it/pom.xml"), "<platform>7</platform>");
278 278
         Helper.assertContains(new File("target/it/with-test-default/android-test/" + Constants.TEST_ARTIFACT_ID + "-it/AndroidManifest.xml"), "<uses-library android:name=\"android.test.runner\" />");
279 279
         Helper.assertContains(new File("target/it/with-test-default/android-test/" + Constants.TEST_ARTIFACT_ID + "-it/AndroidManifest.xml"), "<instrumentation android:targetPackage=\"android.archetypes.test\"");
2  android-quickstart/src/main/resources/META-INF/maven/archetype-metadata.xml
@@ -12,7 +12,7 @@
12 12
       <defaultValue>not-specified</defaultValue>
13 13
     </requiredProperty>
14 14
     <requiredProperty key="android-plugin-version">
15  
-      <defaultValue>2.8.4</defaultValue>
  15
+      <defaultValue>3.0.0</defaultValue>
16 16
     </requiredProperty>
17 17
   </requiredProperties>
18 18
 
2  android-quickstart/src/main/resources/archetype-resources/pom.xml
@@ -27,7 +27,7 @@
27 27
         <plugins>
28 28
             <plugin>
29 29
                 <groupId>com.jayway.maven.plugins.android.generation2</groupId>
30  
-                <artifactId>maven-android-plugin</artifactId>
  30
+                <artifactId>android-maven-plugin</artifactId>
31 31
                 <version>${android-plugin-version}</version>
32 32
                 <configuration>
33 33
                     <androidManifestFile>${project.basedir}/AndroidManifest.xml</androidManifestFile>
2  android-release/src/main/resources/META-INF/maven/archetype-metadata.xml
@@ -11,7 +11,7 @@
11 11
             <defaultValue>not-specified</defaultValue>
12 12
         </requiredProperty>
13 13
         <requiredProperty key="android-plugin-version">
14  
-            <defaultValue>2.8.4</defaultValue>
  14
+            <defaultValue>3.0.0</defaultValue>
15 15
         </requiredProperty>
16 16
     </requiredProperties>
17 17
 
4  android-release/src/main/resources/archetype-resources/__rootArtifactId__-it/pom.xml
@@ -55,7 +55,7 @@
55 55
     <plugins>
56 56
       <plugin>
57 57
         <groupId>com.jayway.maven.plugins.android.generation2</groupId>
58  
-        <artifactId>maven-android-plugin</artifactId>
  58
+        <artifactId>android-maven-plugin</artifactId>
59 59
         <extensions>true</extensions>
60 60
       </plugin>
61 61
     </plugins>
@@ -86,7 +86,7 @@
86 86
           </plugin>
87 87
           <plugin>
88 88
             <groupId>com.jayway.maven.plugins.android.generation2</groupId>
89  
-            <artifactId>maven-android-plugin</artifactId>
  89
+            <artifactId>android-maven-plugin</artifactId>
90 90
             <configuration>
91 91
               <sign>
92 92
                 <debug>false</debug>
4  android-release/src/main/resources/archetype-resources/__rootArtifactId__/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>
@@ -89,7 +89,7 @@
89 89
           </plugin>
90 90
           <plugin>
91 91
             <groupId>com.jayway.maven.plugins.android.generation2</groupId>
92  
-            <artifactId>maven-android-plugin</artifactId>
  92
+            <artifactId>android-maven-plugin</artifactId>
93 93
             <executions>
94 94
               <execution>
95 95
                 <id>zipalign-application-apk</id>
2  android-release/src/main/resources/archetype-resources/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
                     <version>${android-plugin-version}</version>
67 67
                     <inherited>true</inherited>
68 68
                     <configuration>
2  android-with-test/src/main/resources/META-INF/maven/archetype-metadata.xml
@@ -11,7 +11,7 @@
11 11
             <defaultValue>not-specified</defaultValue>
12 12
         </requiredProperty>
13 13
         <requiredProperty key="android-plugin-version">
14  
-            <defaultValue>2.8.4</defaultValue>
  14
+            <defaultValue>3.0.0</defaultValue>
15 15
         </requiredProperty>
16 16
     </requiredProperties>
17 17
 
2  android-with-test/src/main/resources/archetype-resources/__rootArtifactId__-it/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
                 <configuration>
50 50
                     <androidManifestFile>${project.basedir}/AndroidManifest.xml</androidManifestFile>
51 51
                     <assetsDirectory>${project.basedir}/assets</assetsDirectory>
2  android-with-test/src/main/resources/archetype-resources/__rootArtifactId__/pom.xml
@@ -29,7 +29,7 @@
29 29
     <plugins>
30 30
       <plugin>
31 31
         <groupId>com.jayway.maven.plugins.android.generation2</groupId>
32  
-        <artifactId>maven-android-plugin</artifactId>
  32
+        <artifactId>android-maven-plugin</artifactId>
33 33
         <configuration>
34 34
           <androidManifestFile>${project.basedir}/AndroidManifest.xml</androidManifestFile>
35 35
           <assetsDirectory>${project.basedir}/assets</assetsDirectory>
4  android-with-test/src/main/resources/archetype-resources/pom.xml
@@ -61,7 +61,7 @@
61 61
             <plugins>
62 62
                 <plugin>
63 63
                     <groupId>com.jayway.maven.plugins.android.generation2</groupId>
64  
-                    <artifactId>maven-android-plugin</artifactId>
  64
+                    <artifactId>android-maven-plugin</artifactId>
65 65
                     <version>${android-plugin-version}</version>
66 66
                 </plugin>
67 67
                 <plugin>
@@ -71,4 +71,4 @@
71 71
             </plugins>
72 72
         </pluginManagement>
73 73
     </build>
74  
-</project>
  74
+</project>
6  changelog.txt
... ...
@@ -1,3 +1,7 @@
  1
+Version 1.0.7
  2
+-------------
  3
+   * Changed plugin name to android-maven-plugin (dtmilano)
  4
+
1 5
 Version 1.0.6
2 6
 -------------
3 7
    * Added the android-plugin-version parameter (thanks Ricardo Gladwell)
@@ -30,4 +34,4 @@ Version 1.0.1
30 34
 
31 35
 Version 1.0.0
32 36
 -------------
33  
-  * Initial release
  37
+  * Initial release

0 notes on commit 0b40216

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