ISIS-1223: fixes merge errors; bumps dependency on wicket.bootstrap from 0.10.7 to 0.10.10
Project: http://git-wip-us.apache.org/repos/asf/isis/repo Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/8bf0cc73 Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/8bf0cc73 Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/8bf0cc73 Branch: refs/heads/master Commit: 8bf0cc73d81c67ca2f5a77efb83f539f45c4e1b7 Parents: 04d8842 Author: Dan Haywood <[email protected]> Authored: Fri Oct 28 01:01:47 2016 +0200 Committer: Dan Haywood <[email protected]> Committed: Fri Oct 28 01:01:47 2016 +0200 ---------------------------------------------------------------------- core/pom.xml | 25 ++++++++++---------- .../viewer/wicket/ui/panels/FormAbstract.java | 3 --- .../viewer/wicket/ui/panels/PanelAbstract.java | 9 ++----- 3 files changed, 15 insertions(+), 22 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/isis/blob/8bf0cc73/core/pom.xml ---------------------------------------------------------------------- diff --git a/core/pom.xml b/core/pom.xml index ceec979..0ba3e7c 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -142,7 +142,7 @@ <wicket.version>7.3.0</wicket.version> <wicket-webjars.version>0.5.4</wicket-webjars.version> - <wicket-bootstrap.version>0.10.7</wicket-bootstrap.version> + <wicket-bootstrap.version>0.10.10</wicket-bootstrap.version> <wicket-source.version>7.0.0</wicket-source.version> <wicketstuff.version>7.3.0</wicketstuff.version> @@ -1511,7 +1511,6 @@ ${license.additional-notes} <version>${resteasy-jaxrs.version}</version> </dependency> - <!-- Wicket --> <dependency> <groupId>org.apache.wicket</groupId> <artifactId>wicket</artifactId> @@ -1525,7 +1524,6 @@ ${license.additional-notes} <version>${wicket.version}</version> <exclusions> <exclusion> - <!-- for dependency convergence --> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> </exclusion> @@ -1542,7 +1540,6 @@ ${license.additional-notes} <version>${wicket.version}</version> <exclusions> <exclusion> - <!-- for dependency convergence --> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> </exclusion> @@ -1555,7 +1552,6 @@ ${license.additional-notes} <version>${wicket.version}</version> <exclusions> <exclusion> - <!-- for dependency convergence --> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> </exclusion> @@ -1568,7 +1564,6 @@ ${license.additional-notes} <version>${wicket.version}</version> <exclusions> <exclusion> - <!-- for dependency convergence --> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> </exclusion> @@ -1581,7 +1576,6 @@ ${license.additional-notes} <version>${wicket.version}</version> <exclusions> <exclusion> - <!-- for dependency convergence --> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> </exclusion> @@ -1594,7 +1588,6 @@ ${license.additional-notes} <version>${wicket.version}</version> <exclusions> <exclusion> - <!-- for dependency convergence --> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> </exclusion> @@ -1607,7 +1600,6 @@ ${license.additional-notes} <version>${wicket.version}</version> <exclusions> <exclusion> - <!-- for dependency convergence --> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> </exclusion> @@ -1621,13 +1613,11 @@ ${license.additional-notes} <!-- Wicket-Select2 --> <dependency> - <groupId>org.wicketstuff</groupId> <artifactId>wicketstuff-select2</artifactId> <version>${wicketstuff.version}</version> <exclusions> <exclusion> - <!-- for dependency convergence --> <groupId>org.apache.wicket</groupId> <artifactId>wicket-core</artifactId> </exclusion> @@ -1659,7 +1649,6 @@ ${license.additional-notes} <version>${wicket-webjars.version}</version> <exclusions> <exclusion> - <!-- for dependency convergence --> <groupId>org.apache.wicket</groupId> <artifactId>wicket-core</artifactId> </exclusion> @@ -1752,6 +1741,18 @@ ${license.additional-notes} </dependency> <dependency> + <groupId>org.webjars</groupId> + <artifactId>Eonasdan-bootstrap-datetimepicker</artifactId> + <version>4.17.37-1</version> + <exclusions> + <exclusion> + <groupId>org.webjars</groupId> + <artifactId>momentjs</artifactId> + </exclusion> + </exclusions> + </dependency> + + <dependency> <groupId>de.agilecoders.wicket</groupId> <artifactId>wicket-bootstrap-themes</artifactId> <version>${wicket-bootstrap.version}</version> http://git-wip-us.apache.org/repos/asf/isis/blob/8bf0cc73/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormAbstract.java ---------------------------------------------------------------------- diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormAbstract.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormAbstract.java index 00d5fe0..581effb 100644 --- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormAbstract.java +++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormAbstract.java @@ -19,12 +19,9 @@ package org.apache.isis.viewer.wicket.ui.panels; -<<<<<<< HEAD import org.apache.wicket.markup.html.IHeaderContributor; -======= import java.util.List; ->>>>>>> origin/ISIS-1223-upgrade-to-wicket-7 import org.apache.wicket.markup.html.form.Form; import org.apache.wicket.markup.html.form.IFormSubmitter; import org.apache.wicket.model.IModel; http://git-wip-us.apache.org/repos/asf/isis/blob/8bf0cc73/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelAbstract.java ---------------------------------------------------------------------- diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelAbstract.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelAbstract.java index c1463da..0995a80 100644 --- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelAbstract.java +++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelAbstract.java @@ -20,11 +20,6 @@ package org.apache.isis.viewer.wicket.ui.panels; import org.apache.wicket.Component; -<<<<<<< HEAD -import org.apache.wicket.markup.html.IHeaderContributor; -======= -import org.apache.wicket.Session; ->>>>>>> origin/ISIS-1223-upgrade-to-wicket-7 import org.apache.wicket.markup.html.panel.Panel; import org.apache.wicket.model.IModel; @@ -34,11 +29,11 @@ import org.apache.isis.core.commons.authentication.AuthenticationSession; import org.apache.isis.core.metamodel.deployment.DeploymentCategory; import org.apache.isis.core.metamodel.services.ServicesInjector; import org.apache.isis.core.metamodel.specloader.SpecificationLoader; -import org.apache.isis.core.runtime.system.session.IsisSessionFactoryBuilder; +import org.apache.isis.core.runtime.system.IsisSystem; import org.apache.isis.core.runtime.system.context.IsisContext; import org.apache.isis.core.runtime.system.persistence.PersistenceSession; import org.apache.isis.core.runtime.system.session.IsisSessionFactory; -import org.apache.isis.core.runtime.system.IsisSystem; +import org.apache.isis.core.runtime.system.session.IsisSessionFactoryBuilder; import org.apache.isis.viewer.wicket.model.hints.UiHintContainer; import org.apache.isis.viewer.wicket.ui.ComponentType; import org.apache.isis.viewer.wicket.ui.app.registry.ComponentFactoryRegistry;
