You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stanbol.apache.org by fl...@apache.org on 2011/12/27 16:37:14 UTC

svn commit: r1224927 - in /incubator/stanbol/trunk: commons/jobs/pom.xml parent/pom.xml releasing/framework/stanbol-framework-source-release-assembly-descriptor/pom.xml

Author: florent
Date: Tue Dec 27 15:37:14 2011
New Revision: 1224927

URL: http://svn.apache.org/viewvc?rev=1224927&view=rev
Log:
Revert "fix typo in scm url"

This reverts commit 03a38b1414dfd432383864113745d4266d1a4227.

Modified:
    incubator/stanbol/trunk/commons/jobs/pom.xml
    incubator/stanbol/trunk/parent/pom.xml
    incubator/stanbol/trunk/releasing/framework/stanbol-framework-source-release-assembly-descriptor/pom.xml

Modified: incubator/stanbol/trunk/commons/jobs/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/commons/jobs/pom.xml?rev=1224927&r1=1224926&r2=1224927&view=diff
==============================================================================
--- incubator/stanbol/trunk/commons/jobs/pom.xml (original)
+++ incubator/stanbol/trunk/commons/jobs/pom.xml Tue Dec 27 15:37:14 2011
@@ -27,10 +27,10 @@
   <name>Apache Stanbol Commons Jobs Reactor</name>
   <scm>
     <connection>
-      scm:svn:http://svn.apache.org/repos/asf/incubator/stanbol/trunk/commons/jobs
+      scm:svn:http://svn.apache.org/repos/asf/incubator/stanbol/trunk/commons/solr
     </connection>
     <developerConnection>
-      scm:svn:https://svn.apache.org/repos/asf/incubator/stanbol/trunk/commons/jobs
+      scm:svn:https://svn.apache.org/repos/asf/incubator/stanbol/trunk/commons/solr
     </developerConnection>
     <url>http://incubator.apache.org/stanbol/</url>
   </scm>
@@ -39,4 +39,4 @@
     <module>api</module>
     <module>web</module>
   </modules>
-</project>
+</project>
\ No newline at end of file

Modified: incubator/stanbol/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/parent/pom.xml?rev=1224927&r1=1224926&r2=1224927&view=diff
==============================================================================
--- incubator/stanbol/trunk/parent/pom.xml (original)
+++ incubator/stanbol/trunk/parent/pom.xml Tue Dec 27 15:37:14 2011
@@ -256,117 +256,6 @@
             </execution>
           </executions>
         </plugin>
