Skip to content

Commit 74c78d0

Browse files
royclarksonroyclarkson
committed
Updated SpringSource repositories
1 parent e053f9c commit 74c78d0

File tree

3 files changed

+168
-138
lines changed
  • spring-android-basic-auth/client
  • spring-android-news-reader
  • spring-android-showcase/client

3 files changed

+168
-138
lines changed

‎spring-android-basic-auth/client/pom.xml

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,8 @@
8282
</plugins>
8383
<pluginManagement>
8484
<plugins>
85-
<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself. -->
85+
<!--This plugin's configuration is used to store Eclipse m2e settings
86+
only. It has no influence on the Maven build itself. -->
8687
<plugin>
8788
<groupId>org.eclipse.m2e</groupId>
8889
<artifactId>lifecycle-mapping</artifactId>
@@ -127,12 +128,21 @@
127128
<!-- For developing against latest Spring milestones -->
128129
<repository>
129130
<id>springsource-milestone</id>
130-
<name>SpringSpring Milestone Repository</name>
131+
<name>SpringSource Milestone Repository</name>
131132
<url>http://repo.springframework.org/milestone</url>
132133
<snapshots>
133134
<enabled>false</enabled>
134135
</snapshots>
135136
</repository>
137+
<!-- For developing against latest Spring releases -->
138+
<repository>
139+
<id>springsource-repo</id>
140+
<name>SpringSpring Repository</name>
141+
<url>http://repo.springframework.org/release</url>
142+
<snapshots>
143+
<enabled>false</enabled>
144+
</snapshots>
145+
</repository>
136146
</repositories>
137147

138148
</project>

‎spring-android-news-reader/pom.xml

Lines changed: 141 additions & 131 deletions
Original file line numberDiff line numberDiff line change
@@ -1,144 +1,154 @@
1-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
22
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3-
<modelVersion>4.0.0</modelVersion>
3+
<modelVersion>4.0.0</modelVersion>
44

5-
<groupId>org.springframework.android</groupId>
6-
<artifactId>spring-android-news-reader</artifactId>
7-
<version>1.0.0.BUILD-SNAPSHOT</version>
8-
<packaging>apk</packaging>
9-
<name>spring-android-news-reader</name>
10-
<url>http://www.springsource.org</url>
11-
<organization>
12-
<name>SpringSource</name>
13-
<url>http://www.springsource.org</url>
14-
</organization>
5+
<groupId>org.springframework.android</groupId>
6+
<artifactId>spring-android-news-reader</artifactId>
7+
<version>1.0.0.BUILD-SNAPSHOT</version>
8+
<packaging>apk</packaging>
9+
<name>spring-android-news-reader</name>
10+
<url>http://www.springsource.org</url>
11+
<organization>
12+
<name>SpringSource</name>
13+
<url>http://www.springsource.org</url>
14+
</organization>
1515

16-
<properties>
17-
<android-platform>15</android-platform>
18-
<android-maven-plugin-version>3.1.1</android-maven-plugin-version>
19-
<maven-compiler-plugin-version>2.3.2</maven-compiler-plugin-version>
16+
<properties>
17+
<android-platform>15</android-platform>
18+
<android-maven-plugin-version>3.1.1</android-maven-plugin-version>
19+
<maven-compiler-plugin-version>2.3.2</maven-compiler-plugin-version>
2020
<java-version>1.6</java-version>
21-
<maven-eclipse-plugin-version>2.8</maven-eclipse-plugin-version>
22-
<com.google.android-version>4.0.1.2</com.google.android-version>
23-
<!-- Available Android versions: 1.5_r3, 1.5_r4, 1.6_r2, 2.1.2, 2.1_r1, 2.2.1, 2.3.1, 2.3.3, 4.0.1.2 -->
24-
<org.springframework.android-version>1.0.0.BUILD-SNAPSHOT</org.springframework.android-version>
25-
<com.google.code.android-rome-feed-reader-version>1.0.0-r2</com.google.code.android-rome-feed-reader-version>
26-
</properties>
21+
<maven-eclipse-plugin-version>2.8</maven-eclipse-plugin-version>
22+
<com.google.android-version>4.0.1.2</com.google.android-version>
23+
<!-- Available Android versions: 1.5_r3, 1.5_r4, 1.6_r2, 2.1.2, 2.1_r1, 2.2.1, 2.3.1, 2.3.3, 4.0.1.2 -->
24+
<org.springframework.android-version>1.0.0.BUILD-SNAPSHOT</org.springframework.android-version>
25+
<com.google.code.android-rome-feed-reader-version>1.0.0-r2</com.google.code.android-rome-feed-reader-version>
26+
</properties>
2727

