author | Petr Sumbera <petr.sumbera@oracle.com> |
Wed, 23 Jan 2013 05:00:51 -0800 | |
branch | s11-update |
changeset 2474 | c9068cb41676 |
parent 657 | 5ec76cbd6116 |
child 1387 | 6df6087cb5b9 |
permissions | -rw-r--r-- |
2474
c9068cb41676
15990838 Upgrade Apache Tomcat to version 6.0.36
Petr Sumbera <petr.sumbera@oracle.com>
parents:
657
diff
changeset
|
1 |
--- apache-tomcat-6.0.36-src/build.properties.default Tue Oct 16 01:05:51 2012 |
c9068cb41676
15990838 Upgrade Apache Tomcat to version 6.0.36
Petr Sumbera <petr.sumbera@oracle.com>
parents:
657
diff
changeset
|
2 |
+++ apache-tomcat-6.0.36-src/build.properties.default Tue Dec 4 07:56:50 2012 |
479
c9b8e016b757
7080654 Upgrade Apache Tomcat to version 6.0.33
Petr Sumbera <petr.sumbera@oracle.com>
parents:
288
diff
changeset
|
3 |
@@ -54,6 +54,12 @@ |
288
2a474229e9a1
7002141 Problem with utility/apache
Petr Sumbera <petr.sumbera@oracle.com>
parents:
142
diff
changeset
|
4 |
base-sf.loc=http://downloads.sourceforge.net |
479
c9b8e016b757
7080654 Upgrade Apache Tomcat to version 6.0.33
Petr Sumbera <petr.sumbera@oracle.com>
parents:
288
diff
changeset
|
5 |
base-maven.loc=http://repo2.maven.org/maven2 |
142
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
6 |
|
288
2a474229e9a1
7002141 Problem with utility/apache
Petr Sumbera <petr.sumbera@oracle.com>
parents:
142
diff
changeset
|
7 |
+# 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
|
8 |
+# 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
|
9 |
+# 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
|
10 |
+# redirected to local file system. |
2a474229e9a1
7002141 Problem with utility/apache
Petr Sumbera <petr.sumbera@oracle.com>
parents:
142
diff
changeset
|
11 |
+userland-files.loc=file://${base.path}/../../ |
2a474229e9a1
7002141 Problem with utility/apache
Petr Sumbera <petr.sumbera@oracle.com>
parents:
142
diff
changeset
|
12 |
+ |
142
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
13 |
# ----- Commons Logging, version 1.1 or later ----- |
288
2a474229e9a1
7002141 Problem with utility/apache
Petr Sumbera <petr.sumbera@oracle.com>
parents:
142
diff
changeset
|
14 |
# 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
|
15 |
# - avalon-framework |
479
c9b8e016b757
7080654 Upgrade Apache Tomcat to version 6.0.33
Petr Sumbera <petr.sumbera@oracle.com>
parents:
288
diff
changeset
|
16 |
@@ -114,7 +120,7 @@ |
288
2a474229e9a1
7002141 Problem with utility/apache
Petr Sumbera <petr.sumbera@oracle.com>
parents:
142
diff
changeset
|
17 |
jdt.jar=${jdt.home}/ecj-${jdt.version}.jar |
2a474229e9a1
7002141 Problem with utility/apache
Petr Sumbera <petr.sumbera@oracle.com>
parents:
142
diff
changeset
|
18 |
# 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
|
19 |
# Note older JARs were called ecj.jar. Newer JARs are called 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
|
20 |
-jdt.loc.1=http://archive.eclipse.org/eclipse/downloads/drops/${jdt.release}/ecj-${jdt.version}.jar |
5ec76cbd6116
7131403 Upgrade Apache Tomcat to version 6.0.35
Petr Sumbera <petr.sumbera@oracle.com>
parents:
479
diff
changeset
|
21 |
+jdt.loc.1=${userland-files.loc}/ecj-${jdt.version}.jar |
5ec76cbd6116
7131403 Upgrade Apache Tomcat to version 6.0.35
Petr Sumbera <petr.sumbera@oracle.com>
parents:
479
diff
changeset
|
22 |
jdt.loc.2=http://download.eclipse.org/eclipse/downloads/drops/${jdt.release}/ecj-${jdt.version}.jar |
142
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
23 |
|
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
24 |
# ----- Tomcat native library ----- |
2474
c9068cb41676
15990838 Upgrade Apache Tomcat to version 6.0.36
Petr Sumbera <petr.sumbera@oracle.com>
parents:
657
diff
changeset
|
25 |
@@ -126,16 +132,16 @@ |
c9068cb41676
15990838 Upgrade Apache Tomcat to version 6.0.36
Petr Sumbera <petr.sumbera@oracle.com>
parents:
657
diff
changeset
|
26 |
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
|
27 |
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
|
28 |
|
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
29 |
-# ----- Commons DBCP, version 1.1 or later ----- |
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
30 |
-commons-dbcp.version=1.3 |
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
31 |
+# ----- Commons DBCP, version 1.4 (for JDK 1.6) ----- |
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
32 |
+commons-dbcp.version=1.4 |
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
33 |
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
|
34 |
-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
|
35 |
+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
|
36 |
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
|
37 |
|
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
38 |
# ----- 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
|
39 |
commons-pool.version=1.5.7 |
142
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
40 |
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
|
41 |
-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
|
42 |
+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
|
43 |
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
|
44 |
|
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
45 |
# ----- NSIS, version 2.0 or later ----- |