Skip to content

Commit

Permalink
#183 Move dependencies to reqif from required-bundle to import-package
Browse files Browse the repository at this point in the history 
Fix issue where javax.xml would be present in 2 different modules,
one from the jdk, the other from dependencies resulting in compilation
issues

Change create-dropins goal to use oxygen instead of neon

Change deprecated source-feature goal to feature-source
Removed deprecated pack200 goals

Change-Id: Id3827920f41ed83f9459898906631480ee4027e0
Signed-off-by: Erwann Traisnel <erwann.traisnel@obeo.fr>
  • Loading branch information
@etraisnel2 @pdulth
etraisnel2 authored and pdulth committed Dec 13, 2023
1 parent 9484962 commit 55d468c
Show file tree
Hide file tree
Showing 16 changed files with 60 additions and 85 deletions.
8 changes: 4 additions & 4 deletions features/org.polarsys.capella.vp.requirements.af.feature/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,15 @@
<build>
<plugins>
<plugin>
<groupId>org.eclipse.tycho.extras</groupId>
<artifactId>tycho-source-feature-plugin</artifactId>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-source-plugin</artifactId>
<version>${tycho-version}</version>
<executions>
<execution>
<phase>package</phase>
<id>source-feature</id>
<id>feature-source</id>
<goals>
<goal>source-feature</goal>
<goal>feature-source</goal>
</goals>
<configuration>
<excludes>
Expand Down
8 changes: 4 additions & 4 deletions features/org.polarsys.capella.vp.requirements.cdo.feature/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,15 @@
<build>
<plugins>
<plugin>
<groupId>org.eclipse.tycho.extras</groupId>
<artifactId>tycho-source-feature-plugin</artifactId>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-source-plugin</artifactId>
<version>${tycho-version}</version>
<executions>
<execution>
<phase>package</phase>
<id>source-feature</id>
<id>feature-source</id>
<goals>
<goal>source-feature</goal>
<goal>feature-source</goal>
</goals>
<configuration>
<excludes>
Expand Down
10 changes: 5 additions & 5 deletions features/org.polarsys.capella.vp.requirements.feature/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,15 @@
<build>
<plugins>
<plugin>
<groupId>org.eclipse.tycho.extras</groupId>
<artifactId>tycho-source-feature-plugin</artifactId>
<version>${tycho-extras-version}</version>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-source-plugin</artifactId>
<version>${tycho-version}</version>
<executions>
<execution>
<phase>package</phase>
<id>source-feature</id>
<id>feature-source</id>
<goals>
<goal>source-feature</goal>
<goal>feature-source</goal>
</goals>
<configuration>
<excludes>
Expand Down
8 changes: 4 additions & 4 deletions features/org.polarsys.capella.vp.requirements.importer.feature/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,15 @@
<build>
<plugins>
<plugin>
<groupId>org.eclipse.tycho.extras</groupId>
<artifactId>tycho-source-feature-plugin</artifactId>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-source-plugin</artifactId>
<version>${tycho-version}</version>
<executions>
<execution>
<phase>package</phase>
<id>source-feature</id>
<id>feature-source</id>
<goals>
<goal>source-feature</goal>
<goal>feature-source</goal>
</goals>
<configuration>
<excludes>
Expand Down
8 changes: 4 additions & 4 deletions features/org.polarsys.capella.vp.requirements.representation.feature/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,15 @@
<build>
<plugins>
<plugin>
<groupId>org.eclipse.tycho.extras</groupId>
<artifactId>tycho-source-feature-plugin</artifactId>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-source-plugin</artifactId>
<version>${tycho-version}</version>
<executions>
<execution>
<phase>package</phase>
<id>source-feature</id>
<id>feature-source</id>
<goals>
<goal>source-feature</goal>
<goal>feature-source</goal>
</goals>
<configuration>
<excludes>
Expand Down
8 changes: 4 additions & 4 deletions features/org.polarsys.capella.vp.requirements.tests.feature/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,15 @@
<build>
<plugins>
<plugin>
<groupId>org.eclipse.tycho.extras</groupId>
<artifactId>tycho-source-feature-plugin</artifactId>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-source-plugin</artifactId>
<version>${tycho-version}</version>
<executions>
<execution>
<phase>package</phase>
<id>source-feature</id>
<id>feature-source</id>
<goals>
<goal>source-feature</goal>
<goal>feature-source</goal>
</goals>
<configuration>
<excludes>
Expand Down
8 changes: 4 additions & 4 deletions features/org.polarsys.capella.vp.requirements.ui.feature/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,15 @@
<build>
<plugins>
<plugin>
<groupId>org.eclipse.tycho.extras</groupId>
<artifactId>tycho-source-feature-plugin</artifactId>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-source-plugin</artifactId>
<version>${tycho-version}</version>
<executions>
<execution>
<phase>package</phase>
<id>source-feature</id>
<id>feature-source</id>
<goals>
<goal>source-feature</goal>
<goal>feature-source</goal>
</goals>
<configuration>
<excludes>
Expand Down
8 changes: 4 additions & 4 deletions features/org.polarsys.kitalpha.vp.requirements.af.feature/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,15 @@
<build>
<plugins>
<plugin>
<groupId>org.eclipse.tycho.extras</groupId>
<artifactId>tycho-source-feature-plugin</artifactId>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-source-plugin</artifactId>
<version>${tycho-version}</version>
<executions>
<execution>
<phase>package</phase>
<id>source-feature</id>
<id>feature-source</id>
<goals>
<goal>source-feature</goal>
<goal>feature-source</goal>
</goals>
<configuration>
<excludes>
Expand Down
8 changes: 4 additions & 4 deletions features/org.polarsys.kitalpha.vp.requirements.docgen.feature/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,15 @@
<build>
<plugins>
<plugin>
<groupId>org.eclipse.tycho.extras</groupId>
<artifactId>tycho-source-feature-plugin</artifactId>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-source-plugin</artifactId>
<version>${tycho-version}</version>
<executions>
<execution>
<phase>package</phase>
<id>source-feature</id>
<id>feature-source</id>
<goals>
<goal>source-feature</goal>
<goal>feature-source</goal>
</goals>
<configuration>
<excludes>
Expand Down
8 changes: 4 additions & 4 deletions features/org.polarsys.kitalpha.vp.requirements.feature/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,15 @@
<build>
<plugins>
<plugin>
<groupId>org.eclipse.tycho.extras</groupId>
<artifactId>tycho-source-feature-plugin</artifactId>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-source-plugin</artifactId>
<version>${tycho-version}</version>
<executions>
<execution>
<phase>package</phase>
<id>source-feature</id>
<id>feature-source</id>
<goals>
<goal>source-feature</goal>
<goal>feature-source</goal>
</goals>
<configuration>
<excludes>
Expand Down
8 changes: 4 additions & 4 deletions features/org.polarsys.kitalpha.vp.requirements.representation.feature/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,15 @@
<build>
<plugins>
<plugin>
<groupId>org.eclipse.tycho.extras</groupId>
<artifactId>tycho-source-feature-plugin</artifactId>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-source-plugin</artifactId>
<version>${tycho-version}</version>
<executions>
<execution>
<phase>package</phase>
<id>source-feature</id>
<id>feature-source</id>
<goals>
<goal>source-feature</goal>
<goal>feature-source</goal>
</goals>
<configuration>
<excludes>
Expand Down
8 changes: 4 additions & 4 deletions features/org.polarsys.kitalpha.vp.requirements.ui.feature/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,15 @@
<build>
<plugins>
<plugin>
<groupId>org.eclipse.tycho.extras</groupId>
<artifactId>tycho-source-feature-plugin</artifactId>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-source-plugin</artifactId>
<version>${tycho-version}</version>
<executions>
<execution>
<phase>package</phase>
<id>source-feature</id>
<id>feature-source</id>
<goals>
<goal>source-feature</goal>
<goal>feature-source</goal>
</goals>
<configuration>
<excludes>
Expand Down
13 changes: 7 additions & 6 deletions plugins/org.polarsys.capella.vp.requirements.importer/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,6 @@ Require-Bundle: org.eclipse.core.runtime,
org.eclipse.emf.diffmerge.bridge.mapping,
org.eclipse.emf.diffmerge.ui,
org.eclipse.emf.diffmerge.ui.sirius;visibility:=reexport,
org.eclipse.rmf.reqif10,
org.eclipse.rmf.reqif10.common,
org.eclipse.rmf.reqif10.serialization,
org.eclipse.rmf.reqif10.xhtml,
org.polarsys.capella.core.compare;visibility:=reexport,
org.polarsys.capella.core.data.gen,
org.polarsys.capella.common.transition;visibility:=reexport,
Expand All @@ -40,7 +36,12 @@ Export-Package: org.polarsys.capella.vp.requirements.importer,
org.polarsys.capella.vp.requirements.importer.transposer.activities,
org.polarsys.capella.vp.requirements.importer.transposer.bridge,
org.polarsys.capella.vp.requirements.importer.transposer.bridge.categories,
org.polarsys.capella.vp.requirements.importer.transposer.launcher,
org.polarsys.capella.vp.requirements.importer.transposer.policies
org.polarsys.capella.vp.requirements.importer.transposer.launcher,
org.polarsys.capella.vp.requirements.importer.transposer.policies
Import-Package: org.eclipse.rmf.reqif10,
org.eclipse.rmf.reqif10.common.util,
org.eclipse.rmf.reqif10.serialization,
org.eclipse.rmf.reqif10.xhtml,
org.eclipse.rmf.reqif10.datatypes
Bundle-Localization: plugin
Bundle-Vendor: %providerName
2 changes: 2 additions & 0 deletions plugins/org.polarsys.capella.vp.requirements.importer/README.MD
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
REQIF dependencies MUST stay in the import package section
If you move it to required bundles, it will cause an issue with javax (for Java > 1.8)
30 changes: 1 addition & 29 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
<tycho.scmUrl>scm:git:http://git.polarsys.org/c/capella/capella-requirements-vp.git</tycho.scmUrl>

