Skip to content

Commit 4faf278

Browse files
HansMartinAHansMartinA
committed
Updated the Maven module structure.
1 parent dca090f commit 4faf278

File tree

18 files changed

+99
-99
lines changed

18 files changed

+99
-99
lines changed

‎.github/workflows/build.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ jobs:
2626
java-version: 17
2727
cache: 'maven'
2828
- name: Build Packages
29-
run: ./mvnw clean package
29+
run: cd jamopp-ext.parent && ./mvnw clean package
3030
- name: Store P2 Repository
3131
if: runner.os == 'Linux'
3232
uses: actions/upload-artifact@v3
3333
with:
3434
name: p2-jamopp
35-
path: jamopp.p2/target/repository
35+
path: jamopp-ext.parent/jamopp-ext.p2/target/repository
3636
retention-days: 1

‎.github/workflows/release.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
java-version: 17
2121
cache: 'maven'
2222
- name: Build Packages (without tests)
23-
run: ./mvnw clean package -Dmaven.test.skip=true
23+
run: cd jamopp-ext.parent && ./mvnw clean package -Dmaven.test.skip=true
2424
- name: Build Deploy Path
2525
shell: bash
2626
run: echo "DEPLOY_PATH=$( echo '${{ secrets.DEPLOYMENT_REMOTE_TARGET }}/extended-java-model-parser-and-printer' )" >> $GITHUB_ENV
@@ -31,7 +31,7 @@ jobs:
3131
remote-host: ${{ secrets.DEPLOYMENT_REMOTE_HOST }}
3232
remote-port: ${{ secrets.DEPLOYMENT_REMOTE_PORT }}
3333
server-ssh-key: ${{ secrets.DEPLOYMENT_SERVER_SSH_KEY }}
34-
local-source: './jamopp.p2/target/repository/*'
34+
local-source: './jamopp-ext.parent/jamopp-ext.p2/target/repository/*'
3535
remote-target: '${{ env.DEPLOY_PATH }}/release/${{ inputs.release-version }}'
3636
release-version: ${{ inputs.release-version }}
3737
link-path: ${{ env.DEPLOY_PATH }}
@@ -47,7 +47,7 @@ jobs:
4747
gpg-passphrase: MAVEN_GPG_PASSPHRASE
4848
cache: 'maven'
4949
- name: Deploy to Apache Maven Central
50-
run: mvn -Pdeploy-mvn-central deploy
50+
run: cd jamopp-ext.parent && mvn -Pdeploy-mvn-central deploy
5151
env:
5252
OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
5353
OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}

‎jamopp-ext.parent/jamopp-ext.model.edit/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
55

66
<modelVersion>4.0.0</modelVersion>
7-
<artifactId>jamopp.model.edit</artifactId>
7+
<artifactId>jamopp-ext.model.edit</artifactId>
88
<packaging>jar</packaging>
99
<name>Extended Java Model Parser and Printer (JaMoPP) Metamodel Edit Support</name>
1010
<description>This package provides edit support for the metamodel of the extended JaMoPP.</description>
1111

1212
<parent>
1313
<groupId>tools.mdsd</groupId>
14-
<artifactId>jamopp.parent</artifactId>
14+
<artifactId>jamopp-ext.parent</artifactId>
1515
<version>6.0.0-SNAPSHOT</version>
1616
</parent>
1717

@@ -164,7 +164,7 @@
164164
</dependency>
165165
<dependency>
166166
<groupId>tools.mdsd</groupId>
167-
<artifactId>jamopp.model</artifactId>
167+
<artifactId>jamopp-ext.model</artifactId>
168168
<version>6.0.0-SNAPSHOT</version>
169169
</dependency>
170170
</dependencies>

‎jamopp-ext.parent/jamopp-ext.model.editor/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
55

