summaryrefslogtreecommitdiffstatsabout
diff options
context:
space:
mode:
authorAlexander Kurtakov2012-01-13 16:35:13 (EST)
committer Jesse McConnell2012-01-13 17:09:08 (EST)
commitfae4f3fda93cbe2b0fe6dec42c1dec54a491c69a (patch)
tree1d161f88f2bce0b53996b1265b2dfa108e8eee7f
parentb25792db872880d6c4f27b4e40c63d9f2a83161e (diff)
downloadorg.eclipse.jetty.project-fae4f3fda93cbe2b0fe6dec42c1dec54a491c69a.zip
org.eclipse.jetty.project-fae4f3fda93cbe2b0fe6dec42c1dec54a491c69a.tar.gz
org.eclipse.jetty.project-fae4f3fda93cbe2b0fe6dec42c1dec54a491c69a.tar.bz2
Get rid of javax.activation.
Java activation framework (JAF) or javax.activation:activation(maven) is an API that is integral part of every Java 5 level virtual machine. As such there is no point in still referencing/downloading/including or making any other operation with it. Simply removing references to it in build scripts makes it use the JVM provided one. Signed-off-by: Jesse McConnell <jesse.mcconnell@gmail.com>
-rw-r--r--jetty-aggregate/jetty-all-server/pom.xml9
-rw-r--r--jetty-aggregate/jetty-all/pom.xml9
-rw-r--r--jetty-aggregate/jetty-plus/pom.xml9
-rw-r--r--jetty-distribution/pom.xml2
-rw-r--r--jetty-osgi/test-jetty-osgi/pom.xml2
-rw-r--r--pom.xml6
6 files changed, 0 insertions, 37 deletions
diff --git a/jetty-aggregate/jetty-all-server/pom.xml b/jetty-aggregate/jetty-all-server/pom.xml
index 072ff23..ed343ae 100644
--- a/jetty-aggregate/jetty-all-server/pom.xml
+++ b/jetty-aggregate/jetty-all-server/pom.xml
@@ -163,10 +163,6 @@
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
</exclusion>
- <exclusion>
- <groupId>javax.activation</groupId>
- <artifactId>activation</artifactId>
- </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -238,11 +234,6 @@
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>javax.activation</groupId>
- <artifactId>activation</artifactId>
- <scope>compile</scope>
- </dependency>
- <dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jaspic_1.0_spec</artifactId>
<version>1.0</version>
diff --git a/jetty-aggregate/jetty-all/pom.xml b/jetty-aggregate/jetty-all/pom.xml
index 3a6eee3..a59ba91 100644
--- a/jetty-aggregate/jetty-all/pom.xml
+++ b/jetty-aggregate/jetty-all/pom.xml
@@ -147,10 +147,6 @@
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
</exclusion>
- <exclusion>
- <groupId>javax.activation</groupId>
- <artifactId>activation</artifactId>
- </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -222,11 +218,6 @@
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>javax.activation</groupId>
- <artifactId>activation</artifactId>
- <scope>compile</scope>
- </dependency>
- <dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jaspic_1.0_spec</artifactId>
<version>1.0</version>
diff --git a/jetty-aggregate/jetty-plus/pom.xml b/jetty-aggregate/jetty-plus/pom.xml
index ff9bf1f..e265fb4 100644
--- a/jetty-aggregate/jetty-plus/pom.xml
+++ b/jetty-aggregate/jetty-plus/pom.xml
@@ -96,10 +96,6 @@
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
</exclusion>
- <exclusion>
- <groupId>javax.activation</groupId>
- <artifactId>activation</artifactId>
- </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -117,10 +113,5 @@
<artifactId>mail</artifactId>
<scope>compile</scope>
</dependency>
- <dependency>
- <groupId>javax.activation</groupId>
- <artifactId>activation</artifactId>
- <scope>compile</scope>
- </dependency>
</dependencies>
</project>
diff --git a/jetty-distribution/pom.xml b/jetty-distribution/pom.xml
index 173d546..53351fd 100644
--- a/jetty-distribution/pom.xml
+++ b/jetty-distribution/pom.xml
@@ -12,7 +12,6 @@
<jetty-orbit-url>http://download.eclipse.org/jetty/orbit</jetty-orbit-url>
<assembly-directory>target/distribution</assembly-directory>
<eclipse-ecj-version>3.6</eclipse-ecj-version>
- <orbit-javax-activation-version>${javax-activation-version}.0.v201005080500</orbit-javax-activation-version>
<orbit-javax-annotation-version>1.0.0.v20100513-0750</orbit-javax-annotation-version>
<orbit-javax-el-version>2.1.0.v201004190952</orbit-javax-el-version>
<orbit-javax-mail-glassfish-version>${javax-mail-version}.v201005082020</orbit-javax-mail-glassfish-version>
@@ -69,7 +68,6 @@
<mkdir dir="${orbit-cache}" />
<get dest="${orbit-cache}" verbose="true" skipexisting="true">
<url url="${jetty-orbit-url}/javax.servlet_${orbit-javax-servlet-version}.jar" />
- <url url="${jetty-orbit-url}/javax.activation_${orbit-javax-activation-version}.jar" />
<url url="${jetty-orbit-url}/javax.annotation_${orbit-javax-annotation-version}.jar" />
<url url="${jetty-orbit-url}/javax.mail.glassfish_${orbit-javax-mail-glassfish-version}.jar" />
<url url="${jetty-orbit-url}/javax.el_${orbit-javax-el-version}.jar" />
diff --git a/jetty-osgi/test-jetty-osgi/pom.xml b/jetty-osgi/test-jetty-osgi/pom.xml
index eedcb97..8a67c03 100644
--- a/jetty-osgi/test-jetty-osgi/pom.xml
+++ b/jetty-osgi/test-jetty-osgi/pom.xml
@@ -14,7 +14,6 @@
<jetty-orbit-url>http://download.eclipse.org/jetty/orbit/</jetty-orbit-url>
<assembly-directory>target/distribution</assembly-directory>
<eclipse-ecj-version>3.6</eclipse-ecj-version>
- <orbit-javax-activation-version>${javax-activation-version}.0.v201005080500</orbit-javax-activation-version>
<orbit-javax-annotation-version>1.0.0.v20100513-0750</orbit-javax-annotation-version>
<orbit-javax-el-version>2.1.0.v201004190952</orbit-javax-el-version>
<orbit-javax-mail-glassfish-version>${javax-mail-version}.v201005082020</orbit-javax-mail-glassfish-version>
@@ -198,7 +197,6 @@
<mkdir dir="${orbit-cache}" />
<get dest="${orbit-cache}" verbose="true" skipexisting="true">
<url url="${jetty-orbit-url}/javax.servlet_${orbit-javax-servlet-version}.jar" />
- <url url="${jetty-orbit-url}/javax.activation_${orbit-javax-activation-version}.jar" />
<url url="${jetty-orbit-url}/javax.mail.glassfish_${orbit-javax-mail-glassfish-version}.jar" />
<url url="${jetty-orbit-url}/javax.el_${orbit-javax-el-version}.jar" />
<url url="${jetty-orbit-url}/javax.servlet.jsp_${orbit-javax-servlet-jsp-version}.jar" />
diff --git a/pom.xml b/pom.xml
index 63315d4..534c7e6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,6 @@
<url>${jetty.url}</url>
<packaging>pom</packaging>
<properties>
- <javax-activation-version>1.1</javax-activation-version>
<javax-mail-version>1.4.1</javax-mail-version>
<javax-servlet-jsp-version>2.1.v20100127</javax-servlet-jsp-version>
<javax-transaction-version>1.1.1</javax-transaction-version>
@@ -403,11 +402,6 @@
<version>${javax-mail-version}</version>
</dependency>
<dependency>
- <groupId>javax.activation</groupId>
- <artifactId>activation</artifactId>
- <version>${javax-activation-version}</version>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${junit-version}</version>