Correct several errors revealed by new Tycho version

Tycho version 2.7.3 is more picky are revealed several small configuration errors in poms and manifests - Update dependency to Commons to version 1.1.1 - Add emf.compare repository to pom - Import slf4j-api to some features
atlanmod · Jun 3, 2022 · c9027cd · c9027cd
1 parent 1653f1e
commit c9027cd
Show file tree

Hide file tree

Showing 13 changed files with 101 additions and 43 deletions.
diff --git a/neoemf-doc/antora.yml b/neoemf-doc/antora.yml
@@ -19,7 +19,6 @@ asciidoc:
   extensions:
     - asciidoctor-plantuml
 nav:
-- modules/ROOT/nav.adoc
 - modules/user/nav.adoc
 - modules/developer/nav.adoc
 - modules/research/nav.adoc

diff --git a/neoemf-doc/modules/ROOT/pages/index.adoc b/neoemf-doc/modules/ROOT/pages/index.adoc
@@ -1,7 +1,6 @@
 = NeoEMF Documentation Site
-:navtitle: Atlanmod
 
-== What Is NeoEMF?
+== About NeoEMF
 
 NeoEMF is an https://www.atlanmod.org[AtlanMod] research team project that aims at handling large EMF models in an efficient and scalable way.
 
@@ -23,6 +22,6 @@ But in some situation where time performance is important this is not enough and
 
 NeoEMF is fully EMF compliant, that means there is no modification to do to use it with existing EMF based applications.
 
-Additionally NeoEMF can be plugged with several persistence solutions and is configurable to fit the best your needs (custom caches, in-memory resources, auto-commit,...).
+Additionall0y, NeoEMF can be plugged with several persistence solutions and is configurable to fit the best your needs (custom caches, in-memory resources, auto-commit,...).
 
 In addition, NeoEMF provides a query API to perform optimized OCL queries over models and reify the results as navigable models.
diff --git a/neoemf-doc/modules/user/pages/Installation.adoc b/neoemf-doc/modules/user/pages/Installation.adoc
@@ -3,12 +3,12 @@
 This page details the different way to install NeoEMF and use it in your project.
 Our plugins are bundled as a Maven Artifacts, which are available on http://search.maven.org/#search%7Cga%7C1%7Cneoemf[Maven Central]
 and also as Eclipse Plugins,
-which available on the https://atlanmod.github.io/NeoEMF/releases/latest/plugin/[NeoEMF Update Site].
+which available on the https://www.atlanmod.org/NeoEMF/releases/latest/plugin/[NeoEMF Update Site].
 If you have any question or issue regarding NeoEMF installation you can https://github.com/atlanmod/NeoEMF/issues[open an issue] or l
 ink:neoemf@googlegroups.com[send us a mail].
 
 Once you have successfully integrated NeoEMF in your project, you can browse the JavaDOc of the latest release on NeoEMF's
-https://atlanmod.github.io/NeoEMF/releases/latest/doc/[Website],
+https://www.atlanmod.org/NeoEMF/releases/latest/doc/[Website],
 or check our link:Get-Started[tutorials and demonstrations] to get started with the framework.
 
 *Latest release: 2.1.0*
@@ -40,40 +40,40 @@ NeoEMF is bundled in an update site to ease its integration in Eclipse-based cli
 You can install NeoEMF using the menu:Help[Install New Software] menu and set the update site URL with the following:
 
 
-https://atlanmod.github.io/NeoEMF/releases/latest/plugin/
+https://www.atlanmod.org/NeoEMF/releases/latest/plugin/
 
 
-image::https://atlanmod.github.io/NeoEMF/updatesite/img/eclipse-update.png[Update Site Installation]
+image::https://www.atlanmod.org/NeoEMF/updatesite/img/eclipse-update.png[Update Site Installation]
 
 == Previous Versions
 
 Previous versions are available on maven central, and corresponding update sites can be found online using the following pattern:
 
 
-https://atlanmod.github.io/NeoEMF/releases/<version_number>/plugin/
+https://www.atlanmod.org/NeoEMF/releases/<version_number>/plugin/
 
 For example, you can install NeoEMF 1.0.1 using the following update site URL:
 
 
-https://atlanmod.github.io/NeoEMF/releases/1.0.1/plugin/
+https://www.atlanmod.org/NeoEMF/releases/1.0.1/plugin/
 
 
 Note that previous versions of the documentation are also available online:
 
-https://atlanmod.github.io/NeoEMF/releases/<version_number>/doc/
+https://www.atlanmod.org/NeoEMF/releases/<version_number>/doc/
 
 
 
 == Snapshots
 
 Snapshots are automatically build from the `master` branch of the GitHub repository and the corresponding update site is uploaded and available at:
 
-https://atlanmod.github.io/NeoEMF/releases/snapshot/plugin/
+https://www.atlanmod.org/NeoEMF/releases/snapshot/plugin/
 
 
 Note that snapshot builds correspond to the latest version of the development branch, and can contain bugs and issues that will be solved before the next release. The latest version of the documentation can also be found online at the following URL:
 
