Skip to content

Commit 1655ecf

Browse files
JulianFun123JulianFun123
committed
Removed useless Classes and added deployment files
1 parent 7125891 commit 1655ecf

File tree

12 files changed

+91
-394
lines changed

12 files changed

+91
-394
lines changed

‎.github/workflows/maven-deploy-release.yml

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Maven Release Deploy
1+
name: Maven Deploy Release
22
on:
33
release:
44
types: [published]
@@ -12,9 +12,15 @@ jobs:
1212
with:
1313
java-version: 1.8
1414
- name: Build
15-
run: mvn -B -DnewVersion=${{ github.event.release.tag_name }} package --file pom.xml
16-
- name: Deploy to JavaWebStack Repository
17-
run: mvn deploy -DnewVersion=${{ github.event.release.tag_name }} -s build/settings.xml
15+
run: mvn -B -DbuildVersion=${{ github.event.release.tag_name }} package --file pom.xml
16+
- name: Install GPG Key
17+
run: echo -e "$GPG_PRIVATE_KEY" | gpg --import --no-tty --batch --yes
18+
env:
19+
GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }}
20+
- name: Deploy to OSSRH Repository
21+
run: mvn deploy -DbuildVersion=${{ github.event.release.tag_name }} -s build/settings.xml
1822
env:
1923
DEPLOYMENT_USERNAME: ${{ secrets.DEPLOYMENT_USERNAME }}
2024
DEPLOYMENT_PASSWORD: ${{ secrets.DEPLOYMENT_PASSWORD }}
25+
GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
26+
OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}

‎.github/workflows/maven-deploy.yml

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
name: Maven Deploy
2-
on: [push]
2+
on:
3+
push:
4+
branches:
5+
- dev
36
jobs:
47
build:
58
runs-on: ubuntu-latest
@@ -10,9 +13,15 @@ jobs:
1013
with:
1114
java-version: 1.8
1215
- name: Build
13-
run: mvn -DnewVersion=1.0-SNAPSHOT -B package --file pom.xml
14-
- name: Deploy to JavaWebStack Repository
15-
run: mvn deploy -DnewVersion=1.0-SNAPSHOT -s build/settings.xml
16+
run: mvn -B package --file pom.xml
17+
- name: Install GPG Key
18+
run: echo -e "$GPG_PRIVATE_KEY" | gpg --import --no-tty --batch --yes
19+
env:
20+
GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }}
21+
- name: Deploy to OSSRH Repository
22+
run: mvn deploy -s build/settings.xml
1623
env:
1724
DEPLOYMENT_USERNAME: ${{ secrets.DEPLOYMENT_USERNAME }}
1825
DEPLOYMENT_PASSWORD: ${{ secrets.DEPLOYMENT_PASSWORD }}
26+
GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
27+
OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}

‎build/settings.xml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,14 @@
1414
<username>${env.DEPLOYMENT_USERNAME}</username>
1515
<password>${env.DEPLOYMENT_PASSWORD}</password>
1616
</server>
17+
<server>
18+
<id>ossrh</id>
19+
<username>JavaWebStack</username>
20+
<password>${env.OSSRH_PASSWORD}</password>
21+
</server>
22+
<server>
23+
<id>gpg</id>
24+
<passphrase>${env.GPG_PASSPHRASE}</passphrase>
25+
</server>
1726
</servers>
18-
</settings>
27+
</settings>

‎pom.xml

Lines changed: 48 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -4,27 +4,55 @@
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

7+
<properties>
8+
<maven.compiler.source>8</maven.compiler.source>
9+
<maven.compiler.target>8</maven.compiler.target>
10+
<buildVersion>1.0.0-SNAPSHOT</buildVersion>
11+
</properties>
12+
713
<groupId>org.javawebstack</groupId>
8-
<artifactId>Web-Framework</artifactId>
9-
<version>${newVersion}</version>
14+
<artifactId>web-framework</artifactId>
15+
<description>This library combines all the power of our JavaWebStack libraries to build an web application.</description>
16+
<version>${buildVersion}</version>
1017

11-
<repositories>
12-
<repository>
13-
<id>javawebstack</id>
14-
<url>https://repo.javawebstack.org</url>
15-
</repository>
16-
</repositories>
18+
<licenses>
19+
<license>
20+
<name>The Apache License, Version 2.0</name>
21+
<url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
22+
</license>
23+
</licenses>
24+
25+
<developers>
26+
<developer>
27+
<name>Jan Bebendorf</name>
28+
<email>[email protected]</email>
29+
<organization>JavaWebStack</organization>
30+
<organizationUrl>https://javawebstack.org</organizationUrl>
31+
</developer>
32+
<developer>
33+
<name>Julian Gojani</name>
34+
<email>[email protected]</email>
35+
<organization>JavaWebStack</organization>
36+
<organizationUrl>https://javawebstack.org</organizationUrl>
37+
</developer>
38+
</developers>
39+
40+
<scm>
41+
<connection>scm:git:git://github.com/JavaWebStack/web-framework.git</connection>
42+
<developerConnection>scm:git:ssh://github.com:JavaWebStack/web-framework.git</developerConnection>
43+
<url>https://github.com/JavaWebStack/web-framework/tree/master</url>
44+
</scm>
1745

