Skip to content

Commit 4754957

Browse files
JanHolgerJanHolger
committed
Refactored a few classes and prepared release
1 parent 2f3f6e7 commit 4754957

14 files changed

+142
-101
lines changed

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

+26
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
name: Maven Deploy Release
2+
on:
3+
release:
4+
types: [published]
5+
jobs:
6+
build:
7+
runs-on: ubuntu-latest
8+
steps:
9+
- uses: actions/checkout@v2
10+
- name: Set up JDK 1.8
11+
uses: actions/setup-java@v1
12+
with:
13+
java-version: 1.8
14+
- name: Build
15+
run: mvn -B -DbuildVersion=${{ github.event.release.tag_name }} package
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 JavaWebStack Repository
21+
run: mvn deploy -B -DbuildVersion=${{ github.event.release.tag_name }} -s build/settings.xml -Dmaven.test.skip=true
22+
env:
23+
DEPLOYMENT_USERNAME: ${{ secrets.DEPLOYMENT_USERNAME }}
24+
DEPLOYMENT_PASSWORD: ${{ secrets.DEPLOYMENT_PASSWORD }}
25+
GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
26+
OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}

‎.github/workflows/maven-deploy.yml

+7-20
Original file line numberDiff line numberDiff line change
@@ -2,39 +2,26 @@ name: Maven Deploy
22
on:
33
push:
44
branches:
5-
- master
6-
5+
- dev
76
jobs:
87
build:
98
runs-on: ubuntu-latest
10-
services:
11-
mysql:
12-
image: mariadb:latest
13-
env:
14-
MYSQL_ALLOW_EMPTY_PASSWORD: yes
15-
MYSQL_DATABASE: test
16-
MYSQL_USER: test
17-
MYSQL_PASSWORD: test
18-
MYSQL_RANDOM_ROOT_PASSWORD: yes
19-
ports:
20-
- 3306
21-
options: --health-cmd="mysqladmin ping" --health-interval=5s --health-timeout=2s --health-retries=3
229
steps:
2310
- uses: actions/checkout@v2
2411
- name: Set up JDK 1.8
2512
uses: actions/setup-java@v1
2613
with:
2714
java-version: 1.8
2815
- name: Build
29-
run: mvn -B package -Dmaven.test.skip=true
30-
- name: Test
31-
run: mvn -B test
16+
run: mvn -B package
17+
- name: Install GPG Key
18+
run: echo -e "$GPG_PRIVATE_KEY" | gpg --import --no-tty --batch --yes
3219
env:
33-
MYSQL_PORT: ${{ job.services.mysql.ports[3306] }}
34-
MYSQL_USERNAME: test
35-
MYSQL_PASSWORD: test
20+
GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }}
3621
- name: Deploy to JavaWebStack Repository
3722
run: mvn deploy -B -s build/settings.xml -Dmaven.test.skip=true
3823
env:
3924
DEPLOYMENT_USERNAME: ${{ secrets.DEPLOYMENT_USERNAME }}
4025
DEPLOYMENT_PASSWORD: ${{ secrets.DEPLOYMENT_PASSWORD }}
26+
GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
27+
OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}

‎.github/workflows/maven-test.yml

-34
This file was deleted.

‎README.md

+2-11
Original file line numberDiff line numberDiff line change
@@ -5,26 +5,17 @@ JWS Utilties
55

