pom.xml

Clone Tools
  • last updated 16 mins ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
ISIS-2072: bumps jackson from 2.8.0 to 2.9.8

in order to avoid dependency convergence issues with libraries sitting on top

wishing to exploit newer features (case insensitive enums in 2.9.0, fixing

security issues in 2.9.0 through 2.9.7)

Merge remote-tracking branch 'origin/v2' into 2033-IoC

Conflicts:

core/config/src/main/java/org/apache/isis/config/AppConfigLocator.java

core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/ServicesInjectorDefaultTest_validateServices.java

core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java

  1. … 12 more files in changeset.
Revert "ISIS-1811: bumps revision property across all pom.xml's to 2.0.0-M2"

This reverts commit 4b8a6f9cf811429628a28114119ca60f2a9655f9.

  1. … 2 more files in changeset.
ISIS-1811: bumps revision property across all pom.xml's to 2.0.0-M2

  1. … 2 more files in changeset.
ISIS-1811: bumps revision property across all ...

... pom.xml's up to 2.0.0-M3-SNAPSHOT

  1. … 2 more files in changeset.
ISIS-1811: bumps revision property across all pom.xml's to 2.0.0-M2

  1. … 2 more files in changeset.
Merge remote-tracking branch 'apache/v2' into 2033-IoC

Conflicts:

core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/DomainObjectLayoutFacetFactory.java

core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/grid/GridFacetFactory.java

core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridLoaderServiceDefault.java

core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridServiceDefault.java

core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderTestAbstract.java

core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java

  1. … 17 more files in changeset.
Merge branch 'master' into v2

# Conflicts:

# adocs/documentation/src/main/asciidoc/__versions.adoc

# adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-CollectionLayout_defaultView.adoc

# adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-CollectionLayout_render.adoc

# adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObjectLayout_cssClassUiEvent.adoc

# adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObjectLayout_iconUiEvent.adoc

# adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObjectLayout_titleUiEvent.adoc

# adocs/documentation/src/main/asciidoc/pages/tg/tg.adoc

# adocs/template/document.html.erb

# core/applib/src/main/java/org/apache/isis/applib/IsisApplibModule.java

# core/applib/src/main/java/org/apache/isis/applib/annotation/DomainObjectLayout.java

# core/applib/src/main/java/org/apache/isis/applib/domain/DomainObjectList.java

# core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/DomainObjectLayoutFacetFactory.java

# core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/grid/GridFacetDefault.java

# core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/grid/GridFacetFactory.java

# core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridLoaderServiceDefault.java

# core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridServiceDefault.java

# core/metamodel/src/main/java/org/apache/isis/progmodels/dflt/ProgrammingModelFacetsJava5.java

# core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.java

# core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract2.java

# core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/standalonecollection/StandaloneCollectionPanel.java

# core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java

# core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/entity/EntityPage.java

# core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormExecutorDefault.java

# core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PromptFormAbstract.java

  1. … 47 more files in changeset.
Merge remote-tracking branch 'apache/v2' into 2033-IoC

Conflicts:

core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerAppManifest.java

core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerConfiguration.java

core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSession.java

  1. … 3 more files in changeset.
ISIS-2067: reinstated WebServer for testing.

Replaces commons-cli with jopt-simple

  1. … 35 more files in changeset.
ISIS-2072: bumps core's parent to latest ASF version (21)

Merge branch 'v2' into 2033-IoC

Conflicts:

core/applib/src/main/java/org/apache/isis/applib/services/metamodel/MetaModelServicesMenu.java

core/config/src/main/java/org/apache/isis/config/AppConfigLocator.java

core/config/src/main/java/org/apache/isis/config/builder/IsisConfigurationDefault.java

core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactory.java

core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/metamodel/MetaModelServiceDefault.java

core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/SpecificationLoader.java

core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java

core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/dflt/ObjectSpecificationDefault.java

core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/standalonelist/ObjectSpecificationOnStandaloneList.java

core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderTestAbstract.java

core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderTest_array.java

core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderTest_collection.java

core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderTest_value.java

core/plugins/jdo-datanucleus-4/src/test/java/org/apache/isis/core/metamodel/specloader/ObjectReflectorDefaultTest_object.java

core/plugins/jdo-datanucleus-4/src/test/java/org/apache/isis/core/runtime/system/ObjectMemberAbstractTest.java

core/plugins/jdo-datanucleus-4/src/test/java/org/apache/isis/core/wrapper/WrapperFactoryDefaultTest_wrappedObject.java

core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/core/metamodel/specloader/ObjectReflectorDefaultTest_object.java

core/pom.xml

core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java

core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketModule.java

core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java

  1. … 38 more files in changeset.
ISIS-1978: fixes dependency convergence issue

  1. … 4 more files in changeset.
ISIS-1978: moves demo test from helloworld to isis-core-webserver

chose isis-core-webserver because it can "see" the rest of the framework, so a convenient place to write such "regression" tests.

  1. … 5 more files in changeset.
ISIS-1978: updates dependencies for junit and surefire to fix the issue.

  1. … 4 more files in changeset.
Merge branch 'release-1.17.0-RC3' into v2

# Conflicts:

