commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ohe...@apache.org
Subject svn commit: r1800925 - in /commons/proper/jelly/trunk/jelly-tags: ./ avalon/ avalon/src/java/org/apache/commons/jelly/avalon/ avalon/src/main/ avalon/src/main/java/ avalon/src/main/java/org/ avalon/src/main/java/org/apache/ avalon/src/main/java/org/apa...
Date Wed, 05 Jul 2017 19:46:58 GMT
Author: oheger
Date: Wed Jul  5 19:46:58 2017
New Revision: 1800925

URL: http://svn.apache.org/viewvc?rev=1800925&view=rev
Log:
Added avalon tag lib to multi-module build.

Added:
    commons/proper/jelly/trunk/jelly-tags/avalon/pom.xml
      - copied, changed from r1800924, commons/proper/jelly/trunk/jelly-tags/avalon/project.xml
    commons/proper/jelly/trunk/jelly-tags/avalon/src/main/
    commons/proper/jelly/trunk/jelly-tags/avalon/src/main/java/
    commons/proper/jelly/trunk/jelly-tags/avalon/src/main/java/org/
    commons/proper/jelly/trunk/jelly-tags/avalon/src/main/java/org/apache/
    commons/proper/jelly/trunk/jelly-tags/avalon/src/main/java/org/apache/commons/
    commons/proper/jelly/trunk/jelly-tags/avalon/src/main/java/org/apache/commons/jelly/
    commons/proper/jelly/trunk/jelly-tags/avalon/src/main/java/org/apache/commons/jelly/avalon/
    commons/proper/jelly/trunk/jelly-tags/avalon/src/main/java/org/apache/commons/jelly/avalon/JellyService.java
      - copied, changed from r1800924, commons/proper/jelly/trunk/jelly-tags/avalon/src/java/org/apache/commons/jelly/avalon/JellyService.java
    commons/proper/jelly/trunk/jelly-tags/avalon/src/main/java/org/apache/commons/jelly/avalon/JellyServiceImpl.java
      - copied, changed from r1800924, commons/proper/jelly/trunk/jelly-tags/avalon/src/java/org/apache/commons/jelly/avalon/JellyServiceImpl.java
    commons/proper/jelly/trunk/jelly-tags/avalon/src/test/resources/
    commons/proper/jelly/trunk/jelly-tags/avalon/src/test/resources/org/
    commons/proper/jelly/trunk/jelly-tags/avalon/src/test/resources/org/apache/
    commons/proper/jelly/trunk/jelly-tags/avalon/src/test/resources/org/apache/commons/
    commons/proper/jelly/trunk/jelly-tags/avalon/src/test/resources/org/apache/commons/jelly/
    commons/proper/jelly/trunk/jelly-tags/avalon/src/test/resources/org/apache/commons/jelly/tags/
    commons/proper/jelly/trunk/jelly-tags/avalon/src/test/resources/org/apache/commons/jelly/tags/avalon/
    commons/proper/jelly/trunk/jelly-tags/avalon/src/test/resources/org/apache/commons/jelly/tags/avalon/sample.jelly
      - copied, changed from r1800924, commons/proper/jelly/trunk/jelly-tags/avalon/src/test/org/apache/commons/jelly/tags/avalon/sample.jelly
Removed:
    commons/proper/jelly/trunk/jelly-tags/avalon/build.xml
    commons/proper/jelly/trunk/jelly-tags/avalon/maven.xml
    commons/proper/jelly/trunk/jelly-tags/avalon/project.properties
    commons/proper/jelly/trunk/jelly-tags/avalon/project.xml
    commons/proper/jelly/trunk/jelly-tags/avalon/src/java/org/apache/commons/jelly/avalon/JellyService.java
    commons/proper/jelly/trunk/jelly-tags/avalon/src/java/org/apache/commons/jelly/avalon/JellyServiceImpl.java
    commons/proper/jelly/trunk/jelly-tags/avalon/src/test/org/apache/commons/jelly/tags/avalon/sample.jelly
Modified:
    commons/proper/jelly/trunk/jelly-tags/pom.xml

Copied: commons/proper/jelly/trunk/jelly-tags/avalon/pom.xml (from r1800924, commons/proper/jelly/trunk/jelly-tags/avalon/project.xml)
URL: http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/avalon/pom.xml?p2=commons/proper/jelly/trunk/jelly-tags/avalon/pom.xml&p1=commons/proper/jelly/trunk/jelly-tags/avalon/project.xml&r1=1800924&r2=1800925&rev=1800925&view=diff
==============================================================================
--- commons/proper/jelly/trunk/jelly-tags/avalon/project.xml (original)
+++ commons/proper/jelly/trunk/jelly-tags/avalon/pom.xml Wed Jul  5 19:46:58 2017
@@ -15,48 +15,39 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<project>
-  <extend>${basedir}/../tag-project.xml</extend>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>commons-jelly</groupId>
+    <artifactId>commons-jelly-tags</artifactId>
+    <version>1.1-SNAPSHOT</version>
+  </parent>
+
   <artifactId>commons-jelly-tags-avalon</artifactId>