-https://atlanmod.github.io/NeoEMF/releases/snapshot/doc/
+https://www.atlanmod.org/NeoEMF/releases/snapshot/doc/
 
 Maven artifacts corresponding to the latest snapshot are not published.
 If you want to use the latest snapshot in your maven application you have to first [build locally](Build) NeoEMF. This will register the latest build in your local maven repository.

diff --git a/neoemf-doc/modules/user/pages/Releases.adoc b/neoemf-doc/modules/user/pages/Releases.adoc
@@ -7,7 +7,7 @@ Note that you can also check the ongoing modifications in the
 https://github.com/atlanmod/NeoEMF/blob/master/CHANGELOG.adoc[CHANGELOG]
 file at the root of the project repository.
 
-== 2.0.0 (_Latest_) - 2022-05-30
+== 2.0.0 (_Latest_) - 2020-10-12
 
 * https://github.com/atlanmod/NeoEMF/releases/tag/v1.0.3[Release Notes]
 * https://github.com/atlanmod/NeoEMF/archive/v1.0.3.zip[Download Sources]

diff --git a/neoemf-utils/p2/pom.xml b/neoemf-utils/p2/pom.xml
@@ -7,7 +7,7 @@
         <groupId>org.atlanmod.neoemf</groupId>
         <artifactId>neoemf</artifactId>
         <version>2.1.0-SNAPSHOT</version>
-        <relativePath>../../</relativePath>
+        <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>neoemf-utils.p2</artifactId>
@@ -26,7 +26,7 @@
         <repository>
             <id>emf-compare</id>
             <layout>p2</layout>
-            <url>http://download.eclipse.org/modeling/emf/compare/updates/releases/3.3</url>
+            <url>http://download.eclipse.org/modeling/emf/compare/updates/releases/latest/</url>
         </repository>
         <repository>
             <id>2020-12</id>

diff --git a/plugins/eclipse/bundles/ui/pom.xml b/plugins/eclipse/bundles/ui/pom.xml
@@ -18,6 +18,20 @@
 
     <dependencies>
 
+        <dependency>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>org.apache.felix.scr</artifactId>
+            <version>2.2.0</version>
+        </dependency>
+
+        <!--
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>1.7.36</version>
+        </dependency>
+        -->
+
         <dependency>
             <groupId>org.atlanmod.neoemf</groupId>
             <artifactId>neoemf-core</artifactId>

diff --git a/...pse/examples/projects/fr.inria.atlanmod.neoemf.eclipse.examples.demo/META-INF/MANIFEST.MF b/...pse/examples/projects/fr.inria.atlanmod.neoemf.eclipse.examples.demo/META-INF/MANIFEST.MF
@@ -11,12 +11,12 @@ Require-Bundle: org.eclipse.emf.ecore,
  org.eclipse.ocl;bundle-version="3.3.100";resolution:=optional,
  org.eclipse.ocl.ecore;bundle-version="3.3.100";resolution:=optional,
  org.atlanmod.neoemf.core;visibility:=reexport,
- org.atlanmod.neoemf.data.blueprints.core;bundle-version="2.0.2.qualifier",
- org.atlanmod.neoemf.data.blueprints.neo4j;bundle-version="2.0.2.qualifier",
- org.atlanmod.neoemf.data.mapdb;bundle-version="2.0.2.qualifier",
- org.atlanmod.neoemf.data.berkeleydb;bundle-version="2.0.2.qualifier",
- org.atlanmod.neoemf.data.hbase;bundle-version="2.0.2.qualifier",
- org.atlanmod.neoemf.io;bundle-version="2.0.2.qualifier",
+ org.atlanmod.neoemf.data.blueprints.core,
+ org.atlanmod.neoemf.data.blueprints.neo4j,
+ org.atlanmod.neoemf.data.mapdb,
+ org.atlanmod.neoemf.data.berkeleydb,
+ org.atlanmod.neoemf.data.hbase,
+ org.atlanmod.neoemf.io,
  org.eclipse.gmt.modisco.java
 Import-Package: org.eclipse.emf.ecore,
  org.eclipse.emf.common,

diff --git a/plugins/eclipse/examples/projects/org.eclipse.gmt.modisco.java/pom.xml b/plugins/eclipse/examples/projects/org.eclipse.gmt.modisco.java/pom.xml
@@ -14,4 +14,26 @@
 
     <packaging>eclipse-plugin</packaging>
 
