sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From romb...@apache.org
Subject svn commit: r1598249 - in /sling/trunk/tooling/ide: ./ eclipse-ui/ eclipse-ui/lib/ vlt-wrapper/ vlt-wrapper/lib/
Date Thu, 29 May 2014 10:33:18 GMT
Author: rombert
Date: Thu May 29 10:33:18 2014
New Revision: 1598249

URL: http://svn.apache.org/r1598249
Log:
SLING-3204 - Remove all jars from SVN

Use the maven-dependency-plugin to pull in dependencies at build time.
This requires a full build to be completed before importing the project
in Eclipse.

Added:
    sling/trunk/tooling/ide/eclipse-ui/lib/.gitignore
    sling/trunk/tooling/ide/vlt-wrapper/lib/.gitignore
Removed:
    sling/trunk/tooling/ide/eclipse-ui/lib/decentxml-1.4.jar
    sling/trunk/tooling/ide/vlt-wrapper/lib/jackrabbit-jcr-client-2.4.0.jar
    sling/trunk/tooling/ide/vlt-wrapper/lib/jackrabbit-jcr-commons-2.4.0.jar
    sling/trunk/tooling/ide/vlt-wrapper/lib/jackrabbit-jcr2spi-2.4.0.jar
    sling/trunk/tooling/ide/vlt-wrapper/lib/jackrabbit-spi-2.4.0.jar
    sling/trunk/tooling/ide/vlt-wrapper/lib/jackrabbit-spi-commons-2.4.0.jar
    sling/trunk/tooling/ide/vlt-wrapper/lib/jackrabbit-spi2dav-2.4.0.jar
    sling/trunk/tooling/ide/vlt-wrapper/lib/jackrabbit-webdav-2.4.0.jar
    sling/trunk/tooling/ide/vlt-wrapper/lib/jcr-2.0.jar
    sling/trunk/tooling/ide/vlt-wrapper/lib/org.apache.jackrabbit.vault-3.0.0.jar
    sling/trunk/tooling/ide/vlt-wrapper/lib/vault-davex-3.0.0.jar
Modified:
    sling/trunk/tooling/ide/README.txt
    sling/trunk/tooling/ide/eclipse-ui/pom.xml
    sling/trunk/tooling/ide/pom.xml
    sling/trunk/tooling/ide/vlt-wrapper/pom.xml

Modified: sling/trunk/tooling/ide/README.txt
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/README.txt?rev=1598249&r1=1598248&r2=1598249&view=diff
==============================================================================
--- sling/trunk/tooling/ide/README.txt (original)
+++ sling/trunk/tooling/ide/README.txt Thu May 29 10:33:18 2014
@@ -17,8 +17,6 @@ to install  the following projects' arti
 
 - The Sling Tooling Support Install bundle, located at
   http://svn.apache.org/viewvc/sling/trunk/tooling/support/install
-- The Jackrabbit FileVault project, located at
-  https://svn.apache.org/repos/asf/jackrabbit/commons/filevault/trunk
 
 For each of these locations, install the Maven artifacts in your local
 Maven repository using the following command:
@@ -46,7 +44,13 @@ How to run the Sling IDE tools in a test
 ---------------------------------------------------------
 
 This howto assumes that you are running Eclipse Kepler with the Plug-In 
-Development Environment and Maven features installed.
+Development Environment and Maven features installed. You should have
+previously built the projects using
+
+    mvn package
+
+to ensure that Maven artifacts which are not available on p2 update sites are
+included in the workspace.
 
 To start with, import all the projects in Eclipse as Maven projects. Eclipse
 might prompt you to install an additional m2eclipse configurator for PDE

Added: sling/trunk/tooling/ide/eclipse-ui/lib/.gitignore
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-ui/lib/.gitignore?rev=1598249&view=auto
==============================================================================
--- sling/trunk/tooling/ide/eclipse-ui/lib/.gitignore (added)
+++ sling/trunk/tooling/ide/eclipse-ui/lib/.gitignore Thu May 29 10:33:18 2014
@@ -0,0 +1 @@
+*.jar
\ No newline at end of file

Modified: sling/trunk/tooling/ide/eclipse-ui/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-ui/pom.xml?rev=1598249&r1=1598248&r2=1598249&view=diff
==============================================================================
--- sling/trunk/tooling/ide/eclipse-ui/pom.xml (original)
+++ sling/trunk/tooling/ide/eclipse-ui/pom.xml Thu May 29 10:33:18 2014
@@ -10,7 +10,8 @@
   <artifactId>org.apache.sling.ide.eclipse-ui</artifactId>
   <packaging>eclipse-plugin</packaging>
   <name>Sling IDE Tools: Eclipse UI</name>