66
<modelVersion>4.0.0</modelVersion>
7-
<artifactId>jamopp.model.editor</artifactId>
7+
<artifactId>jamopp-ext.model.editor</artifactId>
88
<packaging>jar</packaging>
99
<name>Extended Java Model Parser and Printer (JaMoPP) Metamodel Editor</name>
1010
<description>This package provides an editor for the extended JaMoPP allowing to edit Eclipse Modeling Framework-based Java models in the Eclipse IDE.</description>
1111

1212
<parent>
1313
<groupId>tools.mdsd</groupId>
14-
<artifactId>jamopp.parent</artifactId>
14+
<artifactId>jamopp-ext.parent</artifactId>
1515
<version>6.0.0-SNAPSHOT</version>
1616
</parent>
1717

@@ -51,7 +51,7 @@
5151
<dependencies>
5252
<dependency>
5353
<groupId>tools.mdsd</groupId>
54-
<artifactId>jamopp.model.edit</artifactId>
54+
<artifactId>jamopp-ext.model.edit</artifactId>
5555
<version>6.0.0-SNAPSHOT</version>
5656
</dependency>
5757
<dependency>

‎jamopp-ext.parent/jamopp-ext.model/pom.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
55

66
<modelVersion>4.0.0</modelVersion>
7-
<artifactId>jamopp.model</artifactId>
7+
<artifactId>jamopp-ext.model</artifactId>
88
<packaging>jar</packaging>
99
<name>Extended Java Model Parser and Printer (JaMoPP) Metamodel</name>
1010
<description>This package provides the metamodel and generated metamodel code for the extended JaMoPP to model Java source code in the Eclipse Modeling Framework.</description>
1111

1212
<parent>
1313
<groupId>tools.mdsd</groupId>
14-
<artifactId>jamopp.parent</artifactId>
14+
<artifactId>jamopp-ext.parent</artifactId>
1515
<version>6.0.0-SNAPSHOT</version>
1616
</parent>
1717

@@ -102,10 +102,10 @@
102102
<directory>${project.basedir}/src/main/generated</directory>
103103
</fileset>
104104
<fileset>
105-
<directory>${project.basedir}/../jamopp.model.edit/src/main/generated</directory>
105+
<directory>${project.basedir}/../jamopp-ext.model.edit/src/main/generated</directory>
106106
</fileset>
107107
<fileset>
108-
<directory>${project.basedir}/../jamopp.model.edit/src/main/resources</directory>
108+
<directory>${project.basedir}/../jamopp-ext.model.edit/src/main/resources</directory>
109109
</fileset>
110110
</filesets>
111111
</configuration>

‎jamopp-ext.parent/jamopp-ext.model/src/gen/generate.mwe2‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,18 @@ Workflow {
1212
scanClassPath = false
1313
platformUri = workspaceRoot
1414
projectMapping = {
15-
projectName = "jamopp.model"
16-
path = "jamopp.model"
15+
projectName = "jamopp-ext.model"
16+
path = "jamopp-ext.model"
1717
}
1818
projectMapping = {
19-
projectName = "jamopp.model.edit"
20-
path = "jamopp.model.edit"
19+
projectName = "jamopp-ext.model.edit"
20+
path = "jamopp-ext.model.edit"
2121
}
2222
}
2323

2424
component = EcoreGenerator {
25-
genModel = "platform:/resource/jamopp.model/src/main/resources/metamodel/java.genmodel"
26-
srcPath = "platform:/resource/jamopp.model/src/main/generated"
25+
genModel = "platform:/resource/jamopp-ext.model/src/main/resources/metamodel/java.genmodel"
26+
srcPath = "platform:/resource/jamopp-ext.model/src/main/generated"
2727
generateEdit = true
2828
}
2929
}

