Skip to content
This repository has been archived by the owner on Dec 9, 2024. It is now read-only.

updated one-jar dependency, GoogleCode has closed. #8

Open
wants to merge 119 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
119 commits
Select commit Hold shift + click to select a range
fa4bea3
updated one-jar dependency, GoogleCode has closed.
Sep 13, 2016
14025ee
Add init.d script for redhat/centos
rolfchess Nov 21, 2017
9219862
trying to fix build by using JDK8
DominiqueComte May 5, 2019
5ddd43d
Bump junit from 4.11 to 4.13.1
dependabot[bot] Jun 20, 2022
00ebfa5
Merge pull request #3 from DominiqueComte/dependabot/maven/junit-juni…
DominiqueComte Jun 20, 2022
5b10e6b
Bump jetty-server from 8.1.8.v20121106 to 10.0.10
dependabot[bot] Jul 7, 2022
6d93792
Merge pull request #7 from DominiqueComte/dependabot/maven/org.eclips…
DominiqueComte Jul 8, 2022
ae93440
Create maven.yml
DominiqueComte Jul 16, 2022
9ca952d
Update JUnit 4
DominiqueComte Jul 16, 2022
355fc5d
Merge pull request #8 from DominiqueComte/junit4-version-bump
DominiqueComte Jul 16, 2022
cfb0622
Bump spring-webmvc from 4.1.2.RELEASE to 5.2.21.RELEASE
dependabot[bot] Jul 17, 2022
e611cc7
Bump jetty-webapp from 8.1.8.v20121106 to 9.4.34.v20201102
dependabot[bot] Jul 17, 2022
85cc0e0
Merge pull request #6 from DominiqueComte/dependabot/maven/org.spring…
DominiqueComte Aug 15, 2022
173f5d1
Bump spring-core from 4.1.2.RELEASE to 5.2.22.RELEASE
dependabot[bot] Aug 15, 2022
2ac9f3c
Merge pull request #1 from DominiqueComte/dependabot/maven/org.spring…
DominiqueComte Aug 15, 2022
e01991f
Merge pull request #2 from DominiqueComte/dependabot/maven/org.eclips…
DominiqueComte Aug 15, 2022
90efa06
Upgrade Guava
DominiqueComte Aug 15, 2022
c48b74c
Added Maven cache to GH build
DominiqueComte Oct 23, 2022
11704dc
Merge pull request #9 from DominiqueComte/upgrade_dependencies
DominiqueComte Oct 23, 2022
c4bd5d4
Create dependabot.yml
DominiqueComte Nov 2, 2022
c52f7cc
Bump maven-jar-plugin from 2.3.1 to 3.3.0
dependabot[bot] Nov 2, 2022
6dd1bd7
Bump spring.version from 5.2.22.RELEASE to 5.3.23
dependabot[bot] Nov 2, 2022
da3bc74
Bump joda-time from 2.1 to 2.12.1
dependabot[bot] Nov 2, 2022
b93629c
Merge pull request #11 from DominiqueComte/dependabot/maven/org.apach…
DominiqueComte Nov 2, 2022
5335556
Bump slf4j-simple from 1.7.2 to 2.0.3
dependabot[bot] Nov 2, 2022
770b543
Bump mockito-core from 1.8.5 to 4.8.1
dependabot[bot] Nov 2, 2022
2493f8e
Merge pull request #12 from DominiqueComte/dependabot/maven/spring.ve…
DominiqueComte Nov 2, 2022
1b0bc54
Merge pull request #13 from DominiqueComte/dependabot/maven/joda-time…
DominiqueComte Nov 2, 2022
36a22a7
Merge pull request #14 from DominiqueComte/dependabot/maven/org.slf4j…
DominiqueComte Nov 2, 2022
e2d31ba
Merge pull request #15 from DominiqueComte/dependabot/maven/org.mocki…
DominiqueComte Nov 2, 2022
cec79f5
Bump slf4j-api from 1.7.2 to 2.0.3
dependabot[bot] Nov 7, 2022
ae649db
Bump activation from 1.1 to 1.1.1
dependabot[bot] Nov 7, 2022
1fa45ca
Bump commons-cli from 1.2 to 1.5.0
dependabot[bot] Nov 7, 2022
dddf1a2
Bump jetty-webapp from 9.4.34.v20201102 to 11.0.12
dependabot[bot] Nov 7, 2022
2eff89a
Merge pull request #16 from DominiqueComte/dependabot/maven/org.slf4j…
DominiqueComte Nov 7, 2022
6c43716
Merge pull request #17 from DominiqueComte/dependabot/maven/javax.act…
DominiqueComte Nov 7, 2022
929aa84
Merge pull request #18 from DominiqueComte/dependabot/maven/commons-c…
DominiqueComte Nov 7, 2022
7eb2b72
Merge pull request #20 from DominiqueComte/dependabot/maven/org.eclip…
DominiqueComte Nov 7, 2022
f800048
Fixed typo in parseShowEmailInConsoleOption method name
DominiqueComte Nov 7, 2022
2ff459d
Remove unused imports
DominiqueComte Nov 7, 2022
953685f
Using StringBuilders in the HTML builders
DominiqueComte Nov 7, 2022
0b081ff
Fixed some typos
DominiqueComte Nov 7, 2022
b569fd0
Removed the commented code and the try block that cannot happen
DominiqueComte Nov 7, 2022
7a3267d
Removed redundant boxing
DominiqueComte Nov 7, 2022
bca37af
Fixed typo in m option description
DominiqueComte Nov 7, 2022
6444361
Fixed the SMTP port value in the CLI help, the SMTP server starts on …
DominiqueComte Nov 7, 2022
b0e5758
Added long options to the CLI options, fixed the email filters and ad…
DominiqueComte Nov 7, 2022
6ec04fd
Added unit test on DeleteHandler class.
DominiqueComte Nov 7, 2022
dda2fcf
Changed GH workflow to use JDK 1.8
DominiqueComte Nov 7, 2022
05fdac7
Fixed Mockito runner import
DominiqueComte Nov 8, 2022
064ae68
Replaced prerequisites with enforcer plugin rule
DominiqueComte Nov 8, 2022
98f817d
Rolled back update of Jetty dependencies
DominiqueComte Nov 8, 2022
18651de
Version bump to next snapshot and formatted POM to the order of the X…
DominiqueComte Nov 8, 2022
dcd99e4
Plugin updates to version available in enforced 3.0.5
DominiqueComte Nov 8, 2022
32c0f46
Added unit test on IndexHandler class.
DominiqueComte Nov 8, 2022
d8ca82e
Bump maven-resources-plugin from 3.1.0 to 3.3.0
dependabot[bot] Nov 14, 2022
a8765a6
Bump mail from 1.4 to 1.4.7
dependabot[bot] Nov 14, 2022
99e67dc
Merge pull request #22 from DominiqueComte/dependabot/maven/org.apach…
DominiqueComte Nov 14, 2022
49ac0f8
Merge pull request #25 from DominiqueComte/dependabot/maven/javax.mai…
DominiqueComte Nov 15, 2022
764cbfa
Updated MockMock.jar in release directory
DominiqueComte Nov 15, 2022
1065ae1
Minor javadoc changes
DominiqueComte Nov 19, 2022
fd8aa5f
Merge pull request #30 from rolfchess/master
DominiqueComte Nov 19, 2022
e6708e7
Added Checkstyle plugin and small configuration
DominiqueComte Nov 21, 2022
013f99a
Replaced the spring version property with the Spring Framework BOM in…
DominiqueComte Nov 21, 2022
301691d
Replaced the spring version property with the Spring Framework BOM in…
DominiqueComte Nov 21, 2022
c96ceec
Bump mockito-core from 4.8.1 to 4.9.0
dependabot[bot] Nov 21, 2022
80448ec
Upgraded Jetty to the latest 9.4 and moved the version to a BOM in de…
DominiqueComte Nov 21, 2022
ec0fca6
Merge pull request #35 from DominiqueComte/feature/use_spring_framewo…
DominiqueComte Nov 21, 2022
41c6de9
Updated SLF4J
DominiqueComte Nov 21, 2022
21335c7
Merge pull request #40 from DominiqueComte/feature/dependencies/updat…
DominiqueComte Nov 21, 2022
fd3732b
Merge pull request #34 from DominiqueComte/dependabot/maven/org.mocki…
DominiqueComte Nov 21, 2022
7850a8d
Merge branch 'master' into feature/ensure_sources_encoding_is_UTF-8
DominiqueComte Nov 21, 2022
11b5859
Merge pull request #37 from DominiqueComte/feature/ensure_sources_enc…
DominiqueComte Nov 21, 2022
cd0d11c
Bump slf4j.version from 2.0.4 to 2.0.5
dependabot[bot] Nov 28, 2022
271cc83
Merge pull request #41 from DominiqueComte/dependabot/maven/slf4j.ver…
DominiqueComte Nov 28, 2022
2fb20f9
Bump joda-time from 2.12.1 to 2.12.2
dependabot[bot] Dec 5, 2022
afa42dc
Merge pull request #44 from DominiqueComte/dependabot/maven/joda-time…
DominiqueComte Dec 5, 2022
9e63f28
Bump slf4j.version from 2.0.5 to 2.0.6
dependabot[bot] Dec 19, 2022
2637e48
Bump mockito-core from 4.9.0 to 4.10.0
dependabot[bot] Dec 19, 2022
f4db35b
Merge pull request #47 from DominiqueComte/dependabot/maven/slf4j.ver…
DominiqueComte Dec 19, 2022
951d0a1
Merge pull request #48 from DominiqueComte/dependabot/maven/org.mocki…
DominiqueComte Dec 19, 2022
bc42591
Bump mockito-core from 4.10.0 to 4.11.0
dependabot[bot] Jan 2, 2023
b195be2
Merge pull request #49 from DominiqueComte/dependabot/maven/org.mocki…
DominiqueComte Jan 3, 2023
4812c16
Bump maven-checkstyle-plugin from 3.2.0 to 3.2.1
dependabot[bot] Jan 16, 2023
b8ea43a
Merge pull request #50 from DominiqueComte/dependabot/maven/org.apach…
DominiqueComte Jan 16, 2023
a86eaf7
Bump maven-enforcer-plugin from 3.1.0 to 3.2.1
dependabot[bot] Feb 6, 2023
64c0e51
Merge pull request #55 from DominiqueComte/dependabot/maven/org.apach…
DominiqueComte Feb 6, 2023
68b49db
Bump maven-compiler-plugin from 3.8.1 to 3.11.0
dependabot[bot] Mar 6, 2023
a5d5279
Bump slf4j.version from 2.0.6 to 2.0.7
dependabot[bot] Mar 20, 2023
01e063f
Merge pull request #61 from DominiqueComte/dependabot/maven/slf4j.ver…
DominiqueComte Mar 20, 2023
9baa759
Bump joda-time from 2.12.2 to 2.12.4
dependabot[bot] Mar 27, 2023
9190a55
Merge pull request #62 from DominiqueComte/dependabot/maven/joda-time…
DominiqueComte Mar 27, 2023
b1ce598
Bump joda-time from 2.12.4 to 2.12.5
dependabot[bot] Apr 3, 2023
8a7b8bd
Merge pull request #64 from DominiqueComte/dependabot/maven/joda-time…
DominiqueComte Apr 3, 2023
0ab43a6
Bump maven-enforcer-plugin from 3.2.1 to 3.3.0
dependabot[bot] Apr 10, 2023
7c45863
Merge pull request #65 from DominiqueComte/dependabot/maven/org.apach…
DominiqueComte Apr 19, 2023
fdf5307
Bump maven-checkstyle-plugin from 3.2.1 to 3.2.2
dependabot[bot] Apr 24, 2023
9a3833c
Merge pull request #70 from DominiqueComte/dependabot/maven/org.apach…
DominiqueComte Apr 24, 2023
379fca2
Bump maven-resources-plugin from 3.3.0 to 3.3.1
dependabot[bot] May 1, 2023
6fc3b91
Merge pull request #71 from DominiqueComte/dependabot/maven/org.apach…
DominiqueComte May 1, 2023
7c80384
Bump maven-checkstyle-plugin from 3.2.2 to 3.3.0
dependabot[bot] May 29, 2023
8008109
Merge pull request #73 from DominiqueComte/dependabot/maven/org.apach…
DominiqueComte May 29, 2023
485f730
Bump guava from 31.1-jre to 32.0.0-jre
dependabot[bot] Jun 5, 2023
8375d11
Merge pull request #74 from DominiqueComte/dependabot/maven/com.googl…
DominiqueComte Jun 5, 2023
abf4176
Bump guava from 32.0.0-jre to 32.0.1-jre
dependabot[bot] Jun 12, 2023
32e1a14
Merge pull request #75 from DominiqueComte/dependabot/maven/com.googl…
DominiqueComte Jun 12, 2023
ae325c1
Bump guava from 32.0.1-jre to 32.1.1-jre
dependabot[bot] Jul 3, 2023
38ce4ad
Merge pull request #78 from DominiqueComte/dependabot/maven/com.googl…
DominiqueComte Jul 3, 2023
b2aae11
Bump com.google.guava:guava from 32.1.1-jre to 32.1.2-jre
dependabot[bot] Aug 7, 2023
f4eeb99
Merge pull request #80 from DominiqueComte/dependabot/maven/com.googl…
DominiqueComte Aug 7, 2023
4c27be3
Bump org.apache.maven.plugins:maven-enforcer-plugin from 3.3.0 to 3.4.0
dependabot[bot] Aug 28, 2023
51b0fbb
Merge pull request #83 from DominiqueComte/dependabot/maven/org.apach…
DominiqueComte Aug 28, 2023
33b8cec
Bump slf4j.version from 2.0.7 to 2.0.9
dependabot[bot] Sep 4, 2023
884c8b9
Merge pull request #85 from DominiqueComte/dependabot/maven/slf4j.ver…
DominiqueComte Oct 9, 2023
a1c890b
Merge pull request #59 from DominiqueComte/dependabot/maven/org.apach…
DominiqueComte Oct 9, 2023
73b24ba
Bump com.google.guava:guava from 32.1.2-jre to 32.1.3-jre
dependabot[bot] Oct 16, 2023
683174d
Bump org.apache.maven.plugins:maven-enforcer-plugin from 3.4.0 to 3.4.1
dependabot[bot] Oct 16, 2023
f185072
Merge pull request #90 from DominiqueComte/dependabot/maven/org.apach…
DominiqueComte Dec 11, 2023
bbee130
Merge pull request #89 from DominiqueComte/dependabot/maven/com.googl…
DominiqueComte Dec 11, 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
11 changes: 11 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# To get started with Dependabot version updates, you'll need to specify which
# package ecosystems to update and where the package manifests are located.
# Please see the documentation for all configuration options:
# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates

