catch up with branch development Signed-off-by: Ralf Mollik <ramollik@compex-commerce.com>
diff --git a/jenkins.build.config.xml b/jenkins.build.config.xml index ff4d016..a4f00f2 100644 --- a/jenkins.build.config.xml +++ b/jenkins.build.config.xml
@@ -13,6 +13,7 @@ <!--#======================================================================= --> <jenkins> <jenkins.build.technologystack /> + <mavenOpts> -Xmx4096m -Duser.name=OS.bee.buildmanager -Dmaven.javadoc.skip=true </mavenOpts> <!-- DO NOT EDIT BELOW THIS LINE --> <jenkins.build.dependencies> <jenkins.build.dependency>org.eclipse.osbp.releng.maven</jenkins.build.dependency>
diff --git a/mavenizing_started b/mavenizing_started deleted file mode 100644 index e69de29..0000000 --- a/mavenizing_started +++ /dev/null
diff --git a/org.eclipse.osbp.fork.jpos.feature/.settings/org.eclipse.xtend.core.Xtend.prefs b/org.eclipse.osbp.fork.jpos.feature/.settings/org.eclipse.xtend.core.Xtend.prefs index 0933f8c..19e3115 100644 --- a/org.eclipse.osbp.fork.jpos.feature/.settings/org.eclipse.xtend.core.Xtend.prefs +++ b/org.eclipse.osbp.fork.jpos.feature/.settings/org.eclipse.xtend.core.Xtend.prefs
@@ -1,4 +1,5 @@ //outlet.DEFAULT_OUTPUT.sourceFolder.src/test/java.directory=src/test/generated-sources/xtend +BuilderConfiguration.is_project_specific=true eclipse.preferences.version=1 is_project_specific=true outlet.DEFAULT_OUTPUT.hideLocalSyntheticVariables=true
diff --git a/org.eclipse.osbp.fork.jpos/.settings/org.eclipse.xtend.core.Xtend.prefs b/org.eclipse.osbp.fork.jpos/.settings/org.eclipse.xtend.core.Xtend.prefs index 0933f8c..19e3115 100644 --- a/org.eclipse.osbp.fork.jpos/.settings/org.eclipse.xtend.core.Xtend.prefs +++ b/org.eclipse.osbp.fork.jpos/.settings/org.eclipse.xtend.core.Xtend.prefs
@@ -1,4 +1,5 @@ //outlet.DEFAULT_OUTPUT.sourceFolder.src/test/java.directory=src/test/generated-sources/xtend +BuilderConfiguration.is_project_specific=true eclipse.preferences.version=1 is_project_specific=true outlet.DEFAULT_OUTPUT.hideLocalSyntheticVariables=true
diff --git a/org.eclipse.osbp.fork.jpos/build.properties b/org.eclipse.osbp.fork.jpos/build.properties index 3b37cfb..ab73ec1 100644 --- a/org.eclipse.osbp.fork.jpos/build.properties +++ b/org.eclipse.osbp.fork.jpos/build.properties
@@ -9,13 +9,12 @@ about.ini,\ about.mappings,\ about.properties,\ - about_files/,\ + about_files/,\ notice.html,\ license.html,\ - LICENSE.txt,\ - epl-v20.html + epl-v20.html,\ + license.txt src.includes = license.html,\ - LICENSE.txt,\ about.html,\ about.ini,\ about.mappings,\
diff --git a/org.eclipse.osbp.jpa.services b/org.eclipse.osbp.jpa.services new file mode 160000 index 0000000..1b3ee75 --- /dev/null +++ b/org.eclipse.osbp.jpa.services
@@ -0,0 +1 @@ +Subproject commit 1b3ee7555198a84d99f82cec4b12235d2804de05