Skip to content

Pure Maven build #2

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.

Sign up for GitHub

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

Merged
merged 16 commits into from
May 19, 2023
Merged

Pure Maven build #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
75c061f
Converted all bundles to pure Maven modules.
HansMartinA Apr 21, 2023
b6dc1b2
Cleaned the Eclipse-specific files in the bundles.
HansMartinA Apr 21, 2023
b64b9bb
Converted the test plugin into a pure Maven module.
HansMartinA Apr 21, 2023
e43369f
Moved the test submodules into a new directory.
HansMartinA Apr 26, 2023
a73186e
Adjusted the tests for the changed paths.
HansMartinA May 3, 2023
2cf2543
Replaced the Apache BCEL code with the Maven dependency.
HansMartinA May 3, 2023
888d2cb
Added the code generation for the pure Maven build.
HansMartinA May 3, 2023
5009eeb
Replaced log4j with its current version.
HansMartinA May 3, 2023
b28c6e4
Merge remote-tracking branch 'origin/develop' into pure-maven-build
HansMartinA May 3, 2023
34f5c92
The submodules are not cleaned.
HansMartinA May 5, 2023
3093ec1
The Manifest files are automatically generated.
HansMartinA May 10, 2023
72e8879
Added a Maven module to build an update site.
HansMartinA May 16, 2023
bb76672
Removed bundles which are not needed.
HansMartinA May 16, 2023
fbb27f7
Fixed the test setup for the build pipeline.
HansMartinA May 17, 2023
0091e57
Updated the CHANGELOG.
HansMartinA May 19, 2023
3f94227
Merge remote-tracking branch 'origin/develop' into pure-maven-build
HansMartinA May 19, 2023
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
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ javacore.*
local.properties
src-gen/
tmp/
.project
.classpath

# Maven
.mvn/timing.properties
Expand Down
16 changes: 8 additions & 8 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
[submodule "tests/org.emftext.language.java.test/JaMoPP-BulkTest"]
path = tests/org.emftext.language.java.test/JaMoPP-BulkTest
path = tests/org.emftext.language.java.test/target/src-bulk/JaMoPP-BulkTest
url = https://github.com/DevBoost/JaMoPP-BulkTest
[submodule "tests/org.emftext.language.java.test/TeaStore"]
path = tests/org.emftext.language.java.test/TeaStore
path = tests/org.emftext.language.java.test/target/src-bulk/TeaStore
url = https://github.com/DescartesResearch/TeaStore
[submodule "tests/org.emftext.language.java.test/teammates"]
path = tests/org.emftext.language.java.test/teammates
path = tests/org.emftext.language.java.test/target/src-bulk/teammates
url = https://github.com/TEAMMATES/teammates
[submodule "tests/org.emftext.language.java.test/microservice"]
path = tests/org.emftext.language.java.test/microservice
path = tests/org.emftext.language.java.test/target/src-bulk/microservice
url = https://github.com/ewolff/microservice
[submodule "tests/org.emftext.language.java.test/esda"]
path = tests/org.emftext.language.java.test/esda
path = tests/org.emftext.language.java.test/target/src-bulk/esda
url = https://github.com/kit-sdq/esda
[submodule "tests/org.emftext.language.java.test/acmeair"]
path = tests/org.emftext.language.java.test/acmeair
path = tests/org.emftext.language.java.test/target/src-bulk/acmeair
url = https://github.com/acmeair/acmeair.git
[submodule "tests/org.emftext.language.java.test/piggymetrics"]
path = tests/org.emftext.language.java.test/piggymetrics
path = tests/org.emftext.language.java.test/target/src-bulk/piggymetrics
url = https://github.com/sqshq/piggymetrics.git
[submodule "tests/org.emftext.language.java.test/petclinic"]
path = tests/org.emftext.language.java.test/petclinic
path = tests/org.emftext.language.java.test/target/src-bulk/petclinic
url = https://github.com/spring-petclinic/spring-petclinic-microservices.git
13 changes: 0 additions & 13 deletions .mvn/extensions.xml
View file
Open in desktop

This file was deleted.

17 changes: 0 additions & 17 deletions .project
View file
Open in desktop

This file was deleted.

