Skip to content

Commit 49ba2ba

Browse files
Specify datamanager submodule naming and add production flag (#55)
* Remove unnecessary dependency and update Spring Boot Starter to fix security issue * Add missing commit * Include Production Flag in Release Github Action Workflow * Refactor submodule artefact names to datamanagement
1 parent 7af6552 commit 49ba2ba

File tree

4 files changed

+14
-19
lines changed

4 files changed

+14
-19
lines changed

.github/workflows/create-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
run: mvn versions:set -DnewVersion=${{ github.event.inputs.versionTag }}
3434

3535
- name: Build with Maven
36-
run: mvn -B package --file pom.xml
36+
run: mvn -B package -Pproduction --file pom.xml
3737

3838
- name: Create Release Notes
3939
if: ${{ !startsWith(github.ref, 'refs/tags/')

core/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

12-
<artifactId>core</artifactId>
12+
<artifactId>datamanagement-core</artifactId>
1313
<name>Data Manager Core</name>
1414

1515
<dependencyManagement>

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<parent>
2525
<groupId>org.springframework.boot</groupId>
2626
<artifactId>spring-boot-starter-parent</artifactId>
27-
<version>2.6.7</version>
27+
<version>2.7.1</version>
2828
</parent>
2929

3030
<repositories>

webapp/pom.xml

Lines changed: 11 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
55
<modelVersion>4.0.0</modelVersion>
66
<!-- Project from https://start.vaadin.com/project/25bb864a-5cfc-4bcc-8a0c-1abc5ff20bd8 -->
7-
<artifactId>webapp</artifactId>
7+
<artifactId>datamanagement-webapp</artifactId>
88
<name>Data Manager Webapp</name>
99
<version>0.3.0</version>
1010
<packaging>jar</packaging>
@@ -65,31 +65,32 @@
6565

6666
<dependencyManagement>
6767
<dependencies>
68-
<dependency>
69-
<groupId>life.qbic</groupId>
70-
<artifactId>core</artifactId>
71-
<version>0.3.0</version>
72-
</dependency>
7368
<dependency>
7469
<groupId>com.vaadin</groupId>
7570
<artifactId>vaadin-bom</artifactId>
7671
<version>${vaadin.version}</version>
7772
<type>pom</type>
7873
<scope>import</scope>
7974
</dependency>
75+
<dependency>
76+
<groupId>life.qbic</groupId>
77+
<artifactId>datamanagement-core</artifactId>
78+
<version>0.3.0</version>
79+
<scope>compile</scope>
80+
</dependency>
8081
</dependencies>
8182
</dependencyManagement>
8283

8384
<dependencies>
84-
<dependency>
85-
<groupId>life.qbic</groupId>
86-
<artifactId>core</artifactId>
87-
</dependency>
8885
<dependency>
8986
<groupId>com.vaadin</groupId>
9087
<!-- Replace artifactId with vaadin-core to use only free components -->
9188
<artifactId>vaadin</artifactId>
9289
</dependency>
90+
<dependency>
91+
<groupId>life.qbic</groupId>
92+
<artifactId>datamanagement-core</artifactId>
93+
</dependency>
9394
<dependency>
9495
<groupId>com.vaadin</groupId>
9596
<artifactId>vaadin-spring-boot-starter</artifactId>
@@ -116,12 +117,6 @@
116117
<artifactId>mysql-connector-java</artifactId>
117118
</dependency>
118119

119-
<dependency>
120-
<groupId>com.vaadin</groupId>
121-
<artifactId>exampledata</artifactId>
122-
<version>4.1.2</version>
123-
</dependency>
124-
125120
<dependency>
126121
<groupId>com.h2database</groupId>
127122
<artifactId>h2</artifactId>

0 commit comments

Comments
 (0)