From 55fa5d1daf269df10197eb8514148796d2d2d259 Mon Sep 17 00:00:00 2001 From: Lukas Eder Date: Tue, 24 Jun 2014 15:03:01 +0200 Subject: [PATCH] Aagh... Eclipse o_O --- jOOQ-codegen-maven/.classpath | 4 +- jOOQ-codegen/.classpath | 4 +- jOOQ-examples/jOOQ-flyway-example/.classpath | 31 +++++++++ jOOQ-examples/jOOQ-flyway-example/.gitignore | 2 + jOOQ-examples/jOOQ-flyway-example/.project | 23 +++++++ .../org.eclipse.core.resources.prefs | 1 + .../.settings/org.eclipse.jdt.core.prefs | 6 +- .../jooq-flyway-example.iml | 18 +---- jOOQ-examples/jOOQ-flyway-example/pom.xml | 69 ------------------- jOOQ-examples/jOOQ-spring-example/.classpath | 4 +- .../org.eclipse.core.resources.prefs | 1 + .../.settings/org.eclipse.jdt.core.prefs | 6 +- .../jOOQ-spring-guice-example/.classpath | 60 ++++++++-------- .../org.eclipse.core.resources.prefs | 1 + .../.settings/org.eclipse.jdt.core.prefs | 6 +- jOOQ-meta/.classpath | 4 +- jOOQ-scala/.classpath | 8 +-- .../org.eclipse.core.resources.prefs | 1 + .../.settings/org.eclipse.jdt.core.prefs | 6 +- jOOQ-test/.classpath | 6 +- .../org.eclipse.core.resources.prefs | 1 + .../.settings/org.eclipse.jdt.core.prefs | 6 +- jOOQ-test/launch/ASETest.launch | 1 + jOOQ-test/launch/AccessTest.launch | 1 + jOOQ-test/launch/CUBRIDTest.launch | 1 + jOOQ-test/launch/DB2Test.launch | 1 + jOOQ-test/launch/DerbyTest.launch | 1 + jOOQ-test/launch/FirebirdTest.launch | 1 + jOOQ-test/launch/H2Test.launch | 1 + ...(Oracle schema, renderSchema=false).launch | 1 + jOOQ-test/launch/HSQLDBTest.launch | 1 + jOOQ-test/launch/IngresTest.launch | 1 + jOOQ-test/launch/MariaDBTest.launch | 1 + .../launch/MySQLTest (schema mapping).launch | 1 + .../launch/MySQLTest (schema rewrite).launch | 1 + jOOQ-test/launch/MySQLTest.launch | 1 + jOOQ-test/launch/OracleTest (11g).launch | 1 + .../OracleTest (No bind variables).launch | 1 + .../launch/OracleTest (default schema).launch | 1 + jOOQ-test/launch/OracleTest.launch | 1 + jOOQ-test/launch/PostgresTest.launch | 1 + jOOQ-test/launch/SQLServer2008Test.launch | 1 + .../SQLServerTest (No bind variables).launch | 1 + jOOQ-test/launch/SQLServerTest (jTDS).launch | 1 + jOOQ-test/launch/SQLServerTest.launch | 1 + jOOQ-test/launch/SQLiteTest.launch | 1 + jOOQ-test/launch/SybaseTest.launch | 1 + jOOQ/.classpath | 6 +- .../org.eclipse.core.resources.prefs | 1 + pom.xml | 4 +- 50 files changed, 153 insertions(+), 151 deletions(-) create mode 100644 jOOQ-examples/jOOQ-flyway-example/.classpath create mode 100644 jOOQ-examples/jOOQ-flyway-example/.gitignore create mode 100644 jOOQ-examples/jOOQ-flyway-example/.project diff --git a/jOOQ-codegen-maven/.classpath b/jOOQ-codegen-maven/.classpath index 46188e1fa1..934f3282ad 100644 --- a/jOOQ-codegen-maven/.classpath +++ b/jOOQ-codegen-maven/.classpath @@ -18,12 +18,12 @@ - + - + diff --git a/jOOQ-codegen/.classpath b/jOOQ-codegen/.classpath index bbc6e3f1b1..7588058c2f 100644 --- a/jOOQ-codegen/.classpath +++ b/jOOQ-codegen/.classpath @@ -18,12 +18,12 @@ - + - + diff --git a/jOOQ-examples/jOOQ-flyway-example/.classpath b/jOOQ-examples/jOOQ-flyway-example/.classpath new file mode 100644 index 0000000000..c50542cecf --- /dev/null +++ b/jOOQ-examples/jOOQ-flyway-example/.classpath @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/jOOQ-examples/jOOQ-flyway-example/.gitignore b/jOOQ-examples/jOOQ-flyway-example/.gitignore new file mode 100644 index 0000000000..0fd7a02083 --- /dev/null +++ b/jOOQ-examples/jOOQ-flyway-example/.gitignore @@ -0,0 +1,2 @@ +/target +/jooq-flyway-example.iml diff --git a/jOOQ-examples/jOOQ-flyway-example/.project b/jOOQ-examples/jOOQ-flyway-example/.project new file mode 100644 index 0000000000..60978d75f8 --- /dev/null +++ b/jOOQ-examples/jOOQ-flyway-example/.project @@ -0,0 +1,23 @@ + + + jOOQ-flyway-example + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.m2e.core.maven2Builder + + + + + + org.eclipse.jdt.core.javanature + org.eclipse.m2e.core.maven2Nature + + diff --git a/jOOQ-examples/jOOQ-flyway-example/.settings/org.eclipse.core.resources.prefs b/jOOQ-examples/jOOQ-flyway-example/.settings/org.eclipse.core.resources.prefs index 2b2ebf894c..839d647eef 100644 --- a/jOOQ-examples/jOOQ-flyway-example/.settings/org.eclipse.core.resources.prefs +++ b/jOOQ-examples/jOOQ-flyway-example/.settings/org.eclipse.core.resources.prefs @@ -1,4 +1,5 @@ eclipse.preferences.version=1 +encoding//src/main/java=UTF-8 encoding//src/main/resources=UTF-8 encoding//src/test/java=UTF-8 encoding/=UTF-8 diff --git a/jOOQ-examples/jOOQ-flyway-example/.settings/org.eclipse.jdt.core.prefs b/jOOQ-examples/jOOQ-flyway-example/.settings/org.eclipse.jdt.core.prefs index 0b7d1d1a31..319c4a7c4f 100644 --- a/jOOQ-examples/jOOQ-flyway-example/.settings/org.eclipse.jdt.core.prefs +++ b/jOOQ-examples/jOOQ-flyway-example/.settings/org.eclipse.jdt.core.prefs @@ -5,9 +5,9 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annota org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.4 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.compliance=1.4 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -106,7 +106,7 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=1.8 +org.eclipse.jdt.core.compiler.source=1.4 org.eclipse.jdt.core.formatter.align_type_members_on_columns=true org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=48 diff --git a/jOOQ-examples/jOOQ-flyway-example/jooq-flyway-example.iml b/jOOQ-examples/jOOQ-flyway-example/jooq-flyway-example.iml index 3d5d7b4cd5..898deccd54 100644 --- a/jOOQ-examples/jOOQ-flyway-example/jooq-flyway-example.iml +++ b/jOOQ-examples/jOOQ-flyway-example/jooq-flyway-example.iml @@ -1,6 +1,6 @@ - + @@ -10,34 +10,18 @@ - - - - - - - - - - - - - - - - diff --git a/jOOQ-examples/jOOQ-flyway-example/pom.xml b/jOOQ-examples/jOOQ-flyway-example/pom.xml index 7cd38bd0cc..ddf833a231 100644 --- a/jOOQ-examples/jOOQ-flyway-example/pom.xml +++ b/jOOQ-examples/jOOQ-flyway-example/pom.xml @@ -34,31 +34,11 @@ jooq ${org.jooq.version} - - org.jooq - jooq-meta - ${org.jooq.version} - - - org.jooq - jooq-codegen - ${org.jooq.version} - - - commons-dbcp - commons-dbcp - 1.4 - com.h2database h2 1.4.177 - - org.flywaydb - flyway-core - 3.0 - @@ -72,57 +52,17 @@ 1.7.5 - - - org.springframework - spring-context - ${org.springframework.version} - - - org.springframework - spring-jdbc - ${org.springframework.version} - - junit junit 4.11 - jar - test - - - org.springframework - spring-test - ${org.springframework.version} test - - org.apache.maven.plugins - maven-compiler-plugin - 3.1 - - true - 1024m - 256m - UTF-8 - 1.8 - 1.8 - true - lines,vars,source - - - -Xlint:varargs - - - - org.flywaydb flyway-maven-plugin @@ -165,9 +105,7 @@ org.jooq.util.DefaultGenerator - org.jooq.util.h2.H2Database .* - FLYWAY_TEST @@ -178,13 +116,6 @@ - - - com.h2database - h2 - 1.4.177 - - diff --git a/jOOQ-examples/jOOQ-spring-example/.classpath b/jOOQ-examples/jOOQ-spring-example/.classpath index b68034cc95..cf9f912f5b 100644 --- a/jOOQ-examples/jOOQ-spring-example/.classpath +++ b/jOOQ-examples/jOOQ-spring-example/.classpath @@ -19,12 +19,12 @@ - + - + diff --git a/jOOQ-examples/jOOQ-spring-example/.settings/org.eclipse.core.resources.prefs b/jOOQ-examples/jOOQ-spring-example/.settings/org.eclipse.core.resources.prefs index 2b2ebf894c..839d647eef 100644 --- a/jOOQ-examples/jOOQ-spring-example/.settings/org.eclipse.core.resources.prefs +++ b/jOOQ-examples/jOOQ-spring-example/.settings/org.eclipse.core.resources.prefs @@ -1,4 +1,5 @@ eclipse.preferences.version=1 +encoding//src/main/java=UTF-8 encoding//src/main/resources=UTF-8 encoding//src/test/java=UTF-8 encoding/=UTF-8 diff --git a/jOOQ-examples/jOOQ-spring-example/.settings/org.eclipse.jdt.core.prefs b/jOOQ-examples/jOOQ-spring-example/.settings/org.eclipse.jdt.core.prefs index 0b7d1d1a31..319c4a7c4f 100644 --- a/jOOQ-examples/jOOQ-spring-example/.settings/org.eclipse.jdt.core.prefs +++ b/jOOQ-examples/jOOQ-spring-example/.settings/org.eclipse.jdt.core.prefs @@ -5,9 +5,9 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annota org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.4 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.compliance=1.4 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -106,7 +106,7 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=1.8 +org.eclipse.jdt.core.compiler.source=1.4 org.eclipse.jdt.core.formatter.align_type_members_on_columns=true org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=48 diff --git a/jOOQ-examples/jOOQ-spring-guice-example/.classpath b/jOOQ-examples/jOOQ-spring-guice-example/.classpath index c8559af74a..18954d4efd 100644 --- a/jOOQ-examples/jOOQ-spring-guice-example/.classpath +++ b/jOOQ-examples/jOOQ-spring-guice-example/.classpath @@ -1,33 +1,33 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/jOOQ-examples/jOOQ-spring-guice-example/.settings/org.eclipse.core.resources.prefs b/jOOQ-examples/jOOQ-spring-guice-example/.settings/org.eclipse.core.resources.prefs index 2b2ebf894c..839d647eef 100644 --- a/jOOQ-examples/jOOQ-spring-guice-example/.settings/org.eclipse.core.resources.prefs +++ b/jOOQ-examples/jOOQ-spring-guice-example/.settings/org.eclipse.core.resources.prefs @@ -1,4 +1,5 @@ eclipse.preferences.version=1 +encoding//src/main/java=UTF-8 encoding//src/main/resources=UTF-8 encoding//src/test/java=UTF-8 encoding/=UTF-8 diff --git a/jOOQ-examples/jOOQ-spring-guice-example/.settings/org.eclipse.jdt.core.prefs b/jOOQ-examples/jOOQ-spring-guice-example/.settings/org.eclipse.jdt.core.prefs index e6f968da5e..d834c80a20 100644 --- a/jOOQ-examples/jOOQ-spring-guice-example/.settings/org.eclipse.jdt.core.prefs +++ b/jOOQ-examples/jOOQ-spring-guice-example/.settings/org.eclipse.jdt.core.prefs @@ -5,9 +5,9 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annota org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.compliance=1.5 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -106,7 +106,7 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=1.6 +org.eclipse.jdt.core.compiler.source=1.5 org.eclipse.jdt.core.formatter.align_type_members_on_columns=true org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=48 diff --git a/jOOQ-meta/.classpath b/jOOQ-meta/.classpath index 04b89bbf53..e184d1ebe0 100644 --- a/jOOQ-meta/.classpath +++ b/jOOQ-meta/.classpath @@ -24,12 +24,12 @@ - + - + diff --git a/jOOQ-scala/.classpath b/jOOQ-scala/.classpath index 0b70e55cb9..1fbc07cddc 100644 --- a/jOOQ-scala/.classpath +++ b/jOOQ-scala/.classpath @@ -6,23 +6,23 @@ - + - + - + - + diff --git a/jOOQ-scala/.settings/org.eclipse.core.resources.prefs b/jOOQ-scala/.settings/org.eclipse.core.resources.prefs index f6afad94cf..4860d68ee1 100644 --- a/jOOQ-scala/.settings/org.eclipse.core.resources.prefs +++ b/jOOQ-scala/.settings/org.eclipse.core.resources.prefs @@ -3,5 +3,6 @@ encoding//src/main/java=UTF-8 encoding//src/main/resources=UTF-8 encoding//src/main/scala=UTF-8 encoding//src/test/java=UTF-8 +encoding//src/test/resources=UTF-8 encoding//src/test/scala=UTF-8 encoding/=UTF-8 diff --git a/jOOQ-test-utils/.settings/org.eclipse.jdt.core.prefs b/jOOQ-test-utils/.settings/org.eclipse.jdt.core.prefs index 0b7d1d1a31..5779150c69 100644 --- a/jOOQ-test-utils/.settings/org.eclipse.jdt.core.prefs +++ b/jOOQ-test-utils/.settings/org.eclipse.jdt.core.prefs @@ -5,9 +5,9 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annota org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.compliance=1.6 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -106,7 +106,7 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=1.8 +org.eclipse.jdt.core.compiler.source=1.6 org.eclipse.jdt.core.formatter.align_type_members_on_columns=true org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=48 diff --git a/jOOQ-test/.classpath b/jOOQ-test/.classpath index 342804ef9e..bc93b7f389 100644 --- a/jOOQ-test/.classpath +++ b/jOOQ-test/.classpath @@ -6,20 +6,20 @@ - + - + - + diff --git a/jOOQ-test/.settings/org.eclipse.core.resources.prefs b/jOOQ-test/.settings/org.eclipse.core.resources.prefs index a37cfca45c..5240b69c1b 100644 --- a/jOOQ-test/.settings/org.eclipse.core.resources.prefs +++ b/jOOQ-test/.settings/org.eclipse.core.resources.prefs @@ -2,5 +2,6 @@ eclipse.preferences.version=1 encoding//src/main/java=UTF-8 encoding//src/main/resources=UTF-8 encoding//src/test/java=UTF-8 +encoding//src/test/resources=UTF-8 encoding//target/generated-sources/xjc=UTF-8 encoding/=UTF-8 diff --git a/jOOQ-test/.settings/org.eclipse.jdt.core.prefs b/jOOQ-test/.settings/org.eclipse.jdt.core.prefs index 0b7d1d1a31..319c4a7c4f 100644 --- a/jOOQ-test/.settings/org.eclipse.jdt.core.prefs +++ b/jOOQ-test/.settings/org.eclipse.jdt.core.prefs @@ -5,9 +5,9 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annota org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.4 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.compliance=1.4 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -106,7 +106,7 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=1.8 +org.eclipse.jdt.core.compiler.source=1.4 org.eclipse.jdt.core.formatter.align_type_members_on_columns=true org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=48 diff --git a/jOOQ-test/launch/ASETest.launch b/jOOQ-test/launch/ASETest.launch index 19971557e1..2f5f6fd958 100644 --- a/jOOQ-test/launch/ASETest.launch +++ b/jOOQ-test/launch/ASETest.launch @@ -23,5 +23,6 @@ + diff --git a/jOOQ-test/launch/AccessTest.launch b/jOOQ-test/launch/AccessTest.launch index 32ca9ac72b..09702038b1 100644 --- a/jOOQ-test/launch/AccessTest.launch +++ b/jOOQ-test/launch/AccessTest.launch @@ -24,5 +24,6 @@ + diff --git a/jOOQ-test/launch/CUBRIDTest.launch b/jOOQ-test/launch/CUBRIDTest.launch index 8ca0a16679..26ab39de81 100644 --- a/jOOQ-test/launch/CUBRIDTest.launch +++ b/jOOQ-test/launch/CUBRIDTest.launch @@ -23,5 +23,6 @@ + diff --git a/jOOQ-test/launch/DB2Test.launch b/jOOQ-test/launch/DB2Test.launch index a38240f62e..b2b2a3b41b 100644 --- a/jOOQ-test/launch/DB2Test.launch +++ b/jOOQ-test/launch/DB2Test.launch @@ -23,5 +23,6 @@ + diff --git a/jOOQ-test/launch/DerbyTest.launch b/jOOQ-test/launch/DerbyTest.launch index 8958f64acc..97a3e86c6f 100644 --- a/jOOQ-test/launch/DerbyTest.launch +++ b/jOOQ-test/launch/DerbyTest.launch @@ -23,5 +23,6 @@ + diff --git a/jOOQ-test/launch/FirebirdTest.launch b/jOOQ-test/launch/FirebirdTest.launch index 5df2ccc7b8..f2fd87c3f4 100644 --- a/jOOQ-test/launch/FirebirdTest.launch +++ b/jOOQ-test/launch/FirebirdTest.launch @@ -23,6 +23,7 @@ + diff --git a/jOOQ-test/launch/H2Test.launch b/jOOQ-test/launch/H2Test.launch index 1dbaf1a3b1..02cd319219 100644 --- a/jOOQ-test/launch/H2Test.launch +++ b/jOOQ-test/launch/H2Test.launch @@ -23,5 +23,6 @@ + diff --git a/jOOQ-test/launch/HSQLDBTest (Oracle schema, renderSchema=false).launch b/jOOQ-test/launch/HSQLDBTest (Oracle schema, renderSchema=false).launch index 03cefa06f9..4884ba15b4 100644 --- a/jOOQ-test/launch/HSQLDBTest (Oracle schema, renderSchema=false).launch +++ b/jOOQ-test/launch/HSQLDBTest (Oracle schema, renderSchema=false).launch @@ -23,5 +23,6 @@ + diff --git a/jOOQ-test/launch/HSQLDBTest.launch b/jOOQ-test/launch/HSQLDBTest.launch index 57c3dab658..e4a580700b 100644 --- a/jOOQ-test/launch/HSQLDBTest.launch +++ b/jOOQ-test/launch/HSQLDBTest.launch @@ -23,6 +23,7 @@ + diff --git a/jOOQ-test/launch/IngresTest.launch b/jOOQ-test/launch/IngresTest.launch index 73a582459e..4cbc869fdf 100644 --- a/jOOQ-test/launch/IngresTest.launch +++ b/jOOQ-test/launch/IngresTest.launch @@ -23,5 +23,6 @@ + diff --git a/jOOQ-test/launch/MariaDBTest.launch b/jOOQ-test/launch/MariaDBTest.launch index c8d67b11ac..f145b79d1a 100644 --- a/jOOQ-test/launch/MariaDBTest.launch +++ b/jOOQ-test/launch/MariaDBTest.launch @@ -23,5 +23,6 @@ + diff --git a/jOOQ-test/launch/MySQLTest (schema mapping).launch b/jOOQ-test/launch/MySQLTest (schema mapping).launch index f9ba424eb8..2cd78bd836 100644 --- a/jOOQ-test/launch/MySQLTest (schema mapping).launch +++ b/jOOQ-test/launch/MySQLTest (schema mapping).launch @@ -24,5 +24,6 @@ + diff --git a/jOOQ-test/launch/MySQLTest (schema rewrite).launch b/jOOQ-test/launch/MySQLTest (schema rewrite).launch index b87e987082..8a28fa7ba1 100644 --- a/jOOQ-test/launch/MySQLTest (schema rewrite).launch +++ b/jOOQ-test/launch/MySQLTest (schema rewrite).launch @@ -24,5 +24,6 @@ + diff --git a/jOOQ-test/launch/MySQLTest.launch b/jOOQ-test/launch/MySQLTest.launch index bda82af174..4a2d376f06 100644 --- a/jOOQ-test/launch/MySQLTest.launch +++ b/jOOQ-test/launch/MySQLTest.launch @@ -23,5 +23,6 @@ + diff --git a/jOOQ-test/launch/OracleTest (11g).launch b/jOOQ-test/launch/OracleTest (11g).launch index 82ff90e71c..5bc48aca4f 100644 --- a/jOOQ-test/launch/OracleTest (11g).launch +++ b/jOOQ-test/launch/OracleTest (11g).launch @@ -23,5 +23,6 @@ + diff --git a/jOOQ-test/launch/OracleTest (No bind variables).launch b/jOOQ-test/launch/OracleTest (No bind variables).launch index 514c506dc9..4ea78a8f39 100644 --- a/jOOQ-test/launch/OracleTest (No bind variables).launch +++ b/jOOQ-test/launch/OracleTest (No bind variables).launch @@ -23,5 +23,6 @@ + diff --git a/jOOQ-test/launch/OracleTest (default schema).launch b/jOOQ-test/launch/OracleTest (default schema).launch index 1288d27149..297f645560 100644 --- a/jOOQ-test/launch/OracleTest (default schema).launch +++ b/jOOQ-test/launch/OracleTest (default schema).launch @@ -23,5 +23,6 @@ + diff --git a/jOOQ-test/launch/OracleTest.launch b/jOOQ-test/launch/OracleTest.launch index 8d385591a5..a3f6496926 100644 --- a/jOOQ-test/launch/OracleTest.launch +++ b/jOOQ-test/launch/OracleTest.launch @@ -23,5 +23,6 @@ + diff --git a/jOOQ-test/launch/PostgresTest.launch b/jOOQ-test/launch/PostgresTest.launch index 30f2760cb6..b0525a7abc 100644 --- a/jOOQ-test/launch/PostgresTest.launch +++ b/jOOQ-test/launch/PostgresTest.launch @@ -23,5 +23,6 @@ + diff --git a/jOOQ-test/launch/SQLServer2008Test.launch b/jOOQ-test/launch/SQLServer2008Test.launch index 088eb976be..049e0b129a 100644 --- a/jOOQ-test/launch/SQLServer2008Test.launch +++ b/jOOQ-test/launch/SQLServer2008Test.launch @@ -23,5 +23,6 @@ + diff --git a/jOOQ-test/launch/SQLServerTest (No bind variables).launch b/jOOQ-test/launch/SQLServerTest (No bind variables).launch index d60dcceef0..590b3208b6 100644 --- a/jOOQ-test/launch/SQLServerTest (No bind variables).launch +++ b/jOOQ-test/launch/SQLServerTest (No bind variables).launch @@ -23,5 +23,6 @@ + diff --git a/jOOQ-test/launch/SQLServerTest (jTDS).launch b/jOOQ-test/launch/SQLServerTest (jTDS).launch index a439a7db76..b40e0d550d 100644 --- a/jOOQ-test/launch/SQLServerTest (jTDS).launch +++ b/jOOQ-test/launch/SQLServerTest (jTDS).launch @@ -23,5 +23,6 @@ + diff --git a/jOOQ-test/launch/SQLServerTest.launch b/jOOQ-test/launch/SQLServerTest.launch index a0c396f5b3..9613db2ad1 100644 --- a/jOOQ-test/launch/SQLServerTest.launch +++ b/jOOQ-test/launch/SQLServerTest.launch @@ -23,5 +23,6 @@ + diff --git a/jOOQ-test/launch/SQLiteTest.launch b/jOOQ-test/launch/SQLiteTest.launch index 753ceb4bfd..c53efae52e 100644 --- a/jOOQ-test/launch/SQLiteTest.launch +++ b/jOOQ-test/launch/SQLiteTest.launch @@ -23,5 +23,6 @@ + diff --git a/jOOQ-test/launch/SybaseTest.launch b/jOOQ-test/launch/SybaseTest.launch index 42310274de..cb823b4e01 100644 --- a/jOOQ-test/launch/SybaseTest.launch +++ b/jOOQ-test/launch/SybaseTest.launch @@ -23,5 +23,6 @@ + diff --git a/jOOQ/.classpath b/jOOQ/.classpath index f3ae25e969..6379e614e4 100644 --- a/jOOQ/.classpath +++ b/jOOQ/.classpath @@ -23,14 +23,14 @@ - + - + - + diff --git a/jOOQ/.settings/org.eclipse.core.resources.prefs b/jOOQ/.settings/org.eclipse.core.resources.prefs index a37cfca45c..5240b69c1b 100644 --- a/jOOQ/.settings/org.eclipse.core.resources.prefs +++ b/jOOQ/.settings/org.eclipse.core.resources.prefs @@ -2,5 +2,6 @@ eclipse.preferences.version=1 encoding//src/main/java=UTF-8 encoding//src/main/resources=UTF-8 encoding//src/test/java=UTF-8 +encoding//src/test/resources=UTF-8 encoding//target/generated-sources/xjc=UTF-8 encoding/=UTF-8 diff --git a/pom.xml b/pom.xml index e44145850f..4b38acfa45 100644 --- a/pom.xml +++ b/pom.xml @@ -159,14 +159,14 @@ jOOQ-meta jOOQ-scala - jOOQ-examples/jOOQ-spring-example jOOQ-examples/jOOQ-spring-guice-example jOOQ-test-utils jOOQ-test - -->