Skip to content

Commit f156472

Browse files
frankbenoitfrankbenoit
committed
Slice out auto-factory-annotations artifact
* Move the existing processor in 'processor' sub dir, as it is done in the service part. Signed-off-by: Frank Benoit <[email protected]>
1 parent 6bed859 commit f156472

File tree

108 files changed

+338
-142
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

108 files changed

+338
-142
lines changed

‎factory/annotations/pom.xml

Lines changed: 112 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,112 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
Copyright 2012 Google LLC
4+
Copyright (C) 2012 Square, Inc.
5+
6+
Licensed under the Apache License, Version 2.0 (the "License");
7+
you may not use this file except in compliance with the License.
8+
You may obtain a copy of the License at
9+
10+
http://www.apache.org/licenses/LICENSE-2.0
11+
12+
Unless required by applicable law or agreed to in writing, software
13+
distributed under the License is distributed on an "AS IS" BASIS,
14+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
See the License for the specific language governing permissions and
16+
limitations under the License.
17+
-->
18+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
19+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
20+
<modelVersion>4.0.0</modelVersion>
21+
22+
<parent>
23+
<groupId>org.sonatype.oss</groupId>
24+
<artifactId>oss-parent</artifactId>
25+
<version>7</version>
26+
</parent>
27+
28+
<groupId>com.google.auto.factory</groupId>
29+
<artifactId>auto-factory-annotations</artifactId>
30+
<version>HEAD-SNAPSHOT</version>
31+
<name>AutoFactory Annotations</name>
32+
<description>
33+
JSR-330-compatible factories annotations.
34+
</description>
35+
<url>https://github.com/google/auto/tree/master/factory</url>
36+
37+
<properties>
38+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
39+
<java.version>1.8</java.version>
40+
</properties>
41+
42+
<scm>
43+
<url>http://github.com/google/auto</url>
44+
<connection>scm:git:git://github.com/google/auto.git</connection>
45+
<developerConnection>scm:git:ssh://[email protected]/google/auto.git</developerConnection>
46+
<tag>HEAD</tag>
47+
</scm>
48+
49+
<issueManagement>
50+
<system>GitHub Issues</system>
51+
<url>http://github.com/google/auto/issues</url>
52+
</issueManagement>
53+
54+
<licenses>
55+
<license>
56+
<name>Apache 2.0</name>
57+
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
58+
</license>
59+
</licenses>
60+
61+
<organization>
62+
<name>Google LLC</name>
63+
<url>http://www.google.com</url>
64+
</organization>
65+
66+
<dependencies>
67+
</dependencies>
68+
69+
<build>
70+
<plugins>
71+
<plugin>
72+
<artifactId>maven-compiler-plugin</artifactId>
73+
<version>3.7.0</version>
74+
<configuration>
75+
<source>${java.version}</source>
76+
<target>${java.version}</target>
77+
<compilerArgument>-Xlint:all</compilerArgument>
78+
<showWarnings>true</showWarnings>
79+
<showDeprecation>true</showDeprecation>
80+
</configuration>
81+
<dependencies>
82+
<dependency>
83+
<groupId>org.codehaus.plexus</groupId>
84+
<artifactId>plexus-java</artifactId>
85+
<version>0.9.4</version>
86+
</dependency>
87+
</dependencies>
88+
</plugin>
89+
<plugin>
90+
<artifactId>maven-jar-plugin</artifactId>
91+
<version>3.0.2</version>
92+
</plugin>
93+
<plugin>
94+
<artifactId>maven-invoker-plugin</artifactId>
95+
<version>3.0.1</version>
96+
<configuration>
97+
<addTestClassPath>true</addTestClassPath>
98+
<cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
99+
<pomIncludes>
100+
<pomInclude>*/pom.xml</pomInclude>
101+
</pomIncludes>
102+
<streamLogs>true</streamLogs>
103+
</configuration>
104+
</plugin>
105+
<plugin>
106+
<groupId>org.immutables.tools</groupId>
107+
<artifactId>maven-shade-plugin</artifactId>
108+
<version>4</version>
109+
</plugin>
110+
</plugins>
111+
</build>
112+
</project>

‎factory/src/main/java/com/google/auto/factory/AutoFactory.java renamed to ‎factory/annotations/src/main/java/com/google/auto/factory/AutoFactory.java

File renamed without changes.

‎factory/src/main/java/com/google/auto/factory/Provided.java renamed to ‎factory/annotations/src/main/java/com/google/auto/factory/Provided.java

File renamed without changes.

‎factory/pom.xml

Lines changed: 8 additions & 142 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,14 @@
2626
</parent>
2727

2828
<groupId>com.google.auto.factory</groupId>
29-
<artifactId>auto-factory</artifactId>
29+
<artifactId>auto-factory-aggregator</artifactId>
3030
<version>HEAD-SNAPSHOT</version>
31-
<name>AutoFactory</name>
31+
<name>AutoFactory Aggregator</name>
3232
<description>
33-
JSR-330-compatible factories.
33+
Aggregator POM for @AutoFactory.
3434
</description>
3535
<url>https://github.com/google/auto/tree/master/factory</url>
36+
<packaging>pom</packaging>
3637

