Skip to content

Commit 239a6cc

Browse files
Christoph Läubrichlaeubi
Christoph Läubrich
authored and
laeubi
committed
Cleanup used dependencies and streamline manifest
1 parent e331f7c commit 239a6cc

File tree

8 files changed

+192
-528
lines changed

8 files changed

+192
-528
lines changed

‎.github/workflows/maven.yml

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ jobs:
1818

1919
steps:
2020
- uses: actions/[email protected]
21-
- name: Set up JDK 11
21+
- name: Set up JDK 17
2222
uses: actions/[email protected]
2323
with:
24-
java-version: '11'
24+
java-version: '17'
2525
distribution: 'adopt'
2626
cache: maven
2727
- name: Build with Maven
@@ -31,4 +31,13 @@ jobs:
3131
with:
3232
name: tck-results
3333
if-no-files-found: error
34-
path: '**/target/test-reports/**/*.xml'
34+
path: '**/target/test-reports/**/*.xml'
35+
event_file:
36+
name: "Event File"
37+
runs-on: ubuntu-latest
38+
steps:
39+
- name: Upload
40+
uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
41+
with:
42+
name: Event File
43+
path: ${{ github.event_path }}

‎.github/workflows/tck.yml

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,14 @@ jobs:
1010
unit-test-results:
1111
name: Unit Test Results
1212
runs-on: ubuntu-latest
13-
if: github.event.workflow_run.conclusion == 'success'
14-
13+
if: github.event.workflow_run.conclusion != 'skipped'
14+
permissions:
15+
checks: write
16+
pull-requests: write
17+
contents: read
18+
issues: read
19+
actions: read
20+
1521
steps:
1622
- name: Download and Extract Artifacts
1723
env:
@@ -32,6 +38,8 @@ jobs:
3238
uses: EnricoMi/publish-unit-test-result-action@v2
3339
with:
3440
commit: ${{ github.event.workflow_run.head_sha }}
41+
event_file: artifacts/Event File/event.json
42+
event_name: ${{ github.event.workflow_run.event }}
3543
files: "artifacts/**/*.xml"
3644

3745

‎pax-jpa-tck/pom.xml

Lines changed: 21 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,9 @@
99
<packaging>pom</packaging>
1010

