Repository: cxf-fediz Updated Branches: refs/heads/master dd26b7a95 -> aec00b975
Fixing 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/f268ef29 Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/f268ef29 Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/f268ef29 Branch: refs/heads/master Commit: f268ef29b5bbcf9c0c15b4b03099782e1d8f7e89 Parents: dd26b7a Author: Colm O hEigeartaigh <[email protected]> Authored: Thu Sep 3 17:33:38 2015 +0100 Committer: Colm O hEigeartaigh <[email protected]> Committed: Thu Sep 3 17:33:38 2015 +0100 ---------------------------------------------------------------------- apache-fediz/pom.xml | 5 +++++ apache-fediz/src/assembly/bin.xml | 38 ++++++++++++++++++++++++++-------- 2 files changed, 34 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/f268ef29/apache-fediz/pom.xml ---------------------------------------------------------------------- diff --git a/apache-fediz/pom.xml b/apache-fediz/pom.xml index 66932bd..50f2167 100644 --- a/apache-fediz/pom.xml +++ b/apache-fediz/pom.xml @@ -57,6 +57,11 @@ </dependency> <dependency> <groupId>org.apache.cxf.fediz</groupId> + <artifactId>fediz-tomcat8</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.cxf.fediz</groupId> <artifactId>fediz-jetty8</artifactId> <version>${project.version}</version> </dependency> http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/f268ef29/apache-fediz/src/assembly/bin.xml ---------------------------------------------------------------------- diff --git a/apache-fediz/src/assembly/bin.xml b/apache-fediz/src/assembly/bin.xml index 925dca3..4a83e2a 100644 --- a/apache-fediz/src/assembly/bin.xml +++ b/apache-fediz/src/assembly/bin.xml @@ -119,21 +119,38 @@ <excludes> <exclude>org.apache.cxf.fediz:fediz-idp</exclude> <exclude>org.apache.cxf.fediz:fediz-idp-sts</exclude> - <exclude>org.apache.cxf.fediz:fediz-jetty</exclude> + <exclude>org.apache.cxf.fediz:fediz-jetty8</exclude> <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-tomcat8</exclude> </excludes> <scope>runtime</scope> </dependencySet> <dependencySet> - <outputDirectory>apache-fediz-${project.version}/plugins/jetty/lib</outputDirectory> + <outputDirectory>apache-fediz-${project.version}/plugins/tomcat8/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-tomcat</exclude> + <exclude>org.apache.cxf.fediz:fediz-jetty8</exclude> + <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-tomcat7</exclude> + </excludes> + <scope>runtime</scope> + </dependencySet> + <dependencySet> + <outputDirectory>apache-fediz-${project.version}/plugins/jetty8/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-cxf</exclude> <exclude>org.apache.cxf.fediz:fediz-spring</exclude> <exclude>org.apache.cxf.fediz:fediz-spring2</exclude> @@ -147,8 +164,9 @@ <excludes> <exclude>org.apache.cxf.fediz:fediz-idp</exclude> <exclude>org.apache.cxf.fediz:fediz-idp-sts</exclude> - <exclude>org.apache.cxf.fediz:fediz-tomcat</exclude> - <exclude>org.apache.cxf.fediz:fediz-jetty</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-cxf</exclude> <exclude>org.apache.cxf.fediz:fediz-spring2</exclude> </excludes> @@ -161,8 +179,9 @@ <excludes> <exclude>org.apache.cxf.fediz:fediz-idp</exclude> <exclude>org.apache.cxf.fediz:fediz-idp-sts</exclude> - <exclude>org.apache.cxf.fediz:fediz-tomcat</exclude> - <exclude>org.apache.cxf.fediz:fediz-jetty</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-cxf</exclude> <exclude>org.apache.cxf.fediz:fediz-spring:jar</exclude> </excludes> @@ -175,8 +194,9 @@ <excludes> <exclude>org.apache.cxf.fediz:fediz-idp</exclude> <exclude>org.apache.cxf.fediz:fediz-idp-sts</exclude> - <exclude>org.apache.cxf.fediz:fediz-tomcat</exclude> - <exclude>org.apache.cxf.fediz:fediz-jetty</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-spring</exclude> <exclude>org.apache.cxf.fediz:fediz-spring2</exclude> </excludes>
