Skip to content

Commit 89a793b

Browse files
JanHolgerJanHolger
committed
Prepared release
1 parent 9283370 commit 89a793b

File tree

5 files changed

+134
-35
lines changed

5 files changed

+134
-35
lines changed

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

+9-3
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
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 }}
1620
- name: Deploy to JavaWebStack Repository
17-
run: mvn deploy -DnewVersion=${{ github.event.release.tag_name }} -s build/settings.xml
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

+12-3
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
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 }}
1421
- name: Deploy to JavaWebStack Repository
15-
run: mvn deploy -DnewVersion=1.0-SNAPSHOT -s build/settings.xml
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 }}

‎README.md

+14-5
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
JWS HTTP Client
44
</p>
55

6-
![GitHub Workflow Status (branch)](https://img.shields.io/github/workflow/status/JavaWebStack/HTTP-Client/Maven%20Deploy/master)
7-
![GitHub](https://img.shields.io/github/license/JavaWebStack/HTTP-Client)
8-
![Maven metadata URL](https://img.shields.io/maven-metadata/v?metadataUrl=https%3A%2F%2Frepo.javawebstack.org%2Forg%2Fjavawebstack%2FHTTP-Client%2Fmaven-metadata.xml)
9-
![GitHub contributors](https://img.shields.io/github/contributors/JavaWebStack/HTTP-Client)
10-
![Lines of code](https://img.shields.io/tokei/lines/github/JavaWebStack/HTTP-Client)
6+
![GitHub Workflow Status (branch)](https://img.shields.io/github/workflow/status/JavaWebStack/http-client/Maven%20Deploy/master)
7+
![GitHub](https://img.shields.io/github/license/JavaWebStack/http-client)
8+
![Maven metadata URL](https://img.shields.io/maven-metadata/v?metadataUrl=https%3A%2F%2Frepo1.maven.org%2Fmaven2%2Forg%2Fjavawebstack%2FHTTP-Client%2Fmaven-metadata.xml)
9+
![GitHub contributors](https://img.shields.io/github/contributors/JavaWebStack/http-client)
10+
![Lines of code](https://img.shields.io/tokei/lines/github/JavaWebStack/http-client)
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

@@ -16,3 +16,12 @@ A simple to use and extendable http client wrapper around java's built in HttpUR
1616

1717
## Documentation
1818
You can find the current docs on our [website](https://docs.javawebstack.org/framework/http-client). This is a work-in-progress project though so it's not yet complete.
19+
20+
## Maven
21+
```xml
22+
<dependency>
23+
<groupId>org.javawebstack</groupId>
24+
<artifactId>http-client</artifactId>
25+
<version>1.0.0</version>
26+
</dependency>
27+
```

‎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-24
Original file line numberDiff line numberDiff line change
@@ -4,46 +4,63 @@
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>HTTP-Client</artifactId>
9-
<version>${newVersion}</version>
14+
<artifactId>http-client</artifactId>
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>http-client</name>
18+
<description>A simple to use and extendable http client wrapper around java's built in HttpURLConnection.</description>
19+
<url>https://github.com/JavaWebStack/http-client</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/http-client.git</connection>
39+
<developerConnection>scm:git:ssh://github.com:JavaWebStack/http-client.git</developerConnection>
40+
<url>https://github.com/JavaWebStack/http-client/tree/master</url>
41+
</scm>
1742

1843
<dependencies>
1944
<dependency>
2045
<groupId>com.google.code.gson</groupId>
2146
<artifactId>gson</artifactId>
22-
<version>2.8.6</version>
47+
<version>2.8.9</version>
2348
</dependency>
2449
<dependency>
2550
<groupId>org.javawebstack</groupId>
26-
<artifactId>AbstractData</artifactId>
27-
<version>1.0-SNAPSHOT</version>
51+
<artifactId>abstract-data</artifactId>
52+
<version>1.0.0</version>
2853
</dependency>
2954
<dependency>
3055
<groupId>org.junit.jupiter</groupId>
3156
<artifactId>junit-jupiter-engine</artifactId>
32-
<version>5.4.2</version>
57+
<version>5.8.1</version>
3358
<scope>test</scope>
3459
</dependency>
3560
</dependencies>
3661

3762
<build>
3863
<plugins>
39-
<plugin>
40-
<groupId>org.apache.maven.plugins</groupId>
41-
<artifactId>maven-compiler-plugin</artifactId>
42-
<configuration>
43-
<source>8</source>
44-
<target>8</target>
45-
</configuration>
46-
</plugin>
4764
<plugin>
4865
<artifactId>maven-deploy-plugin</artifactId>
4966
<version>3.0.0-M1</version>
@@ -62,17 +79,66 @@
6279
<artifactId>maven-surefire-plugin</artifactId>
6380
<version>2.22.1</version>
6481
</plugin>
82+
<plugin>
83+
<groupId>org.apache.maven.plugins</groupId>
84+
<artifactId>maven-source-plugin</artifactId>
85+
<version>2.2.1</version>
86+
<executions>
87+
<execution>
88+
<id>attach-sources</id>
89+
<goals>
90+
<goal>jar-no-fork</goal>
91+
</goals>
92+
</execution>
93+
</executions>
94+
</plugin>
95+
<plugin>
96+
<groupId>org.apache.maven.plugins</groupId>
97+
<artifactId>maven-javadoc-plugin</artifactId>
98+
<version>2.9.1</version>
99+
<executions>
100+
<execution>
101+
<id>attach-javadocs</id>
102+
<goals>
103+
<goal>jar</goal>
104+
</goals>
105+
</execution>
106+
</executions>
107+
</plugin>
108+
<plugin>
109+
<groupId>org.apache.maven.plugins</groupId>
110+
<artifactId>maven-gpg-plugin</artifactId>
111+
<version>3.0.1</version>
112+
<executions>
113+
<execution>
114+
<id>sign-artifacts</id>
115+
<phase>verify</phase>
116+
<goals>
117+
<goal>sign</goal>
118+
</goals>
119+
<configuration>
120+
<keyname>A313520526A8DFE1C2A30399C35A3D43C557B112</keyname>
121+
<passphraseServerId>gpg</passphraseServerId>
122+
<gpgArguments>
123+
<arg>--no-tty</arg>
124+
<arg>--batch</arg>
125+
<arg>--yes</arg>
126+
</gpgArguments>
127+
</configuration>
128+
</execution>
129+
</executions>
130+
</plugin>
65131
</plugins>
66132
</build>
67133

68134
<distributionManagement>
69135
<snapshotRepository>
70-
<id>javawebstack-snapshots</id>
71-
<url>https://nexus.lumaserv.cloud/repository/javawebstack-snapshots</url>
136+
<id>ossrh</id>
137+
<url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>
72138
</snapshotRepository>
73139
<repository>
74-
<id>javawebstack-releases</id>
75-
<url>https://nexus.lumaserv.cloud/repository/javawebstack-releases</url>
140+
<id>ossrh</id>
141+
<url>https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/</url>
76142
</repository>
77143
</distributionManagement>
78144

0 commit comments

Comments
 (0)