<!-- for packaging -->
<eclipse-repo.url>http://download.eclipse.org/releases/neon</eclipse-repo.url>
<eclipse-repo.url>http://download.eclipse.org/releases/oxygen</eclipse-repo.url>
<packagedAddonName>Requirements</packagedAddonName>

<!-- for junit -->
Expand Down Expand Up @@ -319,20 +319,6 @@
</activation>
<build>
<plugins>
<plugin>
<groupId>org.eclipse.tycho.extras</groupId>
<artifactId>tycho-pack200a-plugin</artifactId>
<version>${tycho-extras-version}</version>
<executions>
<execution>
<id>pack200-normalize</id>
<phase>package</phase>
<goals>
<goal>normalize</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.eclipse.cbi.maven.plugins</groupId>
<artifactId>eclipse-jarsigner-plugin</artifactId>
Expand All @@ -347,20 +333,6 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.eclipse.tycho.extras</groupId>
<artifactId>tycho-pack200b-plugin</artifactId>
<version>${tycho-extras-version}</version>
<executions>
<execution>
<id>pack200-pack</id>
<phase>package</phase>
<goals>
<goal>pack</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
<pluginRepositories>
Expand Down
2 changes: 1 addition & 1 deletion releng/org.polarsys.capella.vp.requirements.target/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
<repository>
<id>targetplatform-tp</id>
<layout>p2</layout>
<url>https://download.eclipse.org/releases/2022-12</url>
<url>https://download.eclipse.org/releases/2023-03</url>
</repository>
<repository>
<id>targetplatform</id>
Expand Down

0 comments on commit 55d468c

Please sign in to comment.