Skip to content

Commit

Permalink
Merge branch 'main' into feature/3411-Resize-sidebars-using-mouse
Browse files Browse the repository at this point in the history
* main: (211 commits)
  #4240 - Facilitate using DIAM serializer in isolation
  #4240 - Facilitate using DIAM serializer in isolation
  #4240 - Facilitate using DIAM serializer in isolation
  [maven-release-plugin] prepare for next development iteration
  [maven-release-plugin] prepare release inception-29.5
  #4230 - Upgrade dependencies
  #4230 - Upgrade dependencies
  #4235 - Direct access-by-URL to sidebar curation mode sometimes does not work
  #4229 - Better project template selection
  #4229 - Better project template selection
  #4232 - Drop evaluation page
  #4229 - Better project template selection
  #4230 - Upgrade dependencies
  #4229 - Better project template selection
  No issue: Update system requirements and improve pointers to Docker-based deployment
  No issue: Call out to admins to look at the admin guide when reaching the installation section in the users guide.
  #4215 - Ability to specify GID and UID for the user used inside the Docker image
  [maven-release-plugin] prepare for next development iteration
  [maven-release-plugin] prepare release inception-29.4
  #4226 - Display logout button on annotation page if dashboard access is disabled
  ...

% Conflicts:
%	inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/AnnotationPage.java
%	inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/sidebar/SidebarTabbedPanel.java
  • Loading branch information
reckart committed Oct 14, 2023
2 parents 0d023e7 + 986222b commit b403030
Show file tree
Hide file tree
Showing 979 changed files with 51,144 additions and 19,178 deletions.
170 changes: 170 additions & 0 deletions Jenkinsfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,170 @@
config = [
agentLabel: '',
maven: 'Maven 3',
jdk: 'Zulu 17',
extraMavenArguments: '-U -Ddkpro.core.testCachePath="${WORKSPACE}/cache/dkpro-core-datasets" -Dmaven.artifact.threads=15 -T 4',
wipeWorkspaceBeforeBuild: true,
wipeWorkspaceAfterBuild: true
]

pipeline {
parameters {
string(
name: 'extraMavenArguments',
defaultValue: config.extraMavenArguments,
description: "Extra arguments to be passed to Maven (for testing; overrides only current build)")
string(
name: 'agentLabel',
defaultValue: config.agentLabel,
description: "Eligible agents (in case a build keeps running on a broken agent; overrides only current build)")
booleanParam(
name: 'wipeWorkspaceBeforeBuild',
defaultValue: config.wipeWorkspaceBeforeBuild,
description: "Wipe workspace before build (for testing; next build only)")
booleanParam(
name: 'wipeWorkspaceAfterBuild',
defaultValue: config.wipeWorkspaceAfterBuild,
description: "Wipe workspace after build (for testing; next build only)")
}

agent {
label params.agentLabel
}

tools {
maven config.maven
jdk config.jdk
}

options {
buildDiscarder(logRotator(
numToKeepStr: '25',
artifactNumToKeepStr: '5'
))
skipDefaultCheckout()
}

stages {
stage("Checkout code") {
steps {
script {
if (params.wipeWorkspaceBeforeBuild) {
echo "Wiping workspace..."
cleanWs(cleanWhenNotBuilt: true,
deleteDirs: true,
disableDeferredWipeout: true,
notFailBuild: true)
}
}

dir('checkout') {
checkout scm
}
}
}

// Display information about the build environment. This can be useful for debugging
// build issues.
stage("Info") {
steps {
echo '=== Environment variables ==='
script {
if (isUnix()) {
sh 'printenv'
}
else {
bat 'set'
}
}
}
}

// Perform a merge request build. This is a conditional stage executed with the GitLab
// sources plugin triggers a build for a merge request. To avoid conflicts with other
// builds, this stage should not deploy artifacts to the Maven repository server and
// also not install them locally.
stage("PR build") {
when { branch 'PR-*' }

steps {
script {
currentBuild.description = 'Triggered by: <a href="' + CHANGE_URL + '">' + BRANCH_NAME +
': ' + env.CHANGE_BRANCH + '</a> (' + env.CHANGE_AUTHOR_DISPLAY_NAME + ')'
}

dir('checkout') {
withMaven(maven: config.maven, jdk: config.jdk, mavenLocalRepo: "$WORKSPACE/.repository") {
script {
def mavenCommand = 'mvn ' +
params.extraMavenArguments +
' -B -Dmaven.test.failure.ignore=true -T 4 -Pjacoco clean verify javadoc:javadoc';

if (isUnix()) {
sh script: mavenCommand
}
else {
bat script: mavenCommand
}
}
}

script {
def mavenConsoleIssues = scanForIssues tool: mavenConsole()
def javaIssues = scanForIssues tool: java()
def javaDocIssues = scanForIssues tool: javaDoc()
publishIssues id: "analysis", issues: [mavenConsoleIssues, javaIssues, javaDocIssues]
}
}
}
}

// Perform a SNAPSHOT build of a main branch. This stage is typically executed after a
// merge request has been merged. On success, it deploys the generated artifacts to the
// Maven repository server.
stage("SNAPSHOT build") {
when { branch pattern: "main|release/.*", comparator: "REGEXP" }

steps {
dir('checkout') {
withMaven(maven: config.maven, jdk: config.jdk, mavenLocalRepo: "$WORKSPACE/.repository") {
script {
def mavenCommand = 'mvn ' +
params.extraMavenArguments +
' -B -Dmaven.test.failure.ignore=true -Pjacoco,full-tests clean verify javadoc:javadoc'

if (isUnix()) {
sh script: mavenCommand
}
else {
bat script: mavenCommand
}
}
}

script {
def mavenConsoleIssues = scanForIssues tool: mavenConsole()
def javaIssues = scanForIssues tool: java()
def javaDocIssues = scanForIssues tool: javaDoc()
def spotBugsIssues = scanForIssues tool: spotBugs()
def taskScannerIssues = scanForIssues tool: taskScanner()
publishIssues id: "analysis", issues: [mavenConsoleIssues, javaIssues, javaDocIssues, spotBugsIssues, taskScannerIssues]
}
}
}
}
}

post {
always {
script {
if (params.wipeWorkspaceAfterBuild) {
echo "Wiping workspace..."
cleanWs(cleanWhenNotBuilt: false,
deleteDirs: true,
disableDeferredWipeout: true,
notFailBuild: true)
}
}
}
}
}
20 changes: 18 additions & 2 deletions inception/inception-active-learning/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,16 @@
<parent>
<groupId>de.tudarmstadt.ukp.inception.app</groupId>
<artifactId>inception-app</artifactId>
<version>28.0-SNAPSHOT</version>
<version>30.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<artifactId>inception-active-learning</artifactId>
<name>INCEpTION - Recommendation - Active Learning</name>
<dependencies>
<dependency>
<groupId>de.tudarmstadt.ukp.inception.app</groupId>
<artifactId>inception-annotation-storage-api</artifactId>
</dependency>
<dependency>
<groupId>de.tudarmstadt.ukp.inception.app</groupId>
<artifactId>inception-ui-annotation</artifactId>
Expand All @@ -44,7 +48,7 @@
</dependency>
<dependency>
<groupId>de.tudarmstadt.ukp.inception.app</groupId>
<artifactId>inception-api</artifactId>
<artifactId>inception-documents-api</artifactId>
</dependency>
<dependency>
<groupId>de.tudarmstadt.ukp.inception.app</groupId>
Expand All @@ -54,6 +58,10 @@
<groupId>de.tudarmstadt.ukp.inception.app</groupId>
<artifactId>inception-model</artifactId>
</dependency>
<dependency>
<groupId>de.tudarmstadt.ukp.inception.app</groupId>
<artifactId>inception-model-vdoc</artifactId>
</dependency>
<dependency>
<groupId>de.tudarmstadt.ukp.inception.app</groupId>
<artifactId>inception-support</artifactId>
Expand Down Expand Up @@ -116,6 +124,10 @@
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-spring</artifactId>
</dependency>
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-extensions</artifactId>
</dependency>
<dependency>
<groupId>org.wicketstuff</groupId>
<artifactId>wicketstuff-annotationeventdispatcher</artifactId>
Expand All @@ -128,6 +140,10 @@
<groupId>de.agilecoders.wicket</groupId>
<artifactId>wicket-bootstrap-extensions</artifactId>
</dependency>
<dependency>
<groupId>org.danekja</groupId>
<artifactId>jdk-serializable-functional</artifactId>
</dependency>