-	<!-- workaround find from : https://issues.apache.org/jira/browse/SLING-2164b-->
-	<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
-        <plugin>
-          <groupId>org.eclipse.m2e</groupId>
-          <artifactId>lifecycle-mapping</artifactId>
-          <version>1.0.0</version>
-          <configuration>
-            <lifecycleMappingMetadata>
-              <pluginExecutions>
-		<pluginExecution>
-                  <pluginExecutionFilter>
-                    <groupId>org.apache.servicemix.tooling</groupId>
-                    <artifactId>depends-maven-plugin</artifactId>
-                    <versionRange>[1.0,)</versionRange>
-                    <goals>
-                      <goal>generate-depends-file</goal>
-                    </goals>
-                  </pluginExecutionFilter>
-                  <action>
-                    <execute />
-                  </action>
-                </pluginExecution>
-		<pluginExecution>
-                  <pluginExecutionFilter>
-                    <groupId>org.apache.felix</groupId>
-                    <artifactId>maven-scr-plugin</artifactId>
-                    <versionRange>[1.4.4,)</versionRange>
-                    <goals>
-                      <goal>scr</goal>
-                    </goals>
-                  </pluginExecutionFilter>
-                  <action>
-                    <!-- <execute /> -->
-	<!-- ignore as it cause error in eclipse when imported -->
-					<ignore />
-                  </action>
-                </pluginExecution>
-                <pluginExecution>
-                  <pluginExecutionFilter>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-antrun-plugin</artifactId>
-                    <versionRange>[1.3,)</versionRange>
-                    <goals>
-                      <goal>run</goal>
-                    </goals>
-                  </pluginExecutionFilter>
-                  <action>
-                    <execute />
-                  </action>
-                </pluginExecution>
-                <pluginExecution>
-                  <pluginExecutionFilter>
-                    <groupId>org.codehaus.groovy.maven</groupId>
-                    <artifactId>gmaven-plugin</artifactId>
-                    <versionRange>[1.0,)</versionRange>
-                    <goals>
-                      <goal>compile</goal>
-                      <goal>testCompile</goal>
-                      <goal>execute</goal>
-                    </goals>
-                  </pluginExecutionFilter>
-                  <action>
-                    <ignore />
-                  </action>
-                </pluginExecution>
-                <pluginExecution>
-                  <pluginExecutionFilter>
-                    <groupId>org.codehaus.mojo</groupId>
-                    <artifactId>build-helper-maven-plugin</artifactId>
-                    <versionRange>[1.5,)</versionRange>
-                    <goals>
-                      <goal>reserve-network-port</goal>
-                    </goals>
-                  </pluginExecutionFilter>
-                  <action>
-                    <ignore />
-                  </action>
-                </pluginExecution>
-                <pluginExecution>
-                  <pluginExecutionFilter>
-                    <groupId>org.apache.sling</groupId>
-                    <artifactId>maven-launchpad-plugin</artifactId>
-                    <versionRange>[2.0.10,)</versionRange>
-                    <goals>
-                      <goal>prepare-package</goal>
-                    </goals>
-                  </pluginExecutionFilter>
-                  <action>
-                    <ignore />
-                  </action>
-                </pluginExecution>
-		<!-- compilation errors when eclipse open -->
-		<pluginExecution>
-                  <pluginExecutionFilter>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-dependency-plugin</artifactId>
-                    <versionRange>[2.1,)</versionRange>
-                    <goals>
-                      <goal>copy-dependencies</goal>
-                    </goals>
-                  </pluginExecutionFilter>
-                  <action>
-<!--                     <execute /> -->
-	<!-- ignore as it cause error in eclipse when imported -->
-					<ignore />
-                  </action>
-                </pluginExecution>
-              </pluginExecutions>
-            </lifecycleMappingMetadata>
-          </configuration>
-        </plugin>
       </plugins>
     </pluginManagement>
   </build>
@@ -1674,7 +1563,7 @@
               </dependency>
             </dependencies>
           </plugin>
-        </plugins>	
+        </plugins>
       </build>
     </profile>
   </profiles>

Modified: incubator/stanbol/trunk/releasing/framework/stanbol-framework-source-release-assembly-descriptor/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/releasing/framework/stanbol-framework-source-release-assembly-descriptor/pom.xml?rev=1224927&r1=1224926&r2=1224927&view=diff
==============================================================================
--- incubator/stanbol/trunk/releasing/framework/stanbol-framework-source-release-assembly-descriptor/pom.xml (original)
+++ incubator/stanbol/trunk/releasing/framework/stanbol-framework-source-release-assembly-descriptor/pom.xml Tue Dec 27 15:37:14 2011
@@ -43,46 +43,4 @@ under the License.
     <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/stanbol/trunk/release/apache-stanbol-framework-source-release-assembly-descriptor</developerConnection>
     <url>http://incubator.apache.org/stanbol</url>
   </scm>
-
-    <!-- workaround find from : https://issues.apache.org/jira/browse/SLING-2164b-->
-    <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
-    <build>
-      <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-resources-plugin</artifactId>
-        <version>2.5</version>
-      </plugin>
-    </plugins>
-
-      <pluginManagement>
-    	<plugins>
-          <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-remote-resources-plugin</artifactId>
-                      <versionRange>[1.0,)</versionRange>
-                      <goals>
-   						<goal>bundle</goal>
-                      </goals>
-                    </pluginExecutionFilter>
-                    <action>
-                      <execute />
-                    </action>
-                  </pluginExecution>
-                </pluginExecutions>
-              </lifecycleMappingMetadata>
-            </configuration>
-          </plugin>
-    	</plugins>
-      </pluginManagement>
-    </build>
-    
 </project>