[Git][java-team/shimdandy][master] 2 commits: Adds parent-pom.patch

[Tom Marble]

Tom Marble pushed to branch master at Debian Java Maintainers / shimdandy


Commits:
3f2a82c7 by Tom Marble at 2019-07-21T14:33:08Z
Adds parent-pom.patch

updates clojure version to 1.10.x
removes unused staging deps
reverts module poms to unpatched state

Signed-off-by: Tom Marble <tmarble at info9.net>

- - - - -
2e3428ab by Tom Marble at 2019-07-21T14:35:01Z
Adds parent-pom.patch (bis)

Actually add the patch this time

Signed-off-by: Tom Marble <tmarble at info9.net>

- - - - -


4 changed files:

- api/pom.xml
- + debian/patches/parent-pom.patch
- debian/patches/series
- impl/pom.xml


Changes:

=====================================
api/pom.xml
=====================================
@@ -1,6 +1,11 @@
 <?xml version="1.0"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.projectodd.shimdandy</groupId>
+    <artifactId>shimdandy-parent</artifactId>
+    <version>1.2.1</version>
+  </parent>
   <groupId>org.projectodd.shimdandy</groupId>
   <artifactId>shimdandy-api</artifactId>
   <version>1.2.1</version>


=====================================
debian/patches/parent-pom.patch
=====================================
@@ -0,0 +1,48 @@
+updates clojure version to 1.10.x, removes unused staging deps
+Index: shimdandy/pom.xml
+===================================================================
+--- shimdandy.orig/pom.xml	2019-07-17 14:44:22.026133989 -0500
++++ shimdandy/pom.xml	2019-07-21 09:30:59.060638254 -0500
+@@ -41,7 +41,7 @@
+ 
+   <properties>
+     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+-    <version.clojure>1.7.0-alpha4</version.clojure>
++    <version.clojure>1.10.x</version.clojure>
+   </properties>
+ 
+   <dependencyManagement>
+@@ -59,33 +59,4 @@
+     <module>impl</module>
+   </modules>
+ 
+-  <build>
+-    <plugins>
+-      <plugin>
+-        <groupId>org.sonatype.plugins</groupId>
+-        <artifactId>nexus-staging-maven-plugin</artifactId>
+-        <version>1.6.3</version>
+-        <extensions>true</extensions>
+-        <configuration>
+-          <serverId>sonatype-nexus-staging</serverId>
+-          <nexusUrl>https://oss.sonatype.org/</nexusUrl>
+-          <autoReleaseAfterClose>true</autoReleaseAfterClose>
+-        </configuration>
+-      </plugin>
+-    </plugins>
+-  </build>
+-
+-  <distributionManagement>
+-    <repository>
+-      <id>sonatype-nexus-staging</id>
+-      <name>Nexus Staging Repo</name>
+-      <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
+-    </repository>
+-    <snapshotRepository>
+-      <id>sonatype-nexus-snapshots</id>
+-      <name>Nexus Snapshot Repo</name>
+-      <url>https://oss.sonatype.org/content/repositories/snapshots/</url>
+-    </snapshotRepository>
+-  </distributionManagement>
+-
+ </project>


=====================================
debian/patches/series
=====================================
@@ -1 +1,2 @@
 exclude-parent-pom.patch
+parent-pom.patch


=====================================
impl/pom.xml
=====================================
@@ -1,6 +1,11 @@
 <?xml version="1.0"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.projectodd.shimdandy</groupId>
+    <artifactId>shimdandy-parent</artifactId>
+    <version>1.2.1</version>
+  </parent>
   <groupId>org.projectodd.shimdandy</groupId>
   <artifactId>shimdandy-impl</artifactId>
   <version>1.2.1</version>



View it on GitLab: https://salsa.debian.org/java-team/shimdandy/compare/9bc4aa57bdd1cf8aa39d00d3c9fbc9676eb1c34b...2e3428abb255f7d18c7eea5e592e4bad7bf85b14

-- 
View it on GitLab: https://salsa.debian.org/java-team/shimdandy/compare/9bc4aa57bdd1cf8aa39d00d3c9fbc9676eb1c34b...2e3428abb255f7d18c7eea5e592e4bad7bf85b14
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20190722/7e9c6152/attachment.html>