Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
59 commits
Select commit Hold shift + click to select a range
82746fa
Create build.yml
paulrutter May 8, 2024
dcc0980
Create root pom.xml
paulrutter May 8, 2024
7260696
Update build.yml
paulrutter May 8, 2024
fba4fc2
Update build.yml
paulrutter May 8, 2024
6a51efe
Update pom.xml
paulrutter May 8, 2024
abc7ecf
Update pom.xml
paulrutter May 8, 2024
9ff29c9
Update build.yml
paulrutter May 8, 2024
2a1e2b4
Update pom.xml
paulrutter May 8, 2024
84000cc
Update build.yml
paulrutter May 8, 2024
cae3d08
Update build.yml
paulrutter May 8, 2024
31cbcab
Update build.yml
paulrutter May 8, 2024
2174c83
Update pom.xml
paulrutter May 9, 2024
a2a3ff3
Update build.yml
paulrutter May 13, 2024
04d85b5
Update build.yml
paulrutter May 13, 2024
1b1fb88
Update build.yml
paulrutter May 13, 2024
1da24c0
Update build.yml
paulrutter May 13, 2024
4d1c192
Update build.yml
paulrutter May 13, 2024
cd7df20
Update build.yml
paulrutter May 13, 2024
d74716d
Update build.yml
paulrutter May 13, 2024
8044e9c
Set plugin version
paulrutter May 13, 2024
0ab6886
Follow https://sling.apache.org/documentation/development/testing-pax…
paulrutter May 13, 2024
d785152
Update build.yml
paulrutter May 15, 2024
8a43eaf
Remove combine
paulrutter May 15, 2024
77c68d5
Update maven
paulrutter May 15, 2024
d2e958c
Remove root pom and replace with -f command
paulrutter May 15, 2024
1651b59
Move configuration to execution
paulrutter May 15, 2024
bb6324b
Remove debug flag
paulrutter May 15, 2024
b1d3377
Use argLine (https://maven.apache.org/surefire/maven-failsafe-plugin/…
paulrutter May 15, 2024
49c7359
Try env variables instead
paulrutter May 15, 2024
e624f79
Fix light test
paulrutter May 15, 2024
46fb9d7
Add framework to test
paulrutter May 15, 2024
2c7e21a
useSystemClassLoader
paulrutter May 15, 2024
605848b
Update build.yml
paulrutter May 15, 2024
5211fff
Update build.yml
paulrutter May 15, 2024
e54ac5f
Update build.yml
paulrutter May 15, 2024
cc33d82
Update build.yml
paulrutter May 15, 2024
0a93c63
Update build.yml
paulrutter May 15, 2024
9a85720
Update build.yml
paulrutter May 15, 2024
fa76f86
Update build.yml
paulrutter May 15, 2024
d961787
Update build.yml
paulrutter May 15, 2024
bcff47a
Update build.yml
paulrutter May 15, 2024
dc9f076
Update build.yml
paulrutter May 15, 2024
82ec8d2
Update build.yml
paulrutter May 15, 2024
b6ae1a3
Update build.yml
paulrutter May 15, 2024
c196114
Update build.yml
paulrutter May 15, 2024
abf6a36
Update build.yml
paulrutter May 15, 2024
e450eab
Update build.yml
paulrutter May 15, 2024
5bd087c
Update build.yml
paulrutter May 15, 2024
92206e4
Update build.yml
paulrutter May 15, 2024
8038ad9
Update build.yml
paulrutter May 15, 2024
ce1dbdb
Update pom.xml
paulrutter May 15, 2024
5a60742
Update pom.xml
paulrutter May 15, 2024
90aa249
Update build.yml
paulrutter May 15, 2024
28343eb
Update build.yml
paulrutter May 15, 2024
f55faa1
Update build.yml
paulrutter May 15, 2024
c8ae47e
Update pom.xml
paulrutter May 15, 2024
3a39471
Update build.yml
paulrutter May 15, 2024
e4035f1
Revert unnecessary changes
paulrutter May 16, 2024
37cbfca
Revert unnecessary changes
paulrutter May 16, 2024
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
32 changes: 32 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
# This workflow will build a Java project with Maven, and cache/restore any dependencies to improve the workflow execution time
# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-maven

# This workflow uses actions that are not certified by GitHub.
# They are provided by a third-party and are governed by
# separate terms of service, privacy policy, and support
# documentation.

name: Java CI with Maven

on:
push:
branches: [ "master" ]
pull_request:
branches: [ "master" ]

jobs:
build:

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4
- name: Set up JDK 17
uses: actions/setup-java@v3
with:
java-version: '17'
distribution: 'temurin'
cache: maven
- name: Felix HTTP
run: mvn -B -DskipITs --file http clean install

4 changes: 2 additions & 2 deletions http/itest/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
<properties>
<felix.java.version>11</felix.java.version>
<http.servlet.api.version>2.1.0</http.servlet.api.version>
<http.jetty.version>5.1.13-SNAPSHOT</http.jetty.version>
<http.jetty.version>5.1.15-SNAPSHOT</http.jetty.version>
<http.jetty.id>org.apache.felix.http.jetty</http.jetty.id>
<pax.exam.version>4.13.1</pax.exam.version>
<pax.url.aether.version>2.6.14</pax.url.aether.version>
Expand All @@ -45,7 +45,7 @@
<properties>
<felix.java.version>17</felix.java.version>
<http.servlet.api.version>3.0.0</http.servlet.api.version>
<http.jetty.version>1.0.5-SNAPSHOT</http.jetty.version>
<http.jetty.version>1.0.7-SNAPSHOT</http.jetty.version>
<http.jetty.id>org.apache.felix.http.jetty12</http.jetty.id>
</properties>
</profile>
Expand Down
2 changes: 1 addition & 1 deletion http/jetty12/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<relativePath>../../pom/pom.xml</relativePath>
</parent>

<name>Apache Felix Http Jetty</name>
<name>Apache Felix Http Jetty 12</name>
<description>This is an implementation of the R8.1 OSGi Servlet Service, the R7 OSGi Http Service and the R7 OSGi Http Whiteboard Specification</description>

<artifactId>org.apache.felix.http.jetty12</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion http/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
<module>base</module>
<module>bridge</module>
<module>inventoryprinter</module>
<module>itest</module>
<!--<module>itest</module>-->
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this still required now -DskipITs is used?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, the regular unit tests also don't run with what's in master right now.

<module>jetty</module>
<module>jetty12</module>
<module>proxy</module>
Expand Down