From 01290bad654dbd37f3879d6ea52ba54a6a538897 Mon Sep 17 00:00:00 2001 From: Malte Brunnlieb Date: Mon, 14 Sep 2020 06:46:15 +0200 Subject: [PATCH 1/9] #1231 Set next development version --- .../cobigen-javaplugin-parent/cobigen-javaplugin-model/pom.xml | 2 +- cobigen/cobigen-javaplugin-parent/cobigen-javaplugin/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cobigen/cobigen-javaplugin-parent/cobigen-javaplugin-model/pom.xml b/cobigen/cobigen-javaplugin-parent/cobigen-javaplugin-model/pom.xml index 2f439307b5..be775e1720 100644 --- a/cobigen/cobigen-javaplugin-parent/cobigen-javaplugin-model/pom.xml +++ b/cobigen/cobigen-javaplugin-parent/cobigen-javaplugin-model/pom.xml @@ -1,7 +1,7 @@ 4.0.0 javaplugin-model - 7.0.0 + 7.0.1-SNAPSHOT CobiGen Javaplugin Model jar CobiGen - Java Plug-in Model diff --git a/cobigen/cobigen-javaplugin-parent/cobigen-javaplugin/pom.xml b/cobigen/cobigen-javaplugin-parent/cobigen-javaplugin/pom.xml index 78e11a6128..56b8d26942 100644 --- a/cobigen/cobigen-javaplugin-parent/cobigen-javaplugin/pom.xml +++ b/cobigen/cobigen-javaplugin-parent/cobigen-javaplugin/pom.xml @@ -2,7 +2,7 @@ 4.0.0 javaplugin CobiGen - Java Plug-in - 7.0.0 + 7.0.1-SNAPSHOT jar CobiGen - Java Plug-in From 53ca93daacf7eb269be5af0cd3012ad69774459b Mon Sep 17 00:00:00 2001 From: jan-vcapgemini Date: Thu, 24 Sep 2020 12:24:45 +0200 Subject: [PATCH 2/9] adjusted determineLineDelimiter to latest core set core dependency to >= 7.0.0 --- .../cobigen-javaplugin/pom.xml | 6 +-- .../cobigen/javaplugin/merger/JavaMerger.java | 49 +------------------ 2 files changed, 5 insertions(+), 50 deletions(-) diff --git a/cobigen/cobigen-javaplugin-parent/cobigen-javaplugin/pom.xml b/cobigen/cobigen-javaplugin-parent/cobigen-javaplugin/pom.xml index 56b8d26942..46d169600f 100644 --- a/cobigen/cobigen-javaplugin-parent/cobigen-javaplugin/pom.xml +++ b/cobigen/cobigen-javaplugin-parent/cobigen-javaplugin/pom.xml @@ -27,7 +27,7 @@ ${project.groupId} core-api - 7.0.0 + [7.0.0,) @@ -39,13 +39,13 @@ ${project.groupId} core-test - 7.0.0 + [7.0.0,) test ${project.groupId} core - 7.0.0 + [7.0.0,) test diff --git a/cobigen/cobigen-javaplugin-parent/cobigen-javaplugin/src/main/java/com/devonfw/cobigen/javaplugin/merger/JavaMerger.java b/cobigen/cobigen-javaplugin-parent/cobigen-javaplugin/src/main/java/com/devonfw/cobigen/javaplugin/merger/JavaMerger.java index 8918ca0921..f20976ccc0 100644 --- a/cobigen/cobigen-javaplugin-parent/cobigen-javaplugin/src/main/java/com/devonfw/cobigen/javaplugin/merger/JavaMerger.java +++ b/cobigen/cobigen-javaplugin-parent/cobigen-javaplugin/src/main/java/com/devonfw/cobigen/javaplugin/merger/JavaMerger.java @@ -11,6 +11,7 @@ import com.devonfw.cobigen.api.exception.MergeException; import com.devonfw.cobigen.api.extension.Merger; +import com.devonfw.cobigen.api.util.SystemUtil; import com.devonfw.cobigen.javaplugin.inputreader.JavaParserUtil; import com.devonfw.cobigen.javaplugin.merger.libextension.ModifyableJavaClass; import com.thoughtworks.qdox.model.JavaClass; @@ -68,7 +69,7 @@ public String merge(File base, String patch, String targetCharset) throws MergeE try (FileInputStream stream = new FileInputStream(base); BufferedInputStream bis = new BufferedInputStream(stream); InputStreamReader reader = new InputStreamReader(bis, targetCharset)) { - lineDelimiter = determineLineDelimiter(bis, reader); + lineDelimiter = SystemUtil.determineLineDelimiter(bis, reader); baseClass = (ModifyableJavaClass) JavaParserUtil.getFirstJavaClass(reader); } catch (IOException e) { throw new MergeException(base, "Cannot read base file.", e); @@ -95,52 +96,6 @@ public String merge(File base, String patch, String targetCharset) throws MergeE return consolidateLineEndings(mergedClass.getSource().getCodeBlock(), lineDelimiter); } - /** - * @param bis - * The {@link BufferedInputStream} containing the input file - * @param reader - * The {@link InputStreamReader} iterating over the Stream - * @return The line delimiter corresponding to the input file - * @throws IOException - * If an exception occurs while processing the {@link BufferedInputStream} or the - * {@link InputStreamReader} - */ - private String determineLineDelimiter(BufferedInputStream bis, InputStreamReader reader) throws IOException { - - bis.mark(0); - try { - while (reader.ready()) { - int nextChar = reader.read(); - if (nextChar == '\r') { - nextChar = reader.read(); - if (nextChar == '\n') { - return "\r\n"; - } - return "\r"; - } else if (nextChar == '\n') { - return "\n"; - } - } - return null; - } finally { - emptyReader(reader); - bis.reset(); - } - } - - /** - * @param reader - * The {@link InputStreamReader} that is to be emptied - * @throws IOException - * If an exception occurs while processing the {@link InputStreamReader} - */ - private void emptyReader(InputStreamReader reader) throws IOException { - while (reader.ready()) { - reader.read(); - } - - } - /** * Consolidates all line endings to the System default * From b673fe4140b54255274eaa4a2c89c95e47663f82 Mon Sep 17 00:00:00 2001 From: jan-vcapgemini Date: Fri, 13 Nov 2020 11:56:04 +0100 Subject: [PATCH 3/9] adjusted determineLineDelimiter to latest core added new testBaseLineEndings unit test replaced Files.toString with FileUtils.readFileToString (removed com.google.common.io.Files) --- .../cobigen/javaplugin/merger/JavaMerger.java | 31 +++++++------------ .../unittest/merger/JavaMergerTest.java | 28 ++++++++++++++--- 2 files changed, 35 insertions(+), 24 deletions(-) diff --git a/cobigen/cobigen-javaplugin-parent/cobigen-javaplugin/src/main/java/com/devonfw/cobigen/javaplugin/merger/JavaMerger.java b/cobigen/cobigen-javaplugin-parent/cobigen-javaplugin/src/main/java/com/devonfw/cobigen/javaplugin/merger/JavaMerger.java index f20976ccc0..26a580ec08 100644 --- a/cobigen/cobigen-javaplugin-parent/cobigen-javaplugin/src/main/java/com/devonfw/cobigen/javaplugin/merger/JavaMerger.java +++ b/cobigen/cobigen-javaplugin-parent/cobigen-javaplugin/src/main/java/com/devonfw/cobigen/javaplugin/merger/JavaMerger.java @@ -6,11 +6,14 @@ import java.io.IOException; import java.io.InputStreamReader; import java.io.StringReader; +import java.nio.file.Path; +import java.nio.file.Paths; import java.util.ArrayList; import java.util.List; import com.devonfw.cobigen.api.exception.MergeException; import com.devonfw.cobigen.api.extension.Merger; +import com.devonfw.cobigen.api.util.StringUtil; import com.devonfw.cobigen.api.util.SystemUtil; import com.devonfw.cobigen.javaplugin.inputreader.JavaParserUtil; import com.devonfw.cobigen.javaplugin.merger.libextension.ModifyableJavaClass; @@ -66,17 +69,22 @@ public String merge(File base, String patch, String targetCharset) throws MergeE ModifyableJavaClass baseClass; String lineDelimiter; - try (FileInputStream stream = new FileInputStream(base); + Path path = Paths.get(base.getAbsolutePath()); + + try (FileInputStream stream = new FileInputStream(path.toString()); BufferedInputStream bis = new BufferedInputStream(stream); InputStreamReader reader = new InputStreamReader(bis, targetCharset)) { - lineDelimiter = SystemUtil.determineLineDelimiter(bis, reader); + baseClass = (ModifyableJavaClass) JavaParserUtil.getFirstJavaClass(reader); + lineDelimiter = SystemUtil.determineLineDelimiter(path, targetCharset); + } catch (IOException e) { throw new MergeException(base, "Cannot read base file.", e); } catch (ParseException e) { throw new MergeException(base, "The syntax of the base file is invalid. Error in line: " + e.getLine() + " / column: " + e.getColumn() + ": " + e.getMessage(), e); } + ModifyableJavaClass patchClass; try (StringReader reader = new StringReader(patch)) { @@ -93,24 +101,7 @@ public String merge(File base, String patch, String targetCharset) throws MergeE } ModifyableJavaClass mergedClass = merge(baseClass, patchClass); - return consolidateLineEndings(mergedClass.getSource().getCodeBlock(), lineDelimiter); - } - - /** - * Consolidates all line endings to the System default - * - * @param codeBlock - * which should be consolidate - * @param lineDelimiter - * the line delimiter of the file or null if none - * @return the consolidated code block - * @author mbrunnli (04.06.2013) - */ - private String consolidateLineEndings(String codeBlock, String lineDelimiter) { - if (lineDelimiter != null) { - return codeBlock.replaceAll("\r\n|\r|\n", lineDelimiter); - } - return codeBlock; + return StringUtil.consolidateLineEndings(mergedClass.getSource().getCodeBlock(), lineDelimiter); } /** diff --git a/cobigen/cobigen-javaplugin-parent/cobigen-javaplugin/src/test/java/com/devonfw/cobigen/javaplugin/unittest/merger/JavaMergerTest.java b/cobigen/cobigen-javaplugin-parent/cobigen-javaplugin/src/test/java/com/devonfw/cobigen/javaplugin/unittest/merger/JavaMergerTest.java index 7aa2eca049..bf0a1acbaf 100644 --- a/cobigen/cobigen-javaplugin-parent/cobigen-javaplugin/src/test/java/com/devonfw/cobigen/javaplugin/unittest/merger/JavaMergerTest.java +++ b/cobigen/cobigen-javaplugin-parent/cobigen-javaplugin/src/test/java/com/devonfw/cobigen/javaplugin/unittest/merger/JavaMergerTest.java @@ -17,7 +17,6 @@ import com.devonfw.cobigen.api.exception.MergeException; import com.devonfw.cobigen.javaplugin.merger.JavaMerger; import com.devonfw.cobigen.javaplugin.merger.libextension.ModifyableClassLibraryBuilder; -import com.google.common.io.Files; import com.thoughtworks.qdox.library.ClassLibraryBuilder; import com.thoughtworks.qdox.model.JavaClass; import com.thoughtworks.qdox.model.JavaConstructor; @@ -318,6 +317,27 @@ public void testConsistentLineEndings() throws IOException, MergeException { assertThat(eol1 ^ eol2 ^ eol3).isTrue(); } + /** + * Tests whether the output file contains line endings of base file + * @throws IOException + * test fails + * @throws MergeException + * test fails + */ + @Test + public void testBaseLineEndings() throws IOException, MergeException { + File baseFile = new File(testFileRootPath + "BaseFile_innerClass.java"); + File patchFile = new File(testFileRootPath + "PatchFile_innerClass.java"); + String mergedContents = + new JavaMerger("", false).merge(baseFile, FileUtils.readFileToString(patchFile), "UTF-8"); + + boolean eol1 = mergedContents.contains("\r\n"); + mergedContents = mergedContents.replaceAll("\r\n", ""); + boolean eol2 = mergedContents.contains("\n"); + boolean eol3 = mergedContents.contains("\r"); + assertThat(eol1 ^ eol2 ^ eol3).isTrue(); + } + /** * Tests whether all generics of the original file will be existent after merging * @throws IOException @@ -358,7 +378,7 @@ public void testMergeMethodsWithoutExtendingMethodBodyWithWhitespaces() throws I JavaClass origClazz = source.getClasses().get(0); String mergedContents = - new JavaMerger("", true).merge(file, Files.toString(file, Charset.forName("UTF-8")), "UTF-8"); + new JavaMerger("", true).merge(file, FileUtils.readFileToString(file, Charset.forName("UTF-8")), "UTF-8"); classLibraryBuilder = new ModifyableClassLibraryBuilder(); source = classLibraryBuilder.addSource(new StringReader(mergedContents)); @@ -387,8 +407,8 @@ public void testMergeInheritanceRelation() throws IOException, MergeException { JavaClass origClazz = getFirstJavaClass(new FileReader(baseFile)); assertThat(origClazz.getSuperClass().getCanonicalName()).isEqualTo("java.lang.Object"); - String mergedContents = - new JavaMerger("", false).merge(baseFile, Files.toString(patchFile, Charset.forName("UTF-8")), "UTF-8"); + String mergedContents = new JavaMerger("", false).merge(baseFile, + FileUtils.readFileToString(patchFile, Charset.forName("UTF-8")), "UTF-8"); JavaClass resultClazz = getFirstJavaClass(new StringReader(mergedContents)); assertThat(resultClazz.getSuperClass().getCanonicalName()) From b8228985a7d0178263f64847b151e9b59b346b0f Mon Sep 17 00:00:00 2001 From: jan-vcapgemini Date: Thu, 26 Nov 2020 19:06:14 +0100 Subject: [PATCH 4/9] fixed #1277 adjusted testBaseLineEndings unit test (now properly checks for a valid merge result) added new eol test files added eol test file handling to .gitattributes --- .gitattributes | 5 +++++ .../cobigen-javaplugin/pom.xml | 2 +- .../unittest/merger/JavaMergerTest.java | 15 ++++++--------- .../testdata/unittest/merger/BaseFile_Eol.java | 7 +++++++ .../testdata/unittest/merger/MergedFile_Eol.java | 9 +++++++++ .../testdata/unittest/merger/PatchFile_Eol.java | 9 +++++++++ 6 files changed, 37 insertions(+), 10 deletions(-) create mode 100644 cobigen/cobigen-javaplugin-parent/cobigen-javaplugin/src/test/resources/testdata/unittest/merger/BaseFile_Eol.java create mode 100644 cobigen/cobigen-javaplugin-parent/cobigen-javaplugin/src/test/resources/testdata/unittest/merger/MergedFile_Eol.java create mode 100644 cobigen/cobigen-javaplugin-parent/cobigen-javaplugin/src/test/resources/testdata/unittest/merger/PatchFile_Eol.java diff --git a/.gitattributes b/.gitattributes index a2517b6f44..3c932714de 100644 --- a/.gitattributes +++ b/.gitattributes @@ -46,3 +46,8 @@ *.pdf binary *.exe binary *.zip binary + +# special line ending handling for test files +cobigen/cobigen-javaplugin-parent/cobigen-javaplugin/src/test/resources/testdata/unittest/merger/BaseFile_Eol.java eol=lf +cobigen/cobigen-javaplugin-parent/cobigen-javaplugin/src/test/resources/testdata/unittest/merger/PatchFile_Eol.java eol=crlf +cobigen/cobigen-javaplugin-parent/cobigen-javaplugin/src/test/resources/testdata/unittest/merger/MergedFile_Eol.java eol=lf diff --git a/cobigen/cobigen-javaplugin-parent/cobigen-javaplugin/pom.xml b/cobigen/cobigen-javaplugin-parent/cobigen-javaplugin/pom.xml index 46d169600f..786b211955 100644 --- a/cobigen/cobigen-javaplugin-parent/cobigen-javaplugin/pom.xml +++ b/cobigen/cobigen-javaplugin-parent/cobigen-javaplugin/pom.xml @@ -27,7 +27,7 @@ ${project.groupId} core-api - [7.0.0,) + 7.1.0-SNAPSHOT diff --git a/cobigen/cobigen-javaplugin-parent/cobigen-javaplugin/src/test/java/com/devonfw/cobigen/javaplugin/unittest/merger/JavaMergerTest.java b/cobigen/cobigen-javaplugin-parent/cobigen-javaplugin/src/test/java/com/devonfw/cobigen/javaplugin/unittest/merger/JavaMergerTest.java index bf0a1acbaf..d6dea386ae 100644 --- a/cobigen/cobigen-javaplugin-parent/cobigen-javaplugin/src/test/java/com/devonfw/cobigen/javaplugin/unittest/merger/JavaMergerTest.java +++ b/cobigen/cobigen-javaplugin-parent/cobigen-javaplugin/src/test/java/com/devonfw/cobigen/javaplugin/unittest/merger/JavaMergerTest.java @@ -318,7 +318,7 @@ public void testConsistentLineEndings() throws IOException, MergeException { } /** - * Tests whether the output file contains line endings of base file + * Tests whether the output file contains line endings of base file (linux line endings) * @throws IOException * test fails * @throws MergeException @@ -326,16 +326,13 @@ public void testConsistentLineEndings() throws IOException, MergeException { */ @Test public void testBaseLineEndings() throws IOException, MergeException { - File baseFile = new File(testFileRootPath + "BaseFile_innerClass.java"); - File patchFile = new File(testFileRootPath + "PatchFile_innerClass.java"); + File baseFile = new File(testFileRootPath + "BaseFile_Eol.java"); + File patchFile = new File(testFileRootPath + "PatchFile_Eol.java"); + File mergedFile = new File(testFileRootPath + "MergedFile_Eol.java"); + String expectedContent = FileUtils.readFileToString(mergedFile); String mergedContents = new JavaMerger("", false).merge(baseFile, FileUtils.readFileToString(patchFile), "UTF-8"); - - boolean eol1 = mergedContents.contains("\r\n"); - mergedContents = mergedContents.replaceAll("\r\n", ""); - boolean eol2 = mergedContents.contains("\n"); - boolean eol3 = mergedContents.contains("\r"); - assertThat(eol1 ^ eol2 ^ eol3).isTrue(); + assertThat(mergedContents).isEqualTo(expectedContent); } /** diff --git a/cobigen/cobigen-javaplugin-parent/cobigen-javaplugin/src/test/resources/testdata/unittest/merger/BaseFile_Eol.java b/cobigen/cobigen-javaplugin-parent/cobigen-javaplugin/src/test/resources/testdata/unittest/merger/BaseFile_Eol.java new file mode 100644 index 0000000000..4e0965f162 --- /dev/null +++ b/cobigen/cobigen-javaplugin-parent/cobigen-javaplugin/src/test/resources/testdata/unittest/merger/BaseFile_Eol.java @@ -0,0 +1,7 @@ +package com.devonfw; + +public class FooBar { + + private int baseField = 0; + +} diff --git a/cobigen/cobigen-javaplugin-parent/cobigen-javaplugin/src/test/resources/testdata/unittest/merger/MergedFile_Eol.java b/cobigen/cobigen-javaplugin-parent/cobigen-javaplugin/src/test/resources/testdata/unittest/merger/MergedFile_Eol.java new file mode 100644 index 0000000000..461dbf028e --- /dev/null +++ b/cobigen/cobigen-javaplugin-parent/cobigen-javaplugin/src/test/resources/testdata/unittest/merger/MergedFile_Eol.java @@ -0,0 +1,9 @@ +package com.devonfw; + +public class FooBar { + + private int baseField = 0; + + private int patchField = 0; + +} diff --git a/cobigen/cobigen-javaplugin-parent/cobigen-javaplugin/src/test/resources/testdata/unittest/merger/PatchFile_Eol.java b/cobigen/cobigen-javaplugin-parent/cobigen-javaplugin/src/test/resources/testdata/unittest/merger/PatchFile_Eol.java new file mode 100644 index 0000000000..790cfec3de --- /dev/null +++ b/cobigen/cobigen-javaplugin-parent/cobigen-javaplugin/src/test/resources/testdata/unittest/merger/PatchFile_Eol.java @@ -0,0 +1,9 @@ +package com.devonfw; + +public class FooBar +{ + + private int baseField = 1; + private int patchField = 0; + +} From 44972c9e14fa77cfd3b0acff7d2a893dc2232c33 Mon Sep 17 00:00:00 2001 From: MikeSchumacher Date: Thu, 3 Dec 2020 16:02:17 +0100 Subject: [PATCH 5/9] dummy commit to start travis build --- .../com/devonfw/cobigen/templates/devon4j/utils/JavaUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cobigen-templates/templates-devon4j/src/main/java/com/devonfw/cobigen/templates/devon4j/utils/JavaUtil.java b/cobigen-templates/templates-devon4j/src/main/java/com/devonfw/cobigen/templates/devon4j/utils/JavaUtil.java index d5cb72020a..754e3b2e88 100644 --- a/cobigen-templates/templates-devon4j/src/main/java/com/devonfw/cobigen/templates/devon4j/utils/JavaUtil.java +++ b/cobigen-templates/templates-devon4j/src/main/java/com/devonfw/cobigen/templates/devon4j/utils/JavaUtil.java @@ -29,7 +29,7 @@ public JavaUtil() { /** * Returns the Object version of a Java primitive or the input if the input isn't a java primitive - * + * * @param simpleType * String * @return the corresponding object wrapper type simple name of the input if the input is the name of a From 63460ae79c68e3961bdcb1a43affe1126c4fdc04 Mon Sep 17 00:00:00 2001 From: MikeSchumacher Date: Mon, 7 Dec 2020 13:03:39 +0100 Subject: [PATCH 6/9] #1287 set release snapshot version --- .../cobigen-javaplugin-parent/cobigen-javaplugin-model/pom.xml | 2 +- cobigen/cobigen-javaplugin-parent/cobigen-javaplugin/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cobigen/cobigen-javaplugin-parent/cobigen-javaplugin-model/pom.xml b/cobigen/cobigen-javaplugin-parent/cobigen-javaplugin-model/pom.xml index be775e1720..f9ba94dca4 100644 --- a/cobigen/cobigen-javaplugin-parent/cobigen-javaplugin-model/pom.xml +++ b/cobigen/cobigen-javaplugin-parent/cobigen-javaplugin-model/pom.xml @@ -1,7 +1,7 @@ 4.0.0 javaplugin-model - 7.0.1-SNAPSHOT + 7.1.0-SNAPSHOT CobiGen Javaplugin Model jar CobiGen - Java Plug-in Model diff --git a/cobigen/cobigen-javaplugin-parent/cobigen-javaplugin/pom.xml b/cobigen/cobigen-javaplugin-parent/cobigen-javaplugin/pom.xml index 786b211955..baf0f5f395 100644 --- a/cobigen/cobigen-javaplugin-parent/cobigen-javaplugin/pom.xml +++ b/cobigen/cobigen-javaplugin-parent/cobigen-javaplugin/pom.xml @@ -2,7 +2,7 @@ 4.0.0 javaplugin CobiGen - Java Plug-in - 7.0.1-SNAPSHOT + 7.1.0-SNAPSHOT jar CobiGen - Java Plug-in From e92c5f92bd955c5700ea2fc1b79748fa06256678 Mon Sep 17 00:00:00 2001 From: MikeSchumacher Date: Mon, 7 Dec 2020 13:03:42 +0100 Subject: [PATCH 7/9] #1287 upgrade SNAPSHOT dependencies --- cobigen/cobigen-javaplugin-parent/cobigen-javaplugin/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cobigen/cobigen-javaplugin-parent/cobigen-javaplugin/pom.xml b/cobigen/cobigen-javaplugin-parent/cobigen-javaplugin/pom.xml index baf0f5f395..9dc6a6b938 100644 --- a/cobigen/cobigen-javaplugin-parent/cobigen-javaplugin/pom.xml +++ b/cobigen/cobigen-javaplugin-parent/cobigen-javaplugin/pom.xml @@ -27,7 +27,7 @@ ${project.groupId} core-api - 7.1.0-SNAPSHOT + 7.1.0 From 20081d618f870cdc58ddb06c11f80e66eb37077a Mon Sep 17 00:00:00 2001 From: MikeSchumacher Date: Mon, 7 Dec 2020 13:04:28 +0100 Subject: [PATCH 8/9] #1287 update wiki docs --- documentation/master-cobigen.asciidoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/documentation/master-cobigen.asciidoc b/documentation/master-cobigen.asciidoc index a0c395dfcd..76c5a521dd 100644 --- a/documentation/master-cobigen.asciidoc +++ b/documentation/master-cobigen.asciidoc @@ -12,7 +12,7 @@ This document contains the documentation of the CobiGen core module as well as a --- * CobiGen v6.0.0 -* CobiGen - Java Plug-in v7.0.0 +* CobiGen - Java Plug-in v7.1.0 * CobiGen - XML Plug-in v4.2.0 * CobiGen - TypeScript Plug-in v2.4.2 * CobiGen - Property Plug-in v2.1.0 From 3f81412a00b90162a459ae61edc7127932245031 Mon Sep 17 00:00:00 2001 From: MikeSchumacher Date: Mon, 7 Dec 2020 13:04:30 +0100 Subject: [PATCH 9/9] #1287 Set release version --- .../cobigen-javaplugin-parent/cobigen-javaplugin-model/pom.xml | 2 +- cobigen/cobigen-javaplugin-parent/cobigen-javaplugin/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cobigen/cobigen-javaplugin-parent/cobigen-javaplugin-model/pom.xml b/cobigen/cobigen-javaplugin-parent/cobigen-javaplugin-model/pom.xml index f9ba94dca4..58ac1facc3 100644 --- a/cobigen/cobigen-javaplugin-parent/cobigen-javaplugin-model/pom.xml +++ b/cobigen/cobigen-javaplugin-parent/cobigen-javaplugin-model/pom.xml @@ -1,7 +1,7 @@ 4.0.0 javaplugin-model - 7.1.0-SNAPSHOT + 7.1.0 CobiGen Javaplugin Model jar CobiGen - Java Plug-in Model diff --git a/cobigen/cobigen-javaplugin-parent/cobigen-javaplugin/pom.xml b/cobigen/cobigen-javaplugin-parent/cobigen-javaplugin/pom.xml index 9dc6a6b938..29e724e798 100644 --- a/cobigen/cobigen-javaplugin-parent/cobigen-javaplugin/pom.xml +++ b/cobigen/cobigen-javaplugin-parent/cobigen-javaplugin/pom.xml @@ -2,7 +2,7 @@ 4.0.0 javaplugin CobiGen - Java Plug-in - 7.1.0-SNAPSHOT + 7.1.0 jar CobiGen - Java Plug-in