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

Reworked SXC #1469

Merged
merged 13 commits into from
Sep 15, 2024
Merged

Reworked SXC #1469

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
a825892
drop sxc runtime shade
jungm Aug 28, 2024
4b9a2ca
fix jms-destinationType
jungm Aug 28, 2024
e482913
regenerate accessors
jungm Aug 28, 2024
2c5dec0
remove sxc from excludes
jungm Aug 28, 2024
2b9c608
private -> protected to avoid field accessors using unsafe
jungm Aug 29, 2024
ee6ae82
use rzo1's metatype fork
jungm Aug 29, 2024
1c66565
add script to regenerate accessors
jungm Aug 29, 2024
65909d7
regenerate accessors
jungm Aug 29, 2024
b5b279b
regenerated boms
jungm Aug 29, 2024
37c4d18
fix OutputGeneratedDescriptorsTest
jungm Aug 29, 2024
ab81c40
fix DontFailOnUnusedTagTest
jungm Aug 29, 2024
3c4ef6e
fix FacesConfig22Test
jungm Aug 29, 2024
3dec16e
fix web manifests in bval-evaluation-redeployment
jungm Sep 14, 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
33 changes: 22 additions & 11 deletions boms/tomee-microprofile/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,28 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>io.github.rzo1.org.metatype.sxc</groupId>
<artifactId>sxc-jaxb-core</artifactId>
<version>0.9</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>*</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>io.github.rzo1.org.metatype.sxc</groupId>
<artifactId>sxc-runtime</artifactId>
<version>0.9</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>*</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>io.micrometer</groupId>
<artifactId>micrometer-commons</artifactId>
Expand Down Expand Up @@ -1530,17 +1552,6 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.tomee</groupId>
<artifactId>sxc-shade</artifactId>
<version>10.0.0-M3-SNAPSHOT</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>*</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.tomee</groupId>
<artifactId>taglibs-shade</artifactId>
Expand Down
33 changes: 22 additions & 11 deletions boms/tomee-plume/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,28 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>io.github.rzo1.org.metatype.sxc</groupId>
<artifactId>sxc-jaxb-core</artifactId>
<version>0.9</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>*</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>io.github.rzo1.org.metatype.sxc</groupId>
<artifactId>sxc-runtime</artifactId>
<version>0.9</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>*</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>io.micrometer</groupId>
<artifactId>micrometer-commons</artifactId>
Expand Down Expand Up @@ -1640,17 +1662,6 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.tomee</groupId>
<artifactId>sxc-shade</artifactId>
<version>10.0.0-M3-SNAPSHOT</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>*</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.tomee</groupId>
<artifactId>taglibs-shade</artifactId>
Expand Down
33 changes: 22 additions & 11 deletions boms/tomee-plus/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,28 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>io.github.rzo1.org.metatype.sxc</groupId>
<artifactId>sxc-jaxb-core</artifactId>
<version>0.9</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>*</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>io.github.rzo1.org.metatype.sxc</groupId>
<artifactId>sxc-runtime</artifactId>
<version>0.9</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>*</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>io.micrometer</groupId>
<artifactId>micrometer-commons</artifactId>
Expand Down Expand Up @@ -1651,17 +1673,6 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.tomee</groupId>
<artifactId>sxc-shade</artifactId>
<version>10.0.0-M3-SNAPSHOT</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>*</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.tomee</groupId>
<artifactId>taglibs-shade</artifactId>
Expand Down
33 changes: 22 additions & 11 deletions boms/tomee-webprofile/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,28 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>io.github.rzo1.org.metatype.sxc</groupId>
<artifactId>sxc-jaxb-core</artifactId>
<version>0.9</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>*</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>io.github.rzo1.org.metatype.sxc</groupId>
<artifactId>sxc-runtime</artifactId>
<version>0.9</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>*</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.bval</groupId>
<artifactId>bval-jsr</artifactId>
Expand Down Expand Up @@ -1079,17 +1101,6 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.tomee</groupId>
<artifactId>sxc-shade</artifactId>
<version>10.0.0-M3-SNAPSHOT</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>*</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.tomee</groupId>
<artifactId>taglibs-shade</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiBeanInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ public class CdiBeanInfo implements JndiConsumer {
private String beanName;
private ClassLoader classLoader;
private List<Injection> injections;
private KeyedCollection<String, ContextService> contextService;
protected KeyedCollection<String, ContextService> contextService;

public String getBeanName() {
return beanName;
Expand Down
11 changes: 2 additions & 9 deletions container/openejb-jee-accessors/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,15 +67,8 @@
</dependency>

<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>sxc-shade</artifactId>
<version>${project.version}</version>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
<groupId>io.github.rzo1.org.metatype.sxc</groupId>
<artifactId>sxc-jaxb-core</artifactId>
</dependency>
</dependencies>

Expand Down
Loading