This is an automated email from the ASF dual-hosted git repository.

danhaywood pushed a commit to branch jdo-SNAPSHOT
in repository https://gitbox.apache.org/repos/asf/causeway-app-simpleapp.git

commit 94a57606c75b21ea9a074cc454f9ae633cc3cfdb
Merge: c019250 e128395
Author: danhaywood <[email protected]>
AuthorDate: Thu Feb 16 09:25:19 2023 +0000

    Merge branch 'jpa-SNAPSHOT' into jdo-SNAPSHOT

 .run/{SimpleApp.run.xml => SimpleApp (jdo).run.xml}                 | 6 ++----
 .../java/domainapp/modules/simple/dom/so/SimpleObject.layout.xml    | 2 +-
 .../application/services/homepage/HomePageViewModel.layout.xml      | 2 +-
 webapp/src/main/resources/menubars.layout.xml                       | 5 ++---
 4 files changed, 6 insertions(+), 9 deletions(-)

diff --cc .run/SimpleApp (jdo).run.xml
index b86b545,b392f60..49b3549
--- a/.run/SimpleApp (jdo).run.xml
+++ b/.run/SimpleApp (jdo).run.xml
@@@ -1,11 -1,12 +1,9 @@@
  <component name="ProjectRunConfigurationManager">
-   <configuration default="false" name="SimpleApp" 
type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
 -  <configuration default="false" name="SimpleApp (jpa)" 
type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
 -    <module name="simpleapp-jpa-webapp" />
++  <configuration default="false" name="SimpleApp (jdo)" 
type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
 +    <option name="ACTIVE_PROFILES" />
 +    <module name="simpleapp-jdo-webapp" />
      <option name="SHORTEN_COMMAND_LINE" value="ARGS_FILE" />
      <option name="SPRING_BOOT_MAIN_CLASS" value="domainapp.webapp.SimpleApp" 
/>
-     <method v="2">
-       <option name="Make" enabled="true" />
-     </method>
 -    <option name="VM_PARAMETERS" 
value="-javaagent:../lib/spring-instrument.jar" />
+     <option name="WORKING_DIRECTORY" value="file://$MODULE_WORKING_DIR$" />
 -    <method v="2">
 -      <option name="Make" enabled="true" />
 -    </method>
    </configuration>
 -</component>
 +</component>

Reply via email to