Skip to content

Commit d6ec9ef

Browse files
WonderCsaboWonderCsabo
committed
Move up common configuration to parent POM
1 parent 8f2e07f commit d6ec9ef

6 files changed

Lines changed: 62 additions & 110 deletions

File tree

  • AndroidAnnotations
    • androidannotations-core
    • androidannotations-ormlite/ormlite-test
    • androidannotations-otto/otto-test
    • androidannotations-rest-spring/rest-spring-test
    • pom.xml

‎AndroidAnnotations/androidannotations-core/androidannotations-test/pom.xml‎

Lines changed: 1 addition & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -64,31 +64,18 @@
6464
<dependency>
6565
<groupId>org.robolectric</groupId>
6666
<artifactId>robolectric</artifactId>
67-
<version>2.4</version>
68-
<scope>test</scope>
6967
</dependency>
7068
<dependency>
7169
<groupId>org.easytesting</groupId>
7270
<artifactId>fest-reflect</artifactId>
73-
<version>1.4.1</version>
7471
</dependency>
7572
<dependency>
7673
<groupId>com.squareup</groupId>
7774
<artifactId>fest-android</artifactId>
78-
<version>1.0.8</version>
79-
<scope>test</scope>
80-
<exclusions>
81-
<exclusion>
82-
<groupId>com.android.support</groupId>
83-
<artifactId>support-v4</artifactId>
84-
</exclusion>
85-
</exclusions>
8675
</dependency>
8776
<dependency>
8877
<groupId>org.mockito</groupId>
89-
<artifactId>mockito-all</artifactId>
90-
<version>1.10.8</version>
91-
<scope>test</scope>
78+
<artifactId>mockito-core</artifactId>
9279
</dependency>
9380
<dependency>
9481
<groupId>junit</groupId>
@@ -106,15 +93,6 @@
10693
<plugin>
10794
<groupId>com.simpligility.maven.plugins</groupId>
10895
<artifactId>android-maven-plugin</artifactId>
109-
<version>4.2.1</version>
110-
<configuration>
111-
<androidManifestFile>AndroidManifest.xml</androidManifestFile>
112-
<sdk>
113-
<platform>16</platform>
114-
</sdk>
115-
<disableConflictingDependenciesWarning>true</disableConflictingDependenciesWarning>
116-
</configuration>
117-
<extensions>true</extensions>
11896
</plugin>
11997

12098
<plugin>

‎AndroidAnnotations/androidannotations-core/androidannotations-testutils/pom.xml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,10 +65,6 @@
6565
</execution>
6666
</executions>
6767
</plugin>
68-
<plugin>
69-
<groupId>org.apache.maven.plugins</groupId>
70-
<artifactId>maven-resources-plugin</artifactId>
71-
</plugin>
7268
</plugins>
7369
</build>
7470

‎AndroidAnnotations/androidannotations-ormlite/ormlite-test/pom.xml‎

Lines changed: 4 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -67,28 +67,14 @@
6767
<dependency>
6868
<groupId>org.robolectric</groupId>
6969
<artifactId>robolectric</artifactId>
70-
<version>2.3</version>
71-
<scope>test</scope>
72-
73-
<exclusions>
74-
<exclusion>
75-
<groupId>com.android.support</groupId>
76-
<artifactId>support-v4</artifactId>
77-
</exclusion>
78-
</exclusions>
7970
</dependency>
8071
<dependency>
8172
<groupId>com.squareup</groupId>
8273
<artifactId>fest-android</artifactId>
83-
<version>1.0.8</version>
84-
<scope>test</scope>
85-
86-
<exclusions>
87-
<exclusion>
88-
<groupId>com.android.support</groupId>
89-
<artifactId>support-v4</artifactId>
90-
</exclusion>
91-
</exclusions>
74+
</dependency>
75+
<dependency>
76+
<groupId>org.easytesting</groupId>
77+
<artifactId>fest-reflect</artifactId>
9278
</dependency>
9379
<dependency>
9480
<groupId>junit</groupId>
@@ -102,15 +88,6 @@
10288
<plugin>
10389
<groupId>com.simpligility.maven.plugins</groupId>
10490
<artifactId>android-maven-plugin</artifactId>
105-
<version>4.2.1</version>
106-
<configuration>
107-
<androidManifestFile>${project.basedir}/AndroidManifest.xml</androidManifestFile>
108-
<sdk>
109-
<platform>16</platform>
110-
</sdk>
111-
<disableConflictingDependenciesWarning>true</disableConflictingDependenciesWarning>
112-
</configuration>
113-
<extensions>true</extensions>
11491
</plugin>
11592

11693
<plugin>

‎AndroidAnnotations/androidannotations-otto/otto-test/pom.xml‎

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -63,28 +63,10 @@
6363
<dependency>
6464
<groupId>org.robolectric</groupId>
6565
<artifactId>robolectric</artifactId>
66-
<version>2.3</version>
67-
<scope>test</scope>
68-
69-
<exclusions>
70-
<exclusion>
71-
<groupId>com.android.support</groupId>
72-
<artifactId>support-v4</artifactId>
73-
</exclusion>
74-
</exclusions>
7566
</dependency>
7667
<dependency>
7768
<groupId>com.squareup</groupId>
7869
<artifactId>fest-android</artifactId>
79-
<version>1.0.8</version>
80-
<scope>test</scope>
81-
82-
<exclusions>
83-
<exclusion>
84-
<groupId>com.android.support</groupId>
85-
<artifactId>support-v4</artifactId>
86-
</exclusion>
87-
</exclusions>
8870
</dependency>
8971
<dependency>
9072
<groupId>junit</groupId>
@@ -98,15 +80,6 @@
9880
<plugin>
9981
<groupId>com.simpligility.maven.plugins</groupId>
10082
<artifactId>android-maven-plugin</artifactId>
101-
<version>4.2.1</version>
102-
<configuration>
103-
<androidManifestFile>${project.basedir}/AndroidManifest.xml</androidManifestFile>
104-
<sdk>
105-
<platform>16</platform>
106-
</sdk>
107-
<disableConflictingDependenciesWarning>true</disableConflictingDependenciesWarning>
108-
</configuration>
109-
<extensions>true</extensions>
11083
</plugin>
11184

