adjust to 7.10

pizzacarre · Jan 14, 2019 · b57e2d6 · b57e2d6
1 parent a2b2a04
commit b57e2d6
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 12 deletions.
diff --git a/snippets/springboot-customized-webapps/springboot-customized-webapp-example/pom.xml b/snippets/springboot-customized-webapps/springboot-customized-webapp-example/pom.xml
@@ -11,15 +11,15 @@
   <description>Spring Boot Application using [Camunda](http://docs.camunda.org). [The project has been generated by the Maven archetype 'camunda-archetype-spring-boot-7.9.0']</description>
 
   <properties>
-    <camunda.version>7.9.0</camunda.version>
+    <camunda.version>7.10.0</camunda.version>
     <!--
     Adjust if you want to use Camunda Enterprise Edition (EE):
-    <camunda.version>7.9.2-ee</camunda.version>
+    <camunda.version>7.10.1-ee</camunda.version>
     Make sure you also switch to the ee webapp dependency
     and EE repository below
     -->
-    <camundaSpringBoot.version>3.0.0</camundaSpringBoot.version>
-    <springBoot.version>2.0.2.RELEASE</springBoot.version>
+    <camundaSpringBoot.version>3.2.0</camundaSpringBoot.version>
+    <springBoot.version>2.1.1.RELEASE</springBoot.version>
 
     <maven.compiler.source>1.8</maven.compiler.source>
     <maven.compiler.target>1.8</maven.compiler.target>

diff --git a/snippets/springboot-customized-webapps/springboot-customized-webapp-webjar/pom.xml b/snippets/springboot-customized-webapps/springboot-customized-webapp-webjar/pom.xml
@@ -6,14 +6,14 @@
 	<parent>
                 <groupId>org.camunda.bpm</groupId>
                 <artifactId>camunda-parent</artifactId>
-                <version>7.9.0</version>
+                <version>7.10.0</version>
 	</parent>
 
 	<!--
 	<parent>
 		<groupId>org.camunda.bpm.webapp</groupId>
 		<artifactId>camunda-webapp-ee-root</artifactId>
-		<version>7.9.2-ee</version>
+		<version>7.10.1-ee</version>
 	</parent>
 	-->
 
@@ -130,7 +130,7 @@
 						</goals>
 						<configuration>
 							<url>https://github.com/camunda/camunda-webapp-translations/raw/master/tasklist/${CUSTOM_LANG}.json</url>
-							<outputDirectory>${project.build.outputDirectory}/META-INF/resources/app/tasklist/locales/</outputDirectory>
+							<outputDirectory>${project.build.outputDirectory}/META-INF/resources/webjars/camunda/app/tasklist/locales/</outputDirectory>
 						</configuration>
 					</execution>
 					<execution>
@@ -141,7 +141,7 @@
 						</goals>
 						<configuration>
 							<url>https://github.com/camunda/camunda-webapp-translations/raw/master/cockpit/${CUSTOM_LANG}.json</url>
-							<outputDirectory>${project.build.outputDirectory}/META-INF/resources/app/cockpit/locales/</outputDirectory>
+							<outputDirectory>${project.build.outputDirectory}/META-INF/resources/webjars/camunda/app/cockpit/locales/</outputDirectory>
 						</configuration>
 					</execution>
 					<execution>
@@ -152,7 +152,7 @@
 						</goals>
 						<configuration>
 							<url>https://github.com/camunda/camunda-webapp-translations/raw/master/admin/${CUSTOM_LANG}.json</url>
-							<outputDirectory>${project.build.outputDirectory}/META-INF/resources/app/admin/locales/</outputDirectory>
+							<outputDirectory>${project.build.outputDirectory}/META-INF/resources/webjars/camunda/app/admin/locales/</outputDirectory>
 						</configuration>
 					</execution>
 				</executions>
@@ -168,7 +168,7 @@
 							<goal>copy-resources</goal>
 						</goals>
 						<configuration>
-							<outputDirectory>${project.build.outputDirectory}/META-INF/resources/app/tasklist/assets/images</outputDirectory>
+							<outputDirectory>${project.build.outputDirectory}/META-INF/resources/webjars/camunda/app/tasklist/assets/images</outputDirectory>
 							<resources>
 								<resource>
 									<directory>artwork</directory>
@@ -184,7 +184,7 @@
 							<goal>copy-resources</goal>
 						</goals>
 						<configuration>
-							<outputDirectory>${project.build.outputDirectory}/META-INF/resources/app/cockpit/assets/images</outputDirectory>
+							<outputDirectory>${project.build.outputDirectory}/META-INF/resources/webjars/camunda/app/cockpit/assets/images</outputDirectory>
 							<resources>
 								<resource>
 									<directory>artwork</directory>
@@ -200,7 +200,7 @@
 							<goal>copy-resources</goal>
 						</goals>
 						<configuration>
-							<outputDirectory>${project.build.outputDirectory}/META-INF/resources/app/admin/assets/images</outputDirectory>
+							<outputDirectory>${project.build.outputDirectory}/META-INF/resources/webjars/camunda/app/admin/assets/images</outputDirectory>
 							<resources>
 								<resource>
 									<directory>artwork</directory>

diff --git a/...INF/resources/app/admin/scripts/config.js → ...bjars/camunda/app/admin/scripts/config.js b/...INF/resources/app/admin/scripts/config.js → ...bjars/camunda/app/admin/scripts/config.js
diff --git a/...esources/app/admin/styles/user-styles.css → .../camunda/app/admin/styles/user-styles.css b/...esources/app/admin/styles/user-styles.css → .../camunda/app/admin/styles/user-styles.css
diff --git a/...F/resources/app/cockpit/scripts/config.js → ...ars/camunda/app/cockpit/scripts/config.js b/...F/resources/app/cockpit/scripts/config.js → ...ars/camunda/app/cockpit/scripts/config.js
diff --git a/...ources/app/cockpit/styles/user-styles.css → ...amunda/app/cockpit/styles/user-styles.css b/...ources/app/cockpit/styles/user-styles.css → ...amunda/app/cockpit/styles/user-styles.css
diff --git a/.../resources/app/tasklist/scripts/config.js → ...rs/camunda/app/tasklist/scripts/config.js b/.../resources/app/tasklist/scripts/config.js → ...rs/camunda/app/tasklist/scripts/config.js
diff --git a/...urces/app/tasklist/styles/user-styles.css → ...munda/app/tasklist/styles/user-styles.css b/...urces/app/tasklist/styles/user-styles.css → ...munda/app/tasklist/styles/user-styles.css