archive-gh-me/onedev
1
0
Fork 0
mirror of https://github.com/theonedev/onedev.git synced 2025-12-08 18:26:30 +00:00
Code Issues Projects Releases Wiki Activity

Bump version

Browse Source
This commit is contained in:
Robin Shen 2022-12-18 17:27:27 +08:00
parent fba099cc45
commit 9a8ec77344
4 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pom.xml
View File

@ -38,14 +38,14 @@
<plugin>
<groupId>io.onedev</groupId>
<artifactId>plugin-maven</artifactId>
<version>2.4.0</version>
<version>2.4.1</version>
<executions>
<execution>
<?m2e execute onConfiguration,onIncremental?>
<id>populate-resources</id>
<phase>generate-sources</phase>
<id>generate-resources</id>
<phase>generate-resources</phase>
<goals>
<goal>populate-resources</goal>
<goal>generate-resources</goal>
</goals>
</execution>
<execution>
@ -76,7 +76,6 @@
<directory>src/main/java</directory>
<excludes>
<exclude>**/*.java</exclude>
<exclude>**/*.scss</exclude>
</excludes>
</resource>
<resource>
@ -617,8 +616,8 @@
</repository>
</repositories>
<properties>
<commons.version>2.6.3</commons.version>
<agent.version>1.7.7</agent.version>
<commons.version>2.6.4</commons.version>
<agent.version>1.7.8</agent.version>
<slf4j.version>1.7.36</slf4j.version>
<logback.version>1.2.11</logback.version>
<antlr.version>4.7.2</antlr.version>

2
server-core/src/main/java/io/onedev/server/model/support/TwoFactorAuthentication.java
View File

@ -9,6 +9,7 @@ import java.net.URL;
import java.net.URLEncoder;
import java.util.List;
import de.taimos.totp.TOTP;
import org.apache.commons.codec.binary.Base32;
import org.apache.commons.codec.binary.Hex;
@ -18,7 +19,6 @@ import com.google.zxing.WriterException;
import com.google.zxing.client.j2se.MatrixToImageWriter;
import com.google.zxing.common.BitMatrix;
import de.taimos.totp.TOTP;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.model.User;

1
server-core/src/main/java/io/onedev/server/web/page/test/TestPage.java
View File

@ -1,6 +1,5 @@
package io.onedev.server.web.page.test;
import io.onedev.commons.utils.FileUtils;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.markup.head.OnDomReadyHeaderItem;

10
server-plugin/server-plugin-archetype/src/main/resources/archetype-resources/pom.xml
View File

@ -33,14 +33,14 @@
<plugin>
<groupId>io.onedev</groupId>
<artifactId>plugin-maven</artifactId>
<version>2.4.0</version>
<version>2.4.1</version>
<executions>
<execution>
<?m2e execute onConfiguration,onIncremental?>
<id>populate-resources</id>
<phase>generate-sources</phase>
<id>generate-resources</id>
<phase>generate-resources</phase>
<goals>
<goal>populate-resources</goal>
<goal>generate-resources</goal>
</goals>
</execution>
<execution>
@ -58,7 +58,7 @@
<executions>
<execution>
<id>default-jar</id>
<phase>never</phase>
<phase>none</phase>
<configuration>
<finalName>unwanted</finalName>
<classifier>unwanted</classifier>