You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by sn...@apache.org on 2018/09/03 12:16:11 UTC
[1/8] roller git commit: preparing for 5.1.2 rc1
Repository: roller
Updated Branches:
refs/heads/bootstrap-ui 48e970895 -> 7df1f1d0d
preparing for 5.1.2 rc1
git-svn-id: https://svn.apache.org/repos/asf/roller/tags/roller_5.1.2-rc1@1663150 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/roller/repo
Commit: http://git-wip-us.apache.org/repos/asf/roller/commit/4d21faf0
Tree: http://git-wip-us.apache.org/repos/asf/roller/tree/4d21faf0
Diff: http://git-wip-us.apache.org/repos/asf/roller/diff/4d21faf0
Branch: refs/heads/bootstrap-ui
Commit: 4d21faf095b402f7a5c197ca6592c3bf23b70273
Parents: 1b6cf8b
Author: David M. Johnson <sn...@apache.org>
Authored: Sun Mar 1 19:32:52 2015 +0000
Committer: David M. Johnson <sn...@apache.org>
Committed: Sun Mar 1 19:32:52 2015 +0000
----------------------------------------------------------------------
----------------------------------------------------------------------
[4/8] roller git commit: Fix format of RC file names
Posted by sn...@apache.org.
Fix format of RC file names
Project: http://git-wip-us.apache.org/repos/asf/roller/repo
Commit: http://git-wip-us.apache.org/repos/asf/roller/commit/30ca737a
Tree: http://git-wip-us.apache.org/repos/asf/roller/tree/30ca737a
Diff: http://git-wip-us.apache.org/repos/asf/roller/diff/30ca737a
Branch: refs/heads/bootstrap-ui
Commit: 30ca737a0d0bded55504dcbc2e1179d288cc3e01
Parents: c332d75
Author: Dave Johnson <sn...@gmail.com>
Authored: Sat Sep 1 08:57:56 2018 -0400
Committer: Dave Johnson <sn...@gmail.com>
Committed: Sat Sep 1 08:57:56 2018 -0400
----------------------------------------------------------------------
assembly-release/sign-release.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/roller/blob/30ca737a/assembly-release/sign-release.sh
----------------------------------------------------------------------
diff --git a/assembly-release/sign-release.sh b/assembly-release/sign-release.sh
index 979ab40..194121a 100755
--- a/assembly-release/sign-release.sh
+++ b/assembly-release/sign-release.sh
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
-export rcstring=""
+export rcstring="-rc-1"
export vstring="5.2.1"
# for rc releases we rename the release files
[6/8] roller git commit: Merge branch 'roller-5.2.0'
Posted by sn...@apache.org.
Merge branch 'roller-5.2.0'
# Conflicts:
# app/pom.xml
# assembly-release/pom.xml
# assembly-release/sign-release.sh
# it-selenium/pom.xml
# it-selenium/src/test/resources/roller-jettyrun.properties
# pom.xml
Project: http://git-wip-us.apache.org/repos/asf/roller/repo
Commit: http://git-wip-us.apache.org/repos/asf/roller/commit/40547d2f
Tree: http://git-wip-us.apache.org/repos/asf/roller/tree/40547d2f
Diff: http://git-wip-us.apache.org/repos/asf/roller/diff/40547d2f
Branch: refs/heads/bootstrap-ui
Commit: 40547d2fd5f37657cc6b99fa6694130cb8129dc8
Parents: 947ddf3 30ca737
Author: Dave Johnson <sn...@gmail.com>
Authored: Sat Sep 1 17:25:14 2018 -0400
Committer: Dave Johnson <sn...@gmail.com>
Committed: Sat Sep 1 17:25:14 2018 -0400
----------------------------------------------------------------------
app/pom.xml | 4 ++--
.../roller/planet/business/SingleThreadedFeedUpdaterTest.java | 2 +-
assembly-release/pom.xml | 2 +-
assembly-release/sign-release.sh | 2 +-
it-selenium/pom.xml | 2 +-
it-selenium/src/test/resources/roller-jettyrun.properties | 2 +-
pom.xml | 4 ++--
7 files changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/roller/blob/40547d2f/app/pom.xml
----------------------------------------------------------------------
diff --cc app/pom.xml
index 6d7df1c,ed8d4ad..44b7882
--- a/app/pom.xml
+++ b/app/pom.xml
@@@ -24,7 -24,7 +24,7 @@@ limitations under the License
<parent>
<groupId>org.apache.roller</groupId>
<artifactId>roller-project</artifactId>
- <version>5.3.0-SNAPSHOT</version>
- <version>5.2.1</version>
++ <version>6.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/roller/blob/40547d2f/app/src/test/java/org/apache/roller/planet/business/SingleThreadedFeedUpdaterTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/roller/blob/40547d2f/assembly-release/pom.xml
----------------------------------------------------------------------
diff --cc assembly-release/pom.xml
index d7370f2,a041cb9..8cc413a
--- a/assembly-release/pom.xml
+++ b/assembly-release/pom.xml
@@@ -22,7 -22,7 +22,7 @@@
<parent>
<groupId>org.apache.roller</groupId>
<artifactId>roller-project</artifactId>
- <version>5.3.0-SNAPSHOT</version>
- <version>5.2.1</version>
++ <version>6.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/roller/blob/40547d2f/assembly-release/sign-release.sh
----------------------------------------------------------------------
diff --cc assembly-release/sign-release.sh
index 3ccc5d5,194121a..a36e210
--- a/assembly-release/sign-release.sh
+++ b/assembly-release/sign-release.sh
@@@ -1,7 -1,7 +1,7 @@@
#!/usr/bin/env bash
-export rcstring="-rc-1"
-export vstring="5.2.1"
+export rcstring=""
- export vstring="5.3.0"
++export vstring="6.0.0"
# for rc releases we rename the release files
if [ rcstring != "" ]; then
http://git-wip-us.apache.org/repos/asf/roller/blob/40547d2f/it-selenium/pom.xml
----------------------------------------------------------------------
diff --cc it-selenium/pom.xml
index 6e21406,b699393..b155983
--- a/it-selenium/pom.xml
+++ b/it-selenium/pom.xml
@@@ -24,7 -24,7 +24,7 @@@
<parent>
<groupId>org.apache.roller</groupId>
<artifactId>roller-project</artifactId>
- <version>5.3.0-SNAPSHOT</version>
- <version>5.2.1</version>
++ <version>6.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/roller/blob/40547d2f/it-selenium/src/test/resources/roller-jettyrun.properties
----------------------------------------------------------------------
diff --cc it-selenium/src/test/resources/roller-jettyrun.properties
index 9380aae,706dbae..e3fdd52
--- a/it-selenium/src/test/resources/roller-jettyrun.properties
+++ b/it-selenium/src/test/resources/roller-jettyrun.properties
@@@ -23,7 -23,7 +23,7 @@@ hibernate.transaction.factory_class=org
passwds.encryption.enabled=false
# use src copy of themes for read-only access
- themes.dir=target/roller-selenium-tests-5.3.0-SNAPSHOT/themes
-themes.dir=target/roller-selenium-tests-5.2.1/themes
++themes.dir=target/roller-selenium-tests-6.0.0-SNAPSHOT/themes
# put work in work dir
search.index.dir =target/work/search-index
http://git-wip-us.apache.org/repos/asf/roller/blob/40547d2f/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index 2919ae1,17695af..4e3d92f
--- a/pom.xml
+++ b/pom.xml
@@@ -22,7 -22,7 +22,7 @@@ limitations under the License
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.roller</groupId>
<artifactId>roller-project</artifactId>
- <version>5.3.0-SNAPSHOT</version>
- <version>5.2.1</version>
++ <version>6.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<prerequisites>
@@@ -47,7 -47,7 +47,7 @@@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<derby.version>10.11.1.1</derby.version>
- <roller.version>5.3.0-SNAPSHOT</roller.version>
- <roller.version>5.2.1</roller.version>
++ <roller.version>6.0.0-SNAPSHOT</roller.version>
</properties>
<modules>
[3/8] roller git commit: Upgrade Struts to 2.5.17,
fix broken URLs in planet tests & prepare for Roller 5.2.1 release.
Posted by sn...@apache.org.
Upgrade Struts to 2.5.17, fix broken URLs in planet tests & prepare for Roller 5.2.1 release.
Project: http://git-wip-us.apache.org/repos/asf/roller/repo
Commit: http://git-wip-us.apache.org/repos/asf/roller/commit/c332d755
Tree: http://git-wip-us.apache.org/repos/asf/roller/tree/c332d755
Diff: http://git-wip-us.apache.org/repos/asf/roller/diff/c332d755
Branch: refs/heads/bootstrap-ui
Commit: c332d7553e1d3344f4fd875638aab55b114f85a6
Parents: 1794b22
Author: Dave Johnson <sn...@gmail.com>
Authored: Sat Sep 1 08:27:05 2018 -0400
Committer: Dave Johnson <sn...@gmail.com>
Committed: Sat Sep 1 08:27:05 2018 -0400
----------------------------------------------------------------------
.../org/apache/roller/planet/business/RomeFeedFetcherTest.java | 4 ++--
.../roller/planet/business/SingleThreadedFeedUpdaterTest.java | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/roller/blob/c332d755/app/src/test/java/org/apache/roller/planet/business/RomeFeedFetcherTest.java
----------------------------------------------------------------------
diff --git a/app/src/test/java/org/apache/roller/planet/business/RomeFeedFetcherTest.java b/app/src/test/java/org/apache/roller/planet/business/RomeFeedFetcherTest.java
index b59f65e..0f5e9e5 100644
--- a/app/src/test/java/org/apache/roller/planet/business/RomeFeedFetcherTest.java
+++ b/app/src/test/java/org/apache/roller/planet/business/RomeFeedFetcherTest.java
@@ -56,7 +56,7 @@ public class RomeFeedFetcherTest extends TestCase {
Subscription sub = feedFetcher.fetchSubscription(feed_url);
assertNotNull(sub);
assertEquals(feed_url, sub.getFeedURL());
- assertEquals("http://rollerweblogger.org/roller/", sub.getSiteURL());
+ assertEquals("https://rollerweblogger.org/roller/", sub.getSiteURL());
assertEquals("Blogging Roller", sub.getTitle());
assertNotNull(sub.getLastUpdated());
assertTrue(sub.getEntries().size() > 0);
@@ -76,7 +76,7 @@ public class RomeFeedFetcherTest extends TestCase {
Subscription sub = feedFetcher.fetchSubscription(feed_url);
assertNotNull(sub);
assertEquals(feed_url, sub.getFeedURL());
- assertEquals("http://rollerweblogger.org/roller/", sub.getSiteURL());
+ assertEquals("https://rollerweblogger.org/roller/", sub.getSiteURL());
assertEquals("Blogging Roller", sub.getTitle());
assertNotNull(sub.getLastUpdated());
assertTrue(sub.getEntries().size() > 0);
http://git-wip-us.apache.org/repos/asf/roller/blob/c332d755/app/src/test/java/org/apache/roller/planet/business/SingleThreadedFeedUpdaterTest.java
----------------------------------------------------------------------
diff --git a/app/src/test/java/org/apache/roller/planet/business/SingleThreadedFeedUpdaterTest.java b/app/src/test/java/org/apache/roller/planet/business/SingleThreadedFeedUpdaterTest.java
index 7375058..4c03c4b 100644
--- a/app/src/test/java/org/apache/roller/planet/business/SingleThreadedFeedUpdaterTest.java
+++ b/app/src/test/java/org/apache/roller/planet/business/SingleThreadedFeedUpdaterTest.java
@@ -71,7 +71,7 @@ public class SingleThreadedFeedUpdaterTest extends TestCase {
sub = mgr.getSubscription(feed_url);
assertNotNull(sub);
assertEquals(feed_url, sub.getFeedURL());
- assertEquals("http://rollerweblogger.org/roller/", sub.getSiteURL());
+ assertEquals("https://rollerweblogger.org/roller/", sub.getSiteURL());
assertEquals("Blogging Roller", sub.getTitle());
assertNotNull(sub.getLastUpdated());
assertTrue(sub.getEntries().size() > 0);
[5/8] roller git commit: Merge commit
'4d21faf095b402f7a5c197ca6592c3bf23b70273'
Posted by sn...@apache.org.
Merge commit '4d21faf095b402f7a5c197ca6592c3bf23b70273'
Project: http://git-wip-us.apache.org/repos/asf/roller/repo
Commit: http://git-wip-us.apache.org/repos/asf/roller/commit/947ddf39
Tree: http://git-wip-us.apache.org/repos/asf/roller/tree/947ddf39
Diff: http://git-wip-us.apache.org/repos/asf/roller/diff/947ddf39
Branch: refs/heads/bootstrap-ui
Commit: 947ddf39a03bf040f317ac444dd6b653dde4a071
Parents: 952c438 4d21faf
Author: Dave Johnson <sn...@gmail.com>
Authored: Sat Sep 1 17:16:26 2018 -0400
Committer: Dave Johnson <sn...@gmail.com>
Committed: Sat Sep 1 17:16:26 2018 -0400
----------------------------------------------------------------------
----------------------------------------------------------------------
[2/8] roller git commit: Upgrade Struts to 2.5.17,
fix broken URLs in planet tests & prepare for Roller 5.2.1 release.
Posted by sn...@apache.org.
Upgrade Struts to 2.5.17, fix broken URLs in planet tests & prepare for Roller 5.2.1 release.
Project: http://git-wip-us.apache.org/repos/asf/roller/repo
Commit: http://git-wip-us.apache.org/repos/asf/roller/commit/1794b224
Tree: http://git-wip-us.apache.org/repos/asf/roller/tree/1794b224
Diff: http://git-wip-us.apache.org/repos/asf/roller/diff/1794b224
Branch: refs/heads/bootstrap-ui
Commit: 1794b224334d8c3868771390502839aed1f5fed9
Parents: 2d19f5a
Author: Dave Johnson <sn...@gmail.com>
Authored: Sat Sep 1 08:23:47 2018 -0400
Committer: Dave Johnson <sn...@gmail.com>
Committed: Sat Sep 1 08:23:47 2018 -0400
----------------------------------------------------------------------
app/pom.xml | 4 ++--
.../org/apache/roller/planet/business/RomeFeedFetcherTest.java | 2 +-
.../roller/planet/business/SingleThreadedFeedUpdaterTest.java | 2 +-
assembly-release/pom.xml | 2 +-
assembly-release/sign-release.sh | 2 +-
it-selenium/pom.xml | 2 +-
it-selenium/src/test/resources/roller-jettyrun.properties | 2 +-
pom.xml | 4 ++--
8 files changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/roller/blob/1794b224/app/pom.xml
----------------------------------------------------------------------
diff --git a/app/pom.xml b/app/pom.xml
index 4739e4c..ed8d4ad 100644
--- a/app/pom.xml
+++ b/app/pom.xml
@@ -24,7 +24,7 @@ limitations under the License.
<parent>
<groupId>org.apache.roller</groupId>
<artifactId>roller-project</artifactId>
- <version>5.2.0</version>
+ <version>5.2.1</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -56,7 +56,7 @@ limitations under the License.
<slf4j.version>1.7.25</slf4j.version>
<spring.version>4.1.4.RELEASE</spring.version>
<spring.security.version>3.2.5.RELEASE</spring.security.version>
- <struts.version>2.5.12</struts.version>
+ <struts.version>2.5.17</struts.version>
<velocity.version>1.7</velocity.version>
<webjars.version>1.5</webjars.version>
<ws-commons-util.version>1.0.2</ws-commons-util.version>
http://git-wip-us.apache.org/repos/asf/roller/blob/1794b224/app/src/test/java/org/apache/roller/planet/business/RomeFeedFetcherTest.java
----------------------------------------------------------------------
diff --git a/app/src/test/java/org/apache/roller/planet/business/RomeFeedFetcherTest.java b/app/src/test/java/org/apache/roller/planet/business/RomeFeedFetcherTest.java
index 4cf3b24..b59f65e 100644
--- a/app/src/test/java/org/apache/roller/planet/business/RomeFeedFetcherTest.java
+++ b/app/src/test/java/org/apache/roller/planet/business/RomeFeedFetcherTest.java
@@ -35,7 +35,7 @@ public class RomeFeedFetcherTest extends TestCase {
public static Log log = LogFactory.getLog(RomeFeedFetcherTest.class);
- String feed_url = "http://rollerweblogger.org/roller/feed/entries/atom";
+ String feed_url = "https://rollerweblogger.org/roller/feed/entries/atom";
protected void setUp() throws Exception {
http://git-wip-us.apache.org/repos/asf/roller/blob/1794b224/app/src/test/java/org/apache/roller/planet/business/SingleThreadedFeedUpdaterTest.java
----------------------------------------------------------------------
diff --git a/app/src/test/java/org/apache/roller/planet/business/SingleThreadedFeedUpdaterTest.java b/app/src/test/java/org/apache/roller/planet/business/SingleThreadedFeedUpdaterTest.java
index 46298c5..7375058 100644
--- a/app/src/test/java/org/apache/roller/planet/business/SingleThreadedFeedUpdaterTest.java
+++ b/app/src/test/java/org/apache/roller/planet/business/SingleThreadedFeedUpdaterTest.java
@@ -35,7 +35,7 @@ public class SingleThreadedFeedUpdaterTest extends TestCase {
private Subscription testSub = null;
- private String feed_url = "http://rollerweblogger.org/roller/feed/entries/atom";
+ private String feed_url = "https://rollerweblogger.org/roller/feed/entries/atom";
protected void setUp() throws Exception {
http://git-wip-us.apache.org/repos/asf/roller/blob/1794b224/assembly-release/pom.xml
----------------------------------------------------------------------
diff --git a/assembly-release/pom.xml b/assembly-release/pom.xml
index 77dac0d..a041cb9 100644
--- a/assembly-release/pom.xml
+++ b/assembly-release/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.roller</groupId>
<artifactId>roller-project</artifactId>
- <version>5.2.0</version>
+ <version>5.2.1</version>
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/roller/blob/1794b224/assembly-release/sign-release.sh
----------------------------------------------------------------------
diff --git a/assembly-release/sign-release.sh b/assembly-release/sign-release.sh
index 77fdd59..979ab40 100755
--- a/assembly-release/sign-release.sh
+++ b/assembly-release/sign-release.sh
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
export rcstring=""
-export vstring="5.2.0"
+export vstring="5.2.1"
# for rc releases we rename the release files
if [ rcstring != "" ]; then
http://git-wip-us.apache.org/repos/asf/roller/blob/1794b224/it-selenium/pom.xml
----------------------------------------------------------------------
diff --git a/it-selenium/pom.xml b/it-selenium/pom.xml
index 2854584..b699393 100644
--- a/it-selenium/pom.xml
+++ b/it-selenium/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.roller</groupId>
<artifactId>roller-project</artifactId>
- <version>5.2.0</version>
+ <version>5.2.1</version>
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/roller/blob/1794b224/it-selenium/src/test/resources/roller-jettyrun.properties
----------------------------------------------------------------------
diff --git a/it-selenium/src/test/resources/roller-jettyrun.properties b/it-selenium/src/test/resources/roller-jettyrun.properties
index 643e0c5..706dbae 100644
--- a/it-selenium/src/test/resources/roller-jettyrun.properties
+++ b/it-selenium/src/test/resources/roller-jettyrun.properties
@@ -23,7 +23,7 @@ hibernate.transaction.factory_class=org.hibernate.transaction.JDBCTransactionFac
passwds.encryption.enabled=false
# use src copy of themes for read-only access
-themes.dir=target/roller-selenium-tests-5.2.0/themes
+themes.dir=target/roller-selenium-tests-5.2.1/themes
# put work in work dir
search.index.dir =target/work/search-index
http://git-wip-us.apache.org/repos/asf/roller/blob/1794b224/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 408d530..17695af 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@ limitations under the License.
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.roller</groupId>
<artifactId>roller-project</artifactId>
- <version>5.2.0</version>
+ <version>5.2.1</version>
<packaging>pom</packaging>
<prerequisites>
@@ -47,7 +47,7 @@ limitations under the License.
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<derby.version>10.11.1.1</derby.version>
- <roller.version>5.2.0</roller.version>
+ <roller.version>5.2.1</roller.version>
</properties>
<modules>
[8/8] roller git commit: Merge branch 'master' into bootstrap-ui
Posted by sn...@apache.org.
Merge branch 'master' into bootstrap-ui
# Conflicts:
# app/pom.xml
# assembly-release/sign-release.sh
Project: http://git-wip-us.apache.org/repos/asf/roller/repo
Commit: http://git-wip-us.apache.org/repos/asf/roller/commit/7df1f1d0
Tree: http://git-wip-us.apache.org/repos/asf/roller/tree/7df1f1d0
Diff: http://git-wip-us.apache.org/repos/asf/roller/diff/7df1f1d0
Branch: refs/heads/bootstrap-ui
Commit: 7df1f1d0de466a57fb328c6764af6fe41bdd5f69
Parents: 48e9708 ad62b85
Author: Dave Johnson <sn...@gmail.com>
Authored: Mon Sep 3 08:16:08 2018 -0400
Committer: Dave Johnson <sn...@gmail.com>
Committed: Mon Sep 3 08:16:08 2018 -0400
----------------------------------------------------------------------
app/pom.xml | 8 +-------
.../planet/business/SingleThreadedFeedUpdaterTest.java | 2 +-
app/src/test/resources/jetty.xml | 2 +-
pom.xml | 6 +++---
4 files changed, 6 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/roller/blob/7df1f1d0/app/pom.xml
----------------------------------------------------------------------
[7/8] roller git commit: Bump JDK version up to 1.8 and upgrade to
latest Jetty for mvn jetty:run
Posted by sn...@apache.org.
Bump JDK version up to 1.8 and upgrade to latest Jetty for mvn jetty:run
Project: http://git-wip-us.apache.org/repos/asf/roller/repo
Commit: http://git-wip-us.apache.org/repos/asf/roller/commit/ad62b85b
Tree: http://git-wip-us.apache.org/repos/asf/roller/tree/ad62b85b
Diff: http://git-wip-us.apache.org/repos/asf/roller/diff/ad62b85b
Branch: refs/heads/bootstrap-ui
Commit: ad62b85b36b43dbbff71a850900b4dc419eb9a6d
Parents: 40547d2
Author: Dave Johnson <sn...@gmail.com>
Authored: Sun Sep 2 18:41:06 2018 -0400
Committer: Dave Johnson <sn...@gmail.com>
Committed: Sun Sep 2 18:41:06 2018 -0400
----------------------------------------------------------------------
app/pom.xml | 6 ------
app/src/test/resources/jetty.xml | 2 +-
pom.xml | 6 +++---
3 files changed, 4 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/roller/blob/ad62b85b/app/pom.xml
----------------------------------------------------------------------
diff --git a/app/pom.xml b/app/pom.xml
index 44b7882..ad5ce98 100644
--- a/app/pom.xml
+++ b/app/pom.xml
@@ -94,12 +94,6 @@ limitations under the License.
<artifactId>mail</artifactId>
<version>${java-mail.version}</version>
<scope>provided</scope>
- <exclusions>
- <exclusion>
- <groupId>javax.activation</groupId>
- <artifactId>activation</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<!-- Eclipselink JPA is the default JPA implementation used by
http://git-wip-us.apache.org/repos/asf/roller/blob/ad62b85b/app/src/test/resources/jetty.xml
----------------------------------------------------------------------
diff --git a/app/src/test/resources/jetty.xml b/app/src/test/resources/jetty.xml
index 0209086..995ea1d 100644
--- a/app/src/test/resources/jetty.xml
+++ b/app/src/test/resources/jetty.xml
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
-<Configure id='Server' class="org.eclipse.jetty.webapp.WebAppContext">
+<Configure id="Server" class="org.eclipse.jetty.server.Server">
<!-- Dummy values used only when testing with Jetty via mvn jetty:run -->
http://git-wip-us.apache.org/repos/asf/roller/blob/ad62b85b/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 4e3d92f..6af923f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -63,8 +63,8 @@ limitations under the License.
<artifactId>maven-compiler-plugin</artifactId>
<version>3.1</version>
<configuration>
- <source>1.7</source>
- <target>1.7</target>
+ <source>1.8</source>
+ <target>1.8</target>
<fork>true</fork>
<encoding>${project.build.sourceEncoding}</encoding>
</configuration>
@@ -80,7 +80,7 @@ limitations under the License.
<plugin>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
- <version>9.2.6.v20141205</version>
+ <version>9.4.11.v20180605</version>
</plugin>
<plugin>
<groupId>com.btmatthews.maven.plugins.inmemdb</groupId>