replace java8 profile with a direct dependency in the assembly
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/f8a8a67e Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/f8a8a67e Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/f8a8a67e Branch: refs/heads/master Commit: f8a8a67ec6da4cfe92ad63a4a553b29a3799b54c Parents: 2c35baf Author: Savva Kolbachev <s.kolbac...@gmail.com> Authored: Mon Feb 8 17:25:49 2016 +0300 Committer: Savva Kolbachev <s.kolbac...@gmail.com> Committed: Mon Feb 15 19:04:06 2016 +0300 ---------------------------------------------------------------------- assembly/pom.xml | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cayenne/blob/f8a8a67e/assembly/pom.xml ---------------------------------------------------------------------- diff --git a/assembly/pom.xml b/assembly/pom.xml index ca14fbb..3411a81 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -72,6 +72,12 @@ <version>${project.version}</version> </dependency> + <dependency> + <groupId>org.apache.cayenne</groupId> + <artifactId>cayenne-java8</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> <groupId>org.apache.cayenne</groupId> <artifactId>cayenne-dbcp2</artifactId> @@ -341,20 +347,5 @@ </plugins> </build> </profile> - - <profile> - <!-- Java8 assembly (can only be run on Java8 and higher) --> - <id>java8</id> - <activation> - <jdk>[1.8,)</jdk> - </activation> - <dependencies> - <dependency> - <groupId>org.apache.cayenne</groupId> - <artifactId>cayenne-java8</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> - </profile> </profiles> </project>
