Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVincenzo Caselli2015-11-03 20:04:16 +0000
committerVincenzo Caselli2015-11-03 20:04:16 +0000
commit7aeb621ffe0e5d38e5fbab61240ec8911c54adf7 (patch)
tree35cae7bc3ec34e3cdf0d64812a95eea38095d515 /releng/org.eclipse.emf.parsley.repository
parent3cc4bb7a1d3ac7d4d923d5a8ddbc861655c45d6b (diff)
parent3a7d40f480df8a4cc45cea3072841670d2708508 (diff)
downloadorg.eclipse.emf-parsley-7aeb621ffe0e5d38e5fbab61240ec8911c54adf7.tar.gz
org.eclipse.emf-parsley-7aeb621ffe0e5d38e5fbab61240ec8911c54adf7.tar.xz
org.eclipse.emf-parsley-7aeb621ffe0e5d38e5fbab61240ec8911c54adf7.zip
Merge remote-tracking branch 'origin/master' into json
Diffstat (limited to 'releng/org.eclipse.emf.parsley.repository')
-rw-r--r--releng/org.eclipse.emf.parsley.repository/feature.xml2
-rw-r--r--releng/org.eclipse.emf.parsley.repository/pom.xml7
2 files changed, 5 insertions, 4 deletions
diff --git a/releng/org.eclipse.emf.parsley.repository/feature.xml b/releng/org.eclipse.emf.parsley.repository/feature.xml
index df039204c..8c3403fc0 100644
--- a/releng/org.eclipse.emf.parsley.repository/feature.xml
+++ b/releng/org.eclipse.emf.parsley.repository/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.emf.parsley.repository"
label="Emf Parsley Repository"
- version="0.5.1.qualifier"
+ version="0.5.2.qualifier"
provider-name="RCP Vision">
<description url="http://www.eclipse.org/emfparsley">
diff --git a/releng/org.eclipse.emf.parsley.repository/pom.xml b/releng/org.eclipse.emf.parsley.repository/pom.xml
index 05fdfe629..d248b3c55 100644
--- a/releng/org.eclipse.emf.parsley.repository/pom.xml
+++ b/releng/org.eclipse.emf.parsley.repository/pom.xml
@@ -1,12 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<relativePath>../../releng/org.eclipse.emf.parsley.parent/pom.xml</relativePath>
<groupId>org.eclipse.emf.parsley</groupId>
<artifactId>org.eclipse.emf.parsley.parent</artifactId>
- <version>0.5.1-SNAPSHOT</version>
+ <version>0.5.2-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.emf.parsley.repository</artifactId>
@@ -65,7 +66,7 @@
<artifactId>tycho-eclipserun-plugin</artifactId>
<version>${tycho-version}</version>
<configuration>
- <appArgLine>-application org.eclipse.ant.core.antRunner -buildfile ${project.basedir}/../org.eclipse.emf.parsley.releng/packaging-p2composite.ant p2.composite.add -Dsoftware.download.area=${parsley.download.area} -Dupdates.dir=${parsley.updates.dir} -Dsite.label="Emf Parsley Site" -Dproject.build.directory=${project.build.directory} -DunqualifiedVersion=${unqualifiedVersion} -DbuildQualifier=${buildQualifier}</appArgLine>
+ <appArgLine>-application org.eclipse.ant.core.antRunner -buildfile ${project.basedir}/../org.eclipse.emf.parsley.parent/ant/packaging-p2composite.ant p2.composite.add -Dsoftware.download.area=${parsley.download.area} -Dupdates.dir=${parsley.updates.dir} -Dsite.label="Emf Parsley Site" -Dproject.build.directory=${project.build.directory} -DunqualifiedVersion=${unqualifiedVersion} -DbuildQualifier=${buildQualifier}</appArgLine>
<repositories>
<repository>
<id>luna</id>

Back to the top