+    <dependencies>
+
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>30.1-jre</version>
+        </dependency>
+
+        <dependency>
+        	<groupId>org.atlanmod.neoemf</groupId>
+        	<artifactId>neoemf-core</artifactId>
+        	<version>${project.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>1.7.36</version>
+        </dependency>
+
+    </dependencies>
+
 </project>
diff --git a/plugins/eclipse/examples/projects/pom.xml b/plugins/eclipse/examples/projects/pom.xml
@@ -24,12 +24,24 @@
     <properties>
         <generated-sources.location>${project.basedir}/src-gen</generated-sources.location>
         <models.location>${project.basedir}/model</models.location>
-
-        <xtext.version>2.25.0</xtext.version>
     </properties>
 
     <dependencies>
 
+        <!--    OSGI -->
+
+        <dependency>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>org.apache.felix.scr</artifactId>
+            <version>2.2.0</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.util.promise</artifactId>
+            <version>1.2.0</version>
+        </dependency>
+
         <!-- NeoEMF -->
 
         <dependency>
@@ -101,9 +113,13 @@
         <dependency>
             <groupId>org.eclipse.emf</groupId>
             <artifactId>org.eclipse.emf.ecore.xcore.lib</artifactId>
-            <version>1.5.0</version>
+            <version>1.6.0</version>
+            <scope>provided</scope>
         </dependency>
 
+       <!-- org.eclipse.xtext.xbase.lib -->
+
+
     </dependencies>
 
     <build>
@@ -198,23 +214,13 @@
                 <dependencies>
 
                     <!-- Eclipse -->
-<!--  
 					<dependency>
 						<groupId>org.eclipse.platform</groupId>
     					<artifactId>org.eclipse.core.resources</artifactId>
     					<version>3.14.0</version>
 					</dependency>
- -->                   
 
                     <!-- Xtext -->
-
-					<!--
-                    <dependency>
-                        <groupId>org.eclipse.text</groupId>
-                        <artifactId>org.eclipse.text</artifactId>
-                        <version>${xtext.version}</version>
-                    </dependency>
-						-->
 
                     <dependency>
                         <groupId>org.eclipse.xtext</groupId>
@@ -235,13 +241,12 @@
                         <version>${xtext.version}</version>
                     </dependency>
 
-<!--
                     <dependency>
                         <groupId>org.eclipse.xtext</groupId>
                         <artifactId>org.eclipse.xtext.xtext.generator</artifactId>
                         <version>${xtext.version}</version>
                     </dependency>
-						-->
+
 
                     <!-- EMF: Ecore -->
 
@@ -296,7 +301,7 @@
                     <dependency>
                         <groupId>org.eclipse.emf</groupId>
                         <artifactId>org.eclipse.emf.codegen.ecore.xtext</artifactId>
-                        <version>1.5.0</version>
+                        <version>1.6.0</version>
                     </dependency>
 
                 </dependencies>

diff --git a/plugins/eclipse/features/fr.inria.atlanmod.neoemf.core.feature/feature.xml b/plugins/eclipse/features/fr.inria.atlanmod.neoemf.core.feature/feature.xml
@@ -19,7 +19,7 @@
             id="org.atlanmod.commons"
             download-size="0"
             install-size="0"
-            version="1.1.0.qualifier"
+            version="1.1.1"
             unpack="false" />
 
     <plugin

diff --git a/plugins/eclipse/releng/configuration/pom.xml b/plugins/eclipse/releng/configuration/pom.xml
@@ -30,10 +30,15 @@
     </properties>
 
     <repositories>
+        <repository>
+            <id>emf-compare</id>
+            <layout>p2</layout>
+            <url>https://download.eclipse.org/modeling/emf/compare/updates/releases/latest/</url>
+        </repository>
         <repository>
             <id>2020-12</id>
             <layout>p2</layout>
-            <url>http://download.eclipse.org/releases/2020-12/</url>
+            <url>https://download.eclipse.org/releases/2020-12/</url>
         </repository>
     </repositories>
 

diff --git a/plugins/eclipse/releng/update/pom.xml b/plugins/eclipse/releng/update/pom.xml
@@ -15,6 +15,19 @@
     <name>NeoEMF Eclipse Update-Site</name>
 
     <dependencies>
+        <!--    OSGI -->
+
+        <dependency>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>org.apache.felix.scr</artifactId>
+            <version>2.2.0</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.util.promise</artifactId>
+            <version>1.2.0</version>
+        </dependency>
 
         <dependency>
             <groupId>org.atlanmod.neoemf.eclipse</groupId>

diff --git a/pom.xml b/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.atlanmod.commons</groupId>
         <artifactId>commons</artifactId>
-        <version>1.1.0</version>
+        <version>1.1.1</version>
     </parent>
 
     <groupId>org.atlanmod.neoemf</groupId>
@@ -87,7 +87,7 @@
 
     <properties>
         <argLine.global>-Xmx2g --illegal-access=warn --illegal-access=permit --add-exports java.base/jdk.internal.ref=ALL-UNNAMED</argLine.global>
-        <commons.version>1.1.0</commons.version>
+        <commons.version>1.1.1</commons.version>
         <emf.version>[2.15.0,)</emf.version>
         <xtext.version>2.25.0</xtext.version>
         <xcore.version>[1.15.0,)</xcore.version>
@@ -191,7 +191,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-enforcer-plugin</artifactId>
-                <version>3.0.0-M3</version>
+                <version>3.0.0</version>
                 <executions>
                     <execution>
                         <id>enforce-maven</id>
@@ -356,6 +356,7 @@
                     <extensions>true</extensions>
                     <configuration>
                         <instructions>
+                            <!--Bundle-Version>2.1.0.${maven.build.timestamp}</Bundle-Version-->
                             <Bundle-Version>${project.version}</Bundle-Version>
                             <Bundle-ClassPath>.,{maven-dependencies}</Bundle-ClassPath>
                             <Import-Package/>