1846
<dependencies>
1947
<dependency>
2048
<groupId>org.javawebstack</groupId>
21-
<artifactId>ORM</artifactId>
22-
<version>1.0-SNAPSHOT</version>
49+
<artifactId>orm</artifactId>
50+
<version>1.0.1</version>
2351
</dependency>
2452
<dependency>
2553
<groupId>org.javawebstack</groupId>
26-
<artifactId>HTTP-Server</artifactId>
27-
<version>1.0-SNAPSHOT</version>
54+
<artifactId>http-server</artifactId>
55+
<version>1.0.0</version>
2856
</dependency>
2957
<dependency>
3058
<groupId>com.github.javafaker</groupId>
@@ -33,19 +61,19 @@
3361
</dependency>
3462
<dependency>
3563
<groupId>org.javawebstack</groupId>
36-
<artifactId>AbstractData</artifactId>
37-
<version>1.0-SNAPSHOT</version>
64+
<artifactId>abstract-data</artifactId>
65+
<version>1.0.0</version>
3866
</dependency>
3967
<dependency>
4068
<groupId>org.junit.jupiter</groupId>
4169
<artifactId>junit-jupiter-engine</artifactId>
42-
<version>5.4.2</version>
70+
<version>5.8.1</version>
4371
<scope>test</scope>
4472
</dependency>
4573
<dependency>
4674
<groupId>org.javawebstack</groupId>
4775
<artifactId>web-utils</artifactId>
48-
<version>1.0-SNAPSHOT</version>
76+
<version>1.0.0</version>
4977
</dependency>
5078
<dependency>
5179
<groupId>info.picocli</groupId>
@@ -87,13 +115,12 @@
87115

88116
<distributionManagement>
89117
<snapshotRepository>
90-
<id>javawebstack-snapshots</id>
91-
<url>https://nexus.lumaserv.cloud/repository/javawebstack-snapshots</url>
118+
<id>ossrh</id>
119+
<url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>
92120
</snapshotRepository>
93121
<repository>
94-
<id>javawebstack-releases</id>
95-
<url>https://nexus.lumaserv.cloud/repository/javawebstack-releases</url>
122+
<id>ossrh</id>
123+
<url>https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/</url>
96124
</repository>
97125
</distributionManagement>
98-
99126
</project>

‎src/main/java/org/javawebstack/framework/WebApplication.java

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,10 @@
22

33
import com.github.javafaker.Faker;
44
import org.javawebstack.abstractdata.AbstractElement;
5-
import org.javawebstack.framework.bind.ModelBindParamTransformer;
6-
import org.javawebstack.framework.bind.ModelBindTransformer;
75
import org.javawebstack.framework.commands.AutoMigrateCommand;
86
import org.javawebstack.framework.commands.HelpCommand;
97
import org.javawebstack.framework.commands.SeedCommand;
108
import org.javawebstack.framework.commands.StartWebServerCommand;
11-
import org.javawebstack.framework.config.Config;
129
import org.javawebstack.framework.module.Module;
1310
import org.javawebstack.framework.seed.AllSeeder;
1411
import org.javawebstack.framework.seed.MergedSeeder;
@@ -19,7 +16,14 @@
1916
import org.javawebstack.orm.wrapper.SQLDriverFactory;
2017
import org.javawebstack.orm.wrapper.SQLDriverNotFoundException;
2118
import org.javawebstack.webutils.*;
19+
import org.javawebstack.webutils.config.Config;
2220
import org.javawebstack.webutils.crypt.Crypt;
21+
import org.javawebstack.webutils.middleware.CORSPolicy;
22+
import org.javawebstack.webutils.middleware.MultipartPolicy;
23+
import org.javawebstack.webutils.middleware.SerializedResponseTransformer;
24+
import org.javawebstack.webutils.modelbind.ModelBindParamTransformer;
25+
import org.javawebstack.webutils.modelbind.ModelBindTransformer;
26+
import org.javawebstack.webutils.util.IO;
2327
import picocli.CommandLine;
2428

2529
import java.io.IOException;
@@ -55,6 +59,7 @@ public WebApplication() {
5559
put("user", config.get("database.user", "root"));
5660
put("password", config.get("database.password", ""));
5761
}});
62+
5863
modules.forEach(m -> m.setupDriverFactory(this, sqlDriverFactory));
5964
String driverName = config.get("database.driver", "none");
6065
try {

‎src/main/java/org/javawebstack/framework/bind/ModelBind.java

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

‎src/main/java/org/javawebstack/framework/bind/ModelBindParamTransformer.java

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

‎src/main/java/org/javawebstack/framework/bind/ModelBindTransformer.java

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

0 commit comments

Comments
 (0)