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.

Sign up for GitHub

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

Jump to bottom

Cleanup used dependencies and streamline manifest #59

Merged
merged 1 commit into from
Jul 7, 2024
Merged

Cleanup used dependencies and streamline manifest #59

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 12 additions & 3 deletions .github/workflows/maven.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ jobs:

steps:
- uses: actions/[email protected]
- name: Set up JDK 11
- name: Set up JDK 17
uses: actions/[email protected]
with:
java-version: '11'
java-version: '17'
distribution: 'adopt'
cache: maven
- name: Build with Maven
Expand All @@ -31,4 +31,13 @@ jobs:
with:
name: tck-results
if-no-files-found: error
path: '**/target/test-reports/**/*.xml'
path: '**/target/test-reports/**/*.xml'
event_file:
name: "Event File"
runs-on: ubuntu-latest
steps:
- name: Upload
uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
with:
name: Event File
path: ${{ github.event_path }}
12 changes: 10 additions & 2 deletions .github/workflows/tck.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,14 @@ jobs:
unit-test-results:
name: Unit Test Results
runs-on: ubuntu-latest
if: github.event.workflow_run.conclusion == 'success'

if: github.event.workflow_run.conclusion != 'skipped'
permissions:
checks: write
pull-requests: write
contents: read
issues: read
actions: read

steps:
- name: Download and Extract Artifacts
env:
Expand All @@ -32,6 +38,8 @@ jobs:
uses: EnricoMi/publish-unit-test-result-action@v2
with:
commit: ${{ github.event.workflow_run.head_sha }}
event_file: artifacts/Event File/event.json
event_name: ${{ github.event.workflow_run.event }}
files: "artifacts/**/*.xml"


Expand Down
64 changes: 21 additions & 43 deletions pax-jpa-tck/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,9 @@
<packaging>pom</packaging>

