Skip to content

Commit 167f014

Browse files
ilg-ulilg-ul
committed
maven cleanups in repositories
1 parent 58c89df commit 167f014

8 files changed

Lines changed: 55 additions & 125 deletions

File tree

‎.travis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,6 @@ branches:
3636
# -----------------------------------------------------------------------------
3737

3838
script:
39-
- mvn clean install
39+
- mvn clean verify
4040

4141
# -----------------------------------------------------------------------------

‎README.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ For manual installs, the stable version update site is:
2424
```
2525
$ git clone --branch=master https://github.com/gnuarmeclipse/plug-ins.git gnuarmeclipse/plug-ins.git
2626
$ cd gnuarmeclipse/plug-ins.git
27-
$ mvn -Dtycho.localArtifacts=ignore clean install
27+
$ mvn -Dtycho.localArtifacts=ignore clean verify
2828
```
2929

3030
The result is a p2 repository, in `ilg.gnumcueclipse-repository/target/repository`.
@@ -37,13 +37,13 @@ The Eclipse build is described in the [project web](http://gnuarmeclipse.github.
3737

3838
The minimum requirements for running the GNU MCU Eclipse plug-ins are:
3939

40-
- JavaSE-1.8
41-
- CDT 8.6.0 (Luna SR2)
40+
- JavaSE-1.8-111 or later
41+
- CDT 9.2.1 (Neon.3)
4242

4343
Recommended:
4444

4545
- JavaSE-1.8-111 or later
46-
- Eclipse Mars.2
46+
- Eclipse Neon.3
4747

4848
## Developer
4949

‎packages/pom.xml‎

Lines changed: 0 additions & 44 deletions
This file was deleted.

‎parent/pom.xml‎

Lines changed: 37 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,9 @@
2323

2424
<!-- Silence a Maven warning -->
2525
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
26-
27-
<!-- Upstream p2 repository, used as a source for pre-compiled build artifacts -->
28-
<eclipse.simultaneous.release.repository>http://download.eclipse.org/staging/neon/</eclipse.simultaneous.release.repository>
2926

30-
<gnumcueclipse.version>4.1.1</gnumcueclipse.version>
27+
<!-- The usual Eclipse timestamp, down to minutes. -->
28+
<maven.build.timestamp.format>yyyyMMddHHmm</maven.build.timestamp.format>
3129
</properties>
3230

3331
<licenses>
@@ -57,13 +55,30 @@
5755
<build>
5856
<plugins>
5957
<plugin>
60-
<!-- Used by eclipse-plugin & eclipse-feature packagings. -->
58+
<!-- Enable Tycho. -->
6159
<groupId>org.eclipse.tycho</groupId>
6260
<artifactId>tycho-maven-plugin</artifactId>
6361
<version>${tycho.version}</version>
64-
<extensions>true</extensions>
62+
<!-- Mandatory, without it eclipse-* POMs are not accepted. -->
63+
<extensions>true</extensions>
6564
</plugin>
66-
65+
66+
<!--
67+
<plugin>
68+
<groupId>org.codehaus.mojo</groupId>
69+
<artifactId>build-helper-maven-plugin</artifactId>
70+
<version>3.0.0</version>
71+
<executions>
72+
<execution>
73+
<id>gme-parse-version</id>
74+
<goals>
75+
<goal>parse-version</goal>
76+
</goals>
77+
</execution>
78+
</executions>
79+
</plugin>
80+
-->
81+
6782
<plugin>
6883
<!-- Used by eclipse-repository packagings. -->
6984
<groupId>org.eclipse.tycho</groupId>
@@ -72,6 +87,8 @@
7287
<configuration>
7388
<resolver>p2</resolver>
7489
<pomDependencies>consider</pomDependencies>
90+
91+
<!-- Mandatory, without it Build is platform dependent. -->
7592
<environments>
7693
<environment>
7794
<os>linux</os>
@@ -83,11 +100,6 @@
83100
<ws>gtk</ws>
84101
<arch>x86_64</arch>
85102
</environment>
86-
<environment>
87-
<os>linux</os>
88-
<ws>gtk</ws>
89-
<arch>ppc64</arch>
90-
</environment>
91103
<environment>
92104
<os>win32</os>
93105
<ws>win32</ws>
@@ -103,41 +115,37 @@
103115
<ws>cocoa</ws>
104116
<arch>x86_64</arch>
105117
</environment>
106-
<environment>
107-
<os>aix</os>
108-
<ws>gtk</ws>
109-
<arch>ppc</arch>
110-
</environment>
111118
</environments>
112119
</configuration>
113120
</plugin>
121+
114122
</plugins>
115123

116124
<pluginManagement>
117-
<!-- Default plugin information. -->
125+
<!-- Defaults, applied when plug-ins are actually used. -->
118126
<plugins>
127+
119128
<plugin>
120129
<groupId>org.eclipse.tycho</groupId>
121130
<artifactId>tycho-compiler-plugin</artifactId>
122131
<version>${tycho.version}</version>
123132
<configuration>
124133
<encoding>UTF-8</encoding>
125-
<useProjectSettings>true</useProjectSettings>
134+
<!-- <useProjectSettings>true</useProjectSettings> -->
135+
<!-- <showDeprecation>true</showDeprecation> -->
126136
</configuration>
127137
</plugin>
128138

129139
<plugin>
130140
<groupId>org.eclipse.tycho</groupId>
131-
<artifactId>tycho-source-plugin</artifactId>
132-
<version>${tycho-version}</version>
133-
<executions>
134-
<execution>
135-
<id>plugin-source</id>
136-
<goals>
137-
<goal>plugin-source</goal>
138-
</goals>
139-
</execution>
140-
</executions>
141+
<artifactId>tycho-p2-repository-plugin</artifactId>
142+
<version>${tycho.version}</version>
143+
<configuration>
144+
<compress>true</compress>
145+
<!-- Nope, it brings all 3rd party plug-ins.
146+
<includeAllDependencies>true</includeAllDependencies>
147+
-->
148+
</configuration>
141149
</plugin>
142150

143151
</plugins>

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,6 @@
9191
<module>repos/ilg.gnumcueclipse.riscv-repository</module>
9292
</modules>
9393

94-
<name>GNU MCU Eclipse plug-ins</name>
94+
<name>GNU MCU Eclipse plug-ins root</name>
9595
<url>http://gnuarmeclipse.github.io</url>
9696
</project>

‎repos/README.md‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
Projects to generate the p2 repositories.
2+
3+
Since the archives are not deployed, the SNAPSHOT qualifier in the
4+
archive name is not substituted,
5+
and must be processed externally by the publish script. (using
6+
`${maven.build.timestamp}` is not ok, since it is captured when
7+
the entire build starts, which is before the moment when plug-ins
8+
are internally deployed to the repository).
9+
10+
The main repository contains all (ARM & RISC-V) plug-ins.
11+
12+
The RISC-V repository contains only the RISC-V plug-ins.

‎repos/ilg.gnumcueclipse-repository/pom.xml‎

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -28,29 +28,6 @@
2828
<relativePath>../../parent/pom.xml</relativePath>
2929
</parent>
3030

31-
<build>
32-
<plugins>
33-
<plugin>
34-
<groupId>org.eclipse.tycho</groupId>
35-
<artifactId>tycho-p2-repository-plugin</artifactId>
36-
<version>${tycho.version}</version>
37-
<configuration>
38-
<compress>true</compress>
39-
<!-- Nope, it brings all 3rd party plug-ins.
40-
<includeAllDependencies>true</includeAllDependencies>
41-
-->
42-
</configuration>
43-
<executions>
44-
<execution>
45-
<goals>
46-
<goal>archive-repository</goal>
47-
</goals>
48-
</execution>
49-
</executions>
50-
</plugin>
51-
</plugins>
52-
</build>
53-
5431
<name>GNU MCU Eclipse repository</name>
5532
<url>http://gnuarmeclipse.github.io</url>
5633
</project>

‎repos/ilg.gnumcueclipse.riscv-repository/pom.xml‎

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -28,29 +28,6 @@
2828
<relativePath>../../parent/pom.xml</relativePath>
2929
</parent>
3030

31-
<build>
32-
<plugins>
33-
<plugin>
34-
<groupId>org.eclipse.tycho</groupId>
35-
<artifactId>tycho-p2-repository-plugin</artifactId>
36-
<version>${tycho.version}</version>
37-
<configuration>
38-
<compress>true</compress>
39-
<!-- Nope, it brings all 3rd party plug-ins.
40-
<includeAllDependencies>true</includeAllDependencies>
41-
-->
42-
</configuration>
43-
<executions>
44-
<execution>
45-
<goals>
46-
<goal>archive-repository</goal>
47-
</goals>
48-
</execution>
49-
</executions>
50-
</plugin>
51-
</plugins>
52-
</build>
53-
5431
<name>GNU MCU Eclipse RISC-V repository</name>
5532
<url>http://gnuarmeclipse.github.io</url>
5633
</project>

0 commit comments

Comments
 (0)