‎jamopp-ext.parent/jamopp-ext.model/src/main/resources/metamodel/java.genmodel‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
33
xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2020-2023&#xD;&#xA;Modelling for Continuous Software Engineering (MCSE) group, Institute of Information Security and Dependability (KASTEL), Karlsruhe Institute of Technology (KIT).&#xD;&#xA;&#xD;&#xA;Copyright (c) 2006-2014&#xD;&#xA;Software Technology Group, Dresden University of Technology&#xD;&#xA;DevBoost GmbH, Berlin, Amtsgericht Charlottenburg, HRB 140026&#xD;&#xA;&#xD;&#xA;All rights reserved. This program and the accompanying materials&#xD;&#xA;are made available under the terms of the Eclipse Public License v1.0&#xD;&#xA;which accompanies this distribution, and is available at&#xD;&#xA;http://www.eclipse.org/legal/epl-v10.html&#xD;&#xA;&#xD;&#xA;Contributors:&#xD;&#xA; Software Technology Group - TU Dresden, Germany;&#xD;&#xA; DevBoost GmbH - Berlin, Germany&#xD;&#xA; - initial API and implementation&#xD;&#xA; Martin Armbruster (MCSE, KASTEL, KIT)&#xD;&#xA; - Adaptation and extension for Java 7+&#xD;&#xA; "
4-
modelDirectory="/jamopp.model/src/main/generated" editDirectory="/jamopp.model.edit/src/main/generated"
5-
editorDirectory="/jamopp.model.editor/src-gen" modelPluginID="tools.mdsd.jamopp.model"
4+
modelDirectory="/jamopp-ext.model/src/main/generated" editDirectory="/jamopp-ext.model.edit/src/main/generated"
5+
editorDirectory="/jamopp-ext.model.editor/src-gen" modelPluginID="tools.mdsd.jamopp.model"
66
templateDirectory="" modelName="Java" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl"
77
importerID="org.eclipse.emf.importer.ecore" bundleManifest="false" containmentProxies="true"
88
complianceLevel="17.0" suppressGenModelAnnotations="false" copyrightFields="false"

‎jamopp-ext.parent/jamopp-ext.p2/pom.xml‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
44

55
<modelVersion>4.0.0</modelVersion>
6-
<artifactId>jamopp.p2</artifactId>
6+
<artifactId>jamopp-ext.p2</artifactId>
77
<packaging>pom</packaging>
88
<name>Extended JaMoPP P2 Site</name>
99
<description>This package builds a P2 update site for the extended JaMoPP.</description>
1010

1111
<parent>
1212
<groupId>tools.mdsd</groupId>
13-
<artifactId>jamopp.parent</artifactId>
13+
<artifactId>jamopp-ext.parent</artifactId>
1414
<version>6.0.0-SNAPSHOT</version>
1515
</parent>
1616

