Skip to content

Commit e2ceac9

Browse files
author
Matthias Stein
committed
Update project to map.apps 4.13
1 parent 513aed3 commit e2ceac9

9 files changed

Lines changed: 80 additions & 277 deletions

File tree

‎.github/workflows/devnet-bundle-release.yml‎

Lines changed: 14 additions & 117 deletions
Original file line numberDiff line numberDiff line change
@@ -10,124 +10,21 @@ on:
1010
description: "Next SNAPSHOT version"
1111
required: true
1212

13-
env:
14-
RELEASE_VERSION: ${{ github.event.inputs.releaseVersion }}
15-
NEXT_DEV_VERSION: ${{ github.event.inputs.nextDevVersion }}
16-
1713
jobs:
1814
build:
1915
runs-on: ubuntu-latest
2016
steps:
21-
- id: checkout
22-
uses: actions/checkout@v2
23-
- id: cache-node
24-
name: Cache node modules
25-
uses: actions/cache@v2
26-
with:
27-
path: |
28-
'**/node'
29-
'**/node_modules'
30-
~/.m2/repository
31-
key: ${{ runner.os }}-node_modules-${{ hashFiles('**/package.json') }}
32-
- id: setup
33-
name: Set up JDK 11
34-
uses: actions/setup-java@v2
35-
with:
36-
java-version: '11'
37-
distribution: 'adopt'
38-
- id: git
39-
name: Set GIT username and email
40-
run: |
41-
git config --global user.email "${{ secrets.GIT_MAIL }}"
42-
git config --global user.name "${{ secrets.GIT_USER }}"
43-
- id: create_settings_xml
44-
name: "Create settings.xml"
45-
uses: whelk-io/maven-settings-xml-action@v18
46-
with:
47-
repositories: >
48-
[
49-
{
50-
"id": "central",
51-
"url": "http://central",
52-
"releases": {
53-
"enabled": "true"
54-
},
55-
"snapshots": {
56-
"enabled": "true"
57-
}
58-
}
59-
]
60-
plugin_repositories: >
61-
[
62-
{
63-
"id": "central",
64-
"url": "http://central",
65-
"releases": {
66-
"enabled": "true"
67-
},
68-
"snapshots": {
69-
"enabled": "true"
70-
}
71-
}
72-
]
73-
servers: >
74-
[
75-
{
76-
"id": "${{ secrets.NEXUS_ID }}",
77-
"username": "${{ secrets.NEXUS_USER }}",
78-
"password": "${{ secrets.NEXUS_USER_PW }}"
79-
}
80-
]
81-
mirrors: >
82-
[
83-
{
84-
"id": "${{ secrets.NEXUS_ID }}",
85-
"mirrorOf": "central",
86-
"url": "${{ secrets.NEXUS_URL }}"
87-
}
88-
]
89-
- name: Cache node modules
90-
uses: actions/cache@v2
91-
env:
92-
cache-name: cache-node-modules
93-
with:
94-
path: |
95-
~/.node
96-
~/.node_modules
97-
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
98-
restore-keys: |
99-
${{ runner.os }}-build-${{ env.cache-name }}-
100-
${{ runner.os }}-build-
101-
${{ runner.os }}-
102-
- id: project_artifact_id
103-
name: Extract Maven project artifactId
104-
run: echo ::set-output name=artifactId::$(mvn -q -Dexec.executable=echo -Dexec.args='${project.artifactId}' --non-recursive exec:exec)
105-
- id: write_release_versions
106-
name: Update versions to ${{ env.RELEASE_VERSION }}
107-
run: |
108-
mvn validate -P write-release-versions -Dreplace.target.version=${{ env.RELEASE_VERSION }}
109-
mvn versions:set -DnewVersion=${{ env.RELEASE_VERSION }} -DgenerateBackupPoms=false
110-
mvn scm:checkin -DpushChanges=false -Dmessage="[update-version] to ${{ env.RELEASE_VERSION }}" -Dscm.username=${{ secrets.GIT_USER }} -Dscm.password=${{ secrets.RELEASE_TOKEN }}
111-
- id: tests
112-
name: Run tests
113-
run: mvn prepare-package -Prun-js-tests,include-mapapps-deps
114-
- id: nexus_deployment
115-
name: Publish to Nexus
116-
run: mvn deploy -Pcompress -Dmaven.test.skip.exec=true -Ddist.releases.id=${{ secrets.NEXUS_ID }} -Ddist.releases.url=${{ secrets.NEXUS_URL_RELEASE }} -Ddist.snapshots.id=${{ secrets.NEXUS_ID }} -Ddist.snapshots.url=${{ secrets.NEXUS_URL_SNAPSHOTS }}
117-
- id: release
118-
name: Create GitHub release
119-
uses: ncipollo/release-action@v1
120-
with:
121-
artifacts: "target/${{ steps.project_artifact_id.outputs.artifactId }}-bundle.zip,target/${{ steps.project_artifact_id.outputs.artifactId }}-sample-app.zip"
122-
preRelease: false
123-
bodyFile: "RELEASE.md"
124-
allowUpdates: true
125-
replacesArtifacts: true
126-
tag: ${{ env.RELEASE_VERSION }}
127-
token: ${{ secrets.RELEASE_TOKEN }}
128-
- id: write_dev_versions
129-
name: Update versions to ${{ env.NEXT_DEV_VERSION }}
130-
run: |
131-
mvn validate -P write-release-versions -Dreplace.target.version=${{ env.NEXT_DEV_VERSION }}
132-
mvn versions:set -DnewVersion=${{ env.NEXT_DEV_VERSION }} -DgenerateBackupPoms=false
133-
mvn scm:checkin -DpushChanges=true -Dmessage="[update-version] to ${{ env.NEXT_DEV_VERSION }}" -Dscm.username=${{ secrets.GIT_USER }} -Dscm.password=${{ secrets.RELEASE_TOKEN }}
17+
- uses: conterra/devnet-bundle-release-action@main
18+
with:
19+
nexus_id: ${{secrets.NEXUS_ID}}
20+
nexus_user: ${{secrets.NEXUS_USER}}
21+
nexus_user_pw: ${{secrets.NEXUS_USER_PW}}
22+
nexus_url: ${{secrets.NEXUS_URL}}
23+
nexus_url_release: ${{secrets.NEXUS_URL_RELEASE}}
24+
nexus_url_snapshots: ${{secrets.NEXUS_URL_SNAPSHOTS}}
25+
release_token: ${{secrets.RELEASE_TOKEN}}
26+
git_mail: ${{secrets.GIT_MAIL}}
27+
git_user: ${{secrets.GIT_USER}}
28+
release_version: ${{ github.event.inputs.releaseVersion }}
29+
next_dev_version: ${{ github.event.inputs.nextDevVersion }}
30+
ms_teams_webhook_uri: ${{secrets.MS_TEAMS_WEBHOOK_URI}}

