Skip to content
This repository was archived by the owner on Jul 30, 2021. It is now read-only.

Commit 67c27d2

Browse files
jwgmeligmeylingjwgmeligmeyling
committed
Target Java 8 and removal of Guava as dependency
1 parent 60b65f9 commit 67c27d2

Some content is hidden

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

73 files changed

+2818
-2838
lines changed

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ Java/Scala Code generation tool
55

66
[![Build Status](https://travis-ci.org/querydsl/codegen.svg?branch=master)](https://travis-ci.org/querydsl/codegen)
77

8-
See this test for examples https://github.com/querydsl/codegen/blob/master/src/test/java/com/mysema/codegen/JavaWriterTest.java
8+
See this test for examples https://github.com/querydsl/codegen/blob/master/src/test/java/com/querydsl/codegen/utils/JavaWriterTest.java
99

‎pom.xml

+62-62
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@
22
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
33

44
<modelVersion>4.0.0</modelVersion>
5-
<groupId>com.mysema.codegen</groupId>
6-
<artifactId>codegen</artifactId>
7-
<version>0.6.9.BUILD-SNAPSHOT</version>
5+
<groupId>com.querydsl</groupId>
6+
<artifactId>codegen-utils</artifactId>
7+
<version>1.0.0-SNAPSHOT</version>
88
<name>Codegen</name>
99
<description>Code generation and compilation for Java</description>
10-
10+
1111
<parent>
12-
<groupId>com.mysema.home</groupId>
13-
<artifactId>mysema-source</artifactId>
14-
<version>0.3.1</version>
12+
<groupId>com.querydsl</groupId>
13+
<artifactId>querydsl-parent</artifactId>
14+
<version>0.1.0</version>
1515
</parent>
1616

1717
<packaging>jar</packaging>
@@ -33,17 +33,10 @@
3333
<properties>
3434
<commons.collections.version>4.01</commons.collections.version>
3535
<commons.lang.version>3.0.1</commons.lang.version>
36-
<guava.version>11.0.2</guava.version>
3736
<ecj.version>4.3.1</ecj.version>
3837
</properties>
3938

4039
<dependencies>
41-
<dependency>
42-
<groupId>com.google.guava</groupId>
43-
<artifactId>guava</artifactId>
44-
<version>18.0</version>
45-
</dependency>
46-
4740
<dependency>
4841
<groupId>org.eclipse.jdt.core.compiler</groupId>
4942
<artifactId>ecj</artifactId>
@@ -54,73 +47,80 @@
5447
<dependency>
5548
<groupId>junit</groupId>
5649
<artifactId>junit</artifactId>
57-
<version>4.8.1</version>
50+
<version>4.13.1</version>
5851
<scope>test</scope>
59-
<exclusions>
60-
<exclusion>
61-
<groupId>javax.servlet</groupId>
62-
<artifactId>servlet-api</artifactId>
63-
</exclusion>
64-
</exclusions>
6552
</dependency>
6653
<dependency>
6754
<groupId>javax.validation</groupId>
6855
<artifactId>validation-api</artifactId>
6956
<version>1.0.CR3</version>
7057
<scope>test</scope>
7158
</dependency>
72-
73-
7459
</dependencies>
7560

7661
<build>
7762
<plugins>
78-
<plugin>
79-
<groupId>org.apache.maven.plugins</groupId>
80-
<artifactId>maven-jar-plugin</artifactId>
81-
<configuration>
82-
<useDefaultManifestFile>true</useDefaultManifestFile>
83-
</configuration>
84-
</plugin>
85-
<plugin>
86-
<groupId>com.springsource.bundlor</groupId>
87-
<artifactId>com.springsource.bundlor.maven</artifactId>
88-
<version>1.0.0.RELEASE</version>
89-
<executions>
90-
<execution>
91-
<id>bundlor</id>
92-
<goals>
93-
<goal>bundlor</goal>
94-
</goals>
95-
</execution>
96-
</executions>
97-
<configuration>
98-
<failOnWarnings>true</failOnWarnings>
99-
</configuration>
100-
</plugin>
63+
<plugin>
64+
<groupId>org.apache.maven.plugins</groupId>
65+
<artifactId>maven-jar-plugin</artifactId>
66+
<version>2.6</version>
67+
<configuration>
68+
<useDefaultManifestFile>true</useDefaultManifestFile>
69+
</configuration>
70+
</plugin>
71+
<plugin>
72+
<groupId>com.springsource.bundlor</groupId>
73+
<artifactId>com.springsource.bundlor.maven</artifactId>
74+
<version>1.0.0.RELEASE</version>
75+
<executions>
76+
<execution>
77+
<id>bundlor</id>
78+
<goals>
79+
<goal>bundlor</goal>
80+
</goals>
81+
</execution>
82+
</executions>
83+
<configuration>
84+
<failOnWarnings>true</failOnWarnings>
85+
</configuration>
86+
</plugin>
87+
<plugin>
88+
<groupId>org.apache.maven.plugins</groupId>
89+
<artifactId>maven-compiler-plugin</artifactId>
90+
<configuration>
91+
<source>1.8</source>
92+
<target>1.8</target>
93+
</configuration>
94+
</plugin>
10195
</plugins>
10296
</build>
103-
104-
<!--
105-
<repositories>
106-
<repository>
107-
<id>jboss</id>
108-
<url>http://repository.jboss.org/maven2</url>
109-
<releases>
110-
<enabled>true</enabled>
111-
</releases>
112-
<snapshots>
113-
<enabled>false</enabled>
114-
</snapshots>
115-
</repository>
116-
</repositories>
117-
-->
118-
97+
11998
<pluginRepositories>
12099
<pluginRepository>
121100
<id>com.springsource.repository.bundles.release</id>
122101
<url>http://repository.springsource.com/maven/bundles/release</url>
123102
</pluginRepository>
124103
</pluginRepositories>
125104

105+
106+
<developers>
107+
<developer>
108+
<id>tiwe</id>
109+
<name>Timo Westkämper</name>
110+
<email>[email protected]</email>
111+
<organization>Mysema Ltd</organization>
112+
<roles>
113+
<role>Architect</role>
114+
</roles>
115+
</developer>
116+
<developer>
117+
<id>laim</id>
118+
<name>Lassi Immonen</name>
119+
<email>[email protected]</email>
120+
<organization>Mysema Ltd</organization>
121+
<roles>
122+
<role>Consultant</role>
123+
</roles>
124+
</developer>
125+
</developers>
126126
</project>

‎src/main/java/com/mysema/codegen/AbstractCodeWriter.java renamed to ‎src/main/java/com/querydsl/codegen/utils/AbstractCodeWriter.java

+2-4
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,10 @@
1111
* See the License for the specific language governing permissions and
1212
* limitations under the License.
1313
*/
14-
package com.mysema.codegen;
14+
package com.querydsl.codegen.utils;
1515

1616
import java.io.IOException;
1717

18-
import com.google.common.base.Strings;
19-
2018
/**
2119
* @author tiwe
2220
*
@@ -42,7 +40,7 @@ public AbstractCodeWriter(Appendable appendable, int spaces) {
4240
}
4341
this.appendable = appendable;
4442
this.spaces = spaces;
45-
this.spacesString = Strings.repeat(" ", spaces);
43+
this.spacesString = StringUtils.repeat(' ', spaces);
4644
}
4745

4846
@Override

‎src/main/java/com/mysema/codegen/AbstractEvaluatorFactory.java renamed to ‎src/main/java/com/querydsl/codegen/utils/AbstractEvaluatorFactory.java

+7-7
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
* See the License for the specific language governing permissions and
1212
* limitations under the License.
1313
*/
14-
package com.mysema.codegen;
14+
package com.querydsl.codegen.utils;
1515

1616
import java.io.IOException;
1717
import java.io.StringWriter;
@@ -20,12 +20,12 @@
2020
import java.util.Map;
2121
import java.util.WeakHashMap;
2222

23-
import com.mysema.codegen.model.ClassType;
24-
import com.mysema.codegen.model.Parameter;
25-
import com.mysema.codegen.model.SimpleType;
26-
import com.mysema.codegen.model.Type;
27-
import com.mysema.codegen.model.TypeCategory;
28-
import com.mysema.codegen.support.ClassUtils;
23+
import com.querydsl.codegen.utils.model.ClassType;
24+
import com.querydsl.codegen.utils.model.Parameter;
25+
import com.querydsl.codegen.utils.model.SimpleType;
26+
import com.querydsl.codegen.utils.model.Type;
27+
import com.querydsl.codegen.utils.model.TypeCategory;
28+
import com.querydsl.codegen.utils.support.ClassUtils;
2929

3030
/**
3131
* @author tiwe

0 commit comments

Comments
 (0)