1111
<properties>
12-
<bnd.version>6.4.0-SNAPSHOT</bnd.version>
12+
<bnd.version>7.0.0</bnd.version>
1313
<org.eclipse.osgi.version>3.17.200</org.eclipse.osgi.version>
14+
<eclipselink.version>2.4.2</eclipselink.version>
1415
</properties>
1516
<repositories>
1617
<repository>
@@ -21,19 +22,6 @@
2122
</snapshots>
2223
</repository>
2324
</repositories>
24-
<pluginRepositories>
25-
<pluginRepository>
26-
<id>bnd-snapshots</id>
27-
<url>https://bndtools.jfrog.io/bndtools/libs-snapshot/</url>
28-
<layout>default</layout>
29-
<releases>
30-
<enabled>false</enabled>
31-
</releases>
32-
<snapshots>
33-
<enabled>true</enabled>
34-
</snapshots>
35-
</pluginRepository>
36-
</pluginRepositories>
3725
<build>
3826
<plugins>
3927
<plugin>
@@ -85,35 +73,28 @@
8573
<groupId>org.ops4j.pax.jpa</groupId>
8674
<artifactId>pax-jpa</artifactId>
8775
<version>${project.version}</version>
76+
<scope>compile</scope>
8877
</dependency>
8978
<dependency>
9079
<groupId>org.slf4j</groupId>
9180
<artifactId>slf4j-api</artifactId>
81+
<scope>compile</scope>
9282
</dependency>
9383
<dependency>
94-
<groupId>com.sun.activation</groupId>
95-
<artifactId>jakarta.activation</artifactId>
96-
<version>2.0.0</version>
97-
</dependency>
98-
<dependency>
99-
<groupId>org.apache.geronimo.specs</groupId>
100-
<artifactId>geronimo-jpa_2.2_spec</artifactId>
101-
<version>1.1</version>
84+
<groupId>org.osgi</groupId>
85+
<artifactId>org.osgi.service.jdbc</artifactId>
86+
<scope>compile</scope>
10287
</dependency>
10388
<dependency>
10489
<groupId>jakarta.xml.bind</groupId>
10590
<artifactId>jakarta.xml.bind-api</artifactId>
10691
<scope>compile</scope>
10792
</dependency>
108-
<dependency>
109-
<groupId>com.sun.xml.bind</groupId>
110-
<artifactId>jaxb-impl</artifactId>
111-
<scope>compile</scope>
112-
</dependency>
11393
<dependency>
11494
<groupId>org.eclipse.persistence</groupId>
11595
<artifactId>org.eclipse.persistence.jpa</artifactId>
116-
<scope>provided</scope>
96+
<version>${eclipselink.version}</version>
97+
<scope>compile</scope>
11798
</dependency>
11899
<dependency>
119100
<groupId>org.glassfish.hk2</groupId>
@@ -126,21 +107,23 @@
126107
<artifactId>slf4j-simple</artifactId>
127108
<version>1.7.0</version>
128109
</dependency>
129-
<dependency>
130-
<groupId>org.osgi</groupId>
131-
<artifactId>org.osgi.service.jpa</artifactId>
132-
<version>1.1.1</version>
133-
</dependency>
134110
<dependency>
135111
<groupId>org.osgi</groupId>
136112
<artifactId>org.osgi.service.cm</artifactId>
137-
<version>1.6.1</version>
113+
<scope>compile</scope>
138114
</dependency>
139115
<dependency>
140116
<groupId>org.osgi</groupId>
141117
<artifactId>org.osgi.test.cases.jpa</artifactId>
142-
<version>8.0.0-SNAPSHOT</version>
118+
<version>8.1.0</version>
143119
<!-- <scope>runtime</scope>-->
120+
<!-- See https://github.com/osgi/osgi/issues/731 -->
121+
<exclusions>
122+
<exclusion>
123+
<groupId>org.osgi</groupId>
124+
<artifactId>org.osgi.service.jpa</artifactId>
125+
</exclusion>
126+
</exclusions>
144127
</dependency>
145128
<dependency>
146129
<groupId>org.eclipse.platform</groupId>
@@ -149,14 +132,9 @@
149132
<scope>runtime</scope>
150133
</dependency>
151134
<dependency>
152-
<groupId>org.osgi</groupId>
153-
<artifactId>org.osgi.util.function</artifactId>
154-
<version>1.2.0</version>
155-
</dependency>
156-
<dependency>
157-
<groupId>org.osgi</groupId>
158-
<artifactId>org.osgi.util.promise</artifactId>
159-
<version>1.2.0</version>
135+
<groupId>com.sun.xml.bind</groupId>
136+
<artifactId>jaxb-impl</artifactId>
137+
<version>4.0.5</version>
160138
</dependency>
161139
</dependencies>
162140
</project>

‎pax-jpa-tck/tck.bndrun

Lines changed: 36 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,33 +11,62 @@
1111
-runrequires.testcase: \
1212
bnd.identity;id='org.osgi.test.cases.jpa'
1313

14-
-runee: JavaSE-11
14+
-runee: JavaSE-17
1515
-runfw: org.eclipse.osgi
1616

1717
-runrequires: \
1818
bnd.identity;id='org.ops4j.pax.jpa',\
1919
bnd.identity;id='slf4j.simple',\
20-
bnd.identity;id='com.sun.xml.bind.jaxb-impl',\
2120
bnd.identity;id='org.glassfish.hk2.osgi-resource-locator',\
22-
bnd.identity;id='org.eclipse.persistence.jpa'
21+
bnd.identity;id='org.eclipse.persistence.jpa', \
22+
bnd.identity;id='com.sun.xml.bind.jaxb-impl'
2323

