directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pamarce...@apache.org
Subject svn commit: r985186 - in /directory/studio/trunk: application/application-plugins/pom.xml org.apache.xmlcommons.xmlapis/ org.apache.xmlcommons.xmlapis/pom.xml org.dom4j.dom4j/pom.xml pom.xml
Date Fri, 13 Aug 2010 13:18:18 GMT
Author: pamarcelot
Date: Fri Aug 13 13:18:18 2010
New Revision: 985186

URL: http://svn.apache.org/viewvc?rev=985186&view=rev
Log:
Added missing plugin for depedency 'org.apache.xmlcommons.xmlapis'.

Added:
    directory/studio/trunk/org.apache.xmlcommons.xmlapis/
    directory/studio/trunk/org.apache.xmlcommons.xmlapis/pom.xml
Modified:
    directory/studio/trunk/application/application-plugins/pom.xml
    directory/studio/trunk/org.dom4j.dom4j/pom.xml
    directory/studio/trunk/pom.xml

Modified: directory/studio/trunk/application/application-plugins/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/application/application-plugins/pom.xml?rev=985186&r1=985185&r2=985186&view=diff
==============================================================================
--- directory/studio/trunk/application/application-plugins/pom.xml (original)
+++ directory/studio/trunk/application/application-plugins/pom.xml Fri Aug 13 13:18:18 2010
@@ -112,6 +112,10 @@
                 </artifactItem>
                 <artifactItem>
                   <groupId>org.apache.directory.studio</groupId>
+                  <artifactId>org.apache.xmlcommons.xmlapis</artifactId>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.apache.directory.studio</groupId>
                   <artifactId>org.bouncycastle.bcprovjdk15</artifactId>
                 </artifactItem>
                 <artifactItem>

Added: directory/studio/trunk/org.apache.xmlcommons.xmlapis/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/org.apache.xmlcommons.xmlapis/pom.xml?rev=985186&view=auto
==============================================================================
--- directory/studio/trunk/org.apache.xmlcommons.xmlapis/pom.xml (added)
+++ directory/studio/trunk/org.apache.xmlcommons.xmlapis/pom.xml Fri Aug 13 13:18:18 2010
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  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.
+-->
+<!--
+  @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.directory.studio</groupId>
+    <artifactId>parent</artifactId>
+    <version>2.0.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>org.apache.xmlcommons.xmlapis</artifactId>
+  <version>${org.apache.xmlcommons.xmlapis.validversion}</version>
+  
+  <name>XML Commons External Components XML APIs (for Apache Directory Studio)</name>
+  <packaging>jar</packaging>
+
+  <description />
+  
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-eclipse-plugin</artifactId>
+        <configuration>
+          <skip>false</skip>
+          <pde>true</pde>
+          <additionalProjectnatures>
+            <projectnature>org.eclipse.pde.PluginNature</projectnature>
+            <projectnature>org.eclipse.jdt.core.javanature</projectnature>
+          </additionalProjectnatures>
+          <classpathContainers>
+            <classpathContainer>org.eclipse.jdt.launching.JRE_CONTAINER</classpathContainer>
+            <classpathContainer>org.eclipse.pde.core.requiredPlugins</classpathContainer>
+          </classpathContainers>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.directory.studio</groupId>
+        <artifactId>studio-maven-plugin</artifactId>
+        <configuration>
+          <skip>false</skip>
+          <createManifest>true</createManifest>
+        </configuration>
+        <executions>
+          <execution>
+            <goals>
+              <goal>prepare-jar-package</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <configuration>
+          <archive>
+            <manifestFile>META-INF/MANIFEST.MF</manifestFile>
+            <addMavenDescriptor>false</addMavenDescriptor>
+          </archive>
+        </configuration>
+      </plugin>
+      <!-- MANIFEST.MF Generation -->
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <extensions>true</extensions>
+        <configuration>
+          <manifestLocation>META-INF</manifestLocation>
+          <instructions>
+            <Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
+            <Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
+            <Embed-Directory>lib</Embed-Directory>
+            <Embed-StripGroup>true</Embed-StripGroup>
+            <Export-Package>*</Export-Package>
+            <Import-Package>!</Import-Package>
+          </instructions>
+        </configuration>
+        <executions>
+          <execution>
+            <id>generate-manifest</id>
+            <phase>process-classes</phase>
+            <goals>
+              <goal>manifest</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <!-- No tests to run -->
+      <plugin>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <skip>true</skip>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+  
+  <dependencies>
+    <dependency>
+      <groupId>xml-apis</groupId>
+      <artifactId>xml-apis</artifactId>
+    </dependency>
+  </dependencies>
+  
+</project>