28-
<dependencies>
29-
<dependency>
30-
<groupId>com.google.android</groupId>
31-
<artifactId>android</artifactId>
32-
<version>${com.google.android-version}</version>
33-
<scope>provided</scope>
34-
</dependency>
35-
<dependency>
36-
<groupId>org.springframework.android</groupId>
37-
<artifactId>spring-android-rest-template</artifactId>
38-
<version>${org.springframework.android-version}</version>
39-
</dependency>
40-
<dependency>
41-
<!-- Using ROME for RSS and ATOM feeds -->
42-
<groupId>com.google.code.android-rome-feed-reader</groupId>
43-
<artifactId>android-rome-feed-reader</artifactId>
44-
<version>${com.google.code.android-rome-feed-reader-version}</version>
45-
</dependency>
46-
</dependencies>
28+
<dependencies>
29+
<dependency>
30+
<groupId>com.google.android</groupId>
31+
<artifactId>android</artifactId>
32+
<version>${com.google.android-version}</version>
33+
<scope>provided</scope>
34+
</dependency>
35+
<dependency>
36+
<groupId>org.springframework.android</groupId>
37+
<artifactId>spring-android-rest-template</artifactId>
38+
<version>${org.springframework.android-version}</version>
39+
</dependency>
40+
<dependency>
41+
<!-- Using ROME for RSS and ATOM feeds -->
42+
<groupId>com.google.code.android-rome-feed-reader</groupId>
43+
<artifactId>android-rome-feed-reader</artifactId>
44+
<version>${com.google.code.android-rome-feed-reader-version}</version>
45+
</dependency>
46+
</dependencies>
4747

