Skip to content

Commit

Permalink
Improve Maven architecture
Browse files Browse the repository at this point in the history
Get rid of the configuration module that prevents tycho-versions-plugin
from performing well.
  • Loading branch information
echebbi committed Dec 18, 2018
1 parent 17d3726 commit 5ffb1a3
Show file tree
Hide file tree
Showing 23 changed files with 159 additions and 182 deletions.
2 changes: 1 addition & 1 deletion bundles/fr.kazejiyu.ekumi.core.edit/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: fr.kazejiyu.ekumi.core.edit;singleton:=true
Bundle-Version: 1.0.0.qualifier
Bundle-Version: 0.1.0
Bundle-ClassPath: .
Bundle-Activator: fr.kazejiyu.ekumi.model.catalog.provider.EkumiEditPlugin$Implementation
Bundle-Vendor: %providerName
Expand Down
2 changes: 1 addition & 1 deletion bundles/fr.kazejiyu.ekumi.core.editor/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Bundle-Vendor: %providerName
Export-Package: fr.kazejiyu.ekumi.core.ekumi.presentation,
fr.kazejiyu.ekumi.model.catalog.presentation
Bundle-Name: %pluginName
Bundle-Version: 1.0.0.qualifier
Bundle-Version: 0.1.0
Bundle-ClassPath: .
Bundle-Localization: plugin
Bundle-Activator: fr.kazejiyu.ekumi.model.catalog.presentation.EkumiEditorPlugin$Implementation
2 changes: 1 addition & 1 deletion bundles/fr.kazejiyu.ekumi.core/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: fr.kazejiyu.ekumi.core;singleton:=true
Bundle-Version: 1.0.0.qualifier
Bundle-Version: 0.1.0
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Expand Down
2 changes: 1 addition & 1 deletion bundles/fr.kazejiyu.ekumi.datatypes/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: EKumi Datatypes
Bundle-SymbolicName: fr.kazejiyu.ekumi.datatypes;singleton:=true
Bundle-Version: 1.0.0.qualifier
Bundle-Version: 0.1.0
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Require-Bundle: fr.kazejiyu.ekumi.core;bundle-version="0.1.0"
Bundle-Vendor: Emmanuel CHEBBI
2 changes: 1 addition & 1 deletion bundles/fr.kazejiyu.ekumi.ide/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: EKumi Eclipse IDE Integration
Bundle-SymbolicName: fr.kazejiyu.ekumi.ide
Bundle-Version: 1.0.0.qualifier
Bundle-Version: 0.1.0
Automatic-Module-Name: fr.kazejiyu.ekumi.ide
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Export-Package: fr.kazejiyu.ekumi.ide.history
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: EKumi Java Language
Bundle-SymbolicName: fr.kazejiyu.ekumi.languages.java;singleton:=true
Bundle-Version: 1.0.0.qualifier
Bundle-Version: 0.1.0
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Require-Bundle: fr.kazejiyu.ekumi.core;bundle-version="0.1.0",
org.eclipse.core.runtime;bundle-version="3.13.0",
Expand Down
2 changes: 1 addition & 1 deletion bundles/fr.kazejiyu.ekumi.ui.e4/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: EKumi UI E4
Bundle-SymbolicName: fr.kazejiyu.ekumi.ui.e4;singleton:=true
Bundle-Version: 1.0.0.qualifier
Bundle-Version: 0.1.0
Bundle-Vendor: Emmanuel CHEBBI
Require-Bundle: javax.inject,
org.eclipse.osgi,
Expand Down
2 changes: 1 addition & 1 deletion bundles/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>fr.kazejiyu.ekumi</groupId>
<artifactId>fr.kazejiyu.ekumi.root</artifactId>
<version>1.0.0-SNAPSHOT</version>
<version>0.1.0</version>
</parent>

<artifactId>fr.kazejiyu.ekumi.bundles</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion features/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>fr.kazejiyu.ekumi</groupId>
<artifactId>fr.kazejiyu.ekumi.root</artifactId>
<version>1.0.0-SNAPSHOT</version>
<version>0.1.0</version>
</parent>

<artifactId>fr.kazejiyu.ekumi.features</artifactId>
Expand Down
134 changes: 127 additions & 7 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,142 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>fr.kazejiyu.ekumi</groupId>
<artifactId>fr.kazejiyu.ekumi.configuration</artifactId>
<version>1.0.0-SNAPSHOT</version>
<relativePath>releng/fr.kazejiyu.ekumi.configuration</relativePath>
</parent>

