You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by aa...@apache.org on 2016/08/12 16:24:22 UTC
cayenne git commit: CAY-2101 DataContext.currentSnapshot() doesn't
set snapshot entity name
Repository: cayenne
Updated Branches:
refs/heads/STABLE-3.1 45e413de0 -> 4b88b432e
CAY-2101 DataContext.currentSnapshot() doesn't set snapshot entity name
* switched compiler to 1.6 by mistake... back to 1.5
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/4b88b432
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/4b88b432
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/4b88b432
Branch: refs/heads/STABLE-3.1
Commit: 4b88b432e4598b91c66adc3999c2de2aecc70c00
Parents: 45e413d
Author: Andrus Adamchik <an...@objectstyle.com>
Authored: Fri Aug 12 17:15:56 2016 +0300
Committer: Andrus Adamchik <an...@objectstyle.com>
Committed: Fri Aug 12 19:18:48 2016 +0300
----------------------------------------------------------------------
framework/cayenne-jdk1.5-unpublished/pom.xml | 8 --------
.../access/DataContextObjectIdQuery_PolymorphicTest.java | 3 +--
2 files changed, 1 insertion(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/4b88b432/framework/cayenne-jdk1.5-unpublished/pom.xml
----------------------------------------------------------------------
diff --git a/framework/cayenne-jdk1.5-unpublished/pom.xml b/framework/cayenne-jdk1.5-unpublished/pom.xml
index 9f8789f..6063604 100644
--- a/framework/cayenne-jdk1.5-unpublished/pom.xml
+++ b/framework/cayenne-jdk1.5-unpublished/pom.xml
@@ -239,14 +239,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.6</source>
- <target>1.6</target>
- </configuration>
- </plugin>
</plugins>
</build>
</project>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/4b88b432/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextObjectIdQuery_PolymorphicTest.java
----------------------------------------------------------------------
diff --git a/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextObjectIdQuery_PolymorphicTest.java b/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextObjectIdQuery_PolymorphicTest.java
index 1805274..9c52bf9 100644
--- a/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextObjectIdQuery_PolymorphicTest.java
+++ b/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextObjectIdQuery_PolymorphicTest.java
@@ -105,8 +105,7 @@ public class DataContextObjectIdQuery_PolymorphicTest extends ServerCase {
queryInterceptor.runWithQueriesBlocked(new UnitTestClosure() {
-
- @Override
+
public void execute() {
// use different context to ensure we hit shared cache
AbstractPerson ap1 = (AbstractPerson) Cayenne.objectForQuery(context2, q1);