Mercurial > hg > thermostat-ng > agent

changeset 2626:40903f2b0759

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Get rid of some more keyring remnents clean up .hgignore (also add ignore gradle cache) clean up 000_shared_osgi spec patch Reviewed-by: sgehwolf Review-thread: http://icedtea.classpath.org/pipermail/thermostat/2017-March/022591.html
author Simon Tooke <stooke@redhat.com>
date Fri, 31 Mar 2017 15:31:01 -0400
parents 703a2e1f90be
children 92c35ea119fd
files .hgignore distribution/assembly/core-assembly.xml distribution/packaging/fedora/0002_shared_osgi_spec_fixes.patch
diffstat 3 files changed, 2 insertions(+), 41 deletions(-) [+]
line wrap: on
line diff
--- a/.hgignore	Tue Mar 21 18:47:16 2017 -0400
+++ b/.hgignore	Fri Mar 31 15:31:01 2017 -0400
@@ -7,20 +7,6 @@
 vm-profiler/jvm-agent/dependency-reduced-pom.xml
 vm-byteman/byteman-helper/dependency-reduced-pom.xml
 
-# Keyring autogenerated files
-keyring/Makefile.in
-keyring/Makefile
-keyring/aclocal.m4
-keyring/autom4*
-keyring/compile
-keyring/config.log
-keyring/config.status
-keyring/configure
-keyring/install-sh
-keyring/missing
-keyring/src/main/native/Makefile
-keyring/src/main/native/Makefile.in
-
 syntax: glob
 target/*
 bin/*
@@ -33,3 +19,5 @@
 *.versionsBackup
 *.iml
 .idea/*
+.gradle/*
+
--- a/distribution/assembly/core-assembly.xml	Tue Mar 21 18:47:16 2017 -0400
+++ b/distribution/assembly/core-assembly.xml	Fri Mar 31 15:31:01 2017 -0400
@@ -89,13 +89,6 @@
   <fileSets>
     <fileSet>
       <outputDirectory>native</outputDirectory>
-      <directory>${main.basedir}/keyring/target</directory>
-      <includes>
-        <include>libGnomeKeyringWrapper${sharedlib.suffix}</include>
-      </includes>
-    </fileSet>
-    <fileSet>
-      <outputDirectory>native</outputDirectory>
       <directory>${main.basedir}/common/portability/target</directory>
       <includes>
         <include>${sharedlib.prefix}thermostat-common-portability${sharedlib.suffix}</include>
--- a/distribution/packaging/fedora/0002_shared_osgi_spec_fixes.patch	Tue Mar 21 18:47:16 2017 -0400
+++ b/distribution/packaging/fedora/0002_shared_osgi_spec_fixes.patch	Fri Mar 31 15:31:01 2017 -0400
@@ -582,26 +582,6 @@
      </dependency>
      <dependency>
        <groupId>org.jfree</groupId>
-diff --git a/keyring/pom.xml b/keyring/pom.xml
---- a/keyring/pom.xml
-+++ b/keyring/pom.xml
-@@ -184,14 +184,8 @@
-     </dependency>
-
-     <dependency>
--      <groupId>org.osgi</groupId>
--      <artifactId>org.osgi.core</artifactId>
--      <scope>provided</scope>
--    </dependency>
--    <dependency>
--      <groupId>org.osgi</groupId>
--      <artifactId>org.osgi.compendium</artifactId>
--      <scope>provided</scope>
-+      <groupId>org.apache.felix</groupId>
-+      <artifactId>org.apache.felix.framework</artifactId>
-     </dependency>
- 
-     <dependency>
 diff --git a/killvm/agent/pom.xml b/killvm/agent/pom.xml
 --- a/killvm/agent/pom.xml
 +++ b/killvm/agent/pom.xml