Skip to content

Commit 93d0d41

Browse files
WonderCsaboWonderCsabo
committed
Clean up POMs
Updated to new plugins and dependencies, removed old unused parts.
1 parent c6d2b30 commit 93d0d41

5 files changed

Lines changed: 69 additions & 66 deletions

File tree

‎AndroidAnnotations/androidannotations-api/pom.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
<!-- spring-android-rest-template is required to use the Rest API -->
2929
<groupId>org.springframework.android</groupId>
3030
<artifactId>spring-android-rest-template</artifactId>
31-
<version>1.0.0.RELEASE</version>
3231
<scope>provided</scope>
3332
</dependency>
3433
</dependencies>

‎AndroidAnnotations/androidannotations/pom.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@
3939
<!-- spring-android-rest-template is required to use the Rest API -->
4040
<groupId>org.springframework.android</groupId>
4141
<artifactId>spring-android-rest-template</artifactId>
42-
<version>1.0.0.RELEASE</version>
4342
<scope>test</scope>
4443
</dependency>
4544
</dependencies>

‎AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/manifest/AndroidManifestFinderTest.java‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,16 @@
1717

1818
import java.io.File;
1919
import java.io.FileNotFoundException;
20+
import java.io.FileOutputStream;
2021
import java.io.IOException;
21-
import java.io.InputStream;
22+
import java.io.OutputStream;
2223

2324
import org.androidannotations.AndroidAnnotationProcessor;
2425
import org.androidannotations.utils.AAProcessorTestHelper;
2526
import org.junit.Before;
2627
import org.junit.Test;
2728

28-
import com.google.common.io.Files;
29-
import com.google.common.io.InputSupplier;
29+
import com.google.common.io.ByteStreams;
3030

