Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Im 238 usa recreation idb request information state by state from the api #125

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
252 commits
Select commit Hold shift + click to select a range
735e249
Fix frontend folder
kristinaBc3 Jul 3, 2023
dfc8b7c
Change ProfileResource.class to add group complimentary parameter. Ad…
kristinaBc3 Jul 5, 2023
8e672bd
Add front-end fix
kristinaBc3 Jul 5, 2023
b24707b
Add agreement template's CRUD
kristinaBc3 Jul 20, 2023
491add3
Updated Guava dependency to version 31.1.1-jre
inigo-cobian Jul 24, 2023
934c6ee
Replace AWS dependency with MinIO
inigo-cobian Jul 24, 2023
022aaef
First stubs with the MinIO S3 functionalities
inigo-cobian Jul 24, 2023
b5a4ade
Added JUnit5 for ogc tests
inigo-cobian Jul 24, 2023
0e3f44c
Segregate Minio Exploratory tests from the other S3 tests
inigo-cobian Jul 24, 2023
aa3ec5c
Made public adapters visible only if they are authorized
inigo-cobian Jul 26, 2023
f70af11
Made public adapters visible only if they are authorized
inigo-cobian Jul 26, 2023
0efd5f2
Add tests to show how to download files from AWS
inigo-cobian Jul 26, 2023
cceab6e
Revert changes that patched the stats node being returned at all times
inigo-cobian Jul 26, 2023
72d2701
Update UI
euskalhenriko Jul 27, 2023
9cccd1d
Added authentication credentials for S3
inigo-cobian Jul 27, 2023
c877921
Connect to an S3 instance using stored S3 credentials
inigo-cobian Jul 27, 2023
6102ba3
Clean tests to connect to S3 clients via a method call
inigo-cobian Jul 27, 2023
ae2acac
Get to download S3 files using MinIO
inigo-cobian Jul 28, 2023
2c54aa3
Manage each S3 connection independently
inigo-cobian Jul 28, 2023
d08dc0e
Extracted Minio/S3 exploratory tests
inigo-cobian Jul 28, 2023
1c3ee3f
Manage exceptions for S3
inigo-cobian Jul 28, 2023
c83eed7
Renamed S3 tests file to S3ConnectionManagerTest
inigo-cobian Jul 28, 2023
d33fef1
Add isS3Endpoint and isConnected S3 utilities
inigo-cobian Jul 28, 2023
957fb9b
Corrected inconcise names at S3 utilities
inigo-cobian Jul 28, 2023
b83b43e
Added a method to get the S3 resource as an InputStream
inigo-cobian Jul 28, 2023
773b851
Moved generic utilities at adapters to the engine
inigo-cobian Jul 28, 2023
79a109c
Documented public S3 methods
inigo-cobian Aug 1, 2023
f0bf02e
Write messages about stats node search
euskalhenriko Aug 2, 2023
dcabdd6
Force commit to test jenkins
euskalhenriko Aug 2, 2023
af05b23
Add test for non-existing credentials in S3
inigo-cobian Aug 2, 2023
9dfe612
Return resource at STAC publishing
inigo-cobian Aug 2, 2023
89a7828
Merge pull request #88 from integratedmodelling/IM-173-Remove-AWS-dep…
inigo-cobian Aug 2, 2023
9cf1337
Update UI
euskalhenriko Aug 3, 2023
9b7adcc
Update UI
euskalhenriko Aug 3, 2023
45e0f30
Merge remote-tracking branch 'origin/IM-154-Merge-stats-implementatio…
euskalhenriko Aug 3, 2023
aac3cd8
Calculate the Group expiration date
inigo-cobian Aug 4, 2023
13748fc
Extracted date conversion method
inigo-cobian Aug 4, 2023
7490134
Refactor and cleanup of calculate group expiration time
inigo-cobian Aug 4, 2023
b5de141
Merge branch 'feature/RIDBAdapter' into feature/routing
Aug 4, 2023
65e5968
Add default expiration date to the calculation
inigo-cobian Aug 7, 2023
a63312c
Initialize MongoGroup collections
inigo-cobian Aug 7, 2023
81451c3
Pass user instead of username argument
inigo-cobian Aug 7, 2023
064296d
Refatorized methods for getting the expiration date
inigo-cobian Aug 7, 2023
1ce4e32
Merge branch 'develop' into IM-154-Merge-stats-implementation-with-ne…
euskalhenriko Aug 7, 2023
c75b372
Merge branch 'IM-155-Retrieve-the-correct-Stats-node' into IM-154-Mer…
euskalhenriko Aug 7, 2023
b9724c5
Update UI to avoid conflicts with merges
euskalhenriko Aug 7, 2023
6d5a805
Testing Valhalla installation with USA tiles
Aug 7, 2023
5e58fd6
upgrade for new HM changes for stac support
moovida Aug 8, 2023
a30369c
slipped through fix
moovida Aug 8, 2023
705db13
Add pagination and filtering in backend
kristinaBc3 Aug 8, 2023
844a3c8
Merge branch 'develop' into IM-154-Merge-stats-implementation-with-ne…
euskalhenriko Aug 8, 2023
6b453e7
Merge branch 'IM-154-Merge-stats-implementation-with-new-hub-implemen…
euskalhenriko Aug 8, 2023
e02db67
Revert "Merge branch 'IM-154-Merge-stats-implementation-with-new-hub-…
euskalhenriko Aug 8, 2023
bb33fb2
Housekeeping
Aug 9, 2023
25c097d
Change in exception handlers when user is signing up
euskalhenriko Aug 9, 2023
4eb9416
Automatically exporting networks at instantiation time
Aug 9, 2023
f7aa561
Add defines to k.DL
fvilla Aug 9, 2023
dcf766d
Adding support for relationship metadata as network edge parameters
Aug 10, 2023
d88fac3
Create test for UserGroupEntryService
inigo-cobian Aug 11, 2023
498db73
Network edge attributes export as weights in CSV format
Aug 11, 2023
ec504e9
Added tests for UserGroupEntryService
inigo-cobian Aug 15, 2023
72b002d
Profile groups management solved
euskalhenriko Aug 15, 2023
14ef746
Update UI
euskalhenriko Aug 15, 2023
49fd685
Merge branch 'develop' into IM-154-Merge-stats-implementation-with-ne…
euskalhenriko Aug 16, 2023
161ff05
update UI
euskalhenriko Aug 16, 2023
d88ebe5
Fix null user actor
Aug 16, 2023
cc431a3
Merge branch 'develop' into IM-154-Merge-stats-implementation-with-ne…
euskalhenriko Aug 16, 2023
e83d64c
Removing unnecessary valhalla logs + updating valhalla url
Aug 16, 2023
3491c24
Added getting multiple CustomProperties by name list
inigo-cobian Aug 16, 2023
23ef7e5
Another change for stats
euskalhenriko Aug 17, 2023
1887e7e
Re-revert commit
euskalhenriko Aug 17, 2023
bf519d1
Merge branch 'IM-154-Merge-stats-implementation-with-new-hub-implemen…
euskalhenriko Aug 17, 2023
ddf28e0
Implemented service to add CustomProperty to users
inigo-cobian Aug 17, 2023
41bd1d2
Defined controller for User custom properties
inigo-cobian Aug 18, 2023
ba9aa60
Merge branch 'develop' into IM-157-Pagination-in-users-UI
euskalhenriko Aug 18, 2023
f39d829
Paging implementation for users on hub
euskalhenriko Aug 18, 2023
0cb3766
Updating valhalla's new domain
Aug 18, 2023
0b15116
Draft of community instantiator
Aug 18, 2023
6f8c8b2
Syntactic support for observers in k.IM models and namespace
fvilla Aug 21, 2023
d6f5185
Retrieving communities as a map and creating comunities shape
Aug 21, 2023
817b2ef
Attempt to retrieve network observation from context
Aug 22, 2023
e925680
Extracted Request and fixed Spring errors at CustomProperties
inigo-cobian Aug 30, 2023
66dda03
Add a few tests for UserCustomProperty
inigo-cobian Aug 30, 2023
32ff489
Add fail tests for PropertyController
inigo-cobian Aug 30, 2023
895586f
Filtering by groups now woking
euskalhenriko Aug 30, 2023
30144b9
Implemented search by user without groups
euskalhenriko Aug 31, 2023
69b2b1f
Merge remote-tracking branch 'origin/IM-154-Merge-stats-implementatio…
inigo-cobian Aug 31, 2023
0e65b46
Implemented is null filter
euskalhenriko Aug 31, 2023
a1b126b
Add date filter and update UI
euskalhenriko Sep 1, 2023
8ed899e
Merge branch 'IM-157-Pagination-in-users-UI' into IM-154-Merge-stats-…
euskalhenriko Sep 1, 2023
d393cf2
Update UI
euskalhenriko Sep 1, 2023
823aedd
Merge pull request #89 from integratedmodelling/IM-169-Users-Key-Valu…
euskalhenriko Sep 1, 2023
4fd6d15
Update UI for close spinner function
euskalhenriko Sep 2, 2023
6d62511
Instantiator access configuration observations in the context.
Sep 4, 2023
c8102f9
Renamed CustomProperties into RecordedCustomProperty
inigo-cobian Sep 4, 2023
1868626
Renamed CustomPropertyRequest
inigo-cobian Sep 5, 2023
b1e36a8
Renamed packages for RecordedCustomProperty
inigo-cobian Sep 5, 2023
d36e7ac
Working draft of community instantiator
Sep 5, 2023
047ffed
Add generous default timeout for synchronous OpenEO calls
fvilla Sep 6, 2023
0344ec8
Merge remote-tracking branch 'origin/develop' into IM-154-Merge-stats…
euskalhenriko Sep 6, 2023
710d87c
Propagate time in accumulation resolver
fvilla Sep 6, 2023
91a1070
Solve issue with certificate in UI
euskalhenriko Sep 6, 2023
b37bd8f
Merge pull request #91 from integratedmodelling/refactor/update-custo…
euskalhenriko Sep 6, 2023
c7fc6d7
Merge pull request #90 from integratedmodelling/IM-175-Move-logic-for…
euskalhenriko Sep 6, 2023
9f51393
Merge remote-tracking branch 'origin/IM-154-Merge-stats-implementatio…
euskalhenriko Sep 6, 2023
2788dda
Merge remote-tracking branch 'origin/develop' into feature/community-…
Sep 6, 2023
54574ea
Auto stash before merge of "feature/community-detection" and "origin/…
Sep 6, 2023
5b2d570
Finish propagating accumulated flows to temporal states
Sep 6, 2023
31faf71
Add process resolver and fix time access in cells
Sep 6, 2023
f4f3f75
Launch exception if agreement with specific id is not found
euskalhenriko Sep 7, 2023
4234a57
Stupid typo
fvilla Sep 7, 2023
d59c387
Transmit local variables across scopes
fvilla Sep 7, 2023
67d938e
Merge pull request #92 from integratedmodelling/IM-154-Merge-stats-im…
euskalhenriko Sep 7, 2023
ca1b895
Improve notifications in STAC bulk importer
fvilla Sep 8, 2023
71f4fdd
More STAC notes
fvilla Sep 8, 2023
e0175cd
More notes
fvilla Sep 8, 2023
c3f196b
Undo commit of auto-generated code
euskalhenriko Sep 11, 2023
09529a7
Solve bug in UI
euskalhenriko Sep 12, 2023
0992f07
Bump postcss in /docs/ui
dependabot[bot] Oct 5, 2023
55a331a
Fix ESPG tranformation
inigo-cobian Oct 5, 2023
4d6168b
Added new checks when reading STAC resources
inigo-cobian Oct 5, 2023
b88acd8
Bulk import STAC resources by asset and not by collection.
inigo-cobian Oct 9, 2023
bddc44d
Added temporal geometry to the STAC adapter
inigo-cobian Oct 9, 2023
369d960
Read STAC geometry on item level
inigo-cobian Oct 9, 2023
c6d7a06
Removal of dead code and small refactor at STAC adapter
inigo-cobian Oct 19, 2023
b2f82c2
Fix parameter of getGeometry
inigo-cobian Oct 19, 2023
cd82eb8
Simplified STAC extension management by removing code excesses
inigo-cobian Oct 19, 2023
19b4232
Get the geometry from the STAC metadata
inigo-cobian Oct 19, 2023
3d466e9
Fixed parsing of collection extent metadata
inigo-cobian Oct 19, 2023
db21d69
Add a small commit for band management at STAC
inigo-cobian Oct 19, 2023
af088cf
Add optional feature title to STAC resources and default value
inigo-cobian Oct 20, 2023
fa70f57
Remove unused STAC file
inigo-cobian Oct 23, 2023
bb4afdc
Test STACImporter importResources
inigo-cobian Oct 23, 2023
2bc9d07
Created STACUtil test adding Hamcrest assertion
inigo-cobian Oct 24, 2023
71a0c01
Add Hamcrest assertion to STACImportTest
inigo-cobian Oct 24, 2023
503152c
Merge pull request #95 from integratedmodelling/feature/improve-STAC-…
inigo-cobian Oct 25, 2023
a478af8
Bump org.json:json in /components/klab.component.alignment
dependabot[bot] Oct 25, 2023
7bc3958
Ignored the STAC Item while importing
inigo-cobian Oct 25, 2023
53ac203
Remove TODO of an already done task (set spatial extent)
inigo-cobian Oct 26, 2023
7c4263a
IM-203: Update to Eclipse 2023-09
iperdomo Oct 26, 2023
40a31da
Fix inverted condition in cell walker
fvilla Oct 26, 2023
970593e
Adjust the locators within cells resulting from explicit displacements
fvilla Oct 26, 2023
bc7d507
Remove optional at getCollectionById
inigo-cobian Oct 27, 2023
f2cb65b
Get asset instead of band for reading STAC raster
inigo-cobian Oct 27, 2023
6fe8a6f
Bump browserify-sign from 4.2.1 to 4.2.2 in /docs/ui
dependabot[bot] Oct 28, 2023
7f626d4
Add exception for non-generic time STAC observations
inigo-cobian Nov 2, 2023
bfb22c5
Merge branch 'develop' into feature/community-detection
Nov 3, 2023
235554d
IM-203: Update Eclipse settings to use Java 17
iperdomo Nov 8, 2023
278b3ce
refit time if out of bounds and context is generic
inigo-cobian Nov 8, 2023
3f5a313
Check media support case and whitespace insensitive
inigo-cobian Nov 9, 2023
aa76e36
Merge pull request #97 from integratedmodelling/dependabot/npm_and_ya…
iperdomo Nov 9, 2023
488efab
Merge pull request #96 from integratedmodelling/dependabot/maven/comp…
iperdomo Nov 9, 2023
49e40c4
Merge pull request #94 from integratedmodelling/dependabot/npm_and_ya…
iperdomo Nov 9, 2023
3053cd2
Added link to issue tracker at TODO for STAC Asset reader
inigo-cobian Nov 9, 2023
2e70394
Merge pull request #98 from integratedmodelling/IM-202-redesign-STAC-…
inigo-cobian Nov 9, 2023
57124de
Manage STAC Assets via id instead of band title
inigo-cobian Nov 10, 2023
d0ed702
Read resource time from STAC collection
inigo-cobian Nov 13, 2023
ad4fb64
Remove unused variables
inigo-cobian Nov 13, 2023
2efc801
rollback asset name change
inigo-cobian Nov 14, 2023
8c12d03
Read STAC assets via /items endpoint if there is no item_assets
inigo-cobian Nov 14, 2023
add15fc
Read license of STAC catalog
inigo-cobian Nov 14, 2023
5cb1463
Merge branch 'develop' into IM-209-Read-STAC-asset-id-instead-of-title
inigo-cobian Nov 15, 2023
92bab9b
Merge pull request #99 from integratedmodelling/IM-209-Read-STAC-asse…
inigo-cobian Nov 15, 2023
ccba7aa
Merge branch 'develop' into IM-215-Get-the-STAC-assets-list-from-an-Item
inigo-cobian Nov 15, 2023
64dba70
Merge pull request #100 from integratedmodelling/IM-215-Get-the-STAC-…
inigo-cobian Nov 15, 2023
66844c5
Merge pull request #101 from integratedmodelling/IM-205-Read-the-lice…
inigo-cobian Nov 15, 2023
c33fd79
Fix value not being assigned to the asset list
inigo-cobian Nov 16, 2023
5822936
splitting of large multi-geometry areas in smaller bits to speed up t…
moovida Nov 6, 2023
de15a07
IM-203 Use jdk17 based images for building
iperdomo Nov 17, 2023
7f55d95
IM-203 Recover `ch.qos.logback.slf4j` plugin
iperdomo Nov 20, 2023
17df12b
Add parsing for file:values
inigo-cobian Nov 21, 2023
1b6a62c
add failing geomtries dumper + add HM polygon intersector (and geom h…
moovida Nov 21, 2023
5294cde
Merge pull request #102 from integratedmodelling/hotfix/wfs-large-are…
moovida Nov 21, 2023
eb8c4d6
IM-203 Merge branch 'develop'
iperdomo Nov 22, 2023
869f75f
Merge pull request #103 from integratedmodelling/IM-225-Implement-par…
inigo-cobian Nov 22, 2023
3211e5a
Define needs for classification extension
inigo-cobian Nov 22, 2023
e10c565
Parse Classes from Classification extension
inigo-cobian Nov 22, 2023
76ead7c
Small fix
fvilla Nov 23, 2023
0a3b311
Tune parse of Classifications and remove Bit-field references
inigo-cobian Nov 23, 2023
88aea94
Select strategy for managing multiple rasters at STAC
inigo-cobian Nov 23, 2023
598d930
Apply aggregation strategy mean for STAC
inigo-cobian Nov 24, 2023
ade0300
Merge branch 'develop' into IM-203-java-17
iperdomo Nov 24, 2023
4f72c17
Merge pull request #104 from integratedmodelling/IM-226-Implement-par…
inigo-cobian Nov 24, 2023
8b80684
Bump the npm_and_yarn at /docs/highlightjs security update group
dependabot[bot] Nov 24, 2023
499c5db
Merge pull request #107 from integratedmodelling/dependabot/npm_and_y…
iperdomo Nov 24, 2023
7e1f759
Bump word-wrap from 1.2.3 to 1.2.5 in /docs/ui
dependabot[bot] Nov 24, 2023
1d01549
fix raster mergin api to reflect new HM changes
moovida Nov 24, 2023
763132a
Merge pull request #106 from integratedmodelling/dependabot/npm_and_y…
iperdomo Nov 24, 2023
756fd13
Merge branch 'develop' into
inigo-cobian Nov 24, 2023
b856214
IM-203 Merge branch 'develop'
iperdomo Nov 28, 2023
53f6216
Merge pull request #105 from integratedmodelling/IM-203-java-17
iperdomo Nov 30, 2023
40a741a
Order STAC items at substitution merge
inigo-cobian Dec 4, 2023
184c775
Merge pull request #108 from integratedmodelling/IM-233-Determine-str…
inigo-cobian Dec 4, 2023
a1c798f
add aspect and gradient (slope) resolvers
moovida Dec 4, 2023
a3cc955
cleanup + aspect to rounded degs
moovida Dec 4, 2023
f6e713d
Merge branch 'feature/slope_aspect_resolvers' into develop
moovida Dec 4, 2023
79a9465
IM-203 Enable push products stage
iperdomo Dec 5, 2023
d35f089
Merge pull request #109 from integratedmodelling/IM-203-enable-push-p…
iperdomo Dec 5, 2023
826b3c6
IM-203 Eclipse settings for components/projects
iperdomo Dec 5, 2023
6e9d235
Merge pull request #110 from integratedmodelling/IM-203-eclipse-settings
euskalhenriko Dec 7, 2023
313f56c
Changes in the UI
euskalhenriko Dec 11, 2023
2204aa6
Unit handling for rates
fvilla Dec 14, 2023
09a59f1
Add contextualization time info message for URNs
Dec 14, 2023
63ee03a
Merge pull request #111 from integratedmodelling/IM-231-Changes-for-P…
euskalhenriko Dec 14, 2023
64be597
Handle multiple classifiers in summarizing table compiler
fvilla Dec 15, 2023
75ac3d4
Add mean summarization to summarizing table compiler
fvilla Dec 15, 2023
3b51963
Implemented shelf with labels in app
euskalhenriko Dec 18, 2023
b1bcc12
TODO comment for the RIDB adpater
Jan 8, 2024
e676b6c
Unify methods for reading assets
inigo-cobian Jan 9, 2024
f3a326d
Parse and add file values to the codelist
inigo-cobian Jan 9, 2024
7326ae4
Fix STAC canHandle not checking the asset
inigo-cobian Jan 10, 2024
be11637
Added tests for STACValidator.canHandle
inigo-cobian Jan 10, 2024
ae567b0
Add tests for STACValidator.validate
inigo-cobian Jan 11, 2024
88474f2
Add Powermock dependencies
inigo-cobian Jan 11, 2024
34b5a92
Add tests for codelists
inigo-cobian Jan 11, 2024
e6c69ee
Update disclaimer comment
inigo-cobian Jan 11, 2024
31faddf
Fix read asset id at basic STAC test
inigo-cobian Jan 12, 2024
4a08627
IM-243 Enable executing tests for `klab.ogc`
iperdomo Jan 12, 2024
ef228e1
Merge pull request #112 from integratedmodelling/IM-232-Populate-Code…
iperdomo Jan 12, 2024
f421c71
IM-232 Enable `*STAC*` only tests
iperdomo Jan 12, 2024
998f797
IM-232 Missing `"` :/
iperdomo Jan 12, 2024
22b3727
Unify version of testing libraries
inigo-cobian Jan 15, 2024
69da43b
Merge pull request #114 from integratedmodelling/chore/unify-testing-…
inigo-cobian Jan 15, 2024
8c75a8c
Merge branch 'develop' into IM-238-USA-Recreation-IDB-request-informa…
inigo-cobian Jan 15, 2024
257cfbd
Add individual USA states at RecreationIDBAdapter default query
inigo-cobian Jan 15, 2024
b4b5e9f
Make RecreationIDB queries state by state
inigo-cobian Jan 16, 2024
0f1e7c0
IM-252 Adds `mvnw` - Maven Wrapper
iperdomo Jan 17, 2024
7a73a64
IM-252 Use new agent - without maven
iperdomo Jan 17, 2024
98a3afa
Bug downloading maps, tables and generated output, solved
euskalhenriko Jan 17, 2024
9b610d2
Part of previous commit
euskalhenriko Jan 17, 2024
fb2a9bd
Merge pull request #115 from integratedmodelling/IM-252-maven-wrapper
iperdomo Jan 18, 2024
fdb83cc
More time to app loading to avoid fake errors
euskalhenriko Jan 18, 2024
6fe926e
Fix modal windows dark theme and removed warnings on js type
euskalhenriko Jan 19, 2024
cfbccf4
IM-98 Enable GH actions for building
iperdomo Jan 19, 2024
90425e9
IM-98 Add missing `-DskipTests`
iperdomo Jan 19, 2024
f630adf
IM-98 Attempt to execute `mvn deploy`
iperdomo Jan 19, 2024
893a3e8
IM-98 Deploy only `api` module
iperdomo Jan 19, 2024
3273334
Changed order of logics to discard routes
Jan 20, 2024
47f8d26
Add "blank" metadata to permit open url in a new page
euskalhenriko Jan 23, 2024
07df80d
Add url parameter to @menu, it will be open in a new page
euskalhenriko Jan 23, 2024
8a98f41
Merge pull request #116 from integratedmodelling/IM-247-UI-modificati…
euskalhenriko Jan 23, 2024
3bda9d9
IM-259 Update `.withParams` to use JDK17 & `mvnw`
iperdomo Jan 24, 2024
acb4e0a
Revert reverted commit to make app combo working, need checks
euskalhenriko Jan 24, 2024
a47422f
Avoid send null messages
euskalhenriko Jan 29, 2024
a59e802
IM-98 Only deploy `develop` or `master` builds
iperdomo Jan 29, 2024
88e7f28
IM-98 Fix syntax for conditional deploy
iperdomo Jan 29, 2024
b47b531
Export networks graphs
inigo-cobian Jan 30, 2024
1f103f0
Move the export logic of networks to DirectObservation
inigo-cobian Jan 30, 2024
b8bc817
Merge branch 'develop' into IM-256-Export-networks-from-the-k.Explorer
inigo-cobian Jan 30, 2024
3fad102
Merge pull request #118 from integratedmodelling/IM-256-Export-networ…
inigo-cobian Feb 2, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
20 changes: 20 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
name: Build and test

on:
push:

jobs:
build:
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3
- name: Java setup
uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: '17'
cache: 'maven'
- name: Build with maven
run: |
./mvnw -U clean install -DskipTests
./mvnw -pl :klab.ogc test -Dtest="*STAC*"
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,5 @@ target
/workspace/
**/*.xtendbin
**/.temp-*
**/*._trace
**/*._trace
.mvn/wrapper/maven-wrapper.jar
2 changes: 2 additions & 0 deletions .mvn/maven.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
--batch-mode
--no-transfer-progress
18 changes: 18 additions & 0 deletions .mvn/wrapper/maven-wrapper.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.5/apache-maven-3.9.5-bin.zip
wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar
28 changes: 20 additions & 8 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,19 @@ def kmodelers = [
]

pipeline {
agent { label "mvn-java-agent"}
agent { label "klab-agent-jdk17"}
options { skipDefaultCheckout(true) }
environment {
VERSION_DATE = sh(
script: "date '+%Y-%m-%dT%H:%M:%S'",
returnStdout: true).trim()
MAVEN_OPTS="--illegal-access=permit"
REGISTRY = "registry.integratedmodelling.org"
STAT_CONTAINER = "stat-server-16"
ENGINE_CONTAINER = "engine-server-16"
HUB_CONTAINER = "hub-server-16"
NODE_CONTAINER = "node-server-16"
BASE_CONTAINER = "klab-base-16:bc344fa9a66e93edaa3a2b528a65e7efa2e55a6f"
STAT_CONTAINER = "stat-server-17"
ENGINE_CONTAINER = "engine-server-17"
HUB_CONTAINER = "hub-server-17"
NODE_CONTAINER = "node-server-17"
BASE_CONTAINER = "klab-base-17:04da07762c87f77f2a3c04c880815327f94643c3"
PRODUCTS_GEN = shouldPushProducts(env.BRANCH_NAME)
TAG = "${env.BRANCH_NAME.replace('/','-')}"
MINIO_HOST = "http://192.168.250.224:9000"
Expand Down Expand Up @@ -49,7 +49,7 @@ pipeline {

env.SNAPSHOT = sh(
returnStdout: true,
script: 'mvn org.apache.maven.plugins:maven-help-plugin:3.1.0:evaluate ' +
script: './mvnw org.apache.maven.plugins:maven-help-plugin:3.1.0:evaluate ' +
'-Dexpression=project.version -q -DforceStdout ' +
'--batch-mode -U -e -Dsurefire.useFile=false'
).trim()
Expand Down Expand Up @@ -88,7 +88,19 @@ pipeline {
stage('Maven install with jib') {
steps {
withCredentials([usernamePassword(credentialsId: "${env.REGISTRY_CREDENTIALS}", passwordVariable: 'PASSWORD', usernameVariable: 'USERNAME')]) {
sh 'export JAVA_HOME=/opt/java16/openjdk && mvn clean install -U -DskipTests jib:build -Djib.httpTimeout=60000'
sh './mvnw -U clean install -DskipTests jib:build -Djib.httpTimeout=60000'
sh './mvnw -pl :klab.ogc test -Dtest="*STAC*"'
}
}
}

stage('Maven deploy') {
when {
anyOf { branch 'develop'; branch 'master' }
}
steps {
configFileProvider([configFile(fileId: '1f5f24a2-9839-4194-b2ad-0613279f9fba', variable: 'MAVEN_SETTINGS_XML')]) {
sh './mvnw --settings $MAVEN_SETTINGS_XML deploy -pl :api -DskipTests'
}
}
}
Expand Down
27 changes: 19 additions & 8 deletions Jenkinsfile.withParams
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ def kmodelers = [
]

pipeline {
agent { label "mvn-java-agent"}
agent { label "klab-agent-jdk17"}
options { skipDefaultCheckout(true) }
parameters {
string(name: 'BRANCH',
Expand Down Expand Up @@ -51,11 +51,11 @@ pipeline {
returnStdout: true).trim()
MAVEN_OPTS="--illegal-access=permit"
REGISTRY = "registry.integratedmodelling.org"
STAT_CONTAINER = "stat-server-16"
ENGINE_CONTAINER = "engine-server-16"
HUB_CONTAINER = "hub-server-16"
NODE_CONTAINER = "node-server-16"
BASE_CONTAINER = "klab-base-16:bc344fa9a66e93edaa3a2b528a65e7efa2e55a6f"
STAT_CONTAINER = "stat-server-17"
ENGINE_CONTAINER = "engine-server-17"
HUB_CONTAINER = "hub-server-17"
NODE_CONTAINER = "node-server-17"
BASE_CONTAINER = "klab-base-17:04da07762c87f77f2a3c04c880815327f94643c3"
MAIN = "master"
DEVELOP = "develop"
PRODUCTS_GEN = "yes"
Expand Down Expand Up @@ -113,7 +113,7 @@ pipeline {

env.SNAPSHOT = sh(
returnStdout: true,
script: 'mvn org.apache.maven.plugins:maven-help-plugin:3.1.0:evaluate ' +
script: './mvnw org.apache.maven.plugins:maven-help-plugin:3.1.0:evaluate ' +
'-Dexpression=project.version -q -DforceStdout ' +
'--batch-mode -U -e -Dsurefire.useFile=false'
).trim()
Expand Down Expand Up @@ -159,7 +159,18 @@ pipeline {
stage('Maven install with jib') {
steps {
withCredentials([usernamePassword(credentialsId: "${params.REGISTRY_CREDENTIALS}", passwordVariable: 'PASSWORD', usernameVariable: 'USERNAME')]) {
sh 'export JAVA_HOME=/opt/java16/openjdk && mvn clean install -U -DskipTests jib:build -Djib.httpTimeout=60000'
sh './mvnw clean install -U -DskipTests jib:build -Djib.httpTimeout=60000'
}
}
}

stage('Maven deploy') {
when {
anyOf { branch 'develop'; branch 'master' }
}
steps {
configFileProvider([configFile(fileId: '1f5f24a2-9839-4194-b2ad-0613279f9fba', variable: 'MAVEN_SETTINGS_XML')]) {
sh './mvnw --settings $MAVEN_SETTINGS_XML deploy -pl :api -DskipTests'
}
}
}
Expand Down
77 changes: 39 additions & 38 deletions adapters/klab.adapter.copernicus/.classpath
Original file line number Diff line number Diff line change
@@ -1,38 +1,39 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" output="target/classes" path="src/main/java">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="target/test-classes" path="src/test/java">
<attributes>
<attribute name="test" value="true"/>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
<attributes>
<attribute name="test" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/classes"/>
</classpath>
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" output="target/classes" path="src/main/java">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="target/test-classes" path="src/test/java">
<attributes>
<attribute name="test" value="true"/>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
<attributes>
<attribute name="test" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
<attributes>
<attribute name="module" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/classes"/>
</classpath>
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
org.eclipse.jdt.core.compiler.compliance=17
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
org.eclipse.jdt.core.compiler.release=disabled
org.eclipse.jdt.core.compiler.source=1.8
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
org.eclipse.jdt.core.compiler.release=enabled
org.eclipse.jdt.core.compiler.source=17
77 changes: 39 additions & 38 deletions adapters/klab.adapter.datacube/.classpath
Original file line number Diff line number Diff line change
@@ -1,38 +1,39 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" output="target/classes" path="src/main/java">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="target/test-classes" path="src/test/java">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
<attribute name="test" value="true"/>
</attributes>
</classpathentry>
<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="test" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/classes"/>
</classpath>
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" output="target/classes" path="src/main/java">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="target/test-classes" path="src/test/java">
<attributes>
<attribute name="test" value="true"/>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
<attributes>
<attribute name="test" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
<attributes>
<attribute name="module" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/classes"/>
</classpath>
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
org.eclipse.jdt.core.compiler.compliance=17
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
org.eclipse.jdt.core.compiler.release=disabled
org.eclipse.jdt.core.compiler.source=1.8
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
org.eclipse.jdt.core.compiler.release=enabled
org.eclipse.jdt.core.compiler.source=17
Loading
Loading