Skip to content

Commit

Permalink
Refactor as mono module, update for simplified poms / seed
Browse files Browse the repository at this point in the history
  • Loading branch information
adrienlauer committed Oct 8, 2015
1 parent ad6f0b7 commit 9bac78b
Show file tree
Hide file tree
Showing 36 changed files with 49 additions and 154 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# Version 2.1.0 (2015-11-26)

* [chg] Refactored as an add-on and updated to work with Seed 2.1.0+

# Version 2.0.0 (2015-07-30)

* [new] Initial Open-Source release.
65 changes: 0 additions & 65 deletions core/pom.xml

This file was deleted.

53 changes: 41 additions & 12 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,20 +15,21 @@

<parent>
<groupId>org.seedstack</groupId>
<artifactId>parent</artifactId>
<version>2.0.1-SNAPSHOT</version>
<artifactId>parent-internal</artifactId>
<version>2.1.0-SNAPSHOT</version>
</parent>

<artifactId>seed-javamail</artifactId>
<version>2.0.1-SNAPSHOT</version>
<packaging>pom</packaging>
<groupId>org.seedstack.addons</groupId>
<artifactId>javamail</artifactId>
<version>2.1.0-M1-SNAPSHOT</version>

<properties>
<seed.version>2.0.0</seed.version>
<seed.version>2.1.0-M1-SNAPSHOT</seed.version>
<javamail.version>1.4.7</javamail.version>
<subethamail.version>3.1.7</subethamail.version>

<compatibility.groupId>org.seedstack.seed</compatibility.groupId>
<compatibility.artifactId>seed-mail-support-core</compatibility.artifactId>
<compatibility.version>2.0.0</compatibility.version>
</properties>

Expand All @@ -45,9 +46,9 @@
<includedLicense>CDDL 1.0</includedLicense>
<includedLicense>EPL 1.0</includedLicense>
<includedLicense>MIT</includedLicense>
<includedLicense>LGPL 2.1</includedLicense>
<includedLicense>LGPL 3.0</includedLicense>
<includedLicense>MPL 2.0</includedLicense>
<includedLicense>The JSON License</includedLicense>
<includedLicense>Public Domain</includedLicense>
<includedLicense>WTFPL</includedLicense>

Expand All @@ -65,19 +66,47 @@
<licenseMerge>EPL 1.0|Eclipse Public License 1.0</licenseMerge>
<licenseMerge>LGPL 3.0|GNU Lesser Public License</licenseMerge>
<licenseMerge>MIT|MIT License</licenseMerge>
<licenseMerge>MIT|The MIT License</licenseMerge>
<licenseMerge>IGNORED_LICENSE|MPL 1.1</licenseMerge>
<licenseMerge>IGNORED_LICENSE|LGPL 2.1</licenseMerge>
</licenseMerges>
</configuration>
</plugin>
</plugins>
</pluginManagement>
</build>

<modules>
<module>core</module>
<module>test</module>
</modules>
<dependencies>
<dependency>
<groupId>org.seedstack.seed</groupId>
<artifactId>seed-core</artifactId>
<version>${seed.version}</version>
</dependency>
<dependency>
<groupId>org.seedstack.seed</groupId>
<artifactId>seed-testing</artifactId>
<version>${seed.version}</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.subethamail</groupId>
<artifactId>subethasmtp</artifactId>
<version>${subethamail.version}</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
<version>${javamail.version}</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>${logback.version}</version>
<scope>test</scope>
</dependency>
</dependencies>

<scm>
<url>https://github.com/seedstack/javamail-addon</url>
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
package org.seedstack.seed.mail.rule;
package org.seedstack.seed.mail.internal;

import org.seedstack.seed.it.api.ITBind;
import org.seedstack.seed.mail.api.WithMailServer;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
import org.seedstack.seed.it.spi.ITKernelMode;
import org.seedstack.seed.it.spi.ITRunnerPlugin;
import org.seedstack.seed.mail.api.WithMailServer;
import org.seedstack.seed.mail.rule.MockMailServerITClassRule;
import org.junit.rules.MethodRule;
import org.junit.rules.TestRule;
import org.junit.runners.model.TestClass;
Expand Down
File renamed without changes.
60 changes: 0 additions & 60 deletions test/pom.xml

This file was deleted.

15 changes: 0 additions & 15 deletions test/src/main/java/org/seedstack/seed/mail/rule/package-info.java

This file was deleted.

0 comments on commit 9bac78b

Please sign in to comment.