Merge branch 'master' into FixGitHubDeploy

FIUS · Jan 3, 2024 · a748d3d · a748d3d
2 parents a560824 + e5a7083
commit a748d3d
Show file tree

Hide file tree

Showing 7 changed files with 101 additions and 26 deletions.
diff --git a/.github/workflows/deploySettings.xml b/.github/workflows/deploySettings.xml
@@ -0,0 +1,37 @@
+<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">
+
+  <activeProfiles>
+    <activeProfile>github</activeProfile>
+  </activeProfiles>
+
+  <profiles>
+    <profile>
+      <id>github</id>
+      <repositories>
+        <repository>
+          <id>central</id>
+          <url>https://repo1.maven.org/maven2</url>
+        </repository>
+        <repository>
+          <id>github</id>
+          <url>https://maven.pkg.github.com/OWNER/REPOSITORY</url>
+          <snapshots>
+            <enabled>true</enabled>
+          </snapshots>
+        </repository>
+      </repositories>
+    </profile>
+  </profiles>
+
+  <servers>
+    <server>
+      <id>github</id>
+      <username>${github.user}</username>
+      <password>${github.token}</password>
+    </server>
+  </servers>
+</settings>
+
diff --git a/.github/workflows/releaseMavenPackages.yml b/.github/workflows/releaseMavenPackages.yml
diff --git a/.github/workflows/releaseToGithubPackages.yml b/.github/workflows/releaseToGithubPackages.yml
@@ -0,0 +1,24 @@
+name: Publish package to GitHub Packages
+on:
+  release:
+    types: [created]
+jobs:
+  publish:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-java@v3
+        with:
+          java-version: '11'
+          distribution: 'temurin'
+          server-id: github # Value of the distributionManagement/repository/id field of the pom.xml
+          settings-path: ${{ github.workspace }} # location for the settings.xml file
+      - name: Publish package
+        run: ./mvnw -s "${{ github.workspace }}/scriptsAndTools/internalOrCiOnly/deploySettings.xml" deploy -Dgithub.user=$GITHUB_USER -Dgithub.token=$GITHUB_TOKEN
+        env:
+          GITHUB_USER: ${{ secrets.MAVEN_REPO_USER }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
diff --git a/ICGE-archetype-module/src/main/resources/archetype-resources/pom.xml b/ICGE-archetype-module/src/main/resources/archetype-resources/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>de.uni-stuttgart.informatik.fius</groupId>
         <artifactId>ICGE</artifactId>
-        <version>2.3.8-Snapshot</version>
+        <version>2.3.9-Snapshot</version>
     </parent>
     <artifactId>${artifactId}</artifactId>
     <name>${name}</name>

diff --git a/examples/mario/pom.xml b/examples/mario/pom.xml
@@ -7,7 +7,7 @@
     <name>ICGE Example: Mario Simulator</name>
     <properties>
         <java.version>11</java.version>
-        <icge.version>2.3.8-Snapshot</icge.version>
+        <icge.version>2.3.9-Snapshot</icge.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
     <build>

diff --git a/pom.xml b/pom.xml
@@ -150,7 +150,7 @@
 	<distributionManagement>
 		<repository>
 			<id>github</id>
-			<url>https://maven.pkg.github.com/graefjk/ICGE2</url>
+			<url>https://maven.pkg.github.com/FIUS/ICGE2</url>
 		</repository>
 	</distributionManagement>
 	<modules>

diff --git a/scriptsAndTools/internalOrCiOnly/deploySettings.xml b/scriptsAndTools/internalOrCiOnly/deploySettings.xml
@@ -0,0 +1,37 @@
+<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">
+
+  <activeProfiles>
+    <activeProfile>github</activeProfile>
+  </activeProfiles>
+
+  <profiles>
+    <profile>
+      <id>github</id>
+      <repositories>
+        <repository>
+          <id>central</id>
+          <url>https://repo1.maven.org/maven2</url>
+        </repository>
+        <repository>
+          <id>github</id>
+          <url>https://maven.pkg.github.com/OWNER/REPOSITORY</url>
+          <snapshots>
+            <enabled>true</enabled>
+          </snapshots>
+        </repository>
+      </repositories>
+    </profile>
+  </profiles>
+
+  <servers>
+    <server>
+      <id>github</id>
+      <username>${github.user}</username>
+      <password>${github.token}</password>
+    </server>
+  </servers>
+</settings>
+