Skip to content

Merge jakarta.web.beans and web.beans #7958

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

Merged
matthiasblaesing merged 4 commits into from
Dec 22, 2024
Merged

Merge jakarta.web.beans and web.beans #7958

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2b82c08
Fix CDI Unittests
matthiasblaesing Nov 11, 2024
fcdd3e8
Merge jakarta.web.beans and web.beans
matthiasblaesing Nov 9, 2024
1e3bbde
Reenable web.beans tests
matthiasblaesing Nov 12, 2024
d31d18a
web.beans: Simplify/consolidate annotation analysis
matthiasblaesing Nov 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
9 changes: 2 additions & 7 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2016,10 +2016,6 @@ jobs:
# - name: j2ee.sun.ddui
# run: ant $OPTS -f enterprise/j2ee.sun.ddui test

# Fails + Slow
# - name: jakarta.web.beans
# run: ant $OPTS -f enterprise/jakarta.web.beans test

- name: javaee.wildfly
run: .github/retry.sh ant $OPTS -f enterprise/javaee.wildfly test

Expand Down Expand Up @@ -2061,9 +2057,8 @@ jobs:
- name: tomcat5
run: ant $OPTS -f enterprise/tomcat5 test

# Fails
# - name: web.beans
# run: ant $OPTS -f enterprise/web.beans test
- name: web.beans
run: ant $OPTS -f enterprise/web.beans test

# Fails + Slow
# - name: web.core.syntax
Expand Down
1 change: 0 additions & 1 deletion enterprise/j2ee.api.ejbmodule/nbproject/project.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,6 @@
<friend>org.netbeans.modules.maven.jaxws</friend>
<friend>org.netbeans.modules.profiler.j2ee</friend>
<friend>org.netbeans.modules.web.beans</friend>
<friend>org.netbeans.modules.jakarta.web.beans</friend>
<friend>org.netbeans.modules.web.project</friend>
<friend>org.netbeans.modules.websvc.core</friend>
<friend>org.netbeans.modules.websvc.dev</friend>
Expand Down
1 change: 0 additions & 1 deletion enterprise/j2ee.common/nbproject/project.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -522,7 +522,6 @@
<friend>org.netbeans.modules.visualweb.dataconnectivity</friend>
<friend>org.netbeans.modules.visualweb.project.jsf</friend>
<friend>org.netbeans.modules.web.beans</friend>
<friend>org.netbeans.modules.jakarta.web.beans</friend>
<friend>org.netbeans.modules.web.core</friend>
<friend>org.netbeans.modules.web.freeform</friend>
<friend>org.netbeans.modules.web.jsf</friend>
Expand Down
25 changes: 0 additions & 25 deletions enterprise/jakarta.web.beans/build.xml
View file
Open in desktop

This file was deleted.

39 changes: 0 additions & 39 deletions enterprise/jakarta.web.beans/licenseinfo.xml
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions enterprise/jakarta.web.beans/manifest.mf
View file
Open in desktop

This file was deleted.

Loading
Loading