-<build>
+
+  <build>
     <resources>
       <resource>
         <directory>src/main/java</directory>
@@ -19,4 +20,29 @@
         </excludes>
       </resource>
     </resources>
-</build></project>
+
+    <plugins>
+        <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-dependency-plugin</artifactId>
+            <configuration>
+                <artifactItems>
+                    <artifactItem>
+                        <groupId>de.pdark</groupId>
+                        <artifactId>decentxml</artifactId>
+                        <version>1.4</version>
+                    </artifactItem>                           
+                </artifactItems>
+                <outputDirectory>lib</outputDirectory>
+            </configuration>
+            <executions>
+                <execution>
+                    <goals>
+                        <goal>copy</goal>
+                    </goals>
+                </execution>
+            </executions>
+        </plugin>
+    </plugins>
+  </build>
+</project>

Modified: sling/trunk/tooling/ide/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/pom.xml?rev=1598249&r1=1598248&r2=1598249&view=diff
==============================================================================
--- sling/trunk/tooling/ide/pom.xml (original)
+++ sling/trunk/tooling/ide/pom.xml Thu May 29 10:33:18 2014
@@ -78,6 +78,40 @@
                       <target>1.6</target>
                     </configuration>
                 </plugin>
+                <!--This plugin's configuration is used to store Eclipse m2e settings
only. It has no influence on the Maven build itself.-->
+                <!--
+                    We embed some bundles that are not available on p2 update sites. To make
the build seamless, we copy them early in the process.
+                 -->
+                <plugin>
+                    <groupId>org.eclipse.m2e</groupId>
+                    <artifactId>lifecycle-mapping</artifactId>
+                    <version>1.0.0</version>
+                    <configuration>
+                        <lifecycleMappingMetadata>
+                            <pluginExecutions>
+                                <pluginExecution>
+                                    <pluginExecutionFilter>
+                                        <groupId>
+                                            org.apache.maven.plugins
+                                        </groupId>
+                                        <artifactId>
+                                            maven-dependency-plugin
+                                        </artifactId>
+                                        <versionRange>
+                                            [2.8,)
+                                        </versionRange>
+                                        <goals>
+                                            <goal>copy</goal>
+                                        </goals>
+                                    </pluginExecutionFilter>
+                                    <action>
+                                        <ignore></ignore>
+                                    </action>
+                                </pluginExecution>
+                            </pluginExecutions>
+                        </lifecycleMappingMetadata>
+                    </configuration>
+                </plugin>
             </plugins>
         </pluginManagement>
 	</build>

Added: sling/trunk/tooling/ide/vlt-wrapper/lib/.gitignore
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/vlt-wrapper/lib/.gitignore?rev=1598249&view=auto
==============================================================================
--- sling/trunk/tooling/ide/vlt-wrapper/lib/.gitignore (added)
+++ sling/trunk/tooling/ide/vlt-wrapper/lib/.gitignore Thu May 29 10:33:18 2014
@@ -0,0 +1 @@
+*.jar
\ No newline at end of file

Modified: sling/trunk/tooling/ide/vlt-wrapper/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/vlt-wrapper/pom.xml?rev=1598249&r1=1598248&r2=1598249&view=diff
==============================================================================
--- sling/trunk/tooling/ide/vlt-wrapper/pom.xml (original)
+++ sling/trunk/tooling/ide/vlt-wrapper/pom.xml Thu May 29 10:33:18 2014
@@ -11,99 +11,85 @@
   <packaging>eclipse-plugin</packaging>
   <name>Sling IDE Tools: FileVault wrapper</name>
 
