From b98a1a2d4a1fa22084de9fcfda942d6695c8e284 Mon Sep 17 00:00:00 2001
From: Betty <basp91@gmail.com>
Date: Tue, 26 Jan 2021 15:37:12 +0000
Subject: [PATCH] attaching sources

---
 .gitignore                                    |  1 +
 .../META-INF/MANIFEST.MF                      |  6 +--
 .../META-INF/MANIFEST.MF                      |  1 -
 pom.xml                                       | 42 ++++++++++++++-----
 .../category.xml                              | 11 ++++-
 5 files changed, 45 insertions(+), 16 deletions(-)

diff --git a/.gitignore b/.gitignore
index a7831e3..0e6775e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
 **/.idea/**
 *.launch
 **/testOutput/**
+**/target-plain/**
\ No newline at end of file
diff --git a/plugins/org.epsilonlabs.modelflow.engine/META-INF/MANIFEST.MF b/plugins/org.epsilonlabs.modelflow.engine/META-INF/MANIFEST.MF
index 582ecf8..0d104d0 100644
--- a/plugins/org.epsilonlabs.modelflow.engine/META-INF/MANIFEST.MF
+++ b/plugins/org.epsilonlabs.modelflow.engine/META-INF/MANIFEST.MF
@@ -39,7 +39,7 @@ Export-Package: org.epsilonlabs.modelflow,
  org.epsilonlabs.modelflow.parse,
  org.epsilonlabs.modelflow.registry,
  org.epsilonlabs.modelflow.repository
-Require-Bundle: org.epsilonlabs.modelflow.dependencies,
+Require-Bundle: org.epsilonlabs.modelflow.dependencies;visibility:=reexport,
  com.google.inject;visibility:=reexport,
  com.google.guava,
  org.eclipse.emf.ecore.xmi;visibility:=reexport,
@@ -47,8 +47,8 @@ Require-Bundle: org.epsilonlabs.modelflow.dependencies,
  org.apache.commons.csv,
  org.eclipse.equinox.common,
  org.eclipse.core.runtime,
- org.eclipse.emf.ecore;visibility:=reexport
+ org.eclipse.emf.ecore;visibility:=reexport,
+ javax.xml.bind;visibility:=reexport
 Bundle-ActivationPolicy: lazy
 Import-Package: com.google.inject.multibindings,
- javax.xml.bind,
  org.slf4j
diff --git a/plugins/org.epsilonlabs.modelflow.mmc.epsilon/META-INF/MANIFEST.MF b/plugins/org.epsilonlabs.modelflow.mmc.epsilon/META-INF/MANIFEST.MF
index 0e9dd67..7460fc6 100644
--- a/plugins/org.epsilonlabs.modelflow.mmc.epsilon/META-INF/MANIFEST.MF
+++ b/plugins/org.epsilonlabs.modelflow.mmc.epsilon/META-INF/MANIFEST.MF
@@ -25,4 +25,3 @@ Export-Package: org.epsilonlabs.modelflow.mmc.epsilon.plugin,
  org.epsilonlabs.modelflow.mmc.epsilon.task.trace,
  org.epsilonlabs.modelflow.mmc.epsilon.task.trace.egl
 Automatic-Module-Name: org.epsilonlabs.modelflow.mmc.epsilon
-Import-Package: javax.xml.bind
diff --git a/pom.xml b/pom.xml
index 1d740a8..07f4c58 100644
--- a/pom.xml
+++ b/pom.xml
@@ -73,6 +73,7 @@
         <executions>
           <execution>
             <id>plugin-source</id>
+            <phase>package</phase>
             <goals>
               <goal>plugin-source</goal>
             </goals>
@@ -84,22 +85,43 @@
           </execution>
         </executions>
       </plugin>
-
+      <plugin>
+          <groupId>org.eclipse.tycho.extras</groupId>
+          <artifactId>tycho-source-feature-plugin</artifactId>
+          <version>${tycho.version}</version>
+          <executions>
+              <execution>
+                  <id>source-feature</id>
+                  <phase>package</phase>
+                  <goals>
+                      <goal>source-feature</goal>
+                  </goals>
+              </execution>
+          </executions>
+          <configuration>
+              <excludes>
+              <plugin id="org.epsilonlabs.modelflow.target" />
+              <plugin id="org.epsilonlabs.modelflow.updatesite" />
+              <plugin id="org.epsilonlabs.modelflow.logback" />
+              <plugin id="org.epsilonlabs.modelflow.dependencies" />
+              <plugin id="org.epsilonlabs.modelflow.jacoco" />
+              </excludes>
+          </configuration>
+      </plugin>
       <plugin>
         <groupId>org.eclipse.tycho</groupId>
-        <artifactId>tycho-packaging-plugin</artifactId>
+        <artifactId>tycho-p2-plugin</artifactId>
         <version>${tycho.version}</version>
         <executions>
-          <execution>
-            <phase>package</phase>
-            <id>package-feature</id>
-            <configuration>
-              <finalName>${project.artifactId}_${unqualifiedVersion}.${buildQualifier}</finalName>
-            </configuration>
-          </execution>
+            <execution>
+                <id>attach-p2-metadata</id>
+                <phase>package</phase>
+                <goals>
+                    <goal>p2-metadata</goal>
+                </goals>
+            </execution>
         </executions>
       </plugin>
-
       <plugin>
         <groupId>org.eclipse.tycho</groupId>
         <artifactId>target-platform-configuration</artifactId>
diff --git a/releng/org.epsilonlabs.modelflow.updatesite/category.xml b/releng/org.epsilonlabs.modelflow.updatesite/category.xml
index 919db83..db6ea75 100644
--- a/releng/org.epsilonlabs.modelflow.updatesite/category.xml
+++ b/releng/org.epsilonlabs.modelflow.updatesite/category.xml
@@ -6,15 +6,21 @@
    <feature url="features/org.epsilonlabs.modelflow.feature_0.0.1.qualifier.jar" id="org.epsilonlabs.modelflow.feature" version="0.0.1.qualifier">
       <category name="org.epsilonlabs.modelflow"/>
    </feature>
-   <feature url="features/org.epsilonlabs.modelflow.atl.feature_0.0.1.qualifier.jar" id="org.epsilonlabs.modelflow.atl.feature" version="0.0.1.qualifier">
-      <category name="org.epsilonlabs.modelflow.mmc"/>
+   <feature id="org.epsilonlabs.modelflow.feature.source" version="0.0.1.qualifier">
+      <category name="org.epsilonlabs.modelflow"/>
    </feature>
    <feature url="features/org.epsilonlabs.modelflow.emf.feature_0.0.1.qualifier.jar" id="org.epsilonlabs.modelflow.emf.feature" version="0.0.1.qualifier">
       <category name="org.epsilonlabs.modelflow.mmc"/>
    </feature>
+   <feature id="org.epsilonlabs.modelflow.emf.feature.source" version="0.0.1.qualifier">
+      <category name="org.epsilonlabs.modelflow.mmc"/>
+   </feature>
    <feature url="features/org.epsilonlabs.modelflow.epsilon.feature_0.0.1.qualifier.jar" id="org.epsilonlabs.modelflow.epsilon.feature" version="0.0.1.qualifier">
       <category name="org.epsilonlabs.modelflow.mmc"/>
    </feature>
+   <feature id="org.epsilonlabs.modelflow.epsilon.feature.source" version="0.0.1.qualifier">
+      <category name="org.epsilonlabs.modelflow.mmc"/>
+   </feature>
    <category-def name="org.epsilonlabs.modelflow" label="ModelfFlow">
       <description>
          Parser and execution engines for ModelFlow.
@@ -25,6 +31,7 @@
          Model Management Tasks and Model Types
       </description>
    </category-def>
+   
    <repository-reference location="http://download.eclipse.org/emfatic/update" enabled="true" />
    <repository-reference location="http://download.eclipse.org/mmt/qvto/updates/releases" enabled="true" />
    <repository-reference location="https://download.eclipse.org/modeling/gmp/gmf-tooling/updates/releases" enabled="true" />