components/tomcat-8/patches/build.properties.patch
author Petr Sumbera <petr.sumbera@oracle.com>
Tue, 29 Dec 2015 08:23:34 -0800
branchs11u3-sru
changeset 5318 efa7f7393e63
parent 4282 fcfeee656fe9
child 6483 ee6fa154236b
permissions -rw-r--r--
22363179 Upgrade Apache Tomcat to version 8.0.30
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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
b1148b9ffd9b 20843475 Upgrade Apache Tomcat to version 6.0.43
Petr Sumbera <petr.sumbera@oracle.com>
parents: 3054
diff changeset
     7
--- build.properties.default
b1148b9ffd9b 20843475 Upgrade Apache Tomcat to version 6.0.43
Petr Sumbera <petr.sumbera@oracle.com>
parents: 3054
diff changeset
     8
+++ build.properties.default
5318
efa7f7393e63 22363179 Upgrade Apache Tomcat to version 8.0.30
Petr Sumbera <petr.sumbera@oracle.com>
parents: 4282
diff changeset
     9
@@ -100,6 +100,12 @@
4282
fcfeee656fe9 PSARC/2015/209 Tomcat 8 integration
Petr Sumbera <petr.sumbera@oracle.com>
parents: 4134
diff changeset
    10
 # Mirror, was used when there were problems with the main SF downloads site
fcfeee656fe9 PSARC/2015/209 Tomcat 8 integration
Petr Sumbera <petr.sumbera@oracle.com>
parents: 4134
diff changeset
    11
 # base-sf.loc=http://sunet.dl.sourceforge.net
142
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    12
 
288
2a474229e9a1 7002141 Problem with utility/apache
Petr Sumbera <petr.sumbera@oracle.com>
parents: 142
diff changeset
    13
+# 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
    14
+# 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
    15
+# 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
    16
+# redirected to local file system.
2a474229e9a1 7002141 Problem with utility/apache
Petr Sumbera <petr.sumbera@oracle.com>
parents: 142
diff changeset
    17
+userland-files.loc=file://${base.path}/../../
2a474229e9a1 7002141 Problem with utility/apache
Petr Sumbera <petr.sumbera@oracle.com>
parents: 142
diff changeset
    18
+
142
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    19
 # ----- Commons Logging, version 1.1 or later -----
4282
fcfeee656fe9 PSARC/2015/209 Tomcat 8 integration
Petr Sumbera <petr.sumbera@oracle.com>
parents: 4134
diff changeset
    20
 # If this version is updated, check the versions required for the dependencies below
288
2a474229e9a1 7002141 Problem with utility/apache
Petr Sumbera <petr.sumbera@oracle.com>
parents: 142
diff changeset
    21
 # - avalon-framework
5318
efa7f7393e63 22363179 Upgrade Apache Tomcat to version 8.0.30
Petr Sumbera <petr.sumbera@oracle.com>
parents: 4282
diff changeset
    22
@@ -155,7 +161,7 @@
4282
fcfeee656fe9 PSARC/2015/209 Tomcat 8 integration
Petr Sumbera <petr.sumbera@oracle.com>
parents: 4134
diff changeset
    23
 jdt.home=${base.path}/ecj-${jdt.version}
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.
2727
1025391509eb 16945274 Upgrade Apache Tomcat to version 6.0.37
Petr Sumbera <petr.sumbera@oracle.com>
parents: 2474
diff changeset
    26
-jdt.loc.1=http://archive.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj-${jdt.version}.jar
4282
fcfeee656fe9 PSARC/2015/209 Tomcat 8 integration
Petr Sumbera <petr.sumbera@oracle.com>
parents: 4134
diff changeset
    27
+jdt.loc.1=file://${base.path}/ECJ/ecj.jar
2727
1025391509eb 16945274 Upgrade Apache Tomcat to version 6.0.37
Petr Sumbera <petr.sumbera@oracle.com>
parents: 2474
diff changeset
    28
 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
    29
 
5318
efa7f7393e63 22363179 Upgrade Apache Tomcat to version 8.0.30
Petr Sumbera <petr.sumbera@oracle.com>
parents: 4282
diff changeset
    30
 # ----- Tomcat native library -----