5 from external webs. |
5 from external webs. |
6 Uses newer version of Commons DBCP which builds with newer JDK. |
6 Uses newer version of Commons DBCP which builds with newer JDK. |
7 |
7 |
8 --- build.properties.default |
8 --- build.properties.default |
9 +++ build.properties.default |
9 +++ build.properties.default |
10 @@ -67,6 +67,12 @@ |
10 @@ -65,6 +65,12 @@ |
11 # repo.maven.apache.org is the same as repo2.maven.org |
11 # repo.maven.apache.org is the same as repo2.maven.org |
12 base-maven.loc=http://repo.maven.apache.org/maven2 |
12 base-maven.loc=http://repo.maven.apache.org/maven2 |
13 |
13 |
14 +# In Userland we really don't want Tomcat to download its build |
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. |
15 +# dependencies itself but instead we will do it ourself in advance. |
18 +userland-files.loc=file://${base.path}/../../ |
18 +userland-files.loc=file://${base.path}/../../ |
19 + |
19 + |
20 # ----- Commons Logging, version 1.1 or later ----- |
20 # ----- Commons Logging, version 1.1 or later ----- |
21 # If this version is updated, check the versions required for the deps |
21 # If this version is updated, check the versions required for the deps |
22 # - avalon-framework |
22 # - avalon-framework |
23 @@ -127,7 +133,7 @@ |
23 @@ -125,7 +131,7 @@ |
24 jdt.jar=${jdt.home}/ecj-${jdt.version}.jar |
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. |
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 |
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 |
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 |
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 |
29 jdt.loc.2=http://download.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj-${jdt.version}.jar |
30 |
30 |
31 # ----- Tomcat native library ----- |
31 # ----- Tomcat native library ----- |
32 @@ -139,16 +145,16 @@ |
32 @@ -137,16 +143,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 |
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 |
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 |
35 |
36 -# ----- Commons DBCP, version 1.1 or later ----- |
36 -# ----- Commons DBCP, version 1.1 or later ----- |
37 -commons-dbcp.version=1.3 |
37 -commons-dbcp.version=1.3 |