Skip to content

Commit 546dc82

Browse files
mazkatlimazkatli
authored
Merge pull request #19 from MDSD-Tools/dep_down
Dependency Cleanup
2 parents f0113ff + fc740cf commit 546dc82

File tree

20 files changed

+319
-250
lines changed

20 files changed

+319
-250
lines changed

‎CHANGELOG.md‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
1919
- Migration to MDSD Tools organization
2020
- Converted Maven Tycho-based build to pure Maven build
2121
- Unification and renaming of packages to: `tools.mdsd.jamopp`
22-
- Renaming of meta-model namespace URI to: `https://mdsd.tools/jamopp/java`
22+
- Renaming of meta-model namespace URI to: `https://mdsd.tools/jamopp/6.0.0/java`
23+
- Versioned the meta-model
2324
- Upgraded dependency versions to:
2425
- Apache Commons Bytecode Engineering Library 6.7.0
25-
- Apache Log4j 2 2.20.0 including the Log4j 1.x bridge
26+
- Apache Log4j 2 2.20.0
2627

2728
### Deprecated
2829

‎jamopp.model.edit/.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,5 @@
11
/src/main/generated
22
/src/main/resources
3+
build.properties
4+
plugin.properties
5+
plugin.xml

‎jamopp.model.edit/pom.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,11 @@
9797
<goals>
9898
<goal>bundle</goal>
9999
</goals>
100+
<configuration>
101+
<instructions>
102+
<Bundle-SymbolicName>${project.groupId}.${project.artifactId};singleton:=true</Bundle-SymbolicName>
103+
</instructions>
104+
</configuration>
100105
</execution>
101106
</executions>
102107
</plugin>

‎jamopp.model/.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,4 @@
11
/src/main/generated
2+
build.properties
3+
plugin.properties
4+
plugin.xml

‎jamopp.model/pom.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,11 @@
6464
<goals>
6565
<goal>bundle</goal>
6666
</goals>
67+
<configuration>
68+
<instructions>
69+
<Bundle-SymbolicName>${project.groupId}.${project.artifactId};singleton:=true</Bundle-SymbolicName>
70+
</instructions>
71+
</configuration>
6772
</execution>
6873
</executions>
6974
</plugin>