66
![GitHub Workflow Status (branch)](https://img.shields.io/github/workflow/status/JavaWebStack/web-utils/Maven%20Deploy/master)
77
![GitHub](https://img.shields.io/github/license/JavaWebStack/web-utils)
8-
![Maven metadata URL](https://img.shields.io/maven-metadata/v?metadataUrl=https%3A%2F%2Frepo.javawebstack.org%2Forg%2Fjavawebstack%2Fweb-utils%2Fmaven-metadata.xml)
8+
![Maven metadata URL](https://img.shields.io/maven-metadata/v?metadataUrl=https%3A%2F%2Frepo1.maven.org%2Fmaven2%2Forg%2Fjavawebstack%2Fweb-utils%2Fmaven-metadata.xml)
99
![GitHub contributors](https://img.shields.io/github/contributors/JavaWebStack/web-utils)
1010
![Lines of code](https://img.shields.io/tokei/lines/github/JavaWebStack/web-utils)
1111
![Discord](https://img.shields.io/discord/815612319378833408?color=%237289DA&label=discord)
1212
![Twitter Follow](https://img.shields.io/twitter/follow/JavaWebStack?style=social)
1313

1414
## Maven
15-
16-
### Repository
17-
```xml
18-
<repository>
19-
<id>javawebstack</id>
20-
<url>https://repo.javawebstack.org</url>
21-
</repository>
22-
```
23-
### Dependency
2415
```xml
2516
<dependency>
2617
<groupId>org.javawebstack</groupId>
2718
<artifactId>web-utils</artifactId>
28-
<version>1.0-SNAPSHOT</version>
19+
<version>1.0.0</version>
2920
</dependency>
3021
```

‎build/settings.xml

+9
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>
1827
</settings>

‎pom.xml

+90-29
Original file line numberDiff line numberDiff line change
@@ -4,56 +4,68 @@
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>
814
<artifactId>web-utils</artifactId>
9-
<version>1.0-SNAPSHOT</version>
15+
<version>${buildVersion}</version>
1016

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

1843
<dependencies>
1944
<dependency>
2045
<groupId>org.javawebstack</groupId>
21-
<artifactId>ORM</artifactId>
22-
<version>1.0-SNAPSHOT</version>
46+
<artifactId>orm</artifactId>
47+
<version>1.0.1</version>
2348
</dependency>
2449
<dependency>
2550
<groupId>org.javawebstack</groupId>
26-
<artifactId>HTTP-Server</artifactId>
27-
<version>1.0-SNAPSHOT</version>
51+
<artifactId>http-server</artifactId>
52+
<version>1.0.1</version>
2853
</dependency>
2954
<dependency>
3055
<groupId>com.github.javafaker</groupId>
3156
<artifactId>javafaker</artifactId>
3257
<version>1.0.2</version>
3358
</dependency>
34-
<dependency>
35-
<groupId>org.javawebstack</groupId>
36-
<artifactId>AbstractData</artifactId>
37-
<version>1.0-SNAPSHOT</version>
38-
</dependency>
3959
<dependency>
4060
<groupId>org.junit.jupiter</groupId>
4161
<artifactId>junit-jupiter-engine</artifactId>
42-
<version>5.4.2</version>
62+
<version>5.8.1</version>
4363
<scope>test</scope>
4464
</dependency>
4565
</dependencies>
4666

4767
<build>
4868
<plugins>
49-
<plugin>
50-
<groupId>org.apache.maven.plugins</groupId>
51-
<artifactId>maven-compiler-plugin</artifactId>
52-
<configuration>
53-
<source>8</source>
54-
<target>8</target>
55-
</configuration>
56-
</plugin>
5769
<plugin>
5870
<groupId>org.apache.maven.plugins</groupId>
5971
<artifactId>maven-surefire-plugin</artifactId>
@@ -72,17 +84,66 @@
7284
</execution>
7385
</executions>
7486
</plugin>
87+
<plugin>
88+
<groupId>org.apache.maven.plugins</groupId>
89+
<artifactId>maven-source-plugin</artifactId>
90+
<version>2.2.1</version>
91+
<executions>
92+
<execution>
93+
<id>attach-sources</id>
94+
<goals>
95+
<goal>jar-no-fork</goal>
96+
</goals>
97+
</execution>
98+
</executions>
99+
</plugin>
100+
<plugin>
101+
<groupId>org.apache.maven.plugins</groupId>
102+
<artifactId>maven-javadoc-plugin</artifactId>
103+
<version>2.9.1</version>
104+
<executions>
105+
<execution>
106+
<id>attach-javadocs</id>
107+
<goals>
108+
<goal>jar</goal>
109+
</goals>
110+
</execution>
111+
</executions>
112+
</plugin>
113+
<plugin>
114+
<groupId>org.apache.maven.plugins</groupId>
115+
<artifactId>maven-gpg-plugin</artifactId>
116+
<version>3.0.1</version>
117+
<executions>
118+
<execution>
119+
<id>sign-artifacts</id>
120+
<phase>verify</phase>
121+
<goals>
122+
<goal>sign</goal>
123+
</goals>
124+
<configuration>
125+
<keyname>A313520526A8DFE1C2A30399C35A3D43C557B112</keyname>
126+
<passphraseServerId>gpg</passphraseServerId>
127+
<gpgArguments>
128+
<arg>--no-tty</arg>
129+
<arg>--batch</arg>
130+
<arg>--yes</arg>
131+
</gpgArguments>
132+
</configuration>
133+
</execution>
134+
</executions>
135+
</plugin>
75136
</plugins>
76137
</build>
77138

78139
<distributionManagement>
79140
<snapshotRepository>
80-
<id>javawebstack-snapshots</id>
81-
<url>https://nexus.lumaserv.cloud/repository/javawebstack-snapshots</url>
141+
<id>ossrh</id>
142+
<url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>
82143
</snapshotRepository>
83144
<repository>
84-
<id>javawebstack-releases</id>
85-
<url>https://nexus.lumaserv.cloud/repository/javawebstack-releases</url>
145+
<id>ossrh</id>
146+
<url>https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/</url>
86147
</repository>
87148
</distributionManagement>
88149

‎src/main/java/org/javawebstack/webutils/Translation.java

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import org.javawebstack.abstractdata.AbstractElement;
44
import org.javawebstack.abstractdata.AbstractObject;
5+
import org.javawebstack.webutils.util.IO;
56

67
import java.io.*;
78
import java.util.HashMap;

‎src/main/java/org/javawebstack/webutils/config/EnvFile.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package org.javawebstack.webutils.config;
22

3-
import org.javawebstack.webutils.IO;
3+
import org.javawebstack.webutils.util.IO;
44

55
import java.io.File;
66
import java.io.IOException;

‎src/main/java/org/javawebstack/webutils/CORSPolicy.java renamed to ‎src/main/java/org/javawebstack/webutils/middleware/CORSPolicy.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.javawebstack.webutils;
1+
package org.javawebstack.webutils.middleware;
22

33
import org.javawebstack.httpserver.Exchange;
44
import org.javawebstack.httpserver.handler.RequestInterceptor;

‎src/main/java/org/javawebstack/webutils/MultipartPolicy.java renamed to ‎src/main/java/org/javawebstack/webutils/middleware/MultipartPolicy.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.javawebstack.webutils;
1+
package org.javawebstack.webutils.middleware;
22

33
import org.javawebstack.httpserver.Exchange;
44
import org.javawebstack.httpserver.handler.RequestInterceptor;

‎src/main/java/org/javawebstack/webutils/SerializedResponseTransformer.java renamed to ‎src/main/java/org/javawebstack/webutils/middleware/SerializedResponseTransformer.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.javawebstack.webutils;
1+
package org.javawebstack.webutils.middleware;
22

33
import org.javawebstack.abstractdata.AbstractMapper;
44
import org.javawebstack.abstractdata.NamingPolicy;

‎src/main/java/org/javawebstack/webutils/IO.java renamed to ‎src/main/java/org/javawebstack/webutils/util/IO.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.javawebstack.webutils;
1+
package org.javawebstack.webutils.util;
22

33
import org.javawebstack.abstractdata.AbstractElement;
44

‎src/main/java/org/javawebstack/webutils/RandomUtil.java renamed to ‎src/main/java/org/javawebstack/webutils/util/RandomUtil.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.javawebstack.webutils;
1+
package org.javawebstack.webutils.util;
22

33
import java.security.SecureRandom;
44
import java.util.Locale;

‎src/main/java/org/javawebstack/webutils/URLUtils.java renamed to ‎src/main/java/org/javawebstack/webutils/util/URLUtils.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.javawebstack.webutils;
1+
package org.javawebstack.webutils.util;
22

33
import org.javawebstack.abstractdata.util.QueryString;
44

0 commit comments

Comments
 (0)