@@ -32,31 +32,31 @@
3232
<!-- specify your depencies here -->
3333
<!-- groupId:artifactId:version -->
3434
<artifact>
35-
<id>tools.mdsd:jamopp.model:6.0.0-SNAPSHOT</id>
35+
<id>tools.mdsd:jamopp-ext.model:6.0.0-SNAPSHOT</id>
3636
<transitive>false</transitive>
3737
</artifact>
3838
<artifact>
39-
<id>tools.mdsd:jamopp.model.edit:6.0.0-SNAPSHOT</id>
39+
<id>tools.mdsd:jamopp-ext.model.edit:6.0.0-SNAPSHOT</id>
4040
<transitive>false</transitive>
4141
</artifact>
4242
<artifact>
43-
<id>tools.mdsd:jamopp.parser.jdt.singlefile:6.0.0-SNAPSHOT</id>
43+
<id>tools.mdsd:jamopp-ext.parser.jdt.singlefile:6.0.0-SNAPSHOT</id>
4444
<transitive>false</transitive>
4545
</artifact>
4646
<artifact>
47-
<id>tools.mdsd:jamopp.resource:6.0.0-SNAPSHOT</id>
47+
<id>tools.mdsd:jamopp-ext.resource:6.0.0-SNAPSHOT</id>
4848
<transitive>false</transitive>
4949
</artifact>
5050
<artifact>
51-
<id>tools.mdsd:jamopp.parser.jdt:6.0.0-SNAPSHOT</id>
51+
<id>tools.mdsd:jamopp-ext.parser.jdt:6.0.0-SNAPSHOT</id>
5252
<transitive>false</transitive>
5353
</artifact>
5454
<artifact>
55-
<id>tools.mdsd:jamopp.parser.bcel:6.0.0-SNAPSHOT</id>
55+
<id>tools.mdsd:jamopp-ext.parser.bcel:6.0.0-SNAPSHOT</id>
5656
<transitive>false</transitive>
5757
</artifact>
5858
<artifact>
59-
<id>tools.mdsd:jamopp.standalone:6.0.0-SNAPSHOT</id>
59+
<id>tools.mdsd:jamopp-ext.standalone:6.0.0-SNAPSHOT</id>
6060
<transitive>false</transitive>
6161
</artifact>
6262
<artifact>
@@ -106,47 +106,47 @@ Contributors:
106106
<generateSourceFeature>false</generateSourceFeature>
107107
<artifacts>
108108
<artifact>
109-
<id>tools.mdsd:jamopp.model:6.0.0-SNAPSHOT</id>
109+
<id>tools.mdsd:jamopp-ext.model:6.0.0-SNAPSHOT</id>
110110
<transitive>false</transitive>
111111
<source>false</source>
112112
</artifact>
113113
<artifact>
114-
<id>tools.mdsd:jamopp.model.edit:6.0.0-SNAPSHOT</id>
114+
<id>tools.mdsd:jamopp-ext.model.edit:6.0.0-SNAPSHOT</id>
115115
<transitive>false</transitive>
116116
<source>false</source>
117117
</artifact>
118118
<artifact>
119-
<id>tools.mdsd:jamopp.parser:6.0.0-SNAPSHOT</id>
119+
<id>tools.mdsd:jamopp-ext.parser:6.0.0-SNAPSHOT</id>
120120
<transitive>false</transitive>
121121
<source>false</source>
122122
</artifact>
123123
<artifact>
124-
<id>tools.mdsd:jamopp.parser.jdt:6.0.0-SNAPSHOT</id>
124+
<id>tools.mdsd:jamopp-ext.parser.jdt:6.0.0-SNAPSHOT</id>
125125
<transitive>false</transitive>
126126
<source>false</source>
127127
</artifact>
128128
<artifact>
129-
<id>tools.mdsd:jamopp.parser.jdt.singlefile:6.0.0-SNAPSHOT</id>
129+
<id>tools.mdsd:jamopp-ext.parser.jdt.singlefile:6.0.0-SNAPSHOT</id>
130130
<transitive>false</transitive>
131131
<source>false</source>
132132
</artifact>
133133
<artifact>
134-
<id>tools.mdsd:jamopp.printer:6.0.0-SNAPSHOT</id>
134+
<id>tools.mdsd:jamopp-ext.printer:6.0.0-SNAPSHOT</id>
135135
<transitive>false</transitive>
136136
<source>false</source>
137137
</artifact>
138138
<artifact>
139-
<id>tools.mdsd:jamopp.resolution:6.0.0-SNAPSHOT</id>
139+
<id>tools.mdsd:jamopp-ext.resolution:6.0.0-SNAPSHOT</id>
140140
<transitive>false</transitive>
141141
<source>false</source>
142142
</artifact>
143143
<artifact>
144-
<id>tools.mdsd:jamopp.resource:6.0.0-SNAPSHOT</id>
144+
<id>tools.mdsd:jamopp-ext.resource:6.0.0-SNAPSHOT</id>
145145
<transitive>false</transitive>
146146
<source>false</source>
147147
</artifact>
148148
<artifact>
149-
<id>tools.mdsd:jamopp.standalone:6.0.0-SNAPSHOT</id>
149+
<id>tools.mdsd:jamopp-ext.standalone:6.0.0-SNAPSHOT</id>
150150
<transitive>false</transitive>
151151
<source>false</source>
152152
</artifact>
@@ -180,17 +180,17 @@ Contributors:
180180
<dependencies>
181181
<dependency>
182182
<groupId>tools.mdsd</groupId>
183-
<artifactId>jamopp.tests</artifactId>
183+
<artifactId>jamopp-ext.tests</artifactId>
184184
<version>6.0.0-SNAPSHOT</version>
185185
</dependency>
186186
<dependency>
187187
<groupId>tools.mdsd</groupId>
188-
<artifactId>jamopp.model.edit</artifactId>
188+
<artifactId>jamopp-ext.model.edit</artifactId>
189189
<version>6.0.0-SNAPSHOT</version>
190190
</dependency>
191191
<dependency>
192192
<groupId>tools.mdsd</groupId>
193-
<artifactId>jamopp.standalone</artifactId>
193+
<artifactId>jamopp-ext.standalone</artifactId>
194194
<version>6.0.0-SNAPSHOT</version>
195195
</dependency>
196196
</dependencies>

