Skip to content

Commit

Permalink
Migrated and updated Gecko QVT
Browse files Browse the repository at this point in the history
Signed-off-by: Juergen Albert <[email protected]>
  • Loading branch information
juergen-albert committed Feb 5, 2024
1 parent 8d9af85 commit d4c0591
Show file tree
Hide file tree
Showing 80 changed files with 2,400 additions and 72 deletions.
29 changes: 25 additions & 4 deletions cnf/build.bnd
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
geckoEMF,\
geckoOSGi-Test,\
geckoDIMC,\
geckoJacoco
geckoJacoco,\
geckoUtil

# Needed because we enabled library 'gecko-dimc'
github-project: org.gecko.emf.util
Expand Down Expand Up @@ -49,8 +50,28 @@ javac.target: 11
readOnly=true;\
name=Baseline

-plugin.dimrelease: \
aQute.bnd.repository.maven.provider.MavenBndRepository;\
snapshotUrl=https://devel.data-in-motion.biz/nexus/repository/dim-snapshot/;\
releaseUrl=https://devel.data-in-motion.biz/nexus/repository/dim-release/;\
index=${.}/dim_release.maven;\
name='DIM_Release'

-plugin.dimruntime: \
aQute.bnd.repository.osgi.OSGiRepository; \
locations = https://devel.data-in-motion.biz/repository/p2/obr/dim-core-runtime/index.xml;\
max.stale=-1;\
readonly = true;\
name = "DIM Eclipse Runtime Shade";\
cache=${build}/cache/DimEclipseRuntime

-plugin.z.target: \
aQute.bnd.repository.p2.provider.P2Repository; \
url = ${fileuri;${.}}qvt.target; \
name = Targetdefinition;\
poll.time = -1


-baselinerepo: Baseline
-baseline: \
*

-diffignore.module:
*
27 changes: 15 additions & 12 deletions cnf/central.mvn
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
biz.aQute.bnd:biz.aQute.bnd.annotation:7.0.0
biz.aQute.bnd:biz.aQute.bnd.annotation:7.0.0
biz.aQute:biz.aQute.gogo.commands.provider:1.8.0
biz.aQute:biz.aQute.wrapper.hamcrest:1.9.0
biz.aQute.bnd:biz.aQute.bnd.javagen:7.0.0
org.bndtools:org.bndtools.templates.osgi:7.0.0

jakarta.ws.rs:jakarta.ws.rs-api:3.1.0
jakarta.ws.rs:jakarta.ws.rs-api:2.1.6
Expand All @@ -18,8 +21,6 @@ org.objenesis:objenesis:3.2

org.apache.aries.spifly:org.apache.aries.spifly.dynamic.bundle:1.3.4
org.apache.felix:org.apache.felix.framework:jar:7.0.1
org.apache.felix:org.apache.felix.configadmin:1.9.22
org.apache.felix:org.apache.felix.configurator:1.0.14
org.apache.felix:org.apache.felix.converter:1.0.18
org.apache.felix:org.apache.felix.coordinator:1.0.2
org.apache.felix:org.apache.felix.eventadmin:1.6.2
Expand Down Expand Up @@ -80,7 +81,7 @@ org.osgi:org.osgi.service.blueprint:1.0.2
org.osgi:org.osgi.service.cdi:1.0.0
org.osgi:org.osgi.service.clusterinfo:1.0.0
org.osgi:org.osgi.service.cm:1.6.0
org.osgi:org.osgi.service.component.annotations:1.4.0
org.osgi:org.osgi.service.component.annotations:1.5.1
org.osgi:org.osgi.service.component:1.4.0
org.osgi:org.osgi.service.condition:1.0.0
org.osgi:org.osgi.service.condpermadmin:1.1.2
Expand Down Expand Up @@ -125,17 +126,9 @@ org.slf4j:slf4j-jcl:1.7.36

commons-logging:commons-logging:1.2

org.eclipse.emf:org.eclipse.emf.common:2.23.0
org.eclipse.emf:org.eclipse.emf.ecore:2.25.0
org.eclipse.emf:org.eclipse.emf.ecore.xmi:2.16.0
org.eclipse.emf:org.eclipse.emf.codegen.ecore:2.28.0
org.eclipse.emf:org.eclipse.emf.codegen:2.22.0
org.eclipse.emf:org.eclipse.emf.ecore.xcore.lib:1.6.0
org.eclipse.platform:org.eclipse.osgi:3.16.300
org.eclipse.platform:org.eclipse.equinox.common:3.14.0
org.eclipse.platform:org.eclipse.equinox.registry:3.10.200
org.eclipse.platform:org.eclipse.core.expressions:3.7.100
org.eclipse.platform:org.eclipse.core.runtime:3.22.0
org.eclipse.platform:org.eclipse.core.resources:3.14.0
org.eclipse.platform:org.eclipse.core.jobs:3.11.0
org.eclipse.platform:org.eclipse.core.contenttype:3.7.1000
Expand All @@ -149,8 +142,9 @@ org.apiguardian:apiguardian-api:1.1.2
org.geckoprojects.bnd:org.gecko.bnd.dimc.library:1.4.4
org.geckoprojects.bnd:org.gecko.bnd.osgitest.library:1.4.4
org.geckoprojects.bnd:org.gecko.bnd.jacoco.library:1.4.4
org.geckoprojects.utils:org.gecko.util.bnd.library.workspace:1.0.0