2424
-runbundles: \
25-
assertj-core;version='[3.22.0,3.22.1)',\
25+
assertj-core;version='[3.23.1,3.23.2)',\
2626
com.sun.xml.bind.jaxb-core;version='[4.0.5,4.0.6)',\
2727
com.sun.xml.bind.jaxb-impl;version='[4.0.5,4.0.6)',\
2828
jakarta.activation-api;version='[2.1.0,2.1.1)',\
2929
jakarta.xml.bind-api;version='[4.0.0,4.0.1)',\
3030
javax.persistence;version='[2.0.5,2.0.6)',\
31-
org.apache.geronimo.specs.geronimo-jpa_2.0_spec;version='[1.1.0,1.1.1)',\
31+
net.bytebuddy.byte-buddy;version='[1.12.10,1.12.11)',\
3232
org.apache.servicemix.bundles.junit;version='[4.13.2,4.13.3)',\
3333
org.eclipse.persistence.asm;version='[3.3.1,3.3.2)',\
3434
org.eclipse.persistence.core;version='[2.4.2,2.4.3)',\
3535
org.eclipse.persistence.jpa;version='[2.4.2,2.4.3)',\
3636
org.glassfish.hk2.osgi-resource-locator;version='[2.4.0,2.4.1)',\
3737
org.ops4j.pax.jpa;version='[1.0.0,1.0.1)',\
3838
org.osgi.service.cm;version='[1.6.1,1.6.2)',\
39-
org.osgi.service.jdbc;version='[1.0.0,1.0.1)',\
40-
org.osgi.service.jpa;version='[1.1.1,1.1.2)',\
39+
org.osgi.service.jdbc;version='[1.1.0,1.1.1)',\
40+
org.osgi.test.cases.jpa;version='[8.1.0,8.1.1)',\
41+
slf4j.api;version='[1.7.0,1.7.1)',\
42+
slf4j.simple;version='[1.7.0,1.7.1)'
43+
assertj-core;version='[3.20.2,3.20.3)',\
44+
jakarta.activation-api;version='[2.1.0,2.1.1)',\
45+
jakarta.xml.bind-api;version='[4.0.0,4.0.1)',\
46+
javax.persistence;version='[2.0.5,2.0.6)',\
47+
org.apache.servicemix.bundles.junit;version='[4.13.2,4.13.3)',\
48+
org.eclipse.persistence.asm;version='[3.3.1,3.3.2)',\
49+
org.eclipse.persistence.core;version='[2.4.2,2.4.3)',\
50+
org.eclipse.persistence.jpa;version='[2.4.2,2.4.3)',\
51+
org.glassfish.hk2.osgi-resource-locator;version='[2.4.0,2.4.1)',\
52+
org.ops4j.pax.jpa;version='[1.0.0,1.0.1)',\
53+
org.osgi.service.cm;version='[1.6.1,1.6.2)',\
54+
org.osgi.service.jdbc;version='[1.1.0,1.1.1)',\
55+
org.osgi.test.cases.jpa;version='[8.0.0,8.0.1)',\
56+
slf4j.api;version='[1.7.0,1.7.1)',\
57+
slf4j.simple;version='[1.7.0,1.7.1)'
58+
assertj-core;version='[3.20.2,3.20.3)',\
59+
jakarta.activation-api;version='[2.1.0,2.1.1)',\
60+
jakarta.xml.bind-api;version='[4.0.0,4.0.1)',\
61+
javax.persistence;version='[2.0.5,2.0.6)',\
62+
org.apache.servicemix.bundles.junit;version='[4.13.2,4.13.3)',\
63+
org.eclipse.persistence.asm;version='[3.3.1,3.3.2)',\
64+
org.eclipse.persistence.core;version='[2.4.2,2.4.3)',\
65+
org.eclipse.persistence.jpa;version='[2.4.2,2.4.3)',\
66+
org.glassfish.hk2.osgi-resource-locator;version='[2.4.0,2.4.1)',\
67+
org.ops4j.pax.jpa;version='[1.0.0,1.0.1)',\
68+
org.osgi.service.cm;version='[1.6.1,1.6.2)',\
69+
org.osgi.service.jdbc;version='[1.1.0,1.1.1)',\
4170
org.osgi.test.cases.jpa;version='[8.0.0,8.0.1)',\
4271
slf4j.api;version='[1.7.0,1.7.1)',\
4372
slf4j.simple;version='[1.7.0,1.7.1)'

0 commit comments

Comments
 (0)