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

Detach JavaMail #6165

Merged
merged 14 commits into from
Jan 18, 2022
Merged

Detach JavaMail #6165

Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
32f1fac
Do not use `javax.mail` for `doCheckAdminAddress`
jglick Jan 6, 2022
15b1fdd
Detach JavaMail
basil Jan 6, 2022
1348ffb
Merge remote-tracking branch 'origin/master' into javamail
basil Jan 7, 2022
72bc903
Revert "Bump `git-changelist-maven-extension` from 1.2 to 1.3 (#6132)"
basil Jan 7, 2022
21e2f37
Revert "Revert "Bump `git-changelist-maven-extension` from 1.2 to 1.3…
basil Jan 8, 2022
b87684e
Bump releases
basil Jan 8, 2022
64aeabb
Fix split plugin cycles
basil Jan 8, 2022
5103131
Merge remote-tracking branch 'origin/master' into javamail
basil Jan 8, 2022
e6cb360
Bump releases
basil Jan 8, 2022
aa974a6
Bump versions
basil Jan 8, 2022
faf50aa
Bump versions
basil Jan 9, 2022
8f99ae4
Update core/src/main/resources/jenkins/split-plugins.txt
basil Jan 10, 2022
ed7b370
Update core/src/main/resources/jenkins/split-plugins.txt
basil Jan 11, 2022
770dd8f
Merge remote-tracking branch 'origin/master' into javamail
basil Jan 12, 2022
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: 0 additions & 5 deletions bom/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,11 +319,6 @@ THE SOFTWARE.
<artifactId>symbol-annotation</artifactId>
<version>1.1</version>
</dependency>
<dependency>
<groupId>com.sun.mail</groupId>
<artifactId>jakarta.mail</artifactId>
<version>1.6.5</version>
basil marked this conversation as resolved.
Show resolved Hide resolved
</dependency>

<!--XStream-->
<dependency>
Expand Down
4 changes: 0 additions & 4 deletions core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,10 +280,6 @@ THE SOFTWARE.
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
</dependency>
<dependency>
<groupId>com.sun.mail</groupId>
<artifactId>jakarta.mail</artifactId>
</dependency>
<dependency>
<groupId>jaxen</groupId>
<artifactId>jaxen</artifactId>
Expand Down
4 changes: 4 additions & 0 deletions core/src/main/resources/jenkins/split-plugin-cycles.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,3 +32,7 @@ junit jaxb
bouncycastle-api jaxb
command-launcher jaxb
jdk-tool jaxb

javax-activation-api javax-mail-api
javax-activation-api sshd
javax-mail-api sshd
3 changes: 3 additions & 0 deletions core/src/main/resources/jenkins/split-plugins.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,3 +34,6 @@ trilead-api 2.184 1.0.4

# JENKINS-64107
sshd 2.281 3.0.1

javax-activation-api 2.329 1.2.0-2
javax-mail-api 2.329 1.6.2-5
basil marked this conversation as resolved.
Show resolved Hide resolved
6 changes: 6 additions & 0 deletions test/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,12 @@ THE SOFTWARE.
<version>391.ve4a_38c1b_cf4b_</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.jenkins.plugins</groupId>
<artifactId>javax-mail-api</artifactId>
<version>1.6.2-5</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>matrix-auth</artifactId>
Expand Down
12 changes: 12 additions & 0 deletions war/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -367,6 +367,18 @@ THE SOFTWARE.
<version>1.0.4</version>
<type>hpi</type>
</artifactItem>
<artifactItem>
<groupId>io.jenkins.plugins</groupId>
<artifactId>javax-activation-api</artifactId>
<version>1.2.0-2</version>
<type>hpi</type>
</artifactItem>
<artifactItem>
<groupId>io.jenkins.plugins</groupId>
<artifactId>javax-mail-api</artifactId>
<version>1.6.2-5</version>
<type>hpi</type>
</artifactItem>
</artifactItems>
<outputDirectory>${project.build.directory}/${project.build.finalName}/WEB-INF/detached-plugins</outputDirectory>
<stripVersion>true</stripVersion>
Expand Down