3131
public class AndroidManifestFinderTest extends AAProcessorTestHelper {
3232

@@ -78,13 +78,12 @@ private void deleteManifestFromParentOfOutputDirectory() {
7878
}
7979

8080
private void copyManifestToParentOfOutputDirectory() throws FileNotFoundException, IOException {
81-
InputSupplier<InputStream> from = new InputSupplier<InputStream>() {
82-
@Override
83-
public InputStream getInput() throws IOException {
84-
return AndroidManifestFinderTest.class.getResourceAsStream("AndroidManifest.xml");
85-
}
86-
};
87-
Files.copy(from, manifestFileInParentOfOutputDirectory());
81+
final OutputStream out = new FileOutputStream(manifestFileInParentOfOutputDirectory());
82+
try {
83+
ByteStreams.copy(AndroidManifestFinderTest.class.getResourceAsStream("AndroidManifest.xml"), out);
84+
} finally {
85+
out.close();
86+
}
8887
}
8988

9089
private File manifestFileInParentOfOutputDirectory() {

‎AndroidAnnotations/functional-test-1-5/pom.xml‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,11 @@
1010

1111
<artifactId>functional-test-1-5</artifactId>
1212
<packaging>apk</packaging>
13-
<name>functional-test-1-5</name>
13+
<name>AndroidAnnotations functional test suite</name>
1414

1515
<properties>
16-
<spring-android-version>1.0.0.RELEASE</spring-android-version>
17-
<jackson-version>1.9.6</jackson-version>
18-
<simple-version>2.4.1</simple-version>
19-
<android-rome-version>1.0.0-r2</android-rome-version>
16+
<jackson-version>1.9.11</jackson-version>
17+
<simple-version>2.7.1</simple-version>
2018
</properties>
2119

2220
<dependencies>
@@ -49,18 +47,17 @@
4947
<dependency>
5048
<groupId>com.j256.ormlite</groupId>
5149
<artifactId>ormlite-android</artifactId>
52-
<version>4.41</version>
50+
<version>4.48</version>
5351
</dependency>
5452
<dependency>
5553
<groupId>com.squareup</groupId>
5654
<artifactId>otto</artifactId>
57-
<version>1.3.4</version>
55+
<version>1.3.5</version>
5856
</dependency>
5957
<dependency>
6058
<!-- spring-android-rest-template is required to use the Rest API -->
6159
<groupId>org.springframework.android</groupId>
6260
<artifactId>spring-android-rest-template</artifactId>
63-
<version>${spring-android-version}</version>
6461
</dependency>
6562
<dependency>
6663
<!-- Using Jackson for JSON marshaling -->
@@ -82,6 +79,10 @@
8279
<artifactId>stax-api</artifactId>
8380
<groupId>stax</groupId>
8481
</exclusion>
82+
<exclusion>
83+
<groupId>xpp3</groupId>
84+
<artifactId>xpp3</artifactId>
85+
</exclusion>
8586
</exclusions>
8687
</dependency>
8788
<dependency>
@@ -96,9 +97,9 @@
9697
<scope>test</scope>
9798
<exclusions>
9899
<exclusion>
99-
<groupId>com.android.support</groupId>
100-
<artifactId>support-v4</artifactId>
101-
</exclusion>
100+
<groupId>com.android.support</groupId>
101+
<artifactId>support-v4</artifactId>
102+
</exclusion>
102103
</exclusions>
103104
</dependency>
104105
<dependency>
@@ -116,13 +117,12 @@
116117
<dependency>
117118
<groupId>org.mockito</groupId>
118119
<artifactId>mockito-all</artifactId>
119-
<version>1.9.5</version>
120+
<version>1.10.8</version>
120121
<scope>test</scope>
121-
</dependency>
122-
<dependency>
123-
<groupId>junit</groupId>
124-
<artifactId>junit</artifactId>
125-
<scope>test</scope>
122+
</dependency>
123+
<dependency>
124+
<groupId>junit</groupId>
125+
<artifactId>junit</artifactId>
126126
</dependency>
127127
<dependency>
128128
<groupId>bouncycastle</groupId>
@@ -139,7 +139,7 @@
139139
<version>3.9.0-rc.3</version>
140140
<configuration>
141141
<sdk>
142-
<platform>14</platform>
142+
<platform>16</platform>
143143
</sdk>
144144
<dex>
145145
<jvmArguments>

‎AndroidAnnotations/pom.xml‎

Lines changed: 42 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,10 @@
9797
<properties>
9898
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
9999
</properties>
100+
101+
<prerequisites>
102+
<maven>3.1.1</maven>
103+
</prerequisites>
100104

101105
<modules>
102106
<module>androidannotations</module>
@@ -156,20 +160,26 @@
156160
<dependency>
157161
<groupId>com.sun.codemodel</groupId>
158162
<artifactId>codemodel</artifactId>
159-
<version>2.4.1</version>
163+
<version>2.6</version>
160164
</dependency>
161165
<dependency>
162166
<groupId>junit</groupId>
163167
<artifactId>junit</artifactId>
164-
<version>4.8.1</version>
168+
<version>4.11</version>
165169
<scope>test</scope>
166170
</dependency>
167171
<dependency>
168172
<groupId>com.google.guava</groupId>
169173
<artifactId>guava</artifactId>
170-
<version>15.0</version>
174+
<version>18.0</version>
171175
<scope>test</scope>
172176
</dependency>
177+
<dependency>
178+
<groupId>org.springframework.android</groupId>
179+
<artifactId>spring-android-rest-template</artifactId>
180+
<version>1.0.1.RELEASE</version>
181+
<scope>provided</scope>
182+
</dependency>
173183
</dependencies>
174184
</dependencyManagement>
175185

@@ -179,15 +189,15 @@
179189
<plugin>
180190
<groupId>org.apache.maven.plugins</groupId>
181191
<artifactId>maven-release-plugin</artifactId>
182-
<version>2.5</version>
192+
<version>2.5.1</version>
183193
<configuration>
184194
<mavenExecutorId>forked-path</mavenExecutorId>
185195
</configuration>
186196
</plugin>
187197
<plugin>
188198
<groupId>org.sonatype.plugins</groupId>
189199
<artifactId>jarjar-maven-plugin</artifactId>
190-
<version>1.3</version>
200+
<version>1.9</version>
191201
</plugin>
192202
<plugin>
193203
<groupId>org.apache.maven.plugins</groupId>
@@ -197,23 +207,23 @@
197207
<plugin>
198208
<groupId>org.apache.maven.plugins</groupId>
199209
<artifactId>maven-resources-plugin</artifactId>
200-
<version>2.5</version>
210+
<version>2.6</version>
201211
<configuration>
202212
<encoding>${project.build.sourceEncoding}</encoding>
203213
</configuration>
204214
</plugin>
205215
<plugin>
206216
<groupId>org.apache.maven.plugins</groupId>
207217
<artifactId>maven-jar-plugin</artifactId>
208-
<version>2.3.1</version>
218+
<version>2.5</version>
209219
</plugin>
210220
<plugin>
211221
<artifactId>maven-assembly-plugin</artifactId>
212-
<version>2.2.1</version>
222+
<version>2.5</version>
213223
</plugin>
214224
<plugin>
215225
<artifactId>maven-javadoc-plugin</artifactId>
216-
<version>2.9</version>
226+
<version>2.10.1</version>
217227
<configuration>
218228
<locale>en_US</locale>
219229
</configuration>
@@ -228,36 +238,12 @@
228238
</plugin>
229239
<plugin>
230240
<artifactId>maven-source-plugin</artifactId>
231-
<version>2.1.2</version>
241+
<version>2.4</version>
232242
</plugin>
233243
<plugin>
234244
<groupId>org.apache.maven.plugins</groupId>
235245
<artifactId>maven-deploy-plugin</artifactId>
236-
<version>2.7</version>
237-
</plugin>
238-
<plugin>
239-
<groupId>org.eclipse.m2e</groupId>
240-
<artifactId>lifecycle-mapping</artifactId>
241-
<version>1.0.0</version>
242-
<configuration>
243-
<lifecycleMappingMetadata>
244-
<pluginExecutions>
245-
<pluginExecution>
246-
<pluginExecutionFilter>
247-
<groupId>org.apache.maven.plugins</groupId>
248-
<artifactId>maven-enforcer-plugin</artifactId>
249-
<versionRange>[1.0,)</versionRange>
250-
<goals>
251-
<goal>enforce</goal>
252-
</goals>
253-
</pluginExecutionFilter>
254-
<action>
255-
<ignore />
256-
</action>
257-
</pluginExecution>
258-
</pluginExecutions>
259-
</lifecycleMappingMetadata>
260-
</configuration>
246+
<version>2.8.2</version>
261247
</plugin>
262248
</plugins>
263249
</pluginManagement>
@@ -282,6 +268,26 @@
282268
<strictCheck>true</strictCheck>
283269
</configuration>
284270
</plugin>
271+
<plugin>
272+
<groupId>org.apache.maven.plugins</groupId>
273+
<artifactId>maven-enforcer-plugin</artifactId>
274+
<version>1.3.1</version>
275+
<executions>
276+
<execution>
277+
<id>enforce-maven-version</id>
278+
<goals>
279+
<goal>enforce</goal>
280+
</goals>
281+
<configuration>
282+
<rules>
283+
<requireMavenVersion>
284+
<version>3.1.1</version>
285+
</requireMavenVersion>
286+
</rules>
287+
</configuration>
288+
</execution>
289+
</executions>
290+
</plugin>
285291
</plugins>
286292
</build>
287293

@@ -306,7 +312,7 @@
306312
<plugin>
307313
<groupId>org.apache.maven.plugins</groupId>
308314
<artifactId>maven-gpg-plugin</artifactId>
309-
<version>1.4</version>
315+
<version>1.5</version>
310316
<executions>
311317
<execution>
312318
<id>sign-artifacts</id>

0 commit comments

Comments
 (0)