version: 2
updates:
- package-ecosystem: "maven" # See documentation for possible values
directory: "/" # Location of package manifests
schedule:
interval: "weekly"
33 changes: 33 additions & 0 deletions .github/workflows/maven.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
# This workflow will build a Java project with Maven, and cache/restore any dependencies to improve the workflow execution time
# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven

name: Java CI with Maven

on:
push:
branches: [ "master" ]
pull_request:
branches: [ "master" ]

jobs:
build:

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- name: Set up JDK 1.8
uses: actions/setup-java@v3
with:
java-version: '8'
distribution: 'temurin'
cache: maven
- name: Cache local Maven repository
uses: actions/cache@v3.0.11
with:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
restore-keys: |
${{ runner.os }}-maven-
- name: Build with Maven
run: mvn -B package --file pom.xml
7 changes: 5 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
language: java
jdk:
- oraclejdk7
- openjdk7
- oraclejdk8
- openjdk8
cache:
directories:
- $HOME/.m2
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ The easiest way to install and run MockMock is by downloading the jar file [here
`java -jar MockMock.jar`

This will run MockMock on the default ports 25 (for SMTP) and 8282 (the web interface). Please note you might need root permissions on some systems to let it listen on port 25.
After it started you can use your internet browser to navigate to [http://localhost:8282] (replace host name and web port if necessary). This will now show you the emails it received (which should be none at the moment). You can now send emails using the built in SMTP server running on port 25 by default. The emails should be visible via the web interface. To run MockMock on another port, you can start it with the following parameters:
After it started you can use your internet browser to navigate to [http://localhost:8282] (replace host name and web port if necessary). This will now show you the emails it received (which should be none at the moment). You can now send emails using the built-in SMTP server running on port 25 by default. The emails should be visible via the web interface. To run MockMock on another port, you can start it with the following parameters:
`java -jar MockMock.jar -p 25000 -h 8080`

This will run MockMock on SMTP port 25000 and http port 8080.
Expand Down
16 changes: 16 additions & 0 deletions checkstyle.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<?xml version="1.0"?>
<!DOCTYPE module PUBLIC
"-//Puppy Crawl//DTD Check Configuration 1.3//EN"
"https://www.puppycrawl.com/dtds/configuration_1_3.dtd">

<module name="Checker">
<property name="localeCountry" value="UK"/>
<property name="localeLanguage" value="en"/>
<module name="TreeWalker">
<module name="RedundantModifier"/>
<module name="ConstantName"/>
<module name="EmptyBlock"/>
<module name="StringLiteralEquality"/>
<module name="UnusedImports"/>
</module>
</module>
88 changes: 88 additions & 0 deletions extra/init.centos
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
#! /bin/sh
### BEGIN INIT INFO
# Required-Start: $remote_fs $syslog
# Required-Stop: $remote_fs $syslog
# Default-Start: 2 3 4 5
# Default-Stop: 0 1 6
# Short-Description: MockMock - Mock SMTP Server
### END INIT INFO

# PATH should only include /usr/* if it runs after the mountnfs.sh script
PATH=/sbin:/usr/sbin:/bin:/usr/bin
DESC="MockMock - Mock SMTP Server"
NAME=mockmock
DAEMON=/opt/mockmock/MockMock.jar
DAEMON_ARGS="-p 25000 -h 8282"
PIDFILE=/var/run/$NAME.pid
SCRIPTNAME=/etc/init.d/$NAME

# Read configuration variable file if it is present
[ -r /etc/default/$NAME ] && . /etc/default/$NAME

# Centos daemon functions
. /etc/init.d/functions

exe="/usr/bin/java -jar ${DAEMON} ${DAEMON_ARGS}"

#
# Function that starts the daemon/service
#
do_start()
{
echo -n "Starting mockmock : ${DAEMON_ARGS}"
#daemon ${exe} # Not working ...
if [ -s ${PIDFILE} ]; then
RETVAL=1
echo -n "Already running, check '${PIDFILE}'." && warning
echo
else
nohup ${exe} > /var/log/mockmock.log 2>&1 &
RETVAL=$?
PID=$!
[ $RETVAL -eq 0 ] && success || failure
echo
echo $PID > ${PIDFILE}
fi
return "$RETVAL"
}

#
# Function that stops the daemon/service
#
do_stop()
{
killproc -p ${PIDFILE}
RETVAL="$?"
if [ "$RETVAL" -ne 0 ]; then
echo -n "Could not stop mockmock with pid file ${PIDFILE}." && error
return "$RETVAL"
fi

# Many daemons don't delete their pidfiles when they exit.
rm -f ${PIDFILE}
echo "Stopping mockmock."
return "$RETVAL"
}

case "$1" in
start)
do_start
;;
stop)
do_stop
;;
status)
status -p $PIDFILE
;;
restart|force-reload)
do_stop
do_start
;;
*)
#echo "Usage: $SCRIPTNAME {start|stop|restart|reload|force-reload}" >&2
echo "Usage: $SCRIPTNAME {start|stop|status|restart}" >&2
exit 3
;;
esac

:
Loading