pom.xml

Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
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.
ISIS-2040: Update Shiro 1.2.6 -> 1.3.2

I'm failing to update to Shiro 1.4.0, running into unresolved issue:

https://issues.apache.org/jira/browse/SHIRO-610

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

ISIS-2048: Update Wicket 8.1.0 -> 8.2.0, without updating guice ...

wicket-guice 8.2.0 requires guice 4.2.2, which requires guava

25.1-android, but we are stuck with guava 19.0 because of payara

so we stay at guice 4.1.0 for now

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

2039 redesign of config (#134)

* ISIS-2039: major refactoring

move config code into its own module

remove number of classes in metamodel, that hold a reference to

IsisConfiguration or its implementation

hide the mutable IsisConfigurationDefault

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

* ISIS-2039: reduce visibility of some config classes

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

* ISIS-2039: simplify config access

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

* ISIS-2039: cleaning up the component-provider mess

for web-modules: no longer negotiate by writing attributes to the

servlet-context, instead use a java class for that

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

* ISIS-2039: fixing some tests

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

* ISIS-2039: removing arguments of @PostConstruct methods

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

* ISIS-2039: lazy binding to config for wicket

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

* ISIS-2039: proposed test fix

also cleaning up verbose tests

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

* ISIS-2039: more test fixes

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

* ISIS-2039: experimenting with AppConfig managed by Guice

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

* ISIS-2039: solving the AppManifest lookup problem independently of the

configuration bootstrapping

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

* ISIS-2039: simplify helloworld

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

* ISIS-2039: moving type discovery to an earlier stage in bootstrapping

Integration Test Bootstrapping works.

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

* ISIS-2039: on web-context: move the config bootstrapping from wicket

module to the main ServletContextListener

such that the wicket module is no longer responsible for initiating the

framework

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

* ISIS-2039: config bootstrapping: fixes the resource chain

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

* ISIS-2039: allow ServiceLoader lookup for AppConfig to fallback ...

to previous behavior, that is to lookup the AppManifest from config

property 'isis.appManifest'

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

* ISIS-2039: fixes concurrent modification with _Context

add a property 'isUnitTesting' to the IsisSystemEnvironment, to help

with the decision on how to bootstrap the configuration

also doing some cleaning up

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

* ISIS-2039: fixing junit tests ...

by having the IsisSystemEnvironment#isUnitTesting correctly setup by

JunitRuleMocker2

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

* ISIS-2039: further fixing tests ...

also moving ExceptionRecognizer services that depend on the 'config'

module from 'applib' to 'runtime'

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

* ISIS-2039: fixing tests, that fail due to new domain object annot.

processing

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

* ISIS-2039: unify config bootstrapping code for maven-plugin,

wicket-viewer and headless

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

* ISIS-2039: to fix prev. commit: let the maven-plugin bootstrap the

configuration properly

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

* ISIS-2039: fixing mm verification tests

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

* ISIS-2039: reinstating the ConfigurationServiceDefault

also renaming packages within the 'config' module -> 'o.a.i.config'

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

* ISIS-2039: removing the ConfigurationService interface

use the singleton IsisConfiguration instead

for the UI, the ConfigurationServiceMenu was renamed to

ConfigurationMenu which uses a ConfigurationViewService for the single

purpose of displaying config values

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

* ISIS-2039: reorg. packages

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

  1. … 425 more files in changeset.
ISIS-2020: update to latest DataNucleus

dn5-jdo-api.version -> 3.2.0-m10

dn5-core.version -> 5.2.0-m2

dn5-api-jdo.version -> 5.2.0-m2

dn5-jdo-query.version -> 5.0.8

dn5-rdbms.version -> 5.2.0-m2

dn5-jodatime.version -> 5.2.0-m1

also dealing with the fact, that some DN classes and methods have been

renamed

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

  1. … 6 more files in changeset.
ISIS-2028: bump bundled jetty 9.4.3->9.4.12

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

ISIS-2013: adds support for H2 database (in integration tests)

  1. … 5 more files in changeset.