inteligr8/alfresco-transform-core
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-transform-core.git synced 2025-08-14 17:58:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix spring tests

Browse Source
This commit is contained in:
Erik Knizat
2020-03-23 12:51:49 +00:00
parent deb5d9e41f
commit 6f6f2b1d8d
5 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@@ -60,7 +60,7 @@ jobs:
- name: "Release" - name: "Release"
stage: release stage: release
if: commit_message ~= /\[trigger release\]/ AND branch ~= /^(master|SP\/.+|HF\/.+)$/ if: commit_message ~= /\[trigger release\]/ AND branch ~= /^(ATS-671_skinny_jars_in_modules|master|SP\/.+|HF\/.+)$/
before_install: bash _ci/init.sh before_install: bash _ci/init.sh
before_script: travis_wait bash _ci/cache_artifacts.sh before_script: travis_wait bash _ci/cache_artifacts.sh
script: travis_wait 30 bash _ci/release.sh script: travis_wait 30 bash _ci/release.sh

2
_ci/release.sh
View File

@@ -18,6 +18,8 @@ mvn -B \
${DRY_RUN} \ ${DRY_RUN} \
-Prelease \ -Prelease \
"-Darguments=-Prelease -DskipTests -Dmaven.javadoc.skip -Dadditionalparam=-Xdoclint:none" \ "-Darguments=-Prelease -DskipTests -Dmaven.javadoc.skip -Dadditionalparam=-Xdoclint:none" \
-DreleaseVersion="2.1.2-test-0" \
-DdevelopmentVersion="2.1.2-test-1" \
release:clean release:prepare release:perform \ release:clean release:prepare release:perform \
-DscmCommentPrefix="[maven-release-plugin][skip ci] " \ -DscmCommentPrefix="[maven-release-plugin][skip ci] " \
-Dusername=alfresco-build \ -Dusername=alfresco-build \

3
alfresco-transform-misc/alfresco-transform-misc-spring/src/main/java/org/alfresco/transformer/MiscController.java
View File

@@ -60,8 +60,7 @@ public class MiscController extends AbstractTransformerController
{ {
private static final Logger logger = LoggerFactory.getLogger(MiscController.class); private static final Logger logger = LoggerFactory.getLogger(MiscController.class);
@Autowired private SelectingTransformer transformer = new SelectingTransformer();
private SelectingTransformer transformer;
@Override @Override
public String getTransformerName() public String getTransformerName()

1
alfresco-transform-misc/alfresco-transform-misc-spring/src/test/java/org/alfresco/transformer/MiscControllerTest.java
View File

@@ -62,7 +62,6 @@ import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilde
@RunWith(SpringRunner.class) @RunWith(SpringRunner.class)
@WebMvcTest(MiscController.class) @WebMvcTest(MiscController.class)
@Import({SelectingTransformer.class})
public class MiscControllerTest extends AbstractTransformerControllerTest public class MiscControllerTest extends AbstractTransformerControllerTest
{ {
@Autowired @Autowired

1
alfresco-transform-misc/alfresco-transform-misc/src/main/java/org/alfresco/transformer/transformers/SelectingTransformer.java
View File

@@ -37,7 +37,6 @@ import org.alfresco.transform.exceptions.TransformException;
import org.alfresco.transformer.logging.LogEntry; import org.alfresco.transformer.logging.LogEntry;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Component;
import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMap;