activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From clebertsuco...@apache.org
Subject [2/4] activemq-artemis git commit: ARTEMIS-119 Changed dependency to use Tomcat Servlet API 3.1.
Date Thu, 04 Jun 2015 14:21:37 GMT
ARTEMIS-119 Changed dependency to use Tomcat Servlet API 3.1.


Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/e2f301dd
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/e2f301dd
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/e2f301dd

Branch: refs/heads/master
Commit: e2f301dd851b1ccca9397b48926219859b63306f
Parents: ef1b960
Author: John D. Ament <johndament@apache.org>
Authored: Thu Jun 4 09:33:41 2015 -0400
Committer: Clebert Suconic <clebertsuconic@apache.org>
Committed: Thu Jun 4 10:20:33 2015 -0400

----------------------------------------------------------------------
 artemis-distribution/pom.xml                   |  4 ++--
 artemis-distribution/src/main/assembly/dep.xml |  2 +-
 pom.xml                                        | 13 ++++++-------
 3 files changed, 9 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/e2f301dd/artemis-distribution/pom.xml
----------------------------------------------------------------------
diff --git a/artemis-distribution/pom.xml b/artemis-distribution/pom.xml
index 273bb0b..ebde324 100644
--- a/artemis-distribution/pom.xml
+++ b/artemis-distribution/pom.xml
@@ -154,8 +154,8 @@
           <artifactId>jetty-all</artifactId>
        </dependency>
        <dependency>
-          <groupId>org.apache.geronimo.specs</groupId>
-          <artifactId>geronimo-servlet_3.0_spec</artifactId>
+           <groupId>org.apache.tomcat</groupId>
+           <artifactId>tomcat-servlet-api</artifactId>
        </dependency>
        <dependency>
           <groupId>org.jolokia</groupId>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/e2f301dd/artemis-distribution/src/main/assembly/dep.xml
----------------------------------------------------------------------
diff --git a/artemis-distribution/src/main/assembly/dep.xml b/artemis-distribution/src/main/assembly/dep.xml
index e2466c3..aa464a3 100644
--- a/artemis-distribution/src/main/assembly/dep.xml
+++ b/artemis-distribution/src/main/assembly/dep.xml
@@ -80,7 +80,7 @@
             <include>javax.inject:javax.inject</include>
             <include>org.eclipse.jetty.aggregate:jetty-all</include>
             <include>org.apache.geronimo.specs:</include>
-            <include>org.apache.geronimo.specs:geronimo-servlet_3.0_spec</include>
+            <include>org.apache.tomcat:tomcat-servlet-api</include>
             <include>commons-beanutils:commons-beanutils</include>
             <include>commons-logging:commons-logging</include>
             <include>org.fusesource.hawtbuf:hawtbuf</include>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/e2f301dd/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 4ef69f1..2f7b61a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -204,7 +204,7 @@
          <!-- ### Build Time Dependencies ### -->
          <!-- This is a build dependency of this project, but is not needed at compile
or runtime by other
          projects that depend on this project. This should be in the compiler plugin but
can't because of a bug,
-         see https://jira.codehaus.org/browse/MCOMPILER-203-->
+         see https://issues.apache.org/jira/browse/MCOMPILER-203-->
          <dependency>
             <groupId>org.jboss.logging</groupId>
             <artifactId>jboss-logging-processor</artifactId>
@@ -441,12 +441,11 @@
             <version>${jetty.version}</version>
             <!-- License: (Joint): Apache 2.0 & EPL 1.0 -->
         </dependency>
-        <dependency>
-           <groupId>org.apache.geronimo.specs</groupId>
-           <artifactId>geronimo-servlet_3.0_spec</artifactId>
-           <version>1.0</version>
-           <!-- License: Apache 2.0 -->
-        </dependency>
+         <dependency>
+            <groupId>org.apache.tomcat</groupId>
+            <artifactId>tomcat-servlet-api</artifactId>
+            <version>8.0.23</version>
+         </dependency>
         <dependency>
            <groupId>org.jolokia</groupId>
            <artifactId>jolokia-war</artifactId>


Mime
View raw message