See
<https://ci-builds.apache.org/job/Wicket/job/wicket-9.x/157/display/redirect>
Changes:
------------------------------------------
[...truncated 35.45 KB...]
CONFLICT (content): Merge conflict in
wicket-native-websocket/wicket-native-websocket-javax/src/main/java/org/apache/wicket/protocol/ws/javax/JavaxWebSocketConnection.java
Auto-merging
wicket-native-websocket/wicket-native-websocket-javax/src/main/java/org/apache/wicket/protocol/ws/javax/JavaxUpgradeHttpRequest.java
Auto-merging
wicket-native-websocket/wicket-native-websocket-javax/src/main/java/module-info.java
CONFLICT (add/add): Merge conflict in
wicket-native-websocket/wicket-native-websocket-javax/src/main/java/module-info.java
Auto-merging wicket-native-websocket/wicket-native-websocket-javax/pom.xml
CONFLICT (content): Merge conflict in
wicket-native-websocket/wicket-native-websocket-javax/pom.xml
Auto-merging
wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/util/tester/TestWebSocketProcessor.java
Auto-merging
wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/registry/SimpleWebSocketConnectionRegistry.java
Auto-merging
wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/WebSocketResponse.java
Auto-merging
wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/BaseWebSocketBehavior.java
CONFLICT (content): Merge conflict in
wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/BaseWebSocketBehavior.java
Auto-merging
wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/AbstractWebSocketProcessor.java
Auto-merging
wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/WebSocketSettings.java
Removing
wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/WebSocketAwareCsrfPreventionRequestCycleListener.java
Auto-merging
wicket-native-websocket/wicket-native-websocket-core/src/main/java/module-info.java
CONFLICT (add/add): Merge conflict in
wicket-native-websocket/wicket-native-websocket-core/src/main/java/module-info.java
Auto-merging wicket-native-websocket/wicket-native-websocket-core/pom.xml
CONFLICT (content): Merge conflict in
wicket-native-websocket/wicket-native-websocket-core/pom.xml
Auto-merging wicket-native-websocket/pom.xml
CONFLICT (content): Merge conflict in wicket-native-websocket/pom.xml
Auto-merging wicket-jmx/src/main/java/org/apache/wicket/jmx/Initializer.java
CONFLICT (content): Merge conflict in
wicket-jmx/src/main/java/org/apache/wicket/jmx/Initializer.java
Auto-merging wicket-jmx/pom.xml
CONFLICT (content): Merge conflict in wicket-jmx/pom.xml
Auto-merging
wicket-ioc/src/test/java/org/apache/wicket/proxy/packageprivate/PackagePrivateConcreteObject.java
Auto-merging
wicket-ioc/src/test/java/org/apache/wicket/injection/util/MockDependency.java
CONFLICT (content): Merge conflict in
wicket-ioc/src/test/java/org/apache/wicket/injection/util/MockDependency.java
CONFLICT (modify/delete):
wicket-ioc/src/main/java/org/apache/wicket/proxy/objenesis/ObjenesisProxyFactory.java
deleted in 8c770c4337cc2649385aea49f02d29a357ac7acf and modified in HEAD.
Version HEAD of
wicket-ioc/src/main/java/org/apache/wicket/proxy/objenesis/ObjenesisProxyFactory.java
left in tree.
Auto-merging
wicket-ioc/src/main/java/org/apache/wicket/proxy/LazyInitProxyFactory.java
CONFLICT (content): Merge conflict in
wicket-ioc/src/main/java/org/apache/wicket/proxy/LazyInitProxyFactory.java
Auto-merging wicket-ioc/src/main/java/module-info.java
CONFLICT (add/add): Merge conflict in wicket-ioc/src/main/java/module-info.java
Auto-merging wicket-ioc/pom.xml
CONFLICT (content): Merge conflict in wicket-ioc/pom.xml
Auto-merging wicket-guice/src/main/java/module-info.java
CONFLICT (add/add): Merge conflict in
wicket-guice/src/main/java/module-info.java
Auto-merging wicket-guice/pom.xml
CONFLICT (content): Merge conflict in wicket-guice/pom.xml
Auto-merging
wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/NavigatorLabel.java
Auto-merging
wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/NavigationToolbar.java
CONFLICT (content): Merge conflict in
wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/NavigationToolbar.java
Removing
wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/res/transparent2.png
Removing
wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/res/transparent1.gif
Removing
wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/res/modal.js
Removing
wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/res/modal.css
Removing
wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/res/frame-gray-2-ie.png
Removing
wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/res/frame-gray-2-alpha.png
Removing
wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/res/frame-gray-1-ie.png
Removing
wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/res/frame-gray-1-alpha.png
Removing
wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/res/frame-blue-2-ie.png
Removing
wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/res/frame-blue-2-alpha.png
Removing
wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/res/frame-blue-1-ie.png
Removing
wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/res/frame-blue-1-alpha.png
CONFLICT (modify/delete):
wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/ModalWindow.java
deleted in 8c770c4337cc2649385aea49f02d29a357ac7acf and modified in HEAD.
Version HEAD of
wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/ModalWindow.java
left in tree.
Auto-merging
wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/ModalDialog.java
Auto-merging
wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadProgressBar.java
Auto-merging
wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/AjaxFileDropBehavior.java
Auto-merging
wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/AjaxDownloadBehavior.java
Auto-merging wicket-extensions/src/main/java/module-info.java
CONFLICT (add/add): Merge conflict in
wicket-extensions/src/main/java/module-info.java
Auto-merging wicket-extensions/pom.xml
CONFLICT (content): Merge conflict in wicket-extensions/pom.xml
Auto-merging wicket-experimental/wicket-metrics/src/main/java/module-info.java
CONFLICT (add/add): Merge conflict in
wicket-experimental/wicket-metrics/src/main/java/module-info.java
Auto-merging wicket-experimental/wicket-metrics/pom.xml
CONFLICT (content): Merge conflict in wicket-experimental/wicket-metrics/pom.xml
Removing
wicket-experimental/wicket-http2/wicket-http2-undertow/src/main/resources/META-INF/services/org.apache.wicket.IInitializer
Removing
wicket-experimental/wicket-http2/wicket-http2-undertow/src/main/java/org/apache/wicket/http2/markup/head/undertow/UndertowPushBuilder.java
Removing
wicket-experimental/wicket-http2/wicket-http2-undertow/src/main/java/org/apache/wicket/http2/markup/head/undertow/Initializer.java
CONFLICT (modify/delete):
wicket-experimental/wicket-http2/wicket-http2-undertow/pom.xml deleted in
8c770c4337cc2649385aea49f02d29a357ac7acf and modified in HEAD. Version HEAD of
wicket-experimental/wicket-http2/wicket-http2-undertow/pom.xml left in tree.
Removing
wicket-experimental/wicket-http2/wicket-http2-tomcat/src/main/resources/META-INF/services/org.apache.wicket.IInitializer
Removing
wicket-experimental/wicket-http2/wicket-http2-tomcat/src/main/java/org/apache/wicket/http2/markup/head/tomcat/Tomcat85PushBuilder.java
Removing
wicket-experimental/wicket-http2/wicket-http2-tomcat/src/main/java/org/apache/wicket/http2/markup/head/tomcat/Initializer.java
CONFLICT (modify/delete):
wicket-experimental/wicket-http2/wicket-http2-tomcat/pom.xml deleted in
8c770c4337cc2649385aea49f02d29a357ac7acf and modified in HEAD. Version HEAD of
wicket-experimental/wicket-http2/wicket-http2-tomcat/pom.xml left in tree.
Removing
wicket-experimental/wicket-http2/wicket-http2-servlet4/src/main/resources/META-INF/services/org.apache.wicket.IInitializer
Removing
wicket-experimental/wicket-http2/wicket-http2-servlet4/src/main/java/org/apache/wicket/http2/markup/head/servlet4/Initializer.java
CONFLICT (modify/delete):
wicket-experimental/wicket-http2/wicket-http2-servlet4/pom.xml deleted in
8c770c4337cc2649385aea49f02d29a357ac7acf and modified in HEAD. Version HEAD of
wicket-experimental/wicket-http2/wicket-http2-servlet4/pom.xml left in tree.
Removing
wicket-experimental/wicket-http2/wicket-http2-jetty/src/main/resources/META-INF/services/org.apache.wicket.IInitializer
Removing
wicket-experimental/wicket-http2/wicket-http2-jetty/src/main/java/org/apache/wicket/http2/markup/head/jetty/Jetty9PushBuilder.java
Removing
wicket-experimental/wicket-http2/wicket-http2-jetty/src/main/java/org/apache/wicket/http2/markup/head/jetty/Initializer.java
CONFLICT (modify/delete):
wicket-experimental/wicket-http2/wicket-http2-jetty/pom.xml deleted in
8c770c4337cc2649385aea49f02d29a357ac7acf and modified in HEAD. Version HEAD of
wicket-experimental/wicket-http2/wicket-http2-jetty/pom.xml left in tree.
Removing
wicket-experimental/wicket-http2/wicket-http2-core/src/main/java/org/apache/wicket/http2/markup/head/NoopPushBuilder.java
Removing
wicket-experimental/wicket-http2/wicket-http2-core/src/main/java/org/apache/wicket/http2/Http2Settings.java
CONFLICT (modify/delete):
wicket-experimental/wicket-http2/wicket-http2-core/pom.xml deleted in
8c770c4337cc2649385aea49f02d29a357ac7acf and modified in HEAD. Version HEAD of
wicket-experimental/wicket-http2/wicket-http2-core/pom.xml left in tree.
CONFLICT (modify/delete): wicket-experimental/wicket-http2/pom.xml deleted in
8c770c4337cc2649385aea49f02d29a357ac7acf and modified in HEAD. Version HEAD of
wicket-experimental/wicket-http2/pom.xml left in tree.
Auto-merging wicket-experimental/pom.xml
CONFLICT (content): Merge conflict in wicket-experimental/pom.xml
Auto-merging wicket-examples/src/main/resources/META-INF/NOTICE
CONFLICT (content): Merge conflict in
wicket-examples/src/main/resources/META-INF/NOTICE
Removing
wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/modal/ModalWindowPage.java
Removing
wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/modal/ModalWindowPage.html
Removing
wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/modal/ModalPanel1.java
Removing
wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/modal/ModalPanel1.html
Removing
wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/modal/ModalContent2Page.java
Removing
wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/modal/ModalContent2Page.html
Removing
wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/modal/ModalContent1Page.java
Removing
wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/modal/ModalContent1Page.html
Auto-merging
wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/AjaxApplication.java
Auto-merging wicket-examples/pom.xml
CONFLICT (content): Merge conflict in wicket-examples/pom.xml
CONFLICT (rename/rename): Rename
"wicket-extensions/src/test/java/org/apache/wicket/util/markup/xhtml/WellFormedXmlTest.java"->"wicket-devutils/src/test/java/org/apache/wicket/devutils/util/markup/xhtml/WellFormedXmlTest.java"
in branch "HEAD" rename
"wicket-extensions/src/test/java/org/apache/wicket/util/markup/xhtml/WellFormedXmlTest.java"->"wicket-auth-roles/src/test/java/org/apache/wicket/authroles/util/markup/xhtml/WellFormedXmlTest.java"
in "8c770c4337cc2649385aea49f02d29a357ac7acf"
Auto-merging wicket-devutils/pom.xml
CONFLICT (content): Merge conflict in wicket-devutils/pom.xml
Auto-merging
wicket-core/src/test/java/org/apache/wicket/protocol/http/WicketFilterTest.java
Removing
wicket-core/src/test/java/org/apache/wicket/protocol/http/CsrfPreventionRequestCycleListenerTest.java
Auto-merging
wicket-core/src/test/java/org/apache/wicket/pageStore/AbstractPersistentPageStoreTest.java
CONFLICT (add/add): Merge conflict in
wicket-core/src/test/java/org/apache/wicket/pageStore/AbstractPersistentPageStoreTest.java
Auto-merging
wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormMultiPartTest.java
Auto-merging
wicket-core/src/test/java/org/apache/wicket/core/util/tester/cookies/SetCookiePage.java
Auto-merging
wicket-core/src/test/java/org/apache/wicket/core/util/tester/cookies/CollectAllRequestCookiesPage.java
Auto-merging
wicket-core/src/test/java/org/apache/wicket/core/util/tester/WicketTesterTest.java
Auto-merging
wicket-core/src/test/java/org/apache/wicket/core/util/tester/WicketTesterCookieTest.java
Auto-merging
wicket-core/src/test/java/org/apache/wicket/core/util/tester/FormTesterTest.java
CONFLICT (content): Merge conflict in
wicket-core/src/test/java/org/apache/wicket/core/util/tester/FormTesterTest.java
Auto-merging
wicket-core/src/test/java/org/apache/wicket/core/util/tester/CookiePage.java
Auto-merging
wicket-core/src/test/java/org/apache/wicket/core/util/file/WebApplicationPathTest.java
Auto-merging
wicket-core/src/test/java/org/apache/wicket/core/util/cookies/SetCookieAndRedirectTest.java
CONFLICT (content): Merge conflict in
wicket-core/src/test/java/org/apache/wicket/core/util/cookies/SetCookieAndRedirectTest.java
Auto-merging
wicket-core/src/test/java/org/apache/wicket/core/util/cookies/PreserveRequestCookieAfterLinkClickTest.java
Auto-merging
wicket-core/src/test/java/org/apache/wicket/core/util/cookies/CookieUtilsTest.java
CONFLICT (content): Merge conflict in
wicket-core/src/test/java/org/apache/wicket/core/util/cookies/CookieUtilsTest.java
Auto-merging
wicket-core/src/test/java/org/apache/wicket/core/util/ExceptionTestBase.java
Auto-merging
wicket-core/src/test/java/org/apache/wicket/core/request/resource/DynamicImageResourceTest.java
Auto-merging
wicket-core/src/test/java/org/apache/wicket/core/request/resource/ByteArrayResourceTest.java
Auto-merging
wicket-core/src/test/java/org/apache/wicket/core/request/handler/resource/ResourceAuthorizationTest.java
Auto-merging wicket-core/src/main/resources/META-INF/wicket.xsd
CONFLICT (content): Merge conflict in
wicket-core/src/main/resources/META-INF/wicket.xsd
Auto-merging
wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTester.java
Auto-merging
wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
Auto-merging
wicket-core/src/main/java/org/apache/wicket/settings/ResourceSettings.java
Removing
wicket-core/src/main/java/org/apache/wicket/response/filter/ServerAndClientTimeFilter.java
Removing
wicket-core/src/main/java/org/apache/wicket/response/filter/AjaxServerAndClientTimeFilter.java
Auto-merging
wicket-core/src/main/java/org/apache/wicket/request/resource/DynamicImageResource.java
Auto-merging
wicket-core/src/main/java/org/apache/wicket/request/resource/AbstractResource.java
Auto-merging
wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/XForwardedRequestWrapperFactory.java
Auto-merging
wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/WicketSessionFilter.java
Auto-merging
wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebRequest.java
Auto-merging
wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/SecuredRemoteAddressRequestWrapperFactory.java
Auto-merging
wicket-core/src/main/java/org/apache/wicket/protocol/http/WicketServlet.java
Auto-merging
wicket-core/src/main/java/org/apache/wicket/protocol/http/WebApplication.java
Auto-merging
wicket-core/src/main/java/org/apache/wicket/protocol/http/RequestUtils.java
Auto-merging
wicket-core/src/main/java/org/apache/wicket/protocol/http/ReloadingWicketFilter.java
CONFLICT (modify/delete):
wicket-core/src/main/java/org/apache/wicket/protocol/http/CsrfPreventionRequestCycleListener.java
deleted in 8c770c4337cc2649385aea49f02d29a357ac7acf and modified in HEAD.
Version HEAD of
wicket-core/src/main/java/org/apache/wicket/protocol/http/CsrfPreventionRequestCycleListener.java
left in tree.
Auto-merging
wicket-core/src/main/java/org/apache/wicket/protocol/http/ClientProperties.java
Auto-merging
wicket-core/src/main/java/org/apache/wicket/pageStore/InSessionPageStore.java
Auto-merging
wicket-core/src/main/java/org/apache/wicket/pageStore/AbstractPersistentPageStore.java
Auto-merging
wicket-core/src/main/java/org/apache/wicket/page/PartialPageUpdate.java
CONFLICT (modify/delete):
wicket-core/src/main/java/org/apache/wicket/model/AbstractWrapModel.java
deleted in 8c770c4337cc2649385aea49f02d29a357ac7acf and modified in HEAD.
Version HEAD of
wicket-core/src/main/java/org/apache/wicket/model/AbstractWrapModel.java left
in tree.
Auto-merging
wicket-core/src/main/java/org/apache/wicket/markup/parser/XmlPullParser.java
CONFLICT (content): Merge conflict in
wicket-core/src/main/java/org/apache/wicket/markup/parser/XmlPullParser.java
Auto-merging
wicket-core/src/main/java/org/apache/wicket/markup/html/form/Form.java
Auto-merging
wicket-core/src/main/java/org/apache/wicket/markup/head/http2/PushItemHeaderValue.java
Auto-merging
wicket-core/src/main/java/org/apache/wicket/markup/head/http2/PushItem.java
CONFLICT (content): Merge conflict in
wicket-core/src/main/java/org/apache/wicket/markup/head/http2/PushItem.java
Auto-merging
wicket-core/src/main/java/org/apache/wicket/markup/head/http2/PushHeaderItem.java
Auto-merging
wicket-core/src/main/java/org/apache/wicket/markup/head/http2/PushBuilder.java
Auto-merging
wicket-core/src/main/java/org/apache/wicket/markup/head/http2/IPushBuilder.java
Auto-merging
wicket-core/src/main/java/org/apache/wicket/markup/ComponentTag.java
CONFLICT (content): Merge conflict in
wicket-core/src/main/java/org/apache/wicket/markup/ComponentTag.java
Auto-merging
wicket-core/src/main/java/org/apache/wicket/core/util/crypt/AbstractJceCrypt.java
CONFLICT (content): Merge conflict in
wicket-core/src/main/java/org/apache/wicket/core/util/crypt/AbstractJceCrypt.java
Auto-merging
wicket-core/src/main/java/org/apache/wicket/core/request/mapper/ResourceMapper.java
Auto-merging
wicket-core/src/main/java/org/apache/wicket/ajax/AjaxRequestTarget.java
CONFLICT (content): Merge conflict in
wicket-core/src/main/java/org/apache/wicket/ajax/AjaxRequestTarget.java
Auto-merging
wicket-core/src/main/java/org/apache/wicket/ajax/AbstractAjaxTimerBehavior.java
Auto-merging
wicket-core/src/main/java/org/apache/wicket/NonResettingRestartException.java
Auto-merging wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java
CONFLICT (content): Merge conflict in
wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java
Auto-merging wicket-core/src/main/java/org/apache/wicket/Component.java
Auto-merging wicket-core/src/main/java/org/apache/wicket/Application.java
Auto-merging wicket-core/src/main/java/module-info.java
CONFLICT (add/add): Merge conflict in wicket-core/src/main/java/module-info.java
Auto-merging wicket-core/pom.xml
CONFLICT (content): Merge conflict in wicket-core/pom.xml
Auto-merging wicket-cdi/src/main/java/org/apache/wicket/cdi/NonContextual.java
Auto-merging wicket-cdi/src/main/java/module-info.java
CONFLICT (add/add): Merge conflict in wicket-cdi/src/main/java/module-info.java
Auto-merging wicket-cdi/pom.xml
CONFLICT (content): Merge conflict in wicket-cdi/pom.xml
Auto-merging
wicket-bean-validation/src/test/java/org/apache/wicket/bean/validation/TestValidatableBean.java
Auto-merging
wicket-bean-validation/src/test/java/org/apache/wicket/bean/validation/PropertyValidatorRequiredTest.java
Auto-merging
wicket-bean-validation/src/main/java/org/apache/wicket/bean/validation/ValidationModelResolver.java
Auto-merging
wicket-bean-validation/src/main/java/org/apache/wicket/bean/validation/SizeTagModifier.java
Auto-merging
wicket-bean-validation/src/main/java/org/apache/wicket/bean/validation/SessionLocaleInterpolator.java
Auto-merging
wicket-bean-validation/src/main/java/org/apache/wicket/bean/validation/PropertyValidator.properties
CONFLICT (content): Merge conflict in
wicket-bean-validation/src/main/java/org/apache/wicket/bean/validation/PropertyValidator.properties
Auto-merging
wicket-bean-validation/src/main/java/org/apache/wicket/bean/validation/PropertyValidator.java
Auto-merging
wicket-bean-validation/src/main/java/org/apache/wicket/bean/validation/IViolationTranslator.java
Auto-merging
wicket-bean-validation/src/main/java/org/apache/wicket/bean/validation/ITagModifier.java
Auto-merging
wicket-bean-validation/src/main/java/org/apache/wicket/bean/validation/IPropertyResolver.java
Auto-merging
wicket-bean-validation/src/main/java/org/apache/wicket/bean/validation/DefaultViolationTranslator.java
Auto-merging
wicket-bean-validation/src/main/java/org/apache/wicket/bean/validation/DefaultValidatorProvider.java
Auto-merging
wicket-bean-validation/src/main/java/org/apache/wicket/bean/validation/ConstraintIterator.java
Auto-merging
wicket-bean-validation/src/main/java/org/apache/wicket/bean/validation/BeanValidationContext.java
Auto-merging
wicket-bean-validation/src/main/java/org/apache/wicket/bean/validation/BeanValidationConfiguration.java
Auto-merging wicket-bean-validation/src/main/java/module-info.java
CONFLICT (add/add): Merge conflict in
wicket-bean-validation/src/main/java/module-info.java
Auto-merging wicket-bean-validation/pom.xml
CONFLICT (content): Merge conflict in wicket-bean-validation/pom.xml
Auto-merging wicket-auth-roles/pom.xml
CONFLICT (content): Merge conflict in wicket-auth-roles/pom.xml
Auto-merging testing/wicket-threadtest/pom.xml
CONFLICT (content): Merge conflict in testing/wicket-threadtest/pom.xml
Auto-merging testing/wicket-js-tests/pom.xml
CONFLICT (content): Merge conflict in testing/wicket-js-tests/pom.xml
Auto-merging testing/wicket-js-tests/package.json
CONFLICT (content): Merge conflict in testing/wicket-js-tests/package.json
Auto-merging testing/wicket-js-tests/package-lock.json
CONFLICT (content): Merge conflict in testing/wicket-js-tests/package-lock.json
Auto-merging testing/wicket-common-tests/pom.xml
CONFLICT (content): Merge conflict in testing/wicket-common-tests/pom.xml
Auto-merging pom.xml
CONFLICT (content): Merge conflict in pom.xml
Auto-merging archetypes/quickstart/pom.xml
CONFLICT (content): Merge conflict in archetypes/quickstart/pom.xml
Auto-merging README.md
CONFLICT (content): Merge conflict in README.md
Auto-merging NOTICE
CONFLICT (content): Merge conflict in NOTICE
Auto-merging .travis.yml
CONFLICT (content): Merge conflict in .travis.yml
Automatic merge failed; fix conflicts and then commit the result.
stderr:
at
org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:2671)
at
org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandWithCredentials(CliGitAPIImpl.java:2096)
at
org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandWithCredentials(CliGitAPIImpl.java:1996)
at
org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandWithCredentials(CliGitAPIImpl.java:1987)
at
org.jenkinsci.plugins.gitclient.CliGitAPIImpl.access$600(CliGitAPIImpl.java:84)
at
org.jenkinsci.plugins.gitclient.CliGitAPIImpl$3.execute(CliGitAPIImpl.java:955)
at
org.jenkinsci.plugins.gitclient.AbstractGitAPIImpl.merge(AbstractGitAPIImpl.java:88)
at
org.jenkinsci.plugins.gitclient.CliGitAPIImpl.merge(CliGitAPIImpl.java:84)
at
java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at
java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
at
java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
at java.base/java.lang.reflect.Method.invoke(Method.java:566)
at
hudson.remoting.RemoteInvocationHandler$RPCRequest.perform(RemoteInvocationHandler.java:924)
at
hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:902)
at
hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:853)
at hudson.remoting.UserRequest.perform(UserRequest.java:211)
at hudson.remoting.UserRequest.perform(UserRequest.java:54)
at hudson.remoting.Request$2.run(Request.java:376)
at
hudson.remoting.InterceptingExecutorService.lambda$wrap$0(InterceptingExecutorService.java:78)
at java.base/java.util.concurrent.FutureTask.run(FutureTask.java:264)
at
java.base/java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1128)
at
java.base/java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:628)
at java.base/java.lang.Thread.run(Thread.java:834)
Publishing Javadoc
Not sending mail to unregistered user martijn.dasho...@topicus.nl
