Repository: cayenne Updated Branches: refs/heads/master 15b7f696b -> feaa5da08
CAY-2431 Cayenne JDK 11 compatibility Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/feaa5da0 Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/feaa5da0 Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/feaa5da0 Branch: refs/heads/master Commit: feaa5da08dc2bd3d8200ade66f1f38306de1fbee Parents: 15b7f69 Author: Nikita Timofeev <[email protected]> Authored: Mon May 7 15:25:24 2018 +0300 Committer: Nikita Timofeev <[email protected]> Committed: Mon May 7 15:25:24 2018 +0300 ---------------------------------------------------------------------- .../dbsync/reverse/dbimport/package-info.java | 24 ------------------- .../gradle/wrapper/gradle-wrapper.jar | Bin 54783 -> 54731 bytes .../gradle/wrapper/gradle-wrapper.properties | 5 ++-- .../inheritance_with_enum/auto/_Root.java | 2 -- 4 files changed, 2 insertions(+), 29 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cayenne/blob/feaa5da0/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbimport/package-info.java ---------------------------------------------------------------------- diff --git a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbimport/package-info.java b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbimport/package-info.java deleted file mode 100644 index 12cdd1c..0000000 --- a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbimport/package-info.java +++ /dev/null @@ -1,24 +0,0 @@ -/***************************************************************** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - ****************************************************************/ - -@XmlSchema(namespace="http://cayenne.apache.org/schema/8/reverseEngineering";, elementFormDefault= XmlNsForm.QUALIFIED) -package org.apache.cayenne.dbsync.reverse.dbimport; - -import javax.xml.bind.annotation.XmlNsForm; -import javax.xml.bind.annotation.XmlSchema; \ No newline at end of file http://git-wip-us.apache.org/repos/asf/cayenne/blob/feaa5da0/cayenne-gradle-plugin/gradle/wrapper/gradle-wrapper.jar ---------------------------------------------------------------------- diff --git a/cayenne-gradle-plugin/gradle/wrapper/gradle-wrapper.jar b/cayenne-gradle-plugin/gradle/wrapper/gradle-wrapper.jar index 50df0b7..6b6ea3a 100644 Binary files a/cayenne-gradle-plugin/gradle/wrapper/gradle-wrapper.jar and b/cayenne-gradle-plugin/gradle/wrapper/gradle-wrapper.jar differ http://git-wip-us.apache.org/repos/asf/cayenne/blob/feaa5da0/cayenne-gradle-plugin/gradle/wrapper/gradle-wrapper.properties ---------------------------------------------------------------------- diff --git a/cayenne-gradle-plugin/gradle/wrapper/gradle-wrapper.properties b/cayenne-gradle-plugin/gradle/wrapper/gradle-wrapper.properties index ae13321..e5e04e4 100644 --- a/cayenne-gradle-plugin/gradle/wrapper/gradle-wrapper.properties +++ b/cayenne-gradle-plugin/gradle/wrapper/gradle-wrapper.properties @@ -13,9 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -#Thu May 25 16:50:56 MSK 2017 +distributionUrl=https\://services.gradle.org/distributions/gradle-4.7-bin.zip distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.3.1-bin.zip +zipStoreBase=GRADLE_USER_HOME http://git-wip-us.apache.org/repos/asf/cayenne/blob/feaa5da0/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_with_enum/auto/_Root.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_with_enum/auto/_Root.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_with_enum/auto/_Root.java index 3a8a95f..f39d18d 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_with_enum/auto/_Root.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_with_enum/auto/_Root.java @@ -5,8 +5,6 @@ import java.io.ObjectInputStream; import java.io.ObjectOutputStream; import java.util.List; -import javax.annotation.Generated; - import org.apache.cayenne.BaseDataObject; import org.apache.cayenne.exp.Property; import org.apache.cayenne.testdo.inheritance_with_enum.Dependent;
