Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Piggott2011-03-22 09:47:54 -0400
committerMatthew Piggott2011-03-22 09:47:54 -0400
commit5b68038bb56ca2bd777ac7d359b4524c5fbc347d (patch)
treed7a3112806867a74f4cfb0ee7703858a817a905e /org.eclipse.m2e.discovery-directory
parentc711f02bd4d1b170d8c1ec4f905cb151c50bc03a (diff)
downloadm2e-core-5b68038bb56ca2bd777ac7d359b4524c5fbc347d.tar.gz
m2e-core-5b68038bb56ca2bd777ac7d359b4524c5fbc347d.tar.xz
m2e-core-5b68038bb56ca2bd777ac7d359b4524c5fbc347d.zip
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, 32 insertions, 4 deletions
diff --git a/org.eclipse.m2e.discovery-directory/.gitignore b/org.eclipse.m2e.discovery-directory/.gitignore
new file mode 100644
index 00000000..ea8c4bf7
--- /dev/null
+++ b/org.eclipse.m2e.discovery-directory/.gitignore
@@ -0,0 +1 @@
+/target
diff --git a/org.eclipse.m2e.discovery-directory/directory.xml b/org.eclipse.m2e.discovery-directory/directory.xml
index 47e0d65e..dbcdd94a 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/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/${m2e-version}/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 c7939f5c..8e7c669a 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,6 +21,7 @@
<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 9c287754..cf1b89d4 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}/${project.artifactId}/</toDir>
+ <toDir>${discovery.folder}/${m2e-version}/${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 5594d120..c54c79a8 100644
--- a/org.eclipse.m2e.discovery-directory/pom.xml
+++ b/org.eclipse.m2e.discovery-directory/pom.xml
@@ -18,6 +18,32 @@
<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>
@@ -35,11 +61,11 @@
<goal>upload</goal>
</goals>
<configuration>
- <fromFile>${project.directory}/</fromFile>
+ <fromFile>${project.build.outputDirectory}/</fromFile>
<serverId>download.eclipse.org</serverId>
<includes>directory.xml</includes>
<url>scpexe://dev.eclipse.org/</url>
- <toDir>${discovery.folder}</toDir>
+ <toDir>${discovery.folder}/${m2e-version}</toDir>
</configuration>
</execution>
</executions>

Back to the top