Repository: cxf-fediz Updated Branches: refs/heads/master 14d45f4f5 -> c62cc4835
FEDIZ-201 - Spring3 plugin does not include jars in the distribution Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/c62cc483 Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/c62cc483 Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/c62cc483 Branch: refs/heads/master Commit: c62cc48352fde6a8f1c671fdd730271e5a821299 Parents: 14d45f4 Author: Colm O hEigeartaigh <[email protected]> Authored: Wed May 10 13:21:13 2017 +0100 Committer: Colm O hEigeartaigh <[email protected]> Committed: Wed May 10 13:21:13 2017 +0100 ---------------------------------------------------------------------- apache-fediz/pom.xml | 5 +++++ apache-fediz/src/assembly/bin.xml | 26 +++++++++++++++++++++++++- 2 files changed, 30 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/c62cc483/apache-fediz/pom.xml ---------------------------------------------------------------------- diff --git a/apache-fediz/pom.xml b/apache-fediz/pom.xml index 253aed9..327c4ce 100644 --- a/apache-fediz/pom.xml +++ b/apache-fediz/pom.xml @@ -89,6 +89,11 @@ </dependency> <dependency> <groupId>org.apache.cxf.fediz</groupId> + <artifactId>fediz-spring3</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.cxf.fediz</groupId> <artifactId>fediz-cxf</artifactId> <version>${project.version}</version> </dependency> http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/c62cc483/apache-fediz/src/assembly/bin.xml ---------------------------------------------------------------------- diff --git a/apache-fediz/src/assembly/bin.xml b/apache-fediz/src/assembly/bin.xml index ae6880f..4d05ce5 100644 --- a/apache-fediz/src/assembly/bin.xml +++ b/apache-fediz/src/assembly/bin.xml @@ -135,6 +135,7 @@ <exclude>org.apache.cxf.fediz:fediz-cxf</exclude> <exclude>org.apache.cxf.fediz:fediz-spring</exclude> <exclude>org.apache.cxf.fediz:fediz-spring2</exclude> + <exclude>org.apache.cxf.fediz:fediz-spring3</exclude> <exclude>org.apache.cxf.fediz:fediz-tomcat8</exclude> </excludes> <scope>runtime</scope> @@ -151,6 +152,7 @@ <exclude>org.apache.cxf.fediz:fediz-cxf</exclude> <exclude>org.apache.cxf.fediz:fediz-spring</exclude> <exclude>org.apache.cxf.fediz:fediz-spring2</exclude> + <exclude>org.apache.cxf.fediz:fediz-spring3</exclude> <exclude>org.apache.cxf.fediz:fediz-tomcat7</exclude> </excludes> <scope>runtime</scope> @@ -168,6 +170,7 @@ <exclude>org.apache.cxf.fediz:fediz-cxf</exclude> <exclude>org.apache.cxf.fediz:fediz-spring</exclude> <exclude>org.apache.cxf.fediz:fediz-spring2</exclude> + <exclude>org.apache.cxf.fediz:fediz-spring3</exclude> </excludes> <scope>runtime</scope> </dependencySet> @@ -184,6 +187,7 @@ <exclude>org.apache.cxf.fediz:fediz-cxf</exclude> <exclude>org.apache.cxf.fediz:fediz-spring</exclude> <exclude>org.apache.cxf.fediz:fediz-spring2</exclude> + <exclude>org.apache.cxf.fediz:fediz-spring3</exclude> </excludes> <scope>runtime</scope> </dependencySet> @@ -199,7 +203,25 @@ <exclude>org.apache.cxf.fediz:fediz-jetty8</exclude> <exclude>org.apache.cxf.fediz:fediz-jetty9</exclude> <exclude>org.apache.cxf.fediz:fediz-cxf</exclude> - <exclude>org.apache.cxf.fediz:fediz-spring2</exclude> + <exclude>org.apache.cxf.fediz:fediz-spring2:jar</exclude> + <exclude>org.apache.cxf.fediz:fediz-spring3:jar</exclude> + </excludes> + <scope>runtime</scope> + </dependencySet> + <dependencySet> + <outputDirectory>apache-fediz-${project.version}/plugins/spring3/lib</outputDirectory> + <unpack>false</unpack> + <useTransitiveFiltering>true</useTransitiveFiltering> + <excludes> + <exclude>org.apache.cxf.fediz:fediz-idp</exclude> + <exclude>org.apache.cxf.fediz:fediz-idp-sts</exclude> + <exclude>org.apache.cxf.fediz:fediz-tomcat7</exclude> + <exclude>org.apache.cxf.fediz:fediz-tomcat8</exclude> + <exclude>org.apache.cxf.fediz:fediz-jetty8</exclude> + <exclude>org.apache.cxf.fediz:fediz-jetty9</exclude> + <exclude>org.apache.cxf.fediz:fediz-cxf</exclude> + <exclude>org.apache.cxf.fediz:fediz-spring:jar</exclude> + <exclude>org.apache.cxf.fediz:fediz-spring2:jar</exclude> </excludes> <scope>runtime</scope> </dependencySet> @@ -216,6 +238,7 @@ <exclude>org.apache.cxf.fediz:fediz-jetty9</exclude> <exclude>org.apache.cxf.fediz:fediz-cxf</exclude> <exclude>org.apache.cxf.fediz:fediz-spring:jar</exclude> + <exclude>org.apache.cxf.fediz:fediz-spring3:jar</exclude> </excludes> <scope>runtime</scope> </dependencySet> @@ -232,6 +255,7 @@ <exclude>org.apache.cxf.fediz:fediz-jetty9</exclude> <exclude>org.apache.cxf.fediz:fediz-spring</exclude> <exclude>org.apache.cxf.fediz:fediz-spring2</exclude> + <exclude>org.apache.cxf.fediz:fediz-spring3</exclude> </excludes> <scope>runtime</scope> </dependencySet>
