Skip to content

Commit

Permalink
Relax version requirement to Epsilon 2.1 and test on it as well
Browse files Browse the repository at this point in the history
  • Loading branch information
agarciadom committed Nov 5, 2024
1 parent 4185003 commit bda295d
Show file tree
Hide file tree
Showing 15 changed files with 769 additions and 7 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/build-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,7 @@ jobs:
cache: maven
- name: Build with Tycho
run: mvn --batch-mode -U -T 1C clean install
- name: Build with Tycho and older Epsilon
run: mvn --batch-mode -P epsilon-oldest-stable -U -T 1C clean test
- name: Build with plain Maven
run: mvn --batch-mode -f pom-plain.xml clean install
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Bundle-Name: Developer Tools for Epsilon Model Connectivity RDF driver
Bundle-SymbolicName: org.eclipse.epsilon.emc.rdf.dt;singleton:=true
Bundle-Version: 1.0.0.qualifier
Require-Bundle: org.eclipse.epsilon.emc.rdf;bundle-version="1.0.0",
org.eclipse.epsilon.common.dt;bundle-version="2.5.0"
org.eclipse.epsilon.common.dt;bundle-version="2.1.0"
Bundle-Vendor: University of York
Automatic-Module-Name: org.eclipse.epsilon.emc.rdf.dt
Bundle-RequiredExecutionEnvironment: JavaSE-17
4 changes: 2 additions & 2 deletions bundles/org.eclipse.epsilon.emc.rdf/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Bundle-Name: Epsilon Model Connectivity driver for RDF
Bundle-SymbolicName: org.eclipse.epsilon.emc.rdf
Bundle-Version: 1.0.0.qualifier
Export-Package: org.eclipse.epsilon.emc.rdf
Require-Bundle: org.eclipse.epsilon.eol.engine;bundle-version="2.5.0",
Require-Bundle: org.eclipse.epsilon.eol.engine;bundle-version="2.1.0",
wrapped.org.apache.jena.jena-arq;bundle-version="5.1.0",
wrapped.org.apache.jena.jena-core;bundle-version="5.1.0",
wrapped.org.apache.jena.jena-base;bundle-version="5.1.0",
Expand All @@ -15,6 +15,6 @@ Require-Bundle: org.eclipse.epsilon.eol.engine;bundle-version="2.5.0",
com.github.ben-manes.caffeine;bundle-version="3.1.8",
org.apache.commons.commons-compress;bundle-version="1.26.2",
com.google.guava;bundle-version="15.0.0"
Bundle-Vendor: Eclipse.org
Bundle-Vendor: University of York
Automatic-Module-Name: org.eclipse.epsilon.emc.rdf
Bundle-RequiredExecutionEnvironment: JavaSE-17
20 changes: 19 additions & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@
<target>
<artifact>
<groupId>${project.groupId}</groupId>
<artifactId>org.eclipse.epsilon.emc.rdf.target</artifactId>
<artifactId>${target.artifactId}</artifactId>
<version>${project.version}</version>
</artifact>
</target>
Expand Down Expand Up @@ -138,4 +138,22 @@
</pluginManagement>
</build>

<profiles>
<profile>
<id>epsilon-latest-stable</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
<properties>
<target.artifactId>org.eclipse.epsilon.emc.rdf.target</target.artifactId>
</properties>
</profile>
<profile>
<id>epsilon-oldest-stable</id>
<properties>
<target.artifactId>org.eclipse.epsilon.emc.rdf.target.epsilon21</target.artifactId>
</properties>
</profile>
</profiles>

</project>
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="output" path="bin"/>
</classpath>
28 changes: 28 additions & 0 deletions releng/org.eclipse.epsilon.emc.rdf.target.epsilon21/.project
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>org.eclipse.epsilon.emc.rdf.target.epsilon21</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.pde.ManifestBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.pde.SchemaBuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
</projectDescription>
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
org.eclipse.jdt.core.compiler.release=disabled
org.eclipse.jdt.core.compiler.source=1.8
300 changes: 300 additions & 0 deletions releng/org.eclipse.epsilon.emc.rdf.target.epsilon21/EPL-2.0.html

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: EMC RDF Driver Target Platform with Epsilon 2.1
Bundle-SymbolicName: org.eclipse.epsilon.emc.rdf.target.epsilon21
Bundle-Version: 1.0.0.qualifier
Bundle-Vendor: University of York
Automatic-Module-Name: org.eclipse.epsilon.target
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
28 changes: 28 additions & 0 deletions releng/org.eclipse.epsilon.emc.rdf.target.epsilon21/about.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
<title>About</title>
</head>
<body lang="EN-US">
<h2>About This Content</h2>

