You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@turbine.apache.org by pa...@apache.org on 2019/01/22 19:41:12 UTC

[turbine-archetypes] branch master updated: Fix jetty plugin version and remove Upload fulcrum service from roleConfig

This is an automated email from the ASF dual-hosted git repository.

painter pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/turbine-archetypes.git


The following commit(s) were added to refs/heads/master by this push:
     new 1646160  Fix jetty plugin version and remove Upload fulcrum service from roleConfig
1646160 is described below

commit 16461607bc0cd2cbc67bdd961824240bd0226a4d
Author: jlpainter <je...@gmail.com>
AuthorDate: Tue Jan 22 14:40:59 2019 -0500

    Fix jetty plugin version and remove Upload fulcrum service from roleConfig
---
 src/main/resources/archetype-resources/pom.xml                     | 4 +++-
 .../src/main/webapp/WEB-INF/conf/roleConfiguration.xml             | 7 +------
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/main/resources/archetype-resources/pom.xml b/src/main/resources/archetype-resources/pom.xml
index 39cdf97..c375b31 100644
--- a/src/main/resources/archetype-resources/pom.xml
+++ b/src/main/resources/archetype-resources/pom.xml
@@ -243,7 +243,9 @@ under the License.
         <plugin>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-maven-plugin</artifactId>
-            <version>9.4.12.v20181114</version>
+            <!-- latest one that seems to be working, 
+                v20181111 and v20181114 coming up not found on maven central -->
+            <version>9.4.12.v20180830</version>
           <configuration>
             <scanIntervalSeconds>10</scanIntervalSeconds>
             <dumpOnStart>true</dumpOnStart>
diff --git a/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/conf/roleConfiguration.xml b/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/conf/roleConfiguration.xml
index a21b16a..3911005 100644
--- a/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/conf/roleConfiguration.xml
+++ b/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/conf/roleConfiguration.xml
@@ -61,11 +61,6 @@
         default-class="org.apache.fulcrum.pool.DefaultPoolService"/>
 
     <role
-        name="org.apache.fulcrum.upload.UploadService"
-        shorthand="upload"
-        default-class="org.apache.fulcrum.upload.DefaultUploadService"/>
-
-    <role
         name="org.apache.fulcrum.parser.ParserService"
         shorthand="parser"
         default-class="org.apache.fulcrum.parser.DefaultParserService"/>
@@ -137,4 +132,4 @@
     <!-- Add your services here -->
     
                 
-</role-list>
\ No newline at end of file
+</role-list>