Skip to content

Commit 0aacf7b

Browse files
jknackjknack
committed
Merge branch '3.x' into 4.x
2 parents 3878647 + f08c167 commit 0aacf7b

File tree

73 files changed

+150
-5418
lines changed

Some content is hidden

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

73 files changed

+150
-5418
lines changed

‎.github/workflows/maven-central.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,15 @@ jobs:
3232
with: # running setup-java again overwrites the settings.xml
3333
java-version: 17
3434
distribution: 'temurin'
35-
server-id: ossrh
36-
server-username: OSSRH_USERNAME
37-
server-password: OSSRH_PASSWORD
35+
server-id: central
36+
server-username: CENTRAL_USERNAME
37+
server-password: CENTRAL_TOKEN
3838
gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }}
3939
gpg-passphrase: MAVEN_GPG_PASSPHRASE
4040

4141
- name: Publish to Maven Central
4242
run: mvn -pl '!tests' clean deploy -P bom,central,gradlePlugin
4343
env:
44-
OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
45-
OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
44+
CENTRAL_USERNAME: ${{ secrets.CENTRAL_USERNAME }}
45+
CENTRAL_TOKEN: ${{ secrets.CENTRAL_TOKEN }}
4646
MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}

‎docs/asciidoc/index.adoc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ public class App {
182182
public static void main(String[] args) {
183183
runApp(args, app -> {
184184
185-
app.use(new MyController());
185+
app.use(new MyController_());
186186
187187
});
188188
}
@@ -205,7 +205,7 @@ class MyController {
205205
fun main(args: Array<String>) {
206206
runApp(args) {
207207
208-
use(MyController())
208+
use(MyController_())
209209
210210
}
211211
}

‎jooby/pom.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,10 @@
66
<parent>
77
<groupId>io.jooby</groupId>
88
<artifactId>jooby-project</artifactId>
9-
<version>3.9.2-SNAPSHOT</version>
9+
<version>3.11.0-SNAPSHOT</version>
1010
</parent>
1111
<artifactId>jooby</artifactId>
12+
<name>jooby</name>
1213

1314
<dependencies>
1415

‎modules/jooby-apt/pom.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,10 @@
66
<parent>
77
<groupId>io.jooby</groupId>
88
<artifactId>modules</artifactId>
9-
<version>3.9.2-SNAPSHOT</version>
9+
<version>3.11.0-SNAPSHOT</version>
1010
</parent>
1111
<artifactId>jooby-apt</artifactId>
12+
<name>jooby-apt</name>
1213

1314
<properties>
1415
<!-- shaded module-info.java makes javadoc plugin fails -->

‎modules/jooby-avaje-inject/pom.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,10 @@
66
<parent>
77
<groupId>io.jooby</groupId>
88
<artifactId>modules</artifactId>
9-
<version>3.9.2-SNAPSHOT</version>
9+
<version>3.11.0-SNAPSHOT</version>
1010
</parent>
1111
<artifactId>jooby-avaje-inject</artifactId>
12+
<name>jooby-avaje-inject</name>
1213

1314
<properties>
1415
<maven.compiler.proc>full</maven.compiler.proc>

‎modules/jooby-avaje-jsonb/pom.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,10 @@
66
<parent>
77
<groupId>io.jooby</groupId>
88
<artifactId>modules</artifactId>
9-
<version>3.9.2-SNAPSHOT</version>
9+
<version>3.11.0-SNAPSHOT</version>
1010
</parent>
1111
<artifactId>jooby-avaje-jsonb</artifactId>
12+
<name>jooby-avaje-jsonb</name>
1213

1314
<dependencies>
1415
<dependency>

‎modules/jooby-avaje-validator/pom.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,10 @@
66
<parent>
77
<groupId>io.jooby</groupId>
88
<artifactId>modules</artifactId>
9-
<version>3.9.2-SNAPSHOT</version>
9+
<version>3.11.0-SNAPSHOT</version>
1010
</parent>
1111
<artifactId>jooby-avaje-validator</artifactId>
12+
<name>jooby-avaje-validator</name>
1213

1314
<properties>
1415
<maven.compiler.proc>full</maven.compiler.proc>

‎modules/jooby-awssdk-v1/pom.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,10 @@
66
<parent>
77
<groupId>io.jooby</groupId>
88
<artifactId>modules</artifactId>
9-
<version>3.9.2-SNAPSHOT</version>
9+
<version>3.11.0-SNAPSHOT</version>
1010
</parent>
1111
<artifactId>jooby-awssdk-v1</artifactId>
12+
<name>jooby-awssdk-v1</name>
1213

1314
<properties>
1415
<Module-Name>io.jooby.awssdkv1</Module-Name>

‎modules/jooby-awssdk-v2/pom.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,10 @@
66
<parent>
77
<groupId>io.jooby</groupId>
88
<artifactId>modules</artifactId>
9-
<version>3.9.2-SNAPSHOT</version>
9+
<version>3.11.0-SNAPSHOT</version>
1010
</parent>
1111
<artifactId>jooby-awssdk-v2</artifactId>
12+
<name>jooby-awssdk-v2</name>
1213

1314
<properties>
1415
<aws.java.sdk.version>2.31.73</aws.java.sdk.version>

‎modules/jooby-bom/pom.template.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212

1313
<groupId>io.jooby</groupId>
1414
<artifactId>jooby-bom</artifactId>
15+
<name>jooby-bom</name>
1516
<packaging>pom</packaging>
1617
<version>@version</version>
1718
<description>Jooby (Bill of Materials)</description>

0 commit comments

Comments
 (0)