Skip to content

Commit

Permalink
Fix pom configuration
Browse files Browse the repository at this point in the history
  • Loading branch information
@ugur93
ugur93 committed Jan 11, 2024
1 parent b955a8e commit 1703304
Show file tree
Hide file tree
Showing 13 changed files with 213 additions and 513 deletions.
14 changes: 14 additions & 0 deletions .github/.m2/maven-settings.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0
http://maven.apache.org/xsd/settings-1.0.0.xsd">

<servers>
<server>
<id>github</id>
<username>${env.GITHUB_USERNAME}</username>
<password>${env.GITHUB_TOKEN}</password>
</server>
</servers>

</settings>
3 changes: 0 additions & 3 deletions .github/dependabot.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,6 @@ updates:
directory: "/"
registries:
- "maven-github"
ignore:
- dependency-name: "no.nav.bidrag:bidrag-commons"
versions: [ "0.x.x" ]
schedule:
interval: "weekly"
day: "monday"
Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/publish.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@ jobs:
mvn versions:set -DnewVersion="${{ env.VERSION }}"
mvn versions:commit
- name: Deploy to Github Package
env:
GITHUB_USERNAME: x-access-token
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
echo "Release package with version ${{ env.VERSION }}"
mvn source:jar-no-fork deploy -DskipTests=true -Dmaven.wagon.http.pool=false
mvn --settings .github/.m2/maven-settings.xml source:jar-no-fork deploy -DskipTests=true -Dmaven.wagon.http.pool=false -DdeplyAtEnd=true
2 changes: 1 addition & 1 deletion .github/workflows/release-draft.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-java@v4.0.0
- uses: actions/setup-java@v4
with:
java-version: 21
distribution: 'temurin'
Expand Down
195 changes: 6 additions & 189 deletions bidrag-commons/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<version>${revision}</version>
</parent>

<artifactId>bidrag-commons</artifactId>
<artifactId>bidrag-commons-felles</artifactId>
<name>bidrag-commons</name>
<version>${parent.version}</version>
<packaging>jar</packaging>
Expand Down Expand Up @@ -52,21 +52,13 @@
<ktlint.version>1.0.1</ktlint.version>

<!-- language -->
<kotlin.compiler.jvmTarget>21</kotlin.compiler.jvmTarget>
<java.version>21</java.version>
<kotlin.code.style>official</kotlin.code.style>

<!-- plugins -->
<maven-compiler.version>3.11.0</maven-compiler.version>
<maven-surefire.version>3.2.3</maven-surefire.version>
<maven-deploy.version>3.1.1</maven-deploy.version>
<maven-failsafe.version>3.2.3</maven-failsafe.version>
<maven-resources.version>3.3.1</maven-resources.version>
<maven-release.version>3.0.1</maven-release.version>
<maven-antrun.version>3.1.0</maven-antrun.version>
<maven-jar.version>3.3.0</maven-jar.version>
<flatten-maven.version>1.5.0</flatten-maven.version>
<build-helper-maven.version>3.5.0</build-helper-maven.version>
<java.version>21</java.version>
<maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target>
<kotlin.compiler.jvmTarget>${java.version}</kotlin.compiler.jvmTarget>

</properties>

<dependencyManagement>
Expand Down Expand Up @@ -192,102 +184,6 @@

</dependencies>

<profiles>
<profile>
<id>release</id>
<activation>
<property>
<name>release</name>
</property>
</activation>
<build>
<plugins>
<!--create source jar-->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>${maven-source.version}</version>
<executions>
<execution>
<id>attach-sources</id>
<goals>
<goal>jar-no-fork</goal>
</goals>
</execution>
</executions>
</plugin>

</plugins>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>${maven-jar.version}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>${maven-compiler.version}</version>
<configuration>
<release>${java.version}</release>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<version>${maven-release.version}</version>
<configuration>
<autoVersionSubmodules>true</autoVersionSubmodules>
<useReleaseProfile>true</useReleaseProfile>
<releaseProfiles>release</releaseProfiles>
<goals>deploy</goals>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>${maven-source.version}</version>
<executions>
<execution>
<id>attach-sources</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<version>${maven-deploy.version}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${maven-surefire.version}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<version>${maven-failsafe.version}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>${maven-resources.version}</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>flatten-maven-plugin</artifactId>
<version>${flatten-maven.version}</version>
</plugin>
</plugins>
</pluginManagement>
</build>
</profile>
</profiles>

<build>
<sourceDirectory>src/main/kotlin</sourceDirectory>
<testSourceDirectory>src/test/kotlin</testSourceDirectory>
Expand All @@ -296,37 +192,6 @@
<plugin>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-maven-plugin</artifactId>
<version>${kotlin.version}</version>
<configuration>
<args>
<arg>-Xjsr305=strict</arg>
</args>
<compilerPlugins>
<plugin>spring</plugin>
</compilerPlugins>
<jvmTarget>${java.version}</jvmTarget>
</configuration>
<executions>
<execution>
<id>compile</id>
<phase>compile</phase>
<goals>
<goal>compile</goal>
</goals>
</execution>
<execution>
<id>test-compile</id>
<phase>test-compile</phase>
<goals>
<goal>test-compile</goal>
</goals>
<configuration>
<sourceDirs>
<sourceDir>${project.basedir}/src/test/kotlin</sourceDir>
</sourceDirs>
</configuration>
</execution>
</executions>
<dependencies>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
Expand All @@ -335,54 +200,6 @@
</dependency>
</dependencies>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>${maven-source.version}</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>${build-helper-maven.version}</version>

<executions>
<execution>
<phase>generate-sources</phase>
<goals>
<goal>add-source</goal>
</goals>
<configuration>
<sources>
<source>src/main/kotlin</source>
</sources>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${maven-surefire.version}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<version>${maven-release.version}</version>
<configuration>
<autoVersionSubmodules>true</autoVersionSubmodules>
<useReleaseProfile>true</useReleaseProfile>
<releaseProfiles>release</releaseProfiles>
<goals>deploy</goals>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>${maven-compiler.version}</version>
<configuration>
<release>${java.version}</release>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
Expand Down
Loading

0 comments on commit 1703304

Please sign in to comment.