jspwiki-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From juanpa...@apache.org
Subject [jspwiki] 03/05: jspwiki-portable: update bundled Apache Tomcat to 7.0.84
Date Sun, 28 Jan 2018 00:54:43 GMT
This is an automated email from the ASF dual-hosted git repository.

juanpablo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git

commit de8d084b446ead5f54610cdfef736d2cf6b5556c
Author: juanpablo <juanpablo@apache.org>
AuthorDate: Sun Jan 28 01:49:38 2018 +0100

    jspwiki-portable: update bundled Apache Tomcat to 7.0.84
---
 jspwiki-portable/pom.xml                           |  82 +++++++++++++++------
 .../src/main/assembly/tomcat-launcher.xml          |  34 +++++++++
 .../resources/tomcat/tomcat-launcher-7.0.52.jar    | Bin 61998 -> 0 bytes
 3 files changed, 93 insertions(+), 23 deletions(-)

diff --git a/jspwiki-portable/pom.xml b/jspwiki-portable/pom.xml
index afa8e35..3118154 100644
--- a/jspwiki-portable/pom.xml
+++ b/jspwiki-portable/pom.xml
@@ -31,6 +31,7 @@
 
   <properties>
     <jspwiki.woas.language>en</jspwiki.woas.language>
+    <tomcat.version>7.0.84</tomcat.version>
   </properties>
 
   <build>
@@ -46,7 +47,50 @@
         </configuration>
       </plugin>
       <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>generate-tomcat-launcher</id>
+            <phase>generate-resources</phase>
+            <goals>
+              <goal>single</goal>
+            </goals>
+            <configuration>
+              <appendAssemblyId>false</appendAssemblyId>
+              <descriptors>
+                <descriptor>${basedir}/src/main/assembly/tomcat-launcher.xml</descriptor>
+              </descriptors>
+              <finalName>tomcat-launcher-${tomcat.version}</finalName>
+              <outputDirectory>./target/launchers</outputDirectory>
+              <!-- 
+              <filters>
+                <filter>
+                  <artifact>*:*</artifact>
+                  <excludes>
+                    <exclude>META-INF/*.SF</exclude>
+                    <exclude>META-INF/*.DSA</exclude>
+                    <exclude>META-INF/*.RSA</exclude>
+                  </excludes>
+                </filter>
+              </filters> -->
+            </configuration>
+          </execution>
+          <execution>
+            <id>make-assembly</id>
+            <phase>package</phase>
+            <goals>
+              <goal>single</goal>
+            </goals>
+            <configuration>
+              <tarLongFileMode>gnu</tarLongFileMode>
+              <descriptors>
+                <descriptor>${basedir}/src/main/assembly/woas-dist.xml</descriptor>
+              </descriptors>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
         <artifactId>maven-antrun-plugin</artifactId>
         <executions>
           <execution>
@@ -93,9 +137,7 @@
         </executions>
       </plugin>
       <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-dependency-plugin</artifactId>
-        <version>2.8</version>
         <executions>
           <!-- Unpack the JSP Wiki web archive -->
           <execution>
@@ -166,7 +208,7 @@
                 <artifactItem>
                   <groupId>org.apache.tomcat</groupId>
                   <artifactId>tomcat</artifactId>
-                  <version>7.0.52</version>
+                  <version>${tomcat.version}</version>
                   <type>zip</type>
                 </artifactItem>
               </artifactItems>
@@ -175,26 +217,20 @@
           </execution>
         </executions>
       </plugin>
-      <plugin>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <!-- Create the installed/released artifacts -->
-        <executions>
-          <execution>
-            <id>make-assembly</id>
-            <phase>package</phase>
-            <configuration>
-              <tarLongFileMode>gnu</tarLongFileMode>
-              <descriptors>
-                <descriptor>${basedir}/src/main/assembly/woas-dist.xml</descriptor>
-              </descriptors>
-            </configuration>
-            <goals>
-              <goal>single</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
     </plugins>
   </build>
+  
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.tomcat.embed</groupId>
+      <artifactId>tomcat-embed-core</artifactId>
+      <version>${tomcat.version}</version>
+    </dependency>
 
+    <dependency>
+      <groupId>org.apache.tomcat.embed</groupId>
+      <artifactId>tomcat-embed-logging-juli</artifactId>
+      <version>${tomcat.version}</version>
+    </dependency>
+  </dependencies>
 </project>
diff --git a/jspwiki-portable/src/main/assembly/tomcat-launcher.xml b/jspwiki-portable/src/main/assembly/tomcat-launcher.xml
new file mode 100755
index 0000000..392c1f0
--- /dev/null
+++ b/jspwiki-portable/src/main/assembly/tomcat-launcher.xml
@@ -0,0 +1,34 @@
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+-->
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"

+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0
http://maven.apache.org/xsd/assembly-1.1.0.xsd">
+  <id>tomcat-launcher-jar</id>
+  <formats>
+    <format>jar</format>
+  </formats>
+
+  <dependencySets>
+    <dependencySet>
+      <unpack>true</unpack>
+      <useProjectArtifact>false</useProjectArtifact>
+      <useTransitiveDependencies>false</useTransitiveDependencies>
+    </dependencySet>
+  </dependencySets>
+</assembly>
\ No newline at end of file
diff --git a/jspwiki-portable/src/resources/tomcat/tomcat-launcher-7.0.52.jar b/jspwiki-portable/src/resources/tomcat/tomcat-launcher-7.0.52.jar
deleted file mode 100644
index 9174284..0000000
Binary files a/jspwiki-portable/src/resources/tomcat/tomcat-launcher-7.0.52.jar and /dev/null
differ

-- 
To stop receiving notification emails like this one, please contact
juanpablo@apache.org.

Mime
View raw message