You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@batchee.apache.org by st...@apache.org on 2017/06/21 18:43:37 UTC
[1/2] incubator-batchee git commit: move tomcat config to a profile
and add tomee
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 <st...@apache.org>
Authored: Wed Jun 21 16:49:15 2017 +0200
Committer: Mark Struberg <st...@apache.org>
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
[2/2] incubator-batchee git commit: BATCHEE-119 upgrade various
dependencies
Posted by st...@apache.org.
BATCHEE-119 upgrade various dependencies
* OpenEBJ from 7.0.1 -> 7.0.3
* Johnzon from 0.9.5 -> 1.0.0
* DeltaSpike from 1.5.1 to 1.8.0
* OpenWebBeans from 1.6.2 to 1.7.2
Project: http://git-wip-us.apache.org/repos/asf/incubator-batchee/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-batchee/commit/bede496c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-batchee/tree/bede496c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-batchee/diff/bede496c
Branch: refs/heads/master
Commit: bede496c0c6cecca1bd107a9834f1c5c4b10f406
Parents: 6c2b909
Author: Mark Struberg <st...@apache.org>
Authored: Wed Jun 21 20:42:46 2017 +0200
Committer: Mark Struberg <st...@apache.org>
Committed: Wed Jun 21 20:42:46 2017 +0200
----------------------------------------------------------------------
extensions/cdi/pom.xml | 8 --------
gui/jaxrs/jaxrs-server/pom.xml | 4 ++--
gui/jaxrs/webapp/pom.xml | 4 ++--
pom.xml | 4 +++-
tools/cli/pom.xml | 4 ++--
5 files changed, 9 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-batchee/blob/bede496c/extensions/cdi/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/cdi/pom.xml b/extensions/cdi/pom.xml
index 28937ca..9c3eefd 100644
--- a/extensions/cdi/pom.xml
+++ b/extensions/cdi/pom.xml
@@ -28,10 +28,6 @@
<name>BatchEE :: Extensions :: CDI</name>
<description>This module implements some CDI scopes batch oriented.</description>
- <properties>
- <deltaspike.version>1.5.1</deltaspike.version>
- </properties>
-
<dependencies>
<!-- optional since we are protable and can be used with other jbatch implementations as well -->
<dependency>
@@ -94,10 +90,6 @@
<profile>
<id>cdi-1.1</id>
- <properties>
- <owb.version>1.6.2</owb.version>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-batchee/blob/bede496c/gui/jaxrs/jaxrs-server/pom.xml
----------------------------------------------------------------------
diff --git a/gui/jaxrs/jaxrs-server/pom.xml b/gui/jaxrs/jaxrs-server/pom.xml
index 3159377..f9f0b49 100644
--- a/gui/jaxrs/jaxrs-server/pom.xml
+++ b/gui/jaxrs/jaxrs-server/pom.xml
@@ -115,9 +115,9 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.openejb.maven</groupId>
+ <groupId>org.apache.tomee.maven</groupId>
<artifactId>tomee-maven-plugin</artifactId>
- <version>1.6.0</version>
+ <version>${tomee.version}</version>
<configuration>
<tomeeClassifier>jaxrs</tomeeClassifier>
<simpleLog>true</simpleLog>
http://git-wip-us.apache.org/repos/asf/incubator-batchee/blob/bede496c/gui/jaxrs/webapp/pom.xml
----------------------------------------------------------------------
diff --git a/gui/jaxrs/webapp/pom.xml b/gui/jaxrs/webapp/pom.xml
index f58d461..ea9e55c 100644
--- a/gui/jaxrs/webapp/pom.xml
+++ b/gui/jaxrs/webapp/pom.xml
@@ -90,9 +90,9 @@
</configuration>
</plugin>
<plugin>
- <groupId>org.apache.openejb.maven</groupId>
+ <groupId>org.apache.tomee.maven</groupId>
<artifactId>tomee-maven-plugin</artifactId>
- <version>1.6.0</version>
+ <version>${tomee.version}</version>
<configuration>
<tomeeClassifier>jaxrs</tomeeClassifier>
<simpleLog>true</simpleLog>
http://git-wip-us.apache.org/repos/asf/incubator-batchee/blob/bede496c/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index d2c7ccf..e6ef791 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,7 +43,9 @@
<batch-api.version>1.0</batch-api.version>
<jackson.version>2.2.2</jackson.version>
<jodatime.version>2.9.1</jodatime.version>
- <johnzon.version>0.9.5</johnzon.version>
+ <johnzon.version>1.0.0</johnzon.version>
+ <tomee.version>7.0.3</tomee.version>
+ <deltaspike.version>1.8.0</deltaspike.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<batchee.scmPubUrl>https://svn.apache.org/repos/asf/incubator/batchee/site</batchee.scmPubUrl>
<batchee.scmPubCheckoutDirectory>${basedir}/.site-content</batchee.scmPubCheckoutDirectory>
http://git-wip-us.apache.org/repos/asf/incubator-batchee/blob/bede496c/tools/cli/pom.xml
----------------------------------------------------------------------
diff --git a/tools/cli/pom.xml b/tools/cli/pom.xml
index 6a5a3c8..5d68afd 100644
--- a/tools/cli/pom.xml
+++ b/tools/cli/pom.xml
@@ -68,14 +68,14 @@
<dependency>
<groupId>org.apache.tomee</groupId>
<artifactId>openejb-core</artifactId>
- <version>7.0.1</version>
+ <version>${tomee.version}</version>
<scope>provided</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.deltaspike.cdictrl</groupId>
<artifactId>deltaspike-cdictrl-api</artifactId>
- <version>1.7.1</version>
+ <version>${deltaspike.version}</version>
<scope>provided</scope>
<optional>true</optional>
</dependency>