From commits-return-22732-archive-asf-public=cust-asf.ponee.io@cayenne.apache.org Tue Jan 23 14:00:47 2018 Return-Path: X-Original-To: archive-asf-public@eu.ponee.io Delivered-To: archive-asf-public@eu.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by mx-eu-01.ponee.io (Postfix) with ESMTP id D0688180621 for ; Tue, 23 Jan 2018 14:00:47 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id C050C160C17; Tue, 23 Jan 2018 13:00:47 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id DE78A160C39 for ; Tue, 23 Jan 2018 14:00:46 +0100 (CET) Received: (qmail 31229 invoked by uid 500); 23 Jan 2018 13:00:46 -0000 Mailing-List: contact commits-help@cayenne.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cayenne.apache.org Delivered-To: mailing list commits@cayenne.apache.org Received: (qmail 31210 invoked by uid 99); 23 Jan 2018 13:00:46 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 23 Jan 2018 13:00:45 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id DAF1AE2F03; Tue, 23 Jan 2018 13:00:45 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ntimofeev@apache.org To: commits@cayenne.apache.org Date: Tue, 23 Jan 2018 13:00:45 -0000 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: [1/3] cayenne git commit: Cayenne-assembly upgrade to 3.1.0 Repository: cayenne Updated Branches: refs/heads/master 14f175365 -> 8c3c49a4d Cayenne-assembly upgrade to 3.1.0 Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/a0c63e46 Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/a0c63e46 Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/a0c63e46 Branch: refs/heads/master Commit: a0c63e46bcf3cf5d412634225a88fd5d4fdb438e Parents: 54bb53a Author: Arseni Bulatski Authored: Mon Jan 22 15:22:15 2018 +0300 Committer: Arseni Bulatski Committed: Mon Jan 22 16:05:58 2018 +0300 ---------------------------------------------------------------------- .../main/resources/assemblies/assembly-mac.xml | 26 ++++++++++---------- docs/doc/src/main/resources/RELEASE-NOTES.txt | 1 + pom.xml | 2 +- 3 files changed, 15 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cayenne/blob/a0c63e46/assembly/src/main/resources/assemblies/assembly-mac.xml ---------------------------------------------------------------------- diff --git a/assembly/src/main/resources/assemblies/assembly-mac.xml b/assembly/src/main/resources/assemblies/assembly-mac.xml index f3abac7..e2cb738 100644 --- a/assembly/src/main/resources/assemblies/assembly-mac.xml +++ b/assembly/src/main/resources/assemblies/assembly-mac.xml @@ -21,16 +21,16 @@ dir - true + false target/legal/META-INF/cayenne - / + cayenne-${project.version}-macosx/ ../tutorials/ - tutorials + cayenne-${project.version}-macosx/tutorials/ tutorial/** tutorial-rop-server/** @@ -46,41 +46,41 @@ ../cayenne-cgen/src/main/resources/templates/v4_1 - templates + cayenne-${project.version}-macosx/templates/ ../docs/asciidoc/getting-started-guide/target/generated-docs/getting-started-guide.pdf - doc + cayenne-${project.version}-macosx/doc/ getting-started.pdf ../docs/asciidoc/getting-started-db-first/target/generated-docs/getting-started-db-first.pdf - doc + cayenne-${project.version}-macosx/doc/ getting-started-db-first.pdf ../docs/asciidoc/getting-started-rop/target/generated-docs/getting-started-rop.pdf - doc + cayenne-${project.version}-macosx/doc/ getting-started-rop.pdf ../docs/asciidoc/cayenne-guide/target/generated-docs/cayenne-guide.pdf - doc + cayenne-${project.version}-macosx/doc/ cayenne-guide.pdf ../docs/asciidoc/upgrade-guide/target/generated-docs/upgrade-guide.pdf - doc + cayenne-${project.version}-macosx/doc/ upgrade-guide.pdf - lib + cayenne-${project.version}-macosx/lib/ org.apache.cayenne:cayenne-client org.apache.cayenne:cayenne-crypto @@ -107,14 +107,14 @@ - lib/third-party + cayenne-${project.version}-macosx/lib/third-party/ org.slf4j:slf4j-api - / + cayenne-${project.version}-macosx/ org.apache.cayenne.docs:cayenne-doc @@ -126,7 +126,7 @@ - ../../ + / org.apache.cayenne.modeler:cayenne-modeler-mac http://git-wip-us.apache.org/repos/asf/cayenne/blob/a0c63e46/docs/doc/src/main/resources/RELEASE-NOTES.txt ---------------------------------------------------------------------- diff --git a/docs/doc/src/main/resources/RELEASE-NOTES.txt b/docs/doc/src/main/resources/RELEASE-NOTES.txt index 0c93335..5fba36f 100644 --- a/docs/doc/src/main/resources/RELEASE-NOTES.txt +++ b/docs/doc/src/main/resources/RELEASE-NOTES.txt @@ -18,6 +18,7 @@ CAY-2377 Cleanup deprecated code. CAY-2391 cdbimport: add option to skip user-defined relationships CAY-2393 Add sqlserver-docker profile to automate tests on SQLServer CAY-2394 Upgrade to Apache Velocity 2.0 +CAY-2396 Upgrade maven-assembly-plugin to 3.1.0 Bug Fixes: http://git-wip-us.apache.org/repos/asf/cayenne/blob/a0c63e46/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index af8a347..90ea4d6 100644 --- a/pom.xml +++ b/pom.xml @@ -763,7 +763,7 @@ maven-assembly-plugin - 2.2 + 3.1.0 maven-surefire-plugin