[tomcat] 01/07: Clean-up. No functional change.

2019-07-05 Thread markt
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit 383428b0c7ee83b28f35af4aaa03448275b513fb
Author: Mark Thomas 
AuthorDate: Fri Jul 5 13:41:42 2019 +0100

Clean-up. No functional change.
---
 build.properties.default | 19 +++
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index afa85a4..4b31cc8 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -65,12 +65,13 @@ trydownload.httpusecaches=true
 # contexts by the various build scripts.
 base.path=${user.home}/tomcat-build-libs
 
-compile.source=1.6
-compile.target=1.6
 compile.debug=true
 
+# Do not pass -deprecation (-Xlint:deprecation) flag to javac
+compile.deprecation=false
+
 
base-apache.loc.1=http://www.apache.org/dyn/closer.lua?action=download&filename=
-base-apache.loc.2=http://archive.apache.org/dist
+base-apache.loc.2=https://archive.apache.org/dist
 base-commons.loc.1=${base-apache.loc.1}/commons
 base-commons.loc.2=${base-apache.loc.2}/commons
 base-tomcat.loc.1=${base-apache.loc.1}/tomcat
@@ -143,8 +144,8 @@ jaxrpc-lib.checksum.enabled=true
 jaxrpc-lib.checksum.algorithm=MD5|SHA-1
 
jaxrpc-lib.checksum.value=4bebba22a4cdb9f68e16c45129770333|fe9371d33dc3e1646d4d13bde19614283eb998b1
 jaxrpc-lib.home=${base.path}/jaxrpc-${jaxrpc-lib.version}
-jaxrpc-lib.loc=${base-maven.loc}/geronimo-spec/geronimo-spec-jaxrpc/${jaxrpc-lib.version}/geronimo-spec-jaxrpc-${jaxrpc-lib.version}.jar
 
jaxrpc-lib.jar=${jaxrpc-lib.home}/geronimo-spec-jaxrpc-${jaxrpc-lib.version}.jar
+jaxrpc-lib.loc=${base-maven.loc}/geronimo-spec/geronimo-spec-jaxrpc/${jaxrpc-lib.version}/geronimo-spec-jaxrpc-${jaxrpc-lib.version}.jar
 
 # - Webservices - WSDL4J -
 wsdl4j-lib.version=1.6.2
@@ -152,10 +153,12 @@ wsdl4j-lib.checksum.enabled=true
 wsdl4j-lib.checksum.algorithm=MD5|SHA-1
 
wsdl4j-lib.checksum.value=2608a8ea3f07b0c08de8a7d3d0d3fc09|dec1669fb6801b7328e01ad72fc9e10b69ea06c1
 wsdl4j-lib.home=${base.path}/wsdl4j-${wsdl4j-lib.version}
-wsdl4j-lib.loc=${base-maven.loc}/wsdl4j/wsdl4j/${wsdl4j-lib.version}/wsdl4j-${wsdl4j-lib.version}.jar
 wsdl4j-lib.jar=${wsdl4j-lib.home}/wsdl4j-${wsdl4j-lib.version}.jar
+wsdl4j-lib.loc=${base-maven.loc}/wsdl4j/wsdl4j/${wsdl4j-lib.version}/wsdl4j-${wsdl4j-lib.version}.jar
 
 # - Eclipse JDT, version 4.4 or later -#
+# See 
https://cwiki.apache.org/confluence/display/TOMCAT/Managing+Tomcat%27s+Dependency+on+the+Eclipse+JDT+Core+Batch+Compiler
+#
 # 4.4.2 is the latest release that runs on Java 6
 # Later versions can be used but the official builds need to use 4.4.2
 jdt.version=4.4.2
@@ -252,8 +255,8 @@ easymock.checksum.enabled=true
 easymock.checksum.algorithm=MD5|SHA-1
 
easymock.checksum.value=2d914151580d6749ba0921be7eda705a|9794114433b4788b5d6498164311ecb3a25ff262
 easymock.home=${base.path}/easymock-${easymock.version}
-easymock.loc=${base-sf.loc}/easymock/easymock-${easymock.version}.zip
 easymock.jar=${easymock.home}/easymock-${easymock.version}.jar
+easymock.loc=${base-sf.loc}/easymock/easymock-${easymock.version}.zip
 
 # - cglib, used by EasyMock, version 2.2 or later -
 cglib.version=2.2.3
@@ -261,8 +264,8 @@ cglib.checksum.enabled=true
 cglib.checksum.algorithm=MD5|SHA-1
 
cglib.checksum.value=694815351007f966c14ea093ec838323|6a4af5d9112066a5baf235fd55d5876969bc813c
 cglib.home=${base.path}/cglib-${cglib.version}
-cglib.loc=${base-sf.loc}/cglib/cglib-nodep-${cglib.version}.jar
 cglib.jar=${cglib.home}/cglib-nodep-${cglib.version}.jar
+cglib.loc=${base-sf.loc}/cglib/cglib-nodep-${cglib.version}.jar
 
 # - objenesis, used by EasyMock, version 1.2 or later -
 objenesis.version=1.2
