Merge pull request #6 from /issues/3-update_to_mycore_2022.06.2

update to mycore 2022.06.2 (3)
MyCoRe-Org · Jul 10, 2023 · 5f42f42 · 5f42f42
2 parents b6d55ef + 1fb5b07
commit 5f42f42
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/src/main/resources/archetype-resources/README.md b/src/main/resources/archetype-resources/README.md
@@ -13,6 +13,7 @@ ${hash}${hash} Installation Instructions
 * configure your database connection in `~/.mycore/${rootArtifactId}/resources/META-INF/persistence.xml`
 * perhaps you need to download a driver to `~/.mycore/${rootArtifactId}/lib/`
 * run cli command `bin/${rootArtifactId}.sh process config/setup-commands.txt to load default data`
+* run cli command `bin/${rootArtifactId}.sh reload mappings in jpa configuration file`
 * Go to ${rootArtifactId}-webapp
 * Install solr with the command: `mvn solr-runner:copyHome`
 * Run solr with the command `mvn solr-runner:start` (End with `mvn solr-runner:stop`)

diff --git a/src/main/resources/archetype-resources/__rootArtifactId__-webapp/pom.xml b/src/main/resources/archetype-resources/__rootArtifactId__-webapp/pom.xml
@@ -14,8 +14,8 @@
     <MCR.AppName>${rootArtifactId}</MCR.AppName>
     <solr.location>${user.home}/.mycore/${rootArtifactId}/data/solr</solr.location>
     <!-- solr.location>${user.home}/AppData/Local/MyCoRe/dev-${rootArtifactId}/data/solr</solr.location -->
-    <solr-runner.solrMirrorURL>http://mirror.23media.de/apache/lucene/solr/</solr-runner.solrMirrorURL>
-    <solr-runner.solrVersionString>7.7.2</solr-runner.solrVersionString>
+    <solr-runner.solrMirrorURL>https://dlcdn.apache.org/lucene/solr/</solr-runner.solrMirrorURL>
+    <solr-runner.solrVersionString>8.11.2</solr-runner.solrVersionString>
   </properties>
   <build>
     <finalName>${rootArtifactId}-${project.version}</finalName>

diff --git a/src/main/resources/archetype-resources/__rootArtifactId__-webapp/src/etc/jetty-context.xml b/src/main/resources/archetype-resources/__rootArtifactId__-webapp/src/etc/jetty-context.xml
@@ -5,7 +5,7 @@
     <Set name="loginService">
       <New class="org.eclipse.jetty.security.HashLoginService">
         <Set name="name">Restricted</Set>
-        <Set name="config"><SystemProperty name="project.basedir" />/src/etc/jetty-realm.properties</Set>
+        <Set name="config"><SystemProperty name="project.basedir" />/../src/etc/jetty-realm.properties</Set>
         <Call name="start"/>
       </New>
     </Set>

diff --git a/src/main/resources/archetype-resources/pom.xml b/src/main/resources/archetype-resources/pom.xml
@@ -19,7 +19,7 @@
     <maven.compiler.target>17</maven.compiler.target>
     <maven.compiler.source>17</maven.compiler.source>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <jetty.version>11.0.08</jetty.version>
+    <jetty.version>11.0.15</jetty.version>
     <mycore.version>2022.06.2-SNAPSHOT</mycore.version>
   </properties>
   <!-- put your Git or SVN URLs here -->