Skip to content

Commit 308f4bb

Browse files
maybeecmaybeec
committed
#53: Merge branch 'dev_core'
Conflicts: cobigen/cobigen-javaplugin/src/main/java/com/capgemini/cobigen/javaplugin/inputreader/ParsedJavaModelBuilder.java cobigen/cobigen-javaplugin/src/main/java/com/capgemini/cobigen/javaplugin/inputreader/ReflectedJavaModelBuilder.java cobigen/cobigen-javaplugin/src/main/java/com/capgemini/cobigen/javaplugin/merger/libextension/ModifyableModelBuilder.java cobigen/cobigen-javaplugin/src/main/java/com/capgemini/cobigen/javaplugin/util/ParserUtil.java cobigen/cobigen-javaplugin/src/test/java/com/capgemini/cobigen/javaplugin/inputreader/AbstractJavaParserTest.java cobigen/cobigen-javaplugin/src/test/java/com/capgemini/cobigen/javaplugin/inputreader/JavaInputReaderTest.java cobigen/cobigen-javaplugin/src/test/java/com/capgemini/cobigen/javaplugin/inputreader/ParsedJavaModelBuilderTest.java cobigen/cobigen-javaplugin/src/test/java/com/capgemini/cobigen/javaplugin/inputreader/ReflectedJavaModelBuilderTest.java cobigen/cobigen-javaplugin/src/test/java/com/capgemini/cobigen/javaplugin/merger/libextension/CustomModelWriterTest.java cobigen/cobigen-xmlplugin/pom.xml cobigen/cobigen-xmlplugin/src/main/java/com/capgemini/cobigen/xmlplugin/action/BasicMergeAction.java cobigen/cobigen-xmlplugin/src/main/java/com/capgemini/cobigen/xmlplugin/action/CompleteMergeAction.java cobigen/cobigen-xmlplugin/src/main/java/com/capgemini/cobigen/xmlplugin/action/OverrideMergeAction.java cobigen/cobigen-xmlplugin/src/main/java/com/capgemini/cobigen/xmlplugin/matcher/XmlMatcher.java cobigen/cobigen-xmlplugin/src/test/java/com/capgemini/cobigen/xmlplugin/XmlMergerTest.java cobigen/pom.xml pom.xml
2 parents b4bb850 + 6d3cfab commit 308f4bb

File tree

185 files changed

+3165
-3950
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

185 files changed

+3165
-3950
lines changed

‎.gitignore

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
/*.settings
22
bin
3-
target
3+
target
4+
5+
/cobigen-eclipse/.project

‎.gitmodules

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
[submodule "cobigen-documentation/oasp-docgen"]
2+
path = cobigen-documentation/oasp-docgen
3+
url = https://github.com/oasp/oasp-docgen
4+
[submodule "cobigen-documentation/tools-cobigen.wiki"]
5+
path = cobigen-documentation/tools-cobigen.wiki
6+
url = https://github.com/oasp/tools-cobigen.wiki.git

‎cobigen-documentation/oasp-docgen

Submodule oasp-docgen added at ce400a3

‎cobigen-documentation/pom.xml

-127
This file was deleted.

‎cobigen-documentation/src/main/ant/build.xml

-44
This file was deleted.

‎cobigen-documentation/src/main/docbook/xsl/Readme.md

-3
This file was deleted.

‎cobigen-documentation/src/main/docbook/xsl/common.xsl

-46
This file was deleted.

0 commit comments

Comments
 (0)