Skip to content

Commit

Permalink
lots of updates
Browse files Browse the repository at this point in the history 
- adds playground app
- updated to some current libraries
- adds git emf repo

Signed-off-by: Juergen Albert <j.albert@data-in-motion.biz>
  • Loading branch information
@juergen-albert
juergen-albert committed Feb 19, 2025
1 parent bea1cf6 commit df49a3e
Show file tree
Hide file tree
Showing 61 changed files with 2,485 additions and 319 deletions.
2 changes: 1 addition & 1 deletion Jenkinsfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ pipeline {
}

tools {
jdk 'OpenJDK17'
jdk 'OpenJDK21'
}
options {
buildDiscarder(logRotator(numToKeepStr: '5'))
Expand Down
4 changes: 2 additions & 2 deletions cnf/build.bnd
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
javac.source: 17
javac.target: 17
javac.source: 21
javac.target: 21

Bundle-DocURL: https://github.com/de-jena/MDO
Bundle-SCM: url=https://github.com/de-jena/MDO, \
Expand Down
7 changes: 7 additions & 0 deletions cnf/ext/daanse.maven
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
org.eclipse.daanse:org.eclipse.daanse.jdbc.db.core:0.0.1-SNAPSHOT
org.eclipse.daanse:org.eclipse.daanse.jdbc.db.record:0.0.1-SNAPSHOT
org.eclipse.daanse:org.eclipse.daanse.jdbc.db.api:0.0.1-SNAPSHOT
org.eclipse.daanse:org.eclipse.daanse.jdbc.db.importer.csv:0.0.1-SNAPSHOT
org.eclipse.daanse:org.eclipse.daanse.io.fs.watcher.api:0.0.1-SNAPSHOT
org.eclipse.daanse:org.eclipse.daanse.io.fs.watcher.watchservice:0.0.1-SNAPSHOT
de.siegmar:fastcsv:3.4.0
99 changes: 52 additions & 47 deletions cnf/ext/fennec.maven
View file
Original file line number Diff line number Diff line change
@@ -1,47 +1,52 @@
org.assertj:assertj-core:3.26.3
com.h2database:h2:2.3.232
jakarta.persistence:jakarta.persistence-api:3.2.0
org.junit.jupiter:junit-jupiter-api:5.10.3
org.junit.jupiter:junit-jupiter-params:5.10.3
org.junit.platform:junit-platform-commons:1.10.3
net.bytebuddy:byte-buddy:1.14.18
org.apache.aries.spifly:org.apache.aries.spifly.dynamic.framework.extension:1.3.7
org.apache.felix:org.apache.felix.cm.json:2.0.6
org.apache.felix:org.apache.felix.configadmin:1.9.26
org.apache.felix:org.apache.felix.configurator:1.0.18
org.apache.felix:org.apache.felix.scr:2.2.12
org.eclipse.daanse:org.eclipse.daanse.jdbc.datasource.metatype.common:0.0.1-SNAPSHOT
org.eclipse.daanse:org.eclipse.daanse.jdbc.datasource.metatype.h2:0.0.1-SNAPSHOT
org.eclipse.emf:org.eclipse.emf.common:2.29.0
org.eclipse.emf:org.eclipse.emf.ecore:2.35.0
org.eclipse.emf:org.eclipse.emf.ecore.xmi:2.36.0
org.geckoprojects.fennec.persistence:org.eclipse.fennec.persistence:1.0.0-SNAPSHOT
org.geckoprojects.fennec.persistence:org.eclipse.fennec.persistence.eclipselink:1.0.0-SNAPSHOT
org.geckoprojects.fennec.persistence:org.eclipse.fennec.persistence.orm:1.0.0-SNAPSHOT
org.geckoprojects.fennec.persistence:org.eclipse.fennec.persistence.test:1.0.0-SNAPSHOT
org.eclipse.parsson:jakarta.json:1.1.7
org.eclipse.persistence:org.eclipse.persistence.asm:9.7.1
org.eclipse.persistence:org.eclipse.persistence.core:4.0.4
org.eclipse.persistence:org.eclipse.persistence.jpa:4.0.4
org.eclipse.persistence:org.eclipse.persistence.jpa.jpql:4.0.4
org.geckoprojects.emf:org.gecko.emf.osgi.component.minimal:8.0.1
org.geckoprojects.emf:org.gecko.emf.osgi.example.model.basic:6.3.0
org.opentest4j:opentest4j:1.3.0
org.osgi:org.osgi.service.cm:1.6.1
org.osgi:org.osgi.service.component:1.5.1
org.osgi:org.osgi.test.common:1.3.0
org.osgi:org.osgi.test.junit5:1.3.0
org.osgi:org.osgi.test.junit5.cm:1.3.0
org.osgi:org.osgi.util.converter:1.0.9
org.osgi:org.osgi.util.function:1.2.0
org.osgi:org.osgi.util.promise:1.3.0
org.slf4j:slf4j-api:2.0.16
org.slf4j:slf4j-simple:2.0.16
org.osgi:org.osgi.annotation.versioning:1.1.2
org.osgi:org.osgi.annotation.bundle:1.1.0
org.osgi:org.osgi.service.component.annotations:1.4.0
org.osgi:org.osgi.service.metatype.annotations:1.4.0
org.osgi:org.osgi.service.condition:1.0.0
org.osgi:org.osgi.service.component.annotations:1.5.1
org.osgi:org.osgi.framework:1.10.0
org.osgi:org.osgi.annotation.bundle:2.0.0
org.assertj:assertj-core:3.26.3
com.h2database:h2:2.3.232
jakarta.persistence:jakarta.persistence-api:3.2.0
org.junit.jupiter:junit-jupiter-api:5.10.3
org.junit.jupiter:junit-jupiter-params:5.10.3
org.junit.platform:junit-platform-commons:1.10.3
net.bytebuddy:byte-buddy:1.14.18
org.apache.aries.spifly:org.apache.aries.spifly.dynamic.framework.extension:1.3.7
org.apache.felix:org.apache.felix.cm.json:2.0.6
org.apache.felix:org.apache.felix.configadmin:1.9.26
org.apache.felix:org.apache.felix.configurator:1.0.18
org.apache.felix:org.apache.felix.scr:2.2.12
org.eclipse.daanse:org.eclipse.daanse.jdbc.datasource.metatype.common:0.0.1-SNAPSHOT
org.eclipse.daanse:org.eclipse.daanse.jdbc.datasource.metatype.h2:0.0.1-SNAPSHOT
org.eclipse.emf:org.eclipse.emf.ecore:2.35.0
org.geckoprojects.fennec.persistence:org.eclipse.fennec.persistence:1.0.0-SNAPSHOT
org.geckoprojects.fennec.persistence:org.eclipse.fennec.persistence.eclipselink:1.0.0-SNAPSHOT
org.geckoprojects.fennec.persistence:org.eclipse.fennec.persistence.orm:1.0.0-SNAPSHOT
org.geckoprojects.fennec.persistence:org.eclipse.fennec.persistence.geojson:1.0.0-SNAPSHOT
org.eclipse.parsson:jakarta.json:1.1.7
org.eclipse.persistence:org.eclipse.persistence.asm:9.7.1
org.eclipse.persistence:org.eclipse.persistence.core:4.0.4
org.eclipse.persistence:org.eclipse.persistence.jpa:4.0.4
org.eclipse.persistence:org.eclipse.persistence.jpa.jpql:4.0.4
org.geckoprojects.emf:org.gecko.emf.osgi.component.minimal:6.3.0
org.opentest4j:opentest4j:1.3.0
org.osgi:org.osgi.service.cm:1.6.1
org.osgi:org.osgi.service.component:1.5.1
org.osgi:org.osgi.test.common:1.3.0
org.osgi:org.osgi.test.junit5:1.3.0
org.osgi:org.osgi.test.junit5.cm:1.3.0
org.osgi:org.osgi.util.converter:1.0.9
org.osgi:org.osgi.util.function:1.2.0
org.osgi:org.osgi.util.promise:1.3.0
org.slf4j:slf4j-api:2.0.16
org.slf4j:slf4j-simple:2.0.16
org.osgi:org.osgi.annotation.versioning:1.1.2
org.osgi:org.osgi.annotation.bundle:1.1.0
org.osgi:org.osgi.service.component.annotations:1.4.0
org.osgi:org.osgi.service.metatype.annotations:1.4.0
org.osgi:org.osgi.service.condition:1.0.0
org.osgi:org.osgi.service.component.annotations:1.5.1
org.osgi:org.osgi.framework:1.10.0
org.osgi:org.osgi.annotation.bundle:2.0.0

org.eclipse.platform:org.eclipse.core.resources:3.22.0
org.eclipse.platform:org.eclipse.core.runtime:3.32.0
org.eclipse.platform:org.eclipse.equinox.common:3.19.200
org.eclipse.platform:org.eclipse.core.contenttype:3.9.600
org.eclipse.platform:org.eclipse.equinox.preferences:3.11.200
org.eclipse.emf:org.eclipse.emf.common:2.40.0
org.eclipse.emf:org.eclipse.emf.ecore.xmi:2.38.0
32 changes: 18 additions & 14 deletions cnf/ext/project.maven
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ commons-fileupload:commons-fileupload:1.4
commons-io:commons-io:2.6

# Swagger OpenAPI
io.swagger.core.v3:swagger-annotations:2.2.20
io.swagger.core.v3:swagger-jaxrs2-jakarta:2.2.20
io.swagger.core.v3:swagger-models-jakarta:2.2.20
io.swagger.core.v3:swagger-integration-jakarta:2.2.20
io.swagger.core.v3:swagger-core-jakarta:2.2.20
io.swagger.core.v3:swagger-annotations:2.2.28
io.swagger.core.v3:swagger-jaxrs2-jakarta:2.2.28
io.swagger.core.v3:swagger-models-jakarta:2.2.28
io.swagger.core.v3:swagger-integration-jakarta:2.2.28
io.swagger.core.v3:swagger-core-jakarta:2.2.28
commons-io:commons-io:2.15.1
org.apache.commons:commons-lang3:3.14.0
io.github.classgraph:classgraph:4.8.165
Expand Down Expand Up @@ -122,18 +122,18 @@ com.google.guava:guava:30.1-jre
com.google.guava:failureaccess:1.0.1

org.apache.commons:commons-text:1.10.0
org.apache.commons:commons-lang3:3.12.0
org.apache.commons:commons-lang3:3.17.0
biz.aQute.bnd:biz.aQute.bnd.annotation:7.0.0

com.fasterxml.jackson.core:jackson-core:2.16.1
com.fasterxml.jackson.core:jackson-databind:2.16.1
com.fasterxml.jackson.core:jackson-annotations:2.16.1
com.fasterxml.jackson.dataformat:jackson-dataformat-properties:2.16.1
com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.16.1
com.fasterxml.jackson.dataformat:jackson-dataformat-csv:2.16.1
com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.16.1
com.fasterxml.jackson.core:jackson-core:2.18.0
com.fasterxml.jackson.core:jackson-databind:2.18.0
com.fasterxml.jackson.core:jackson-annotations:2.18.0
com.fasterxml.jackson.dataformat:jackson-dataformat-properties:2.18.0
com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.18.0
com.fasterxml.jackson.dataformat:jackson-dataformat-csv:2.18.0
com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.18.0

com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.16.1
com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.18.0
org.apache.felix:org.apache.felix.configadmin.plugin.interpolation:1.2.8
org.keycloak:keycloak-authz-client:24.0.1
org.keycloak:keycloak-core:24.0.1
Expand All @@ -157,3 +157,7 @@ org.geckoprojects.jgit:org.gecko.jgit:1.0.0-SNAPSHOT
org.apache.servicemix.bundles:org.apache.servicemix.bundles.jsch:0.1.55_1
com.googlecode.javaewah:JavaEWAH:1.1.12
commons-codec:commons-codec:1.17.1

org.eclipse.emf:org.eclipse.emf.common:2.40.0
org.eclipse.emf:org.eclipse.emf.ecore.xmi:2.38.0
org.eclipse.emf:org.eclipse.emf.ecore:2.38.0
18 changes: 13 additions & 5 deletions cnf/ext/repo_project.bnd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
index = ${.}/libraries.maven;\
name = 'Libraries'

-plugin.osgi: \
-plugin.5.osgi: \
aQute.bnd.repository.maven.provider.MavenBndRepository;\
releaseUrl = "https://repo.maven.apache.org/maven2/";\
snapshotUrl = "https://oss.sonatype.org/content/repositories/snapshots/";\
Expand All @@ -47,10 +47,18 @@
poll_time = -1;\
name = 'OSGi Deps'

-plugin.FennecPersistence: \
-plugin.6.FennecPersistence: \
aQute.bnd.repository.maven.provider.MavenBndRepository;\
releaseUrl = "https://repo.maven.apache.org/maven2/,https://devel.data-in-motion.biz/nexus/repository/dim-release/"; \
snapshotUrl = "https://devel.data-in-motion.biz/nexus/repository/dim-snapshot/";\
index = "${.}/fennec.maven" ;\
snapshotUrl = "https://devel.data-in-motion.biz/nexus/repository/dim-snapshot/, https://oss.sonatype.org/content/repositories/snapshots/";\
index = "${.}/fennec.maven" ;\
readOnly = true;\
name="Fennec JPA Persistence"
name="Fennec JPA Persistence"

-plugin.7.FennecPersistence: \
aQute.bnd.repository.maven.provider.MavenBndRepository;\
releaseUrl = "https://repo.maven.apache.org/maven2/,https://devel.data-in-motion.biz/nexus/repository/dim-release/"; \
snapshotUrl = "https://devel.data-in-motion.biz/nexus/repository/dim-snapshot/, https://oss.sonatype.org/content/repositories/snapshots/";\
index = "${.}/daanse.maven" ;\
readOnly = true;\
name="Eclipse DAANSE"
Loading

0 comments on commit df49a3e

Please sign in to comment.