48-
<build>
49-
<finalName>${project.artifactId}</finalName>
50-
<sourceDirectory>src</sourceDirectory>
51-
<plugins>
52-
<plugin>
53-
<groupId>com.jayway.maven.plugins.android.generation2</groupId>
54-
<artifactId>android-maven-plugin</artifactId>
55-
<version>${android-maven-plugin-version}</version>
56-
<configuration>
57-
<sdk>
58-
<platform>${android-platform}</platform>
59-
</sdk>
60-
<deleteConflictingFiles>true</deleteConflictingFiles>
61-
<undeployBeforeDeploy>true</undeployBeforeDeploy>
62-
</configuration>
63-
<extensions>true</extensions>
64-
</plugin>
65-
<plugin>
66-
<artifactId>maven-compiler-plugin</artifactId>
67-
<version>${maven-compiler-plugin-version}</version>
48+
<build>
49+
<finalName>${project.artifactId}</finalName>
50+
<sourceDirectory>src</sourceDirectory>
51+
<plugins>
52+
<plugin>
53+
<groupId>com.jayway.maven.plugins.android.generation2</groupId>
54+
<artifactId>android-maven-plugin</artifactId>
55+
<version>${android-maven-plugin-version}</version>
56+
<configuration>
57+
<sdk>
58+
<platform>${android-platform}</platform>
59+
</sdk>
60+
<deleteConflictingFiles>true</deleteConflictingFiles>
61+
<undeployBeforeDeploy>true</undeployBeforeDeploy>
62+
</configuration>
63+
<extensions>true</extensions>
64+
</plugin>
65+
<plugin>
66+
<artifactId>maven-compiler-plugin</artifactId>
67+
<version>${maven-compiler-plugin-version}</version>
6868
<configuration>
6969
<source>${java-version}</source>
7070
<target>${java-version}</target>
7171
</configuration>
72-
</plugin>
73-
<plugin>
74-
<groupId>org.apache.maven.plugins</groupId>
75-
<artifactId>maven-eclipse-plugin</artifactId>
76-
<version>${maven-eclipse-plugin-version}</version>
77-
<configuration>
78-
<downloadSources>true</downloadSources>
79-
<downloadJavadocs>true</downloadJavadocs>
80-
</configuration>
81-
</plugin>
82-
</plugins>
83-
<pluginManagement>
84-
<plugins>
85-
<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
86-
<plugin>
87-
<groupId>org.eclipse.m2e</groupId>
88-
<artifactId>lifecycle-mapping</artifactId>
89-
<version>1.0.0</version>
90-
<configuration>
91-
<lifecycleMappingMetadata>
92-
<pluginExecutions>
93-
<pluginExecution>
94-
<pluginExecutionFilter>
95-
<groupId>com.jayway.maven.plugins.android.generation2</groupId>
96-
<artifactId>android-maven-plugin</artifactId>
97-
<versionRange>[3.1.1,)</versionRange>
98-
<goals>
99-
<goal>proguard</goal>
100-
</goals>
101-
</pluginExecutionFilter>
102-
<action>
103-
<ignore></ignore>
104-
</action>
105-
</pluginExecution>
106-
</pluginExecutions>
107-
</lifecycleMappingMetadata>
108-
</configuration>
109-
</plugin>
110-
</plugins>
111-
</pluginManagement>
112-
</build>
72+
</plugin>
73+
<plugin>
74+
<groupId>org.apache.maven.plugins</groupId>
75+
<artifactId>maven-eclipse-plugin</artifactId>
76+
<version>${maven-eclipse-plugin-version}</version>
77+
<configuration>
78+
<downloadSources>true</downloadSources>
79+
<downloadJavadocs>true</downloadJavadocs>
80+
</configuration>
81+
</plugin>
82+
</plugins>
83+
<pluginManagement>
84+
<plugins>
85+
<!--This plugin's configuration is used to store Eclipse m2e settings
86+
only. It has no influence on the Maven build itself. -->
87+
<plugin>
88+
<groupId>org.eclipse.m2e</groupId>
89+
<artifactId>lifecycle-mapping</artifactId>
90+
<version>1.0.0</version>
91+
<configuration>
92+
<lifecycleMappingMetadata>
93+
<pluginExecutions>
94+
<pluginExecution>
95+
<pluginExecutionFilter>
96+
<groupId>com.jayway.maven.plugins.android.generation2</groupId>
97+
<artifactId>android-maven-plugin</artifactId>
98+
<versionRange>[3.1.1,)</versionRange>
99+
<goals>
100+
<goal>proguard</goal>
101+
</goals>
102+
</pluginExecutionFilter>
103+
<action>
104+
<ignore></ignore>
105+
</action>
106+
</pluginExecution>
107+
</pluginExecutions>
108+
</lifecycleMappingMetadata>
109+
</configuration>
110+
</plugin>
111+
</plugins>
112+
</pluginManagement>
113+
</build>
113114

