cayenne git commit: Build JavaDocs only in "assembly" profile

[ntimofeev]

Repository: cayenne
Updated Branches:
  refs/heads/master f894fb5e3 -> 54bb53ae7


Build JavaDocs only in "assembly" profile


Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/54bb53ae
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/54bb53ae
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/54bb53ae

Branch: refs/heads/master
Commit: 54bb53ae7edb43fc961cbd94ce1a4e98882aeb55
Parents: f894fb5
Author: Nikita Timofeev 
Authored: Fri Jan 19 17:38:44 2018 +0300
Committer: Nikita Timofeev 
Committed: Fri Jan 19 17:38:44 2018 +0300

--
 docs/doc/pom.xml | 177 ++
 1 file changed, 91 insertions(+), 86 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cayenne/blob/54bb53ae/docs/doc/pom.xml
--
diff --git a/docs/doc/pom.xml b/docs/doc/pom.xml
index 02574f2..a40983d 100644
--- a/docs/doc/pom.xml
+++ b/docs/doc/pom.xml
@@ -90,92 +90,97 @@
 

 
-   
-   
-   
-   target/site/apidocs
-   
-   
-   src/main/resources
-   
-   doc/index.html
-   
-   
-   
-   src/main/resources
-   true
-   
-   doc/index.html
-   
-   
-   
-
-   
-   
-   org.codehaus.mojo
-   dependency-maven-plugin
-   
-   
-   unpack-sources
-   generate-sources
-   
-   unpack
-   
-   
+   
+   
+   assembly
+   
+   
+   
+   
target/site/apidocs
+   
+   
+   
src/main/resources
+   
+   
doc/index.html
+   
+   
+   
+   
src/main/resources
+   true
+   
+   
doc/index.html
+   
+   
+   
+
+   
+   
+   
org.codehaus.mojo
+   
dependency-maven-plugin
+   
+   
+   
unpack-sources
+   
generate-sources
+   
+   
unpack
+   
+   
+   
+   
target/sources
+   

+   

+   
org.apache.cayenne
+   
cayenne-di
+   
${project.version}
+   
sources
+   

+ 

[jira] [Closed] (CAY-2393) Add sqlserver-docker profile to automate tests on SQLServer