org.geckoprojects.emf:org.gecko.emf.osgi.bnd.library.workspace:6.0.1
org.geckoprojects.emf:org.gecko.emf.osgi.bnd.library.workspace:6.1.1

com.fasterxml.jackson.core:jackson-core:2.14.1
com.fasterxml.jackson.core:jackson-databind:2.14.1
Expand Down Expand Up @@ -180,3 +174,12 @@ org.apache.logging.log4j:log4j-to-slf4j:2.18.0

javax.xml.bind:jaxb-api:2.4.0-b180830.0359
javax.activation:javax.activation-api:1.2.0

#qvt
org.eclipse.platform:org.eclipse.equinox.supplement:1.10.700
org.geckoprojects.emf:org.gecko.emf.osgi.example.model.basic:6.1.0
org.eclipse.emf:org.eclipse.emf.ecore.change:2.15.0
lpg.runtime:java:2.0.17-v201004271640
org.eclipse.equinox:org.eclipse.equinox.registry:3.5.101
org.apache.felix:org.apache.felix.configadmin:1.9.26
org.apache.felix:org.apache.felix.configurator:1.0.18
32 changes: 32 additions & 0 deletions cnf/dim_release.maven
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
#com.ibm:com.ibm.icu:64.2.0.v20190507-1337
#lpg.runtime:lpg.runtime.java:2.0.17.v201004271640

#org.eclipse.emf:org.eclipse.emf.ecore.change:2.14.0.v20190528-0725
#org.eclipse.emf:org.eclipse.emf.compare:3.5.3.201909101346

#org.eclipse.ocl:org.eclipse.ocl:3.10.400.201911041049
#org.eclipse.ocl:org.eclipse.ocl.common:1.8.400.v20190910-0937
#org.eclipse.ocl:org.eclipse.ocl.ecore:3.14.0.v20190910-0937

#org.eclipse.m2m:org.eclipse.m2m.qvt.oml.common:3.9.0.v20190909-1952
#org.eclipse.m2m:org.eclipse.m2m.qvt.oml.cst.parser:3.9.0.v20190909-1952
#org.eclipse.m2m:org.eclipse.m2m.qvt.oml.ecore.imperativeocl:3.9.0.v20190909-1952
#org.eclipse.m2m:org.eclipse.m2m.qvt.oml.ocl:3.9.0.v20190909-1952
#org.eclipse.m2m:org.eclipse.m2m.qvt.oml:3.10.0.201911041036
#org.eclipse.m2m:org.eclipse.m2m.qvt.oml.emf.util:3.9.0.201911041041

#org.eclipse.equinox:org.eclipse.equinox.preferences:3.7.500.v20190815-1535
#org.eclipse.equinox:org.eclipse.equinox.app:1.4.300.v20190815-1535
#org.eclipse.equinox:org.eclipse.equinox.common:3.10.500.v20190815-1535
#org.eclipse.equinox:org.eclipse.equinox.registry:3.8.500.v20190714-1850
#org.eclipse.equinox:org.eclipse.equinox.supplement:1.9.100.201911011403

#org.eclipse.core:org.eclipse.core.runtime:3.16.100.201911011611
#org.eclipse.core:org.eclipse.core.resources:3.13.600.201910311300
#org.eclipse.core:org.eclipse.core.jobs:3.10.500.v20190620-1426
#org.eclipse.core:org.eclipse.core.filesystem:1.7.600.201910311251
#org.eclipse.core:org.eclipse.core.contenttype:3.7.400.v20190624-1144
#org.eclipse.core:org.eclipse.core.expressions:3.6.600.201910311244

#org.gecko.eclipse:org.gecko.eclipse.core.supplement:1.0.0

