Skip to content

Commit

Permalink
Update to map.apps 4.17
Browse files Browse the repository at this point in the history
  • Loading branch information
matthiasstein committed May 13, 2024
1 parent 79446f7 commit cadd95b
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 19 deletions.
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@
"watch-types": "tsc -w --noEmit"
},
"devDependencies": {
"@conterra/ct-mapapps-typings": "~4.16.0",
"@conterra/ct-mapapps-typings": "~4.17.0",
"@conterra/mapapps-mocha-runner": "1.1.1",
"@types/arcgis-js-api": "4.28.0",
"@types/chai": "4.3.10",
"@types/license-checker": "^25.0.6",
"@types/mocha": "10.0.4",
"chai": "4.3.10",
"ct-mapapps-browser-sync": "0.0.34",
"ct-mapapps-browser-sync": "0.0.35",
"ct-mapapps-gulp-js": "0.10.2",
"eslint-config-ct-prodeng": "1.4.0",
"license-checker": "25.0.1",
Expand Down
40 changes: 23 additions & 17 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -165,11 +165,6 @@
<artifactId>setproperties-maven-plugin</artifactId>
<version>1.0.2</version>
</plugin>
<plugin>
<groupId>de.conterra.jsrt</groupId>
<artifactId>ct-jsrt-test-maven-plugin</artifactId>
<version>${ct.jsrt-test.version}</version>
</plugin>
</plugins>
</pluginManagement>
<sourceDirectory>src/main/js</sourceDirectory>
Expand Down Expand Up @@ -207,9 +202,7 @@
</execution>
</executions>
<configuration>
<!-- add here properties which are used in plugin configuration resolution -->
<properties>
<!-- deployment of map.apps installation -->
<mapapps.remote.base>.</mapapps.remote.base>
</properties>
</configuration>
Expand Down Expand Up @@ -336,6 +329,9 @@
<include>**/gulpfile.js</include>
<include>**/pom.xml</include>
</includes>
<excludes>
<exclude>src/main/js/**/*.min.js</exclude>
</excludes>
<mapping>
<vue>XML_STYLE</vue>
</mapping>
Expand Down Expand Up @@ -416,6 +412,24 @@
<goal>deployApps</goal>
</goals>
</execution>
<execution>
<id>build-app-template</id>
<phase>prepare-package</phase>
<goals>
<goal>deployAppTemplate</goal>
</goals>
<configuration>
<templateFile>${project.build.directory}/${project.artifactId}-sample-app.zip</templateFile>
<templateResources>
<templateResource>
<directory>${js.build.outputPath}/apps/sample</directory>
<includes>
<include>**/*</include>
</includes>
</templateResource>
</templateResources>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
Expand Down Expand Up @@ -470,12 +484,12 @@
<root.build.outputPath>${project.build.directory}/webapp</root.build.outputPath>
<js.build.outputPath>${root.build.outputPath}/js</js.build.outputPath>

<mapapps.version>4.16.0</mapapps.version>
<mapapps.version>4.17.0</mapapps.version>
<vuetify.version>1.5.28</vuetify.version>
<!-- JS lib versions -->
<apprt.version>${mapapps.version}</apprt.version>
<!-- java lib versions -->
<ct.jsregistry.version>1.5.14</ct.jsregistry.version>
<ct.jsregistry.version>2.0.1</ct.jsregistry.version>
<ct.jsrt-test.version>2.0.2</ct.jsrt-test.version>

<!-- the default app, replaced in the *.html files to switch app names-->
Expand Down Expand Up @@ -645,12 +659,6 @@
</properties>
<build>
<plugins>
<plugin>
<artifactId>maven-deploy-plugin</artifactId>
<configuration>
<updateReleaseInfo>true</updateReleaseInfo>
</configuration>
</plugin>
<plugin>
<groupId>de.conterra.jsregistry</groupId>
<artifactId>ct-jsregistry-maven-plugin</artifactId>
Expand Down Expand Up @@ -693,8 +701,6 @@
<configuration>
<skipDeploy>${skip.apps.upload}</skipDeploy>
<deployAsApp>true</deployAsApp>
<appName>${project.artifactId}</appName>
<appTitle>${project.artifactId}-${project.version}</appTitle>
<appEditorState>PUBLISHED</appEditorState>
<serverResourcesEndpoint>${mapapps.remote.base}/resources</serverResourcesEndpoint>
<username>${mapapps.user}</username>
Expand Down

0 comments on commit cadd95b

Please sign in to comment.