-    <profiles>
-        <profile>
-            <id>refresh-embedded-deps</id>
-            <!-- 
-                We embed most dependencies required by vlt since they are not available in
a p2 repo
-                To refresh them, execute
-                mvn -pl vlt-wrapper -Prefresh-embedded-deps dependency:copy
-                
-                Those dependencies which are available as bundles ( commons-collections,
commons-httpclient etc )
-                need to be managed using the bundle's manifest.
-                  
-            -->
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-dependency-plugin</artifactId>
-                        <configuration>
-                            <artifactItems>
-                                <!-- START JCR dependencies -->
-                                <artifactItem>
-                                    <groupId>javax.jcr</groupId>
-                                    <artifactId>jcr</artifactId>
-                                    <version>2.0</version>
-                                </artifactItem>
-                                <!-- END JCR dependencies -->
-                                                            
-                                <!-- START Apache Jackrabbit dependencies -->
-                                <artifactItem>
-                                    <groupId>org.apache.jackrabbit</groupId>
-                                    <artifactId>jackrabbit-webdav</artifactId>
-                                    <version>${jackrabbit.version}</version>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>org.apache.jackrabbit</groupId>
-                                    <artifactId>jackrabbit-spi-commons</artifactId>
-                                    <version>${jackrabbit.version}</version>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>org.apache.jackrabbit</groupId>
-                                    <artifactId>jackrabbit-jcr-commons</artifactId>
-                                    <version>${jackrabbit.version}</version>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>org.apache.jackrabbit</groupId>
-                                    <artifactId>jackrabbit-jcr2spi</artifactId>
-                                    <version>${jackrabbit.version}</version>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>org.apache.jackrabbit</groupId>
-                                    <artifactId>jackrabbit-jcr-client</artifactId>
-                                    <version>${jackrabbit.version}</version>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>org.apache.jackrabbit</groupId>
-                                    <artifactId>jackrabbit-spi</artifactId>
-                                    <version>${jackrabbit.version}</version>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>org.apache.jackrabbit</groupId>
-                                    <artifactId>jackrabbit-spi2dav</artifactId>
-                                    <version>${jackrabbit.version}</version>
-                                </artifactItem>
-                                <!-- END Apache Jackrabbit dependencies -->
-                                
-                                <!-- START Apache Jackrabbit FileVault dependencies -->
-                                <artifactItem>
-                                    <groupId>org.apache.jackrabbit.vault</groupId>
-                                    <artifactId>vault-davex</artifactId>
-                                    <version>${vault.version}</version>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>org.apache.jackrabbit.vault</groupId>
-                                    <artifactId>org.apache.jackrabbit.vault</artifactId>
-                                    <version>${vault.version}</version>
-                                </artifactItem>
-                                <!-- END Apache Jackrabbit FileVault dependencies -->
                               
-                                
-                            </artifactItems>
-                            <outputDirectory>lib</outputDirectory>
-                        </configuration>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>copy</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <configuration>
+                    <artifactItems>
+                        <!-- START JCR dependencies -->
+                        <artifactItem>
+                            <groupId>javax.jcr</groupId>
+                            <artifactId>jcr</artifactId>
+                            <version>2.0</version>
+                        </artifactItem>
+                        <!-- END JCR dependencies -->
+                                                    
+                        <!-- START Apache Jackrabbit dependencies -->
+                        <artifactItem>
+                            <groupId>org.apache.jackrabbit</groupId>
+                            <artifactId>jackrabbit-webdav</artifactId>
+                            <version>${jackrabbit.version}</version>
+                        </artifactItem>
+                        <artifactItem>
+                            <groupId>org.apache.jackrabbit</groupId>
+                            <artifactId>jackrabbit-spi-commons</artifactId>
+                            <version>${jackrabbit.version}</version>
+                        </artifactItem>
+                        <artifactItem>
+                            <groupId>org.apache.jackrabbit</groupId>
+                            <artifactId>jackrabbit-jcr-commons</artifactId>
+                            <version>${jackrabbit.version}</version>
+                        </artifactItem>
+                        <artifactItem>
+                            <groupId>org.apache.jackrabbit</groupId>
+                            <artifactId>jackrabbit-jcr2spi</artifactId>
+                            <version>${jackrabbit.version}</version>
+                        </artifactItem>
+                        <artifactItem>
+                            <groupId>org.apache.jackrabbit</groupId>
+                            <artifactId>jackrabbit-jcr-client</artifactId>
+                            <version>${jackrabbit.version}</version>
+                        </artifactItem>
+                        <artifactItem>
+                            <groupId>org.apache.jackrabbit</groupId>
+                            <artifactId>jackrabbit-spi</artifactId>
+                            <version>${jackrabbit.version}</version>
+                        </artifactItem>
+                        <artifactItem>
+                            <groupId>org.apache.jackrabbit</groupId>
+                            <artifactId>jackrabbit-spi2dav</artifactId>
+                            <version>${jackrabbit.version}</version>
+                        </artifactItem>
+                        <!-- END Apache Jackrabbit dependencies -->
+                        
+                        <!-- START Apache Jackrabbit FileVault dependencies -->
+                        <artifactItem>
+                            <groupId>org.apache.jackrabbit.vault</groupId>
+                            <artifactId>vault-davex</artifactId>
+                            <version>${vault.version}</version>
+                        </artifactItem>
+                        <artifactItem>
+                            <groupId>org.apache.jackrabbit.vault</groupId>
+                            <artifactId>org.apache.jackrabbit.vault</artifactId>
+                            <version>${vault.version}</version>
+                        </artifactItem>
+                        <!-- END Apache Jackrabbit FileVault dependencies -->     
                          
+                        
+                    </artifactItems>
+                    <outputDirectory>lib</outputDirectory>
+                </configuration>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>copy</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
 
     <properties>
         <jackrabbit.version>2.4.0</jackrabbit.version>



Mime
View raw message