11285
<plugin>

‎AndroidAnnotations/androidannotations-rest-spring/rest-spring-test/pom.xml‎

Lines changed: 1 addition & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -92,37 +92,18 @@
9292
<dependency>
9393
<groupId>org.robolectric</groupId>
9494
<artifactId>robolectric</artifactId>
95-
<version>2.3</version>
96-
<scope>test</scope>
97-
<exclusions>
98-
<exclusion>
99-
<groupId>com.android.support</groupId>
100-
<artifactId>support-v4</artifactId>
101-
</exclusion>
102-
</exclusions>
10395
</dependency>
10496
<dependency>
10597
<groupId>com.squareup</groupId>
10698
<artifactId>fest-android</artifactId>
107-
<version>1.0.8</version>
108-
<scope>test</scope>
109-
<exclusions>
110-
<exclusion>
111-
<groupId>com.android.support</groupId>
112-
<artifactId>support-v4</artifactId>
113-
</exclusion>
114-
</exclusions>
11599
</dependency>
116100
<dependency>
117101
<groupId>org.mockito</groupId>
118-
<artifactId>mockito-all</artifactId>
119-
<version>1.10.8</version>
120-
<scope>test</scope>
102+
<artifactId>mockito-core</artifactId>
121103
</dependency>
122104
<dependency>
123105
<groupId>junit</groupId>
124106
<artifactId>junit</artifactId>
125-
<scope>test</scope>
126107
</dependency>
127108
</dependencies>
128109

@@ -131,15 +112,6 @@
131112
<plugin>
132113
<groupId>com.simpligility.maven.plugins</groupId>
133114
<artifactId>android-maven-plugin</artifactId>
134-
<version>4.2.1</version>
135-
<configuration>
136-
<androidManifestFile>${project.basedir}/AndroidManifest.xml</androidManifestFile>
137-
<sdk>
138-
<platform>16</platform>
139-
</sdk>
140-
<disableConflictingDependenciesWarning>true</disableConflictingDependenciesWarning>
141-
</configuration>
142-
<extensions>true</extensions>
143115
</plugin>
144116

145117
<plugin>

‎AndroidAnnotations/pom.xml‎

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,49 @@
174174
<version>4.11</version>
175175
<scope>test</scope>
176176
</dependency>
177+
<dependency>
178+
<groupId>org.hamcrest</groupId>
179+
<artifactId>hamcrest-core</artifactId>
180+
<version>1.3</version>
181+
<scope>test</scope>
182+
</dependency>
183+
<dependency>
184+
<groupId>org.robolectric</groupId>
185+
<artifactId>robolectric</artifactId>
186+
<version>2.4</version>
187+
<scope>test</scope>
188+
189+
<exclusions>
190+
<exclusion>
191+
<groupId>com.android.support</groupId>
192+
<artifactId>support-v4</artifactId>
193+
</exclusion>
194+
</exclusions>
195+
</dependency>
196+
<dependency>
197+
<groupId>com.squareup</groupId>
198+
<artifactId>fest-android</artifactId>
199+
<version>1.0.8</version>
200+
<scope>test</scope>
201+
<exclusions>
202+
<exclusion>
203+
<groupId>com.android.support</groupId>
204+
<artifactId>support-v4</artifactId>
205+
</exclusion>
206+
</exclusions>
207+
</dependency>
208+
<dependency>
209+
<groupId>org.easytesting</groupId>
210+
<artifactId>fest-reflect</artifactId>
211+
<version>1.4.1</version>
212+
<scope>test</scope>
213+
</dependency>
214+
<dependency>
215+
<groupId>org.mockito</groupId>
216+
<artifactId>mockito-core</artifactId>
217+
<version>1.10.8</version>
218+
<scope>test</scope>
219+
</dependency>
177220
</dependencies>
178221
</dependencyManagement>
179222

@@ -249,6 +292,19 @@
249292
<artifactId>license-maven-plugin</artifactId>
250293
<version>2.6</version>
251294
</plugin>
295+
<plugin>
296+
<groupId>com.simpligility.maven.plugins</groupId>
297+
<artifactId>android-maven-plugin</artifactId>
298+
<version>4.2.1</version>
299+
<configuration>
300+
<androidManifestFile>${project.basedir}/AndroidManifest.xml</androidManifestFile>
301+
<sdk>
302+
<platform>16</platform>
303+
</sdk>
304+
<disableConflictingDependenciesWarning>true</disableConflictingDependenciesWarning>
305+
</configuration>
306+
<extensions>true</extensions>
307+
</plugin>
252308
</plugins>
253309
</pluginManagement>
254310
<plugins>

0 commit comments

Comments
 (0)