Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move to Jakarta #377

Merged
merged 1 commit into from
Feb 14, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 8 additions & 36 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,35 +17,6 @@ jobs:
runs-on: ubuntu-latest
name: build

steps:
- uses: actions/checkout@v2
name: checkout

- uses: AdoptOpenJDK/install-jdk@v1
name: set up jdk 8
with:
version: 8

- name: Maven
run: mvn -B -ntp formatter:validate install

- uses: actions/checkout@v2
name: checkout smallrye-config
with:
repository: smallrye/smallrye-config
path: smallrye-config

- name: test with smallrye-config
run: |
cd smallrye-config
mvn -B -ntp versions:update-parent -DallowSnapshots=true -N
git diff pom.xml
mvn -B -ntp install

build-jakarta:
runs-on: ubuntu-latest
name: build with jakarta

steps:
- uses: actions/checkout@v2
name: checkout
Expand All @@ -64,10 +35,11 @@ jobs:
repository: smallrye/smallrye-config
path: smallrye-config

- name: test with smallrye-config
run: |
cd smallrye-config
mvn -B -ntp versions:update-parent -DallowSnapshots=true -N
sh to-jakarta.sh
git diff pom.xml
mvn -B -ntp install -Dtck.skip.owb=true
# Needs updates to work properly with Jakarta. The auto migration is not enough.
# - name: test with smallrye-config
# run: |
# cd smallrye-config
# mvn -B -ntp versions:update-parent -DallowSnapshots=true
# sh to-jakarta.sh
# git diff pom.xml
# mvn -B -ntp install -Dtck.skip.owb=true
155 changes: 0 additions & 155 deletions full-parent-jakarta/pom.xml

This file was deleted.

27 changes: 8 additions & 19 deletions full-parent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,21 +15,15 @@
<description>SmallRye Parent POM</description>

<properties>
<maven.compiler.target>1.8</maven.compiler.target>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.testTarget>${maven.compiler.target}</maven.compiler.testTarget>
<maven.compiler.testSource>${maven.compiler.source}</maven.compiler.testSource>

<!-- Dependency versions -->
<version.jakarta.api>8.0.0</version.jakarta.api>
<version.jakarta.annotation.api>1.3.5</version.jakarta.annotation.api>
<version.jakarta.enterprise.cdi.api>2.0.2</version.jakarta.enterprise.cdi.api>
<version.jakarta.json-p.api>1.1.6</version.jakarta.json-p.api>
<version.jakarta.json-b.api>1.0.2</version.jakarta.json-b.api>
<version.jakarta.ws.rs.api>2.1.6</version.jakarta.ws.rs.api>
<version.jakarta.jms.api>2.0.3</version.jakarta.jms.api>
<version.jakarta.api>10.0.0</version.jakarta.api>
<version.jakarta.annotation.api>2.1.1</version.jakarta.annotation.api>
<version.jakarta.enterprise.cdi.api>4.0.1</version.jakarta.enterprise.cdi.api>
<version.jakarta.json-p.api>2.1.0</version.jakarta.json-p.api>
<version.jakarta.json-b.api>3.0.0</version.jakarta.json-b.api>
<version.jakarta.ws.rs.api>3.1.0</version.jakarta.ws.rs.api>

<version.org.jboss.logging>3.4.3.Final</version.org.jboss.logging>
<version.org.jboss.logging>3.5.0.Final</version.org.jboss.logging>
<version.org.jboss.logging-processor>2.2.1.Final</version.org.jboss.logging-processor>
<version.org.jboss.jandex>2.4.3.Final</version.org.jboss.jandex>

Expand All @@ -46,7 +40,7 @@
<!-- Jakarta EE -->
<dependency>
<groupId>jakarta.platform</groupId>
<artifactId>jakarta.jakartaee-api</artifactId>
<artifactId>jakarta.jakartaee-core-api</artifactId>
<version>${version.jakarta.api}</version>
</dependency>
<dependency>
Expand Down Expand Up @@ -74,11 +68,6 @@
<artifactId>jakarta.json-api</artifactId>
<version>${version.jakarta.json-p.api}</version>
</dependency>
<dependency>
<groupId>jakarta.jms</groupId>
<artifactId>jakarta.jms-api</artifactId>
<version>${version.jakarta.jms.api}</version>
</dependency>

<!-- Logging -->
<dependency>
Expand Down
5 changes: 2 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@

<modules>
<module>full-parent</module>
<module>full-parent-jakarta</module>
</modules>

<properties>
Expand Down Expand Up @@ -51,8 +50,8 @@
<sonar.organization>smallrye</sonar.organization>

<!-- maven-compiler-plugin -->
<maven.compiler.target>1.8</maven.compiler.target>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.testTarget>${maven.compiler.target}</maven.compiler.testTarget>
<maven.compiler.testSource>${maven.compiler.source}</maven.compiler.testSource>

Expand Down