78 changes: 39 additions & 39 deletions cnf/local/index.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,43 @@
<?xml version='1.0' encoding='UTF-8'?>
<repository xmlns="http://www.osgi.org/xmlns/repository/v1.0.0" name="Local" increment="1705682865214">
<repository xmlns="http://www.osgi.org/xmlns/repository/v1.0.0" name="Local" increment="1705409091791">
<resource>
<capability namespace="osgi.identity">
<attribute name="osgi.identity" value="de.siegmar.fastcsv"/>
<attribute name="type" value="osgi.bundle"/>
<attribute name="version" value="2.2.2" type="Version"/>
</capability>
<capability namespace="osgi.wiring.package">
<attribute name="bundle-symbolic-name" value="de.siegmar.fastcsv"/>
<attribute name="bundle-version" value="2.2.2" type="Version"/>
<attribute name="osgi.wiring.package" value="de.siegmar.fastcsv.reader"/>
<attribute name="version" value="2.2.2" type="Version"/>
<attribute name="bnd.hashes" value="-1901923904,-1690706222,-73316078,-1593229662,1809435209,2027955732,758076521,-354192348,939712043,919553531,245419856,759928429,1600268336,2000715872,-1321348323" type="List&lt;Long&gt;"/>
</capability>
<capability namespace="osgi.wiring.package">
<attribute name="bundle-symbolic-name" value="de.siegmar.fastcsv"/>
<attribute name="bundle-version" value="2.2.2" type="Version"/>
<attribute name="osgi.wiring.package" value="de.siegmar.fastcsv.writer"/>
<attribute name="version" value="2.2.2" type="Version"/>
<attribute name="bnd.hashes" value="-202213534,-1521398322,1964840441,-1165707181,696269295" type="List&lt;Long&gt;"/>
</capability>
<capability namespace="osgi.wiring.bundle">
<attribute name="bundle-version" value="2.2.2" type="Version"/>
<attribute name="osgi.wiring.bundle" value="de.siegmar.fastcsv"/>
</capability>
<capability namespace="osgi.wiring.host">
<attribute name="bundle-version" value="2.2.2" type="Version"/>
<attribute name="osgi.wiring.host" value="de.siegmar.fastcsv"/>
</capability>
<capability namespace="osgi.content">
<attribute name="size" value="54004" type="Long"/>
<attribute name="mime" value="application/vnd.osgi.bundle"/>
<attribute name="url" value="de.siegmar.fastcsv/de.siegmar.fastcsv-2.2.2.jar"/>
<attribute name="osgi.content" value="3CC1BE03964BC0617D0C0C4420A8A6F6F0CC6EF8C40148BB0BA4364BB14817B9"/>
</capability>
<requirement namespace="osgi.ee">
<directive name="filter" value="(&amp;(osgi.ee=JavaSE)(version=1.8))"/>
</requirement>
</resource>
<resource>
<capability namespace="osgi.identity">
<attribute name="license" value="&quot;The Unlicense&quot;;link=&quot;https://github.com/miachm/SODS/blob/master/LICENSE&quot;"/>
Expand Down Expand Up @@ -42,42 +80,4 @@
<directive name="filter" value="(&amp;(osgi.ee=JavaSE)(version=1.8))"/>
</requirement>
</resource>
<resource>
<capability namespace="osgi.identity">
<attribute name="osgi.identity" value="de.siegmar.fastcsv"/>
<attribute name="type" value="osgi.bundle"/>
<attribute name="version" value="2.2.2" type="Version"/>
</capability>
<capability namespace="osgi.wiring.package">
<attribute name="bundle-symbolic-name" value="de.siegmar.fastcsv"/>
<attribute name="bundle-version" value="2.2.2" type="Version"/>
<attribute name="osgi.wiring.package" value="de.siegmar.fastcsv.reader"/>
<attribute name="version" value="2.2.2" type="Version"/>
<attribute name="bnd.hashes" value="-1901923904,-1690706222,-73316078,-1593229662,1809435209,2027955732,758076521,-354192348,939712043,919553531,245419856,759928429,1600268336,2000715872,-1321348323" type="List&lt;Long&gt;"/>
</capability>
<capability namespace="osgi.wiring.package">
<attribute name="bundle-symbolic-name" value="de.siegmar.fastcsv"/>
<attribute name="bundle-version" value="2.2.2" type="Version"/>
<attribute name="osgi.wiring.package" value="de.siegmar.fastcsv.writer"/>
<attribute name="version" value="2.2.2" type="Version"/>
<attribute name="bnd.hashes" value="-202213534,-1521398322,1964840441,-1165707181,696269295" type="List&lt;Long&gt;"/>
</capability>
<capability namespace="osgi.wiring.bundle">
<attribute name="bundle-version" value="2.2.2" type="Version"/>
<attribute name="osgi.wiring.bundle" value="de.siegmar.fastcsv"/>
</capability>
<capability namespace="osgi.wiring.host">
<attribute name="bundle-version" value="2.2.2" type="Version"/>
<attribute name="osgi.wiring.host" value="de.siegmar.fastcsv"/>
</capability>
<capability namespace="osgi.content">
<attribute name="size" value="54004" type="Long"/>
<attribute name="mime" value="application/vnd.osgi.bundle"/>
<attribute name="url" value="de.siegmar.fastcsv/de.siegmar.fastcsv-2.2.2.jar"/>
<attribute name="osgi.content" value="3CC1BE03964BC0617D0C0C4420A8A6F6F0CC6EF8C40148BB0BA4364BB14817B9"/>
</capability>
<requirement namespace="osgi.ee">
<directive name="filter" value="(&amp;(osgi.ee=JavaSE)(version=1.8))"/>
</requirement>
</resource>
</repository>
1 change: 0 additions & 1 deletion cnf/local/index.xml.sha

