diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml new file mode 100644 index 0000000000..59f0f4427c --- /dev/null +++ b/.github/workflows/maven.yml @@ -0,0 +1,23 @@ +name: Java CI with Maven + +on: + push: + branches: [ "master" ] + pull_request: + branches: [ "master" ] + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v3 + - name: Set up JDK 17 + uses: actions/setup-java@v3 + with: + java-version: '17' + distribution: 'temurin' + cache: maven + - name: Resolver + run: mvn -B package --file resolver/pom.xml diff --git a/.gitignore b/.gitignore index 7692143cb7..262a166146 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,5 @@ dependency-reduced-pom.xml /.metadata/ /workspace/ .vscode +bin/ +target_test-classes/ \ No newline at end of file diff --git a/resolver/pom.xml b/resolver/pom.xml index cc2844dfd9..e340780d05 100644 --- a/resolver/pom.xml +++ b/resolver/pom.xml @@ -29,7 +29,7 @@ Provide OSGi resolver service. - 2.1.0-SNAPSHOT + 3.0.0-SNAPSHOT org.apache.felix.resolver scm:git:https://github.com/apache/felix-dev.git @@ -38,15 +38,17 @@ HEAD - - org.osgi - osgi.annotation - 6.0.1 + + org.osgi + osgi.annotation + 8.1.0 + provided - org.osgi - org.osgi.core - 5.0.0 + org.osgi + osgi.core + 8.0.0 + provided junit @@ -68,7 +70,7 @@ - 6 + 8 @@ -114,7 +116,7 @@ src/**/packageinfo src/main/appended-resources/** - src/test/resources/resolution.json + src/test/resources/resolution.json src/test/resources/felix-4914.json