<properties>
<bnd.version>6.4.0-SNAPSHOT</bnd.version>
<bnd.version>7.0.0</bnd.version>
<org.eclipse.osgi.version>3.17.200</org.eclipse.osgi.version>
<eclipselink.version>2.4.2</eclipselink.version>
</properties>
<repositories>
<repository>
Expand All @@ -21,19 +22,6 @@
</snapshots>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>bnd-snapshots</id>
<url>https://bndtools.jfrog.io/bndtools/libs-snapshot/</url>
<layout>default</layout>
<releases>
<enabled>false</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
</pluginRepository>
</pluginRepositories>
<build>
<plugins>
<plugin>
Expand Down Expand Up @@ -85,35 +73,28 @@
<groupId>org.ops4j.pax.jpa</groupId>
<artifactId>pax-jpa</artifactId>
<version>${project.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.sun.activation</groupId>
<artifactId>jakarta.activation</artifactId>
<version>2.0.0</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jpa_2.2_spec</artifactId>
<version>1.1</version>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.service.jdbc</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.eclipse.persistence</groupId>
<artifactId>org.eclipse.persistence.jpa</artifactId>
<scope>provided</scope>
<version>${eclipselink.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.glassfish.hk2</groupId>
Expand All @@ -126,21 +107,23 @@
<artifactId>slf4j-simple</artifactId>
<version>1.7.0</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.service.jpa</artifactId>
<version>1.1.1</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.service.cm</artifactId>
<version>1.6.1</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.test.cases.jpa</artifactId>
<version>8.0.0-SNAPSHOT</version>
<version>8.1.0</version>
<!-- <scope>runtime</scope>-->
<!-- See https://github.com/osgi/osgi/issues/731 -->
<exclusions>
<exclusion>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.service.jpa</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.eclipse.platform</groupId>
Expand All @@ -149,14 +132,9 @@
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.util.function</artifactId>
<version>1.2.0</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.util.promise</artifactId>
<version>1.2.0</version>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
<version>4.0.5</version>
</dependency>
</dependencies>
</project>
43 changes: 36 additions & 7 deletions pax-jpa-tck/tck.bndrun
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,33 +11,62 @@
-runrequires.testcase: \
bnd.identity;id='org.osgi.test.cases.jpa'

-runee: JavaSE-11
-runee: JavaSE-17
-runfw: org.eclipse.osgi

-runrequires: \
bnd.identity;id='org.ops4j.pax.jpa',\
bnd.identity;id='slf4j.simple',\
bnd.identity;id='com.sun.xml.bind.jaxb-impl',\
bnd.identity;id='org.glassfish.hk2.osgi-resource-locator',\
bnd.identity;id='org.eclipse.persistence.jpa'
bnd.identity;id='org.eclipse.persistence.jpa', \
bnd.identity;id='com.sun.xml.bind.jaxb-impl'

-runbundles: \
assertj-core;version='[3.22.0,3.22.1)',\
assertj-core;version='[3.23.1,3.23.2)',\
com.sun.xml.bind.jaxb-core;version='[4.0.5,4.0.6)',\
com.sun.xml.bind.jaxb-impl;version='[4.0.5,4.0.6)',\
jakarta.activation-api;version='[2.1.0,2.1.1)',\
jakarta.xml.bind-api;version='[4.0.0,4.0.1)',\
javax.persistence;version='[2.0.5,2.0.6)',\
org.apache.geronimo.specs.geronimo-jpa_2.0_spec;version='[1.1.0,1.1.1)',\
net.bytebuddy.byte-buddy;version='[1.12.10,1.12.11)',\
org.apache.servicemix.bundles.junit;version='[4.13.2,4.13.3)',\
org.eclipse.persistence.asm;version='[3.3.1,3.3.2)',\
org.eclipse.persistence.core;version='[2.4.2,2.4.3)',\
org.eclipse.persistence.jpa;version='[2.4.2,2.4.3)',\
org.glassfish.hk2.osgi-resource-locator;version='[2.4.0,2.4.1)',\
org.ops4j.pax.jpa;version='[1.0.0,1.0.1)',\
org.osgi.service.cm;version='[1.6.1,1.6.2)',\
org.osgi.service.jdbc;version='[1.0.0,1.0.1)',\
org.osgi.service.jpa;version='[1.1.1,1.1.2)',\
org.osgi.service.jdbc;version='[1.1.0,1.1.1)',\
org.osgi.test.cases.jpa;version='[8.1.0,8.1.1)',\
slf4j.api;version='[1.7.0,1.7.1)',\
slf4j.simple;version='[1.7.0,1.7.1)'
assertj-core;version='[3.20.2,3.20.3)',\
jakarta.activation-api;version='[2.1.0,2.1.1)',\
jakarta.xml.bind-api;version='[4.0.0,4.0.1)',\
javax.persistence;version='[2.0.5,2.0.6)',\
org.apache.servicemix.bundles.junit;version='[4.13.2,4.13.3)',\
org.eclipse.persistence.asm;version='[3.3.1,3.3.2)',\
org.eclipse.persistence.core;version='[2.4.2,2.4.3)',\
org.eclipse.persistence.jpa;version='[2.4.2,2.4.3)',\
org.glassfish.hk2.osgi-resource-locator;version='[2.4.0,2.4.1)',\
org.ops4j.pax.jpa;version='[1.0.0,1.0.1)',\
org.osgi.service.cm;version='[1.6.1,1.6.2)',\
org.osgi.service.jdbc;version='[1.1.0,1.1.1)',\
org.osgi.test.cases.jpa;version='[8.0.0,8.0.1)',\
slf4j.api;version='[1.7.0,1.7.1)',\
slf4j.simple;version='[1.7.0,1.7.1)'
assertj-core;version='[3.20.2,3.20.3)',\
jakarta.activation-api;version='[2.1.0,2.1.1)',\
jakarta.xml.bind-api;version='[4.0.0,4.0.1)',\
javax.persistence;version='[2.0.5,2.0.6)',\
org.apache.servicemix.bundles.junit;version='[4.13.2,4.13.3)',\
org.eclipse.persistence.asm;version='[3.3.1,3.3.2)',\
org.eclipse.persistence.core;version='[2.4.2,2.4.3)',\
org.eclipse.persistence.jpa;version='[2.4.2,2.4.3)',\
org.glassfish.hk2.osgi-resource-locator;version='[2.4.0,2.4.1)',\
org.ops4j.pax.jpa;version='[1.0.0,1.0.1)',\
org.osgi.service.cm;version='[1.6.1,1.6.2)',\
org.osgi.service.jdbc;version='[1.1.0,1.1.1)',\
org.osgi.test.cases.jpa;version='[8.0.0,8.0.1)',\
slf4j.api;version='[1.7.0,1.7.1)',\
slf4j.simple;version='[1.7.0,1.7.1)'
Loading
Loading