diff options
Diffstat (limited to 'releng')
| -rw-r--r-- | releng/main-tests/pom.xml | 4 | ||||
| -rwxr-xr-x | releng/main/pom.xml | 8 | ||||
| -rw-r--r-- | releng/pom.xml | 30 | ||||
| -rwxr-xr-x | releng/toolsmiths/pom.xml | 8 |
4 files changed, 25 insertions, 25 deletions
diff --git a/releng/main-tests/pom.xml b/releng/main-tests/pom.xml index 7b63549afcb..3ae00deab5b 100644 --- a/releng/main-tests/pom.xml +++ b/releng/main-tests/pom.xml @@ -8,7 +8,7 @@ <artifactId>org.eclipse.papyrus.all.releng</artifactId> <version>0.0.1-SNAPSHOT</version> </parent> - <groupId>org.eclipse.papyrus</groupId> + <artifactId>org.eclipse.papyrus.tests.releng</artifactId> <version>1.2.0-SNAPSHOT</version> <packaging>pom</packaging> @@ -16,7 +16,7 @@ <properties> <testConfig>CI_TESTS_CONFIG</testConfig> <!-- See org.eclipse.papyrus.junit.framework.classification.ClassificationConfig --> <testSuiteClass>org.eclipse.papyrus.tests.AllTests</testSuiteClass> - <jacoco.version>0.7.9</jacoco.version> + <jacoco.version>0.8.2</jacoco.version> <!-- https://repo.maven.apache.org/maven2/ --> <!-- Separate property for test argLine seems to be required when running Jacoco + Surefire --> <test.argLine>-Xms512m -Xmx2048m -XX:SoftRefLRUPolicyMSPerMB=100</test.argLine> diff --git a/releng/main/pom.xml b/releng/main/pom.xml index d6d314ed52f..bbfa249b9a7 100755 --- a/releng/main/pom.xml +++ b/releng/main/pom.xml @@ -3,13 +3,14 @@ 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> - <artifactId>org.eclipse.papyrus.releng</artifactId> - <packaging>pom</packaging> <parent> <groupId>org.eclipse.papyrus</groupId> <artifactId>org.eclipse.papyrus.all.releng</artifactId> <version>0.0.1-SNAPSHOT</version> </parent> + + <artifactId>org.eclipse.papyrus.releng</artifactId> + <packaging>pom</packaging> <modules> <module>../../plugins</module> @@ -21,8 +22,9 @@ </modules> <properties> + <!-- https://repo.maven.apache.org/maven2/ --> <mojo.buildhelper.version>3.0.0</mojo.buildhelper.version> - <mylyn.wikitext.version>3.0.24</mylyn.wikitext.version> + <mylyn.wikitext.version>3.0.29</mylyn.wikitext.version> <target.platform>org.eclipse.papyrus.main.${target.suffix}.target</target.platform> </properties> diff --git a/releng/pom.xml b/releng/pom.xml index 7fcf9f7955e..9bbb472f565 100644 --- a/releng/pom.xml +++ b/releng/pom.xml @@ -9,18 +9,22 @@ <packaging>pom</packaging> <properties> + <!-- https://repo.maven.apache.org/maven2/ --> <tycho-version>1.3.0</tycho-version> <tychoExtrasVersion>1.3.0</tychoExtrasVersion> + <xtext.version>2.16.0</xtext.version> + <maven.resources.version>3.1.0</maven.resources.version> + <maven.clean.version>3.1.0</maven.clean.version> + <mojo.execmaven.version>1.6.0</mojo.execmaven.version> + <findbugs.version>3.0.5</findbugs.version> + <maven.compiler.version>3.8.0</maven.compiler.version> + + <!-- https://repo.eclipse.org/content/repositories/cbi-releases/ --> <jarSignerVersion>1.1.5</jarSignerVersion> - <findbugs.version>3.0.1</findbugs.version> - <xtext.version>2.14.0</xtext.version> - <maven.resources.version>3.0.2</maven.resources.version> - <maven.clean.version>3.0.0</maven.clean.version> - <mojo.execmaven.version>1.6.0</mojo.execmaven.version> - <jboss.utils.version>1.1.0</jboss.utils.version> - <maven.compiler.version>3.7.0</maven.compiler.version> + + <!-- https://repository.jboss.org/ --> + <jboss.utils.version>1.3.0</jboss.utils.version> - <tycho.scmUrl>scm:git:git://git.eclipse.org/gitroot/papyrus/org.eclipse.papyrus.git</tycho.scmUrl> <java.source.version>1.8</java.source.version> <java.target.version>1.8</java.target.version> <skipAllTests>false</skipAllTests> @@ -35,6 +39,8 @@ <papyrus.eclipse.target>master</papyrus.eclipse.target> <papyrus.repo.main>http://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/${papyrus.eclipse.target}/main</papyrus.repo.main> <papyrus.repo.toolsmiths>http://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/${papyrus.eclipse.target}/toolsmiths</papyrus.repo.toolsmiths> + + <tycho.scmUrl>scm:git:git://git.eclipse.org/gitroot/papyrus/org.eclipse.papyrus.git</tycho.scmUrl> </properties> <modules> @@ -122,14 +128,6 @@ <groupId>org.eclipse.xtend</groupId> <artifactId>xtend-maven-plugin</artifactId> <version>${xtext.version}</version> - <!-- patch to fix a signer issue - https://github.com/eclipse/xtext/issues/1231 --> - <dependencies> - <dependency> - <groupId>org.eclipse.platform</groupId> - <artifactId>org.eclipse.equinox.common</artifactId> - <version>3.10.0</version> - </dependency> - </dependencies> </plugin> <plugin> diff --git a/releng/toolsmiths/pom.xml b/releng/toolsmiths/pom.xml index cf59be44efb..6487f1d68e9 100755 --- a/releng/toolsmiths/pom.xml +++ b/releng/toolsmiths/pom.xml @@ -3,15 +3,15 @@ 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> - <groupId>org.eclipse.papyrus</groupId> - <artifactId>org.eclipse.papyrus.toolsmiths.releng</artifactId> - <version>1.0.0-SNAPSHOT</version> - <packaging>pom</packaging> <parent> <groupId>org.eclipse.papyrus</groupId> <artifactId>org.eclipse.papyrus.all.releng</artifactId> <version>0.0.1-SNAPSHOT</version> </parent> + + <artifactId>org.eclipse.papyrus.toolsmiths.releng</artifactId> + <version>1.0.0-SNAPSHOT</version> + <packaging>pom</packaging> <properties> <target.platform>org.eclipse.papyrus.toolsmiths.${target.suffix}.targetplatform</target.platform> |