‎.github/workflows/devnet-bundle-snapshot.yml‎

Lines changed: 9 additions & 99 deletions
Original file line numberDiff line numberDiff line change
@@ -10,102 +10,12 @@ jobs:
1010
build:
1111
runs-on: ubuntu-latest
1212
steps:
13-
- id: checkout
14-
uses: actions/checkout@v2
15-
- id: cache-node
16-
name: Cache node modules
17-
uses: actions/cache@v2
18-
with:
19-
path: |
20-
'**/node'
21-
'**/node_modules'
22-
~/.m2/repository
23-
key: ${{ runner.os }}-node_modules-${{ hashFiles('**/package.json') }}
24-
- id: setup
25-
name: Set up JDK 11
26-
uses: actions/setup-java@v2
27-
with:
28-
java-version: '11'
29-
distribution: 'adopt'
30-
- id: create_settings_xml
31-
name: Create settings.xml
32-
uses: whelk-io/maven-settings-xml-action@v18
33-
with:
34-
repositories: >
35-
[
36-
{
37-
"id": "central",
38-
"url": "http://central",
39-
"releases": {
40-
"enabled": "true"
41-
},
42-
"snapshots": {
43-
"enabled": "true"
44-
}
45-
}
46-
]
47-
plugin_repositories: >
48-
[
49-
{
50-
"id": "central",
51-
"url": "http://central",
52-
"releases": {
53-
"enabled": "true"
54-
},
55-
"snapshots": {
56-
"enabled": "true"
57-
}
58-
}
59-
]
60-
servers: >
61-
[
62-
{
63-
"id": "${{ secrets.NEXUS_ID }}",
64-
"username": "${{ secrets.NEXUS_USER }}",
65-
"password": "${{ secrets.NEXUS_USER_PW }}"
66-
}
67-
]
68-
mirrors: >
69-
[
70-
{
71-
"id": "${{ secrets.NEXUS_ID }}",
72-
"mirrorOf": "central",
73-
"url": "${{ secrets.NEXUS_URL }}"
74-
}
75-
]
76-
- name: Cache node modules
77-
uses: actions/cache@v2
78-
env:
79-
cache-name: cache-node-modules
80-
with:
81-
path: |
82-
~/.node
83-
~/.node_modules
84-
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
85-
restore-keys: |
86-
${{ runner.os }}-build-${{ env.cache-name }}-
87-
${{ runner.os }}-build-
88-
${{ runner.os }}-
89-
- id: project_version
90-
name: Extract Maven project version
91-
run: echo ::set-output name=version::$(mvn -q -Dexec.executable=echo -Dexec.args='${project.version}' --non-recursive exec:exec)
92-
- id: project_artifact_id
93-
name: Extract Maven project artifactId
94-
run: echo ::set-output name=artifactId::$(mvn -q -Dexec.executable=echo -Dexec.args='${project.artifactId}' --non-recursive exec:exec)
95-
- id: tests
96-
name: Run tests
97-
run: mvn prepare-package -Prun-js-tests,include-mapapps-deps
98-
- id: nexus_deployment
99-
name: Publish to Nexus
100-
run: mvn deploy -Pcompress -Dmaven.test.skip.exec=true -Ddist.releases.id=${{ secrets.NEXUS_ID }} -Ddist.releases.url=${{ secrets.NEXUS_URL_RELEASE }} -Ddist.snapshots.id=${{ secrets.NEXUS_ID }} -Ddist.snapshots.url=${{ secrets.NEXUS_URL_SNAPSHOTS }}
101-
- id: release
102-
name: Create GitHub release
103-
uses: ncipollo/release-action@v1
104-
with:
105-
artifacts: "target/${{ steps.project_artifact_id.outputs.artifactId }}-bundle.zip,target/${{ steps.project_artifact_id.outputs.artifactId }}-sample-app.zip"
106-
preRelease: true
107-
bodyFile: "RELEASE.md"
108-
allowUpdates: true
109-
replacesArtifacts: true
110-
tag: ${{ steps.project_version.outputs.version }}
111-
token: ${{ secrets.RELEASE_TOKEN }}
13+
- uses: conterra/devnet-bundle-snapshot-action@main
14+
with:
15+
nexus_id: ${{secrets.NEXUS_ID}}
16+
nexus_user: ${{secrets.NEXUS_USER}}
17+
nexus_user_pw: ${{secrets.NEXUS_USER_PW}}
18+
nexus_url: ${{secrets.NEXUS_URL}}
19+
nexus_url_release: ${{secrets.NEXUS_URL_RELEASE}}
20+
nexus_url_snapshots: ${{secrets.NEXUS_URL_SNAPSHOTS}}
21+
release_token: ${{secrets.RELEASE_TOKEN}}

