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.

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

Fixed Compiler errors, updated to newest java version, updated travis, updated to newest featureIDE #53

Merged
merged 42 commits into from
Feb 18, 2021
Merged
Show file tree
Hide file tree
Changes from 31 commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
b3bd504
Deleted setPossibleWords(...)
wurstbroteater Nov 25, 2020
06560c0
Merge pull request #1 from wurstbroteater/issue-48
tcerny Nov 25, 2020
8a41e4e
fixed #46
tcerny Nov 25, 2020
6a02b88
bugfix issue-47
jeremiaheinle Nov 25, 2020
3b77828
Merge remote-tracking branch 'origin/issue47' into issue-45
tcerny Nov 26, 2020
963271b
Merge remote-tracking branch 'origin/issue-48' into issue-45
tcerny Nov 26, 2020
826b307
added missing method initExtension()
tcerny Nov 26, 2020
250a2ca
DeltaFactoryManager update
jeremiaheinle Nov 26, 2020
ef529c5
updated travis and pom
wurstbroteater Dec 1, 2020
c92109d
forgotten commit in issue-45
wurstbroteater Dec 1, 2020
32487de
Tests do not trigger has been fixed
wurstbroteater Dec 1, 2020
764be5a
this branch fixed #42
wurstbroteater Dec 1, 2020
1d64214
Issue initExtension & DeltaFactoryManager
jeremiaheinle Dec 3, 2020
4471f5c
updated travis services to run with bionic and increased tycho versio…
wurstbroteater Dec 4, 2020
bfb65e7
deleted unnecessary depdency
wurstbroteater Dec 4, 2020
75ee471
Casted Path to IFile in order to keep the old code.
tcerny Dec 4, 2020
c28616c
Merge branch 'issue-46' into issue-45
tcerny Dec 4, 2020
b51d8ca
Merge branch 'issue-45' of github.com:tcerny/VariantSync into issue-45
tcerny Dec 4, 2020
08c1b78
Update .travis.yml
wurstbroteater Dec 4, 2020
9c7c2a3
win32 x86 no longer supported
wurstbroteater Dec 5, 2020
9464e20
works on my machine with tests and java >= 11
wurstbroteater Dec 6, 2020
b6d4102
Merge branch 'issue-42' into issue-45
tcerny Dec 8, 2020
30f3c25
Update .gitignore
tcerny Dec 8, 2020
003f7be
del .idea
jeremiaheinle Dec 8, 2020
2c59bb0
Update .gitignore
tcerny Dec 9, 2020
c84a9d1
Merge pull request #2 from tcerny/issue-45
wurstbroteater Dec 10, 2020
cbfe2a3
adressed: Pauls review: remove openjdk10
wurstbroteater Dec 10, 2020
02b4399
adressed Pauls review: remove empy line
wurstbroteater Dec 10, 2020
ae949ba
update .gitignore
tcerny Dec 23, 2020
7785e27
addressed Tobi's review
tcerny Dec 23, 2020
0c9ddd7
adressed Tobis review
wurstbroteater Dec 24, 2020
3c8410c
Adressing reviewer suggetions now in correct branch for #53
wurstbroteater Jan 16, 2021
a454db8
Adressing reviewer suggetions for travis
wurstbroteater Jan 21, 2021
95df99f
Adressing reviewer suggestion to remove commented import
wurstbroteater Jan 21, 2021
bb57936
Fixed Code Style
wurstbroteater Jan 21, 2021
bb7368b
added build status to readme
wurstbroteater Jan 21, 2021
38d9296
Delete de.tubs.variantsync.core-test/.settings directory
tcerny Jan 28, 2021
0159db8
Delete de.tubs.variantsync.core/.settings directory
tcerny Jan 28, 2021
00950e6
fixed code style and added all optional brackets
tcerny Jan 28, 2021
b069cd4
changed String to StringBuilder
wurstbroteater Feb 2, 2021
774e9a5
Auto format VariantSyncComposer
wurstbroteater Feb 2, 2021
381e491
addressing reviewer suggestion: replaced ternary operator with ifElse…
wurstbroteater Feb 2, 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
224 changes: 222 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,225 @@


# Created by https://www.toptal.com/developers/gitignore/api/java,maven,intellij,visualstudiocode,eclipse
# Edit at https://www.toptal.com/developers/gitignore?templates=java,maven,intellij,visualstudiocode,eclipse

### Eclipse ###
.metadata
bin/
tmp/
*.tmp
*.bak
*.swp
*~.nib
local.properties
.settings/
.loadpath
.recommenders

# External tool builders
.externalToolBuilders/

# Locally stored "Eclipse launch configurations"
*.launch

# PyDev specific (Python IDE for Eclipse)
*.pydevproject

# CDT-specific (C/C++ Development Tooling)
.cproject

# CDT- autotools
.autotools

# Java annotation processor (APT)
.factorypath

# PDT-specific (PHP Development Tools)
.buildpath

# sbteclipse plugin
.target

# Tern plugin
.tern-project

# TeXlipse plugin
.texlipse

# STS (Spring Tool Suite)
.springBeans

# Code Recommenders
.recommenders/

# Annotation Processing
.apt_generated/
.apt_generated_test/

# Scala IDE specific (Scala & Java development for Eclipse)
.cache-main
.scala_dependencies
.worksheet

# Uncomment this line if you wish to ignore the project description file.
# Typically, this file would be tracked if it contains build/dependency configurations:
#.project

### Eclipse Patch ###
# Spring Boot Tooling
.sts4-cache/

### Intellij ###
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839

# User-specific stuff
.idea/**/workspace.xml
.idea/**/tasks.xml
.idea/**/usage.statistics.xml
.idea/**/dictionaries
.idea/**/shelf

