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

Target Java 8 and removal of Guava as dependency #46

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Target Java 8 and removal of Guava as dependency #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
67c27d2
Target Java 8 and removal of Guava as dependency
jwgmeligmeyling Nov 2, 2020
276efe4
Bump ECJ so that sources can be compiled with Java 8 target
jwgmeligmeyling Nov 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ Java/Scala Code generation tool

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

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

126 changes: 63 additions & 63 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@
<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">

<modelVersion>4.0.0</modelVersion>
<groupId>com.mysema.codegen</groupId>
<artifactId>codegen</artifactId>
<version>0.6.9.BUILD-SNAPSHOT</version>
<groupId>com.querydsl</groupId>
<artifactId>codegen-utils</artifactId>
<version>1.0.0-SNAPSHOT</version>
<name>Codegen</name>
<description>Code generation and compilation for Java</description>

<parent>
<groupId>com.mysema.home</groupId>
<artifactId>mysema-source</artifactId>
<version>0.3.1</version>
<groupId>com.querydsl</groupId>
<artifactId>querydsl-parent</artifactId>
<version>0.1.0</version>
</parent>

<packaging>jar</packaging>
Expand All @@ -33,17 +33,10 @@
<properties>
<commons.collections.version>4.01</commons.collections.version>
<commons.lang.version>3.0.1</commons.lang.version>
<guava.version>11.0.2</guava.version>
<ecj.version>4.3.1</ecj.version>
<ecj.version>4.6.1</ecj.version>
</properties>

<dependencies>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>18.0</version>
</dependency>

<dependency>
<groupId>org.eclipse.jdt.core.compiler</groupId>
<artifactId>ecj</artifactId>
Expand All @@ -54,73 +47,80 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.8.1</version>
<version>4.13.1</version>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>javax.validation</groupId>
<artifactId>validation-api</artifactId>
<version>1.0.CR3</version>
<scope>test</scope>
</dependency>


</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<useDefaultManifestFile>true</useDefaultManifestFile>
</configuration>
</plugin>
<plugin>
<groupId>com.springsource.bundlor</groupId>
<artifactId>com.springsource.bundlor.maven</artifactId>
<version>1.0.0.RELEASE</version>
<executions>
<execution>
<id>bundlor</id>
<goals>
<goal>bundlor</goal>
</goals>
</execution>
</executions>
<configuration>
<failOnWarnings>true</failOnWarnings>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.6</version>
<configuration>
<useDefaultManifestFile>true</useDefaultManifestFile>
</configuration>
</plugin>
<plugin>
<groupId>com.springsource.bundlor</groupId>
<artifactId>com.springsource.bundlor.maven</artifactId>
<version>1.0.0.RELEASE</version>
<executions>
<execution>
<id>bundlor</id>
<goals>
<goal>bundlor</goal>
</goals>
</execution>
</executions>
<configuration>
<failOnWarnings>true</failOnWarnings>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin>
</plugins>
</build>

<!--
<repositories>
<repository>
<id>jboss</id>
<url>http://repository.jboss.org/maven2</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
</repositories>
-->


<pluginRepositories>
<pluginRepository>
<id>com.springsource.repository.bundles.release</id>
<url>http://repository.springsource.com/maven/bundles/release</url>
</pluginRepository>
</pluginRepositories>


<developers>
<developer>
<id>tiwe</id>
<name>Timo Westkämper</name>
<email>[email protected]</email>
<organization>Mysema Ltd</organization>
<roles>
<role>Architect</role>
</roles>
</developer>
<developer>
<id>laim</id>
<name>Lassi Immonen</name>
<email>[email protected]</email>
<organization>Mysema Ltd</organization>
<roles>
<role>Consultant</role>
</roles>
</developer>
</developers>
</project>
6 changes: 2 additions & 4 deletions ...om/mysema/codegen/AbstractCodeWriter.java → ...dsl/codegen/utils/AbstractCodeWriter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.mysema.codegen;
package com.querydsl.codegen.utils;

import java.io.IOException;

import com.google.common.base.Strings;

/**
* @author tiwe
*
Expand All @@ -42,7 +40,7 @@ public AbstractCodeWriter(Appendable appendable, int spaces) {
}
this.appendable = appendable;
this.spaces = spaces;
this.spacesString = Strings.repeat(" ", spaces);
this.spacesString = StringUtils.repeat(' ', spaces);
}

@Override
Expand Down
14 changes: 7 additions & 7 deletions ...ema/codegen/AbstractEvaluatorFactory.java → ...degen/utils/AbstractEvaluatorFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.mysema.codegen;
package com.querydsl.codegen.utils;

import java.io.IOException;
import java.io.StringWriter;
Expand All @@ -20,12 +20,12 @@
import java.util.Map;
import java.util.WeakHashMap;

import com.mysema.codegen.model.ClassType;
import com.mysema.codegen.model.Parameter;
import com.mysema.codegen.model.SimpleType;
import com.mysema.codegen.model.Type;
import com.mysema.codegen.model.TypeCategory;
import com.mysema.codegen.support.ClassUtils;
import com.querydsl.codegen.utils.model.ClassType;
import com.querydsl.codegen.utils.model.Parameter;
import com.querydsl.codegen.utils.model.SimpleType;
import com.querydsl.codegen.utils.model.Type;
import com.querydsl.codegen.utils.model.TypeCategory;
import com.querydsl.codegen.utils.support.ClassUtils;

/**
* @author tiwe
Expand Down
Loading