<p>April 27, 2020</p>
<h3>License</h3>

<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise
indicated below, the Content is provided to you under the terms and conditions of the
Eclipse Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is available
at <a href="http://www.eclipse.org/legal/epl-v20.html">http://www.eclipse.org/legal/epl-v20.html</a>.
For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
apply to your use of any object code in the Content. Check the Redistributor's license that was
provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
indicated below, the terms and conditions of the EPL still apply to any source code in the Content
and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>

</body>
</html>
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
bin.includes = META-INF/,\
.
Original file line number Diff line number Diff line change
@@ -0,0 +1,184 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
<target name="EMC RDF Target Platform with Epsilon 2.1" sequenceNumber="1730829899">
<locations>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.license.feature.group" version="0.0.0"/>
<repository location="https://download.eclipse.org/cbi/updates/license"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.e4.core.tools.feature.feature.group" version="0.0.0"/>
<unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
<unit id="org.eclipse.emf.validation.sdk.feature.group" version="0.0.0"/>
<unit id="org.eclipse.equinox.sdk.feature.group" version="0.0.0"/>
<unit id="org.eclipse.jdt.feature.group" version="0.0.0"/>
<unit id="org.eclipse.pde.feature.group" version="0.0.0"/>
<unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
<unit id="org.eclipse.sdk" version="0.0.0"/>
<unit id="org.eclipse.rcp.feature.group" version="0.0.0"/>
<unit id="org.eclipse.sdk.ide" version="0.0.0"/>
<unit id="org.eclipse.egit.feature.group" version="0.0.0"/>
<unit id="org.eclipse.ocl.all.sdk.feature.group" version="0.0.0"/>
<unit id="org.eclipse.sirius.runtime.feature.group" version="0.0.0"/>
<unit id="org.eclipse.sirius.runtime.ide.ui.feature.group" version="0.0.0"/>
<unit id="org.eclipse.sirius.properties.feature.feature.group" version="0.0.0"/>
<unit id="org.eclipse.eef.sdk.feature.feature.group" version="0.0.0"/>
<unit id="org.eclipse.xsd.sdk.feature.group" version="0.0.0"/>
<unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
<unit id="org.eclipse.xtext.runtime.feature.group" version="0.0.0"/>
<unit id="org.eclipse.m2m.qvt.oml.sdk.feature.group" version="0.0.0"/>
<unit id="org.eclipse.emf.cdo.sdk.feature.group" version="0.0.0"/>
<repository location="https://download.eclipse.org/releases/2023-12"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.emf.emfatic.feature.group" version="0.0.0"/>
<repository location="https://download.eclipse.org/emfatic/update"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.emf.compare.feature.group" version="0.0.0"/>
<unit id="org.eclipse.emf.compare.ide.ui.feature.group" version="0.0.0"/>
<unit id="org.eclipse.emf.compare.rcp.ui.feature.group" version="0.0.0"/>
<unit id="org.eclipse.emf.compare.uml2.feature.group" version="0.0.0"/>
<repository location="https://download.eclipse.org/modeling/emf/compare/updates/releases/3.3/R202401051648"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="com.atlassian.commonmark" version="0.15.1.v20200707-1444"/>
<unit id="com.atlassian.commonmark-gfm-strikethrough" version="0.15.1.v20200707-1444"/>
<unit id="com.atlassian.commonmark-gfm-tables" version="0.15.1.v20200707-1444"/>
<unit id="com.atlassian.commonmark-heading-anchor" version="0.15.1.v20200707-1444"/>
<unit id="com.atlassian.commonmark-image-attributes" version="0.15.1.v20200707-1444"/>
<unit id="com.atlassian.commonmark-ins" version="0.15.1.v20200707-1444"/>
<unit id="com.atlassian.commonmark-task-list-items" version="0.15.1.v20200707-1444"/>
<unit id="com.atlassian.commonmark-yaml" version="0.15.1.v20200707-1444"/>
<unit id="com.google.gdata" version="1.47.1.v20200819-2030"/>
<unit id="javax.xml.stream" version="1.0.1.v201004272200"/>
<unit id="javax.annotation" version="1.3.5.v20200909-1856"/>
<unit id="net.bytebuddy.byte-buddy" version="1.7.9.v20180420-1519"/>
<unit id="net.bytebuddy.byte-buddy-agent" version="1.7.9.v20180420-1519"/>
<unit id="org.antlr.runtime" version="3.5.2.v20200724-1452"/>
<unit id="org.apache.commons.cli" version="1.4.0.v20200417-1444"/>
<unit id="org.apache.commons.codec" version="1.14.0.v20200818-1422"/>
<unit id="org.apache.commons.collections" version="3.2.2.v201511171945"/>
<unit id="org.apache.commons.collections4" version="4.4.0.v20200420-1700"/>
<unit id="org.apache.commons.compress" version="1.21.0.v20211103-2100"/>
<unit id="org.apache.commons.csv" version="1.8.0.v20200804-1438"/>
<unit id="org.apache.commons.io" version="2.8.0.v20210415-0900"/>
<unit id="org.apache.commons.lang3" version="3.1.0.v201403281430"/>
<unit id="org.apache.commons.logging" version="1.2.0.v20180409-1502"/>
<unit id="org.apache.commons.math3" version="3.6.1.v20200817-1830"/>
<unit id="org.apache.santuario.xmlsec" version="2.2.0.v20200818-1422"/>
<unit id="org.apache.xmlbeans" version="3.1.0.v20200922-1359"/>
<unit id="org.jdom" version="1.1.1.v201101151400"/>
<unit id="org.jsoup" version="1.7.2.v201411291515"/>
<unit id="org.jsoup.source" version="1.7.2.v201411291515"/>
<unit id="org.mockito" version="2.23.0.v20200310-1642"/>
<unit id="org.objenesis" version="2.6.0.v20180420-1519"/>
<unit id="org.slf4j.api" version="1.7.2.v20121108-1250"/>
<unit id="org.yaml.snakeyaml" version="1.27.0.v20201111-1638"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20211213173813/repository"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.acceleo.ui.interpreter.feature.group" version="0.0.0"/>
<repository location="https://download.eclipse.org/acceleo/updates/releases/3.7/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.lsp4j.debug" version="0.0.0"/>
<repository location="https://download.eclipse.org/lsp4j/updates/releases/0.23.1/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.lsp4e" version="0.0.0"/>
<unit id="org.eclipse.lsp4e.debug" version="0.0.0"/>
<repository location="https://download.eclipse.org/lsp4e/releases/0.26.3/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.mylyn.wikitext" version="0.0.0"/>
<unit id="org.eclipse.mylyn.wikitext.markdown" version="0.0.0"/>
<unit id="org.eclipse.mylyn.wikitext.markdown.ui" version="0.0.0"/>
<repository location="https://download.eclipse.org/mylyn/updates/release/4.3.0/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.epsilon.eol.engine" version="0.0.0"/>
<unit id="org.eclipse.epsilon.eol.dt" version="0.0.0"/>
<unit id="org.eclipse.epsilon.core.feature.feature.group" version="0.0.0"/>
<repository location="http://download.eclipse.org/epsilon/updates/2.1/"/>
</location>
<location includeDependencyDepth="infinite" includeDependencyScopes="compile,test,runtime" includeSource="true" missingManifest="generate" type="Maven" label="MavenDependencies">
<dependencies>
<dependency>
<groupId>net.sourceforge.plantuml</groupId>
<artifactId>plantuml-epl</artifactId>
<version>1.2023.11</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>com.googlecode.json-simple</groupId>
<artifactId>json-simple</artifactId>
<version>1.1.1</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi</artifactId>
<version>4.1.2</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi-ooxml</artifactId>
<version>4.1.2</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi-ooxml-schemas</artifactId>
<version>4.1.2</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.jena</groupId>
<artifactId>jena-rdfpatch</artifactId>
<version>5.1.0</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.jena</groupId>
<artifactId>jena-ontapi</artifactId>
<version>5.1.0</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.jena</groupId>
<artifactId>jena-shacl</artifactId>
<version>5.1.0</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.jena</groupId>
<artifactId>jena-shex</artifactId>
<version>5.1.0</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.jena</groupId>
<artifactId>jena-tdb1</artifactId>
<version>5.1.0</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.jena</groupId>
<artifactId>jena-tdb2</artifactId>
<version>5.1.0</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.jena</groupId>
<artifactId>jena-rdfconnection</artifactId>
<version>5.1.0</version>
<type>jar</type>
</dependency>
</dependencies>
</location>
</locations>
<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
</target>
Loading

0 comments on commit bda295d

Please sign in to comment.