# Generated files
.idea/**/contentModel.xml

# Sensitive or high-churn files
.idea/**/dataSources/
.idea/**/dataSources.ids
.idea/**/dataSources.local.xml
.idea/**/sqlDataSources.xml
.idea/**/dynamic.xml
.idea/**/uiDesigner.xml
.idea/**/dbnavigator.xml

# Gradle
.idea/**/gradle.xml
.idea/**/libraries

# Gradle and Maven with auto-import
# When using Gradle or Maven with auto-import, you should exclude module files,
# since they will be recreated, and may cause churn. Uncomment if using
# auto-import.
# .idea/artifacts
# .idea/compiler.xml
# .idea/jarRepositories.xml
# .idea/modules.xml
# .idea/*.iml
# .idea/modules
*.iml
.idea/
# *.ipr

# CMake
cmake-build-*/

# Mongo Explorer plugin
.idea/**/mongoSettings.xml

# File-based project format
*.iws

# IntelliJ
out/

# mpeltonen/sbt-idea plugin
.idea_modules/

# JIRA plugin
atlassian-ide-plugin.xml

# Cursive Clojure plugin
.idea/replstate.xml

# Crashlytics plugin (for Android Studio and IntelliJ)
com_crashlytics_export_strings.xml
crashlytics.properties
crashlytics-build.properties
fabric.properties

# Editor-based Rest Client
.idea/httpRequests

# Android studio 3.1+ serialized cache file
.idea/caches/build_file_checksums.ser

### Intellij Patch ###
# Comment Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-215987721

# *.iml
# modules.xml
# .idea/misc.xml
# *.ipr

# Sonarlint plugin
# https://plugins.jetbrains.com/plugin/7973-sonarlint
.idea/**/sonarlint/

# SonarQube Plugin
# https://plugins.jetbrains.com/plugin/7238-sonarqube-community-plugin
.idea/**/sonarIssues.xml

# Markdown Navigator plugin
# https://plugins.jetbrains.com/plugin/7896-markdown-navigator-enhanced
.idea/**/markdown-navigator.xml
.idea/**/markdown-navigator-enh.xml
.idea/**/markdown-navigator/

# Cache file creation bug
# See https://youtrack.jetbrains.com/issue/JBR-2257
.idea/$CACHE_FILE$

# CodeStream plugin
# https://plugins.jetbrains.com/plugin/12206-codestream
.idea/codestream.xml

### Java ###
# Compiled class file
*.class

# Log file
*.log

# BlueJ files
*.ctxt

# Mobile Tools for Java (J2ME)
.mtj.tmp/

# Package Files #
*.jar
*.war
*.nar
*.ear
*.zip
*.tar.gz
*.rar

# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
hs_err_pid*

### Maven ###
target/
bin/
/.metadata/
pom.xml.tag
pom.xml.releaseBackup
pom.xml.versionsBackup
pom.xml.next
release.properties
dependency-reduced-pom.xml
buildNumber.properties
.mvn/timing.properties
# https://github.com/takari/maven-wrapper#usage-without-binary-jar
.mvn/wrapper/maven-wrapper.jar

### VisualStudioCode ###
.vscode/*
!.vscode/tasks.json
!.vscode/launch.json
*.code-workspace

### VisualStudioCode Patch ###
# Ignore all local history of files
.history
.ionide

# End of https://www.toptal.com/developers/gitignore/api/java,maven,intellij,visualstudiocode,eclipse
31 changes: 17 additions & 14 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,17 @@
sudo: false
language: java
dist: trusty
jdk: oraclejdk8
cache:
directories:
- "$HOME/.m2"
install: true
script:
- mvn clean verify
- sed -i'' -e "s/\$VERSION/${TRAVIS_TAG:=0.0.0}/" descriptor.json
- sed -i'' -e "s/\$DATE/$(date +%Y-%m-%d)/" descriptor.json
notifications:
webhooks: https://fathomless-fjord-24024.herokuapp.com/notify
dist: bionic

language: java
jdk:
- openjdk8
- openjdk11

#-----start GUI testing stuff
services:
- xvfb
#-----end GUI testin stuff
pmbittner marked this conversation as resolved.
Show resolved Hide resolved
cache:
directories:
- "$HOME/.m2"
install: true
script:
- mvn clean verify -e
17 changes: 9 additions & 8 deletions de.tubs.variantsync.core-test/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Core-test
Bundle-SymbolicName: de.tubs.variantsync.core-test
Bundle-Version: 1.0.0.qualifier
Bundle-Vendor: TU Braunschweig
Fragment-Host: de.tubs.variantsync.core;bundle-version="0.0.1"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Core-test
Bundle-SymbolicName: de.tubs.variantsync.core-test
Bundle-Version: 0.0.3.qualifier
Bundle-Vendor: TU Braunschweig
Fragment-Host: de.tubs.variantsync.core;bundle-version="0.0.1"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Require-Bundle: javax.annotation;bundle-version="1.0.0"
15 changes: 15 additions & 0 deletions de.tubs.variantsync.core-test/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>de.tubs.variantsync</groupId>
<artifactId>de.tubs.variantsync</artifactId>
<version>0.0.3-SNAPSHOT</version>
</parent>

<artifactId>de.tubs.variantsync.core-test</artifactId>
<packaging>eclipse-test-plugin</packaging>

<groupId>de.tubs.variantsync.core</groupId>
</project>
Original file line number Diff line number Diff line change
Expand Up @@ -62,4 +62,4 @@ public void testPatch2() throws DiffException {
assertTrue(patch.getDeltas().size() == 1);
}

}
}
Loading