Modified: directory/studio/trunk/org.dom4j.dom4j/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/org.dom4j.dom4j/pom.xml?rev=985186&r1=985185&r2=985186&view=diff
==============================================================================
--- directory/studio/trunk/org.dom4j.dom4j/pom.xml (original)
+++ directory/studio/trunk/org.dom4j.dom4j/pom.xml Fri Aug 13 13:18:18 2010
@@ -86,6 +86,9 @@
           <manifestLocation>META-INF</manifestLocation>
           <instructions>
             <Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
+            <Require-Bundle>
+org.apache.xmlcommons.xmlapis;bundle-version="${org.apache.xmlcommons.xmlapis.validversion}"
+            </Require-Bundle>
             <Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
             <Embed-Directory>lib</Embed-Directory>
             <Embed-StripGroup>true</Embed-StripGroup>

Modified: directory/studio/trunk/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/pom.xml?rev=985186&r1=985185&r2=985186&view=diff
==============================================================================
--- directory/studio/trunk/pom.xml (original)
+++ directory/studio/trunk/pom.xml Fri Aug 13 13:18:18 2010
@@ -78,6 +78,8 @@
     <org.apache.directory.shared.version>0.9.17</org.apache.directory.shared.version>
     <org.apache.mina.core.version>2.0.0-M6</org.apache.mina.core.version>
     <org.apache.mina.core.validversion>2.0.0.M6</org.apache.mina.core.validversion>
+    <org.apache.xmlcommons.xmlapis.version>1.0.b2</org.apache.xmlcommons.xmlapis.version>
+    <org.apache.xmlcommons.xmlapis.validversion>1.0.0.b2</org.apache.xmlcommons.xmlapis.validversion>
     <org.bouncycastle.bcprovjdk15.version>140</org.bouncycastle.bcprovjdk15.version>
     <org.dom4j.version>1.6.1</org.dom4j.version>
     <org.slf4j.version>1.5.6</org.slf4j.version>
@@ -104,6 +106,7 @@
     <module>org.apache.httpcomponents.httpcore</module>
     <module>org.apache.logging.log4j</module>
     <module>org.apache.mina.core</module>
+    <module>org.apache.xmlcommons.xmlapis</module>
     <module>org.bouncycastle.bcprovjdk15</module>
     <module>org.dom4j.dom4j</module>
     <module>org.slf4j.api</module>
@@ -294,6 +297,11 @@
       </dependency>
       <dependency>
         <groupId>org.apache.directory.studio</groupId>
+        <artifactId>org.apache.xmlcommons.xmlapis</artifactId>
+        <version>${org.apache.xmlcommons.xmlapis.validversion}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.directory.studio</groupId>
         <artifactId>org.bouncycastle.bcprovjdk15</artifactId>
         <version>${org.bouncycastle.bcprovjdk15.version}</version>
       </dependency>
@@ -1307,6 +1315,11 @@
         <artifactId>odfdom</artifactId>
         <version>0.6.16</version>
       </dependency>
+      <dependency>
+        <groupId>xml-apis</groupId>
+        <artifactId>xml-apis</artifactId>
+        <version>${org.apache.xmlcommons.xmlapis.version}</version>
+      </dependency>
 
       <dependency>
         <groupId>org.slf4j</groupId>



Mime
View raw message