Skip to content

Commit

Permalink
Integration Build
Browse files Browse the repository at this point in the history
- Add type="features" to product file
- Add org.eclipse.ecf.filetransfer.httpclientjava.feature
- Remove slf4j from target as this doesn't suppress the log message in this version
  • Loading branch information
Phillipus committed Feb 15, 2024
1 parent 88b807d commit 89d0397
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 11 deletions.
3 changes: 2 additions & 1 deletion com.archimatetool.editor.product/archi.product
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<?pde version="3.5"?>

<product name="Archi" uid="com.archimatetool.editor.product" id="com.archimatetool.editor.product" application="com.archimatetool.editor.app" version="5.2.0.qualifier" useFeatures="true" includeLaunchers="true" autoIncludeRequirements="true">
<product name="Archi" uid="com.archimatetool.editor.product" id="com.archimatetool.editor.product" application="com.archimatetool.editor.app" version="5.2.0.qualifier" type="features" includeLaunchers="true" autoIncludeRequirements="true">

<configIni use="">
</configIni>
Expand Down Expand Up @@ -78,6 +78,7 @@ openFile
<feature id="org.eclipse.ecf.core.ssl.feature"/>
<feature id="org.eclipse.equinox.p2.extras.feature"/>
<feature id="org.eclipse.ecf.filetransfer.httpclient5.feature"/>
<feature id="org.eclipse.ecf.filetransfer.httpclientjava.feature"/>
<feature id="org.eclipse.emf.compare"/>
<feature id="org.eclipse.jgit"/>
<feature id="org.eclipse.jgit.ssh.apache"/>
Expand Down
18 changes: 10 additions & 8 deletions com.archimatetool.editor.product/archi.target
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,18 @@
<target name="Archi">
<locations>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/releases/2023-06"/>
<unit id="org.eclipse.sdk.ide" version="4.28.0.I20230605-0440"/>
<unit id="org.eclipse.emf.compare.feature.group" version="3.3.21.202212280858"/>
<unit id="org.eclipse.jgit.feature.group" version="6.6.0.202305301015-r"/>
<unit id="org.eclipse.jgit.ssh.apache.feature.group" version="6.6.0.202305301015-r"/>
<repository location="https://download.eclipse.org/eclipse/updates/4.31-I-builds"/>
<unit id="org.eclipse.sdk.ide" version="0.0.0"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/tools/orbit/simrel/maven-osgi/release/4.29.0"/>
<unit id="slf4j.api" version="1.7.36"/>
<unit id="org.mockito.mockito-core" version="5.5.0"/>
<repository location="https://download.eclipse.org/releases/2024-03"/>
<unit id="org.eclipse.emf.compare.feature.group" version="0.0.0"/>
<unit id="org.eclipse.jgit.feature.group" version="0.0.0"/>
<unit id="org.eclipse.jgit.ssh.apache.feature.group" version="0.0.0"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/tools/orbit/simrel/maven-osgi/release/4.30.0"/>
<unit id="org.mockito.mockito-core" version="5.7.0"/>
</location>
</locations>
</target>
9 changes: 7 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,15 @@
</properties>

<repositories>
<repository>
<id>Eclipse I-build</id>
<layout>p2</layout>
<url>https://download.eclipse.org/eclipse/updates/4.31-I-builds</url>
</repository>
<repository>
<id>Eclipse</id>
<layout>p2</layout>
<url>https://download.eclipse.org/releases/2023-06</url>
<url>https://download.eclipse.org/releases/2024-03</url>
</repository>
</repositories>

Expand Down Expand Up @@ -73,7 +78,7 @@
<repository>
<id>Orbit</id>
<layout>p2</layout>
<url>https://download.eclipse.org/tools/orbit/simrel/maven-osgi/release/4.29.0</url>
<url>https://download.eclipse.org/tools/orbit/simrel/maven-osgi/release/4.30.0</url>
</repository>
</repositories>
</profile>
Expand Down

0 comments on commit 89d0397

Please sign in to comment.