3738
<properties>
3839
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -65,144 +66,9 @@
6566
<url>http://www.google.com</url>
6667
</organization>
6768

68-
<dependencies>
69-
<dependency>
70-
<groupId>com.google.auto</groupId>
71-
<artifactId>auto-common</artifactId>
72-
<version>0.10</version>
73-
</dependency>
74-
<dependency>
75-
<groupId>com.google.auto.value</groupId>
76-
<artifactId>auto-value-annotations</artifactId>
77-
<version>1.7</version>
78-
</dependency>
79-
<dependency>
80-
<groupId>com.google.auto.value</groupId>
81-
<artifactId>auto-value</artifactId>
82-
<version>1.7</version>
83-
<scope>provided</scope>
84-
</dependency>
85-
<dependency>
86-
<groupId>com.google.auto.service</groupId>
87-
<artifactId>auto-service</artifactId>
88-
<version>1.0-rc6</version>
89-
<scope>provided</scope>
90-
</dependency>
91-
<dependency>
92-
<groupId>net.ltgt.gradle.incap</groupId>
93-
<artifactId>incap</artifactId>
94-
<version>0.2</version>
95-
<scope>provided</scope>
96-
</dependency>
97-
<dependency>
98-
<groupId>net.ltgt.gradle.incap</groupId>
99-
<artifactId>incap-processor</artifactId>
100-
<version>0.2</version>
101-
<scope>provided</scope>
102-
</dependency>
103-
<dependency>
104-
<groupId>com.google.googlejavaformat</groupId>
105-
<artifactId>google-java-format</artifactId>
106-
<version>1.7</version>
107-
</dependency>
108-
<dependency>
109-
<groupId>com.google.guava</groupId>
110-
<artifactId>guava</artifactId>
111-
<version>${guava.version}</version>
112-
</dependency>
113-
<dependency>
114-
<groupId>com.squareup</groupId>
115-
<artifactId>javapoet</artifactId>
116-
<version>1.12.1</version>
117-
</dependency>
118-
<dependency>
119-
<groupId>javax.inject</groupId>
120-
<artifactId>javax.inject</artifactId>
121-
<version>1</version>
122-
</dependency>
123-
<!-- test dependencies -->
124-
<dependency>
125-
<groupId>com.google.testing.compile</groupId>
126-
<artifactId>compile-testing</artifactId>
127-
<version>0.18</version>
128-
<scope>test</scope>
129-
</dependency>
130-
<dependency>
131-
<groupId>junit</groupId>
132-
<artifactId>junit</artifactId>
133-
<version>4.13</version>
134-
<scope>test</scope>
135-
</dependency>
136-
<dependency>
137-
<groupId>com.google.truth</groupId>
138-
<artifactId>truth</artifactId>
139-
<version>${truth.version}</version>
140-
<scope>test</scope>
141-
</dependency>
142-
<dependency>
143-
<groupId>com.google.code.findbugs</groupId>
144-
<artifactId>jsr305</artifactId>
145-
<version>3.0.2</version>
146-
<scope>test</scope>
147-
</dependency>
148-
<dependency>
149-
<groupId>org.checkerframework</groupId>
150-
<artifactId>checker-compat-qual</artifactId>
151-
<version>2.5.5</version>
152-
<scope>test</scope>
153-
</dependency>
154-
</dependencies>
69+
<modules>
70+
<module>annotations</module>
71+
<module>processor</module>
72+
</modules>
15573

156-
<build>
157-
<plugins>
158-
<plugin>
159-
<artifactId>maven-compiler-plugin</artifactId>
160-
<version>3.7.0</version>
161-
<configuration>
162-
<source>${java.version}</source>
163-
<target>${java.version}</target>
164-
<compilerArgument>-Xlint:all</compilerArgument>
165-
<showWarnings>true</showWarnings>
166-
<showDeprecation>true</showDeprecation>
167-
</configuration>
168-
<dependencies>
169-
<dependency>
170-
<groupId>org.codehaus.plexus</groupId>
171-
<artifactId>plexus-java</artifactId>
172-
<version>0.9.4</version>
173-
</dependency>
174-
</dependencies>
175-
</plugin>
176-
<plugin>
177-
<artifactId>maven-jar-plugin</artifactId>
178-
<version>3.0.2</version>
179-
</plugin>
180-
<plugin>
181-
<artifactId>maven-invoker-plugin</artifactId>
182-
<version>3.0.1</version>
183-
<configuration>
184-
<addTestClassPath>true</addTestClassPath>
185-
<cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
186-
<pomIncludes>
187-
<pomInclude>*/pom.xml</pomInclude>
188-
</pomIncludes>
189-
<streamLogs>true</streamLogs>
190-
</configuration>
191-
<executions>
192-
<execution>
193-
<id>integration-test</id>
194-
<goals>
195-
<goal>install</goal>
196-
<goal>run</goal>
197-
</goals>
198-
</execution>
199-
</executions>
200-
</plugin>
201-
<plugin>
202-
<groupId>org.immutables.tools</groupId>
203-
<artifactId>maven-shade-plugin</artifactId>
204-
<version>4</version>
205-
</plugin>
206-
</plugins>
207-
</build>
20874
</project>

0 commit comments

Comments
 (0)