Revert "Add branches for infra projects"

This reverts commit c3ed396.
This reverts commit 6c0560e.
This reverts commit 1d4f428.

Author: marko-bekhta

prepare-release.sh

@@ -54,15 +54,8 @@ if [ "$PROJECT" == "orm" ]; then
 		-Pgradle.publish.key=$PLUGIN_PORTAL_USERNAME -Pgradle.publish.secret=$PLUGIN_PORTAL_PASSWORD \
 		-PhibernatePublishUsername=$OSSRH_USER -PhibernatePublishPassword=$OSSRH_PASSWORD \
 		-DsigningPassword=$RELEASE_GPG_PASSPHRASE -DsigningKeyFile=$RELEASE_GPG_PRIVATE_KEY_PATH
-elif [[ "$PROJECT" == "infra-theme" || "$PROJECT" == "infra-extensions" ]]; then
-	./mvnw release:prepare \
-				-Dtag=$RELEASE_VERSION \
-				-DreleaseVersion=$RELEASE_VERSION \
-				-DdevelopmentVersion=$DEVELOPMENT_VERSION \
-				-DperformRelease=true \
-				-Dmaven.resolver.transport=wagon
 elif [ "$PROJECT" != "reactive" ]; then
-	# Hibernate Reactive does these checks in the `cirelease` task (called by publish.sh)
+  # Hibernate Reactive does these checks in the `cirelease` task (called by publish.sh)
 	"$SCRIPTS_DIR/check-sourceforge-availability.sh"
 	"$SCRIPTS_DIR/update-readme.sh" $PROJECT $RELEASE_VERSION "$WORKSPACE/README.md"
 	"$SCRIPTS_DIR/update-changelog.sh" $PROJECT $RELEASE_VERSION "$WORKSPACE/changelog.txt"

publish.sh

@@ -99,8 +99,6 @@ elif [ "$PROJECT" == "reactive" ]; then
 	fi
 	# Publish the artifact to OSSRH
 	exec_or_dry_run ./gradlew publishToSonatype closeAndReleaseSonatypeStagingRepository -PsontaypeOssrhUser=$OSSRH_USER -PsonatypeOssrgPassword=$OSSRH_PASSWORD
-elif [[ "$PROJECT" == "infra-theme" || "$PROJECT" == "infra-extensions" ]]; then
-  exec_or_dry_run ./mvnw release:perform -DperformRelease=true -Dmaven.resolver.transport=wagon
 else
 	bash -xe "$SCRIPTS_DIR/deploy.sh" "$PROJECT"
 

release.sh

@@ -110,8 +110,6 @@ elif [ "$PROJECT" == "orm" ]; then
   JIRA_PROJECT="HHH"
 elif [ "$PROJECT" == "reactive" ]; then
   JIRA_PROJECT="HREACT"
-elif [[ "$PROJECT" == "infra-theme" || "$PROJECT" == "infra-extensions" ]]; then
-  echo 'No JIRA project available'
 else
   echo "ERROR: Unknown project name $PROJECT"
   usage
@@ -188,13 +186,7 @@ if [ "$PUSH_CHANGES" != "true" ]; then
 	ADDITIONAL_OPTIONS="-d"
 fi
 
-if [ "$PROJECT" == "infra-theme" || "$PROJECT" == "infra-extensions" ]; then
-  # infra projects are using different release plugins than main maven-based projects,
-  # and they require both release and development versions:
-  bash -xe "$SCRIPTS_DIR/prepare-release.sh" "$PROJECT" "$RELEASE_VERSION" "$DEVELOPMENT_VERSION"
-else
-  bash -xe "$SCRIPTS_DIR/prepare-release.sh" "$PROJECT" "$RELEASE_VERSION"
-fi
+bash -xe "$SCRIPTS_DIR/prepare-release.sh" "$PROJECT" "$RELEASE_VERSION"
 
 #bash -xe "$SCRIPTS_DIR/jira-release.sh" $ADDITIONAL_OPTIONS "$JIRA_PROJECT" "$RELEASE_VERSION_BASIS" "$NEXT_VERSION_BASIS"