Skip to content

Commit acd6b74

Browse files
authored
Merge pull request #102 from merks/issue-95-2
Improve target platforms with only latest Orbit update site. Thanks Ed!!
2 parents 710472f + fa3ff81 commit acd6b74

File tree

11 files changed

+145
-895
lines changed

11 files changed

+145
-895
lines changed

.github/workflows/maven.yml

+4
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,9 @@ jobs:
2222
java-version: '17'
2323
distribution: 'temurin'
2424
cache: maven
25+
- name: Set up Maven
26+
uses: stCarolas/setup-maven@d6af6abeda15e98926a57b5aa970a96bb37f97d1 # v5
27+
with:
28+
maven-version: 3.9.6
2529
- name: Build with Maven
2630
run: mvn clean verify -Pbaseline-checks -DskipTests=true

applications/kosmos/bundles/org.eclipse.ecf.presence.bot.kosmos/messages.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ newsgroup=Try asking for help on the newsgroups - http\://www.eclipse.org/newsgr
132132
viewvc=Looking for a web interface to the source code released by Eclipse projects? http\://dev.eclipse.org/viewcvs/index.cgi/
133133
circular-debug=You might want to try circular debugging by attaching a debugger to Eclipse itself - http\://borisoneclipse.blogspot.com/2007/01/circular-debugging.html
134134
consolelog=Writing an Eclipse-based application and can't find anything useful in your console and/or getting "Unhandled event loop exceptions"? Add -consoleLog as a 'Program Argument' to your launch configuration. See http\://wiki.eclipse.org/Graphical_Eclipse_FAQs\#I_get_an_unhandled_event_loop_exception_in_my_console._What_gives.3F
135-
source=My source code can be found at http\://git.eclipse.org/c/ecf/org.eclipse.ecf.git/ repository under applications/kosmos/bundles/org.eclipse.ecf.presence.bot.kosmos.
135+
source=My source code can be found at http\://github.com/eclipse/ecf/ repository under applications/kosmos/bundles/org.eclipse.ecf.presence.bot.kosmos.
136136
launcher=To learn more about the Eclipse launcher / binary, see - http\://www.eclipse.org/swt/launcher.html - http\://wiki.eclipse.org/Equinox_Launcher - http\://help.eclipse.org/stable/nftopic/org.eclipse.platform.doc.isv/reference/misc/launcher.html - http\://help.eclipse.org/stable/topic/org.eclipse.platform.doc.user/tasks/running_eclipse.htm
137137
linux-install=Trying to install Eclipse on Linux? http\://wiki.eclipse.org/IRC_FAQ\#How_do_I_install_Eclipse_on_Linux.3F
138138
showlocation=Ever get confused and wondered what workspace you are using? Well, wonder no more, for -showlocation is here to help\! Add -showlocation to the first line of your eclipse.ini file (consequently shifting everything down one line), and you can now see the workspace's name in the title bar.

pom.xml

+15-22
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,14 @@
4747
</licenses>
4848

4949
<scm>
50-
<connection>scm:git:http://git.eclipse.org/gitroot/ecf/org.eclipse.ecf.git</connection>
51-
<developerConnection>scm:git:ssh://git.eclipse.org/gitroot/ecf/org.eclipse.ecf.git</developerConnection>
52-
<url>http://git.eclipse.org/c/ecf/org.eclipse.ecf.git</url>
50+
<connection>scm:git:https://github.com/eclipse/ecf.git</connection>
51+
<developerConnection>scm:git:git@github.com:eclipse/ecf.git</developerConnection>
52+
<url>https://github.com/eclipse/ecf.git</url>
5353
</scm>
5454

5555
<issueManagement>
56-
<url>https://bugs.eclipse.org/bugs/buglist.cgi?product=ECF</url>
57-
<system>Bugzilla</system>
56+
<url>https://github.com/eclipse/ecf/issues</url>
57+
<system>GitHub</system>
5858
</issueManagement>
5959

6060
<distributionManagement>
@@ -72,9 +72,9 @@
7272
</distributionManagement>
7373

7474
<properties>
75-
<tycho-version>2.7.5</tycho-version>
75+
<tycho-version>4.0.7</tycho-version>
7676
<cbi-version>1.4.3</cbi-version>
77-
<target-platform>latest-3</target-platform>
77+
<target-platform>2024-06</target-platform>
7878
<execution-environment>JavaSE-17</execution-environment>
7979
<eclipserun-repo>https://download.eclipse.org/eclipse/updates/latest/</eclipserun-repo>
8080
<project.build.sourceEncoding>ISO-8859-1</project.build.sourceEncoding>
@@ -93,8 +93,6 @@
9393
</pluginRepositories>
9494

9595
<modules>
96-
<module>doc/bundles/org.eclipse.ecf.doc</module>
97-
9896
<module>examples/bundles/com.mycorp.examples.timeservice</module>
9997
<module>examples/bundles/com.mycorp.examples.timeservice.async</module>
10098
<module>examples/bundles/com.mycorp.examples.timeservice.consumer</module>
@@ -248,6 +246,8 @@
248246

249247
<module>releng/org.eclipse.ecf.releng.target</module>
250248
<module>releng/org.eclipse.ecf.releng.repository</module>
249+
250+
<module>doc/bundles/org.eclipse.ecf.doc</module>
251251
</modules>
252252

253253
<build>
@@ -285,28 +285,21 @@
285285
<groupId>org.eclipse.tycho</groupId>
286286
<artifactId>tycho-source-plugin</artifactId>
287287
<version>${tycho-version}</version>
288+
<configuration>
289+
<includeBinaryFeature>false</includeBinaryFeature>
290+
</configuration>
288291
<executions>
289292
<execution>
290293
<id>plugin-source</id>
291294
<goals>
292295
<goal>plugin-source</goal>
293296
</goals>
294297
</execution>
295-
</executions>
296-
</plugin>
297-
<plugin>
298-
<groupId>org.eclipse.tycho.extras</groupId>
299-
<artifactId>tycho-source-feature-plugin</artifactId>
300-
<version>${tycho-version}</version>
301-
<configuration>
302-
<includeBinaryFeature>false</includeBinaryFeature>
303-
</configuration>
304-
<executions>
305298
<execution>
306-
<id>source-feature</id>
299+
<id>feature-source</id>
307300
<phase>package</phase>
308301
<goals>
309-
<goal>source-feature</goal>
302+
<goal>feature-source</goal>
310303
</goals>
311304
</execution>
312305
</executions>
@@ -349,7 +342,7 @@
349342
<version>${tycho-version}</version>
350343
<dependencies>
351344
<dependency>
352-
<groupId>org.eclipse.tycho.extras</groupId>
345+
<groupId>org.eclipse.tycho</groupId>
353346
<artifactId>tycho-buildtimestamp-jgit</artifactId>
354347
<version>${tycho-version}</version>
355348
</dependency>

protocols/bundles/ch.ethz.iks.r_osgi.remote/src/test/java/ch/ethz/iks/test/util/SmartSerializerTestCase.java

-82
This file was deleted.

protocols/bundles/ch.ethz.iks.slp/src/test/java/ch/ethz/iks/slp/impl/AttributeParserTest.java

-136
This file was deleted.

0 commit comments

Comments
 (0)