directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From seelm...@apache.org
Subject svn commit: r1721235 - in /directory/studio/trunk: eclipse-trgt-platform/ eclipse-trgt-platform/template/ features/rcp.feature/ plugins/slf4j-eclipselog/ tests/test.integration.ui/
Date Mon, 21 Dec 2015 18:58:05 GMT
Author: seelmann
Date: Mon Dec 21 18:58:05 2015
New Revision: 1721235

URL: http://svn.apache.org/viewvc?rev=1721235&view=rev
Log:
Fix for DIRSTUDIO-1068 (Bundles are not resolved on Eclipse Mars): Remove additional slf4j
API, use existing one provided by Eclipse.

Modified:
    directory/studio/trunk/eclipse-trgt-platform/pom-first.xml
    directory/studio/trunk/eclipse-trgt-platform/template/org.apache.directory.studio.eclipse-trgt-platform.template
    directory/studio/trunk/features/rcp.feature/feature.xml
    directory/studio/trunk/plugins/slf4j-eclipselog/pom-first.xml
    directory/studio/trunk/tests/test.integration.ui/pom-first.xml

Modified: directory/studio/trunk/eclipse-trgt-platform/pom-first.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/eclipse-trgt-platform/pom-first.xml?rev=1721235&r1=1721234&r2=1721235&view=diff
==============================================================================
--- directory/studio/trunk/eclipse-trgt-platform/pom-first.xml (original)
+++ directory/studio/trunk/eclipse-trgt-platform/pom-first.xml Mon Dec 21 18:58:05 2015
@@ -35,17 +35,12 @@
   <!-- Step 1: Define the Maven artifacts, that should be added to a P2 repository. -->
   <dependencies>
 
-    <!-- Logging jars -->
+    <!-- Exclude slf4j, reuse org.slf4j.api provided by Eclipse, see DIRSTUDIO-1068 -->
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
       <version>${org.slf4j.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>log4j-over-slf4j</artifactId>
-      <version>${org.slf4j.version}</version>
+      <scope>provided</scope>
     </dependency>
 
     <!-- Commons jars -->
@@ -73,6 +68,14 @@
       <version>${org.apache.commons.pool.version}</version>
     </dependency>
 
+
+    <!-- Mina modules -->
+    <dependency>
+      <groupId>org.apache.mina</groupId>
+      <artifactId>mina-core</artifactId>
+      <version>${org.apache.mina.version}</version>
+    </dependency>
+
     <!-- LDAP API modules -->
     <dependency>
       <groupId>org.apache.directory.api</groupId>
@@ -465,6 +468,7 @@
             </goals>
             <configuration>
               <outputDirectory>${project.basedir}/target/source/plugins</outputDirectory>
+              <excludeScope>provided</excludeScope>
             </configuration>
           </execution>
         </executions>

Modified: directory/studio/trunk/eclipse-trgt-platform/template/org.apache.directory.studio.eclipse-trgt-platform.template
URL: http://svn.apache.org/viewvc/directory/studio/trunk/eclipse-trgt-platform/template/org.apache.directory.studio.eclipse-trgt-platform.template?rev=1721235&r1=1721234&r2=1721235&view=diff
==============================================================================
--- directory/studio/trunk/eclipse-trgt-platform/template/org.apache.directory.studio.eclipse-trgt-platform.template
(original)
+++ directory/studio/trunk/eclipse-trgt-platform/template/org.apache.directory.studio.eclipse-trgt-platform.template
Mon Dec 21 18:58:05 2015
@@ -19,7 +19,7 @@
   @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
 -->
 <?pde version="3.8"?>
-<target name="Apache Directory Studio Platform" sequenceNumber="185">
+<target name="Apache Directory Studio Platform" sequenceNumber="207">
   <locations>
 
     <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner"
includeSource="true" type="InstallableUnit">
@@ -29,10 +29,6 @@
       <unit id="org.apache.servicemix.bundles.xpp3" version="1.1.0.4c_6"/>
       <unit id="net.sf.ehcache" version="${net.sf.ehcache.bundleversion}"/>
 
-      <!-- Logging jars -->
-      <unit id="slf4j.api" version="${org.slf4j.bundleversion}"/>
-      <unit id="log4j.over.slf4j" version="${org.slf4j.bundleversion}"/>
-
       <!-- Commons jars -->
       <unit id="org.apache.commons.collections" version="${org.apache.commons.collections.bundleversion}"/>
       <unit id="org.apache.commons.io" version="${org.apache.commons.io.bundleversion}"/>

Modified: directory/studio/trunk/features/rcp.feature/feature.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/features/rcp.feature/feature.xml?rev=1721235&r1=1721234&r2=1721235&view=diff
==============================================================================
--- directory/studio/trunk/features/rcp.feature/feature.xml (original)
+++ directory/studio/trunk/features/rcp.feature/feature.xml Mon Dec 21 18:58:05 2015
@@ -239,13 +239,6 @@ http://www.apache.org/licenses/
          unpack="false"/>
 
    <plugin
-         id="slf4j.api"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
          id="org.apache.servicemix.bundles.dom4j"
          download-size="0"
          install-size="0"

Modified: directory/studio/trunk/plugins/slf4j-eclipselog/pom-first.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/slf4j-eclipselog/pom-first.xml?rev=1721235&r1=1721234&r2=1721235&view=diff
==============================================================================
--- directory/studio/trunk/plugins/slf4j-eclipselog/pom-first.xml (original)
+++ directory/studio/trunk/plugins/slf4j-eclipselog/pom-first.xml Mon Dec 21 18:58:05 2015
@@ -46,7 +46,7 @@
           <instructions>
             <Bundle-SymbolicName>${project.artifactId};singleton:=true</Bundle-SymbolicName>
             <Bundle-Localization>plugin</Bundle-Localization>
-            <Fragment-Host>slf4j.api;bundle-version="[1.7.10,1.7.11)"</Fragment-Host>
+            <Fragment-Host>org.slf4j.api</Fragment-Host>
             
             <Export-Package>org.slf4j.impl</Export-Package>
             
@@ -54,7 +54,6 @@
             </Import-Package>
             
             <Require-Bundle>
- slf4j.api,
  org.slf4j.api,
  org.eclipse.core.runtime
             </Require-Bundle>

Modified: directory/studio/trunk/tests/test.integration.ui/pom-first.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/tests/test.integration.ui/pom-first.xml?rev=1721235&r1=1721234&r2=1721235&view=diff
==============================================================================
--- directory/studio/trunk/tests/test.integration.ui/pom-first.xml (original)
+++ directory/studio/trunk/tests/test.integration.ui/pom-first.xml Mon Dec 21 18:58:05 2015
@@ -49,7 +49,6 @@
             
             <Require-Bundle>org.junit;bundle-version="4.11.0",
  org.hamcrest.library;bundle-version="1.3.0",
- log4j.over.slf4j;bundle-version="1.7.10",
  org.eclipse.swtbot.eclipse.finder;bundle-version="2.2.1",
  org.eclipse.swtbot.eclipse.core;bundle-version="2.2.1",
  org.eclipse.swtbot.forms.finder;bundle-version="2.2.1",
@@ -106,6 +105,7 @@
  org.apache.commons.io,
  org.apache.commons.codec.digest,
  org.apache.http.conn.ssl,
+ org.apache.log4j,
  org.dom4j,
  org.dom4j.io</Import-Package>
           



Mime
View raw message