Repository: incubator-batchee Updated Branches: refs/heads/master 2891b07ae -> bede496c0
move tomcat config to a profile and add tomee Project: http://git-wip-us.apache.org/repos/asf/incubator-batchee/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-batchee/commit/6c2b9090 Tree: http://git-wip-us.apache.org/repos/asf/incubator-batchee/tree/6c2b9090 Diff: http://git-wip-us.apache.org/repos/asf/incubator-batchee/diff/6c2b9090 Branch: refs/heads/master Commit: 6c2b9090fa5b69326b408e8905c70488c1e0800f Parents: 2891b07 Author: Mark Struberg <[email protected]> Authored: Wed Jun 21 16:49:15 2017 +0200 Committer: Mark Struberg <[email protected]> Committed: Wed Jun 21 16:49:15 2017 +0200 ---------------------------------------------------------------------- gui/pom.xml | 12 +- gui/servlet/webapp/pom.xml | 392 ++++++++++++++++++++++------------------ 2 files changed, 224 insertions(+), 180 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-batchee/blob/6c2b9090/gui/pom.xml ---------------------------------------------------------------------- diff --git a/gui/pom.xml b/gui/pom.xml index d2ce2f4..c412f40 100644 --- a/gui/pom.xml +++ b/gui/pom.xml @@ -33,6 +33,13 @@ <module>servlet</module> </modules> + <properties> + <arquillian.version>1.0.3.Final</arquillian.version> + <cxf.version>2.6.9</cxf.version> + <tomcat.version>7.0.50</tomcat.version> + <tomee.version>7.0.3</tomee.version> + </properties> + <dependencyManagement> <dependencies> <dependency> @@ -139,9 +146,4 @@ </dependencies> </dependencyManagement> - <properties> - <arquillian.version>1.0.3.Final</arquillian.version> - <cxf.version>2.6.9</cxf.version> - <tomcat.version>7.0.50</tomcat.version> - </properties> </project> http://git-wip-us.apache.org/repos/asf/incubator-batchee/blob/6c2b9090/gui/servlet/webapp/pom.xml ---------------------------------------------------------------------- diff --git a/gui/servlet/webapp/pom.xml b/gui/servlet/webapp/pom.xml index 80e311a..61d13ba 100644 --- a/gui/servlet/webapp/pom.xml +++ b/gui/servlet/webapp/pom.xml @@ -47,181 +47,223 @@ <attachClasses>true</attachClasses> </configuration> </plugin> - <plugin> <!-- use mvn tomcat7:run --> - <groupId>org.apache.tomcat.maven</groupId> - <artifactId>tomcat7-maven-plugin</artifactId> - <version>2.2</version> - <configuration> - <ignorePackaging>true</ignorePackaging> - <path>/</path> - <warSourceDirectory>${project.basedir}/src/main/resources/META-INF/resources</warSourceDirectory> - <additionalClasspathDirs> - <additionalClasspathDir>${project.build.directory}/${project.build.finalName}.${project.packaging} - </additionalClasspathDir> - <additionalClasspathDir>${project.build.directory}/${project.build.finalName}-tests.${project.packaging} - </additionalClasspathDir> - </additionalClasspathDirs> - </configuration> - <dependencies> - <dependency> - <groupId>org.apache.tomcat.embed</groupId> - <artifactId>tomcat-embed-core</artifactId> - <version>${tomcat.version}</version> - </dependency> - <dependency> - <groupId>org.apache.tomcat</groupId> - <artifactId>tomcat-util</artifactId> - <version>${tomcat.version}</version> - </dependency> - <dependency> - <groupId>org.apache.tomcat</groupId> - <artifactId>tomcat-coyote</artifactId> - <version>${tomcat.version}</version> - </dependency> - <dependency> - <groupId>org.apache.tomcat</groupId> - <artifactId>tomcat-api</artifactId> - <version>${tomcat.version}</version> - </dependency> - - <dependency> - <groupId>org.apache.tomcat</groupId> - <artifactId>tomcat-jdbc</artifactId> - <version>${tomcat.version}</version> - </dependency> - - <dependency> - <groupId>org.apache.tomcat</groupId> - <artifactId>tomcat-dbcp</artifactId> - <version>${tomcat.version}</version> - </dependency> - - <dependency> - <groupId>org.apache.tomcat</groupId> - <artifactId>tomcat-servlet-api</artifactId> - <version>${tomcat.version}</version> - </dependency> - - <dependency> - <groupId>org.apache.tomcat</groupId> - <artifactId>tomcat-jsp-api</artifactId> - <version>${tomcat.version}</version> - </dependency> - - <dependency> - <groupId>org.apache.tomcat</groupId> - <artifactId>tomcat-jasper</artifactId> - <version>${tomcat.version}</version> - </dependency> - - <dependency> - <groupId>org.apache.tomcat</groupId> - <artifactId>tomcat-jasper-el</artifactId> - <version>${tomcat.version}</version> - </dependency> - - <dependency> - <groupId>org.apache.tomcat</groupId> - <artifactId>tomcat-el-api</artifactId> - <version>${tomcat.version}</version> - </dependency> - - <dependency> - <groupId>org.apache.tomcat</groupId> - <artifactId>tomcat-catalina</artifactId> - <version>${tomcat.version}</version> - </dependency> - - <dependency> - <groupId>org.apache.tomcat</groupId> - <artifactId>tomcat-tribes</artifactId> - <version>${tomcat.version}</version> - </dependency> - - <dependency> - <groupId>org.apache.tomcat</groupId> - <artifactId>tomcat-catalina-ha</artifactId> - <version>${tomcat.version}</version> - </dependency> - - <dependency> - <groupId>org.apache.tomcat</groupId> - <artifactId>tomcat-annotations-api</artifactId> - <version>${tomcat.version}</version> - </dependency> - - <dependency> - <groupId>org.apache.tomcat</groupId> - <artifactId>tomcat-juli</artifactId> - <version>${tomcat.version}</version> - </dependency> - - <dependency> - <groupId>org.apache.tomcat.embed</groupId> - <artifactId>tomcat-embed-logging-juli</artifactId> - <version>${tomcat.version}</version> - </dependency> - <dependency> - <groupId>org.apache.tomcat.embed</groupId> - <artifactId>tomcat-embed-logging-log4j</artifactId> - <version>${tomcat.version}</version> - </dependency> - - <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-atinject_1.0_spec</artifactId> - <version>${atinject.version}</version> - </dependency> - <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-atinject_1.0_spec</artifactId> - <version>${atinject.version}</version> - </dependency> - <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-jbatch_1.0_spec</artifactId> - <version>${batch-api.version}</version> - </dependency> - <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-json_1.0_spec</artifactId> - <version>1.0-alpha-1</version> - </dependency> - <dependency> - <groupId>org.apache.johnzon</groupId> - <artifactId>johnzon-jaxrs</artifactId> - <version>${johnzon.version}</version> - </dependency> - <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-frontend-jaxrs</artifactId> - <version>${cxf.version}</version> - <exclusions> - <exclusion> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-impl</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-javamail_1.4_spec</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.ws.xmlschema</groupId> - <artifactId>xmlschema-core</artifactId> - </exclusion> - <exclusion> - <groupId>org.codehaus.woodstox</groupId> - <artifactId>woodstox-core-asl</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.batchee</groupId> - <artifactId>batchee-jbatch</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> - </plugin> </plugins> </build> + <profiles> + <profile> + <id>tomcat</id> + <activation><activeByDefault>true</activeByDefault></activation> + + <build> + <plugins> + <plugin> <!-- use mvn tomcat7:run --> + <groupId>org.apache.tomcat.maven</groupId> + <artifactId>tomcat7-maven-plugin</artifactId> + <version>2.2</version> + <configuration> + <ignorePackaging>true</ignorePackaging> + <path>/</path> + <warSourceDirectory>${project.basedir}/src/main/resources/META-INF/resources</warSourceDirectory> + <additionalClasspathDirs> + <additionalClasspathDir>${project.build.directory}/${project.build.finalName}.${project.packaging} + </additionalClasspathDir> + <additionalClasspathDir>${project.build.directory}/${project.build.finalName}-tests.${project.packaging} + </additionalClasspathDir> + </additionalClasspathDirs> + </configuration> + <dependencies> + <dependency> + <groupId>org.apache.tomcat.embed</groupId> + <artifactId>tomcat-embed-core</artifactId> + <version>${tomcat.version}</version> + </dependency> + <dependency> + <groupId>org.apache.tomcat</groupId> + <artifactId>tomcat-util</artifactId> + <version>${tomcat.version}</version> + </dependency> + <dependency> + <groupId>org.apache.tomcat</groupId> + <artifactId>tomcat-coyote</artifactId> + <version>${tomcat.version}</version> + </dependency> + <dependency> + <groupId>org.apache.tomcat</groupId> + <artifactId>tomcat-api</artifactId> + <version>${tomcat.version}</version> + </dependency> + + <dependency> + <groupId>org.apache.tomcat</groupId> + <artifactId>tomcat-jdbc</artifactId> + <version>${tomcat.version}</version> + </dependency> + + <dependency> + <groupId>org.apache.tomcat</groupId> + <artifactId>tomcat-dbcp</artifactId> + <version>${tomcat.version}</version> + </dependency> + + <dependency> + <groupId>org.apache.tomcat</groupId> + <artifactId>tomcat-servlet-api</artifactId> + <version>${tomcat.version}</version> + </dependency> + + <dependency> + <groupId>org.apache.tomcat</groupId> + <artifactId>tomcat-jsp-api</artifactId> + <version>${tomcat.version}</version> + </dependency> + + <dependency> + <groupId>org.apache.tomcat</groupId> + <artifactId>tomcat-jasper</artifactId> + <version>${tomcat.version}</version> + </dependency> + + <dependency> + <groupId>org.apache.tomcat</groupId> + <artifactId>tomcat-jasper-el</artifactId> + <version>${tomcat.version}</version> + </dependency> + + <dependency> + <groupId>org.apache.tomcat</groupId> + <artifactId>tomcat-el-api</artifactId> + <version>${tomcat.version}</version> + </dependency> + + <dependency> + <groupId>org.apache.tomcat</groupId> + <artifactId>tomcat-catalina</artifactId> + <version>${tomcat.version}</version> + </dependency> + + <dependency> + <groupId>org.apache.tomcat</groupId> + <artifactId>tomcat-tribes</artifactId> + <version>${tomcat.version}</version> + </dependency> + + <dependency> + <groupId>org.apache.tomcat</groupId> + <artifactId>tomcat-catalina-ha</artifactId> + <version>${tomcat.version}</version> + </dependency> + + <dependency> + <groupId>org.apache.tomcat</groupId> + <artifactId>tomcat-annotations-api</artifactId> + <version>${tomcat.version}</version> + </dependency> + + <dependency> + <groupId>org.apache.tomcat</groupId> + <artifactId>tomcat-juli</artifactId> + <version>${tomcat.version}</version> + </dependency> + + <dependency> + <groupId>org.apache.tomcat.embed</groupId> + <artifactId>tomcat-embed-logging-juli</artifactId> + <version>${tomcat.version}</version> + </dependency> + <dependency> + <groupId>org.apache.tomcat.embed</groupId> + <artifactId>tomcat-embed-logging-log4j</artifactId> + <version>${tomcat.version}</version> + </dependency> + + <dependency> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-atinject_1.0_spec</artifactId> + <version>${atinject.version}</version> + </dependency> + <dependency> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-atinject_1.0_spec</artifactId> + <version>${atinject.version}</version> + </dependency> + <dependency> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-jbatch_1.0_spec</artifactId> + <version>${batch-api.version}</version> + </dependency> + <dependency> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-json_1.0_spec</artifactId> + <version>1.0-alpha-1</version> + </dependency> + <dependency> + <groupId>org.apache.johnzon</groupId> + <artifactId>johnzon-jaxrs</artifactId> + <version>${johnzon.version}</version> + </dependency> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-frontend-jaxrs</artifactId> + <version>${cxf.version}</version> + <exclusions> + <exclusion> + <groupId>com.sun.xml.bind</groupId> + <artifactId>jaxb-impl</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-javamail_1.4_spec</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.ws.xmlschema</groupId> + <artifactId>xmlschema-core</artifactId> + </exclusion> + <exclusion> + <groupId>org.codehaus.woodstox</groupId> + <artifactId>woodstox-core-asl</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.apache.batchee</groupId> + <artifactId>batchee-jbatch</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> + </plugin> + + </plugins> + </build> + </profile> + + <profile> + <id>tomee</id> + + <build> + <finalName>batchee</finalName> + <plugins> + <plugin> + <groupId>org.apache.tomee.maven</groupId> + <artifactId>tomee-maven-plugin</artifactId> + <version>${tomee.version}</version> + + <dependencies> + <dependency> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-jbatch_1.0_spec</artifactId> + <version>${batch-api.version}</version> + </dependency> + + <dependency> + <groupId>org.apache.batchee</groupId> + <artifactId>batchee-jbatch</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> + + </plugin> + </plugins> + </build> + </profile> + </profiles> </project> \ No newline at end of file
