You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by se...@apache.org on 2014/09/14 21:25:18 UTC
svn commit: r1624898 [1/2] - in /directory/studio/branches/studio-tycho:
plugins/common.core/pom.xml plugins/pom.xml pom.xml
Author: seelmann
Date: Sun Sep 14 19:25:18 2014
New Revision: 1624898
URL: http://svn.apache.org/r1624898
Log:
Disable everyting in root pom, enable only commons.core plugin
Modified:
directory/studio/branches/studio-tycho/plugins/common.core/pom.xml
directory/studio/branches/studio-tycho/plugins/pom.xml
directory/studio/branches/studio-tycho/pom.xml
Modified: directory/studio/branches/studio-tycho/plugins/common.core/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-tycho/plugins/common.core/pom.xml?rev=1624898&r1=1624897&r2=1624898&view=diff
==============================================================================
--- directory/studio/branches/studio-tycho/plugins/common.core/pom.xml (original)
+++ directory/studio/branches/studio-tycho/plugins/common.core/pom.xml Sun Sep 14 19:25:18 2014
@@ -6,9 +6,9 @@
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.
@@ -24,6 +24,7 @@
<groupId>org.apache.directory.studio</groupId>
<artifactId>parent-plugins</artifactId>
<version>2.0.0-SNAPSHOT</version>
+ <relativePath>../</relativePath>
</parent>
<artifactId>common.core</artifactId>
@@ -31,134 +32,134 @@
<packaging>jar</packaging>
<description />
-
- <build>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- </resource>
- <resource>
- <directory>src/main/java</directory>
- <includes>
- <include>**/*.properties</include>
- </includes>
- </resource>
- </resources>
- <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>
- <additionalProjects>
- <project>org.apache.directory.studio.connection.core</project>
- </additionalProjects>
- <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>
+
+<!-- <build> -->
+<!-- <resources> -->
+<!-- <resource> -->
+<!-- <directory>src/main/resources</directory> -->
+<!-- </resource> -->
+<!-- <resource> -->
+<!-- <directory>src/main/java</directory> -->
+<!-- <includes> -->
+<!-- <include>**/*.properties</include> -->
+<!-- </includes> -->
+<!-- </resource> -->
+<!-- </resources> -->
+<!-- <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> -->
+<!-- <additionalProjects> -->
+<!-- <project>org.apache.directory.studio.connection.core</project> -->
+<!-- </additionalProjects> -->
+<!-- <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>${project.groupId}.${project.artifactId};singleton:=true</Bundle-SymbolicName>
- <Eclipse-RegisterBuddy>org.apache.logging.log4j</Eclipse-RegisterBuddy>
- <Bundle-Localization>plugin</Bundle-Localization>
- <Eclipse-LazyStart>true</Eclipse-LazyStart>
- <Require-Bundle>org.apache.commons.lang;bundle-version="${org.apache.commons.lang.version}",
- org.apache.logging.log4j;bundle-version="${org.apache.logging.log4j.version}",
- org.eclipse.core.runtime</Require-Bundle>
- <Export-Package>org.apache.directory.studio.*</Export-Package>
- <Import-Package>!</Import-Package>
- <Private-Package>!</Private-Package>
- </instructions>
- </configuration>
- <executions>
- <execution>
- <id>generate-manifest</id>
- <phase>process-classes</phase>
- <goals>
- <goal>manifest</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
+<!-- <plugin> -->
+<!-- <groupId>org.apache.felix</groupId> -->
+<!-- <artifactId>maven-bundle-plugin</artifactId> -->
+<!-- <extensions>true</extensions> -->
+<!-- <configuration> -->
+<!-- <manifestLocation>META-INF</manifestLocation> -->
+<!-- <instructions> -->
+<!-- <Bundle-SymbolicName>${project.groupId}.${project.artifactId};singleton:=true</Bundle-SymbolicName> -->
+<!-- <Eclipse-RegisterBuddy>org.apache.logging.log4j</Eclipse-RegisterBuddy> -->
+<!-- <Bundle-Localization>plugin</Bundle-Localization> -->
+<!-- <Eclipse-LazyStart>true</Eclipse-LazyStart> -->
+<!-- <Require-Bundle>org.apache.commons.lang;bundle-version="${org.apache.commons.lang.version}", -->
+<!-- org.apache.logging.log4j;bundle-version="${org.apache.logging.log4j.version}", -->
+<!-- org.eclipse.core.runtime</Require-Bundle> -->
+<!-- <Export-Package>org.apache.directory.studio.*</Export-Package> -->
+<!-- <Import-Package>!</Import-Package> -->
+<!-- <Private-Package>!</Private-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>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
- </plugins>
- </build>
+<!-- <plugin> -->
+<!-- <groupId>org.apache.maven.plugins</groupId> -->
+<!-- <artifactId>maven-surefire-plugin</artifactId> -->
+<!-- <configuration> -->
+<!-- <skip>true</skip> -->
+<!-- </configuration> -->
+<!-- </plugin> -->
+<!-- </plugins> -->
+<!-- </build> -->
- <dependencies>
+<!-- <dependencies> -->
<!-- Apache Directory Studio library plugins dependencies -->
- <dependency>
- <groupId>org.apache.directory.studio</groupId>
- <artifactId>org.apache.commons.lang</artifactId>
- <scope>provided</scope>
- </dependency>
-
+<!-- <dependency> -->
+<!-- <groupId>org.apache.directory.studio</groupId> -->
+<!-- <artifactId>org.apache.commons.lang</artifactId> -->
+<!-- <scope>provided</scope> -->
+<!-- </dependency> -->
+
<!-- Eclipse plugins dependencies -->
- <dependency>
- <groupId>org.eclipse.core</groupId>
- <artifactId>runtime</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse</groupId>
- <artifactId>osgi</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.core</groupId>
- <artifactId>jobs</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.equinox</groupId>
- <artifactId>common</artifactId>
- <scope>provided</scope>
- </dependency>
- </dependencies>
+<!-- <dependency> -->
+<!-- <groupId>org.eclipse.core</groupId> -->
+<!-- <artifactId>runtime</artifactId> -->
+<!-- <scope>provided</scope> -->
+<!-- </dependency> -->
+<!-- <dependency> -->
+<!-- <groupId>org.eclipse</groupId> -->
+<!-- <artifactId>osgi</artifactId> -->
+<!-- <scope>provided</scope> -->
+<!-- </dependency> -->
+<!-- <dependency> -->
+<!-- <groupId>org.eclipse.core</groupId> -->
+<!-- <artifactId>jobs</artifactId> -->
+<!-- <scope>provided</scope> -->
+<!-- </dependency> -->
+<!-- <dependency> -->
+<!-- <groupId>org.eclipse.equinox</groupId> -->
+<!-- <artifactId>common</artifactId> -->
+<!-- <scope>provided</scope> -->
+<!-- </dependency> -->
+<!-- </dependencies> -->
</project>
\ No newline at end of file
Modified: directory/studio/branches/studio-tycho/plugins/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-tycho/plugins/pom.xml?rev=1624898&r1=1624897&r2=1624898&view=diff
==============================================================================
--- directory/studio/branches/studio-tycho/plugins/pom.xml (original)
+++ directory/studio/branches/studio-tycho/plugins/pom.xml Sun Sep 14 19:25:18 2014
@@ -6,9 +6,9 @@
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.
@@ -25,83 +25,83 @@
<artifactId>parent</artifactId>
<version>2.0.0-SNAPSHOT</version>
</parent>
-
+
<artifactId>parent-plugins</artifactId>
<name>Apache Directory Studio Plugins</name>
<packaging>pom</packaging>
<modules>
- <module>aciitemeditor</module>
- <module>apacheds-launcher</module>
- <module>apacheds.configuration</module>
- <module>apacheds.configuration.v2</module>
+<!-- <module>aciitemeditor</module> -->
+<!-- <module>apacheds-launcher</module> -->
+<!-- <module>apacheds.configuration</module> -->
+<!-- <module>apacheds.configuration.v2</module> -->
<module>common.core</module>
- <module>common.ui</module>
- <module>connection.core</module>
- <module>connection.ui</module>
- <module>ldapbrowser.core</module>
- <module>ldapbrowser.common</module>
- <module>ldapbrowser.ui</module>
- <module>ldapservers</module>
- <module>ldapservers.apacheds.v153</module>
- <module>ldapservers.apacheds.v154</module>
- <module>ldapservers.apacheds.v155</module>
- <module>ldapservers.apacheds.v156</module>
- <module>ldapservers.apacheds.v157</module>
- <module>ldapservers.apacheds.v200</module>
- <module>ldifeditor</module>
- <module>ldifparser</module>
- <module>rcp</module>
- <module>schemaeditor</module>
- <module>valueeditors</module>
+<!-- <module>common.ui</module> -->
+<!-- <module>connection.core</module> -->
+<!-- <module>connection.ui</module> -->
+<!-- <module>ldapbrowser.core</module> -->
+<!-- <module>ldapbrowser.common</module> -->
+<!-- <module>ldapbrowser.ui</module> -->
+<!-- <module>ldapservers</module> -->
+<!-- <module>ldapservers.apacheds.v153</module> -->
+<!-- <module>ldapservers.apacheds.v154</module> -->
+<!-- <module>ldapservers.apacheds.v155</module> -->
+<!-- <module>ldapservers.apacheds.v156</module> -->
+<!-- <module>ldapservers.apacheds.v157</module> -->
+<!-- <module>ldapservers.apacheds.v200</module> -->
+<!-- <module>ldifeditor</module> -->
+<!-- <module>ldifparser</module> -->
+<!-- <module>rcp</module> -->
+<!-- <module>schemaeditor</module> -->
+<!-- <module>valueeditors</module> -->
</modules>
-
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <configuration>
- <excludeSubProjects>false</excludeSubProjects>
- <excludes>
+
+<!-- <build> -->
+<!-- <pluginManagement> -->
+<!-- <plugins> -->
+<!-- <plugin> -->
+<!-- <groupId>org.apache.rat</groupId> -->
+<!-- <artifactId>apache-rat-plugin</artifactId> -->
+<!-- <configuration> -->
+<!-- <excludeSubProjects>false</excludeSubProjects> -->
+<!-- <excludes> -->
<!-- MAVEN_DEFAULT_EXCLUDES -->
- <exclude>**/target/**/*</exclude>
- <exclude>**/cobertura.ser</exclude>
+<!-- <exclude>**/target/**/*</exclude> -->
+<!-- <exclude>**/cobertura.ser</exclude> -->
<!-- ECLIPSE_DEFAULT_EXCLUDES -->
- <exclude>**/.classpath</exclude>
- <exclude>**/.project</exclude>
- <exclude>**/.settings/**/*</exclude>
+<!-- <exclude>**/.classpath</exclude> -->
+<!-- <exclude>**/.project</exclude> -->
+<!-- <exclude>**/.settings/**/*</exclude> -->
<!-- IDEA_DEFAULT_EXCLUDES -->
- <exclude>**/*.iml</exclude>
- <exclude>**/*.ipr</exclude>
- <exclude>**/*.iws</exclude>
+<!-- <exclude>**/*.iml</exclude> -->
+<!-- <exclude>**/*.ipr</exclude> -->
+<!-- <exclude>**/*.iws</exclude> -->
<!-- MANIFEST_MF_EXCLUDES -->
- <exclude>**/MANIFEST.MF</exclude>
+<!-- <exclude>**/MANIFEST.MF</exclude> -->
<!-- Missing license header in dependency reduced pom, see http://jira.codehaus.org/browse/MSHADE-48 -->
- <exclude>**/dependency-reduced-pom.xml</exclude>
+<!-- <exclude>**/dependency-reduced-pom.xml</exclude> -->
<!-- GITIGNORE_EXCLUDES -->
- <exclude>**/.gitignore</exclude>
+<!-- <exclude>**/.gitignore</exclude> -->
<!-- ABOUT_EXCLUDES -->
- <exclude>**/about.ini</exclude>
- <exclude>**/about_files/*</exclude>
+<!-- <exclude>**/about.ini</exclude> -->
+<!-- <exclude>**/about_files/*</exclude> -->
<!-- LOG_FILES_EXCLUDES -->
- <exclude>**/*.log</exclude>
- <exclude>**/*.vm</exclude>
+<!-- <exclude>**/*.log</exclude> -->
+<!-- <exclude>**/*.vm</exclude> -->
<!-- OTHER_EXCLUDES -->
- <exclude>apacheds.configuration/src/main/resources/org/apache/directory/studio/apacheds/configuration/spring-beans.dtd</exclude>
- <exclude>apacheds.configuration.v2/src/main/resources/org/apache/directory/studio/apacheds/configuration/v2/config.ldif</exclude>
- <exclude>common.ui/src/main/java/org/apache/directory/studio/common/ui/filesystem/PathEditorInput.java</exclude>
- <exclude>ldapbrowser.core/src/main/resources/default_schema.ldif</exclude>
- <exclude>rcp/resources/icons/linux/studio.xpm</exclude>
- <exclude>schemaeditor/resources/schemas/openldap/*.xml</exclude>
- <exclude>**/*.launch</exclude>
- <exclude>**/maven-eclipse.xml</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
-
+<!-- <exclude>apacheds.configuration/src/main/resources/org/apache/directory/studio/apacheds/configuration/spring-beans.dtd</exclude> -->
+<!-- <exclude>apacheds.configuration.v2/src/main/resources/org/apache/directory/studio/apacheds/configuration/v2/config.ldif</exclude> -->
+<!-- <exclude>common.ui/src/main/java/org/apache/directory/studio/common/ui/filesystem/PathEditorInput.java</exclude> -->
+<!-- <exclude>ldapbrowser.core/src/main/resources/default_schema.ldif</exclude> -->
+<!-- <exclude>rcp/resources/icons/linux/studio.xpm</exclude> -->
+<!-- <exclude>schemaeditor/resources/schemas/openldap/*.xml</exclude> -->
+<!-- <exclude>**/*.launch</exclude> -->
+<!-- <exclude>**/maven-eclipse.xml</exclude> -->
+<!-- </excludes> -->
+<!-- </configuration> -->
+<!-- </plugin> -->
+<!-- </plugins> -->
+<!-- </pluginManagement> -->
+<!-- </build> -->
+
</project>