@@ -270,8 +273,8 @@ objenesis.checksum.enabled=true
 objenesis.checksum.algorithm=SHA-1
 objenesis.checksum.value=2359e04aca6f4f171f92ff77489d1669043dd536
 objenesis.home=${base.path}/objenesis-${objenesis.version}
-objenesis.loc=https://bintray.com/easymock/distributions/download_file?file_path=objenesis-${objenesis.version}-bin.zip
 objenesis.jar=${objenesis.home}/objenesis-${objenesis.version}.jar
+objenesis.loc=https://bintray.com/easymock/distributions/download_file?file_path=objenesis-${objenesis.version}-bin.zip
 
 # - Checkstyle, version 6.0 or later -
 # Limited to 6.1.1 since that is the latest release that supports Java 6


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[tomcat] 01/07: Clean-up. No functional change.

2019-12-06 Thread markt
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit 14dea885579e275dc3633b2a0df328dff5beb653
Author: Mark Thomas 
AuthorDate: Thu Dec 5 19:59:47 2019 +

Clean-up. No functional change.
---
 .../apache/catalina/authenticator/Constants.java   | 41 ++
 1 file changed, 10 insertions(+), 31 deletions(-)

diff --git a/java/org/apache/catalina/authenticator/Constants.java 
b/java/org/apache/catalina/authenticator/Constants.java
index 452a4f0..69b6066 100644
--- a/java/org/apache/catalina/authenticator/Constants.java
+++ b/java/org/apache/catalina/authenticator/Constants.java
@@ -14,11 +14,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
-
 package org.apache.catalina.authenticator;
 
-
 public class Constants {
 // Authentication methods for login configuration
 // Servlet spec schemes are defined in HttpServletRequest
@@ -33,17 +30,13 @@ public class Constants {
 // SPNEGO authentication constants
 public static final String KRB5_CONF_PROPERTY = "java.security.krb5.conf";
 public static final String DEFAULT_KRB5_CONF = "conf/krb5.ini";
-public static final String JAAS_CONF_PROPERTY =
-"java.security.auth.login.config";
+public static final String JAAS_CONF_PROPERTY = 
"java.security.auth.login.config";
 public static final String DEFAULT_JAAS_CONF = "conf/jaas.conf";
-public static final String DEFAULT_LOGIN_MODULE_NAME =
-"com.sun.security.jgss.krb5.accept";
+public static final String DEFAULT_LOGIN_MODULE_NAME = 
"com.sun.security.jgss.krb5.accept";
 
 // Cookie name for single sign on support
-public static final String SINGLE_SIGN_ON_COOKIE =
-System.getProperty(
-
"org.apache.catalina.authenticator.Constants.SSO_SESSION_COOKIE_NAME",
-"JSESSIONIDSSO");
+public static final String SINGLE_SIGN_ON_COOKIE = System.getProperty(
+
"org.apache.catalina.authenticator.Constants.SSO_SESSION_COOKIE_NAME", 
"JSESSIONIDSSO");
 
 
 // - Request Notes
@@ -52,17 +45,13 @@ public class Constants {
  * The notes key to track the single-sign-on identity with which this
  * request is associated.
  */
-public static final String REQ_SSOID_NOTE =
-"org.apache.catalina.request.SSOID";
+public static final String REQ_SSOID_NOTE = 
"org.apache.catalina.request.SSOID";
 
-
-public static final String REQ_JASPIC_SUBJECT_NOTE =
-"org.apache.catalina.authenticator.jaspic.SUBJECT";
+public static final String REQ_JASPIC_SUBJECT_NOTE = 
"org.apache.catalina.authenticator.jaspic.SUBJECT";
 
 
 // -- Session Notes
 
-
 /**
  * If the cache property of our authenticator is set, and
  * the current request is part of a session, authentication information
@@ -70,19 +59,15 @@ public class Constants {
  * Realm.authenticate(), under the following keys:
  */
 
-
 /**
  * The notes key for the password used to authenticate this user.
  */
-public static final String SESS_PASSWORD_NOTE =
-  "org.apache.catalina.session.PASSWORD";
-
+public static final String SESS_PASSWORD_NOTE = 
"org.apache.catalina.session.PASSWORD";
 
 /**
  * The notes key for the username used to authenticate this user.
  */
-public static final String SESS_USERNAME_NOTE =
-  "org.apache.catalina.session.USERNAME";
+public static final String SESS_USERNAME_NOTE = 
"org.apache.catalina.session.USERNAME";
 
 
 /**
@@ -90,20 +75,14 @@ public class Constants {
  * cache required information prior to the completion of authentication.
  */
 
-
 /**
  * The previously authenticated principal (if caching is disabled).
  */
-public static final String FORM_PRINCIPAL_NOTE =
-"org.apache.catalina.authenticator.PRINCIPAL";
-
+public static final String FORM_PRINCIPAL_NOTE = 
"org.apache.catalina.authenticator.PRINCIPAL";
 
 /**
  * The original request information, to which the user will be
  * redirected if authentication succeeds.
  */
-public static final String FORM_REQUEST_NOTE =
-"org.apache.catalina.authenticator.REQUEST";
-
-
+public static final String FORM_REQUEST_NOTE = 
"org.apache.catalina.authenticator.REQUEST";
 }


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org