This file was deleted.

35 changes: 35 additions & 0 deletions cnf/qvt.target
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde version="3.8"?>
<target name="qvt">
<locations>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/mmt/qvto/updates/releases/latest"/>
<unit id="org.eclipse.m2m.qvt.oml.common" version="0.0.0"/>
<unit id="org.eclipse.m2m.qvt.oml.common.source" version="0.0.0"/>
<unit id="org.eclipse.m2m.qvt.oml.cst.parser" version="0.0.0"/>
<unit id="org.eclipse.m2m.qvt.oml.cst.parser.source" version="0.0.0"/>
<unit id="org.eclipse.m2m.qvt.oml.ecore.imperativeocl" version="0.0.0"/>
<unit id="org.eclipse.m2m.qvt.oml.ecore.imperativeocl.source" version="0.0.0"/>
<unit id="org.eclipse.m2m.qvt.oml.ocl" version="0.0.0"/>
<unit id="org.eclipse.m2m.qvt.oml.ocl.source" version="0.0.0"/>
<unit id="org.eclipse.m2m.qvt.oml" version="0.0.0"/>
<unit id="org.eclipse.m2m.qvt.oml.source" version="0.0.0"/>
<unit id="org.eclipse.m2m.qvt.oml.emf.util" version="0.0.0"/>
<unit id="org.eclipse.m2m.qvt.oml.emf.util.source" version="0.0.0"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/modeling/mdt/ocl/updates/releases/latest"/>
<unit id="org.eclipse.ocl" version="0.0.0"/>
<unit id="org.eclipse.ocl.source" version="0.0.0"/>
<unit id="org.eclipse.ocl.common" version="0.0.0"/>
<unit id="org.eclipse.ocl.common.source" version="0.0.0"/>
<unit id="org.eclipse.ocl.ecore" version="0.0.0"/>
<unit id="org.eclipse.ocl.ecore.source" version="0.0.0"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/modeling/emf/compare/updates/releases/3.3/R202311200811/core/"/>
<unit id="org.eclipse.emf.compare" version="0.0.0"/>
<unit id="org.eclipse.emf.compare.source" version="0.0.0"/>
</location>
</locations>
</target>
11 changes: 11 additions & 0 deletions org.eclipse.emf.ecore.fragment/.classpath
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<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"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
<classpathentry kind="src" output="bin" path="src"/>
<classpathentry kind="output" path="bin"/>
</classpath>
1 change: 1 addition & 0 deletions org.eclipse.emf.ecore.fragment/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/bin/
23 changes: 23 additions & 0 deletions org.eclipse.emf.ecore.fragment/.project
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>org.eclipse.emf.ecore.fragment</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>bndtools.core.bndbuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>bndtools.core.bndnature</nature>
</natures>
</projectDescription>
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
eclipse.preferences.version=1
encoding/<project>=UTF-8
encoding/bnd.bnd=UTF-8
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
org.eclipse.jdt.core.compiler.compliance=17
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
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.reportPreviewFeatures=warning
org.eclipse.jdt.core.compiler.release=enabled
org.eclipse.jdt.core.compiler.source=17
11 changes: 11 additions & 0 deletions org.eclipse.emf.ecore.fragment/bnd.bnd
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
Fragment-Host: org.eclipse.emf.ecore

Import-Package: org.eclipse.core.runtime.spi

Provide-Capability: emf.m2m.companion;emf.m2m.companion=ecore.fragment

Require-Bundle: org.eclipse.core.runtime

-workingset: qvt

Bundle-Version: 2.0.0.SNAPSHOT
11 changes: 11 additions & 0 deletions org.eclipse.ocl.fragment/.classpath
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<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"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
<classpathentry kind="src" output="bin" path="src"/>
<classpathentry kind="output" path="bin"/>
</classpath>
1 change: 1 addition & 0 deletions org.eclipse.ocl.fragment/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/bin/
23 changes: 23 additions & 0 deletions org.eclipse.ocl.fragment/.project
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>org.eclipse.ocl.fragment</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>bndtools.core.bndbuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>bndtools.core.bndnature</nature>
</natures>
</projectDescription>
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
eclipse.preferences.version=1
encoding/<project>=UTF-8
encoding/bnd.bnd=UTF-8
Loading

0 comments on commit d4c0591

Please sign in to comment.