Skip to content

Commit 6ea4b00

Browse files
renczesstefanrenczesstefan
committed
Merge branch 'NAE-2070' into NAE-2092_old_user
# Conflicts: # application-engine/src/main/groovy/com/netgrif/application/engine/petrinet/domain/dataset/logic/action/ActionDelegate.groovy # application-engine/src/main/java/com/netgrif/application/engine/auth/web/UserController.java # application-engine/src/main/java/com/netgrif/application/engine/auth/web/requestbodies/UpdateUserRequest.java
2 parents 9262c8b + c8714f9 commit 6ea4b00

2,728 files changed

Lines changed: 2830 additions & 1445 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/master-build.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ jobs:
9292
restore-keys: ${{ runner.os }}-m2
9393

9494
- name: Generate certificates
95-
run: cd src/main/resources/certificates && openssl genrsa -out keypair.pem 4096 && openssl rsa -in keypair.pem -pubout -out public.crt && openssl pkcs8 -topk8 -inform PEM -outform DER -nocrypt -in keypair.pem -out private.der && cd ../../../..
95+
run: cd application-engine/src/main/resources/certificates && openssl genrsa -out keypair.pem 4096 && openssl rsa -in keypair.pem -pubout -out public.crt && openssl pkcs8 -topk8 -inform PEM -outform DER -nocrypt -in keypair.pem -out private.der && cd ../../../../..
9696