‎.vscode/tasks.json‎

Lines changed: 19 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,34 @@
22
"version": "2.0.0",
33
"tasks": [
44
{
5-
"label": "Run Jetty Server",
5+
"label": "Initialize",
66
"type": "shell",
7-
"command": "mvn clean jetty:run -Pwatch-all",
7+
"command": "mvn initialize",
88
"group": "build"
99
},
1010
{
11-
"label": "Run stand-alone Jetty Server",
11+
"label": "Run HTTP Server",
1212
"type": "shell",
13-
"command": "mvn clean jetty:run -P'watch-all,include-mapapps-deps'",
13+
"command": "mvn jetty:run -Denv=dev '-Dlocal.configfile=./build.properties'",
1414
"group": "build"
1515
},
1616
{
17-
"label": "Install",
17+
"label": "Run stand-alone HTTP Server",
1818
"type": "shell",
19-
"command": "mvn clean install -Pcompress",
20-
"group": {
21-
"kind": "build",
22-
"isDefault": true
23-
}
19+
"command": "mvn jetty:run -Denv=dev '-Dlocal.configfile=./build.properties' -Pinclude-mapapps-deps",
20+
"group": "build"
21+
},
22+
{
23+
"label": "Compress",
24+
"type": "shell",
25+
"command": "mvn install -P compress",
26+
"group": "build"
27+
},
28+
{
29+
"label": "Clean",
30+
"type": "shell",
31+
"command": "mvn clean",
32+
"group": "build"
2433
}
2534
]
2635
}

‎RELEASE.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
✅ Tested for map.apps 4.12.0 / Linie 4
1+
✅ Tested for map.apps 4.13.1 / Linie 4
22

33
#### Release Notes
44
- SNAPSHOT-Release

‎build.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@
1515
#
1616

1717
# URL to the remote map.apps instance
18-
mapapps.remote.base=http://%YOURSERVER%/ct-mapapps-webapp-%VERSION%
18+
# mapapps.remote.base=http://%YOURSERVER%/ct-mapapps-webapp-%VERSION%

‎gulpfile.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ mapapps.registerTasks({
2222
themes: [/*"sample-theme"*/],
2323
/* state that the custom theme will be dependant from map.apps everlasting theme that provides the base styles */
2424
hasBaseThemes: true,
25-
/* state that we want to support vuetify components and therefore need the the vuetify core styles*/
26-
hasVuetify: true,
25+
/* state that we want to support vuetify components and therefore need the vuetify core styles*/
26+
hasVuetify: true
2727
/*themeChangeTargets: {
2828
"vuetify": [
2929
"sample_theme"

‎package.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
"description": "test build",
44
"version": "0.0.1",
55
"devDependencies": {
6-
"@conterra/ct-mapapps-typings": "~4.12.0",
6+
"@conterra/ct-mapapps-typings": "4.13.1",
77
"@conterra/mapapps-mocha-runner": "^1.0.0",
8-
"@types/arcgis-js-api": "4.20.1",
9-
"ct-mapapps-gulp-js": "^0.5.27",
8+
"@types/arcgis-js-api": "4.22.0",
9+
"ct-mapapps-gulp-js": "^0.6.18",
1010
"vue-template-compiler": "2.6.14",
11-
"puppeteer": "^10.0.0",
12-
"eslint-config-ct-prodeng": "^1.2.4",
11+
"puppeteer": "^13.3.2",
12+
"eslint-config-ct-prodeng": "^1.2.5",
1313
"stylelint-config-ct-prodeng": "1.0.3",
1414
"chai": "^4.3.4",
1515
"mocha": "^9.0.0"

0 commit comments

Comments
 (0)