<!-- LOGGING DEPENDENCIES - SLF4J -->
<dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
import de.tudarmstadt.ukp.clarin.webanno.model.SourceDocument;
import de.tudarmstadt.ukp.clarin.webanno.security.model.User;
import de.tudarmstadt.ukp.inception.active.learning.ActiveLearningServiceImpl.ActiveLearningUserState;
import de.tudarmstadt.ukp.inception.recommendation.api.model.LearningRecord;
import de.tudarmstadt.ukp.inception.recommendation.api.model.LearningRecordType;
import de.tudarmstadt.ukp.inception.recommendation.api.model.SpanSuggestion;
import de.tudarmstadt.ukp.inception.recommendation.api.model.SuggestionGroup;
Expand All @@ -44,15 +43,6 @@ public interface ActiveLearningService
*/
List<SuggestionGroup<SpanSuggestion>> getSuggestions(User aDataOwner, AnnotationLayer aLayer);

/**
* @param aRecord
* record to check
* @return if the suggestions from which the given record was created (or an equivalent one) is
* visible to the user. This is useful to check if the suggestion can be highlighted
* when clicking on a history record.
*/
boolean isSuggestionVisible(LearningRecord aRecord);

/**
* @return if the are any records of type {@link LearningRecordType#SKIPPED} in the history of
* the given layer for the given user.
Expand All @@ -64,8 +54,8 @@ public interface ActiveLearningService
*/
boolean hasSkippedSuggestions(String aSessionOwner, User aDataOwner, AnnotationLayer aLayer);

void hideRejectedOrSkippedAnnotations(String aSessionOwner, User aDataOwner, AnnotationLayer aLayer,
boolean aFilterSkippedRecommendation,
void hideRejectedOrSkippedAnnotations(String aSessionOwner, User aDataOwner,
AnnotationLayer aLayer, boolean aFilterSkippedRecommendation,
List<SuggestionGroup<SpanSuggestion>> aSuggestionGroups);

Optional<Delta<SpanSuggestion>> generateNextSuggestion(String aSessionOwner, User aDataOwner,
Expand Down
Loading

0 comments on commit b403030

Please sign in to comment.