Merge pull request #355 from Spring-Framework-Java-Apps/master

thomaswoehlke · web-flow · commit 9b12c9935efa · 2022-08-27T00:18:56.000+02:00
work
diff --git a/Procfile b/Procfile
@@ -1 +1 @@
-web: java $JAVA_OPTS -Dserver.port=9010 -Dspring.profiles.active=default -jar target/simpleworklist.jar
+web: java $JAVA_OPTS -Dspring.profiles.active=default -jar target/simpleworklist.jar
diff --git a/build.sh b/build.sh
@@ -65,4 +65,6 @@ function main() {
     #boot_run
 }
 
+# JAVA_OPTS=-XX:+UseContainerSupport -Xmx300m -Xss512k -XX:CICompilerCount=2 -Dfile.encoding=UTF-8
+
 main
diff --git a/pom.xml b/pom.xml
@@ -692,11 +692,11 @@
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-jta-atomikos</artifactId>
     </dependency>
-    -->
     <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-data-jdbc</artifactId>
     </dependency>
+    -->
     <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-data-jpa</artifactId>
@@ -1871,7 +1871,7 @@
         <skip.integration.tests>true</skip.integration.tests>
       </properties>
       <build>
-        <finalName>petclinic</finalName>
+        <finalName>${project.artifactId}</finalName>
         <defaultGoal>clean install</defaultGoal>
       </build>
     </profile>
diff --git a/src/main/resources/templates/layout/page.html b/src/main/resources/templates/layout/page.html
@@ -23,7 +23,7 @@
 <body th:fragment="tw-page-body(twcontent,twtitle,scripts)">
 
 	<!-- Navbar on Top -->
-	<header style="background-image: url('/img/jumbotron/2012-06-07_20.58.02.png')" >
+	<header style="background-image: url('/img/jumbotron/berlin_skyline.png')" >
     <div style="background-color:  rgba(255, 255, 255, 0.3)">
 		  <div th:replace="layout/navbartop :: navbartop(contexts=${contexts},locale=${locale},thisProject=${thisProject},numberOfNewIncomingMessages=${numberOfNewIncomingMessages},ctx=${ctx})">
       </div>

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-web: java $JAVA_OPTS -Dserver.port=9010 -Dspring.profiles.active=default -jar target/simpleworklist.jar`
	`1`	`+web: java $JAVA_OPTS -Dspring.profiles.active=default -jar target/simpleworklist.jar`
Original file line number	Diff line number	Diff line change
`@@ -65,4 +65,6 @@ function main() {`
`65`	`65`	`#boot_run`
`66`	`66`	`}`
`67`	`67`
	`68`	`+# JAVA_OPTS=-XX:+UseContainerSupport -Xmx300m -Xss512k -XX:CICompilerCount=2 -Dfile.encoding=UTF-8`
	`69`	`+`
`68`	`70`	`main`