Skip to content

Commit

Permalink
feat: update eclipse-platform-text to 4.26
Browse files Browse the repository at this point in the history
Eclipse JFace Text

Issue: deepin-community/sig-deepin-sysdev-team#547
Log: update repo
  • Loading branch information
xzl01 committed Apr 23, 2024
1 parent 74e3999 commit fd4b26b
Show file tree
Hide file tree
Showing 209 changed files with 6,444 additions and 5,921 deletions.
1 change: 0 additions & 1 deletion .gitignore

This file was deleted.

11 changes: 6 additions & 5 deletions .mvn/extensions.xml
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>

<extensions>
<extension>
<groupId>org.eclipse.tycho.extras</groupId>
<artifactId>tycho-pomless</artifactId>
<version>2.4.0</version>
</extension>
<extension>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-build</artifactId>
<version>3.0.0</version>
</extension>
</extensions>
71 changes: 0 additions & 71 deletions CONTRIBUTING

This file was deleted.

42 changes: 5 additions & 37 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,16 @@ pipeline {
options {
timeout(time: 40, unit: 'MINUTES')
buildDiscarder(logRotator(numToKeepStr:'5'))
disableConcurrentBuilds(abortPrevious: true)
}
agent {
label "centos-7"
}
tools {
maven 'apache-maven-latest'
jdk 'openjdk-jdk11-latest'
jdk 'openjdk-jdk17-latest'
}
stages {
stage('initialize Gerrit review') {
steps {
gerritReview labels: [Verified: 0], message: "Build started $BUILD_URL"
}
}
stage('Build') {
steps {
wrap([$class: 'Xvnc', useXauthority: true]) {
Expand All @@ -24,7 +20,9 @@ pipeline {
mvn clean verify --batch-mode --fail-at-end -Dmaven.repo.local=$WORKSPACE/.m2/repository \
-Pbuild-individual-bundles -Pbree-libs -Papi-check \
-Dcompare-version-with-baselines.skip=false \
-Dproject.build.sourceEncoding=UTF-8
-Dproject.build.sourceEncoding=UTF-8 \
-Dorg.slf4j.simpleLogger.showDateTime=true -Dorg.slf4j.simpleLogger.dateTimeFormat=HH:mm:ss.SSS \
-DtrimStackTrace=false
"""
}
}
Expand All @@ -34,37 +32,7 @@ pipeline {
junit '**/target/surefire-reports/TEST-*.xml'
publishIssues issues:[scanForIssues(tool: java()), scanForIssues(tool: mavenConsole())]
}
unstable {
gerritReview labels: [Verified: -1], message: "Build UNSTABLE (test failures) $BUILD_URL"
}
failure {
gerritReview labels: [Verified: -1], message: "Build FAILED $BUILD_URL"
}
}
}
stage('Check freeze period') {
when {
not {
branch 'master'
}
}
steps {
sh "wget https://git.eclipse.org/c/platform/eclipse.platform.releng.aggregator.git/plain/scripts/verifyFreezePeriod.sh"
sh "chmod +x verifyFreezePeriod.sh"
withCredentials([string(credentialsId: 'google-api-key', variable: 'GOOGLE_API_KEY')]) {
sh './verifyFreezePeriod.sh'
}
}
post {
failure {
gerritReview labels: [Verified: -1], message: "Build and test are OK, but Eclipse project is currently in a code freeze period.\nPlease wait for end of code freeze period before merging.\n $BUILD_URL"
}
}
}
}
post {
success {
gerritReview labels: [Verified: 1], message: "Build Succcess $BUILD_URL"
}
}
}
43 changes: 0 additions & 43 deletions NOTICE

This file was deleted.

2 changes: 1 addition & 1 deletion debian/build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

<!-- Eclipse JFace Text -->
<target name="org.eclipse.jface.text" depends="org.eclipse.text">
<make-bundle name="org.eclipse.jface.text" basedir="." depends="org.eclipse.text">
<make-bundle name="org.eclipse.jface.text" basedir="." depends="org.eclipse.text" release="11">
<pathelement path="/usr/share/java/eclipse-jface.jar"/>
<pathelement path="/usr/share/java/eclipse-core-commands.jar"/>
<pathelement path="/usr/share/java/eclipse-core-jobs.jar"/>
Expand Down
10 changes: 10 additions & 0 deletions debian/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
eclipse-platform-text (4.26-1) unstable; urgency=medium

* New upstream release
- Depend on libswt-gtk-4-java (>= 4.21)
- Build org.eclipse.jface.text with Java 11
* Standards-Version updated to 4.6.1
* Track and download the new releases from GitHub

-- Emmanuel Bourg <[email protected]> Thu, 08 Dec 2022 19:17:54 +0100

eclipse-platform-text (4.21-1) unstable; urgency=medium

* New upstream release
Expand Down
4 changes: 2 additions & 2 deletions debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ Build-Depends:
libequinox-preferences-java,
libequinox-registry-java,
libicu4j-java,
libswt-gtk-4-java (>= 4.10),
libswt-gtk-4-java (>= 4.21),
eclipse-debian-helper
Standards-Version: 4.6.0.1
Standards-Version: 4.6.1
Vcs-Git: https://salsa.debian.org/java-team/eclipse-platform-text.git
Vcs-Browser: https://salsa.debian.org/java-team/eclipse-platform-text
Homepage: http://www.eclipse.org/eclipse/platform-text/
Expand Down
2 changes: 1 addition & 1 deletion debian/copyright
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: Eclipse Platform Text
Source: https://git.eclipse.org/r/platform/eclipse.platform.text
Source: https://github.com/eclipse-platform/eclipse.platform.text
Files-Excluded: *.so
*.a

Expand Down
2 changes: 1 addition & 1 deletion debian/watch
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
version=4
opts="mode=git,repack,compression=xz,uversionmangle=s/_/./g" \
https://git.eclipse.org/r/platform/eclipse.platform.text refs/tags/R([\d_]+[az]?)
https://github.com/eclipse-platform/eclipse.platform.text refs/tags/R([\d_]+[az]?)
2 changes: 1 addition & 1 deletion org.eclipse.core.filebuffers.tests/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %Plugin.name
Bundle-SymbolicName: org.eclipse.core.filebuffers.tests;singleton:=true
Bundle-Version: 3.12.100.qualifier
Bundle-Version: 3.12.300.qualifier
Bundle-Activator: org.eclipse.core.filebuffers.tests.FileBuffersTestPlugin
Bundle-ActivationPolicy: lazy
Bundle-Vendor: %Plugin.providerName
Expand Down
4 changes: 4 additions & 0 deletions org.eclipse.core.filebuffers.tests/build.properties
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,7 @@ bin.includes = plugin.properties,\
src.includes = about.html

source.. = src/

# Maven/Tycho pom model adjustments
pom.model.property.code.ignoredWarnings = ${tests.ignoredWarnings}
pom.model.property.testClass = org.eclipse.core.filebuffers.tests.FileBuffersTestSuite
28 changes: 0 additions & 28 deletions org.eclipse.core.filebuffers.tests/pom.xml

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,93 @@
/*******************************************************************************
* Copyright (c) 2022 Joerg Kubitz and others.
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Joerg Kubitz - initial API and implementation
*******************************************************************************/
package org.eclipse.core.filebuffers.tests;

import static org.junit.Assert.assertEquals;

import java.io.ByteArrayInputStream;
import java.io.InputStream;
import java.nio.file.Files;
import java.util.Arrays;
import java.util.function.Function;

import org.junit.Test;


import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.Path;

import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.ResourcesPlugin;

import org.eclipse.core.filebuffers.FileBuffers;
import org.eclipse.core.filebuffers.manipulation.ConvertLineDelimitersOperation;
import org.eclipse.core.filebuffers.manipulation.FileBufferOperationRunner;

public class ConvertLineDelemiterTest {

private static final String[] DELIMS= new String[] {
"\r",
"\n",
"\r\n",
};

@Test
public void testWithDelimnAtEnd() throws Exception {
test(delim -> delim + "line1" + delim + "line2" + delim + delim + "line3" + delim);
}

@Test
public void testWithoutDelimnAtEnd() throws Exception {
test(delim -> "line1" + delim + "line2" + delim + delim + "line3");
}

void test(Function<String, String> testFile) throws Exception {
IProject p= ResourcesPlugin.getWorkspace().getRoot().getProject("ConvertLineDelemiterTest");
p.create(null);
p.open(null);
try {
for (String outputDelim : DELIMS) {
IFile[] files= new IFile[DELIMS.length];
int i= 0;
for (String inputDelim : DELIMS) {
String input= testFile.apply(inputDelim);
IFile file= ResourcesPlugin.getWorkspace().getRoot().getFile(new Path("/ConvertLineDelemiterTest/test" + i + ".txt"));
InputStream s= new ByteArrayInputStream(input.getBytes());
file.create(s, true, null);
files[i++]= file;
}
FileBufferOperationRunner runner= new FileBufferOperationRunner(FileBuffers.getTextFileBufferManager(), null);
ConvertLineDelimitersOperation op= new ConvertLineDelimitersOperation(outputDelim);
runner.execute(Arrays.stream(files).map(f -> f.getFullPath()).toArray(IPath[]::new), op, null);
for (IFile file : files) {
String actual= Files.readString(file.getLocation().toFile().toPath());
String expected= testFile.apply(outputDelim);
assertEquals(readable(expected), readable(actual));
}
for (IFile file : files) {
file.delete(true, null);
}
}
} finally {
p.delete(true, null);
}
}

private String readable(String s) {
s= s.replace("\r", "\\r");
s= s.replace("\n", "\\n");
return s;
}
}
Loading

0 comments on commit fd4b26b

Please sign in to comment.