Skip to content

Commit

Permalink
Merge main into develop (#4737)
Browse files Browse the repository at this point in the history
  • Loading branch information
@hmottestad
hmottestad authored Aug 7, 2023
2 parents 81cbc94 + 19a758d commit 9c8a745
Show file tree
Hide file tree
Showing 2 changed files with 33 additions and 30 deletions.
45 changes: 24 additions & 21 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -628,7 +628,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>3.4.2</version>
<version>3.6.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand All @@ -638,12 +638,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
<version>3.2.0</version>
<version>3.3.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.10.1</version>
<version>3.11.0</version>
<configuration>
<fork>false</fork>
<encoding>utf8</encoding>
Expand All @@ -652,12 +652,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.4.0</version>
<version>3.6.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<version>3.0.0</version>
<version>3.1.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand Down Expand Up @@ -708,7 +708,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>5.1.8</version>
<version>5.1.9</version>
<extensions>true</extensions>
<configuration>
<instructions>
Expand All @@ -724,7 +724,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.4.1</version>
<version>3.5.0</version>
<configuration>
<encoding>utf8</encoding>
<source>11</source>
Expand Down Expand Up @@ -759,17 +759,17 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>3.3.0</version>
<version>3.3.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>3.2.1</version>
<version>3.3.0</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>properties-maven-plugin</artifactId>
<version>1.1.0</version>
<version>1.2.0</version>
<executions>
<execution>
<phase>generate-resources</phase>
Expand All @@ -786,16 +786,19 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.0.0-M7</version>
<version>3.1.2</version>
<configuration>
<encoding>UTF-8</encoding>
<argLine>-Xmx2048M</argLine>
<excludes>
<exclude>**/*IT.java</exclude>
</excludes>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<version>3.0.0-M7</version>
<version>3.1.2</version>
<configuration>
<encoding>UTF-8</encoding>
<forkCount>1</forkCount>
Expand Down Expand Up @@ -825,7 +828,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>3.3.2</version>
<version>3.4.0</version>
<configuration>
<failOnMissingWebXml>false</failOnMissingWebXml>
<archive>
Expand All @@ -842,7 +845,7 @@
<plugin>
<groupId>net.revelc.code.formatter</groupId>
<artifactId>formatter-maven-plugin</artifactId>
<version>2.21.0</version>
<version>2.23.0</version>
<configuration>
<configFile>${project.basedir}/eclipse-settings/eclipse-rdf4j-conventions.xml</configFile>
<lineEnding>LF</lineEnding>
Expand All @@ -852,7 +855,7 @@
<plugin>
<groupId>net.revelc.code</groupId>
<artifactId>impsort-maven-plugin</artifactId>
<version>1.8.0</version>
<version>1.9.0</version>
<configuration>
<groups>java.,javax.,org.,com.</groups>
<staticGroups>java,*</staticGroups>
Expand All @@ -866,7 +869,7 @@
<plugin>
<groupId>com.github.siom79.japicmp</groupId>
<artifactId>japicmp-maven-plugin</artifactId>
<version>0.17.1</version>
<version>0.17.2</version>
<configuration>
<oldVersion>
<dependency>
Expand Down Expand Up @@ -921,12 +924,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.4.1</version>
<version>3.5.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>3.1.0</version>
<version>3.3.0</version>
<executions>
<execution>
<id>enforce-maven-3</id>
Expand Down Expand Up @@ -1017,19 +1020,19 @@
<dependency>
<groupId>org.codehaus.mojo</groupId>
<artifactId>extra-enforcer-rules</artifactId>
<version>1.6.1</version>
<version>1.7.0</version>
</dependency>
</dependencies>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
<version>3.1.0</version>
<version>3.1.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<version>4.0.0-M4</version>
<version>4.0.0-M9</version>
</plugin>
</plugins>
</pluginManagement>
Expand Down
18 changes: 9 additions & 9 deletions scripts/milestone-release.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,13 @@ if ! command -v xmllint &> /dev/null; then
exit 1;
fi

# check that there are no uncomitted or untracked files
if ! [[ $(git status --porcelain) == "" ]]; then
echo "";
echo "There are uncomitted or untracked files! Commit, delete or unstage files. Run git status for more info.";
exit 1;
fi

echo "Running git pull to make sure we are up to date"
git pull

Expand All @@ -68,10 +75,10 @@ if ! [[ $(git status --porcelain -u no --branch) == "## main...origin/main" ]]
fi

ORIGINAL_BRANCH=""
if ! [[ $(git status --porcelain -u no --branch) == "## main...origin/main" ]]; then
if git status --porcelain -u no --branch == "## main...origin/main"; then
ORIGINAL_BRANCH="main";
fi
if ! [[ $(git status --porcelain -u no --branch) == "## develop...origin/develop" ]]; then
if git status --porcelain -u no --branch == "## develop...origin/develop"; then
ORIGINAL_BRANCH="develop";
fi

Expand Down Expand Up @@ -108,13 +115,6 @@ fi
git checkout "${ORIGINAL_BRANCH}"


# check that there are no uncomitted or untracked files
if ! [[ $(git status --porcelain) == "" ]]; then
echo "";
echo "There are uncomitted or untracked files! Commit, delete or unstage files. Run git status for more info.";
exit 1;
fi

# check that we have push access
if ! git push --dry-run > /dev/null 2>&1; then
echo "";
Expand Down

0 comments on commit 9c8a745

Please sign in to comment.