<groupId>fr.kazejiyu.ekumi</groupId>
<artifactId>fr.kazejiyu.ekumi.root</artifactId>
<version>0.1.0</version>
<packaging>pom</packaging>

<name>EKumi</name>
<description>Workflow mangement system for Eclipse IDE</description>

<modules>
<module>bundles</module>
<module>features</module>
<module>releng</module>
<module>tests</module>
</modules>

<prerequisites>
<maven>3.0</maven>
</prerequisites>

<properties>
<acceleo-version>3.3.0</acceleo-version>
<tycho-version>1.2.0</tycho-version>
<jacoco-version>0.8.1</jacoco-version>
</properties>

<!-- COMMANDS:
* Change project's version:
mvn org.eclipse.tycho:tycho-versions-plugin:set-version -DnewVersion=major.minor.bug
-->

<build>
<plugins>
<plugin>
<!-- Activate Tycho, along as its extension Tycho's pomless extension
is activated in .mvn folder -->
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-maven-plugin</artifactId>
<version>${tycho-version}</version>
<extensions>true</extensions>
</plugin>
<plugin>
<!-- Activate EKumi's target platform -->
<groupId>org.eclipse.tycho</groupId>
<artifactId>target-platform-configuration</artifactId>
<version>${tycho-version}</version>
<configuration>
<target>
<artifact>
<groupId>fr.kazejiyu.ekumi</groupId>
<artifactId>fr.kazejiyu.ekumi.target</artifactId>
<version>0.1.0</version>
</artifact>
</target>
<environments>
<environment>
<os>linux</os>
<ws>gtk</ws>
<arch>x86</arch>
</environment>
<environment>
<os>linux</os>
<ws>gtk</ws>
<arch>x86_64</arch>
</environment>
<environment>
<os>win32</os>
<ws>win32</ws>
<arch>x86</arch>
</environment>
<environment>
<os>win32</os>
<ws>win32</ws>
<arch>x86_64</arch>
</environment>
<environment>
<os>macosx</os>
<ws>cocoa</ws>
<arch>x86_64</arch>
</environment>
</environments>
</configuration>
</plugin>
<!-- Establish code coverage. Used by https://codecov.io/ -->
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
<version>2.7</version>
<configuration>
<formats>
<format>html</format>
<format>xml</format>
</formats>
<check />
<instrumentation>
<excludes>
<exclude>fr/kazejiyu/ekumi/core/exceptions/**/*.class</exclude>
<exclude>fr/kazejiyu/ekumi/core/languages/exceptions/**/*.class</exclude>
</excludes>
</instrumentation>
</configuration>
</plugin>
</plugins>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-compiler-plugin</artifactId>
<version>${tycho-version}</version>
<configuration>
<encoding>UTF-8</encoding>
</configuration>
</plugin>
<!-- Ask Tycho to auto-generate <plugin-name>.source plugins -->
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-source-plugin</artifactId>
<version>${tycho-version}</version>
<executions>
<execution>
<id>attach-source</id>
<phase>process-classes</phase>
<goals>
<goal>plugin-source</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>2.4.1</version>
<configuration>
<encoding>UTF-8</encoding>
</configuration>
</plugin>
</plugins>
</pluginManagement>
</build>
</project>
11 changes: 0 additions & 11 deletions releng/fr.kazejiyu.ekumi.configuration/.project

This file was deleted.

132 changes: 0 additions & 132 deletions releng/fr.kazejiyu.ekumi.configuration/pom.xml

This file was deleted.

2 changes: 1 addition & 1 deletion releng/fr.kazejiyu.ekumi.target/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>fr.kazejiyu.ekumi</groupId>
<artifactId>fr.kazejiyu.ekumi.releng</artifactId>
<version>1.0.0-SNAPSHOT</version>
<version>0.1.0</version>
</parent>

<artifactId>fr.kazejiyu.ekumi.target</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion releng/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>fr.kazejiyu.ekumi</groupId>
<artifactId>fr.kazejiyu.ekumi.root</artifactId>
<version>1.0.0-SNAPSHOT</version>
<version>0.1.0</version>
</parent>

<artifactId>fr.kazejiyu.ekumi.releng</artifactId>
Expand Down

0 comments on commit 5ffb1a3

Please sign in to comment.