change settings for gitlab repo

KeYProject · Dec 20, 2020 · 9849f7b · 9849f7b
1 parent b84273f
commit 9849f7b
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 10 deletions.
diff --git a/key/build.gradle b/key/build.gradle
@@ -231,12 +231,20 @@ subprojects {
         }
         repositories {
             maven {
-                name = "GitHubPackages"
-                url = uri("https://maven.pkg.github.com/KeYProject/key")
-                credentials {
+                name = "GitlabPackages"
+                //url = uri("https://maven.pkg.github.com/KeYProject/key")
+		url "https://git.key-project.org/api/v4/projects/35/packages/maven"
+		credentials(HttpHeaderCredentials) {
+			name = 'Private-Token'
+			value = System.getenv("TOKEN")
+		}
+		authentication {
+			header(HttpHeaderAuthentication)
+		}
+                /*credentials {
                     username = project.findProperty("gpr.user") ?: System.getenv("USERNAME")
                     password = project.findProperty("gpr.key") ?: System.getenv("TOKEN")
-                }
+                }*/
             }
         }
     }

diff --git a/key/key.core/build.gradle b/key/key.core/build.gradle
@@ -39,7 +39,7 @@ compileJavacc {
     doLast {
         // Some manual overwriting of Token files needed
         copy {
-            from("src/main/javacc/de/uka/ilkd//parser/schemajava/Token.java")
+            from("src/main/javacc/de/uka/ilkd/key/parser/schemajava/Token.java")
             into "$javaCCOutputDirMain/de/uka/ilkd/key/parser/schemajava/"
         }
         copy {

diff --git a/key/scripts/mvndeploy/deploy.sh b/key/scripts/mvndeploy/deploy.sh
@@ -1,12 +1,14 @@
-DEPLOYURL=https://maven.pkg.github.com/KeYProject/key
+# PROJECT 53  = key-public/key
+DEPLOYURL=https://git.key-project.org/api/v4/projects/35/packages/maven
 
 MVNDEPLOY="mvn -s settings.xml deploy:deploy-file -DrepositoryId=gpr -Durl=$DEPLOYURL"
 
 
 # recoderkey
-# $MVNDEPLOY -DpomFile=recoderKey.pom.xml -Dfile=../../key.core/lib/recoderkey.jar
+$MVNDEPLOY -DpomFile=recoderKey.pom.xml -Dfile=../../key.core/lib/recoderkey.jar
 
 # docking-frames-core
 #$MVNDEPLOY -DpomFile=docking-frames-core.pom.xml -Dfile=../../key.ui/lib/docking-frames-core.jar
 
-$MVNDEPLOY -DpomFile=docking-frames-common.pom.xml -Dfile=../../key.ui/lib/docking-frames-common.jar
+# docking-frames-common
+#$MVNDEPLOY -DpomFile=docking-frames-common.pom.xml -Dfile=../../key.ui/lib/docking-frames-common.jar
diff --git a/key/scripts/mvndeploy/settings.xml b/key/scripts/mvndeploy/settings.xml
@@ -5,8 +5,14 @@
   <servers>
     <server>
       <id>gpr</id>
-      <username>wadoon</username>
-      <password>17f82842578a76ba27a29fd5f6f34a68b5a266ee</password>
+      <configuration>
+        <httpHeaders>
+          <property>
+            <name>Private-Token</name>
+            <value>Lk6PZsfupdf4jYZRvqKS</value>
+          </property>
+        </httpHeaders>
+      </configuration>
     </server>
   </servers>
 </settings>