Repository: cayenne Updated Branches: refs/heads/master c21fc6896 -> 5502c691d
Include commons-lang into third-party dir Include class generation templates Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/5502c691 Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/5502c691 Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/5502c691 Branch: refs/heads/master Commit: 5502c691dfbd3dc533892e413c1d7f14a26b84de Parents: c21fc68 Author: Nikita Timofeev <stari...@gmail.com> Authored: Mon Feb 20 16:22:38 2017 +0300 Committer: Nikita Timofeev <stari...@gmail.com> Committed: Mon Feb 20 16:22:38 2017 +0300 ---------------------------------------------------------------------- assembly/src/main/resources/assemblies/assembly-generic.xml | 5 +++++ assembly/src/main/resources/assemblies/assembly-mac.xml | 5 +++++ assembly/src/main/resources/assemblies/assembly-windows.xml | 5 +++++ 3 files changed, 15 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cayenne/blob/5502c691/assembly/src/main/resources/assemblies/assembly-generic.xml ---------------------------------------------------------------------- diff --git a/assembly/src/main/resources/assemblies/assembly-generic.xml b/assembly/src/main/resources/assemblies/assembly-generic.xml index 679a2d2..ac3f98b 100644 --- a/assembly/src/main/resources/assemblies/assembly-generic.xml +++ b/assembly/src/main/resources/assemblies/assembly-generic.xml @@ -44,6 +44,10 @@ <exclude>**/.project</exclude> </excludes> </fileSet> + <fileSet> + <directory>../cayenne-cgen/src/main/resources/templates/v1_2</directory> + <outputDirectory>templates</outputDirectory> + </fileSet> </fileSets> <files> @@ -94,6 +98,7 @@ <includes> <include>commons-collections:commons-collections</include> <include>commons-logging:commons-logging</include> + <include>commons-lang:commons-lang</include> <include>org.apache.velocity:velocity</include> <include>foundrylogic.vpp:vpp</include> </includes> http://git-wip-us.apache.org/repos/asf/cayenne/blob/5502c691/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 d65e9ba..6b78adad 100644 --- a/assembly/src/main/resources/assemblies/assembly-mac.xml +++ b/assembly/src/main/resources/assemblies/assembly-mac.xml @@ -44,6 +44,10 @@ <exclude>**/.project</exclude> </excludes> </fileSet> + <fileSet> + <directory>../cayenne-cgen/src/main/resources/templates/v1_2</directory> + <outputDirectory>templates</outputDirectory> + </fileSet> </fileSets> <files> @@ -94,6 +98,7 @@ <includes> <include>commons-collections:commons-collections</include> <include>commons-logging:commons-logging</include> + <include>commons-lang:commons-lang</include> <include>org.apache.velocity:velocity</include> <include>foundrylogic.vpp:vpp</include> </includes> http://git-wip-us.apache.org/repos/asf/cayenne/blob/5502c691/assembly/src/main/resources/assemblies/assembly-windows.xml ---------------------------------------------------------------------- diff --git a/assembly/src/main/resources/assemblies/assembly-windows.xml b/assembly/src/main/resources/assemblies/assembly-windows.xml index 660ba58..563b9b3 100644 --- a/assembly/src/main/resources/assemblies/assembly-windows.xml +++ b/assembly/src/main/resources/assemblies/assembly-windows.xml @@ -44,6 +44,10 @@ <exclude>**/.project</exclude> </excludes> </fileSet> + <fileSet> + <directory>../cayenne-cgen/src/main/resources/templates/v1_2</directory> + <outputDirectory>templates</outputDirectory> + </fileSet> </fileSets> <files> @@ -94,6 +98,7 @@ <includes> <include>commons-collections:commons-collections</include> <include>commons-logging:commons-logging</include> + <include>commons-lang:commons-lang</include> <include>org.apache.velocity:velocity</include> <include>foundrylogic.vpp:vpp</include> </includes>