# adocs/documentation/src/main/asciidoc/__versions.adoc

# adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_metadata-api_MetamodelService.adoc

# adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_getting-started_simpleapp-archetype.adoc

# adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_ui-hints_names-and-descriptions.adoc

# adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_configuration-properties.adoc

# core/.m2/settings.xml

# core/applib/src/main/java/org/apache/isis/applib/services/metamodel/MetaModelServicesMenu.java

# core/applib/src/test/java/org/apache/isis/schema/utils/CommonDtoUtils_setValueOn_Test.java

# core/config/src/main/java/org/apache/isis/config/property/ConfigProperty.java

# core/config/src/main/java/org/apache/isis/config/property/ConfigPropertyAbstract.java

# core/config/src/main/java/org/apache/isis/config/property/ConfigPropertyBoolean.java

# core/config/src/main/java/org/apache/isis/config/property/ConfigPropertyEnum.java

# core/config/src/main/java/org/apache/isis/config/property/ConfigPropertyString.java

# core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java

# core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketModule.java

# example/application/helloworld/src/main/java/domainapp/application/isis-non-changing.properties

# example/application/helloworld/src/main/webapp/WEB-INF/web.xml

# example/application/simpleapp/application/src/test/java/domainapp/application/integtests/tests/mml/MetaModelService_IntegTest.exports.approved.xml

# example/application/simpleapp/webapp/src/main/webapp/WEB-INF/web.xml

# example/archetype/helloworld/pom.xml

# example/archetype/helloworld/src/main/resources/META-INF/maven/archetype-metadata.xml

# example/archetype/helloworld/src/main/resources/archetype-resources/pom.xml

# example/archetype/helloworld/src/main/resources/archetype-resources/src/main/java/domainapp/application/isis-non-changing.properties

# example/archetype/helloworld/src/main/resources/archetype-resources/src/main/java/domainapp/dom/impl/HelloWorldObjects.java

# example/archetype/helloworld/src/test/resources/projects/basic/archetype.properties

# example/archetype/simpleapp/pom.xml

# example/archetype/simpleapp/src/main/resources/META-INF/maven/archetype-metadata.xml

# example/archetype/simpleapp/src/main/resources/archetype-resources/application/pom.xml

# example/archetype/simpleapp/src/main/resources/archetype-resources/application/translations.pot

# example/archetype/simpleapp/src/main/resources/archetype-resources/module-simple/pom.xml

# example/archetype/simpleapp/src/main/resources/archetype-resources/module-simple/src/main/java/domainapp/modules/simple/dom/impl/SimpleObject.java

# example/archetype/simpleapp/src/main/resources/archetype-resources/module-simple/translations.pot

# example/archetype/simpleapp/src/main/resources/archetype-resources/pom.xml

# example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/logging.properties

# example/archetype/simpleapp/src/test/resources/projects/basic/archetype.properties

# recreate_archetype_RELEASE.sh

# recreate_archetype_SNAPSHOT.sh

# scripts/updateGeneratedArchetypeSources.groovy

# scripts/verify-isis-release.sh

  1. … 45 more files in changeset.
ISIS-1899: bumps revision property across all pom.xml's back to 1.0.0-SNAPSHOT

  1. … 2 more files in changeset.
ISIS-1899: bumps revision property across all pom.xml's to 1.17.0

  1. … 2 more files in changeset.
ISIS-1899: bumps revision property across all pom.xml's back to 1.0.0-SNAPSHOT

  1. … 3 more files in changeset.
ISIS-1899: bumps revision property across all pom.xml's to 1.17.0

  1. … 2 more files in changeset.
ISIS-1899: bumps revision property across all pom.xml's back to 1.0.0-SNAPSHOT

  1. … 2 more files in changeset.
ISIS-1899: adds missing license headers

  1. … 11 more files in changeset.
ISIS-1899: bumps revision property across all pom.xml's to 1.17.0

  1. … 2 more files in changeset.
ISIS-1277: don't enforce jdk11 profile when building on jdk11+

Task-Url: https://issues.apache.org/jira/browse/ISIS-1277

ISIS-2033: thread-safety for MetaModelContext

also let MetaModelContext cache its getters

Task-Url: https://issues.apache.org/jira/browse/ISIS-2033

  1. … 16 more files in changeset.
ISIS-2033: another attempted fix of jboss-logging convergence issue

Task-Url: https://issues.apache.org/jira/browse/ISIS-2033

  1. … 1 more file in changeset.
ISIS-2033: reimplementing ServiceInjector

adding Mockito

Task-Url: https://issues.apache.org/jira/browse/ISIS-2033

  1. … 12 more files in changeset.
ISIS-2033: add JUnit-Test support for Weld

Task-Url: https://issues.apache.org/jira/browse/ISIS-2033

  1. … 13 more files in changeset.
ISIS-2033: Major (interim): thrown away Installers and Guice

prepare for full provisioning utilizing CDI

this commit breaks provisioning and SudoService

Task-Url: https://issues.apache.org/jira/browse/ISIS-2033

  1. … 180 more files in changeset.
ISIS-2040: Add stub classes for new module 'security-pac4j'.

Task-Url: https://issues.apache.org/jira/browse/ISIS-2040

  1. … 8 more files in changeset.