diff --git a/.travis.yml b/.travis.yml index abe4fb2e..ef7057e3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -60,7 +60,7 @@ jobs: - name: "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_script: travis_wait bash _ci/cache_artifacts.sh script: travis_wait 30 bash _ci/release.sh diff --git a/_ci/release.sh b/_ci/release.sh index 11344097..b76fb645 100644 --- a/_ci/release.sh +++ b/_ci/release.sh @@ -18,6 +18,8 @@ mvn -B \ ${DRY_RUN} \ -Prelease \ "-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 \ -DscmCommentPrefix="[maven-release-plugin][skip ci] " \ -Dusername=alfresco-build \ diff --git a/alfresco-transform-misc/alfresco-transform-misc-spring/src/main/java/org/alfresco/transformer/MiscController.java b/alfresco-transform-misc/alfresco-transform-misc-spring/src/main/java/org/alfresco/transformer/MiscController.java index 510ebb66..a257b3fc 100644 --- a/alfresco-transform-misc/alfresco-transform-misc-spring/src/main/java/org/alfresco/transformer/MiscController.java +++ b/alfresco-transform-misc/alfresco-transform-misc-spring/src/main/java/org/alfresco/transformer/MiscController.java @@ -60,8 +60,7 @@ public class MiscController extends AbstractTransformerController { private static final Logger logger = LoggerFactory.getLogger(MiscController.class); - @Autowired - private SelectingTransformer transformer; + private SelectingTransformer transformer = new SelectingTransformer(); @Override public String getTransformerName() diff --git a/alfresco-transform-misc/alfresco-transform-misc-spring/src/test/java/org/alfresco/transformer/MiscControllerTest.java b/alfresco-transform-misc/alfresco-transform-misc-spring/src/test/java/org/alfresco/transformer/MiscControllerTest.java index bc5ed784..cd597f7f 100644 --- a/alfresco-transform-misc/alfresco-transform-misc-spring/src/test/java/org/alfresco/transformer/MiscControllerTest.java +++ b/alfresco-transform-misc/alfresco-transform-misc-spring/src/test/java/org/alfresco/transformer/MiscControllerTest.java @@ -62,7 +62,6 @@ import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilde @RunWith(SpringRunner.class) @WebMvcTest(MiscController.class) -@Import({SelectingTransformer.class}) public class MiscControllerTest extends AbstractTransformerControllerTest { @Autowired diff --git a/alfresco-transform-misc/alfresco-transform-misc/src/main/java/org/alfresco/transformer/transformers/SelectingTransformer.java b/alfresco-transform-misc/alfresco-transform-misc/src/main/java/org/alfresco/transformer/transformers/SelectingTransformer.java index 7f562e13..3b42bd16 100644 --- a/alfresco-transform-misc/alfresco-transform-misc/src/main/java/org/alfresco/transformer/transformers/SelectingTransformer.java +++ b/alfresco-transform-misc/alfresco-transform-misc/src/main/java/org/alfresco/transformer/transformers/SelectingTransformer.java @@ -37,7 +37,6 @@ import org.alfresco.transform.exceptions.TransformException; import org.alfresco.transformer.logging.LogEntry; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.stereotype.Component; import com.google.common.collect.ImmutableMap;