author | Petr Sumbera <petr.sumbera@oracle.com> |
Wed, 02 Nov 2016 06:19:13 -0700 | |
branch | s11u3-sru |
changeset 7317 | bd14d5a59818 |
parent 5535 | ae5bc52953a4 |
child 7936 | 40335bd603f6 |
permissions | -rw-r--r-- |
4134
b1148b9ffd9b
20843475 Upgrade Apache Tomcat to version 6.0.43
Petr Sumbera <petr.sumbera@oracle.com>
parents:
3054
diff
changeset
|
1 |
Patch origin: in-house |
b1148b9ffd9b
20843475 Upgrade Apache Tomcat to version 6.0.43
Petr Sumbera <petr.sumbera@oracle.com>
parents:
3054
diff
changeset
|
2 |
Patch status: Solaris-specific; not suitable for upstream |
b1148b9ffd9b
20843475 Upgrade Apache Tomcat to version 6.0.43
Petr Sumbera <petr.sumbera@oracle.com>
parents:
3054
diff
changeset
|
3 |
|
b1148b9ffd9b
20843475 Upgrade Apache Tomcat to version 6.0.43
Petr Sumbera <petr.sumbera@oracle.com>
parents:
3054
diff
changeset
|
4 |
Redirects build process to use local archives instead of downloading |
b1148b9ffd9b
20843475 Upgrade Apache Tomcat to version 6.0.43
Petr Sumbera <petr.sumbera@oracle.com>
parents:
3054
diff
changeset
|
5 |
from external webs. |
b1148b9ffd9b
20843475 Upgrade Apache Tomcat to version 6.0.43
Petr Sumbera <petr.sumbera@oracle.com>
parents:
3054
diff
changeset
|
6 |
Uses newer version of Commons DBCP which builds with newer JDK. |
b1148b9ffd9b
20843475 Upgrade Apache Tomcat to version 6.0.43
Petr Sumbera <petr.sumbera@oracle.com>
parents:
3054
diff
changeset
|
7 |
|
b1148b9ffd9b
20843475 Upgrade Apache Tomcat to version 6.0.43
Petr Sumbera <petr.sumbera@oracle.com>
parents:
3054
diff
changeset
|
8 |
--- build.properties.default |
b1148b9ffd9b
20843475 Upgrade Apache Tomcat to version 6.0.43
Petr Sumbera <petr.sumbera@oracle.com>
parents:
3054
diff
changeset
|
9 |
+++ build.properties.default |
7317
bd14d5a59818
25033828 Upgrade Apache Tomcat to version 6.0.47
Petr Sumbera <petr.sumbera@oracle.com>
parents:
5535
diff
changeset
|
10 |
@@ -65,6 +65,12 @@ |
3054
6c3d483b5807
18466561 Upgrade Apache Tomcat to version 6.0.39
Petr Sumbera <petr.sumbera@oracle.com>
parents:
2727
diff
changeset
|
11 |
# repo.maven.apache.org is the same as repo2.maven.org |
6c3d483b5807
18466561 Upgrade Apache Tomcat to version 6.0.39
Petr Sumbera <petr.sumbera@oracle.com>
parents:
2727
diff
changeset
|
12 |
base-maven.loc=http://repo.maven.apache.org/maven2 |
142
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
13 |
|
288
2a474229e9a1
7002141 Problem with utility/apache
Petr Sumbera <petr.sumbera@oracle.com>
parents:
142
diff
changeset
|
14 |
+# In Userland we really don't want Tomcat to download its build |
2a474229e9a1
7002141 Problem with utility/apache
Petr Sumbera <petr.sumbera@oracle.com>
parents:
142
diff
changeset
|
15 |
+# dependencies itself but instead we will do it ourself in advance. |
2a474229e9a1
7002141 Problem with utility/apache
Petr Sumbera <petr.sumbera@oracle.com>
parents:
142
diff
changeset
|
16 |
+# Therefore those dependencies which are really required need to be |
2a474229e9a1
7002141 Problem with utility/apache
Petr Sumbera <petr.sumbera@oracle.com>
parents:
142
diff
changeset
|
17 |
+# redirected to local file system. |
2a474229e9a1
7002141 Problem with utility/apache
Petr Sumbera <petr.sumbera@oracle.com>
parents:
142
diff
changeset
|
18 |
+userland-files.loc=file://${base.path}/../../ |
2a474229e9a1
7002141 Problem with utility/apache
Petr Sumbera <petr.sumbera@oracle.com>
parents:
142
diff
changeset
|
19 |
+ |
142
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
20 |
# ----- Commons Logging, version 1.1 or later ----- |
288
2a474229e9a1
7002141 Problem with utility/apache
Petr Sumbera <petr.sumbera@oracle.com>
parents:
142
diff
changeset
|
21 |
# If this version is updated, check the versions required for the deps |
2a474229e9a1
7002141 Problem with utility/apache
Petr Sumbera <petr.sumbera@oracle.com>
parents:
142
diff
changeset
|
22 |
# - avalon-framework |
7317
bd14d5a59818
25033828 Upgrade Apache Tomcat to version 6.0.47
Petr Sumbera <petr.sumbera@oracle.com>
parents:
5535
diff
changeset
|
23 |
@@ -125,7 +131,7 @@ |
288
2a474229e9a1
7002141 Problem with utility/apache
Petr Sumbera <petr.sumbera@oracle.com>
parents:
142
diff
changeset
|
24 |
jdt.jar=${jdt.home}/ecj-${jdt.version}.jar |
2a474229e9a1
7002141 Problem with utility/apache
Petr Sumbera <petr.sumbera@oracle.com>
parents:
142
diff
changeset
|
25 |
# The download will be moved to the archive area eventually. We are taking care of that in advance. |
2a474229e9a1
7002141 Problem with utility/apache
Petr Sumbera <petr.sumbera@oracle.com>
parents:
142
diff
changeset
|
26 |
# Note older JARs were called ecj.jar. Newer JARs are called ecj-${jdt.version}.jar |
2727
1025391509eb
16945274 Upgrade Apache Tomcat to version 6.0.37
Petr Sumbera <petr.sumbera@oracle.com>
parents:
2474
diff
changeset
|
27 |
-jdt.loc.1=http://archive.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj-${jdt.version}.jar |
657
5ec76cbd6116
7131403 Upgrade Apache Tomcat to version 6.0.35
Petr Sumbera <petr.sumbera@oracle.com>
parents:
479
diff
changeset
|
28 |
+jdt.loc.1=${userland-files.loc}/ecj-${jdt.version}.jar |
2727
1025391509eb
16945274 Upgrade Apache Tomcat to version 6.0.37
Petr Sumbera <petr.sumbera@oracle.com>
parents:
2474
diff
changeset
|
29 |
jdt.loc.2=http://download.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj-${jdt.version}.jar |
142
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
30 |
|
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
31 |
# ----- Tomcat native library ----- |
7317
bd14d5a59818
25033828 Upgrade Apache Tomcat to version 6.0.47
Petr Sumbera <petr.sumbera@oracle.com>
parents:
5535
diff
changeset
|
32 |
@@ -137,16 +143,16 @@ |
2474
c9068cb41676
15990838 Upgrade Apache Tomcat to version 6.0.36
Petr Sumbera <petr.sumbera@oracle.com>
parents:
657
diff
changeset
|
33 |
tomcat-native.win.1=${base-tomcat.loc.1}/tomcat-connectors/native/${tomcat-native.version}/binaries/tomcat-native-${tomcat-native.version}-win32-bin.zip |
c9068cb41676
15990838 Upgrade Apache Tomcat to version 6.0.36
Petr Sumbera <petr.sumbera@oracle.com>
parents:
657
diff
changeset
|
34 |
tomcat-native.win.2=${base-tomcat.loc.2}/tomcat-connectors/native/${tomcat-native.version}/binaries/tomcat-native-${tomcat-native.version}-win32-bin.zip |
142
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
35 |
|
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
36 |
-# ----- Commons DBCP, version 1.1 or later ----- |
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
37 |
-commons-dbcp.version=1.3 |
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
38 |
+# ----- Commons DBCP, version 1.4 (for JDK 1.6) ----- |
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
39 |
+commons-dbcp.version=1.4 |
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
40 |
commons-dbcp.home=${base.path}/commons-dbcp-${commons-dbcp.version}-src |
479
c9b8e016b757
7080654 Upgrade Apache Tomcat to version 6.0.33
Petr Sumbera <petr.sumbera@oracle.com>
parents:
288
diff
changeset
|
41 |
-commons-dbcp-src.loc.1=${base-commons.loc.1}/dbcp/source/commons-dbcp-${commons-dbcp.version}-src.tar.gz |
c9b8e016b757
7080654 Upgrade Apache Tomcat to version 6.0.33
Petr Sumbera <petr.sumbera@oracle.com>
parents:
288
diff
changeset
|
42 |
+commons-dbcp-src.loc.1=${userland-files.loc}/commons-dbcp-${commons-dbcp.version}-src.tar.gz |
c9b8e016b757
7080654 Upgrade Apache Tomcat to version 6.0.33
Petr Sumbera <petr.sumbera@oracle.com>
parents:
288
diff
changeset
|
43 |
commons-dbcp-src.loc.2=${base-commons.loc.2}/dbcp/source/commons-dbcp-${commons-dbcp.version}-src.tar.gz |
142
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
44 |
|
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
45 |
# ----- Commons Pool, version 1.1 or later ----- |
2474
c9068cb41676
15990838 Upgrade Apache Tomcat to version 6.0.36
Petr Sumbera <petr.sumbera@oracle.com>
parents:
657
diff
changeset
|
46 |
commons-pool.version=1.5.7 |
142
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
47 |
commons-pool.home=${base.path}/commons-pool-${commons-pool.version}-src |
479
c9b8e016b757
7080654 Upgrade Apache Tomcat to version 6.0.33
Petr Sumbera <petr.sumbera@oracle.com>
parents:
288
diff
changeset
|
48 |
-commons-pool-src.loc.1=${base-commons.loc.1}/pool/source/commons-pool-${commons-pool.version}-src.tar.gz |
c9b8e016b757
7080654 Upgrade Apache Tomcat to version 6.0.33
Petr Sumbera <petr.sumbera@oracle.com>
parents:
288
diff
changeset
|
49 |
+commons-pool-src.loc.1=${userland-files.loc}/commons-pool-${commons-pool.version}-src.tar.gz |
c9b8e016b757
7080654 Upgrade Apache Tomcat to version 6.0.33
Petr Sumbera <petr.sumbera@oracle.com>
parents:
288
diff
changeset
|
50 |
commons-pool-src.loc.2=${base-commons.loc.2}/pool/source/commons-pool-${commons-pool.version}-src.tar.gz |
142
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
51 |
|
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
52 |
# ----- NSIS, version 2.0 or later ----- |