Skip to content

Provider fixes #88

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
merged 7 commits into from
Apr 26, 2023
Merged

Provider fixes #88

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
6c16659
Prepare release org.eclipse.angus:all:2.0.1
eclipse-angus-bot Jan 26, 2023
ac33a59
Fix OSGi serviceloader directives.
mnlipp Apr 25, 2023
af4087d
Prepare next development cycle for 2.0.2-SNAPSHOT
eclipse-angus-bot Jan 26, 2023
250a26f
Remove unnecessary 'statements'.
mnlipp Apr 26, 2023
28880b2
fix default build without -Poss-release
lukasj Apr 26, 2023
f4312ba
Document change.
mnlipp Apr 26, 2023
0bad4b5
Merge branch 'master' into provider-fixes3
mnlipp Apr 26, 2023
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
5 changes: 2 additions & 3 deletions core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.eclipse.angus</groupId>
<artifactId>all</artifactId>
<version>2.0.1-SNAPSHOT</version>
<version>2.0.1</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down Expand Up @@ -67,8 +67,7 @@
osgi.service;effective:=active;
objectClass="org.eclipse.angus.mail.util.MailStreamProvider",
osgi.serviceloader;
register:="org.eclipse.angus.mail.util.MailStreamProvider";
osgi.serviceloader="org.eclipse.angus.mail.util.MailStreamProvider"
osgi.serviceloader="jakarta.mail.util.StreamProvider"
]]>
</Provide-Capability>
</instructions>
Expand Down
2 changes: 1 addition & 1 deletion demos/client/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.eclipse.angus</groupId>
<artifactId>demos</artifactId>
<version>2.0.1-SNAPSHOT</version>
<version>2.0.1</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion demos/demo/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.eclipse.angus</groupId>
<artifactId>demos</artifactId>
<version>2.0.1-SNAPSHOT</version>
<version>2.0.1</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion demos/logging/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.eclipse.angus</groupId>
<artifactId>demos</artifactId>
<version>2.0.1-SNAPSHOT</version>
<version>2.0.1</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion demos/outlook/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.eclipse.angus</groupId>
<artifactId>demos</artifactId>
<version>2.0.1-SNAPSHOT</version>
<version>2.0.1</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion demos/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.eclipse.angus</groupId>
<artifactId>all</artifactId>
<version>2.0.1-SNAPSHOT</version>
<version>2.0.1</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion demos/servlet/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.eclipse.angus</groupId>
<artifactId>demos</artifactId>
<version>2.0.1-SNAPSHOT</version>
<version>2.0.1</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion demos/taglib/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.eclipse.angus</groupId>
<artifactId>demos</artifactId>
<version>2.0.1-SNAPSHOT</version>
<version>2.0.1</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion demos/webapp/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.eclipse.angus</groupId>
<artifactId>demos</artifactId>
<version>2.0.1-SNAPSHOT</version>
<version>2.0.1</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion doc/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.eclipse.angus</groupId>
<artifactId>all</artifactId>
<version>2.0.1-SNAPSHOT</version>
<version>2.0.1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion dsn/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.eclipse.angus</groupId>
<artifactId>all</artifactId>
<version>2.0.1-SNAPSHOT</version>
<version>2.0.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.angus</groupId>
Expand Down
2 changes: 1 addition & 1 deletion mailhandler/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.eclipse.angus</groupId>
<artifactId>all</artifactId>
<version>2.0.1-SNAPSHOT</version>
<version>2.0.1</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
<groupId>org.eclipse.angus</groupId>
<artifactId>all</artifactId>
<packaging>pom</packaging>
<version>2.0.1-SNAPSHOT</version>
<version>2.0.1</version>
<name>Angus Mail Project</name>
<description>${project.name}</description>
<url>http://eclipse-ee4j.github.io/angus-mail</url>
Expand Down
23 changes: 3 additions & 20 deletions providers/angus-mail/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.eclipse.angus</groupId>
<artifactId>all</artifactId>
<version>2.0.1-SNAPSHOT</version>
<version>2.0.1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down Expand Up @@ -114,38 +114,21 @@
osgi.service;effective:=active;
objectClass="org.eclipse.angus.mail.util.MailStreamProvider",
osgi.serviceloader;
register:="org.eclipse.angus.mail.util.MailStreamProvider";
osgi.serviceloader="org.eclipse.angus.mail.util.MailStreamProvider",
osgi.serviceloader="jakarta.mail.util.StreamProvider",
osgi.service;effective:=active;
objectClass="org.eclipse.angus.mail.imap.IMAPProvider",
osgi.serviceloader;
register:="org.eclipse.angus.mail.imap.IMAPProvider";
osgi.serviceloader="org.eclipse.angus.mail.imap.IMAPProvider",
osgi.serviceloader="jakarta.mail.Provider",
osgi.service;effective:=active;
objectClass="org.eclipse.angus.mail.imap.IMAPSSLProvider",
osgi.serviceloader;
register:="org.eclipse.angus.mail.imap.IMAPSSLProvider";
osgi.serviceloader="org.eclipse.angus.mail.imap.IMAPSSLProvider",
osgi.service;effective:=active;
objectClass="org.eclipse.angus.mail.smtp.SMTPProvider",
osgi.serviceloader;
register:="org.eclipse.angus.mail.smtp.SMTPProvider";
osgi.serviceloader="org.eclipse.angus.mail.smtp.SMTPProvider",
osgi.service;effective:=active;
objectClass="org.eclipse.angus.mail.smtp.SMTPSSLProvider",
osgi.serviceloader;
register:="org.eclipse.angus.mail.smtp.SMTPSSLProvider";
osgi.serviceloader="org.eclipse.angus.mail.smtp.SMTPSSLProvider",
osgi.service;effective:=active;
objectClass="org.eclipse.angus.mail.pop3.POP3Provider",
osgi.serviceloader;
register:="org.eclipse.angus.mail.pop3.POP3Provider";
osgi.serviceloader="org.eclipse.angus.mail.pop3.POP3Provider",
osgi.service;effective:=active;
objectClass="org.eclipse.angus.mail.pop3.POP3SSLProvider",
osgi.serviceloader;
register:="org.eclipse.angus.mail.pop3.POP3SSLProvider";
osgi.serviceloader="org.eclipse.angus.mail.pop3.POP3SSLProvider"
]]>
</Provide-Capability>
</instructions>
Expand Down
8 changes: 2 additions & 6 deletions providers/gimap/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.eclipse.angus</groupId>
<artifactId>providers</artifactId>
<version>2.0.1-SNAPSHOT</version>
<version>2.0.1</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down Expand Up @@ -64,13 +64,9 @@
osgi.service;effective:=active;
objectClass="org.eclipse.angus.mail.gimap.GmailProvider",
osgi.serviceloader;
register:="org.eclipse.angus.mail.gimap.GmailProvider";
osgi.serviceloader="org.eclipse.angus.mail.gimap.GmailProvider",
osgi.serviceloader="jakarta.mail.Provider",
osgi.service;effective:=active;
objectClass="org.eclipse.angus.mail.gimap.GmailSSLProvider",
osgi.serviceloader;
register:="org.eclipse.angus.mail.gimap.GmailSSLProvider";
osgi.serviceloader="org.eclipse.angus.mail.gimap.GmailSSLProvider"
]]>
</Provide-Capability>
</instructions>
Expand Down
8 changes: 2 additions & 6 deletions providers/imap/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.eclipse.angus</groupId>
<artifactId>providers</artifactId>
<version>2.0.1-SNAPSHOT</version>
<version>2.0.1</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down Expand Up @@ -61,13 +61,9 @@
osgi.service;effective:=active;
objectClass="org.eclipse.angus.mail.imap.IMAPProvider",
osgi.serviceloader;
register:="org.eclipse.angus.mail.imap.IMAPProvider";
osgi.serviceloader="org.eclipse.angus.mail.imap.IMAPProvider",
osgi.serviceloader="jakarta.mail.Provider",
osgi.service;effective:=active;
objectClass="org.eclipse.angus.mail.imap.IMAPSSLProvider",
osgi.serviceloader;
register:="org.eclipse.angus.mail.imap.IMAPSSLProvider";
osgi.serviceloader="org.eclipse.angus.mail.imap.IMAPSSLProvider"
]]>
</Provide-Capability>
</instructions>
Expand Down
23 changes: 3 additions & 20 deletions providers/jakarta.mail/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.eclipse.angus</groupId>
<artifactId>all</artifactId>
<version>2.0.1-SNAPSHOT</version>
<version>2.0.1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down Expand Up @@ -204,38 +204,21 @@
osgi.service;effective:=active;
objectClass="org.eclipse.angus.mail.util.MailStreamProvider",
osgi.serviceloader;
register:="org.eclipse.angus.mail.util.MailStreamProvider";
osgi.serviceloader="org.eclipse.angus.mail.util.MailStreamProvider",
osgi.serviceloader="jakarta.mail.util.StreamProvider",
osgi.service;effective:=active;
objectClass="org.eclipse.angus.mail.imap.IMAPProvider",
osgi.serviceloader;
register:="org.eclipse.angus.mail.imap.IMAPProvider";
osgi.serviceloader="org.eclipse.angus.mail.imap.IMAPProvider",
osgi.serviceloader="jakarta.mail.Provider",
osgi.service;effective:=active;
objectClass="org.eclipse.angus.mail.imap.IMAPSSLProvider",
osgi.serviceloader;
register:="org.eclipse.angus.mail.imap.IMAPSSLProvider";
osgi.serviceloader="org.eclipse.angus.mail.imap.IMAPSSLProvider",
osgi.service;effective:=active;
objectClass="org.eclipse.angus.mail.smtp.SMTPProvider",
osgi.serviceloader;
register:="org.eclipse.angus.mail.smtp.SMTPProvider";
osgi.serviceloader="org.eclipse.angus.mail.smtp.SMTPProvider",
osgi.service;effective:=active;
objectClass="org.eclipse.angus.mail.smtp.SMTPSSLProvider",
osgi.serviceloader;
register:="org.eclipse.angus.mail.smtp.SMTPSSLProvider";
osgi.serviceloader="org.eclipse.angus.mail.smtp.SMTPSSLProvider",
osgi.service;effective:=active;
objectClass="org.eclipse.angus.mail.pop3.POP3Provider",
osgi.serviceloader;
register:="org.eclipse.angus.mail.pop3.POP3Provider";
osgi.serviceloader="org.eclipse.angus.mail.pop3.POP3Provider",
osgi.service;effective:=active;
objectClass="org.eclipse.angus.mail.pop3.POP3SSLProvider",
osgi.serviceloader;
register:="org.eclipse.angus.mail.pop3.POP3SSLProvider";
osgi.serviceloader="org.eclipse.angus.mail.pop3.POP3SSLProvider"
]]>
</Provide-Capability>
</instructions>
Expand Down
2 changes: 1 addition & 1 deletion providers/mbox/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.eclipse.angus</groupId>
<artifactId>providers</artifactId>
<version>2.0.1-SNAPSHOT</version>
<version>2.0.1</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion providers/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.eclipse.angus</groupId>
<artifactId>all</artifactId>
<version>2.0.1-SNAPSHOT</version>
<version>2.0.1</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
8 changes: 2 additions & 6 deletions providers/pop3/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.eclipse.angus</groupId>
<artifactId>providers</artifactId>
<version>2.0.1-SNAPSHOT</version>
<version>2.0.1</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down Expand Up @@ -61,13 +61,9 @@
osgi.service;effective:=active;
objectClass="org.eclipse.angus.mail.pop3.POP3Provider",
osgi.serviceloader;
register:="org.eclipse.angus.mail.pop3.POP3Provider";
osgi.serviceloader="org.eclipse.angus.mail.pop3.POP3Provider",
osgi.serviceloader="jakarta.mail.Provider",
osgi.service;effective:=active;
objectClass="org.eclipse.angus.mail.pop3.POP3SSLProvider",
osgi.serviceloader;
register:="org.eclipse.angus.mail.pop3.POP3SSLProvider";
osgi.serviceloader="org.eclipse.angus.mail.pop3.POP3SSLProvider"
]]>
</Provide-Capability>
</instructions>
Expand Down
8 changes: 2 additions & 6 deletions providers/smtp/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.eclipse.angus</groupId>
<artifactId>providers</artifactId>
<version>2.0.1-SNAPSHOT</version>
<version>2.0.1</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down Expand Up @@ -61,13 +61,9 @@
osgi.service;effective:=active;
objectClass="org.eclipse.angus.mail.smtp.SMTPProvider",
osgi.serviceloader;
register:="org.eclipse.angus.mail.smtp.SMTPProvider";
osgi.serviceloader="org.eclipse.angus.mail.smtp.SMTPProvider",
osgi.serviceloader="jakarta.mail.Provider",
osgi.service;effective:=active;
objectClass="org.eclipse.angus.mail.smtp.SMTPSSLProvider",
osgi.serviceloader;
register:="org.eclipse.angus.mail.smtp.SMTPSSLProvider";
osgi.serviceloader="org.eclipse.angus.mail.smtp.SMTPSSLProvider"
]]>
</Provide-Capability>
</instructions>
Expand Down