Skip to content

Commit cecca8f

Browse files
committed
Fix CI Build
1 parent 2361bd5 commit cecca8f

4 files changed

Lines changed: 27 additions & 28 deletions

File tree

.github/workflows/build.yml

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ on:
44
push:
55
branches:
66
- main
7-
- jakarta
87
paths-ignore:
98
- '.gitignore'
109
- 'CODEOWNERS'
@@ -80,12 +79,24 @@ jobs:
8079
- uses: actions/checkout@v4
8180
with:
8281
fetch-depth: 0
82+
8383
- uses: actions/setup-java@v4
8484
with:
85+
distribution: 'temurin'
86+
java-version: 11
87+
cache: 'maven'
88+
cache-dependency-path: '**/pom.xml'
89+
90+
- name: build with docs and coverage
91+
run: mvn verify -Pcoverage javadoc:javadoc
92+
93+
- uses: actions/setup-java@v4
94+
with:
95+
distribution: 'temurin'
8596
java-version: 17
8697

8798
- name: sonar
8899
env:
89100
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
90101
SONAR_TOKEN: ${{secrets.SONAR_TOKEN}}
91-
run: mvn -B verify --file pom.xml -Pcoverage javadoc:javadoc sonar:sonar -Dsonar.projectKey=smallrye_smallrye-jwt -Dsonar.token=$SONAR_TOKEN
102+
run: mvn sonar:sonar -Psonar -Dsonar.token=${{secrets.SONAR_TOKEN}}

pom.xml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -212,5 +212,17 @@
212212
<module>release</module>
213213
</modules>
214214
</profile>
215+
<profile>
216+
<id>sonar</id>
217+
<properties>
218+
<sonar.projectName>SmallRye JWT</sonar.projectName>
219+
<sonar.projectKey>io.smallrye:smallrye-jwt</sonar.projectKey>
220+
<sonar.moduleKey>${project.artifactId}</sonar.moduleKey>
221+
<!--suppress UnresolvedMavenProperty -->
222+
<sonar.coverage.jacoco.xmlReportPaths>
223+
${maven.multiModuleProjectDirectory}/coverage/target/site/jacoco-aggregate/jacoco.xml
224+
</sonar.coverage.jacoco.xmlReportPaths>
225+
</properties>
226+
</profile>
215227
</profiles>
216228
</project>

testsuite/tck/pom.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,9 +114,10 @@
114114
<artifactId>microprofile-jwt-auth-tck</artifactId>
115115
<version>${version.eclipse.microprofile.jwt}</version>
116116
<type>test-jar</type>
117+
<classifier>tests</classifier>
117118
<overWrite>false</overWrite>
119+
<includes>**/*.xml</includes>
118120
<outputDirectory>${project.build.directory}/tck-suite</outputDirectory>
119-
<includes>**/tck-base-suite.xml</includes>
120121
</artifactItem>
121122
</artifactItems>
122123
</configuration>

to-jakarta.sh

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

0 commit comments

Comments
 (0)