svn commit: r1834283 - in /tomcat/tc8.5.x/trunk: build.properties.default res/maven/mvn.properties.default webapps/docs/changelog.xml
Author: markt Date: Mon Jun 25 07:30:01 2018 New Revision: 1834283 URL: http://svn.apache.org/viewvc?rev=1834283&view=rev Log: Increment version number for next dev cycle Modified: tomcat/tc8.5.x/trunk/build.properties.default tomcat/tc8.5.x/trunk/res/maven/mvn.properties.default tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Modified: tomcat/tc8.5.x/trunk/build.properties.default URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/build.properties.default?rev=1834283&r1=1834282&r2=1834283&view=diff == --- tomcat/tc8.5.x/trunk/build.properties.default (original) +++ tomcat/tc8.5.x/trunk/build.properties.default Mon Jun 25 07:30:01 2018 @@ -25,7 +25,7 @@ # - Version Control Flags - version.major=8 version.minor=5 -version.build=32 +version.build=33 version.patch=0 version.suffix=-dev Modified: tomcat/tc8.5.x/trunk/res/maven/mvn.properties.default URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/res/maven/mvn.properties.default?rev=1834283&r1=1834282&r2=1834283&view=diff == --- tomcat/tc8.5.x/trunk/res/maven/mvn.properties.default (original) +++ tomcat/tc8.5.x/trunk/res/maven/mvn.properties.default Mon Jun 25 07:30:01 2018 @@ -39,7 +39,7 @@ maven.asf.release.repo.url=https://repos maven.asf.release.repo.repositoryId=apache.releases.https # Release version info -maven.asf.release.deploy.version=8.5.32 +maven.asf.release.deploy.version=8.5.33 #Where do we load the libraries from tomcat.lib.path=../../output/build/lib Modified: tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml?rev=1834283&r1=1834282&r2=1834283&view=diff == --- tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Mon Jun 25 07:30:01 2018 @@ -54,7 +54,7 @@ - + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1834293 - in /tomcat/trunk/test/javax/websocket: TestContainerProviderPerformance.java TesterContainerProviderPerformance.java
Author: markt
Date: Mon Jun 25 10:09:29 2018
New Revision: 1834293
URL: http://svn.apache.org/viewvc?rev=1834293&view=rev
Log:
Rename to exclude from tests as this is a support class not a test case (it has
not assertions).
It exists to explore performance differences if
ContainerProvider.getWebSocketContainer() is refactored.
Added:
tomcat/trunk/test/javax/websocket/TesterContainerProviderPerformance.java
- copied, changed from r1834292,
tomcat/trunk/test/javax/websocket/TestContainerProviderPerformance.java
Removed:
tomcat/trunk/test/javax/websocket/TestContainerProviderPerformance.java
Copied:
tomcat/trunk/test/javax/websocket/TesterContainerProviderPerformance.java (from
r1834292,
tomcat/trunk/test/javax/websocket/TestContainerProviderPerformance.java)
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/javax/websocket/TesterContainerProviderPerformance.java?p2=tomcat/trunk/test/javax/websocket/TesterContainerProviderPerformance.java&p1=tomcat/trunk/test/javax/websocket/TestContainerProviderPerformance.java&r1=1834292&r2=1834293&rev=1834293&view=diff
==
--- tomcat/trunk/test/javax/websocket/TestContainerProviderPerformance.java
(original)
+++ tomcat/trunk/test/javax/websocket/TesterContainerProviderPerformance.java
Mon Jun 25 10:09:29 2018
@@ -23,7 +23,7 @@ import org.junit.Test;
import org.apache.tomcat.unittest.TesterThreadedPerformance;
-public class TestContainerProviderPerformance {
+public class TesterContainerProviderPerformance {
@Test
public void testGetWebSocketContainer() throws Exception {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1834295 - /tomcat/trunk/test/org/apache/tomcat/jni/TestSocketServer.java
Author: markt
Date: Mon Jun 25 10:24:31 2018
New Revision: 1834295
URL: http://svn.apache.org/viewvc?rev=1834295&view=rev
Log:
Improve debug messages when test fails
Modified:
tomcat/trunk/test/org/apache/tomcat/jni/TestSocketServer.java
Modified: tomcat/trunk/test/org/apache/tomcat/jni/TestSocketServer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/jni/TestSocketServer.java?rev=1834295&r1=1834294&r2=1834295&view=diff
==
--- tomcat/trunk/test/org/apache/tomcat/jni/TestSocketServer.java (original)
+++ tomcat/trunk/test/org/apache/tomcat/jni/TestSocketServer.java Mon Jun 25
10:24:31 2018
@@ -108,9 +108,9 @@ public class TestSocketServer extends Ab
while (Socket.recv(clientSocket, buf, 0, 1) == 1) {
}
long wait = System.nanoTime() - start;
-Assert.assertFalse("Socket.timeoutSet failed (<1s) [" + wait + "]",
+Assert.assertFalse("Socket.timeoutSet failed (<1s) [" + wait + "] +-["
+ ERROR_MARGIN + "]",
wait < 10 - ERROR_MARGIN);
-Assert.assertFalse("Socket.timeoutSet failed (>2s) [" + wait + "]",
+Assert.assertFalse("Socket.timeoutSet failed (>2s) [" + wait + "] +-["
+ ERROR_MARGIN + "]",
wait > 20 + ERROR_MARGIN);
client.countDown();
@@ -137,8 +137,8 @@ public class TestSocketServer extends Ab
while (Socket.recv(clientSocket, buf, 0, 1) == 1) {
}
long wait = System.nanoTime() - start;
-Assert.assertFalse("non_blocking client Socket.APR_SO_NONBLOCK failed
(>2ms)",
-wait > 200 + ERROR_MARGIN);
+Assert.assertFalse("non_blocking client Socket.APR_SO_NONBLOCK failed
(>2ms) [" + wait +
+"] +-[" + ERROR_MARGIN + "]", wait > 200 + ERROR_MARGIN);
client.countDown();
client.join();
@@ -162,8 +162,8 @@ public class TestSocketServer extends Ab
while (Socket.recv(clientSocket, buf, 0, 1) == 1) {
}
long wait = System.nanoTime() - start;
-Assert.assertFalse("non_blocking client Socket.APR_SO_NONBLOCK failed
(>1ms)",
-wait > 100 + ERROR_MARGIN);
+Assert.assertFalse("non_blocking client Socket.APR_SO_NONBLOCK failed
(>1ms) [" + wait +
+"] +-[" + ERROR_MARGIN + "]", wait > 100 + ERROR_MARGIN);
/* Configure for blocking */
Socket.optSet(clientSocket, Socket.APR_SO_NONBLOCK, 0);
@@ -172,8 +172,8 @@ public class TestSocketServer extends Ab
while (Socket.recv(clientSocket, buf, 0, 1) == 1) {
}
wait = System.nanoTime() - start;
-Assert.assertFalse("non_blocking client Socket.APR_SO_NONBLOCK false
failed",
-wait < 100 - ERROR_MARGIN);
+Assert.assertFalse("non_blocking client Socket.APR_SO_NONBLOCK false
failed (<1ms) [" +
+wait + "] +-[" + ERROR_MARGIN + "]", wait < 100 -
ERROR_MARGIN);
client.countDown();
client.join();
@@ -195,8 +195,8 @@ public class TestSocketServer extends Ab
}
long wait = System.nanoTime() - start;
Assert.assertTrue("Timeout failed", ok);
-Assert.assertFalse("non_blocking accept Socket.APR_SO_NONBLOCK failed
([" + wait + "]>1ms)",
-wait > 100 + ERROR_MARGIN);
+Assert.assertFalse("non_blocking accept Socket.APR_SO_NONBLOCK failed
(>1ms) [" + wait +
+"] +-[" + ERROR_MARGIN + "]", wait > 100 + ERROR_MARGIN);
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat 9.0.10
On 22/06/18 10:47, Konstantin Kolinko wrote: > 2. Unit tests (Java 8u172 32-bit x All connectors): OK, but two issues > 1). full run running serially was 5 hours (297 minutes), > and 1 hour of that was wasted by a single test, running for 20 minutes > * 3 connectors: > javax.websocket.TestContainerProviderPerformance I've renamed that test Tester... as it does not contain any assertions. > 2) org.apache.tomcat.jni.TestSocketServer fails for all connectors. >[concat] Testsuites with failed tests: >[concat] TEST-org.apache.tomcat.jni.TestSocketServer.APR.txt >[concat] TEST-org.apache.tomcat.jni.TestSocketServer.NIO.txt >[concat] TEST-org.apache.tomcat.jni.TestSocketServer.NIO2.txt > > It is not a showstopper. It is JNI internals test, and failures are > apparently caused by timer accuracy. Some test have already been > corrected to be more tolerant, but apparently not all of them. I've improved the debug logging so we can see how far out the error margin is. Thanks for the feedback. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat 9.0.10
On 20/06/18 20:45, Mark Thomas wrote: > The proposed 9.0.10 release is: > [ ] Broken - do not release > [X] Stable - go ahead and release as 9.0.10 Unit tests pass for NIO, NIO2 and APR/native on Windows, Linux and OSX. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[VOTE][RESULT] Release Apache Tomcat 9.0.10
The following votes were cast: binding: +1: remm, huxing, kkolinko, markt non-binding: +1: rmannibucau The vote therefore passes. Thanks to everyone who contributed to this release. Mark On 20/06/18 20:45, Mark Thomas wrote: > The proposed Apache Tomcat 9.0.10 release is now available for voting. > > Note: > 9.0.9 was tagged and uploaded when BZ 62476 was created and the decision > was taken to re-tag to pick up that fix. > > The major changes compared to the 9.0.8 release are: > > - Add the RemoteCIDRFilter and RemoteCIDRValve that can be used to > allow/deny requests based on IPv4 and/or IPv6 client address where the > IP ranges are defined using CIDR notation. > Based on a patch by Francis Galiegue. > > - Use NIO2 API for websockets writes. > > - Update the packaged version of the Tomcat Native Library to 1.2.17 to > pick up the latest Windows binaries built with APR 1.6.3 and OpenSSL > 1.0.2o. > > - Correct a regression in the Host validation by removing the > requirement that the final component of a FQDN must be alphabetic. > > Along with lots of other bug fixes and improvements. > > For full details, see the changelog: > http://svn.apache.org/repos/asf/tomcat/trunk/webapps/docs/changelog.xml > > It can be obtained from: > https://dist.apache.org/repos/dist/dev/tomcat/tomcat-9/v9.0.10/ > The Maven staging repo is: > https://repository.apache.org/content/repositories/orgapachetomcat-1186/ > The svn tag is: > http://svn.apache.org/repos/asf/tomcat/tags/TOMCAT_9_0_10/ > > The proposed 9.0.10 release is: > [ ] Broken - do not release > [ ] Stable - go ahead and release as 9.0.10 > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat 8.5.32
On 20/06/18 21:27, Mark Thomas wrote: > The proposed 8.5.32 release is: > [ ] Broken - do not release > [X] Stable - go ahead and release as 8.5.32 Unit tests pass for NIO, NIO2 and APR/native on Windows, Linux and OSX. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[VOTE][RESULT] Release Apache Tomcat 8.5.32
The following votes were cast: Binding: +1: remm, kkolinko, huxing, markt The vote therefore passes. Thanks to everyone who contributed to this release. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1834305 - /tomcat/trunk/build.properties.default
Author: markt
Date: Mon Jun 25 11:20:46 2018
New Revision: 1834305
URL: http://svn.apache.org/viewvc?rev=1834305&view=rev
Log:
Remove unused property
Modified:
tomcat/trunk/build.properties.default
Modified: tomcat/trunk/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.properties.default?rev=1834305&r1=1834304&r2=1834305&view=diff
==
--- tomcat/trunk/build.properties.default (original)
+++ tomcat/trunk/build.properties.default Mon Jun 25 11:20:46 2018
@@ -201,7 +201,6 @@ checkstyle.jar=${checkstyle.home}/checks
cobertura.version=2.1.1
cobertura.home=${base.path}/cobertura-${cobertura.version}
cobertura.jar=${cobertura.home}/cobertura-${cobertura.version}.jar
-cobertura.lib=${cobertura.home}/lib
cobertura.loc=${base-sf.loc}/cobertura/cobertura-2.1.1-bin.tar.gz
# - Findbugs -
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1834306 - /tomcat/trunk/build.properties.default
Author: markt
Date: Mon Jun 25 11:24:08 2018
New Revision: 1834306
URL: http://svn.apache.org/viewvc?rev=1834306&view=rev
Log:
Consistent ordering:
version, home, jar, location
Modified:
tomcat/trunk/build.properties.default
Modified: tomcat/trunk/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.properties.default?rev=1834306&r1=1834305&r2=1834306&view=diff
==
--- tomcat/trunk/build.properties.default (original)
+++ tomcat/trunk/build.properties.default Mon Jun 25 11:24:08 2018
@@ -106,14 +106,14 @@ base-maven.loc=https://repo.maven.apache
# - Webservices - JAX RPC -
jaxrpc-lib.version=1.1-rc4
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
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.7 or later -#
# See https://wiki.apache.org/tomcat/JDTCoreBatchCompiler before updating
@@ -176,26 +176,26 @@ hamcrest.loc=${base-maven.loc}/org/hamcr
# - EasyMock, version 3.2 or later -
easymock.version=3.2
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
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
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.16 or later -
checkstyle.version=6.17
checkstyle.home=${base.path}/checkstyle-${checkstyle.version}
-checkstyle.loc=${base-sf.loc}/checkstyle/checkstyle/${checkstyle.version}/checkstyle-${checkstyle.version}-all.jar
checkstyle.jar=${checkstyle.home}/checkstyle-${checkstyle.version}-all.jar
+checkstyle.loc=${base-sf.loc}/checkstyle/checkstyle/${checkstyle.version}/checkstyle-${checkstyle.version}-all.jar
# - Cobertura code coverage tool -
cobertura.version=2.1.1
@@ -215,16 +215,16 @@ findbugs.loc=${base-sf.loc}/project/find
# - CDDL Licensed -
saaj-api.version=1.3.5
saaj-api.home=${base.path}/saaj-api-${saaj-api.version}
-saaj-api.loc=${base-maven.loc}/javax/xml/soap/saaj-api/${saaj-api.version}/saaj-api-${saaj-api.version}.jar
saaj-api.jar=${saaj-api.home}/saaj-api-${saaj-api.version}.jar
+saaj-api.loc=${base-maven.loc}/javax/xml/soap/saaj-api/${saaj-api.version}/saaj-api-${saaj-api.version}.jar
# - bnd & bndlib, version 4.0.0 or later -
# - provides OSGI metadata for JARs -
bnd.version=4.0.0
bnd.home=${base.path}/bnd-${bnd.version}
-bnd.loc=${base-maven.loc}/biz/aQute/bnd/biz.aQute.bnd/${bnd.version}/biz.aQute.bnd-${bnd.version}.jar
bnd.jar=${bnd.home}/biz.aQute.bnd-${bnd.version}.jar
+bnd.loc=${base-maven.loc}/biz/aQute/bnd/biz.aQute.bnd/${bnd.version}/biz.aQute.bnd-${bnd.version}.jar
bndlib.home=${base.path}/bndlib-${bnd.version}
-bndlib.loc=${base-maven.loc}/biz/aQute/bnd/biz.aQute.bndlib/${bnd.version}/biz.aQute.bndlib-${bnd.version}.jar
bndlib.jar=${bndlib.home}/biz.aQute.bndlib-${bnd.version}.jar
+bndlib.loc=${base-maven.loc}/biz/aQute/bnd/biz.aQute.bndlib/${bnd.version}/biz.aQute.bndlib-${bnd.version}.jar
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1834307 - /tomcat/trunk/build.properties.default
Author: markt
Date: Mon Jun 25 11:24:47 2018
New Revision: 1834307
URL: http://svn.apache.org/viewvc?rev=1834307&view=rev
Log:
Simplify / make consistent
Modified:
tomcat/trunk/build.properties.default
Modified: tomcat/trunk/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.properties.default?rev=1834307&r1=1834306&r2=1834307&view=diff
==
--- tomcat/trunk/build.properties.default (original)
+++ tomcat/trunk/build.properties.default Mon Jun 25 11:24:47 2018
@@ -206,8 +206,7 @@ cobertura.loc=${base-sf.loc}/cobertura/c
# - Findbugs -
findbugs.version=3.0.1
findbugs.home=${base.path}/findbugs-${findbugs.version}
-findbugs.lib=${findbugs.home}/lib
-findbugs.jar=${findbugs.lib}/findbugs-ant.jar
+findbugs.jar=${findbugs.home}/lib/findbugs-ant.jar
findbugs.loc=${base-sf.loc}/project/findbugs/findbugs/${findbugs.version}/findbugs-${findbugs.version}.tar.gz
# - SAAJ API, used by Code Signing for releases -
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1834310 - /tomcat/trunk/build.xml
Author: markt Date: Mon Jun 25 12:05:08 2018 New Revision: 1834310 URL: http://svn.apache.org/viewvc?rev=1834310&view=rev Log: Fix indent Modified: tomcat/trunk/build.xml Modified: tomcat/trunk/build.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1834310&r1=1834309&r2=1834310&view=diff == --- tomcat/trunk/build.xml (original) +++ tomcat/trunk/build.xml Mon Jun 25 12:05:08 2018 @@ -1557,12 +1557,12 @@ - - - - - - + + + + + + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 62488] New: Obtain dependencies from Maven Central where possible
https://bz.apache.org/bugzilla/show_bug.cgi?id=62488 Bug ID: 62488 Summary: Obtain dependencies from Maven Central where possible Product: Tomcat 9 Version: unspecified Hardware: PC OS: Linux Status: NEW Severity: normal Priority: P2 Component: Packaging Assignee: dev@tomcat.apache.org Reporter: ma...@apache.org Target Milestone: - Talking with michaelo at the ApacheCon EU Roadshow, he mentioned that the way Tomcat pulls dependencies from multiple locations makes it harder to build from source when located behind a strict firewall. He suggested obtaining references from Maven Central where possible as most orgs have a mechanism for proxying / caching Maven Central. Not all dependencies are available from Maven Central (e.g. NSIS is not) but any progress we can make on this would be helpful. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 62488] Obtain dependencies from Maven Central where possible
https://bz.apache.org/bugzilla/show_bug.cgi?id=62488 Mark Thomas changed: What|Removed |Added Severity|normal |enhancement --- Comment #1 from Mark Thomas --- Whoops. Should have created this as an enhancement request. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 62488] Obtain dependencies from Maven Central where possible
https://bz.apache.org/bugzilla/show_bug.cgi?id=62488 --- Comment #2 from Remy Maucherat --- So you simply base all downloads (except one) on https://repo.maven.apache.org/maven2/ ? Why not. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 62488] Obtain dependencies from Maven Central where possible
https://bz.apache.org/bugzilla/show_bug.cgi?id=62488 --- Comment #3 from Emmanuel Bourg --- What about using the Maven Ant Tasks? https://maven.apache.org/resolver-ant-tasks/ -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 62488] Obtain dependencies from Maven Central where possible
https://bz.apache.org/bugzilla/show_bug.cgi?id=62488 --- Comment #4 from Mark Thomas --- (In reply to Emmanuel Bourg from comment #3) > What about using the Maven Ant Tasks? I'm on the fence. For: It would handle dependencies of dependencies Against: It is another component that would have to be downloaded (manually?) first. At the moment, we obtain a number of dependencies from Maven Central. My plan was to see how many of the others could be easily switched and then see where we were. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1834354 - in /tomcat/trunk: build.properties.default build.xml
Author: markt
Date: Mon Jun 25 18:06:22 2018
New Revision: 1834354
URL: http://svn.apache.org/viewvc?rev=1834354&view=rev
Log:
Switch Objensis source to Maven Central
Modified:
tomcat/trunk/build.properties.default
tomcat/trunk/build.xml
Modified: tomcat/trunk/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.properties.default?rev=1834354&r1=1834353&r2=1834354&view=diff
==
--- tomcat/trunk/build.properties.default (original)
+++ tomcat/trunk/build.properties.default Mon Jun 25 18:06:22 2018
@@ -189,7 +189,7 @@ cglib.loc=${base-sf.loc}/cglib/cglib-nod
objenesis.version=1.2
objenesis.home=${base.path}/objenesis-${objenesis.version}
objenesis.jar=${objenesis.home}/objenesis-${objenesis.version}.jar
-objenesis.loc=https://bintray.com/easymock/distributions/download_file?file_path=objenesis-${objenesis.version}-bin.zip
+objenesis.loc=${base-maven.loc}/org/objenesis/objenesis/${objenesis.version}/objenesis-${objenesis.version}.jar
# - Checkstyle, version 6.16 or later -
checkstyle.version=6.17
Modified: tomcat/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1834354&r1=1834353&r2=1834354&view=diff
==
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Mon Jun 25 18:06:22 2018
@@ -2706,10 +2706,10 @@ skip.installer property in build.propert
-
+
-
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1834356 - in /tomcat/trunk: build.properties.default build.xml res/ide-support/eclipse/eclipse.classpath
Author: markt
Date: Mon Jun 25 18:19:55 2018
New Revision: 1834356
URL: http://svn.apache.org/viewvc?rev=1834356&view=rev
Log:
Switch EasyMock and cglib source to Maven Central
Note that EasyMock 2.2.3 wasn't available from Maven Central so I went back a
version to 2.2.2. I confirmed that the tests pass.
Modified:
tomcat/trunk/build.properties.default
tomcat/trunk/build.xml
tomcat/trunk/res/ide-support/eclipse/eclipse.classpath
Modified: tomcat/trunk/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.properties.default?rev=1834356&r1=1834355&r2=1834356&view=diff
==
--- tomcat/trunk/build.properties.default (original)
+++ tomcat/trunk/build.properties.default Mon Jun 25 18:19:55 2018
@@ -177,13 +177,13 @@ hamcrest.loc=${base-maven.loc}/org/hamcr
easymock.version=3.2
easymock.home=${base.path}/easymock-${easymock.version}
easymock.jar=${easymock.home}/easymock-${easymock.version}.jar
-easymock.loc=${base-sf.loc}/easymock/easymock-${easymock.version}.zip
+easymock.loc=${base-maven.loc}/org/easymock/easymock/${easymock.version}/easymock-${easymock.version}.jar
# - cglib, used by EasyMock, version 2.2 or later -
-cglib.version=2.2.3
+cglib.version=2.2.2
cglib.home=${base.path}/cglib-${cglib.version}
cglib.jar=${cglib.home}/cglib-nodep-${cglib.version}.jar
-cglib.loc=${base-sf.loc}/cglib/cglib-nodep-${cglib.version}.jar
+cglib.loc=${base-maven.loc}/cglib/cglib-nodep/${cglib.version}/cglib-nodep-${cglib.version}.jar
# - objenesis, used by EasyMock, version 1.2 or later -
objenesis.version=1.2
Modified: tomcat/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1834356&r1=1834355&r2=1834356&view=diff
==
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Mon Jun 25 18:19:55 2018
@@ -2694,10 +2694,10 @@ skip.installer property in build.propert
-
+
-
+
Modified: tomcat/trunk/res/ide-support/eclipse/eclipse.classpath
URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/ide-support/eclipse/eclipse.classpath?rev=1834356&r1=1834355&r2=1834356&view=diff
==
--- tomcat/trunk/res/ide-support/eclipse/eclipse.classpath (original)
+++ tomcat/trunk/res/ide-support/eclipse/eclipse.classpath Mon Jun 25 18:19:55
2018
@@ -27,7 +27,7 @@
-
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot failure in on tomcat-trunk
The Buildbot has detected a new failure on builder tomcat-trunk while building . Full details are available at: https://ci.apache.org/builders/tomcat-trunk/builds/3397 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: silvanus_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' triggered this build Build Source Stamp: [branch tomcat/trunk] 1834356 Blamelist: markt BUILD FAILED: failed compile_1 Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 62488] Obtain dependencies from Maven Central where possible
https://bz.apache.org/bugzilla/show_bug.cgi?id=62488 --- Comment #5 from Mark Thomas --- I've done the simple ones (there were three of them). There are now seven dependencies not obtained from Maven Central. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 62488] Obtain dependencies from Maven Central where possible
https://bz.apache.org/bugzilla/show_bug.cgi?id=62488 --- Comment #6 from Michael Osipov <1983-01...@gmx.net> --- Mark, thanks for raising! Let me add some stuff here what I'd like to see/expect: Easily swappable URL of Maven Central against an internal Nexus instance, providing credentials for it. At best, we'd use the Resolver Ant Tasks which I can finish and publish to Central. It requires an Über JAR (either lightweight/URLConnection or with HttpComponents Client) which I wouldn't commit along with the code, but would require it to be in Ant's classpath. The best about this, you can define classpath entries for test and compilation and the tasks do the rest for you. People could leverage their settings.xml. Using Ant's get task if fine for the first shot. This is what I do with those tasks at work to customize the vanilla Tomcat tarball from Central with some internal and external libraries. I'd be happy to test a patch. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 62488] Obtain dependencies from Maven Central where possible
https://bz.apache.org/bugzilla/show_bug.cgi?id=62488 --- Comment #7 from Michael Osipov <1983-01...@gmx.net> --- (In reply to Emmanuel Bourg from comment #3) > What about using the Maven Ant Tasks? > > https://maven.apache.org/resolver-ant-tasks/ Please don't call them Maven Ant Tasks, those have been deprecated by me long time ago. The Resolver Ant Tasks have nothing to do with them. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 62488] Obtain dependencies from Maven Central where possible
https://bz.apache.org/bugzilla/show_bug.cgi?id=62488 --- Comment #8 from Emmanuel Bourg --- (In reply to Michael Osipov from comment #7) > Please don't call them Maven Ant Tasks, those have been deprecated by me > long time ago. The Resolver Ant Tasks have nothing to do with them. Well, the full name is "Maven Artifact Resolver Ant Tasks" but that's rather long and boring ;) -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: JDK 11 EA 18
William, On 6/20/18 9:21 PM, William L. Thomson Jr. wrote: > Turns out my issues were due to resources ending up in a sub-directory, > prefixed with java/org, like find out in sources. One aspect I would > like to see done if possible. Tomcat mixes a lot of stuff into the same > directories. Its layout and what not started before the normal java > conventions now such as; > > src/main/java > src/main/resources > > It would be great if tomcat could move towards such structure. My > problem was due to grabbing resources that are mixed in with sources. > Then failing to strip java/ from the path as I copied over the files > into the jar. Various properties and xml files. I understand some > properties files need be in the same folders but other stuff like xml. > But many of those can be merged at build time. > > Packaging hundreds of Java applications. Very few mix in resources with > source files. Thus my logic for handling such cases was off. Self > inflicted problem, but would help if project layout was better. > > Utopian would be moving various pieces into sub-directories for the > various jars. I had to be creative to get my jars to be the same as > those from upstream. Due to sources all being mixed together. Beyond > mixing resources and java sources. I'm confused about what you're asking, here. Do you want Tomcat to change its own directory layout? Why? -chris signature.asc Description: OpenPGP digital signature
Re: JDK 11 EA 18
On Mon, 25 Jun 2018 19:40:27 -0400 Christopher Schultz wrote: > I'm confused about what you're asking, here. Do you want Tomcat to > change its own directory layout? Ideally yes, like a directory per jar, with src/java/main src/java/resources Jetty is good example or Netbeans https://github.com/eclipse/jetty.project https://github.com/apache/incubator-netbeans > Why? Because I am crazy :) It makes packaging it easier IMHO. Each directory contains what ends up in a given jar. Right now they are all mixed together in java, including resources. Fine if you use the build system. But then its all or nothing. Cannot really build a jar, or just those needed/wanted. Tomcat on Gentoo used to use ant and was a monolithic package short of servlet-api. Which still exists in Gentoo. https://github.com/gentoo/gentoo/blob/master/www-servers/tomcat/tomcat-9.0.7.ebuild https://github.com/gentoo/gentoo/blob/master/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.7.ebuild I have split it out to be a package per jar. Its working great, it was just a bit of a pain to find what goes in each jar. If that changes, I will have to match jar contents again. Make sure correct classes are going in the correct jar, and resources. See all the tomcat-* packages here, one per jar https://github.com/Obsidian-StudiosInc/os-xtoo/tree/master/dev-java Some are a bit tricky to package I have to remove some files or specify which to include. It is not really ideal. Example of matching jar contents https://github.com/Obsidian-StudiosInc/os-xtoo/blob/master/dev-java/tomcat-jasper/tomcat-jasper-.ebuild#L39 Then I have a meta package, that just pulls in all others to form the actual tomcat installation. Meta package https://github.com/Obsidian-StudiosInc/os-xtoo/blob/master/www-servers/tomcat/tomcat-.ebuild The individual packages allow for embedded use and for development etc. Like say using Tomcat in Netbeans. This way Netbeans has access to all Tomcat jars, but does not require a server package to be installed. Even better Netbeans can have its own "Tomcat install", linking in jars into its own local server space with its own config, etc. Before others were doing stuff with the server package. If making an embedded app, you can pull in what jars you need, rather than building all of tomcat and having init scripts and other stuff laying around unused. Just makes it a bit more modular. A different way of shipping Tomcat :) -- William L. Thomson Jr. pgp0e4GA3mO9H.pgp Description: OpenPGP digital signature
Re: JDK 11 EA 18
On Mon, 25 Jun 2018 23:21:47 -0400 "William L. Thomson Jr." wrote: > On Mon, 25 Jun 2018 19:40:27 -0400 > Christopher Schultz wrote: > > > I'm confused about what you're asking, here. Do you want Tomcat to > > change its own directory layout? > > Ideally yes, like a directory per jar, with > > src/java/main > src/java/resources Totally messed that up... src/main/java src/main/resources -- William L. Thomson Jr. pgpESPesoUYDT.pgp Description: OpenPGP digital signature
