Skip to content

Commit 642ceeb

Browse files
committed
Clean up pom.xml files and change Jimfs to use auto-service to generate its META-INF/services file.
------------- Created by MOE: http://code.google.com/p/moe-java MOE_MIGRATED_REVID=60126893
1 parent 8962b1f commit 642ceeb

File tree

4 files changed

+37
-36
lines changed

4 files changed

+37
-36
lines changed

.gitignore

100755100644
File mode changed.

jimfs/pom.xml

+14-1
Original file line numberDiff line numberDiff line change
@@ -34,19 +34,32 @@
3434
</description>
3535

3636
<dependencies>
37+
<!-- Required runtime dependencies -->
3738
<dependency>
3839
<groupId>com.google.guava</groupId>
3940
<artifactId>guava</artifactId>
4041
</dependency>
42+
43+
<!-- Optional runtime dependencies -->
4144
<dependency>
4245
<groupId>com.ibm.icu</groupId>
4346
<artifactId>icu4j</artifactId>
4447
<optional>true</optional>
4548
</dependency>
49+
50+
<!-- Compile-time dependencies -->
51+
<dependency>
52+
<groupId>com.google.auto.service</groupId>
53+
<artifactId>auto-service</artifactId>
54+
<optional>true</optional>
55+
</dependency>
4656
<dependency>
4757
<groupId>com.google.code.findbugs</groupId>
4858
<artifactId>jsr305</artifactId>
59+
<optional>true</optional>
4960
</dependency>
61+
62+
<!-- Test dependencies -->
5063
<dependency>
5164
<groupId>junit</groupId>
5265
<artifactId>junit</artifactId>
@@ -102,4 +115,4 @@
102115
</plugin>
103116
</plugins>
104117
</build>
105-
</project>
118+
</project>

jimfs/src/main/java/com/google/jimfs/JimfsFileSystemProvider.java

+2
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import static com.google.jimfs.Jimfs.URI_SCHEME;
2424
import static java.nio.file.StandardOpenOption.APPEND;
2525

26+
import com.google.auto.service.AutoService;
2627
import com.google.common.collect.ImmutableSet;
2728

2829
import java.io.IOException;
@@ -65,6 +66,7 @@
6566
*
6667
* @author Colin Decker
6768
*/
69+
@AutoService(FileSystemProvider.class)
6870
public final class JimfsFileSystemProvider extends FileSystemProvider {
6971

7072
@Override

pom.xml

+21-35
Original file line numberDiff line numberDiff line change
@@ -86,57 +86,43 @@
8686
<properties>
8787
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
8888
<java.version>1.7</java.version>
89-
90-
<!-- Dependency versions -->
9189
<guava.version>16.0</guava.version>
92-
<icu4j.version>51.2</icu4j.version>
93-
<jsr305.version>2.0.1</jsr305.version>
94-
<junit.version>4.10</junit.version>
95-
<truth.version>0.13</truth.version>
96-
97-
<!-- Plugin versions -->
98-
<!--
99-
Note: Using older source/javadoc plugins because newer versions seemed to be hanging for long
100-
periods of time during build.
101-
-->
102-
<compiler-plugin.version>3.1</compiler-plugin.version>
103-
<source-plugin.version>2.1.2</source-plugin.version>
104-
<javadoc-plugin.version>2.8</javadoc-plugin.version>
105-
<gpg-plugin.version>1.4</gpg-plugin.version>
106-
107-
<!-- Misc -->
10890
<gpg.skip>true</gpg.skip>
10991
</properties>
11092

11193
<dependencyManagement>
11294
<dependencies>
95+
<!-- Required runtime dependencies -->
11396
<dependency>
11497
<groupId>com.google.guava</groupId>
11598
<artifactId>guava</artifactId>
11699
<version>${guava.version}</version>
117100
</dependency>
118-
<!--
119-
Don't really like needing a dependency on ICU4J here. However, it does seem like the best
120-
(only?) option for general purpose Unicode case insensitivity. Of course, not many people
121-
probably care about case insensitivity beyond ASCII for an in-memory file system, so it's
122-
optional unless the user really wants Unicode case insensitivity.
123-
-->
101+
102+
<!-- Optional runtime dependencies -->
124103
<dependency>
125104
<groupId>com.ibm.icu</groupId>
126105
<artifactId>icu4j</artifactId>
127-
<version>${icu4j.version}</version>
128-
<optional>true</optional>
106+
<version>51.2</version>
107+
</dependency>
108+
109+
<!-- Compile-time dependencies -->
110+
<dependency>
111+
<groupId>com.google.auto.service</groupId>
112+
<artifactId>auto-service</artifactId>
113+
<version>1.0-rc1</version>
129114
</dependency>
130115
<dependency>
131116
<groupId>com.google.code.findbugs</groupId>
132117
<artifactId>jsr305</artifactId>
133-
<version>${jsr305.version}</version>
134-
<scope>provided</scope>
118+
<version>2.0.1</version>
135119
</dependency>
120+
121+
<!-- Test dependencies -->
136122
<dependency>
137123
<groupId>junit</groupId>
138124
<artifactId>junit</artifactId>
139-
<version>${junit.version}</version>
125+
<version>4.10</version>
140126
<scope>test</scope>
141127
</dependency>
142128
<dependency>
@@ -148,7 +134,7 @@
148134
<dependency>
149135
<groupId>org.truth0</groupId>
150136
<artifactId>truth</artifactId>
151-
<version>${truth.version}</version>
137+
<version>0.13</version>
152138
<scope>test</scope>
153139
</dependency>
154140
</dependencies>
@@ -159,19 +145,19 @@
159145
<plugins>
160146
<plugin>
161147
<artifactId>maven-compiler-plugin</artifactId>
162-
<version>${compiler-plugin.version}</version>
148+
<version>3.1</version>
163149
</plugin>
164150
<plugin>
165151
<artifactId>maven-source-plugin</artifactId>
166-
<version>${source-plugin.version}</version>
152+
<version>2.1.2</version>
167153
</plugin>
168154
<plugin>
169155
<artifactId>maven-javadoc-plugin</artifactId>
170-
<version>${javadoc-plugin.version}</version>
156+
<version>2.8</version>
171157
</plugin>
172158
<plugin>
173159
<artifactId>maven-gpg-plugin</artifactId>
174-
<version>${gpg-plugin.version}</version>
160+
<version>1.4</version>
175161
</plugin>
176162
</plugins>
177163
</pluginManagement>
@@ -199,4 +185,4 @@
199185
</plugins>
200186
</build>
201187

202-
</project>
188+
</project>

0 commit comments

Comments
 (0)