9797
- name: Build
9898
run: mvn clean package install -DskipTests=true
@@ -137,7 +137,7 @@ jobs:
137137
- name: Generate Docs
138138
run: |
139139
mvn javadoc:javadoc
140-
cp -r ./target/apidocs/* ./docs/javadoc/
140+
cp -r ./application-engine/target/reports/apidocs/* ./docs/javadoc/
141141
142142
- uses: EndBug/add-and-commit@v9
143143
with:

‎.github/workflows/nexus-release.yml‎

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
name: Publish package to Netgrif Nexus
2+
on: workflow_dispatch
3+
4+
jobs:
5+
build:
6+
name: Build
7+
runs-on: ubuntu-latest
8+
steps:
9+
- uses: actions/checkout@v4
10+
with:
11+
fetch-depth: 0
12+
13+
- name: Set up JDK 21
14+
uses: actions/setup-java@v4
15+
with:
16+
java-version: 21
17+
distribution: 'temurin'
18+
19+
- name: Cache Maven packages
20+
uses: actions/cache@v4
21+
with:
22+
path: ~/.m2
23+
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
24+
restore-keys: ${{ runner.os }}-m2
25+
26+
- name: Build
27+
run: mvn clean verify -DskipTests=true
28+
29+
publish-OSSRH:
30+
runs-on: ubuntu-latest
31+
name: Publish to Netgrif Nexus
32+
needs: build
33+
permissions:
34+
contents: read
35+
packages: write
36+
steps:
37+
- uses: actions/checkout@v4
38+
39+
- name: Set up Maven Central Repository
40+
uses: actions/setup-java@v4
41+
with:
42+
java-version: 21
43+
distribution: 'temurin'
44+
server-id: netgrif-nexus-snapshots
45+
server-username: MAVEN_USERNAME
46+
server-password: MAVEN_PASSWORD
47+
48+
- name: Publish package
49+
run: mvn -DskipTests=true --batch-mode -P netgrif-nexus-publish deploy
50+
env:
51+
MAVEN_USERNAME: ${{ secrets.NEXUS_USERNAME }}
52+
MAVEN_PASSWORD: ${{ secrets.NEXUS_PASSWORD }}
53+

‎.github/workflows/pr-build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ jobs:
9191
restore-keys: ${{ runner.os }}-m2
9292

9393
- name: Generate certificates
94-
run: cd src/main/resources/certificates && openssl genrsa -out keypair.pem 4096 && openssl rsa -in keypair.pem -pubout -out public.crt && openssl pkcs8 -topk8 -inform PEM -outform DER -nocrypt -in keypair.pem -out private.der && cd ../../../..
94+
run: cd application-engine/src/main/resources/certificates && openssl genrsa -out keypair.pem 4096 && openssl rsa -in keypair.pem -pubout -out public.crt && openssl pkcs8 -topk8 -inform PEM -outform DER -nocrypt -in keypair.pem -out private.der && cd ../../../../..
9595

9696

9797
- name: Build

‎.github/workflows/release-build.yml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ jobs:
103103
restore-keys: ${{ runner.os }}-m2
104104

105105
- name: Generate certificates
106-
run: cd src/main/resources/certificates && openssl genrsa -out keypair.pem 4096 && openssl rsa -in keypair.pem -pubout -out public.crt && openssl pkcs8 -topk8 -inform PEM -outform DER -nocrypt -in keypair.pem -out private.der && cd ../../../..
106+
run: cd application-engine/src/main/resources/certificates && openssl genrsa -out keypair.pem 4096 && openssl rsa -in keypair.pem -pubout -out public.crt && openssl pkcs8 -topk8 -inform PEM -outform DER -nocrypt -in keypair.pem -out private.der && cd ../../../../..
107107

108108
- name: Build
109109
run: mvn clean package install -DskipTests=true
@@ -193,13 +193,15 @@ jobs:
193193
- name: Push Version ${{ steps.getVersion.outputs.version }}
194194
uses: docker/build-push-action@v6
195195
with:
196+
context: "{{defaultContext}}:application-engine"
196197
push: true
197198
tags: netgrif/application-engine:${{ steps.getVersion.outputs.version }}
198199

199200
- name: Push Latest
200201
if: ${{ !contains(steps.getVersion.outputs.version, '-SNAPSHOT') }}
201202
uses: docker/build-push-action@v6
202203
with:
204+
context: "{{defaultContext}}:application-engine"
203205
push: true
204206
tags: netgrif/application-engine:latest
205207

@@ -257,8 +259,8 @@ jobs:
257259
- name: Build project
258260
run: |
259261
mkdir -p netgrif-application-engine-${{ steps.getVersion.outputs.version }}/src/main/resources/
260-
cp target/*-exec.jar netgrif-application-engine-${{ steps.getVersion.outputs.version }}
261-
cp -R src/main/resources/* netgrif-application-engine-${{ steps.getVersion.outputs.version }}/src/main/resources/
262+
cp application-engine/target/*-exec.jar netgrif-application-engine-${{ steps.getVersion.outputs.version }}
263+
cp -R application-engine/src/main/resources/* netgrif-application-engine-${{ steps.getVersion.outputs.version }}/src/main/resources/
262264
zip -r netgrif-application-engine-${{ steps.getVersion.outputs.version }}.zip netgrif-application-engine-${{ steps.getVersion.outputs.version }}
263265
264266
- name: Upload binaries to release

‎application-engine/docs/modules/img.png‎

-6.74 KB
Binary file not shown.

‎application-engine/docs/modules/img_1.png‎

-28.6 KB
Binary file not shown.

‎application-engine/docs/modules/modules.md‎

Lines changed: 0 additions & 52 deletions
This file was deleted.

‎application-engine/pom.xml‎

Lines changed: 14 additions & 127 deletions
Original file line numberDiff line numberDiff line change
@@ -56,32 +56,6 @@
5656
<jwt.version>0.11.5</jwt.version>
5757
</properties>
5858

59-
<repositories>
60-
<repository>
61-
<id>oss.snapshots</id>
62-
<name>OSSRH SNAPSHOT</name>
63-
<url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>
64-
<releases>
65-
<enabled>false</enabled>
66-
</releases>
67-
<snapshots>
68-
<enabled>true</enabled>
69-
</snapshots>
70-
</repository>
71-
<repository>
72-
<id>mvnrepository1</id>
73-
<url>https://maven.imagej.net/content/repositories/public/</url>
74-
</repository>
75-
<repository>
76-
<id>mvnrepository2</id>
77-
<url>https://repo.spring.io/plugins-release/</url>
78-
</repository>
79-
<repository>
80-
<id>mulesoft</id>
81-
<url>https://repository.mulesoft.org/nexus/content/repositories/public/</url>
82-
</repository>
83-
</repositories>
84-
8559
<dependencyManagement>
8660
<dependencies>
8761
<dependency>
@@ -129,12 +103,6 @@
129103
<artifactId>nae-user-common</artifactId>
130104
<version>${project.version}</version>
131105
</dependency>
132-
<dependency>
133-
<groupId>com.netgrif</groupId>
134-
<artifactId>plugin-core</artifactId>
135-
<version>0.2.0-SNAPSHOT</version>
136-
<scope>compile</scope>
137-
</dependency>
138106

139107
<!-- Loader -->
140108
<dependency>
@@ -564,13 +532,6 @@
564532
</dependencies>
565533

566534
<build>
567-
<extensions>
568-
<extension>
569-
<groupId>kr.motd.maven</groupId>
570-
<artifactId>os-maven-plugin</artifactId>
571-
<version>1.7.1</version>
572-
</extension>
573-
</extensions>
574535
<resources>
575536
<resource>
576537
<directory>src/main/resources</directory>
@@ -587,24 +548,6 @@
587548
<filtering>true</filtering>
588549
</resource>
589550
</resources>
590-
<pluginManagement>
591-
<plugins>
592-
<plugin>
593-
<groupId>org.apache.maven.plugins</groupId>
594-
<artifactId>maven-source-plugin</artifactId>
595-
<version>3.3.1</version>
596-
<executions>
597-
<execution>
598-
<id>attach-sources</id>
599-
<goals>
600-
<goal>jar-no-fork</goal>
601-
</goals>
602-
<phase>install</phase>
603-
</execution>
604-
</executions>
605-
</plugin>
606-
</plugins>
607-
</pluginManagement>
608551
<plugins>
609552
<plugin>
610553
<groupId>org.springframework.boot</groupId>
@@ -692,45 +635,6 @@
692635
</execution>
693636
</executions>
694637
</plugin>
695-
<plugin>
696-
<groupId>org.apache.maven.plugins</groupId>
697-
<artifactId>maven-source-plugin</artifactId>
698-
<version>3.3.1</version>
699-
<!-- <executions>-->
700-
<!-- <execution>-->
701-
<!-- <id>attach-sources</id>-->
702-
<!-- <goals>-->
703-
<!-- <goal>jar-no-fork</goal>-->
704-
<!-- </goals>-->
705-
<!-- <phase>install</phase>-->
706-
<!-- </execution>-->
707-
<!-- </executions>-->
708-
</plugin>
709-
<!-- <plugin>-->
710-
<!-- <groupId>org.apache.maven.plugins</groupId>-->
711-
<!-- <artifactId>maven-javadoc-plugin</artifactId>-->
712-
<!-- <executions>-->
713-
<!-- <execution>-->
714-
<!-- <id>attach-javadocs</id>-->
715-
<!-- <goals>-->
716-
<!-- <goal>jar</goal>-->
717-
<!-- </goals>-->
718-
<!-- <phase>package</phase>-->
719-
<!-- </execution>-->
720-
<!-- </executions>-->
721-
<!-- <configuration>-->
722-
<!-- <source>21</source>-->
723-
<!-- <doclint>none</doclint>-->
724-
<!-- <detectJavaApiLink>false</detectJavaApiLink>-->
725-
<!-- <failOnWarnings>false</failOnWarnings>-->
726-
<!-- <quiet>true</quiet>-->
727-
<!-- <sourcepath>src/main/java;target/generated-sources/groovy-stubs/main;target/generated-sources/java-->
728-
<!-- </sourcepath>-->
729-
<!-- <additionalOptions>-->
730-
<!-- <additionalOption>-Xdoclint:none</additionalOption>-->
731-
<!-- </additionalOptions>-->
732-
<!-- </configuration>-->
733-
<!-- </plugin>-->
734638
<plugin>
735639
<groupId>org.codehaus.mojo</groupId>
736640
<artifactId>jaxb2-maven-plugin</artifactId>
@@ -916,13 +820,6 @@
916820
</profile>
917821
<profile>
918822
<id>github-publish</id>
919-
<distributionManagement>
920-
<repository>
921-
<id>github</id>
922-
<name>GitHub Packages</name>
923-
<url>https://maven.pkg.github.com/netgrif/application-engine</url>
924-
</repository>
925-
</distributionManagement>
926823
<build>
927824
<plugins>
928825
<plugin>
@@ -945,40 +842,30 @@
945842
</profile>
946843
<profile>
947844
<id>ossrh-publish</id>
948-
<distributionManagement>
949-
<repository>
950-
<id>ossrh</id>
951-
<name>Central Repository OSSRH</name>
952-
<url>https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/</url>
953-
</repository>
954-
<snapshotRepository>
955-
<id>ossrh</id>
956-
<name>Central Repository OSSRG Snapshots</name>
957-
<url>https://s01.oss.sonatype.org/content/repositories/snapshots/</url>
958-
</snapshotRepository>
959-
</distributionManagement>
960845
<build>
961846
<plugins>
962847
<plugin>
963-
<groupId>org.apache.maven.plugins</groupId>
964-
<artifactId>maven-gpg-plugin</artifactId>
965-
<version>1.5</version>
848+
<groupId>org.springframework.boot</groupId>
849+
<artifactId>spring-boot-maven-plugin</artifactId>
966850
<executions>
967851
<execution>
968-
<id>sign-artifacts</id>
969-
<phase>verify</phase>
852+
<id>repackage</id>
970853
<goals>
971-
<goal>sign</goal>
854+
<goal>repackage</goal>
972855
</goals>
856+
<configuration>
857+
<skip>true</skip>
858+
</configuration>
973859
</execution>
974860
</executions>
975-
<configuration>
976-
<gpgArguments>
977-
<arg>--pinentry-mode</arg>
978-
<arg>loopback</arg>
979-
</gpgArguments>
980-
</configuration>
981861
</plugin>
862+
</plugins>
863+
</build>
864+
</profile>
865+
<profile>
866+
<id>netgrif-nexus-publish</id>
867+
<build>
868+
<plugins>
982869
<plugin>
983870
<groupId>org.springframework.boot</groupId>
984871
<artifactId>spring-boot-maven-plugin</artifactId>

‎application-engine/src/main/groovy/com/netgrif/application/engine/integration/plugin/injector/PluginHolder.groovy‎

Lines changed: 0 additions & 7 deletions
This file was deleted.

0 commit comments

Comments
 (0)