You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@empire-db.apache.org by fr...@apache.org on 2015/08/07 00:18:02 UTC
empire-db git commit: undo EMPIREDB-222 back to jdk6 build target
Repository: empire-db
Updated Branches:
refs/heads/master 7db8f03e3 -> 71c48618c
undo EMPIREDB-222 back to jdk6 build target
Project: http://git-wip-us.apache.org/repos/asf/empire-db/repo
Commit: http://git-wip-us.apache.org/repos/asf/empire-db/commit/71c48618
Tree: http://git-wip-us.apache.org/repos/asf/empire-db/tree/71c48618
Diff: http://git-wip-us.apache.org/repos/asf/empire-db/diff/71c48618
Branch: refs/heads/master
Commit: 71c48618caf4adcba38456b4ef435f3ea4ccd944
Parents: 7db8f03
Author: Francis De Brabandere <fr...@apache.org>
Authored: Fri Aug 7 00:17:55 2015 +0200
Committer: Francis De Brabandere <fr...@apache.org>
Committed: Fri Aug 7 00:17:55 2015 +0200
----------------------------------------------------------------------
CHANGELOG.txt | 3 +--
pom.xml | 10 +++++-----
2 files changed, 6 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/empire-db/blob/71c48618/CHANGELOG.txt
----------------------------------------------------------------------
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 3b80e1c..28f338a 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -11,8 +11,7 @@ Release 2.4.4:
EMPIREDB-221 Allow batch execution through JDBC executeBatch
EMPIREDB-220 Allow override of fraction digits on JSF input tag
EMPIREDB-219 Added source code for Eclipse-Code-Generation-Plugin
- EMPIREDB-217 Consistency check for data model defintion vs deployed data model
- EMPIREDB-222 Switch to JDK7
+ EMPIREDB-217 Consistency check for data model defintion vs deployed data model
** Bugfix
EMPIREDB-218 Missing reserved keywords in DBDatabaseDriverMySQL
http://git-wip-us.apache.org/repos/asf/empire-db/blob/71c48618/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index d3aeedc..66d006c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,8 +44,8 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <maven.compile.source>1.7</maven.compile.source>
- <maven.compile.target>1.7</maven.compile.target>
+ <maven.compile.source>1.6</maven.compile.source>
+ <maven.compile.target>1.6</maven.compile.target>
<disclaimer.dir>{project.basedir}</disclaimer.dir>
</properties>
@@ -132,7 +132,7 @@
</execution>
</executions>
</plugin>
- <!-- enable enforcer for java 1.7 -->
+ <!-- enable enforcer for java 1.6 -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
@@ -534,7 +534,7 @@
<configuration>
<signature>
<groupId>org.codehaus.mojo.signature</groupId>
- <artifactId>java17</artifactId>
+ <artifactId>java16</artifactId>
<version>1.0</version>
</signature>
</configuration>
@@ -621,7 +621,7 @@
<artifactId>maven-pmd-plugin</artifactId>
<version>3.1</version>
<configuration>
- <targetJdk>1.7</targetJdk>
+ <targetJdk>1.6</targetJdk>
</configuration>
</plugin>
<!-- findbugs-maven-plugin -->