Skip to content

Commit f4e8e3b

Browse files
dvojtisedvojtise
authored
Fix mvn deploy config (#242)
* add distribution management to pomfirst * use snapshot for thirdparty jars * add metadata in pom.xml Signed-off-by: Didier Vojtisek <[email protected]>
1 parent 68c962d commit f4e8e3b

File tree

10 files changed

+119
-71
lines changed

10 files changed

+119
-71
lines changed

‎dev_support/launchconf/gemoc-studio pomfirst_full_compilation.launch‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
22
<launchConfiguration type="org.eclipse.m2e.Maven2LaunchConfigurationType">
33
<booleanAttribute key="M2_DEBUG_OUTPUT" value="false"/>
4-
<stringAttribute key="M2_GOALS" value="clean package dependency:tree"/>
4+
<stringAttribute key="M2_GOALS" value="clean install dependency:tree"/>
55
<booleanAttribute key="M2_NON_RECURSIVE" value="false"/>
66
<booleanAttribute key="M2_OFFLINE" value="false"/>
77
<stringAttribute key="M2_PROFILES" value=""/>

‎dev_support/pomfirst_full_compilation/pom.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@
88

99
<packaging>pom</packaging>
1010

11+
<properties>
12+
<maven.deploy.skip>true</maven.deploy.skip>
13+
</properties>
14+
1115
<modules>
1216
<module>../../gemoc_studio/pomfirst</module>
1317
<module>../../../gemoc-studio-modeldebugging/pomfirst</module>

‎gemoc_studio/pomfirst/gemoc-studio-bom/pom.xml‎

Lines changed: 11 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -8,30 +8,17 @@
88
<modelVersion>4.0.0</modelVersion>
99
<groupId>org.eclipse.gemoc.gemoc-studio</groupId>
1010
<artifactId>gemoc-studio-bom</artifactId>
11-
<version>3.4.0-SNAPSHOT</version>
1211
<packaging>pom</packaging>
1312
<name>GEMOC Studio BOM</name>
1413
<description>GEMOC Studio Third Party Dependencies (Bill of Materials)</description>
1514
<url>https://www.eclipse.org/gemoc/</url>
16-
<licenses>
17-
<license>
18-
<name>Eclipse Public License, Version 1.0</name>
19-
<url>http://www.eclipse.org/legal/epl-v10.html</url>
20-
</license>
21-
</licenses>
22-
<developers>
23-
<developer>
24-
<name>Didier Vojtisek</name>
25-
<email>[email protected]</email>
26-
<organization>Inria</organization>
27-
<organizationUrl>http://www.inria.fr</organizationUrl>
28-
</developer>
29-
</developers>
30-
<scm>
31-
<connection>scm:git:[email protected]:eclipse/gemoc-studio.git</connection>
32-
<developerConnection>scm:git:[email protected]:eclipse/gemoc-studio.git</developerConnection>
33-
<url>[email protected]:eclipse/gemoc-studio.git</url>
34-
</scm>
15+
16+
<parent>
17+
<groupId>org.eclipse.gemoc.gemoc-studio</groupId>
18+
<artifactId>org.eclipse.gemoc.gemoc_studio.root</artifactId>
19+
<version>3.4.0-SNAPSHOT</version>
20+
<relativePath>..</relativePath>
21+
</parent>
3522
<properties>
3623
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
3724

@@ -42,8 +29,8 @@
4229
<core.runtime-version>3.19.0</core.runtime-version>
4330

4431
<!-- Eclipse debug dependencies versions -->
45-
<debug.core-version>3.15.0.v20200224-0654</debug.core-version>
46-
<debug.ui-version>3.14.700.v20201123-0650</debug.ui-version>
32+
<debug.core-version>3.15.0-SNAPSHOT</debug.core-version>
33+
<debug.ui-version>3.14.700-SNAPSHOT</debug.ui-version>
4734

4835
<!-- Eclipse equinox dependencies versions -->
4936
<equinox.common-version>3.13.0</equinox.common-version>
@@ -54,9 +41,9 @@
5441

5542
<!-- Eclipse EMF dependencies versions -->
5643
<!-- MUST BE ALIGNED with xtext bom currently https://github.com/eclipse/xtext-lib/blob/v2.24.0/org.eclipse.xtext.dev-bom/build.gradle -->
57-
<emf.edit-version>2.16.0.20190920</emf.edit-version>
44+
<emf.edit-version>2.16.0-SNAPSHOT</emf.edit-version>
5845
<emf.common-version>2.17.0</emf.common-version><!-- <emf.common-version>[2.16.0,3.0.0)</emf.common-version> -->
59-
<emf.ecore-version>2.20.0</emf.ecore-version><!-- <emf.ecore-version>[2.16.0,3.0.0)</emf.ecore-version> -->
46+
<emf.ecore-version>2.25.0</emf.ecore-version><!-- <emf.ecore-version>[2.16.0,3.0.0)</emf.ecore-version> -->
6047
<emf.ecore.xmi-version>2.16.0</emf.ecore.xmi-version>
6148
<emf.compare-version>[3.4.0,3.6.0)</emf.compare-version>
6249
<emf.transaction-version>[1.9.0,2.0.0)</emf.transaction-version>

‎gemoc_studio/pomfirst/pom.xml‎

Lines changed: 38 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
33
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
44
<modelVersion>4.0.0</modelVersion>
5-
<groupId>org.eclipse.gemoc.gemoc_studio</groupId>
5+
<groupId>org.eclipse.gemoc.gemoc-studio</groupId>
66
<artifactId>org.eclipse.gemoc.gemoc_studio.root</artifactId>
77
<version>3.4.0-SNAPSHOT</version>
88

@@ -12,4 +12,41 @@
1212
<module>gemoc-studio-bom</module>
1313
<module>thirdparty-bundle</module>
1414
</modules>
15+
16+
<organization>
17+
<name>Eclipse</name>
18+
<url>https://www.eclipse.org</url>
19+
</organization>
20+
<licenses>
21+
<license>
22+
<name>Eclipse Public License, Version 1.0</name>
23+
<url>http://www.eclipse.org/legal/epl-v10.html</url>
24+
</license>
25+
</licenses>
26+
<developers>
27+
<developer>
28+
<name>Didier Vojtisek</name>
29+
<email>[email protected]</email>
30+
<organization>Inria</organization>
31+
<organizationUrl>http://www.inria.fr</organizationUrl>
32+
</developer>
33+
</developers>
34+
<scm>
35+
<connection>scm:git:[email protected]:eclipse/gemoc-studio.git</connection>
36+
<developerConnection>scm:git:[email protected]:eclipse/gemoc-studio.git</developerConnection>
37+
<url>[email protected]:eclipse/gemoc-studio.git</url>
38+
</scm>
39+
40+
<distributionManagement>
41+
<repository>
42+
<id>repo.eclipse.org</id>
43+
<name>GEMOC Project Repository - Releases</name>
44+
<url>https://repo.eclipse.org/content/repositories/gemoc-releases/</url>
45+
</repository>
46+
<snapshotRepository>
47+
<id>repo.eclipse.org</id>
48+
<name>GEMOC Project Repository - Snapshots</name>
49+
<url>https://repo.eclipse.org/content/repositories/gemoc-snapshots/</url>
50+
</snapshotRepository>
51+
</distributionManagement>
1552
</project>

‎gemoc_studio/pomfirst/thirdparty-bundle/org.eclipse.debug.core/pom.xml‎

Lines changed: 20 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -6,25 +6,17 @@
66

77
<groupId>org.eclipse.gemoc.gemoc-studio.thirdparty.bundle</groupId>
88
<artifactId>org.eclipse.debug.core</artifactId>
9-
<version>3.15.0.v20200224-0654</version>
9+
<version>3.15.0-SNAPSHOT</version>
1010
<packaging>jar</packaging>
1111
<description>Maven distribution of org.eclipse.debug.core osgi bundle without maven dependencies</description>
12-
13-
<!-- <parent>
12+
<url>https://www.eclipse.org/gemoc/</url>
13+
14+
<parent>
1415
<groupId>org.eclipse.gemoc.gemoc-studio.thirdparty.bundle</groupId>
1516
<artifactId>org.eclipse.gemoc.gemoc_studio.thirdparty-bundle</artifactId>
1617
<version>3.4.0-SNAPSHOT</version>
17-
</parent> -->
18+
</parent>
1819

19-
<!-- <dependencies>
20-
<dependency>
21-
<groupId>org.eclipse.debug</groupId>
22-
<artifactId>${project.artifactId}</artifactId>
23-
<version>${project.version}</version>
24-
<scope>system</scope>
25-
<systemPath>${project.basedir}/${project.artifactId}_${project.version}.jar</systemPath>
26-
</dependency>
27-
</dependencies> -->
2820
<build>
2921
<plugins>
3022
<plugin>
@@ -36,7 +28,7 @@
3628
<configuration>
3729
<tasks>
3830
<echo message="unzipping file" />
39-
<unzip src="${project.basedir}/${project.artifactId}_${project.version}.jar" dest="${project.build.directory}/classes/" />
31+
<unzip src="${project.basedir}/${project.artifactId}_3.15.0.v20200224-0654.jar" dest="${project.build.directory}/classes/" />
4032
</tasks>
4133
</configuration>
4234
<goals>
@@ -46,5 +38,18 @@
4638
</executions>
4739
</plugin>
4840
</plugins>
49-
</build>
41+
</build>
42+
43+
<distributionManagement>
44+
<repository>
45+
<id>repo.eclipse.org</id>
46+
<name>GEMOC Project Repository - Releases</name>
47+
<url>https://repo.eclipse.org/content/repositories/gemoc-releases/</url>
48+
</repository>
49+
<snapshotRepository>
50+
<id>repo.eclipse.org</id>
51+
<name>GEMOC Project Repository - Snapshots</name>
52+
<url>https://repo.eclipse.org/content/repositories/gemoc-snapshots/</url>
53+
</snapshotRepository>
54+
</distributionManagement>
5055
</project>

‎gemoc_studio/pomfirst/thirdparty-bundle/org.eclipse.debug.ui/pom.xml‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,17 @@
55
<modelVersion>4.0.0</modelVersion>
66
<groupId>org.eclipse.gemoc.gemoc-studio.thirdparty.bundle</groupId>
77
<artifactId>org.eclipse.debug.ui</artifactId>
8-
<version>3.14.700.v20201123-0650</version>
8+
<version>3.14.700-SNAPSHOT</version>
99
<packaging>jar</packaging>
1010
<description>Maven distribution of org.eclipse.debug.ui osgi bundle without maven dependencies</description>
11-
12-
11+
<url>https://www.eclipse.org/gemoc/</url>
12+
13+
<parent>
14+
<groupId>org.eclipse.gemoc.gemoc-studio.thirdparty.bundle</groupId>
15+
<artifactId>org.eclipse.gemoc.gemoc_studio.thirdparty-bundle</artifactId>
16+
<version>3.4.0-SNAPSHOT</version>
17+
</parent>
18+
1319
<build>
1420
<plugins>
1521
<plugin>
@@ -21,7 +27,7 @@
2127
<configuration>
2228
<tasks>
2329
<echo message="unzipping file" />
24-
<unzip src="${project.basedir}/${project.artifactId}_${project.version}.jar" dest="${project.build.directory}/classes/" />
30+
<unzip src="${project.basedir}/${project.artifactId}_3.14.700.v20201123-0650.jar" dest="${project.build.directory}/classes/" />
2531
</tasks>
2632
</configuration>
2733
<goals>

‎gemoc_studio/pomfirst/thirdparty-bundle/org.eclipse.emf.compare/pom.xml‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,17 @@
66

77
<groupId>org.eclipse.gemoc.gemoc-studio.thirdparty.bundle</groupId>
88
<artifactId>org.eclipse.emf.compare</artifactId>
9-
<version>3.5.3.202011201248</version>
9+
<version>3.5.3-SNAPSHOT</version>
1010
<packaging>jar</packaging>
1111
<description>Maven distribution of org.eclipse.emf.compare osgi bundle without maven dependencies</description>
12+
<url>https://www.eclipse.org/gemoc/</url>
1213

14+
<parent>
15+
<groupId>org.eclipse.gemoc.gemoc-studio.thirdparty.bundle</groupId>
16+
<artifactId>org.eclipse.gemoc.gemoc_studio.thirdparty-bundle</artifactId>
17+
<version>3.4.0-SNAPSHOT</version>
18+
</parent>
19+
1320
<build>
1421
<plugins>
1522
<plugin>
@@ -21,7 +28,7 @@
2128
<configuration>
2229
<tasks>
2330
<echo message="unzipping file" />
24-
<unzip src="${project.basedir}/${project.artifactId}_${project.version}.jar" dest="${project.build.directory}/classes/" />
31+
<unzip src="${project.basedir}/${project.artifactId}_3.5.3.202011201248.jar" dest="${project.build.directory}/classes/" />
2532
</tasks>
2633
</configuration>
2734
<goals>

‎gemoc_studio/pomfirst/thirdparty-bundle/org.eclipse.emf.edit/pom.xml‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,17 @@
66

77
<groupId>org.eclipse.gemoc.gemoc-studio.thirdparty.bundle</groupId>
88
<artifactId>org.eclipse.emf.edit</artifactId>
9-
<version>2.16.0.20190920</version>
9+
<version>2.16.0-SNAPSHOT</version>
1010
<packaging>jar</packaging>
1111
<description>Maven distribution of org.eclipse.emf.compare osgi bundle without maven dependencies</description>
12-
12+
<url>https://www.eclipse.org/gemoc/</url>
13+
14+
<parent>
15+
<groupId>org.eclipse.gemoc.gemoc-studio.thirdparty.bundle</groupId>
16+
<artifactId>org.eclipse.gemoc.gemoc_studio.thirdparty-bundle</artifactId>
17+
<version>3.4.0-SNAPSHOT</version>
18+
</parent>
19+
1320
<build>
1421
<plugins>
1522
<plugin>
@@ -21,7 +28,7 @@
2128
<configuration>
2229
<tasks>
2330
<echo message="unzipping file" />
24-
<unzip src="${project.basedir}/${project.artifactId}_${project.version}.jar" dest="${project.build.directory}/classes/" />
31+
<unzip src="${project.basedir}/${project.artifactId}_2.16.0.20190920.jar" dest="${project.build.directory}/classes/" />
2532
</tasks>
2633
</configuration>
2734
<goals>

‎gemoc_studio/pomfirst/thirdparty-bundle/org.eclipse.emf.transaction/pom.xml‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,17 @@
66

77
<groupId>org.eclipse.gemoc.gemoc-studio.thirdparty.bundle</groupId>
88
<artifactId>org.eclipse.emf.transaction</artifactId>
9-
<version>1.9.1.201805140824</version>
9+
<version>1.9.1-SNAPSHOT</version>
1010
<packaging>jar</packaging>
1111
<description>Maven distribution of org.eclipse.emf.transaction osgi bundle without maven dependencies</description>
12+
<url>https://www.eclipse.org/gemoc/</url>
1213

14+
<parent>
15+
<groupId>org.eclipse.gemoc.gemoc-studio.thirdparty.bundle</groupId>
16+
<artifactId>org.eclipse.gemoc.gemoc_studio.thirdparty-bundle</artifactId>
17+
<version>3.4.0-SNAPSHOT</version>
18+
</parent>
19+
1320
<build>
1421
<plugins>
1522
<plugin>
@@ -21,7 +28,7 @@
2128
<configuration>
2229
<tasks>
2330
<echo message="unzipping file" />
24-
<unzip src="${project.basedir}/${project.artifactId}_${project.version}.jar" dest="${project.build.directory}/classes/" />
31+
<unzip src="${project.basedir}/${project.artifactId}_1.9.1.201805140824.jar" dest="${project.build.directory}/classes/" />
2532
</tasks>
2633
</configuration>
2734
<goals>

‎gemoc_studio/pomfirst/thirdparty-bundle/pom.xml‎

Lines changed: 7 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,15 @@
55
<groupId>org.eclipse.gemoc.gemoc-studio.thirdparty.bundle</groupId>
66
<artifactId>org.eclipse.gemoc.gemoc_studio.thirdparty-bundle</artifactId>
77
<version>3.4.0-SNAPSHOT</version>
8-
98
<packaging>pom</packaging>
9+
<url>https://www.eclipse.org/gemoc/</url>
1010

11+
<parent>
12+
<groupId>org.eclipse.gemoc.gemoc-studio</groupId>
13+
<artifactId>org.eclipse.gemoc.gemoc_studio.root</artifactId>
14+
<version>3.4.0-SNAPSHOT</version>
15+
<relativePath>../pom.xml</relativePath>
16+
</parent>
1117
<modules>
1218
<module>org.eclipse.debug.core</module>
1319
<module>org.eclipse.debug.ui</module>
@@ -21,24 +27,6 @@
2127
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2228
</properties>
2329
<build>
24-
<plugins>
25-
<plugin>
26-
<groupId>org.apache.maven.plugins</groupId>
27-
<artifactId>maven-dependency-plugin</artifactId>
28-
<executions>
29-
<execution>
30-
<id>unpack</id>
31-
<phase>prepare-package</phase>
32-
<goals>
33-
<goal>unpack-dependencies</goal>
34-
</goals>
35-
<configuration>
36-
<outputDirectory>${project.build.directory}/classes</outputDirectory>
37-
</configuration>
38-
</execution>
39-
</executions>
40-
</plugin>
41-
</plugins>
4230
</build>
4331
<dependencyManagement>
4432
<dependencies>

0 commit comments

Comments
 (0)