1 Patch origin: in-house |
|
2 Patch status: Solaris-specific; not suitable for upstream |
|
3 |
|
4 Redirects build process to use local archives instead of downloading |
|
5 from external webs. |
|
6 Uses newer version of Commons DBCP which builds with newer JDK. |
|
7 |
|
8 --- build.properties.default |
|
9 +++ build.properties.default |
|
10 @@ -52,6 +52,12 @@ |
|
11 # repo.maven.apache.org is the same as repo2.maven.org |
|
12 base-maven.loc=http://repo.maven.apache.org/maven2 |
|
13 |
|
14 +# In Userland we really don't want Tomcat to download its build |
|
15 +# dependencies itself but instead we will do it ourself in advance. |
|
16 +# Therefore those dependencies which are really required need to be |
|
17 +# redirected to local file system. |
|
18 +userland-files.loc=file://${base.path}/../../ |
|
19 + |
|
20 # ----- Commons Logging, version 1.1 or later ----- |
|
21 # If this version is updated, check the versions required for the deps |
|
22 # - avalon-framework |
|
23 @@ -112,7 +118,7 @@ |
|
24 jdt.jar=${jdt.home}/ecj-${jdt.version}.jar |
|
25 # The download will be moved to the archive area eventually. We are taking care of that in advance. |
|
26 # Note older JARs were called ecj.jar. Newer JARs are called ecj-${jdt.version}.jar |
|
27 -jdt.loc.1=http://archive.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj-${jdt.version}.jar |
|
28 +jdt.loc.1=${userland-files.loc}/ecj-${jdt.version}.jar |
|
29 jdt.loc.2=http://download.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj-${jdt.version}.jar |
|
30 |
|
31 # ----- Tomcat native library ----- |
|
32 @@ -124,16 +130,16 @@ |
|
33 tomcat-native.win.1=${base-tomcat.loc.1}/tomcat-connectors/native/${tomcat-native.version}/binaries/tomcat-native-${tomcat-native.version}-win32-bin.zip |
|
34 tomcat-native.win.2=${base-tomcat.loc.2}/tomcat-connectors/native/${tomcat-native.version}/binaries/tomcat-native-${tomcat-native.version}-win32-bin.zip |
|
35 |
|
36 -# ----- Commons DBCP, version 1.1 or later ----- |
|
37 -commons-dbcp.version=1.3 |
|
38 +# ----- Commons DBCP, version 1.4 (for JDK 1.6) ----- |
|
39 +commons-dbcp.version=1.4 |
|
40 commons-dbcp.home=${base.path}/commons-dbcp-${commons-dbcp.version}-src |
|
41 -commons-dbcp-src.loc.1=${base-commons.loc.1}/dbcp/source/commons-dbcp-${commons-dbcp.version}-src.tar.gz |
|
42 +commons-dbcp-src.loc.1=${userland-files.loc}/commons-dbcp-${commons-dbcp.version}-src.tar.gz |
|
43 commons-dbcp-src.loc.2=${base-commons.loc.2}/dbcp/source/commons-dbcp-${commons-dbcp.version}-src.tar.gz |
|
44 |
|
45 # ----- Commons Pool, version 1.1 or later ----- |
|
46 commons-pool.version=1.5.7 |
|
47 commons-pool.home=${base.path}/commons-pool-${commons-pool.version}-src |
|
48 -commons-pool-src.loc.1=${base-commons.loc.1}/pool/source/commons-pool-${commons-pool.version}-src.tar.gz |
|
49 +commons-pool-src.loc.1=${userland-files.loc}/commons-pool-${commons-pool.version}-src.tar.gz |
|
50 commons-pool-src.loc.2=${base-commons.loc.2}/pool/source/commons-pool-${commons-pool.version}-src.tar.gz |
|
51 |
|
52 # ----- NSIS, version 2.0 or later ----- |
|