+  <packaging>jar</packaging>
   <name>commons-jelly-tags-avalon</name>
-  <currentVersion>1.0.1-SNAPSHOT</currentVersion>
-  <package>org.apache.commons.jelly.avalon</package>
-
-  <description>
-        This is a Jelly library for Avalon
-  </description>
-  <shortDescription>This is a Jelly library for Avalon</shortDescription>
-  
-  <versions>
-    <version>
-      <id>1.0</id>
-      <name>1.0</name>
-      <tag>COMMONS_JELLY_AVALON-1_0</tag>
-    </version>
-  </versions>
+  <description>This is a Jelly library for Avalon.</description>
 
   <dependencies>
-
     <!-- START for compilation -->
-  
     <dependency>
-      <artifactId>avalon-framework</artifactId>
       <groupId>avalon-framework</groupId>
+      <artifactId>avalon-framework</artifactId>
       <version>4.1.3</version>
-      <properties>
-        <gump.project>avalon-framework-api</gump.project>
-      </properties>
     </dependency>
-  
-    <!-- START for running demos -->
+
+    <!-- END for compilation -->
+
+    <!-- Start for running demos -->
 
     <dependency>
       <artifactId>commons-cli</artifactId>
       <groupId>commons-cli</groupId>
       <version>1.0</version>
+      <scope>provided</scope>
     </dependency>
-        
+
     <!-- END for running demos -->
   </dependencies>
-  
 </project>

Copied: commons/proper/jelly/trunk/jelly-tags/avalon/src/main/java/org/apache/commons/jelly/avalon/JellyService.java
(from r1800924, commons/proper/jelly/trunk/jelly-tags/avalon/src/java/org/apache/commons/jelly/avalon/JellyService.java)
URL: http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/avalon/src/main/java/org/apache/commons/jelly/avalon/JellyService.java?p2=commons/proper/jelly/trunk/jelly-tags/avalon/src/main/java/org/apache/commons/jelly/avalon/JellyService.java&p1=commons/proper/jelly/trunk/jelly-tags/avalon/src/java/org/apache/commons/jelly/avalon/JellyService.java&r1=1800924&r2=1800925&rev=1800925&view=diff
==============================================================================
    (empty)

Copied: commons/proper/jelly/trunk/jelly-tags/avalon/src/main/java/org/apache/commons/jelly/avalon/JellyServiceImpl.java
(from r1800924, commons/proper/jelly/trunk/jelly-tags/avalon/src/java/org/apache/commons/jelly/avalon/JellyServiceImpl.java)
URL: http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/avalon/src/main/java/org/apache/commons/jelly/avalon/JellyServiceImpl.java?p2=commons/proper/jelly/trunk/jelly-tags/avalon/src/main/java/org/apache/commons/jelly/avalon/JellyServiceImpl.java&p1=commons/proper/jelly/trunk/jelly-tags/avalon/src/java/org/apache/commons/jelly/avalon/JellyServiceImpl.java&r1=1800924&r2=1800925&rev=1800925&view=diff
==============================================================================
    (empty)

Copied: commons/proper/jelly/trunk/jelly-tags/avalon/src/test/resources/org/apache/commons/jelly/tags/avalon/sample.jelly
(from r1800924, commons/proper/jelly/trunk/jelly-tags/avalon/src/test/org/apache/commons/jelly/tags/avalon/sample.jelly)
URL: http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/avalon/src/test/resources/org/apache/commons/jelly/tags/avalon/sample.jelly?p2=commons/proper/jelly/trunk/jelly-tags/avalon/src/test/resources/org/apache/commons/jelly/tags/avalon/sample.jelly&p1=commons/proper/jelly/trunk/jelly-tags/avalon/src/test/org/apache/commons/jelly/tags/avalon/sample.jelly&r1=1800924&r2=1800925&rev=1800925&view=diff
==============================================================================
    (empty)

Modified: commons/proper/jelly/trunk/jelly-tags/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/pom.xml?rev=1800925&r1=1800924&r2=1800925&view=diff
==============================================================================
--- commons/proper/jelly/trunk/jelly-tags/pom.xml (original)
+++ commons/proper/jelly/trunk/jelly-tags/pom.xml Wed Jul  5 19:46:58 2017
@@ -16,6 +16,7 @@
   <modules>
     <module>ant</module>
     <module>antlr</module>
+    <module>avalon</module>
     <module>junit</module>
     <module>util</module>
   </modules>



Mime
View raw message