Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Piggott2011-03-25 17:38:00 -0400
committerMatthew Piggott2011-03-25 17:38:00 -0400
commitd6c033b85da91aaefcde022e20438f8d96898339 (patch)
treea3d2fff2600ceeb170a9779db2e5cb854800480a /org.eclipse.m2e.discovery-directory
parentb435d7b6c59c0160473d58513fa6f9b5dd473097 (diff)
downloadm2e-core-d6c033b85da91aaefcde022e20438f8d96898339.tar.gz
m2e-core-d6c033b85da91aaefcde022e20438f8d96898339.tar.xz
m2e-core-d6c033b85da91aaefcde022e20438f8d96898339.zip
Revert "Change discovery to use versioned URL"
Diffstat (limited to 'org.eclipse.m2e.discovery-directory')
-rw-r--r--org.eclipse.m2e.discovery-directory/.gitignore1
-rw-r--r--org.eclipse.m2e.discovery-directory/directory.xml2
-rw-r--r--org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery-parent/pom.xml1
-rw-r--r--org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery.oss/pom.xml2
-rw-r--r--org.eclipse.m2e.discovery-directory/pom.xml30
5 files changed, 4 insertions, 32 deletions
diff --git a/org.eclipse.m2e.discovery-directory/.gitignore b/org.eclipse.m2e.discovery-directory/.gitignore
deleted file mode 100644
index ea8c4bf7..00000000
--- a/org.eclipse.m2e.discovery-directory/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/target
diff --git a/org.eclipse.m2e.discovery-directory/directory.xml b/org.eclipse.m2e.discovery-directory/directory.xml
index dbcdd94a..47e0d65e 100644
--- a/org.eclipse.m2e.discovery-directory/directory.xml
+++ b/org.eclipse.m2e.discovery-directory/directory.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<directory xmlns="http://www.eclipse.org/mylyn/discovery/directory/">
- <entry url="http://download.eclipse.org/technology/m2e/discovery/${m2e-version}/org.eclipse.m2e.discovery.oss/org.eclipse.m2e.discovery.oss-1.0.0-SNAPSHOT.jar" permitCategories="true"/>
+ <entry url="http://download.eclipse.org/technology/m2e/discovery/org.eclipse.m2e.discovery.oss/org.eclipse.m2e.discovery.oss-1.0.0-SNAPSHOT.jar" permitCategories="true"/>
</directory> \ No newline at end of file
diff --git a/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery-parent/pom.xml b/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery-parent/pom.xml
index 8e7c669a..c7939f5c 100644
--- a/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery-parent/pom.xml
+++ b/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery-parent/pom.xml
@@ -21,7 +21,6 @@
<properties>
<discovery.folder>/home/data/users/prapicau/downloads/technology/m2e/discovery/</discovery.folder>
<tycho-version>0.10.0</tycho-version>
- <m2e-version>0.14.0</m2e-version>
<!-- References the latest m2eclipse build over https by default -->
<m2e-core.url>https://grid.sonatype.org/ci/view/M2E/job/m2eclipse-core-e37-at-eclipse/jdk=java-5x,label=m2e/lastSuccessfulBuild/artifact/org.eclipse.m2e.site/target/site/</m2e-core.url>
</properties>
diff --git a/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery.oss/pom.xml b/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery.oss/pom.xml
index cf1b89d4..9c287754 100644
--- a/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery.oss/pom.xml
+++ b/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery.oss/pom.xml
@@ -49,7 +49,7 @@
<serverId>download.eclipse.org</serverId>
<includes>org.eclipse.m2e.discovery.oss-1.0.0-SNAPSHOT.jar</includes>
<url>scpexe://dev.eclipse.org/</url>
- <toDir>${discovery.folder}/${m2e-version}/${project.artifactId}/</toDir>
+ <toDir>${discovery.folder}/${project.artifactId}/</toDir>
</configuration>
</execution>
</executions>
diff --git a/org.eclipse.m2e.discovery-directory/pom.xml b/org.eclipse.m2e.discovery-directory/pom.xml
index c54c79a8..5594d120 100644
--- a/org.eclipse.m2e.discovery-directory/pom.xml
+++ b/org.eclipse.m2e.discovery-directory/pom.xml
@@ -18,32 +18,6 @@
<module>org.eclipse.m2e.discovery-directory.tests</module>
</modules>
-<build>
- <resources>
- <resource>
- <directory>${basedir}/</directory>
- <includes>
- <include>directory.xml</include>
- </includes>
- <filtering>true</filtering>
- </resource>
- </resources>
- <plugins>
- <plugin>
- <artifactId>maven-resources-plugin</artifactId>
- <executions>
- <execution>
- <id>process-resources</id>
- <phase>process-resources</phase>
- <goals>
- <goal>resources</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
<profiles>
<profile>
<id>publish-site</id>
@@ -61,11 +35,11 @@
<goal>upload</goal>
</goals>
<configuration>
- <fromFile>${project.build.outputDirectory}/</fromFile>
+ <fromFile>${project.directory}/</fromFile>
<serverId>download.eclipse.org</serverId>
<includes>directory.xml</includes>
<url>scpexe://dev.eclipse.org/</url>
- <toDir>${discovery.folder}/${m2e-version}</toDir>
+ <toDir>${discovery.folder}</toDir>
</configuration>
</execution>
</executions>

Back to the top