You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juddi.apache.org by al...@apache.org on 2017/09/23 12:44:34 UTC
juddi git commit: JUDDI-971 updating the tomcat instance from 7.0.64
to 7.0.81
Repository: juddi
Updated Branches:
refs/heads/master a967991ae -> 95a3d5808
JUDDI-971 updating the tomcat instance from 7.0.64 to 7.0.81
Project: http://git-wip-us.apache.org/repos/asf/juddi/repo
Commit: http://git-wip-us.apache.org/repos/asf/juddi/commit/95a3d580
Tree: http://git-wip-us.apache.org/repos/asf/juddi/tree/95a3d580
Diff: http://git-wip-us.apache.org/repos/asf/juddi/diff/95a3d580
Branch: refs/heads/master
Commit: 95a3d5808d1646c0659607f15b691501ceac1d33
Parents: a967991
Author: Alex O'Ree <al...@apache.org>
Authored: Sat Sep 23 08:44:34 2017 -0400
Committer: Alex O'Ree <al...@apache.org>
Committed: Sat Sep 23 08:44:34 2017 -0400
----------------------------------------------------------------------
juddi-tomcat/assembly.xml | 2 +-
juddi-tomcat/build.xml | 2 +-
juddi-tomcat/pom.xml | 19 ++++++-------------
pom.xml | 1 +
4 files changed, 9 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/juddi/blob/95a3d580/juddi-tomcat/assembly.xml
----------------------------------------------------------------------
diff --git a/juddi-tomcat/assembly.xml b/juddi-tomcat/assembly.xml
index 8a0aa76..df6dac3 100644
--- a/juddi-tomcat/assembly.xml
+++ b/juddi-tomcat/assembly.xml
@@ -22,7 +22,7 @@
</formats>
<fileSets>
<fileSet>
- <directory>${project.build.directory}/tomcat/apache-tomcat-7.0.64</directory>
+ <directory>${project.build.directory}/tomcat/apache-tomcat-${apache.tomcat.version}</directory>
<outputDirectory></outputDirectory>
</fileSet>
</fileSets>
http://git-wip-us.apache.org/repos/asf/juddi/blob/95a3d580/juddi-tomcat/build.xml
----------------------------------------------------------------------
diff --git a/juddi-tomcat/build.xml b/juddi-tomcat/build.xml
index f28ab13..b09e18b 100644
--- a/juddi-tomcat/build.xml
+++ b/juddi-tomcat/build.xml
@@ -33,7 +33,7 @@
<target name="copy-resources" depends="unzip-tomcat">
<!-- JUDDI-894 -->
- <move file="${basedir}/target/tomcat/apache-tomcat-${apache.tomcat.version}/webapps/ROOT/index.jsp" tofile="${basedir}/target/tomcat/apache-tomcat-${apache.tomcat.version}/webapps/ROOT/index-tomcat.html" overwrite="true"/>
+ <move file="${basedir}/target/tomcat/apache-tomcat-${apache.tomcat.version}/webapps/ROOT/index.jsp" tofile="${basedir}/target/tomcat/apache-tomcat-${apache.tomcat.version}/webapps/ROOT/index-tomcat.jsp" overwrite="true"/>
<copy file="${basedir}/index.html" todir="${basedir}/target/tomcat/apache-tomcat-${apache.tomcat.version}/webapps/ROOT" overwrite="true"/>
<copy file="${basedir}/catalina.sh" todir="${basedir}/target/tomcat/apache-tomcat-${apache.tomcat.version}/bin" overwrite="true"/>
http://git-wip-us.apache.org/repos/asf/juddi/blob/95a3d580/juddi-tomcat/pom.xml
----------------------------------------------------------------------
diff --git a/juddi-tomcat/pom.xml b/juddi-tomcat/pom.xml
index 8043188..a28b5d7 100644
--- a/juddi-tomcat/pom.xml
+++ b/juddi-tomcat/pom.xml
@@ -31,18 +31,11 @@
<artifactId>commons-discovery</artifactId>
<version>0.2</version>
</dependency>
-<!-- <dependency>
- <artifactId>apache-tomcat</artifactId>
- <groupId>org.apache.juddi.bootstrap</groupId>
- <version>6.0.44</version>
- <type>zip</type>
- </dependency>
--->
-<dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat</artifactId>
- <version>7.0.64</version>
-<type>zip</type>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat</artifactId>
+ <version>${apache.tomcat.version}</version>
+ <type>zip</type>
</dependency>
@@ -150,7 +143,7 @@
<property name="dependency.juddiv3replication.war" value="${project.build.directory}/juddiv3-war-repl.war" />
<property name="dependency.juddi-gui.war" value="${project.build.directory}/juddi-gui-war.war" />
<property name="dependency.jaxws.jar" value="${maven.dependency.org.apache.geronimo.specs.geronimo-jaxws_2.2_spec.jar.path}" />
- <property name="apache.tomcat.version" value="7.0.64" />
+ <property name="apache.tomcat.version" value="${apache.tomcat.version}" />
<ant antfile="${basedir}/build.xml">
<property name="dependency.tomcat.zip" value="${dependency.tomcat.zip}" />
<target name="threenode" />
http://git-wip-us.apache.org/repos/asf/juddi/blob/95a3d580/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 99ff462..a2b1559 100644
--- a/pom.xml
+++ b/pom.xml
@@ -45,6 +45,7 @@ under the License.
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<cxf.version>2.7.18</cxf.version>
<springframework.version>3.2.18.RELEASE</springframework.version>
+ <apache.tomcat.version>7.0.81</apache.tomcat.version>
</properties>
<issueManagement>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@juddi.apache.org
For additional commands, e-mail: commits-help@juddi.apache.org