‎jamopp.model/src/main/java/tools/mdsd/jamopp/model/java/JavaPackage.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public interface JavaPackage extends EPackage {
4747
* <!-- end-user-doc -->
4848
* @generated
4949
*/
50-
String eNS_URI = "http://www.emftext.org/java";
50+
String eNS_URI = "https://mdsd.tools/jamopp/6.0.0/java";
5151

5252
/**
5353
* The package namespace name.

‎jamopp.model/src/main/resources/metamodel/java.ecore‎

Lines changed: 28 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3-
xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmi:id="_WosmsNz1Ed2bJ_pQViWxFg" name="java" nsURI="https://mdsd.tools/jamopp/java"
3+
xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmi:id="_WosmsNz1Ed2bJ_pQViWxFg" name="java" nsURI="https://mdsd.tools/jamopp/6.0.0/java"
44
nsPrefix="java">
5-
<eSubpackages xmi:id="_Wosmsdz1Ed2bJ_pQViWxFg" name="annotations" nsURI="https://mdsd.tools/jamopp/java/annotations"
5+
<eSubpackages xmi:id="_Wosmsdz1Ed2bJ_pQViWxFg" name="annotations" nsURI="https://mdsd.tools/jamopp/6.0.0/java/annotations"
66
nsPrefix="annotations">
77
<eClassifiers xsi:type="ecore:EClass" name="Annotable" abstract="true" eSuperTypes="#//commons/Commentable">
88
<eStructuralFeatures xsi:type="ecore:EReference" name="annotations" upperBound="-1"
@@ -34,7 +34,8 @@
3434
</eClassifiers>
3535
<eClassifiers xsi:type="ecore:EClass" name="AnnotationValue" abstract="true" eSuperTypes="#//commons/Commentable"/>
3636
</eSubpackages>
37-
<eSubpackages name="arrays" nsURI="https://mdsd.tools/jamopp/java/arrays" nsPrefix="arrays">
37+
<eSubpackages name="arrays" nsURI="https://mdsd.tools/jamopp/6.0.0/java/arrays"
38+
nsPrefix="arrays">
3839
<eClassifiers xsi:type="ecore:EClass" name="ArrayTypeable" abstract="true" eSuperTypes="#//commons/Commentable">
3940
<eOperations name="getArrayDimension" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//ELong">
4041
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
@@ -83,7 +84,7 @@
8384
containment="true"/>
8485
</eClassifiers>
8586
</eSubpackages>
86-
<eSubpackages name="classifiers" nsURI="https://mdsd.tools/jamopp/java/classifiers"
87+
<eSubpackages name="classifiers" nsURI="https://mdsd.tools/jamopp/6.0.0/java/classifiers"
8788
nsPrefix="classifiers">
8889
<eClassifiers xsi:type="ecore:EClass" name="Classifier" abstract="true" eSuperTypes="#_Wo2ZO9z1Ed2bJ_pQViWxFg #//references/ReferenceableElement">
8990
<eOperations name="getAllSuperClassifiers" upperBound="-1" eType="#//classifiers/ConcreteClassifier">
@@ -241,7 +242,8 @@
241242
</eOperations>
242243
</eClassifiers>
243244
</eSubpackages>
244-
<eSubpackages name="commons" nsURI="https://mdsd.tools/jamopp/java/commons" nsPrefix="commons">
245+
<eSubpackages name="commons" nsURI="https://mdsd.tools/jamopp/6.0.0/java/commons"
246+
nsPrefix="commons">
245247
<eClassifiers xsi:type="ecore:EClass" name="Commentable" abstract="true">
246248
<eOperations name="getConcreteClassifier" eType="#//classifiers/ConcreteClassifier">
247249
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
@@ -437,7 +439,7 @@
437439
upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
438440
</eClassifiers>
439441
</eSubpackages>
440-
<eSubpackages name="containers" nsURI="https://mdsd.tools/jamopp/java/containers"
442+
<eSubpackages name="containers" nsURI="https://mdsd.tools/jamopp/6.0.0/java/containers"
441443
nsPrefix="containers">
442444
<eClassifiers xsi:type="ecore:EClass" name="JavaRoot" abstract="true" eSuperTypes="#//commons/NamedElement #//commons/NamespaceAwareElement #//imports/ImportingElement #//annotations/Annotable">
443445
<eOperations name="getClassifiersInSamePackage" upperBound="-1" eType="#//classifiers/ConcreteClassifier">
@@ -525,7 +527,7 @@
525527
<eLiterals name="BINDING" value="3"/>
526528
</eClassifiers>
527529
</eSubpackages>
528-
<eSubpackages xmi:id="_Wo2YC9z1Ed2bJ_pQViWxFg" name="expressions" nsURI="https://mdsd.tools/jamopp/java/expressions"
530+
<eSubpackages xmi:id="_Wo2YC9z1Ed2bJ_pQViWxFg" name="expressions" nsURI="https://mdsd.tools/jamopp/6.0.0/java/expressions"
529531
nsPrefix="expressions">
530532
<eClassifiers xsi:type="ecore:EClass" xmi:id="_Wo2YF9z1Ed2bJ_pQViWxFg" name="ExpressionList"
531533
eSuperTypes="#_Wo2Y9tz1Ed2bJ_pQViWxFg">
@@ -797,7 +799,8 @@
797799
<eClassifiers xsi:type="ecore:EClass" name="ImplicitlyTypedLambdaParameters" eSuperTypes="#//expressions/LambdaParameters"/>
798800
<eClassifiers xsi:type="ecore:EClass" name="SingleImplicitLambdaParameter" eSuperTypes="#//expressions/ImplicitlyTypedLambdaParameters"/>
799801
</eSubpackages>
800-
<eSubpackages name="generics" nsURI="https://mdsd.tools/jamopp/java/generics" nsPrefix="generics">
802+
<eSubpackages name="generics" nsURI="https://mdsd.tools/jamopp/6.0.0/java/generics"
803+
nsPrefix="generics">
801804
<eClassifiers xsi:type="ecore:EClass" name="TypeArgument" abstract="true" eSuperTypes="#//arrays/ArrayTypeable"/>
802805
<eClassifiers xsi:type="ecore:EClass" name="TypeArgumentable" abstract="true"
803806
eSuperTypes="#//commons/Commentable">
@@ -865,7 +868,8 @@
865868
</eClassifiers>
866869
<eClassifiers xsi:type="ecore:EClass" name="UnknownTypeArgument" eSuperTypes="#//generics/TypeArgument #//annotations/Annotable"/>
867870
</eSubpackages>
868-
<eSubpackages name="imports" nsURI="https://mdsd.tools/jamopp/java/imports" nsPrefix="imports">
871+
<eSubpackages name="imports" nsURI="https://mdsd.tools/jamopp/6.0.0/java/imports"
872+
nsPrefix="imports">
869873
<eClassifiers xsi:type="ecore:EClass" name="Import" abstract="true" eSuperTypes="#//commons/NamespaceAwareElement">
870874
<eOperations name="getImportedClassifier" eType="#//classifiers/ConcreteClassifier">
871875
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
@@ -904,7 +908,7 @@
904908
upperBound="-1" eType="#//references/ReferenceableElement"/>
905909
</eClassifiers>
906910
</eSubpackages>
907-
<eSubpackages name="instantiations" nsURI="https://mdsd.tools/jamopp/java/instantiations"
911+
<eSubpackages name="instantiations" nsURI="https://mdsd.tools/jamopp/6.0.0/java/instantiations"
908912
nsPrefix="instantiations">
909913
<eClassifiers xsi:type="ecore:EClass" name="Initializable" abstract="true" eSuperTypes="#//commons/Commentable">
910914
<eStructuralFeatures xsi:type="ecore:EReference" name="initialValue" eType="#_Wo2YDNz1Ed2bJ_pQViWxFg"
@@ -922,7 +926,7 @@
922926
eType="#//literals/Self" containment="true"/>
923927
</eClassifiers>
924928
</eSubpackages>
925-
<eSubpackages xmi:id="_Wo2Yntz1Ed2bJ_pQViWxFg" name="literals" nsURI="https://mdsd.tools/jamopp/java/literals"
929+
<eSubpackages xmi:id="_Wo2Yntz1Ed2bJ_pQViWxFg" name="literals" nsURI="https://mdsd.tools/jamopp/6.0.0/java/literals"
926930
nsPrefix="literals">
927931
<eClassifiers xsi:type="ecore:EClass" xmi:id="_Wo2YsNz1Ed2bJ_pQViWxFg" name="Literal"
928932
abstract="true" eSuperTypes="#//expressions/PrimaryExpression">
@@ -1004,7 +1008,8 @@
10041008
<eClassifiers xsi:type="ecore:EClass" name="Super" eSuperTypes="#//literals/Self"/>
10051009
<eClassifiers xsi:type="ecore:EClass" name="This" eSuperTypes="#//literals/Self"/>
10061010
</eSubpackages>
1007-
<eSubpackages name="members" nsURI="https://mdsd.tools/jamopp/java/members" nsPrefix="members">
1011+
<eSubpackages name="members" nsURI="https://mdsd.tools/jamopp/6.0.0/java/members"
1012+
nsPrefix="members">
10081013
<eClassifiers xsi:type="ecore:EClass" name="ExceptionThrower" abstract="true"
10091014
eSuperTypes="#//commons/Commentable">
10101015
<eStructuralFeatures xsi:type="ecore:EReference" name="exceptions" upperBound="-1"
@@ -1155,7 +1160,7 @@
11551160
containment="true"/>
11561161
</eClassifiers>
11571162
</eSubpackages>
1158-
<eSubpackages xmi:id="_Wo2Ystz1Ed2bJ_pQViWxFg" name="modifiers" nsURI="https://mdsd.tools/jamopp/java/modifiers"
1163+
<eSubpackages xmi:id="_Wo2Ystz1Ed2bJ_pQViWxFg" name="modifiers" nsURI="https://mdsd.tools/jamopp/6.0.0/java/modifiers"
11591164
nsPrefix="modifiers">
11601165
<eClassifiers xsi:type="ecore:EClass" xmi:id="_Wo2Ys9z1Ed2bJ_pQViWxFg" name="Modifier"
11611166
abstract="true" eSuperTypes="#//modifiers/AnnotationInstanceOrModifier"/>
@@ -1294,7 +1299,7 @@
12941299
eSuperTypes="#//commons/Commentable"/>
12951300
<eClassifiers xsi:type="ecore:EClass" name="Open" eSuperTypes="#//commons/Commentable"/>
12961301
</eSubpackages>
1297-
<eSubpackages name="operators" nsURI="https://mdsd.tools/jamopp/java/operators"
1302+
<eSubpackages name="operators" nsURI="https://mdsd.tools/jamopp/6.0.0/java/operators"
12981303
nsPrefix="operators">
12991304
<eClassifiers xsi:type="ecore:EClass" name="Operator" abstract="true" eSuperTypes="#//commons/Commentable"/>
13001305
<eClassifiers xsi:type="ecore:EClass" name="AdditiveOperator" abstract="true"
@@ -1342,7 +1347,7 @@
13421347
<eClassifiers xsi:type="ecore:EClass" name="RightShift" eSuperTypes="#//operators/ShiftOperator"/>
13431348
<eClassifiers xsi:type="ecore:EClass" name="UnsignedRightShift" eSuperTypes="#//operators/ShiftOperator"/>
13441349
</eSubpackages>
1345-
<eSubpackages name="parameters" nsURI="https://mdsd.tools/jamopp/java/parameters"
1350+
<eSubpackages name="parameters" nsURI="https://mdsd.tools/jamopp/6.0.0/java/parameters"
13461351
nsPrefix="parameters">
13471352
<eClassifiers xsi:type="ecore:EClass" name="Parameter" abstract="true" eSuperTypes="#//variables/Variable #//modifiers/AnnotableAndModifiable"/>
13481353
<eClassifiers xsi:type="ecore:EClass" name="Parametrizable" abstract="true" eSuperTypes="#//commons/Commentable">
@@ -1362,7 +1367,7 @@
13621367
eType="#//literals/This" containment="true"/>
13631368
</eClassifiers>
13641369
</eSubpackages>
1365-
<eSubpackages name="references" nsURI="https://mdsd.tools/jamopp/java/references"
1370+
<eSubpackages name="references" nsURI="https://mdsd.tools/jamopp/6.0.0/java/references"
13661371
nsPrefix="references">
13671372
<eClassifiers xsi:type="ecore:EClass" name="Reference" abstract="true" eSuperTypes="#//expressions/PrimaryExpression #//generics/TypeArgumentable #//types/TypedElementExtension">
13681373
<eOperations name="getReferencedType" eType="#_Wo2ZO9z1Ed2bJ_pQViWxFg">
@@ -1433,7 +1438,7 @@
14331438
</eClassifiers>
14341439
<eClassifiers xsi:type="ecore:EClass" name="PackageReference" eSuperTypes="#//references/ReferenceableElement #//commons/NamespaceAwareElement"/>
14351440
</eSubpackages>
1436-
<eSubpackages xmi:id="_Wo2Yy9z1Ed2bJ_pQViWxFg" name="statements" nsURI="https://mdsd.tools/jamopp/java/statements"
1441+
<eSubpackages xmi:id="_Wo2Yy9z1Ed2bJ_pQViWxFg" name="statements" nsURI="https://mdsd.tools/jamopp/6.0.0/java/statements"
14371442
nsPrefix="statements">
14381443
<eClassifiers xsi:type="ecore:EClass" name="StatementContainer" abstract="true"
14391444
eSuperTypes="#//commons/Commentable">
@@ -1612,7 +1617,7 @@
16121617
upperBound="-1" eType="#_Wo2YDNz1Ed2bJ_pQViWxFg" containment="true"/>
16131618
</eClassifiers>
16141619
</eSubpackages>
1615-
<eSubpackages xmi:id="_Wo2ZOtz1Ed2bJ_pQViWxFg" name="types" nsURI="https://mdsd.tools/jamopp/java/types"
1620+
<eSubpackages xmi:id="_Wo2ZOtz1Ed2bJ_pQViWxFg" name="types" nsURI="https://mdsd.tools/jamopp/6.0.0/java/types"
16161621
nsPrefix="types">
16171622
<eClassifiers xsi:type="ecore:EClass" xmi:id="_Wo2ZO9z1Ed2bJ_pQViWxFg" name="Type"
16181623
abstract="true" eSuperTypes="#//commons/Commentable">
@@ -1739,7 +1744,7 @@
17391744
</eOperations>
17401745
</eClassifiers>
17411746
</eSubpackages>
1742-
<eSubpackages name="variables" nsURI="https://mdsd.tools/jamopp/java/variables"
1747+
<eSubpackages name="variables" nsURI="https://mdsd.tools/jamopp/6.0.0/java/variables"
17431748
nsPrefix="variables">
17441749
<eClassifiers xsi:type="ecore:EClass" name="Variable" abstract="true" eSuperTypes="#//commons/NamedElement #_Wo2ZP9z1Ed2bJ_pQViWxFg #//references/ReferenceableElement #//generics/TypeArgumentable">
17451750
<eOperations name="createMethodCallStatement" eType="#_Wo2YzNz1Ed2bJ_pQViWxFg">
@@ -1767,7 +1772,8 @@
17671772
<eClassifiers xsi:type="ecore:EClass" name="Resource" abstract="true" interface="true"
17681773
eSuperTypes="#//commons/Commentable"/>
17691774
</eSubpackages>
1770-
<eSubpackages name="modules" nsURI="https://mdsd.tools/jamopp/java/modules" nsPrefix="modules">
1775+
<eSubpackages name="modules" nsURI="https://mdsd.tools/jamopp/6.0.0/java/modules"
1776+
nsPrefix="modules">
17711777
<eClassifiers xsi:type="ecore:EClass" name="ModuleDirective" abstract="true" eSuperTypes="#//commons/Commentable"/>
17721778
<eClassifiers xsi:type="ecore:EClass" name="UsesModuleDirective" eSuperTypes="#//modules/ModuleDirective #_Wo2ZP9z1Ed2bJ_pQViWxFg"/>
17731779
<eClassifiers xsi:type="ecore:EClass" name="ProvidesModuleDirective" eSuperTypes="#_Wo2ZP9z1Ed2bJ_pQViWxFg #//modules/ModuleDirective">
@@ -1792,7 +1798,8 @@
17921798
<eStructuralFeatures xsi:type="ecore:EReference" name="target" eType="#//containers/Module"/>
17931799
</eClassifiers>
17941800
</eSubpackages>
1795-
<eSubpackages name="layout" nsURI="https://mdsd.tools/jamopp/commons/layout" nsPrefix="layout">
1801+
<eSubpackages name="layout" nsURI="https://mdsd.tools/jamopp/6.0.0/commons/layout"
1802+
nsPrefix="layout">
17961803
<eClassifiers xsi:type="ecore:EClass" name="LayoutInformation" abstract="true">
17971804
<eStructuralFeatures xsi:type="ecore:EAttribute" name="startOffset" lowerBound="1"
17981805
eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>

0 commit comments

Comments
 (0)