Merge branch 'pr-126'

Use archived orbit site #126

Author: adangel

ReleaseNotes.md

@@ -16,6 +16,7 @@ This is a minor release.
 ### Fixed Issues
 
 *   [#123](https://github.com/pmd/pmd-eclipse-plugin/pull/123): Support external configuration changes
+*   [#124](https://github.com/pmd/pmd-eclipse-plugin/issues/124): No repository found containing: osgi.bundle,org.slf4j.log4j,1.7.2.v20130115-1340
 
 ### API Changes
 

kepler/kepler.target

@@ -8,9 +8,7 @@
             <unit id="org.eclipse.wst.xml_core.feature.feature.group" version="3.5.2.v201401062113-7C7OFvVF7RZHQXIlNxNyPh"/>
         </location>
         <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-            <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20140114142710/repository/"/>
-            <unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
-            <unit id="org.apache.log4j.source" version="1.2.15.v201012070815"/>
+            <repository location="https://archive.eclipse.org/tools/orbit/downloads/drops/R20140114142710/repository/"/>
             <unit id="org.apache.commons.io" version="2.0.1.v201105210651"/>
             <unit id="org.apache.commons.io.source" version="2.0.1.v201105210651"/>
             <unit id="org.apache.commons.lang" version="2.6.0.v201205030909"/>
@@ -23,6 +21,8 @@
             <unit id="ch.qos.logback.slf4j.source" version="1.0.7.v20121108-1250"/>
             <unit id="org.slf4j.jul" version="1.7.2.v20121108-1250"/>
             <unit id="org.slf4j.jul.source" version="1.7.2.v20121108-1250"/>
+            <unit id="org.slf4j.log4j" version="1.7.2.v20130115-1340"/>
+            <unit id="org.slf4j.log4j.source" version="1.7.2.v20130115-1340"/>
         </location>
     </locations>
     <targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>

net.sourceforge.pmd.eclipse.p2updatesite/category.xml

@@ -8,5 +8,5 @@
          PMD Plugin for Eclipse
       </description>
    </category-def>
-   <repository-reference location="http://download.eclipse.org/tools/orbit/downloads/drops/R20140114142710/repository/" enabled="true" />
+   <repository-reference location="https://archive.eclipse.org/tools/orbit/downloads/drops/R20140114142710/repository/" enabled="true" />
 </site>

net.sourceforge.pmd.eclipse/feature.xml

@@ -38,4 +38,20 @@
          install-size="0"
          version="4.14.0.qualifier"/>
 
+   <!--
+     org.slf4j.log4j is included for convenience, so that it doesn't need to be fetched from orbit.
+     Adding it here will add it to the update site of pmd-eclipse-plugin.
+     
+     In newer eclipse installations, slf4j and logback itself is already installed, only this old log4j
+     dependency is needed.
+     
+     Note: log4j is only needed to provide compatibility, see https://github.com/pmd/pmd-eclipse-plugin/pull/112
+   -->
+   <plugin
+         id="org.slf4j.log4j"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
 </feature>

pom.xml

@@ -26,7 +26,7 @@
     <checkstyle.version>8.30</checkstyle.version>
     <checkstyle.plugin.version>3.1.1</checkstyle.plugin.version>
 
-    <updatesite.orbit>http://download.eclipse.org/tools/orbit/downloads/drops/${orbit.version}/repository/</updatesite.orbit>
+    <updatesite.orbit>https://archive.eclipse.org/tools/orbit/downloads/drops/${orbit.version}/repository/</updatesite.orbit>
   </properties>
 
   <repositories>
@@ -237,6 +237,31 @@
             </sourceDirectories>
           </configuration>
         </plugin>
+        <!--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.maven.plugins</groupId>
+                    <artifactId>maven-dependency-plugin</artifactId>
+                    <versionRange>[2.7,)</versionRange>
+                    <goals>
+                      <goal>unpack</goal>
+                    </goals>
+                  </pluginExecutionFilter>
+                  <action>
+                    <ignore></ignore>
+                  </action>
+                </pluginExecution>
+              </pluginExecutions>
+            </lifecycleMappingMetadata>
+          </configuration>
+        </plugin>
       </plugins>
     </pluginManagement>
   </build>