Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Eclipse 2021-12 #15

Merged
merged 5 commits into from
Dec 20, 2021
Merged

Eclipse 2021-12 #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9dc2fce
Remove obsolete pom files
HeikoKlare Dec 17, 2021
094c616
Upgrade Tycho to 2.5.0
HeikoKlare Dec 17, 2021
c90dcf5
Upgrade to Eclipse 2021-12
HeikoKlare Dec 17, 2021
c95267e
Upgrade to Maven 3.8.4
HeikoKlare Dec 17, 2021
2de3892
Update source feature plugins in Maven build
HeikoKlare Dec 17, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .mvn/extensions.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
<extension>
<groupId>org.eclipse.tycho.extras</groupId>
<artifactId>tycho-pomless</artifactId>
<version>1.0.0</version>
<version>2.5.0</version>
</extension>
</extensions>
2 changes: 1 addition & 1 deletion .mvn/wrapper/maven-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.4/apache-maven-3.8.4-bin.zip
wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar
14 changes: 0 additions & 14 deletions bundles/pom.xml
View file
Open in desktop

This file was deleted.

14 changes: 0 additions & 14 deletions features/pom.xml
View file
Open in desktop

This file was deleted.

24 changes: 7 additions & 17 deletions releng/edu.kit.ipd.sdq.metamodels.demo.parent/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<tycho.version>2.1.0</tycho.version>
<tycho.version>2.5.0</tycho.version>
<mwe.version>1.6.1</mwe.version>
<mwe2.version>2.12.1</mwe2.version>
<emf-codegen.version>2.22.0</emf-codegen.version>
Expand All @@ -19,9 +19,9 @@

<repositories>
<repository>
<id>Eclipse 2020-12</id>
<id>Eclipse 2021-12</id>
<layout>p2</layout>
<url>http://download.eclipse.org/releases/2020-12</url>
<url>http://download.eclipse.org/releases/2021-12</url>
</repository>
</repositories>

Expand Down Expand Up @@ -69,7 +69,7 @@
</configuration>
</plugin>

<!-- Creates source versions of bundles -->
<!-- Creates source versions of bundles and features -->
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-source-plugin</artifactId>
Expand All @@ -81,20 +81,10 @@
<goal>plugin-source</goal>
</goals>
</execution>
</executions>
</plugin>

<!-- Creates source versions of features -->
<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>
<id>feature-source</id>
<goals>
<goal>source-feature</goal>
<goal>feature-source</goal>
</goals>
</execution>
</executions>
Expand All @@ -107,7 +97,7 @@
<version>${tycho.version}</version>
<executions>
<execution>
<id>attached-p2-metadata</id>
<id>attach-p2-metadata</id>
<phase>package</phase>
<goals>
<goal>p2-metadata</goal>
Expand Down