Skip to content

Commit

Permalink
#4032 - Allow using externalized strings from backend code
Browse files Browse the repository at this point in the history
- Remove props-to-constants-generator annotation processor since it does not work properly in Eclipse (cf. https://stackoverflow.com/a/76356911/2511197)
  • Loading branch information
reckart committed Jun 9, 2023
1 parent eb5b63a commit 61a63b9
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 30 deletions.
2 changes: 1 addition & 1 deletion inception/inception-diam/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,7 @@
<scope>test</scope>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# Licensed to the Technische Universität Darmstadt under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The Technische Universität Darmstadt
# licenses this file to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License.
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
diam.span-annotation.create.error=Unable to create span annotation
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,6 @@
import org.apache.wicket.model.Model;
import org.apache.wicket.spring.injection.annot.SpringBean;

import com.github.kklisura.java.processing.annotations.PropertySourceConstants;

import de.tudarmstadt.ukp.clarin.webanno.api.CasProvider;
import de.tudarmstadt.ukp.clarin.webanno.api.DocumentService;
import de.tudarmstadt.ukp.inception.annotatorjs.resources.AnnotatorJsCssResourceReference;
Expand All @@ -39,7 +37,6 @@
import de.tudarmstadt.ukp.inception.externaleditor.xhtml.XHtmlXmlDocumentIFrameViewFactory;
import de.tudarmstadt.ukp.inception.rendering.editorstate.AnnotatorState;

@PropertySourceConstants(resourceName = "de/tudarmstadt/ukp/inception/annotatorjs/wicket-package.properties", className = "Messages_")
public class AnnotatorJsHtmlAnnotationEditor
extends ExternalAnnotationEditorBase
{
Expand Down
26 changes: 0 additions & 26 deletions inception/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -130,8 +130,6 @@
<!-- * 4.6.1 depends on Lucene 8.11.1 -->
<!-- 4.7.0 depends on Lucene 9.4.2 -->

<props-to-constants-generator.version>1.0.0</props-to-constants-generator.version>

<asciidoctor.plugin.version>2.2.3</asciidoctor.plugin.version>
<asciidoctor.version>2.5.8</asciidoctor.version>
<asciidoctor-diagram.version>2.2.7</asciidoctor-diagram.version>
Expand Down Expand Up @@ -336,14 +334,6 @@
<optional>true</optional>
</dependency>

<!-- Generation of constants for I18N properties files -->
<dependency>
<groupId>com.github.kklisura.java.processing</groupId>
<artifactId>props-to-constants-generator</artifactId>
<optional>true</optional>
</dependency>


<!-- JAXB is no longer included with Java 9+ by default -->
<dependency>
<groupId>javax.xml.bind</groupId>
Expand Down Expand Up @@ -2305,12 +2295,6 @@
<artifactId>ivy</artifactId>
<version>2.5.1</version>
</dependency>

<dependency>
<groupId>com.github.kklisura.java.processing</groupId>
<artifactId>props-to-constants-generator</artifactId>
<version>${props-to-constants-generator.version}</version>
</dependency>
</dependencies>
</dependencyManagement>

Expand Down Expand Up @@ -2476,16 +2460,6 @@
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<annotationProcessorPaths>
<path>
<groupId>com.github.kklisura.java.processing</groupId>
<artifactId>props-to-constants-generator</artifactId>
<version>${props-to-constants-generator.version}</version>
</path>
<path>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-jpamodelgen</artifactId>
<version>${hibernate.version}</version>
</path>
<path>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-jpamodelgen</artifactId>
Expand Down

0 comments on commit 61a63b9

Please sign in to comment.