| 1 |
commit: 540f24964bd0e5d291cfdb1f621a8ef00cc03e70 |
| 2 |
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Feb 19 21:45:21 2016 +0000 |
| 4 |
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Feb 19 21:45:21 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=540f2496 |
| 7 |
|
| 8 |
www-servers/tomcat: removed oracle-javamail from deps and hence from tomcat classpath (bug #453212) |
| 9 |
|
| 10 |
this jar should not be on tomcat's classpath, if one needs it on global classpath, he/she should use TOMCAT_EXTRA_JARS in /etc/conf.d/tomcat-SLOT[-suffix] to put it on the global classpath. the before-the-fix version of the ebuilds made it impossible to put javamail jar inside web application as that resulted in conflict which could be avoided only by removal of javamail jar from the global classpath |
| 11 |
|
| 12 |
Package-Manager: portage-2.2.27 |
| 13 |
|
| 14 |
.../tomcat/{tomcat-7.0.68.ebuild => tomcat-7.0.68-r1.ebuild} | 7 +++---- |
| 15 |
.../tomcat/{tomcat-8.0.32.ebuild => tomcat-8.0.32-r1.ebuild} | 7 +++---- |
| 16 |
...{tomcat-9.0.0_alpha3.ebuild => tomcat-9.0.0_alpha3-r1.ebuild} | 9 ++++----- |
| 17 |
3 files changed, 10 insertions(+), 13 deletions(-) |
| 18 |
|
| 19 |
diff --git a/www-servers/tomcat/tomcat-7.0.68.ebuild b/www-servers/tomcat/tomcat-7.0.68-r1.ebuild |
| 20 |
similarity index 95% |
| 21 |
rename from www-servers/tomcat/tomcat-7.0.68.ebuild |
| 22 |
rename to www-servers/tomcat/tomcat-7.0.68-r1.ebuild |
| 23 |
index cfc0661..b98587f 100644 |
| 24 |
--- a/www-servers/tomcat/tomcat-7.0.68.ebuild |
| 25 |
+++ b/www-servers/tomcat/tomcat-7.0.68-r1.ebuild |
| 26 |
@@ -25,7 +25,6 @@ ECJ_SLOT="4.4" |
| 27 |
SAPI_SLOT="3.0" |
| 28 |
|
| 29 |
COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT} |
| 30 |
- dev-java/oracle-javamail:0 |
| 31 |
dev-java/tomcat-servlet-api:${SAPI_SLOT}" |
| 32 |
RDEPEND="${COMMON_DEP} |
| 33 |
websockets? ( >=virtual/jre-1.7 ) |
| 34 |
@@ -45,8 +44,8 @@ pkg_setup() { |
| 35 |
} |
| 36 |
|
| 37 |
java_prepare() { |
| 38 |
- # Remove bundled javamail, servlet-api |
| 39 |
- rm -rv java/javax/{el,mail,servlet} || die |
| 40 |
+ # Remove bundled servlet-api |
| 41 |
+ rm -rv java/javax/{el,servlet} || die |
| 42 |
|
| 43 |
java-pkg_clean |
| 44 |
|
| 45 |
@@ -61,7 +60,7 @@ java_prepare() { |
| 46 |
JAVA_ANT_REWRITE_CLASSPATH="true" |
| 47 |
|
| 48 |
EANT_BUILD_TARGET="deploy" |
| 49 |
-EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},oracle-javamail,tomcat-servlet-api-${SAPI_SLOT}" |
| 50 |
+EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT}" |
| 51 |
EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes" |
| 52 |
EANT_NEEDS_TOOLS="true" |
| 53 |
EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false" |
| 54 |
|
| 55 |
diff --git a/www-servers/tomcat/tomcat-8.0.32.ebuild b/www-servers/tomcat/tomcat-8.0.32-r1.ebuild |
| 56 |
similarity index 95% |
| 57 |
rename from www-servers/tomcat/tomcat-8.0.32.ebuild |
| 58 |
rename to www-servers/tomcat/tomcat-8.0.32-r1.ebuild |
| 59 |
index c6d8463..ac0869f 100644 |
| 60 |
--- a/www-servers/tomcat/tomcat-8.0.32.ebuild |
| 61 |
+++ b/www-servers/tomcat/tomcat-8.0.32-r1.ebuild |
| 62 |
@@ -25,7 +25,6 @@ ECJ_SLOT="4.4" |
| 63 |
SAPI_SLOT="3.1" |
| 64 |
|
| 65 |
COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT} |
| 66 |
- dev-java/oracle-javamail:0 |
| 67 |
dev-java/tomcat-servlet-api:${SAPI_SLOT}" |
| 68 |
RDEPEND="${COMMON_DEP} |
| 69 |
!<dev-java/tomcat-native-1.1.24 |
| 70 |
@@ -49,8 +48,8 @@ pkg_setup() { |
| 71 |
java_prepare() { |
| 72 |
find -name '*.jar' -type f -delete -print || die |
| 73 |
|
| 74 |
- # Remove bundled javamail, servlet-api |
| 75 |
- rm -rv java/javax/{el,mail,servlet} || die |
| 76 |
+ # Remove bundled servlet-api |
| 77 |
+ rm -rv java/javax/{el,servlet} || die |
| 78 |
|
| 79 |
epatch "${FILESDIR}/${P}-build.xml.patch" |
| 80 |
|
| 81 |
@@ -63,7 +62,7 @@ java_prepare() { |
| 82 |
JAVA_ANT_REWRITE_CLASSPATH="true" |
| 83 |
|
| 84 |
EANT_BUILD_TARGET="deploy" |
| 85 |
-EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},oracle-javamail,tomcat-servlet-api-${SAPI_SLOT}" |
| 86 |
+EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT}" |
| 87 |
EANT_TEST_GENTOO_CLASSPATH="easymock-3.2" |
| 88 |
EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes" |
| 89 |
EANT_NEEDS_TOOLS="true" |
| 90 |
|
| 91 |
diff --git a/www-servers/tomcat/tomcat-9.0.0_alpha3.ebuild b/www-servers/tomcat/tomcat-9.0.0_alpha3-r1.ebuild |
| 92 |
similarity index 94% |
| 93 |
rename from www-servers/tomcat/tomcat-9.0.0_alpha3.ebuild |
| 94 |
rename to www-servers/tomcat/tomcat-9.0.0_alpha3-r1.ebuild |
| 95 |
index 881e9a9..2b58216 100644 |
| 96 |
--- a/www-servers/tomcat/tomcat-9.0.0_alpha3.ebuild |
| 97 |
+++ b/www-servers/tomcat/tomcat-9.0.0_alpha3-r1.ebuild |
| 98 |
@@ -1,4 +1,4 @@ |
| 99 |
-# Copyright 1999-2015 Gentoo Foundation |
| 100 |
+# Copyright 1999-2016 Gentoo Foundation |
| 101 |
# Distributed under the terms of the GNU General Public License v2 |
| 102 |
# $Id$ |
| 103 |
|
| 104 |
@@ -26,7 +26,6 @@ ECJ_SLOT="4.5" |
| 105 |
SAPI_SLOT="4.0" |
| 106 |
|
| 107 |
COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT} |
| 108 |
- dev-java/oracle-javamail:0 |
| 109 |
dev-java/tomcat-servlet-api:${SAPI_SLOT}" |
| 110 |
RDEPEND="${COMMON_DEP} |
| 111 |
!<dev-java/tomcat-native-1.1.24 |
| 112 |
@@ -50,8 +49,8 @@ pkg_setup() { |
| 113 |
java_prepare() { |
| 114 |
find -name '*.jar' -type f -delete -print || die |
| 115 |
|
| 116 |
- # Remove bundled javamail, servlet-api |
| 117 |
- rm -rv java/javax/{el,mail,servlet} || die |
| 118 |
+ # Remove bundled servlet-api |
| 119 |
+ rm -rv java/javax/{el,servlet} || die |
| 120 |
|
| 121 |
epatch "${FILESDIR}/${P}-build.xml.patch" |
| 122 |
|
| 123 |
@@ -64,7 +63,7 @@ java_prepare() { |
| 124 |
JAVA_ANT_REWRITE_CLASSPATH="true" |
| 125 |
|
| 126 |
EANT_BUILD_TARGET="deploy" |
| 127 |
-EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},oracle-javamail,tomcat-servlet-api-${SAPI_SLOT}" |
| 128 |
+EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT}" |
| 129 |
EANT_TEST_GENTOO_CLASSPATH="easymock-3.2" |
| 130 |
EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes" |
| 131 |
EANT_NEEDS_TOOLS="true" |
Archives