114-
<repositories>
115-
<!-- For developing with Android ROME Feed Reader -->
116-
<repository>
117-
<id>android-rome-feed-reader-repository</id>
118-
<name>Android ROME Feed Reader Repository</name>
119-
<url>https://android-rome-feed-reader.googlecode.com/svn/maven2/releases</url>
120-
</repository>
121-
<!-- For testing against latest Spring snapshots -->
122-
<repository>
123-
<id>org.springframework.maven.snapshot</id>
124-
<name>Spring Maven Snapshot Repository</name>
125-
<url>http://repo.springframework.org/snapshot</url>
126-
<releases>
127-
<enabled>false</enabled>
128-
</releases>
129-
<snapshots>
130-
<enabled>true</enabled>
131-
</snapshots>
132-
</repository>
133-
<!-- For developing against latest Spring milestones -->
134-
<repository>
135-
<id>org.springframework.maven.milestone</id>
136-
<name>Spring Maven Milestone Repository</name>
137-
<url>http://repo.springframework.org/milestone</url>
138-
<snapshots>
139-
<enabled>false</enabled>
140-
</snapshots>
141-
</repository>
142-
</repositories>
115+
<repositories>
116+
<!-- For developing with Android ROME Feed Reader -->
117+
<repository>
118+
<id>android-rome-feed-reader-repository</id>
119+
<name>Android ROME Feed Reader Repository</name>
120+
<url>https://android-rome-feed-reader.googlecode.com/svn/maven2/releases</url>
121+
</repository>
122+
<!-- For testing against latest Spring snapshots -->
123+
<repository>
124+
<id>springsource-snapshot</id>
125+
<name>SpringSource Snapshot Repository</name>
126+
<url>http://repo.springframework.org/snapshot</url>
127+
<releases>
128+
<enabled>false</enabled>
129+
</releases>
130+
<snapshots>
131+
<enabled>true</enabled>
132+
</snapshots>
133+
</repository>
134+
<!-- For developing against latest Spring milestones -->
135+
<repository>
136+
<id>springsource-milestone</id>
137+
<name>SpringSource Milestone Repository</name>
138+
<url>http://repo.springframework.org/milestone</url>
139+
<snapshots>
140+
<enabled>false</enabled>
141+
</snapshots>
142+
</repository>
143+
<!-- For developing against latest Spring releases -->
144+
<repository>
145+
<id>springsource-repo</id>
146+
<name>SpringSpring Repository</name>
147+
<url>http://repo.springframework.org/release</url>
148+
<snapshots>
149+
<enabled>false</enabled>
150+
</snapshots>
151+
</repository>
152+
</repositories>
143153

144154
</project>

‎spring-android-showcase/client/pom.xml

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,8 @@
173173
</plugins>
174174
<pluginManagement>
175175
<plugins>
176-
<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself. -->
176+
<!--This plugin's configuration is used to store Eclipse m2e settings
177+
only. It has no influence on the Maven build itself. -->
177178
<plugin>
178179
<groupId>org.eclipse.m2e</groupId>
179180
<artifactId>lifecycle-mapping</artifactId>
@@ -205,8 +206,8 @@
205206
<repositories>
206207
<!-- For testing against latest Spring snapshots -->
207208
<repository>
208-
<id>org.springframework.maven.snapshot</id>
209-
<name>Spring Maven Snapshot Repository</name>
209+
<id>springsource-snapshot</id>
210+
<name>SpringSource Snapshot Repository</name>
210211
<url>http://repo.springframework.org/snapshot</url>
211212
<releases>
212213
<enabled>false</enabled>
@@ -217,13 +218,22 @@
217218
</repository>
218219
<!-- For developing against latest Spring milestones -->
219220
<repository>
220-
<id>org.springframework.maven.milestone</id>
221-
<name>Spring Maven Milestone Repository</name>
221+
<id>springsource-milestone</id>
222+
<name>SpringSource Milestone Repository</name>
222223
<url>http://repo.springframework.org/milestone</url>
223224
<snapshots>
224225
<enabled>false</enabled>
225226
</snapshots>
226227
</repository>
228+
<!-- For developing against latest Spring releases -->
229+
<repository>
230+
<id>springsource-repo</id>
231+
<name>SpringSpring Repository</name>
232+
<url>http://repo.springframework.org/release</url>
233+
<snapshots>
234+
<enabled>false</enabled>
235+
</snapshots>
236+
</repository>
227237
</repositories>
228238

229239
</project>

0 commit comments

Comments
 (0)