‎jamopp-ext.parent/jamopp-ext.parser.bcel/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
55

66
<modelVersion>4.0.0</modelVersion>
7-
<artifactId>jamopp.parser.bcel</artifactId>
7+
<artifactId>jamopp-ext.parser.bcel</artifactId>
88
<packaging>jar</packaging>
99
<name>Extended JaMoPP Parser for Class Files</name>
1010
<description>This package provides a parser for the extended JaMoPP to read class files and generate Eclipse Modeling Framework-based Java models from the class files. Internally, the class files are read with the Apache Commons Bytecode Engineering Library (BCEL).</description>
1111

1212
<parent>
1313
<groupId>tools.mdsd</groupId>
14-
<artifactId>jamopp.parent</artifactId>
14+
<artifactId>jamopp-ext.parent</artifactId>
1515
<version>6.0.0-SNAPSHOT</version>
1616
</parent>
1717

@@ -38,7 +38,7 @@
3838
</dependency>
3939
<dependency>
4040
<groupId>tools.mdsd</groupId>
41-
<artifactId>jamopp.model</artifactId>
41+
<artifactId>jamopp-ext.model</artifactId>
4242
<version>6.0.0-SNAPSHOT</version>
4343
</dependency>
4444
<dependency>

‎jamopp-ext.parent/jamopp-ext.parser.jdt.singlefile/pom.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
55

66
<modelVersion>4.0.0</modelVersion>
7-
<artifactId>jamopp.parser.jdt.singlefile</artifactId>
7+
<artifactId>jamopp-ext.parser.jdt.singlefile</artifactId>
88
<packaging>jar</packaging>
99
<name>Extended JaMoPP JDT-based Parser for Single Files</name>
1010
<description>This package provides a parser for the extended JaMoPP to generate Eclipse Modeling Framework-based Java models from Java source code. It supports single files, i.e., without the need to have the full source code available. Internally, the Eclipse Java Development Tools are used to parse the source code after which the JDT AST is converted to a model.</description>
1111

1212
<parent>
1313
<groupId>tools.mdsd</groupId>
14-
<artifactId>jamopp.parent</artifactId>
14+
<artifactId>jamopp-ext.parent</artifactId>
1515
<version>6.0.0-SNAPSHOT</version>
1616
</parent>
1717

@@ -38,12 +38,12 @@
3838
</dependency>
3939
<dependency>
4040
<groupId>tools.mdsd</groupId>
41-
<artifactId>jamopp.model</artifactId>
41+
<artifactId>jamopp-ext.model</artifactId>
4242
<version>6.0.0-SNAPSHOT</version>
4343
</dependency>
4444
<dependency>
4545
<groupId>tools.mdsd</groupId>
46-
<artifactId>jamopp.parser</artifactId>
46+
<artifactId>jamopp-ext.parser</artifactId>
4747
<version>6.0.0-SNAPSHOT</version>
4848
</dependency>
4949
<dependency>
@@ -52,7 +52,7 @@
5252
</dependency>
5353
<dependency>
5454
<groupId>tools.mdsd</groupId>
55-
<artifactId>jamopp.resolution</artifactId>
55+
<artifactId>jamopp-ext.resolution</artifactId>
5656
<version>6.0.0-SNAPSHOT</version>
5757
</dependency>
5858
<dependency>

0 commit comments

Comments
 (0)