[Nikita Timofeev (JIRA)]

 [ 
https://issues.apache.org/jira/browse/CAY-2393?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Nikita Timofeev closed CAY-2393.

Resolution: Fixed

> Add sqlserver-docker profile to automate tests on SQLServer
> ---
>
> Key: CAY-2393
> URL: https://issues.apache.org/jira/browse/CAY-2393
> Project: Cayenne
>  Issue Type: Improvement
>  Components: Database integration
> Environment: SQLServer
>Reporter: Nikita Timofeev
>Assignee: Nikita Timofeev
>Priority: Minor
> Fix For: 4.0.B3, 4.1.M2
>
>
> Microsoft launched SQLServer for Linux and created official [docker 
> image|https://hub.docker.com/r/microsoft/mssql-server-linux/] for it.
> So we can add {{sqlserver-docker}} profile that will allow us to automate 
> integration tests on SQLServer (like {{mysql-docker}} and {{postrges-docker}})



--
This message was sent by Atlassian JIRA
(v7.6.3#76005)

[jira] [Closed] (CAY-2392) Modeler: Unable to remove DataNode

[Nikita Timofeev (JIRA)]

 [ 
https://issues.apache.org/jira/browse/CAY-2392?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Nikita Timofeev closed CAY-2392.

Resolution: Fixed

> Modeler: Unable to remove DataNode
> --
>
> Key: CAY-2392
> URL: https://issues.apache.org/jira/browse/CAY-2392
> Project: Cayenne
>  Issue Type: Bug
>  Components: Modeler
>Affects Versions: 4.0.B2, 4.1.M1
>Reporter: Nikita Timofeev
>Assignee: Nikita Timofeev
>Priority: Minor
>  Labels: pull-request-available
> Fix For: 4.0.B3, 4.1.M2
>
>
> Not sure why it's not allowed initially, but there are some cases when you 
> want to remove data node from project and for that you should edit project 
> XML directly (e.g. you often want to define connection properties in runtime, 
> or create you own synthetic data node).
> So we can just allow that from the Modeler.



--
This message was sent by Atlassian JIRA
(v7.6.3#76005)

[GitHub] cayenne pull request #257: Added sqlserver-docker profile to tests on SQLSer...

[asfgit]

Github user asfgit closed the pull request at:

https://github.com/apache/cayenne/pull/257


---

[1/2] cayenne git commit: Added sqlserver-docker profile to tests on SQLServer

[ntimofeev]

Repository: cayenne
Updated Branches:
  refs/heads/STABLE-4.0 f6ba5e14d -> 2f22b1e5b


Added sqlserver-docker profile to tests on SQLServer


Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/35570124
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/35570124
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/35570124

Branch: refs/heads/STABLE-4.0
Commit: 355701246e7f9765c24c0f86ae3c93297cb0b49d
Parents: ba14147
Author: Maxim Petrusevich 
Authored: Fri Jan 19 13:40:28 2018 +0300
Committer: Maxim Petrusevich 
Committed: Fri Jan 19 13:40:28 2018 +0300

--
 .travis.yml|  1 +
 cayenne-client/pom.xml | 33 ++
 cayenne-dbsync/pom.xml | 33 ++
 cayenne-jcache/pom.xml | 33 ++
 cayenne-server/pom.xml | 33 ++
 pom.xml| 81 +
 6 files changed, 201 insertions(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cayenne/blob/35570124/.travis.yml
--
diff --git a/.travis.yml b/.travis.yml
index 4101ebd..6151ad1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -31,6 +31,7 @@ env:
   - DB_PROFILE=derby
   - DB_PROFILE=mysql-docker
   - DB_PROFILE=postgres-docker
+  - DB_PROFILE=sqlserver-docker
 
 jdk:
   - oraclejdk8

http://git-wip-us.apache.org/repos/asf/cayenne/blob/35570124/cayenne-client/pom.xml
--
diff --git a/cayenne-client/pom.xml b/cayenne-client/pom.xml
index 3dcc4fe..c6c5257 100644
--- a/cayenne-client/pom.xml
+++ b/cayenne-client/pom.xml
@@ -165,6 +165,39 @@
 
 
 
+sqlserver-docker
+
+
+cayenneTestConnection
+sqlserver-docker
+
+
+
+
+
+io.fabric8
+docker-maven-plugin
+
+
+start-sqlserver
+pre-integration-test
+
+start
+
+
+
+stop-sqlserver
+post-integration-test
+
+stop
+
+
+
+
+
+
+
+
 code-quality
 
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/35570124/cayenne-dbsync/pom.xml
--
diff --git a/cayenne-dbsync/pom.xml b/cayenne-dbsync/pom.xml
index d3db3d3..c179a4a 100644
--- a/cayenne-dbsync/pom.xml
+++ b/cayenne-dbsync/pom.xml
@@ -201,5 +201,38 @@



+   
+   sqlserver-docker
+   
+   
+   cayenneTestConnection
+   sqlserver-docker
+   
+   
+   
+   
+   
+   io.fabric8
+   
docker-maven-plugin
+   
+   
+   
start-sqlserver
+   
pre-integration-test
+   
+   
start
+   
+   
+   
+   
stop-sqlserver
+   
post-integration-test
+   
+   
stop
+   
+   
+   
+  

[2/2] cayenne git commit: Merge remote-tracking branch 'remotes/parent/pr/257' into asf-STABLE-4.0

[ntimofeev]

Merge remote-tracking branch 'remotes/parent/pr/257' into asf-STABLE-4.0


Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/2f22b1e5
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/2f22b1e5
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/2f22b1e5

Branch: refs/heads/STABLE-4.0
Commit: 2f22b1e5b712b0def27054caf771d994615cb97e
Parents: f6ba5e1 3557012
Author: Nikita Timofeev 
Authored: Fri Jan 19 16:49:23 2018 +0300
Committer: Nikita Timofeev 
Committed: Fri Jan 19 16:49:23 2018 +0300

--
 .travis.yml|  1 +
 cayenne-client/pom.xml | 33 ++
 cayenne-dbsync/pom.xml | 33 ++
 cayenne-jcache/pom.xml | 33 ++
 cayenne-server/pom.xml | 33 ++
 pom.xml| 81 +
 6 files changed, 201 insertions(+), 13 deletions(-)
--

[jira] [Commented] (CAY-2392) Modeler: Unable to remove DataNode

[ASF GitHub Bot (JIRA)]

[ 
https://issues.apache.org/jira/browse/CAY-2392?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16332275#comment-16332275
 ] 

ASF GitHub Bot commented on CAY-2392:
-

Github user asfgit closed the pull request at:

https://github.com/apache/cayenne/pull/256


> Modeler: Unable to remove DataNode
> --
>
> Key: CAY-2392
> URL: https://issues.apache.org/jira/browse/CAY-2392
> Project: Cayenne
>  Issue Type: Bug
>  Components: Modeler
>Affects Versions: 4.0.B2, 4.1.M1
>Reporter: Nikita Timofeev
>Assignee: Nikita Timofeev
>Priority: Minor
>  Labels: pull-request-available
> Fix For: 4.0.B3, 4.1.M2
>
>
> Not sure why it's not allowed initially, but there are some cases when you 
> want to remove data node from project and for that you should edit project 
> XML directly (e.g. you often want to define connection properties in runtime, 
> or create you own synthetic data node).
> So we can just allow that from the Modeler.



--
This message was sent by Atlassian JIRA
(v7.6.3#76005)

[GitHub] cayenne pull request #256: CAY-2392 Allow to remove dataNode in 4.0

[asfgit]

Github user asfgit closed the pull request at:

https://github.com/apache/cayenne/pull/256


---

[2/2] cayenne git commit: Merge remote-tracking branch 'remotes/parent/pr/256' into asf-STABLE-4.0

[ntimofeev]

Merge remote-tracking branch 'remotes/parent/pr/256' into asf-STABLE-4.0

# Conflicts:
#   docs/doc/src/main/resources/RELEASE-NOTES.txt


Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/f6ba5e14
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/f6ba5e14
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/f6ba5e14

Branch: refs/heads/STABLE-4.0
Commit: f6ba5e14d2143826a0f767fe7ae2917da395e6bb
Parents: ba14147 5adcec9
Author: Nikita Timofeev 
Authored: Fri Jan 19 16:48:55 2018 +0300
Committer: Nikita Timofeev 
Committed: Fri Jan 19 16:48:55 2018 +0300

--
 docs/doc/src/main/resources/RELEASE-NOTES.txt | 1 +
 .../org/apache/cayenne/modeler/action/DefaultActionManager.java   | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6ba5e14/docs/doc/src/main/resources/RELEASE-NOTES.txt
--
diff --cc docs/doc/src/main/resources/RELEASE-NOTES.txt
index 2b8adbe,3d550eb..1524b5e
--- a/docs/doc/src/main/resources/RELEASE-NOTES.txt
+++ b/docs/doc/src/main/resources/RELEASE-NOTES.txt
@@@ -20,10 -20,7 +20,11 @@@ CAY-2365 SQLExec query tries to conver
  CAY-2367 ClassCastException reading object with an attribute of type 'char'
  CAY-2368 ColumnSelect: Property.self() translates into wrong SQL code
  CAY-2370 ValueObjectType for byte[] fails lookup
 -CAY-2392 Allow to remove dataNode in modeler
 +CAY-2382 Lack of synchronization in DataContext serialization
 +CAY-2387 Can't select byte[] property with ColumnSelect
 +CAY-2388 Modeler: Visualization issues with undo/redo actions for attributes 
and relationships
 +CAY-2389 DbEntity qualifier with DbPath expression translates into wrong SQL
++CAY-2392 Modeler: Unable to remove DataNode
  
  --
  Release: 4.0.B2

[1/2] cayenne git commit: CAY-2392

[ntimofeev]

Repository: cayenne
Updated Branches:
  refs/heads/STABLE-4.0 ba141473a -> f6ba5e14d


CAY-2392


Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/5adcec96
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/5adcec96
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/5adcec96

Branch: refs/heads/STABLE-4.0
Commit: 5adcec965bd47168d9486d1999cf33ad39242acd
Parents: 29c17b0
Author: Arseni Bulatski 
Authored: Fri Jan 19 12:31:41 2018 +0300
Committer: Arseni Bulatski 
Committed: Fri Jan 19 12:31:41 2018 +0300

--
 docs/doc/src/main/resources/RELEASE-NOTES.txt | 1 +
 .../org/apache/cayenne/modeler/action/DefaultActionManager.java   | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cayenne/blob/5adcec96/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 0687aad..3d550eb 100644
--- a/docs/doc/src/main/resources/RELEASE-NOTES.txt
+++ b/docs/doc/src/main/resources/RELEASE-NOTES.txt
@@ -20,6 +20,7 @@ CAY-2365 SQLExec query tries to convert (unexpected) result 
set into objects
 CAY-2367 ClassCastException reading object with an attribute of type 'char'
 CAY-2368 ColumnSelect: Property.self() translates into wrong SQL code
 CAY-2370 ValueObjectType for byte[] fails lookup
+CAY-2392 Allow to remove dataNode in modeler
 
 --
 Release: 4.0.B2

http://git-wip-us.apache.org/repos/asf/cayenne/blob/5adcec96/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/DefaultActionManager.java
--
diff --git 
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/DefaultActionManager.java
 
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/DefaultActionManager.java
index ed865f9..1b74901 100644
--- 
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/DefaultActionManager.java
+++ 
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/DefaultActionManager.java
@@ -169,7 +169,8 @@ public class DefaultActionManager implements ActionManager {
 
 DATA_NODE_ACTIONS = new HashSet(DOMAIN_ACTIONS);
 DATA_NODE_ACTIONS.addAll(Arrays.asList(
-LinkDataMapsAction.class.getName()));
+LinkDataMapsAction.class.getName(),
+RemoveAction.class.getName()));
 
 DATA_MAP_ACTIONS = new HashSet(DOMAIN_ACTIONS);
 DATA_MAP_ACTIONS.addAll(Arrays.asList(

Jenkins build is back to normal : cayenne-master » derby,JDK 1.8 (latest),ubuntu #775

[Apache Jenkins Server]

See 

cayenne git commit: Remove usage of commons-lang from Modeler + minor code cleanup

[ntimofeev]

Repository: cayenne
Updated Branches:
  refs/heads/master d3b546a37 -> f894fb5e3


Remove usage of commons-lang from Modeler + minor code cleanup


Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/f894fb5e
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/f894fb5e
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/f894fb5e

Branch: refs/heads/master
Commit: f894fb5e39af03144af02bdd37a8a219b392b279
Parents: d3b546a
Author: Nikita Timofeev 
Authored: Fri Jan 19 16:25:16 2018 +0300
Committer: Nikita Timofeev 
Committed: Fri Jan 19 16:25:16 2018 +0300

--
 .../main/java/org/apache/cayenne/util/Util.java |  21 ++-
 .../objentity/ObjAttributeInfoDialog.java   | 131 ---
 .../util/DbAttributePathComboBoxEditor.java |   9 +-
 .../util/PathChooserComboBoxCellEditor.java |  12 +-
 4 files changed, 80 insertions(+), 93 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cayenne/blob/f894fb5e/cayenne-server/src/main/java/org/apache/cayenne/util/Util.java
--
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/util/Util.java 
b/cayenne-server/src/main/java/org/apache/cayenne/util/Util.java
index 1c41b3c..5fdfcf4 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/util/Util.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/util/Util.java
@@ -238,6 +238,7 @@ public class Util {
}
 
/**
+* Returns true, if string not empty and contains non-whitespace 
characters.
 * @since 4.1
 */
public static boolean isBlank(CharSequence cs) {
@@ -262,9 +263,7 @@ public class Util {
if (isEmptyString(cs)) {
return false;
} else {
-   int sz = cs.length();
-
-   for(int i = 0; i < sz; ++i) {
+   for(int i = 0; i < cs.length(); ++i) {
if (!Character.isDigit(cs.charAt(i))) {
return false;
}
@@ -275,6 +274,22 @@ public class Util {
}
 
/**
+* Returns how many times the sub appears in the str.
+* @since 4.1
+*/
+   public static int countMatches(final String str, final String sub) {
+   if (isEmptyString(str) || isEmptyString(sub)) {
+   return 0;
+   }
+   int count = 0, idx = 0;
+   while ((idx = str.indexOf(sub, idx)) != -1) {
+   count++;
+   idx += sub.length();
+   }
+   return count;
+   }
+
+   /**
 * Capitalizes the first letter of the property name.
 *
 * @since 4.1

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f894fb5e/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/objentity/ObjAttributeInfoDialog.java
--
diff --git 
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/objentity/ObjAttributeInfoDialog.java
 
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/objentity/ObjAttributeInfoDialog.java
index 11b4a68..2bf61cf 100644
--- 
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/objentity/ObjAttributeInfoDialog.java
+++ 
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/objentity/ObjAttributeInfoDialog.java
@@ -53,8 +53,6 @@ import javax.swing.table.TableColumn;
 import javax.swing.tree.TreePath;
 import java.awt.Color;
 import java.awt.Component;
-import java.awt.event.ItemEvent;
-import java.awt.event.ItemListener;
 import java.awt.event.KeyEvent;
 import java.awt.event.KeyListener;
 import java.util.ArrayList;
@@ -75,8 +73,6 @@ public class ObjAttributeInfoDialog extends CayenneController 
implements TreeSel
 
protected List relTargets;
 
-   protected List objectTargets;
-
protected Map stringToEmbeddables;
protected List embeddableNames;
 
@@ -90,11 +86,9 @@ public class ObjAttributeInfoDialog extends 
CayenneController implements TreeSel
this.model = model;
this.row = row;
this.stringToEmbeddables = new HashMap<>();
-   this.embeddableNames = new ArrayList();
+   this.embeddableNames = new ArrayList<>();
 
-   Iterator embs = 
mediator.getEmbeddablesInCurrentDataDomain().iterator();
-   while (embs.hasNext()) {
-   Embeddable emb = embs.next();
+   for (Embeddable emb : 

[jira] [Closed] (CAY-2394) Upgrade cayenne to Velocity 2.0

[Nikita Timofeev (JIRA)]

 [ 
https://issues.apache.org/jira/browse/CAY-2394?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Nikita Timofeev closed CAY-2394.

Resolution: Fixed

> Upgrade cayenne to Velocity 2.0
> ---
>
> Key: CAY-2394
> URL: https://issues.apache.org/jira/browse/CAY-2394
> Project: Cayenne
>  Issue Type: Task
>Reporter: Arseni Bulatski
>Assignee: Nikita Timofeev
>Priority: Minor
>  Labels: pull-request-available
> Fix For: 4.1.M2
>
>
> Upgrade cayenne-cgen and cayenne-velocity to velocity 2.0



--
This message was sent by Atlassian JIRA
(v7.6.3#76005)

[jira] [Assigned] (CAY-2394) Upgrade cayenne to Velocity 2.0

[Nikita Timofeev (JIRA)]

 [ 
https://issues.apache.org/jira/browse/CAY-2394?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Nikita Timofeev reassigned CAY-2394:


Assignee: Nikita Timofeev

> Upgrade cayenne to Velocity 2.0
> ---
>
> Key: CAY-2394
> URL: https://issues.apache.org/jira/browse/CAY-2394
> Project: Cayenne
>  Issue Type: Task
>Reporter: Arseni Bulatski
>Assignee: Nikita Timofeev
>Priority: Minor
>  Labels: pull-request-available
> Fix For: 4.1.M2
>
>
> Upgrade cayenne-cgen and cayenne-velocity to velocity 2.0



--
This message was sent by Atlassian JIRA
(v7.6.3#76005)

[jira] [Commented] (CAY-2394) Upgrade cayenne to Velocity 2.0

[ASF GitHub Bot (JIRA)]

[ 
https://issues.apache.org/jira/browse/CAY-2394?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16332214#comment-16332214
 ] 

ASF GitHub Bot commented on CAY-2394:
-

Github user asfgit closed the pull request at:

https://github.com/apache/cayenne/pull/255


> Upgrade cayenne to Velocity 2.0
> ---
>
> Key: CAY-2394
> URL: https://issues.apache.org/jira/browse/CAY-2394
> Project: Cayenne
>  Issue Type: Task
>Reporter: Arseni Bulatski
>Priority: Minor
>  Labels: pull-request-available
> Fix For: 4.1.M2
>
>
> Upgrade cayenne-cgen and cayenne-velocity to velocity 2.0



--
This message was sent by Atlassian JIRA
(v7.6.3#76005)

[3/3] cayenne git commit: CAY-2394 Upgrade Apache Velocity to version 2.0 minor cleanup

[ntimofeev]

CAY-2394 Upgrade Apache Velocity to version 2.0
  minor cleanup


Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/d3b546a3
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/d3b546a3
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/d3b546a3

Branch: refs/heads/master
Commit: d3b546a37bfe629a285f6d1a3ba6e44efa014560
Parents: 174898d
Author: Nikita Timofeev 
Authored: Fri Jan 19 15:52:03 2018 +0300
Committer: Nikita Timofeev 
Committed: Fri Jan 19 15:52:03 2018 +0300

--
 .../org/apache/cayenne/velocity/SQLTemplateResourceManager.java   | 3 ---
 1 file changed, 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cayenne/blob/d3b546a3/cayenne-velocity/src/main/java/org/apache/cayenne/velocity/SQLTemplateResourceManager.java
--
diff --git 
a/cayenne-velocity/src/main/java/org/apache/cayenne/velocity/SQLTemplateResourceManager.java
 
b/cayenne-velocity/src/main/java/org/apache/cayenne/velocity/SQLTemplateResourceManager.java
index 33bb192..8648174 100644
--- 
a/cayenne-velocity/src/main/java/org/apache/cayenne/velocity/SQLTemplateResourceManager.java
+++ 
b/cayenne-velocity/src/main/java/org/apache/cayenne/velocity/SQLTemplateResourceManager.java
@@ -39,9 +39,6 @@ import java.util.Map;
  * creates templates from in-memory Strings.
  *
  * @since 1.1
- */
-
-/**
  * @deprecated since 4.1 is unused
  */
 @Deprecated

[GitHub] cayenne pull request #255: CAY-2394 Velocity 2.0 upgrade

[asfgit]

Github user asfgit closed the pull request at:

https://github.com/apache/cayenne/pull/255


---

[1/3] cayenne git commit: CAY-2394 Velocity 2.0 upgrade

[ntimofeev]

Repository: cayenne
Updated Branches:
  refs/heads/master 84687a787 -> d3b546a37


CAY-2394 Velocity 2.0 upgrade


Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/a37df6b2
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/a37df6b2
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/a37df6b2

Branch: refs/heads/master
Commit: a37df6b2dae6102c48ef50f73e0a6265080be5ec
Parents: 8d79f45
Author: Arseni Bulatski 
Authored: Wed Jan 17 10:34:54 2018 +0300
Committer: Arseni Bulatski 
Committed: Fri Jan 19 12:02:16 2018 +0300

--
 .../cayenne/tools/DbImporterTaskTest.java   |  4 +-
 cayenne-cgen/pom.xml|  2 +-
 .../cayenne/gen/ClassGenerationAction.java  |  6 +-
 .../gen/ClassGeneratorResourceLoader.java   | 27 +++
 .../apache/cayenne/gen/ClassGenerationCase.java |  3 -
 .../main/java/org/apache/cayenne/util/Util.java | 39 +-
 cayenne-velocity/pom.xml|  2 +-
 .../velocity/SQLTemplateResourceManager.java| 25 ---
 .../velocity/VelocitySQLTemplateProcessor.java  | 10 +--
 .../SQLTemplateResourceManagerTest.java | 77 
 docs/doc/src/main/resources/RELEASE-NOTES.txt   |  1 +
 .../cayenne/tools/DbImporterMojoTest.java   |  2 +-
 .../modeler/editor/SelectPropertiesPanel.java   | 10 ++-
 .../util/DbAttributePathComboBoxEditor.java |  2 +-
 .../util/PathChooserComboBoxCellEditor.java |  2 +-
 pom.xml |  4 +-
 16 files changed, 87 insertions(+), 129 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cayenne/blob/a37df6b2/cayenne-ant/src/test/java/org/apache/cayenne/tools/DbImporterTaskTest.java
--
diff --git 
a/cayenne-ant/src/test/java/org/apache/cayenne/tools/DbImporterTaskTest.java 
b/cayenne-ant/src/test/java/org/apache/cayenne/tools/DbImporterTaskTest.java
index df746c2..6e83263 100644
--- a/cayenne-ant/src/test/java/org/apache/cayenne/tools/DbImporterTaskTest.java
+++ b/cayenne-ant/src/test/java/org/apache/cayenne/tools/DbImporterTaskTest.java
@@ -45,7 +45,7 @@ import java.sql.Statement;
 import java.util.List;
 
 import static 
org.apache.cayenne.dbsync.reverse.dbimport.ReverseEngineeringUtils.*;
-import static org.apache.commons.lang.StringUtils.isBlank;
+import static org.apache.cayenne.util.Util.isBlank;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
@@ -226,4 +226,6 @@ public class DbImporterTaskTest {
 }
 }
 
+
+
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cayenne/blob/a37df6b2/cayenne-cgen/pom.xml
--
diff --git a/cayenne-cgen/pom.xml b/cayenne-cgen/pom.xml
index 6b96780..d95761d 100644
--- a/cayenne-cgen/pom.xml
+++ b/cayenne-cgen/pom.xml
@@ -50,7 +50,7 @@
 
 
 org.apache.velocity
-velocity
+velocity-engine-core
 compile
 
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/a37df6b2/cayenne-cgen/src/main/java/org/apache/cayenne/gen/ClassGenerationAction.java
--
diff --git 
a/cayenne-cgen/src/main/java/org/apache/cayenne/gen/ClassGenerationAction.java 
b/cayenne-cgen/src/main/java/org/apache/cayenne/gen/ClassGenerationAction.java
index e8678d1..eb122be 100644
--- 
a/cayenne-cgen/src/main/java/org/apache/cayenne/gen/ClassGenerationAction.java
+++ 
b/cayenne-cgen/src/main/java/org/apache/cayenne/gen/ClassGenerationAction.java
@@ -25,12 +25,10 @@ import org.apache.cayenne.map.DataMap;
 import org.apache.cayenne.map.Embeddable;
 import org.apache.cayenne.map.ObjEntity;
 import org.apache.cayenne.map.QueryDescriptor;
-import org.slf4j.Logger;
 import org.apache.velocity.Template;
 import org.apache.velocity.VelocityContext;
 import org.apache.velocity.app.VelocityEngine;
-import org.apache.velocity.runtime.RuntimeConstants;
-import org.apache.velocity.runtime.log.NullLogChute;
+import org.slf4j.Logger;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -261,8 +259,6 @@ public class ClassGenerationAction {
 
Properties props = new Properties();
 
-   // null logger that will prevent velocity.log from 
being generated
-   props.put(RuntimeConstants.RUNTIME_LOG_LOGSYSTEM_CLASS, 
NullLogChute.class.getName());
props.put("resource.loader", "cayenne");
props.put("cayenne.resource.loader.class", 
ClassGeneratorResourceLoader.class.getName());

[2/3] cayenne git commit: Merge remote-tracking branch 'remotes/parent/pr/255' into asf-master

[ntimofeev]

Merge remote-tracking branch 'remotes/parent/pr/255' into asf-master

# Conflicts:
#   
cayenne-ant/src/test/java/org/apache/cayenne/tools/DbImporterTaskTest.java
#   docs/doc/src/main/resources/RELEASE-NOTES.txt


Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/174898d5
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/174898d5
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/174898d5

Branch: refs/heads/master
Commit: 174898d5af5acc9f1242bdb2c4b108094d7b1307
Parents: 84687a7 a37df6b
Author: Nikita Timofeev 
Authored: Fri Jan 19 15:33:01 2018 +0300
Committer: Nikita Timofeev 
Committed: Fri Jan 19 15:33:01 2018 +0300

--
 cayenne-cgen/pom.xml|  2 +-
 .../cayenne/gen/ClassGenerationAction.java  |  6 +-
 .../gen/ClassGeneratorResourceLoader.java   | 27 +++
 .../apache/cayenne/gen/ClassGenerationCase.java |  3 -
 .../main/java/org/apache/cayenne/util/Util.java | 39 +-
 cayenne-velocity/pom.xml|  2 +-
 .../velocity/SQLTemplateResourceManager.java| 25 ---
 .../velocity/VelocitySQLTemplateProcessor.java  | 10 +--
 .../SQLTemplateResourceManagerTest.java | 77 
 docs/doc/src/main/resources/RELEASE-NOTES.txt   |  1 +
 .../cayenne/tools/DbImporterMojoTest.java   |  2 +-
 .../modeler/editor/SelectPropertiesPanel.java   | 10 ++-
 .../util/DbAttributePathComboBoxEditor.java |  2 +-
 .../util/PathChooserComboBoxCellEditor.java |  2 +-
 pom.xml |  4 +-
 15 files changed, 84 insertions(+), 128 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cayenne/blob/174898d5/docs/doc/src/main/resources/RELEASE-NOTES.txt
--
diff --cc docs/doc/src/main/resources/RELEASE-NOTES.txt
index 4b6d894,84f0217..0c93335
--- a/docs/doc/src/main/resources/RELEASE-NOTES.txt
+++ b/docs/doc/src/main/resources/RELEASE-NOTES.txt
@@@ -15,8 -15,7 +15,9 @@@ Changes/New Features
  
  CAY-2372 Extract new modules from cayenne-server
  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
  
  Bug Fixes:
  

http://git-wip-us.apache.org/repos/asf/cayenne/blob/174898d5/maven-plugins/cayenne-maven-plugin/src/test/java/org/apache/cayenne/tools/DbImporterMojoTest.java
--

http://git-wip-us.apache.org/repos/asf/cayenne/blob/174898d5/pom.xml
--

[jira] [Commented] (CAY-2391) cdbimport: add option to skip user-defined relationships

[ASF GitHub Bot (JIRA)]

[ 
https://issues.apache.org/jira/browse/CAY-2391?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16332187#comment-16332187
 ] 

ASF GitHub Bot commented on CAY-2391:
-

Github user asfgit closed the pull request at:

https://github.com/apache/cayenne/pull/253


> cdbimport: add option to skip user-defined relationships
> 
>
> Key: CAY-2391
> URL: https://issues.apache.org/jira/browse/CAY-2391
> Project: Cayenne
>  Issue Type: Improvement
>  Components: Non-GUI Tools
>Reporter: Nikita Timofeev
>Assignee: Nikita Timofeev
>Priority: Major
>  Labels: pull-request-available
> Fix For: 4.1.M2
>
>
> There is a problem in {{cdbimport}} tool when user define relationships that 
> are not backed by foreign key in DB. This may be required to link table with 
> view or just in case some DB-related optimizations. Currently there is no 
> option to keep this relationships, as they will be deleted by next 
> {{cdbimport}} run.
> Workaround may be excluding all tables with this relationships or add 
> relationships at runtime.



--
This message was sent by Atlassian JIRA
(v7.6.3#76005)

[jira] [Commented] (CAY-2392) Modeler: Unable to remove DataNode

[ASF GitHub Bot (JIRA)]

[ 
https://issues.apache.org/jira/browse/CAY-2392?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16332188#comment-16332188
 ] 

ASF GitHub Bot commented on CAY-2392:
-

Github user asfgit closed the pull request at:

https://github.com/apache/cayenne/pull/254


> Modeler: Unable to remove DataNode
> --
>
> Key: CAY-2392
> URL: https://issues.apache.org/jira/browse/CAY-2392
> Project: Cayenne
>  Issue Type: Bug
>  Components: Modeler
>Affects Versions: 4.0.B2, 4.1.M1
>Reporter: Nikita Timofeev
>Assignee: Nikita Timofeev
>Priority: Minor
>  Labels: pull-request-available
> Fix For: 4.0.B3, 4.1.M2
>
>
> Not sure why it's not allowed initially, but there are some cases when you 
> want to remove data node from project and for that you should edit project 
> XML directly (e.g. you often want to define connection properties in runtime, 
> or create you own synthetic data node).
> So we can just allow that from the Modeler.



--
This message was sent by Atlassian JIRA
(v7.6.3#76005)

[GitHub] cayenne pull request #254: CAY-2392 Allow to remove DataNode

[asfgit]

Github user asfgit closed the pull request at:

https://github.com/apache/cayenne/pull/254


---

[5/5] cayenne git commit: Merge remote-tracking branch 'remotes/parent/pr/254' into asf-master

[ntimofeev]

Merge remote-tracking branch 'remotes/parent/pr/254' into asf-master

# Conflicts:
#   docs/doc/src/main/resources/RELEASE-NOTES.txt


Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/84687a78
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/84687a78
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/84687a78

Branch: refs/heads/master
Commit: 84687a7874b4cf0107809d0feea82c394a826b46
Parents: 8d66f55 8f67218
Author: Nikita Timofeev 
Authored: Fri Jan 19 15:27:37 2018 +0300
Committer: Nikita Timofeev 
Committed: Fri Jan 19 15:27:37 2018 +0300

--
 docs/doc/src/main/resources/RELEASE-NOTES.txt | 1 +
 .../org/apache/cayenne/modeler/action/DefaultActionManager.java   | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cayenne/blob/84687a78/docs/doc/src/main/resources/RELEASE-NOTES.txt
--
diff --cc docs/doc/src/main/resources/RELEASE-NOTES.txt
index f64ec84,871929d..4b6d894
--- a/docs/doc/src/main/resources/RELEASE-NOTES.txt
+++ b/docs/doc/src/main/resources/RELEASE-NOTES.txt
@@@ -27,6 -26,6 +27,7 @@@ CAY-2382 Lack of synchronization in Dat
  CAY-2387 Can't select byte[] property with ColumnSelect
  CAY-2388 Modeler: Visualization issues with undo/redo actions for attributes 
and relationships
  CAY-2389 DbEntity qualifier with DbPath expression translates into wrong SQL
++CAY-2392 Modeler: Unable to remove DataNode
  
  --
  Release: 4.1.M1

[GitHub] cayenne pull request #253: CAY-2391 add excludeRelationship to dbImport

[asfgit]

Github user asfgit closed the pull request at:

https://github.com/apache/cayenne/pull/253


---

[2/5] cayenne git commit: CAY-2392 Allow to remove DataNode

[ntimofeev]

CAY-2392 Allow to remove DataNode


Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/8f67218f
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/8f67218f
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/8f67218f

Branch: refs/heads/master
Commit: 8f67218f45038b668e520c949c1bbfc920a2d215
Parents: 8d79f45
Author: Arseni Bulatski 
Authored: Mon Jan 15 16:59:56 2018 +0300
Committer: Arseni Bulatski 
Committed: Mon Jan 15 17:01:57 2018 +0300

--
 docs/doc/src/main/resources/RELEASE-NOTES.txt | 1 +
 .../org/apache/cayenne/modeler/action/DefaultActionManager.java   | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cayenne/blob/8f67218f/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 7958307..871929d 100644
--- a/docs/doc/src/main/resources/RELEASE-NOTES.txt
+++ b/docs/doc/src/main/resources/RELEASE-NOTES.txt
@@ -15,6 +15,7 @@ Changes/New Features:
 
 CAY-2372 Extract new modules from cayenne-server
 CAY-2377 Cleanup deprecated code.
+CAY-2392 Allow to remove DataNode
 
 Bug Fixes:
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/8f67218f/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/DefaultActionManager.java
--
diff --git 
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/DefaultActionManager.java
 
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/DefaultActionManager.java
index ed865f9..1b74901 100644
--- 
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/DefaultActionManager.java
+++ 
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/DefaultActionManager.java
@@ -169,7 +169,8 @@ public class DefaultActionManager implements ActionManager {
 
 DATA_NODE_ACTIONS = new HashSet(DOMAIN_ACTIONS);
 DATA_NODE_ACTIONS.addAll(Arrays.asList(
-LinkDataMapsAction.class.getName()));
+LinkDataMapsAction.class.getName(),
+RemoveAction.class.getName()));
 
 DATA_MAP_ACTIONS = new HashSet(DOMAIN_ACTIONS);
 DATA_MAP_ACTIONS.addAll(Arrays.asList(

[3/5] cayenne git commit: Merge remote-tracking branch 'remotes/parent/pr/253' into asf-master

[ntimofeev]

Merge remote-tracking branch 'remotes/parent/pr/253' into asf-master

# Conflicts:
#   docs/doc/src/main/resources/RELEASE-NOTES.txt


Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/3fa68189
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/3fa68189
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/3fa68189

Branch: refs/heads/master
Commit: 3fa68189fa90883fa4f0ecadf2da3f76408e2107
Parents: 1e8ed89 66af8b3
Author: Nikita Timofeev 
Authored: Fri Jan 19 15:21:30 2018 +0300
Committer: Nikita Timofeev 
Committed: Fri Jan 19 15:21:30 2018 +0300

--
 .../apache/cayenne/tools/DbImporterTask.java|  10 +-
 .../cayenne/tools/DbImporterTaskTest.java   |  39 ++---
 .../testExcludeRelationshipFirst.map.xml-result |  40 ++
 .../tools/testExcludeRelationshipFirst.xml  |  38 +
 .../tools/testExcludeRelationshipFirst.xml.sql  |  37 +
 .../cayenne/dbsync/merge/DataMapMerger.java |   2 +-
 .../dbsync/merge/DbRelationshipDictionary.java  |  31 +++-
 .../dbsync/merge/DbRelationshipMerger.java  |   9 +-
 .../reverse/dbimport/ExcludeRelationship.java   |  34 +
 .../reverse/dbimport/FilterContainer.java   |  26 +++-
 .../dbsync/reverse/dbimport/IncludeTable.java   |  29 
 .../reverse/dbload/RelationshipLoader.java  |  39 ++---
 .../reverse/filters/FiltersConfigBuilder.java   |  63 +++-
 .../cayenne/tools/model/FilterContainer.java|  20 +++
 .../cayenne/tools/model/IncludeTable.java   |  21 +++
 .../cayenne/tools/model/PatternParam.java   |   7 +
 .../org/apache/cayenne/tools/DbImportIT.java|  20 +++
 .../cayenne/tools/model/IncludeTableTest.java   |  12 ++
 .../cayenne/tools/dbimport_excludeRel.gradle|  43 ++
 .../apache/cayenne/tools/exclude_Table.map.xml  |  44 ++
 .../org/apache/cayenne/tools/exclude_Table.sql  |  40 ++
 docs/doc/src/main/resources/RELEASE-NOTES.txt   |   1 +
 docs/doc/src/main/resources/UPGRADE.txt |   2 +
 .../cayenne/tools/DbImporterMojoTest.java   |  10 ++
 .../dbimport/testExcludeRelationship-pom.xml|  55 +++
 .../dbimport/testExcludeRelationship.map.xml| 142 +++
 .../testExcludeRelationship.map.xml-result  | 138 ++
 .../tools/dbimport/testExcludeRelationship.sql  | 105 ++
 .../testExcludeRelationshipFirst-pom.xml|  49 +++
 .../testExcludeRelationshipFirst.map.xml-result |  40 ++
 .../dbimport/testExcludeRelationshipFirst.sql   |  37 +
 31 files changed, 1127 insertions(+), 56 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cayenne/blob/3fa68189/docs/doc/src/main/resources/RELEASE-NOTES.txt
--
diff --cc docs/doc/src/main/resources/RELEASE-NOTES.txt
index cb8b27c,67e3e02..053c8f7
--- a/docs/doc/src/main/resources/RELEASE-NOTES.txt
+++ b/docs/doc/src/main/resources/RELEASE-NOTES.txt
@@@ -15,7 -15,7 +15,8 @@@ Changes/New Features
  
  CAY-2372 Extract new modules from cayenne-server
  CAY-2377 Cleanup deprecated code.
+ CAY-2391 Add excludeRelationship in dbImport
 +CAY-2393 Add sqlserver-docker profile to automate tests on SQLServer
  
  Bug Fixes:
  

[4/5] cayenne git commit: CAY-2395 cdbimport: add option to skip user-defined relationships minor cleanup

[ntimofeev]

CAY-2395 cdbimport: add option to skip user-defined relationships
  minor cleanup


Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/8d66f55b
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/8d66f55b
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/8d66f55b

Branch: refs/heads/master
Commit: 8d66f55b4ef919ca1ad937d43b535011c7dbf5c8
Parents: 3fa6818
Author: Nikita Timofeev 
Authored: Fri Jan 19 15:23:55 2018 +0300
Committer: Nikita Timofeev 
Committed: Fri Jan 19 15:23:55 2018 +0300

--
 .../cayenne/dbsync/reverse/dbimport/FilterContainer.java   | 2 +-
 .../cayenne/dbsync/reverse/filters/FiltersConfigBuilder.java   | 6 +++---
 docs/doc/src/main/resources/RELEASE-NOTES.txt  | 2 +-
 docs/doc/src/main/resources/UPGRADE.txt| 2 --
 4 files changed, 5 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cayenne/blob/8d66f55b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbimport/FilterContainer.java
--
diff --git 
a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbimport/FilterContainer.java
 
b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbimport/FilterContainer.java
index f548863..552b6e7 100644
--- 
a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbimport/FilterContainer.java
+++ 
b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbimport/FilterContainer.java
@@ -132,7 +132,7 @@ public abstract class FilterContainer {
 /**
  * @since 4.1
  */
-public void clearExcludeRelationship() {
+public void clearExcludeRelationships() {
 excludeRelationshipCollection.clear();
 }
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/8d66f55b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/filters/FiltersConfigBuilder.java
--
diff --git 
a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/filters/FiltersConfigBuilder.java
 
b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/filters/FiltersConfigBuilder.java
index 73e938a..dbc2111 100644
--- 
a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/filters/FiltersConfigBuilder.java
+++ 
b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/filters/FiltersConfigBuilder.java
@@ -343,12 +343,12 @@ public final class FiltersConfigBuilder {
 catalog.clearExcludeProcedures();
 catalog.clearIncludeColumns();
 catalog.clearExcludeColumns();
-catalog.clearExcludeRelationship();
+catalog.clearExcludeRelationships();
 
 for (Schema schema : catalog.getSchemas()) {
 schema.clearIncludeColumns();
 schema.clearExcludeColumns();
-schema.clearExcludeRelationship();
+schema.clearExcludeRelationships();
 }
 }
 
@@ -358,7 +358,7 @@ public final class FiltersConfigBuilder {
 engineering.clearExcludeProcedures();
 engineering.clearIncludeColumns();
 engineering.clearExcludeColumns();
-engineering.clearExcludeRelationship();
+engineering.clearExcludeRelationships();
 
 engineering.getSchemas().clear();
 }

http://git-wip-us.apache.org/repos/asf/cayenne/blob/8d66f55b/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 053c8f7..f64ec84 100644
--- a/docs/doc/src/main/resources/RELEASE-NOTES.txt
+++ b/docs/doc/src/main/resources/RELEASE-NOTES.txt
@@ -15,7 +15,7 @@ Changes/New Features:
 
 CAY-2372 Extract new modules from cayenne-server
 CAY-2377 Cleanup deprecated code.
-CAY-2391 Add excludeRelationship in dbImport
+CAY-2391 cdbimport: add option to skip user-defined relationships
 CAY-2393 Add sqlserver-docker profile to automate tests on SQLServer
 
 Bug Fixes:

http://git-wip-us.apache.org/repos/asf/cayenne/blob/8d66f55b/docs/doc/src/main/resources/UPGRADE.txt
--
diff --git a/docs/doc/src/main/resources/UPGRADE.txt 
b/docs/doc/src/main/resources/UPGRADE.txt
index 3086988..0c9fc00 100644
--- a/docs/doc/src/main/resources/UPGRADE.txt
+++ b/docs/doc/src/main/resources/UPGRADE.txt
@@ -16,8 +16,6 @@ UPGRADING TO 4.1.M2
 - cayenne-osgi module contains OSGi related functionality.
 - cayenne-rop-server ROP server part.
 
-* Per CAY-2391 added new excludeRelationship option in dbImport.
-
 UPGRADING TO 4.1.M1
 
 * 

[1/5] cayenne git commit: CAY-2391 add excludeRelationship to dbImport

[ntimofeev]

Repository: cayenne
Updated Branches:
  refs/heads/master 1e8ed89f9 -> 84687a787


CAY-2391 add  excludeRelationship to dbImport


Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/66af8b36
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/66af8b36
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/66af8b36

Branch: refs/heads/master
Commit: 66af8b36f9a4881ecf6b5896e7ce862cccd365db
Parents: e0b9ebe
Author: Arseni Bulatski 
Authored: Fri Jan 12 12:10:27 2018 +0300
Committer: Arseni Bulatski 
Committed: Mon Jan 15 14:01:52 2018 +0300

--
 .../apache/cayenne/tools/DbImporterTask.java|  10 +-
 .../cayenne/tools/DbImporterTaskTest.java   |  39 ++---
 .../testExcludeRelationshipFirst.map.xml-result |  40 ++
 .../tools/testExcludeRelationshipFirst.xml  |  38 +
 .../tools/testExcludeRelationshipFirst.xml.sql  |  37 +
 .../cayenne/dbsync/merge/DataMapMerger.java |   2 +-
 .../dbsync/merge/DbRelationshipDictionary.java  |  31 +++-
 .../dbsync/merge/DbRelationshipMerger.java  |   9 +-
 .../reverse/dbimport/ExcludeRelationship.java   |  34 +
 .../reverse/dbimport/FilterContainer.java   |  26 +++-
 .../dbsync/reverse/dbimport/IncludeTable.java   |  29 
 .../reverse/dbload/RelationshipLoader.java  |  39 ++---
 .../reverse/filters/FiltersConfigBuilder.java   |  63 +++-
 .../cayenne/tools/model/FilterContainer.java|  20 +++
 .../cayenne/tools/model/IncludeTable.java   |  21 +++
 .../cayenne/tools/model/PatternParam.java   |   7 +
 .../org/apache/cayenne/tools/DbImportIT.java|  20 +++
 .../cayenne/tools/model/IncludeTableTest.java   |  12 ++
 .../cayenne/tools/dbimport_excludeRel.gradle|  43 ++
 .../apache/cayenne/tools/exclude_Table.map.xml  |  44 ++
 .../org/apache/cayenne/tools/exclude_Table.sql  |  40 ++
 docs/doc/src/main/resources/RELEASE-NOTES.txt   |   1 +
 docs/doc/src/main/resources/UPGRADE.txt |   2 +
 .../cayenne/tools/DbImporterMojoTest.java   |  10 ++
 .../dbimport/testExcludeRelationship-pom.xml|  55 +++
 .../dbimport/testExcludeRelationship.map.xml| 142 +++
 .../testExcludeRelationship.map.xml-result  | 138 ++
 .../tools/dbimport/testExcludeRelationship.sql  | 105 ++
 .../testExcludeRelationshipFirst-pom.xml|  49 +++
 .../testExcludeRelationshipFirst.map.xml-result |  40 ++
 .../dbimport/testExcludeRelationshipFirst.sql   |  37 +
 31 files changed, 1127 insertions(+), 56 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cayenne/blob/66af8b36/cayenne-ant/src/main/java/org/apache/cayenne/tools/DbImporterTask.java
--
diff --git 
a/cayenne-ant/src/main/java/org/apache/cayenne/tools/DbImporterTask.java 
b/cayenne-ant/src/main/java/org/apache/cayenne/tools/DbImporterTask.java
index 8ab949f..5d22173 100644
--- a/cayenne-ant/src/main/java/org/apache/cayenne/tools/DbImporterTask.java
+++ b/cayenne-ant/src/main/java/org/apache/cayenne/tools/DbImporterTask.java
@@ -24,11 +24,12 @@ import 
org.apache.cayenne.dbsync.naming.DefaultObjectNameGenerator;
 import org.apache.cayenne.dbsync.reverse.configuration.ToolsModule;
 import org.apache.cayenne.dbsync.reverse.dbimport.Catalog;
 import org.apache.cayenne.dbsync.reverse.dbimport.DbImportAction;
-import 
org.apache.cayenne.dbsync.reverse.dbimport.DbImportConfigurationValidator;
 import org.apache.cayenne.dbsync.reverse.dbimport.DbImportConfiguration;
+import 
org.apache.cayenne.dbsync.reverse.dbimport.DbImportConfigurationValidator;
 import org.apache.cayenne.dbsync.reverse.dbimport.DbImportModule;
 import org.apache.cayenne.dbsync.reverse.dbimport.ExcludeColumn;
 import org.apache.cayenne.dbsync.reverse.dbimport.ExcludeProcedure;
+import org.apache.cayenne.dbsync.reverse.dbimport.ExcludeRelationship;
 import org.apache.cayenne.dbsync.reverse.dbimport.ExcludeTable;
 import org.apache.cayenne.dbsync.reverse.dbimport.IncludeColumn;
 import org.apache.cayenne.dbsync.reverse.dbimport.IncludeProcedure;
@@ -77,6 +78,13 @@ public class DbImporterTask extends Task {
 reverseEngineering.addExcludeTable(excludeTable);
 }
 
+/**
+ * @since 4.1
+ */
+public void addExcludeRelationship(ExcludeRelationship 
excludeRelationship){
+reverseEngineering.addExcludeRelationship(excludeRelationship);
+}
+
 public void addIncludeProcedure(IncludeProcedure includeProcedure) {
 reverseEngineering.addIncludeProcedure(includeProcedure);
 }

http://git-wip-us.apache.org/repos/asf/cayenne/blob/66af8b36/cayenne-ant/src/test/java/org/apache/cayenne/tools/DbImporterTaskTest.java

[jira] [Updated] (CAY-2391) cdbimport: add option to skip user-defined relationships

[Nikita Timofeev (JIRA)]

 [ 
https://issues.apache.org/jira/browse/CAY-2391?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Nikita Timofeev updated CAY-2391:
-
Summary: cdbimport: add option to skip user-defined relationships  (was: 
cdbimport need option to skip user-defined relationships)

> cdbimport: add option to skip user-defined relationships
> 
>
> Key: CAY-2391
> URL: https://issues.apache.org/jira/browse/CAY-2391
> Project: Cayenne
>  Issue Type: Improvement
>  Components: Non-GUI Tools
>Reporter: Nikita Timofeev
>Assignee: Nikita Timofeev
>Priority: Major
>  Labels: pull-request-available
> Fix For: 4.1.M2
>
>
> There is a problem in {{cdbimport}} tool when user define relationships that 
> are not backed by foreign key in DB. This may be required to link table with 
> view or just in case some DB-related optimizations. Currently there is no 
> option to keep this relationships, as they will be deleted by next 
> {{cdbimport}} run.
> Workaround may be excluding all tables with this relationships or add 
> relationships at runtime.



--
This message was sent by Atlassian JIRA
(v7.6.3#76005)

[jira] [Updated] (CAY-2395) cdbimport: add option to create project file

[Nikita Timofeev (JIRA)]

 [ 
https://issues.apache.org/jira/browse/CAY-2395?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Nikita Timofeev updated CAY-2395:
-
Description: 
*cdbimport* tools are already pretty advanced and stable, but you still need 
Modeler to create new project. It is really slows down start of new project, 
and moreover complicates new users transition into Cayenne world.

New option in *cbimport* config can be like this:
{code:xml}


${project.basedir}/src/main/resources/cayenne/cayenne-project.xml
${project.basedir}/src/main/resources/cayenne/datamap.map.xml




{code}
And the logic should be like this:
 * without {{cayenneProject}} option result will be same as now
 * if {{cayenneProject}} is set but no file exists it will be created and 
DataMap linked to it
 * it {{cayenneProject}} is and file already exists then DataMap should be 
linked to it (if it is new) or update existing one

  was:
*cdbimport* tools are already pretty advanced and stable, but you still need 
Modeler to create new project. It is really slows down start of new project, 
and moreover complicates new users transition into Cayenne world.

New option in *cbimport* config can be like this:
{code:xml}


${project.basedir}/src/main/resources/cayenne/cayenne-project.xml




{code}
And the logic should be like this:
 * without {{cayenneProject}} option result will be same as now
 * if {{cayenneProject}} is set but no file exists it will be created and 
DataMap linked to it
 * it {{cayenneProject}} is and file already exists then DataMap should be 
linked to it (if it is new) or update existing one


> cdbimport: add option to create project file
> 
>
> Key: CAY-2395
> URL: https://issues.apache.org/jira/browse/CAY-2395
> Project: Cayenne
>  Issue Type: Improvement
>  Components: Non-GUI Tools
>Reporter: Nikita Timofeev
>Assignee: Nikita Timofeev
>Priority: Major
> Fix For: 4.1.M2
>
>
> *cdbimport* tools are already pretty advanced and stable, but you still need 
> Modeler to create new project. It is really slows down start of new project, 
> and moreover complicates new users transition into Cayenne world.
> New option in *cbimport* config can be like this:
> {code:xml}
> 
> 
> ${project.basedir}/src/main/resources/cayenne/cayenne-project.xml
> ${project.basedir}/src/main/resources/cayenne/datamap.map.xml
> 
> 
> 
> 
> {code}
> And the logic should be like this:
>  * without {{cayenneProject}} option result will be same as now
>  * if {{cayenneProject}} is set but no file exists it will be created and 
> DataMap linked to it
>  * it {{cayenneProject}} is and file already exists then DataMap should be 
> linked to it (if it is new) or update existing one



--
This message was sent by Atlassian JIRA
(v7.6.3#76005)

[jira] [Updated] (CAY-2395) cdbimport: add option to create project file

[Nikita Timofeev (JIRA)]

 [ 
https://issues.apache.org/jira/browse/CAY-2395?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Nikita Timofeev updated CAY-2395:
-
Description: 
*cdbimport* tools are already pretty advanced and stable, but you still need 
Modeler to create new project. It is really slows down start of new project, 
and moreover complicates new users transition into Cayenne world.

New option in *cbimport* config can be like this:
{code:xml}


${project.basedir}/src/main/resources/cayenne/cayenne-project.xml




{code}
And the logic should be like this:
 * without {{cayenneProject}} option result will be same as now
 * if {{cayenneProject}} is set but no file exists it will be created and 
DataMap linked to it
 * it {{cayenneProject}} is and file already exists then DataMap should be 
linked to it (if it is new) or update existing one

  was:
*cdbimport* tools are already pretty advanced and stable, but you still need 
Modeler to create new project. It is really slows down start of new project, 
and moreover complicates new users transition into Cayenne world.

New option in *cbimport* config can be like this:

{code:xml}



${project.basedir}/src/main/resources/cayenne/cayenne-project.xml


{code}

And the logic should be like this:
* without {{cayenneProject}} option result will be same as now
* if {{cayenneProject}} is set but no file exists it will be created and 
DataMap linked to it
* it {{cayenneProject}} is and file already exists then DataMap should be 
linked to it (if it is new) or update existing one



> cdbimport: add option to create project file
> 
>
> Key: CAY-2395
> URL: https://issues.apache.org/jira/browse/CAY-2395
> Project: Cayenne
>  Issue Type: Improvement
>  Components: Non-GUI Tools
>Reporter: Nikita Timofeev
>Assignee: Nikita Timofeev
>Priority: Major
> Fix For: 4.1.M2
>
>
> *cdbimport* tools are already pretty advanced and stable, but you still need 
> Modeler to create new project. It is really slows down start of new project, 
> and moreover complicates new users transition into Cayenne world.
> New option in *cbimport* config can be like this:
> {code:xml}
> 
> 
> ${project.basedir}/src/main/resources/cayenne/cayenne-project.xml
> 
> 
> 
> 
> {code}
> And the logic should be like this:
>  * without {{cayenneProject}} option result will be same as now
>  * if {{cayenneProject}} is set but no file exists it will be created and 
> DataMap linked to it
>  * it {{cayenneProject}} is and file already exists then DataMap should be 
> linked to it (if it is new) or update existing one



--
This message was sent by Atlassian JIRA
(v7.6.3#76005)

Jenkins build is back to normal : Cayenne pull requests #381

[Apache Jenkins Server]

See 

[GitHub] cayenne pull request #257: Added sqlserver-docker profile to tests on SQLSer...

[MegaPapa]

GitHub user MegaPapa opened a pull request:

https://github.com/apache/cayenne/pull/257

Added sqlserver-docker profile to tests on SQLServer



You can merge this pull request into a Git repository by running:

$ git pull https://github.com/MegaPapa/cayenne STABLE-4.0

Alternatively you can review and apply these changes as the patch at:

https://github.com/apache/cayenne/pull/257.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

This closes #257


commit 355701246e7f9765c24c0f86ae3c93297cb0b49d
Author: Maxim Petrusevich 
Date:   2018-01-19T10:40:28Z

Added sqlserver-docker profile to tests on SQLServer




---

[jira] [Created] (CAY-2395) cdbimport: add option to create project file

[Nikita Timofeev (JIRA)]

Nikita Timofeev created CAY-2395:


 Summary: cdbimport: add option to create project file
 Key: CAY-2395
 URL: https://issues.apache.org/jira/browse/CAY-2395
 Project: Cayenne
  Issue Type: Improvement
  Components: Non-GUI Tools
Reporter: Nikita Timofeev
Assignee: Nikita Timofeev
 Fix For: 4.1.M2


*cdbimport* tools are already pretty advanced and stable, but you still need 
Modeler to create new project. It is really slows down start of new project, 
and moreover complicates new users transition into Cayenne world.

New option in *cbimport* config can be like this:

{code:xml}



${project.basedir}/src/main/resources/cayenne/cayenne-project.xml


{code}

And the logic should be like this:
* without {{cayenneProject}} option result will be same as now
* if {{cayenneProject}} is set but no file exists it will be created and 
DataMap linked to it
* it {{cayenneProject}} is and file already exists then DataMap should be 
linked to it (if it is new) or update existing one




--
This message was sent by Atlassian JIRA
(v7.6.3#76005)

[jira] [Commented] (CAY-2392) Modeler: Unable to remove DataNode

[ASF GitHub Bot (JIRA)]

[ 
https://issues.apache.org/jira/browse/CAY-2392?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16331999#comment-16331999
 ] 

ASF GitHub Bot commented on CAY-2392:
-

GitHub user aarrsseni opened a pull request:

https://github.com/apache/cayenne/pull/256

CAY-2392



You can merge this pull request into a Git repository by running:

$ git pull https://github.com/aarrsseni/cayenne CAY-2392_4.0

Alternatively you can review and apply these changes as the patch at:

https://github.com/apache/cayenne/pull/256.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

This closes #256


commit 5adcec965bd47168d9486d1999cf33ad39242acd
Author: Arseni Bulatski 
Date:   2018-01-19T09:31:41Z

CAY-2392




> Modeler: Unable to remove DataNode
> --
>
> Key: CAY-2392
> URL: https://issues.apache.org/jira/browse/CAY-2392
> Project: Cayenne
>  Issue Type: Bug
>  Components: Modeler
>Affects Versions: 4.0.B2, 4.1.M1
>Reporter: Nikita Timofeev
>Assignee: Nikita Timofeev
>Priority: Minor
>  Labels: pull-request-available
> Fix For: 4.0.B3, 4.1.M2
>
>
> Not sure why it's not allowed initially, but there are some cases when you 
> want to remove data node from project and for that you should edit project 
> XML directly (e.g. you often want to define connection properties in runtime, 
> or create you own synthetic data node).
> So we can just allow that from the Modeler.



--
This message was sent by Atlassian JIRA
(v7.6.3#76005)

Build failed in Jenkins: Cayenne pull requests #380

[Apache Jenkins Server]

See 


--
GitHub pull request #256 to apache/cayenne
[EnvInject] - Loading node environment variables.
Building remotely on H15 (Hadoop xenial) in workspace 

 > git rev-parse --is-inside-work-tree # timeout=10
Fetching changes from the remote Git repository
 > git config remote.origin.url git://github.com/apache/cayenne.git # timeout=10
Fetching upstream changes from git://github.com/apache/cayenne.git
 > git --version # timeout=10
 > git fetch --tags --progress git://github.com/apache/cayenne.git 
 > +refs/heads/*:refs/remotes/origin/*
 > git config core.sparsecheckout # timeout=10
 > git checkout -f origin/STABLE-4.0
 > git branch -a -v --no-abbrev # timeout=10
 > git checkout -b STABLE-4.0 origin/STABLE-4.0
  Opening connection
Done: 0
  Counting objects
Done: 368
  Finding sources
Done: 368
  Getting sizes
Done: 275
  Compressing objects
Done: 549055
  Writing objects
Done: 368
  remote: Resolving deltas
  remote: Updating references
Merging refs/tags/changes/380
 > git rev-parse refs/tags/changes/380^{commit} # timeout=10
 > git merge 5adcec965bd47168d9486d1999cf33ad39242acd # timeout=10
FATAL: Command "git merge 5adcec965bd47168d9486d1999cf33ad39242acd" returned 
status code 1:
stdout: Auto-merging docs/doc/src/main/resources/RELEASE-NOTES.txt
CONFLICT (content): Merge conflict in 
docs/doc/src/main/resources/RELEASE-NOTES.txt
Automatic merge failed; fix conflicts and then commit the result.

stderr: 
Also:   hudson.remoting.Channel$CallSiteStackTrace: Remote call to H15
at 
hudson.remoting.Channel.attachCallSiteStackTrace(Channel.java:1693)
at hudson.remoting.UserResponse.retrieve(UserRequest.java:310)
at hudson.remoting.Channel.call(Channel.java:908)
at 
hudson.remoting.RemoteInvocationHandler.invoke(RemoteInvocationHandler.java:281)
at com.sun.proxy.$Proxy110.merge(Unknown Source)
at 
org.jenkinsci.plugins.gitclient.RemoteGitImpl.merge(RemoteGitImpl.java:435)
at 
com.cloudbees.jenkins.plugins.git.vmerge.BuildChooserImpl.getCandidateRevisions(BuildChooserImpl.java:107)
at 
hudson.plugins.git.GitSCM.determineRevisionToBuild(GitSCM.java:1017)
at hudson.plugins.git.GitSCM.checkout(GitSCM.java:1124)
at hudson.scm.SCM.checkout(SCM.java:495)
at 
hudson.model.AbstractProject.checkout(AbstractProject.java:1202)
at 
hudson.model.AbstractBuild$AbstractBuildExecution.defaultCheckout(AbstractBuild.java:574)
at 
jenkins.scm.SCMCheckoutStrategy.checkout(SCMCheckoutStrategy.java:86)
at 
hudson.model.AbstractBuild$AbstractBuildExecution.run(AbstractBuild.java:499)
at hudson.model.Run.execute(Run.java:1724)
at 
hudson.maven.MavenModuleSetBuild.run(MavenModuleSetBuild.java:543)
at 
hudson.model.ResourceController.execute(ResourceController.java:97)
at hudson.model.Executor.run(Executor.java:421)
hudson.plugins.git.GitException: Command "git merge 
5adcec965bd47168d9486d1999cf33ad39242acd" returned status code 1:
stdout: Auto-merging docs/doc/src/main/resources/RELEASE-NOTES.txt
CONFLICT (content): Merge conflict in 
docs/doc/src/main/resources/RELEASE-NOTES.txt
Automatic merge failed; fix conflicts and then commit the result.

stderr: 
at 
org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1970)
at 
org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1938)
at 
org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1934)
at 
org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommand(CliGitAPIImpl.java:1572)
at 
org.jenkinsci.plugins.gitclient.CliGitAPIImpl$3.execute(CliGitAPIImpl.java:672)
at 
org.jenkinsci.plugins.gitclient.AbstractGitAPIImpl.merge(AbstractGitAPIImpl.java:86)
at 
org.jenkinsci.plugins.gitclient.CliGitAPIImpl.merge(CliGitAPIImpl.java:71)
at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at 
sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
at 
sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
at java.lang.reflect.Method.invoke(Method.java:498)
at 
hudson.remoting.RemoteInvocationHandler$RPCRequest.perform(RemoteInvocationHandler.java:922)
at 
hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:896)
at 
hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:853)
at hudson.remoting.UserRequest.perform(UserRequest.java:207)
at 

[GitHub] cayenne pull request #256: CAY-2392

[aarrsseni]

GitHub user aarrsseni opened a pull request:

https://github.com/apache/cayenne/pull/256

CAY-2392



You can merge this pull request into a Git repository by running:

$ git pull https://github.com/aarrsseni/cayenne CAY-2392_4.0

Alternatively you can review and apply these changes as the patch at:

https://github.com/apache/cayenne/pull/256.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

This closes #256


commit 5adcec965bd47168d9486d1999cf33ad39242acd
Author: Arseni Bulatski 
Date:   2018-01-19T09:31:41Z

CAY-2392




---

Build failed in Jenkins: Cayenne pull requests #379

[Apache Jenkins Server]

See 


--
GitHub pull request #255 to apache/cayenne
[EnvInject] - Loading node environment variables.
Building remotely on H15 (Hadoop xenial) in workspace 

 > git rev-parse --is-inside-work-tree # timeout=10
Fetching changes from the remote Git repository
 > git config remote.origin.url git://github.com/apache/cayenne.git # timeout=10
Fetching upstream changes from git://github.com/apache/cayenne.git
 > git --version # timeout=10
 > git fetch --tags --progress git://github.com/apache/cayenne.git 
 > +refs/heads/*:refs/remotes/origin/*
 > git config core.sparsecheckout # timeout=10
 > git checkout -f origin/master
 > git branch -a -v --no-abbrev # timeout=10
 > git branch -D master # timeout=10
 > git checkout -b master origin/master
  Opening connection
Done: 0
  Counting objects
Done: 86
  Finding sources
Done: 86
  Getting sizes
Done: 85
  Compressing objects
Done: 209347
  Writing objects
Done: 86
  remote: Resolving deltas
  remote: Updating references
Merging refs/tags/changes/379
 > git rev-parse refs/tags/changes/379^{commit} # timeout=10
 > git merge a37df6b2dae6102c48ef50f73e0a6265080be5ec # timeout=10
FATAL: Command "git merge a37df6b2dae6102c48ef50f73e0a6265080be5ec" returned 
status code 1:
stdout: Auto-merging pom.xml
Auto-merging docs/doc/src/main/resources/RELEASE-NOTES.txt
CONFLICT (content): Merge conflict in 
docs/doc/src/main/resources/RELEASE-NOTES.txt
Removing 
cayenne-velocity/src/test/java/org/apache/cayenne/velocity/SQLTemplateResourceManagerTest.java
Automatic merge failed; fix conflicts and then commit the result.

stderr: 
Also:   hudson.remoting.Channel$CallSiteStackTrace: Remote call to H15
at 
hudson.remoting.Channel.attachCallSiteStackTrace(Channel.java:1693)
at hudson.remoting.UserResponse.retrieve(UserRequest.java:310)
at hudson.remoting.Channel.call(Channel.java:908)
at 
hudson.remoting.RemoteInvocationHandler.invoke(RemoteInvocationHandler.java:281)
at com.sun.proxy.$Proxy110.merge(Unknown Source)
at 
org.jenkinsci.plugins.gitclient.RemoteGitImpl.merge(RemoteGitImpl.java:435)
at 
com.cloudbees.jenkins.plugins.git.vmerge.BuildChooserImpl.getCandidateRevisions(BuildChooserImpl.java:107)
at 
hudson.plugins.git.GitSCM.determineRevisionToBuild(GitSCM.java:1017)
at hudson.plugins.git.GitSCM.checkout(GitSCM.java:1124)
at hudson.scm.SCM.checkout(SCM.java:495)
at 
hudson.model.AbstractProject.checkout(AbstractProject.java:1202)
at 
hudson.model.AbstractBuild$AbstractBuildExecution.defaultCheckout(AbstractBuild.java:574)
at 
jenkins.scm.SCMCheckoutStrategy.checkout(SCMCheckoutStrategy.java:86)
at 
hudson.model.AbstractBuild$AbstractBuildExecution.run(AbstractBuild.java:499)
at hudson.model.Run.execute(Run.java:1724)
at 
hudson.maven.MavenModuleSetBuild.run(MavenModuleSetBuild.java:543)
at 
hudson.model.ResourceController.execute(ResourceController.java:97)
at hudson.model.Executor.run(Executor.java:421)
hudson.plugins.git.GitException: Command "git merge 
a37df6b2dae6102c48ef50f73e0a6265080be5ec" returned status code 1:
stdout: Auto-merging pom.xml
Auto-merging docs/doc/src/main/resources/RELEASE-NOTES.txt
CONFLICT (content): Merge conflict in 
docs/doc/src/main/resources/RELEASE-NOTES.txt
Removing 
cayenne-velocity/src/test/java/org/apache/cayenne/velocity/SQLTemplateResourceManagerTest.java
Automatic merge failed; fix conflicts and then commit the result.

stderr: 
at 
org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1970)
at 
org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1938)
at 
org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1934)
at 
org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommand(CliGitAPIImpl.java:1572)
at 
org.jenkinsci.plugins.gitclient.CliGitAPIImpl$3.execute(CliGitAPIImpl.java:672)
at 
org.jenkinsci.plugins.gitclient.AbstractGitAPIImpl.merge(AbstractGitAPIImpl.java:86)
at 
org.jenkinsci.plugins.gitclient.CliGitAPIImpl.merge(CliGitAPIImpl.java:71)
at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at 
sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
at 
sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
at java.lang.reflect.Method.invoke(Method.java:498)
at 
hudson.remoting.RemoteInvocationHandler$RPCRequest.perform(RemoteInvocationHandler.java:922)
at 

[GitHub] cayenne pull request #255: CAY-2394 Velocity 2.0 upgrade

[aarrsseni]

GitHub user aarrsseni opened a pull request:

https://github.com/apache/cayenne/pull/255

CAY-2394 Velocity 2.0 upgrade



You can merge this pull request into a Git repository by running:

$ git pull https://github.com/aarrsseni/cayenne CAY-2394

Alternatively you can review and apply these changes as the patch at:

https://github.com/apache/cayenne/pull/255.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

This closes #255


commit a37df6b2dae6102c48ef50f73e0a6265080be5ec
Author: Arseni Bulatski 
Date:   2018-01-17T07:34:54Z

CAY-2394 Velocity 2.0 upgrade




---

[jira] [Updated] (CAY-2394) Upgrade cayenne to Velocity 2.0

[ASF GitHub Bot (JIRA)]

 [ 
https://issues.apache.org/jira/browse/CAY-2394?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

ASF GitHub Bot updated CAY-2394:

Labels: pull-request-available  (was: )

> Upgrade cayenne to Velocity 2.0
> ---
>
> Key: CAY-2394
> URL: https://issues.apache.org/jira/browse/CAY-2394
> Project: Cayenne
>  Issue Type: Task
>Reporter: Arseni Bulatski
>Priority: Minor
>  Labels: pull-request-available
> Fix For: 4.1.M2
>
>
> Upgrade cayenne-cgen and cayenne-velocity to velocity 2.0



--
This message was sent by Atlassian JIRA
(v7.6.3#76005)