15 changes: 10 additions & 5 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
- Minimum required Java version: Java 17
- Supported Eclipse version: 2022-12
- Third variant: bindings of parameters and local variables are also resolved
- Migration to MDSD Tools organization
- Converted Maven Tycho-based build to pure Maven build
- Upgraded dependency versions to:
- Apache Commons Bytecode Engineering Library 6.7.0
- Apache Log4j 2 2.20.0 including the Log4j 1.x bridge

### Deprecated

Expand All @@ -27,7 +32,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),

## [5.1.0] - 2022-01-21

From here, independent development by the Institute of Information Security and Dependability (KASTEL) at the Karlsruher Institute of Technology (KIT) resulting in the following changes.
From here, independent development by the Modelling for Continuous Software Engineering (MCSE) group at the Institute of Information Security and Dependability (KASTEL) at the Karlsruher Institute of Technology (KIT) resulting in the following changes.

### Added

Expand Down Expand Up @@ -88,7 +93,7 @@ Originally, developed by DevBoost GmbH and Software Technology Group, Dresden Un
- Tests for the parsing (checks if generated model contains the expected elements)
- Tests for the parsing and printing (checks if printed code is equal to parsed code by parsing both source codes with Eclipse JDT and comparing the resulting ASTs)

[Unreleased]: https://github.com/PalladioSimulator/Palladio-Supporting-EclipseJavaDevelopmentTools/compare/releases/5.1.0...HEAD
[5.1.0]: https://github.com/PalladioSimulator/Palladio-Supporting-EclipseJavaDevelopmentTools/compare/8bc07...releases/5.1.0
[development after 1.4.0]: https://github.com/PalladioSimulator/Palladio-Supporting-EclipseJavaDevelopmentTools/compare/e46b0...8bc07
[1.4.0]: https://github.com/PalladioSimulator/Palladio-Supporting-EclipseJavaDevelopmentTools/commit/e46b0003803a8ccda7c3aa380ff2c759937d1ccb
[Unreleased]: https://github.com/MDSD-Tools/TheExtendedJavaModelParserAndPrinter/compare/releases/5.1.0...HEAD
[5.1.0]: https://github.com/MDSD-Tools/TheExtendedJavaModelParserAndPrinter/compare/8bc07...releases/5.1.0
[development after 1.4.0]: https://github.com/MDSD-Tools/TheExtendedJavaModelParserAndPrinter/compare/e46b0...8bc07
[1.4.0]: https://github.com/MDSD-Tools/TheExtendedJavaModelParserAndPrinter/commit/e46b0003803a8ccda7c3aa380ff2c759937d1ccb
4 changes: 0 additions & 4 deletions Jenkinsfile
View file
Open in desktop

This file was deleted.

11 changes: 0 additions & 11 deletions bundles/jamopp.parser.bcel/.classpath
View file
Open in desktop

This file was deleted.

34 changes: 0 additions & 34 deletions bundles/jamopp.parser.bcel/.project
View file
Open in desktop

This file was deleted.

11 changes: 0 additions & 11 deletions bundles/jamopp.parser.bcel/META-INF/MANIFEST.MF
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions bundles/jamopp.parser.bcel/NOTICE.txt
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions bundles/jamopp.parser.bcel/build.properties
View file
Open in desktop

This file was deleted.

48 changes: 48 additions & 0 deletions bundles/jamopp.parser.bcel/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

<modelVersion>4.0.0</modelVersion>
<artifactId>jamopp.parser.bcel</artifactId>
<packaging>jar</packaging>
<name>Apache BCEL-based JaMoPP Parser for Class Files</name>

<parent>
<groupId>tools.mdsd</groupId>
<artifactId>jamopp.bundles</artifactId>
<version>6.0.0-SNAPSHOT</version>
</parent>

<build>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>bundle</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>

<dependencies>
<dependency>
<groupId>org.eclipse.emf</groupId>
<artifactId>org.eclipse.emf.ecore</artifactId>
</dependency>
<dependency>
<groupId>tools.mdsd</groupId>
<artifactId>org.emftext.language.java</artifactId>
<version>6.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.bcel</groupId>
<artifactId>bcel</artifactId>
</dependency>
</dependencies>
</project>
0 ...opp/parser/bcel/ClassFileModelLoader.java → ...opp/parser/bcel/ClassFileModelLoader.java
View file
Open in desktop
File renamed without changes.
0 .../src/jamopp/parser/bcel/package-info.java → ...java/jamopp/parser/bcel/package-info.java
View file
Open in desktop
File renamed without changes.
Loading